diff -Nru overlay-scrollbar-0.2.16+r353/debian/changelog overlay-scrollbar-0.2.16+r356/debian/changelog --- overlay-scrollbar-0.2.16+r353/debian/changelog 2012-08-24 17:09:07.000000000 +0000 +++ overlay-scrollbar-0.2.16+r356/debian/changelog 2012-09-24 14:36:45.000000000 +0000 @@ -1,3 +1,14 @@ +overlay-scrollbar (0.2.16+r356-0ubuntu1) quantal-proposed; urgency=low + + * New upstream release: + - remove a warning + - update the blacklist + * debian/patches/01_workaround_qt_overlay_crash.patch: + avoid crashes in Qt apps, removing the overlay scrollbars for them + (LP: #1005677) + + -- Didier Roche Mon, 24 Sep 2012 16:24:32 +0200 + overlay-scrollbar (0.2.16+r353-0ubuntu2) quantal; urgency=low * debian/control: diff -Nru overlay-scrollbar-0.2.16+r353/debian/patches/01_workaround_qt_overlay_crash.patch overlay-scrollbar-0.2.16+r356/debian/patches/01_workaround_qt_overlay_crash.patch --- overlay-scrollbar-0.2.16+r353/debian/patches/01_workaround_qt_overlay_crash.patch 1970-01-01 00:00:00.000000000 +0000 +++ overlay-scrollbar-0.2.16+r356/debian/patches/01_workaround_qt_overlay_crash.patch 2012-09-24 14:36:45.000000000 +0000 @@ -0,0 +1,34 @@ +# Description: Use ubuntu_gtk_set_use_overlay_scrollbar and +# ubuntu_gtk_get_use_overlay_scrollbar so that other programs can say they +# don't want to use the overlay scrollbars. This workaround some crash in +# Qt apps for instance. +# Author: Albert Astals Cid +# Bug: http://launchpad.net/bugs/1005677 + +=== modified file 'os/os-scrollbar.c' +--- a/os/os-scrollbar.c 2012-08-29 16:09:23 +0000 ++++ b/os/os-scrollbar.c 2012-09-17 14:07:20 +0000 +@@ -3161,7 +3161,11 @@ + static gboolean + use_overlay_scrollbar (void) + { ++#ifdef USE_GTK3 + return scrollbar_mode != SCROLLBAR_MODE_NORMAL; ++#else ++ return scrollbar_mode != SCROLLBAR_MODE_NORMAL && ubuntu_gtk_get_use_overlay_scrollbar (); ++#endif + } + + static void +@@ -4231,6 +4235,10 @@ + "}\n", -1, NULL); + #endif + ++#ifndef USE_GTK3 ++ ubuntu_gtk_set_use_overlay_scrollbar (TRUE); ++#endif ++ + /* Load custom overlay scrollbar style. */ + if (use_overlay_scrollbar ()) + custom_style_load (); + diff -Nru overlay-scrollbar-0.2.16+r353/debian/rules overlay-scrollbar-0.2.16+r356/debian/rules --- overlay-scrollbar-0.2.16+r353/debian/rules 2012-08-09 14:02:10.000000000 +0000 +++ overlay-scrollbar-0.2.16+r356/debian/rules 2012-09-24 14:36:45.000000000 +0000 @@ -6,6 +6,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/autoreconf.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/