From d4677ab5e83b4766ac5de6a0dbbf367d151860ea89776cae84e828e6dc976d4c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 9 Jan 2009 03:34:42 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk2?expand=0&rev=61 --- gtk2-bnc457728-disable-gail-via-env-var.diff | 28 ++++++++++++++++++++ gtk2.changes | 7 +++++ gtk2.spec | 15 ++++++++--- 3 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 gtk2-bnc457728-disable-gail-via-env-var.diff diff --git a/gtk2-bnc457728-disable-gail-via-env-var.diff b/gtk2-bnc457728-disable-gail-via-env-var.diff new file mode 100644 index 0000000..d09528c --- /dev/null +++ b/gtk2-bnc457728-disable-gail-via-env-var.diff @@ -0,0 +1,28 @@ +diff -urw gtk+-2.14.4/modules/other/gail/gail.c gtk+-2.14.4-fixed//modules/other/gail/gail.c +--- gtk+-2.14.4/modules/other/gail/gail.c 2008-10-17 00:06:24.000000000 -0400 ++++ gtk+-2.14.4-fixed//modules/other/gail/gail.c 2008-12-19 11:37:50.000000000 -0500 +@@ -27,6 +27,7 @@ + #include "gailfactory.h" + + #define GNOME_ACCESSIBILITY_ENV "GNOME_ACCESSIBILITY" ++#define NO_GAIL_ENV "NO_GAIL" + + static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, + guint n_param_values, +@@ -976,6 +977,16 @@ + int + gtk_module_init (gint *argc, char** argv[]) + { ++ const char* env_no_gail; ++ gboolean no_gail = FALSE; ++ ++ env_no_gail = g_getenv (NO_GAIL_ENV); ++ if (env_no_gail) ++ no_gail = atoi (env_no_gail); ++ ++ if (no_gail) ++ return 0; ++ + gail_accessibility_module_init (); + + return 0; diff --git a/gtk2.changes b/gtk2.changes index 0aa4aad..70b859f 100644 --- a/gtk2.changes +++ b/gtk2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 8 10:04:15 EST 2009 - btaylor@novell.com + +- Added gtk2-bnc457728-disable-gail-via-env-var.diff to allow gail to be + disabled by the NO_GAIL env var (bnc#460890, bnc#449513). This is needed by + applications which use gtk but provide their own accessibility modules. + ------------------------------------------------------------------- Tue Dec 23 15:29:10 CST 2008 - federico@novell.com diff --git a/gtk2.spec b/gtk2.spec index dd3dd2a..9e8b713 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -49,7 +49,7 @@ Obsoletes: gtk2-64bit # PreReq: /usr/bin/touch /bin/rm /bin/rmdir Version: 2.14.4 -Release: 9 +Release: 10 Summary: Library for Creation of Graphical User Interfaces (version 2) Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar.bz2 Source1: SuSEconfig.gtk2 @@ -97,6 +97,8 @@ Patch54: gtk2-bnc310710-bgo524166-underallocated-gtklabel-position.diff Patch55: gtk2-bnc355503-file-chooser-remember-geometry.diff Patch56: gtk2-191223-java-selection-fix-updated.patch Patch57: gtk2-bnc447004-treeview-lines-rtl.diff +# PATCH-FEATURE-UPSTREAM gtk2-bnc457728-disable-gail-via-env-var.diff bnc460890 bgo565110 btaylor@novell.com -- Allow gail to be disabled via an env var +Patch58: gtk2-bnc457728-disable-gail-via-env-var.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: cairo >= 0.9.2 hicolor-icon-theme %if %suse_version > 1020 @@ -325,6 +327,7 @@ cp -a %{S:2} . %patch55 -p1 %patch56 -p1 %patch57 -p1 +%patch58 -p1 # gnome-patch-translation-update %build @@ -459,6 +462,10 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Thu Jan 08 2009 btaylor@novell.com +- Added gtk2-bnc457728-disable-gail-via-env-var.diff to allow gail to be + disabled by the NO_GAIL env var (bnc#460890, bnc#449513). This is needed by + applications which use gtk but provide their own accessibility modules. * Tue Dec 23 2008 federico@novell.com - Updated gtk2-bnc355503-file-chooser-remember-geometry.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=445923 - The file @@ -603,7 +610,7 @@ fi + Updated translations - Respin gtk+-strict-aliasing.patch - Drop gtk2-remove-empty-cache.patch and update SuSEconfig.gtk2. -* Tue Jul 22 2008 coolo@suse.de +* Wed Jul 23 2008 coolo@suse.de - obsolete gail- * Mon Jul 21 2008 federico@novell.com - Tagged all the patches that didn't have tags. @@ -1002,7 +1009,7 @@ fi - lots of updates in the printing area - various fixes in many other places - countless bugfixes -* Tue Jun 20 2006 federico@novell.com +* Wed Jun 21 2006 federico@novell.com - Added gtk2-184875-filechooser-location-entry-set-path.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=184875. This makes the location entry in the file chooser preserve the filename from @@ -1183,7 +1190,7 @@ fi - Use current name for XFree86-devel in Requires (#54136). * Mon May 02 2005 gekker@suse.de - Fix crasher in gtktextview (380). -* Sun Apr 03 2005 aj@suse.de +* Mon Apr 04 2005 aj@suse.de - Disable visibility to build with GCC4. This should be enabled again once gtk is fixed. * Fri Mar 18 2005 gekker@suse.de