Hello community, here is the log from the commit of package oxygen-gtk for openSUSE:12.1:Update:Test checked in at 2012-02-16 10:38:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/oxygen-gtk (Old) and /work/SRC/openSUSE:12.1:Update:Test/.oxygen-gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oxygen-gtk", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/oxygen-gtk/oxygen-gtk.changes 2012-02-16 10:38:42.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.oxygen-gtk.new/oxygen-gtk.changes 2012-02-16 10:38:42.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Feb 15 11:13:37 UTC 2012 - nmo.marq...@gmail.com + +- Add PATCH-FIX-UPSTREAM bnc732887.patch: backport of revision + c3afaa38 (upstream) to fix bnc#732887, kde#286140 - banshee + crashes on start if using oxygen-gtk theme. + +------------------------------------------------------------------- New: ---- bnc732887.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk.spec ++++++ --- /var/tmp/diff_new_pack.pmXjlv/_old 2012-02-16 10:38:43.000000000 +0100 +++ /var/tmp/diff_new_pack.pmXjlv/_new 2012-02-16 10:38:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package oxygen-gtk # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,8 @@ Group: System/GUI/KDE Source0: ftp://ftp.kde.org/pub/kde/stable/oxygen-gtk/%{version}/src/%{name}-%{version}.tar.bz2 Source100: baselibs.conf +# PATCH-FIX-UPSTREAM bnc732887.patch nmo.marq...@gmail.com -- backport to fix bnc#732887, kde#286140 +Patch0: bnc732887.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig(cairo) @@ -48,6 +50,7 @@ %prep %setup -q +%patch0 -p1 %build mkdir -p build ++++++ bnc732887.patch ++++++ diff -urN a/src/animations/oxygeninnershadowdata.cpp b/src/animations/oxygeninnershadowdata.cpp --- a/src/animations/oxygeninnershadowdata.cpp 2011-10-15 14:19:29.000000000 +0100 +++ b/src/animations/oxygeninnershadowdata.cpp 2012-02-15 11:19:36.135750688 +0000 @@ -259,13 +259,15 @@ GdkWindow* window(gtk_widget_get_window(widget)); if( // check window - ( window && gdk_display_supports_composite( gdk_display_get_default() ) ) && + window && + gdk_display_supports_composite( gdk_drawable_get_display( GDK_DRAWABLE( window ) ) ) && + gdk_window_get_window_type( window ) == GDK_WINDOW_CHILD && // check widget type (might move to blacklist method) ( G_OBJECT_TYPE_NAME(widget) != std::string("GtkPizza") ) && // make sure widget is scrollable - ( GTK_WIDGET_GET_CLASS( widget )->set_scroll_adjustments_signal ) ) + GTK_WIDGET_GET_CLASS( widget )->set_scroll_adjustments_signal ) { data.initiallyComposited=gdk_window_get_composited(window); gdk_window_set_composited(window,TRUE); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
