Hello community, here is the log from the commit of package oxygen-gtk2 for openSUSE:Factory checked in at 2013-02-17 17:11:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen-gtk2 (Old) and /work/SRC/openSUSE:Factory/.oxygen-gtk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oxygen-gtk2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen-gtk2/oxygen-gtk2.changes 2013-01-31 10:27:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk2.new/oxygen-gtk2.changes 2013-02-17 17:11:18.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Feb 15 14:59:07 UTC 2013 - hrvoje.sen...@gmail.com + +- Update to version 1.3.2.1 + * Bugfix release + * exceptional release fixes startup crashes for many applications + +------------------------------------------------------------------- Old: ---- oxygen-gtk2-1.3.2.tar.bz2 New: ---- oxygen-gtk2-1.3.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.NNv6OJ/_old 2013-02-17 17:11:19.000000000 +0100 +++ /var/tmp/diff_new_pack.NNv6OJ/_new 2013-02-17 17:11:19.000000000 +0100 @@ -17,7 +17,7 @@ Name: oxygen-gtk2 -Version: 1.3.2 +Version: 1.3.2.1 Release: 0 Summary: A Port of the default KDE Widget Theme (Oxygen), to GTK 2.x License: LGPL-2.1+ ++++++ oxygen-gtk2-1.3.2.tar.bz2 -> oxygen-gtk2-1.3.2.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.3.2/CMakeLists.txt new/oxygen-gtk2-1.3.2.1/CMakeLists.txt --- old/oxygen-gtk2-1.3.2/CMakeLists.txt 2013-01-29 13:32:52.000000000 +0100 +++ new/oxygen-gtk2-1.3.2.1/CMakeLists.txt 2013-02-12 09:20:00.000000000 +0100 @@ -13,7 +13,7 @@ set( CPACK_PACKAGE_VENDOR "h...@oxygen-icons.org" ) set( CPACK_PACKAGE_VERSION_MAJOR "1" ) set( CPACK_PACKAGE_VERSION_MINOR "3" ) -set( CPACK_PACKAGE_VERSION_PATCH "2" ) +set( CPACK_PACKAGE_VERSION_PATCH "2.1" ) set( CPACK_SOURCE_IGNORE_FILES "build" "^${PROJECT_SOURCE_DIR}.*/.git/" ) ################################## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.3.2/src/oxygenqtsettings.cpp new/oxygen-gtk2-1.3.2.1/src/oxygenqtsettings.cpp --- old/oxygen-gtk2-1.3.2/src/oxygenqtsettings.cpp 2013-01-29 13:32:23.000000000 +0100 +++ new/oxygen-gtk2-1.3.2.1/src/oxygenqtsettings.cpp 2013-02-11 12:14:06.000000000 +0100 @@ -102,6 +102,9 @@ const bool forced( flags&Forced ); + // no attempt at initializing if gtk settings is not yet set + if( !gtk_settings_get_default() ) return false; + if( _initialized && !forced ) return false; else if( !forced ) _initialized = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.3.2/src/oxygenstylewrapper.cpp new/oxygen-gtk2-1.3.2.1/src/oxygenstylewrapper.cpp --- old/oxygen-gtk2-1.3.2/src/oxygenstylewrapper.cpp 2013-01-29 13:32:23.000000000 +0100 +++ new/oxygen-gtk2-1.3.2.1/src/oxygenstylewrapper.cpp 2013-02-11 12:14:06.000000000 +0100 @@ -3737,10 +3737,14 @@ { #if OXYGEN_DEBUG - std::cerr << "Oxygen::StyleWrapper::classInit" << std::endl; + std::cerr << "Oxygen::StyleWrapper::instanceInit" << std::endl; #endif // style initialization + /* + this is normally achieved in theme_init, but is somehow not working with gnome shell + so that it is redone here, since duplication is avoided when initialization is called twice without modifications + */ Style::instance().initialize(); // hooks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oxygen-gtk2-1.3.2/src/oxygentheme.cpp new/oxygen-gtk2-1.3.2.1/src/oxygentheme.cpp --- old/oxygen-gtk2-1.3.2/src/oxygentheme.cpp 2013-01-22 13:47:16.000000000 +0100 +++ new/oxygen-gtk2-1.3.2.1/src/oxygentheme.cpp 2013-02-11 12:14:06.000000000 +0100 @@ -52,12 +52,8 @@ Oxygen::RCStyle::registerType( module ); Oxygen::StyleWrapper::registerType( module ); - // initialize oxygen here, for XUL applications - // special care is taken to not initialize everything - Oxygen::ApplicationName applicationName; - applicationName.initialize(); - if( applicationName.isXul() ) - { Oxygen::Style::instance().initialize( Oxygen::QtSettings::Forced | Oxygen::QtSettings::Colors ); } + // style initialization + Oxygen::Style::instance().initialize(); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org