Hello community, here is the log from the commit of package oxygen-gtk2 for openSUSE:Factory checked in at 2014-03-28 16:27:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen-gtk2 (Old) and /work/SRC/openSUSE:Factory/.oxygen-gtk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oxygen-gtk2" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen-gtk2/oxygen-gtk2.changes 2014-03-09 18:32:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.oxygen-gtk2.new/oxygen-gtk2.changes 2014-03-28 16:27:17.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 18 17:44:25 UTC 2014 - [email protected] + +- Added crashfix from upstream: + 0001-make-sure-parent-is-registered-to-innerShadowEngine-.patch, + fixes crashes when invoking GTK2 dialogs, bnc#869791, kde#331879 + +------------------------------------------------------------------- New: ---- 0001-make-sure-parent-is-registered-to-innerShadowEngine-.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.agAmKf/_old 2014-03-28 16:27:17.000000000 +0100 +++ /var/tmp/diff_new_pack.agAmKf/_new 2014-03-28 16:27:17.000000000 +0100 @@ -25,6 +25,8 @@ Url: https://projects.kde.org/projects/playground/artwork/oxygen-gtk/ Source0: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 Source100: baselibs.conf +# PATCH-FIX-UPSTREAM 0001-make-sure-parent-is-registered-to-innerShadowEngine-.patch -- kde#331879 +Patch0: 0001-make-sure-parent-is-registered-to-innerShadowEngine-.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig(cairo) @@ -91,6 +93,7 @@ %prep %setup -q +%patch0 -p1 %build mkdir -p build ++++++ 0001-make-sure-parent-is-registered-to-innerShadowEngine-.patch ++++++ >From b39931fa3ad7a2756bcb1494d5c3559513406ce2 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa <[email protected]> Date: Sun, 9 Mar 2014 13:00:33 +0100 Subject: [PATCH 1/1] make sure parent is registered to innerShadowEngine before registering child CCBUG: 331879 --- src/oxygenstylewrapper.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/oxygenstylewrapper.cpp b/src/oxygenstylewrapper.cpp index 20a58fa..de22ecd 100644 --- a/src/oxygenstylewrapper.cpp +++ b/src/oxygenstylewrapper.cpp @@ -1669,7 +1669,10 @@ namespace Oxygen } // register to inner shadow engine - if( shadow == GTK_SHADOW_IN && gtk_scrolled_window_get_shadow_type( GTK_SCROLLED_WINDOW( widget ) ) == GTK_SHADOW_IN ) + if( + shadow == GTK_SHADOW_IN && + gtk_scrolled_window_get_shadow_type( GTK_SCROLLED_WINDOW( widget ) ) == GTK_SHADOW_IN && + Style::instance().animations().innerShadowEngine().contains( widget ) ) { Style::instance().animations().innerShadowEngine().registerChild( widget, gtk_bin_get_child( GTK_BIN( widget ) ) ); } } else if( @@ -2074,7 +2077,8 @@ namespace Oxygen if( gtk_scrolled_window_get_shadow_type( scrolledWindow ) != GTK_SHADOW_IN ) { gtk_scrolled_window_set_shadow_type( scrolledWindow, GTK_SHADOW_IN ); - Style::instance().animations().innerShadowEngine().registerChild( child, gtk_bin_get_child( GTK_BIN( child ) ) ); + if( Style::instance().animations().innerShadowEngine().contains( child ) ) + { Style::instance().animations().innerShadowEngine().registerChild( child, gtk_bin_get_child( GTK_BIN( child ) ) ); } } return; -- 1.9.0 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
