Hello community, here is the log from the commit of package oxygen-gtk for openSUSE:Factory checked in at 2011-11-29 16:24:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen-gtk (Old) and /work/SRC/openSUSE:Factory/.oxygen-gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oxygen-gtk", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen-gtk/oxygen-gtk.changes 2011-11-25 10:13:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk.new/oxygen-gtk.changes 2011-11-29 16:24:37.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Nov 29 14:18:22 CET 2011 - r...@suse.de + +- use _lib macro to properly determine lib suffix + +------------------------------------------------------------------- +Fri Nov 25 13:31:58 UTC 2011 - idoen...@suse.de + +- gdk_window_get_display is a new symbol introduced in GTK+ 2.24, + use gdk_drawable_get_display for older versions. + +------------------------------------------------------------------- New: ---- oxygen-gtk-compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk.spec ++++++ --- /var/tmp/diff_new_pack.etHfNW/_old 2011-11-29 16:24:38.000000000 +0100 +++ /var/tmp/diff_new_pack.etHfNW/_new 2011-11-29 16:24:38.000000000 +0100 @@ -26,6 +26,7 @@ Group: System/GUI/KDE Source0: ftp://ftp.kde.org/pub/kde/stable/oxygen-gtk/%{version}/src/%{name}-%{version}.tar.bz2 Source100: baselibs.conf +Patch1: oxygen-gtk-compat.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig(cairo) @@ -48,6 +49,7 @@ %prep %setup -q +%patch1 -p1 %build mkdir -p build @@ -57,7 +59,7 @@ cmake .. \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - %ifarch x86_64 + %if "%{_lib}" == "lib64" -DLIB_SUFFIX=64 \ %endif -DCMAKE_BUILD_TYPE=release ++++++ oxygen-gtk-compat.patch ++++++ Index: oxygen-gtk-1.1.5/src/animations/oxygenbackgroundhintengine.cpp =================================================================== --- oxygen-gtk-1.1.5.orig/src/animations/oxygenbackgroundhintengine.cpp +++ oxygen-gtk-1.1.5/src/animations/oxygenbackgroundhintengine.cpp @@ -69,7 +69,11 @@ namespace Oxygen if( contains( data ) ) return false; // set hint + #if GTK_CHECK_VERSION(2,24,0) GdkDisplay *display( gdk_window_get_display( window ) ); + #else + GdkDisplay *display( gdk_drawable_get_display( window ) ); + #endif if( display && _backgroundGradientAtom && (hints&BackgroundGradient) ) { unsigned long uLongValue( true ); Index: oxygen-gtk-1.1.5/src/animations/oxygeninnershadowdata.cpp =================================================================== --- oxygen-gtk-1.1.5.orig/src/animations/oxygeninnershadowdata.cpp +++ oxygen-gtk-1.1.5/src/animations/oxygeninnershadowdata.cpp @@ -105,7 +105,11 @@ namespace Oxygen if( // check window window && + #if GTK_CHECK_VERSION(2, 24, 0) gdk_display_supports_composite( gdk_window_get_display( window ) ) && + #else + gdk_display_supports_composite( gdk_drawable_get_display( window ) ) && + #endif gdk_window_get_window_type( window ) == GDK_WINDOW_CHILD && // check widget type (might move to blacklist method) Index: oxygen-gtk-1.1.5/demo/oxygendemodialog.cpp =================================================================== --- oxygen-gtk-1.1.5.orig/demo/oxygendemodialog.cpp +++ oxygen-gtk-1.1.5/demo/oxygendemodialog.cpp @@ -266,7 +266,7 @@ namespace Oxygen gboolean DemoDialog::keyPress( GtkWidget* widget, GdkEventKey* event, gpointer ) { guint modifiers( gtk_accelerator_get_default_mod_mask() ); - if( gdk_keyval_to_upper( event->keyval ) == GDK_KEY_Q && (event->state&modifiers) == GDK_CONTROL_MASK ) + if( gdk_keyval_to_upper( event->keyval ) == GDK_q && (event->state&modifiers) == GDK_CONTROL_MASK ) { gtk_main_quit(); return TRUE; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
