Accepting request 183796 from home:vuntz:branches:GNOME:Factory
Update to 2.24.20 OBS-URL: https://build.opensuse.org/request/show/183796 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=189
This commit is contained in:
Git OBS Bridge
parent
7780dbd263
commit
f1b1f70451
@ -4,102 +4,101 @@ gtk2-devel
|
||||
gtk2-tools
|
||||
+/usr/bin/gtk-query-immodules-2.0(-64)?
|
||||
post "%if "%_lib" == "lib64""
|
||||
post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/gtk-2.0/2.10.0; if test $? -eq 0; then <prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules; fi; fi"
|
||||
post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/gtk-2.0/2.10.0; if test $? -eq 0; then <prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache; fi; fi"
|
||||
post "%else"
|
||||
post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/gtk-2.0/2.10.0; if test $? -eq 0; then <prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules; fi; fi"
|
||||
post "if [ $1 == 1 ]; then test -d <prefix>%{_libdir}/gtk-2.0/2.10.0; if test $? -eq 0; then <prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache; fi; fi"
|
||||
post "%endif"
|
||||
libgtk-2_0-0
|
||||
+/etc/gtk-2.0/gtk(64)?.immodules
|
||||
requires "gtk2-tools-<targettype>"
|
||||
provides "gtk2-<targettype> = <version>"
|
||||
obsoletes "gtk2-<targettype> < <version>"
|
||||
obsoletes "gail-<targettype> <= 1.22.1"
|
||||
post "%if "%_lib" == "lib64""
|
||||
post "if test -f <prefix>%{_bindir}/gtk-query-immodules-2.0-64; then <prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules; fi"
|
||||
post "if test -f <prefix>%{_bindir}/gtk-query-immodules-2.0-64; then <prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache; fi"
|
||||
post "%else"
|
||||
post "if test -f <prefix>%{_bindir}/gtk-query-immodules-2.0; then <prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules; fi"
|
||||
post "if test -f <prefix>%{_bindir}/gtk-query-immodules-2.0; then <prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache; fi"
|
||||
post "%endif"
|
||||
gtk2-immodule-amharic
|
||||
requires "gtk2-<targettype>"
|
||||
post "%if "%_lib" == "lib64""
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
|
||||
post "%else"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
|
||||
post "%endif"
|
||||
postun "%if "%_lib" == "lib64""
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
|
||||
postun "%else"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
|
||||
postun "%endif"
|
||||
gtk2-immodule-inuktitut
|
||||
requires "gtk2-<targettype>"
|
||||
post "%if "%_lib" == "lib64""
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
|
||||
post "%else"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
|
||||
post "%endif"
|
||||
postun "%if "%_lib" == "lib64""
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
|
||||
postun "%else"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
|
||||
postun "%endif"
|
||||
gtk2-immodule-multipress
|
||||
requires "gtk2-<targettype>"
|
||||
post "%if "%_lib" == "lib64""
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
|
||||
post "%else"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
|
||||
post "%endif"
|
||||
postun "%if "%_lib" == "lib64""
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
|
||||
postun "%else"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
|
||||
postun "%endif"
|
||||
gtk2-immodule-thai
|
||||
requires "gtk2-<targettype>"
|
||||
post "%if "%_lib" == "lib64""
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
|
||||
post "%else"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
|
||||
post "%endif"
|
||||
postun "%if "%_lib" == "lib64""
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
|
||||
postun "%else"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
|
||||
postun "%endif"
|
||||
gtk2-immodules-tigrigna
|
||||
requires "gtk2-<targettype>"
|
||||
post "%if "%_lib" == "lib64""
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
|
||||
post "%else"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
|
||||
post "%endif"
|
||||
postun "%if "%_lib" == "lib64""
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
|
||||
postun "%else"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
|
||||
postun "%endif"
|
||||
gtk2-immodule-vietnamese
|
||||
requires "gtk2-<targettype>"
|
||||
post "%if "%_lib" == "lib64""
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
|
||||
post "%else"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
|
||||
post "%endif"
|
||||
postun "%if "%_lib" == "lib64""
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
|
||||
postun "%else"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
|
||||
postun "%endif"
|
||||
gtk2-immodule-xim
|
||||
requires "gtk2-<targettype>"
|
||||
post "%if "%_lib" == "lib64""
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
|
||||
post "%else"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
|
||||
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
|
||||
post "%endif"
|
||||
postun "%if "%_lib" == "lib64""
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
|
||||
postun "%else"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
|
||||
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
|
||||
postun "%endif"
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:15b8bf463eba99abfa58270662914e8e9b83568ab4945b5f0ef1aa29e90becb8
|
||||
size 13374160
|
||||
3
gtk+-2.24.20.tar.xz
Normal file
3
gtk+-2.24.20.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cc66bcbf9239a7d9861175c681ba95894b55c70dc0b37aad8345c46ecfda0da3
|
||||
size 13387180
|
||||
13
gtk2-GTK_PATH64.patch
Normal file
13
gtk2-GTK_PATH64.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Index: gtk+-2.22.1/gtk/gtkmodules.c
|
||||
===================================================================
|
||||
--- gtk+-2.22.1.orig/gtk/gtkmodules.c
|
||||
+++ gtk+-2.22.1/gtk/gtkmodules.c
|
||||
@@ -68,7 +68,7 @@ get_module_path (void)
|
||||
if (home_dir)
|
||||
home_gtk_dir = g_build_filename (home_dir, ".gtk-2.0", NULL);
|
||||
|
||||
- module_path_env = g_getenv ("GTK_PATH");
|
||||
+ module_path_env = g_getenv ("GTK_PATH64");
|
||||
exe_prefix = g_getenv ("GTK_EXE_PREFIX");
|
||||
|
||||
if (exe_prefix)
|
||||
29
gtk2.changes
29
gtk2.changes
@ -1,3 +1,32 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 19 07:09:39 UTC 2013 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 2.24.20:
|
||||
+ Backport changes from GTK+ 3 to look for rc files in system
|
||||
config dirs in addition to /etc/gtk-2.0 and ~/.gtkrc.
|
||||
+ Backport changes from GTK+ 3 to look for the immodules cache
|
||||
file in libdir. gtk-query-immodules-2.0 gained an
|
||||
--update-cache option to write the output to the correct
|
||||
location. Note that this may require slight adjustment of
|
||||
distro packaging.
|
||||
+ Bugs fixed: bgo#560337, bgo#649390, bgo#698183, bgo#702455.
|
||||
- Adapt package for move of immodules cache file to libdir:
|
||||
- Stop touching/creating %{_sysconfdir}/gtk-2.0/gtk.immodules
|
||||
(and gtk64.immodules), and instead touch
|
||||
%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules.cache.
|
||||
- Update calls to gtk-query-immodules-2.0 in .spec and in
|
||||
macros.gtk2 to use --update-cache, instead of redirecting the
|
||||
output to a file.
|
||||
- Change all the Requires(post)/Requires(postun) on gtk2-tools to
|
||||
be versioned >= 2.24.20 because the calls in scriptlets will
|
||||
now require the new gtk-query-immodules-2.0.
|
||||
- Remove gtk64.patch: this was needed to have cache files in
|
||||
/etc.
|
||||
- Also update baselibs.conf accordingly.
|
||||
- Add gtk2-GTK_PATH64.patch: contains the remaining part of
|
||||
gtk64.patch, to use the GTK_PATH64 environment variable on 64bit
|
||||
systems
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 17 21:08:09 UTC 2013 - zaitor@opensuse.org
|
||||
|
||||
|
||||
48
gtk2.spec
48
gtk2.spec
@ -21,7 +21,7 @@
|
||||
|
||||
Name: gtk2
|
||||
%define _name gtk+
|
||||
Version: 2.24.19
|
||||
Version: 2.24.20
|
||||
Release: 0
|
||||
# FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
|
||||
Summary: The GTK+ toolkit library (version 2)
|
||||
@ -35,8 +35,8 @@ Source4: baselibs.conf
|
||||
Source5: macros.gtk2
|
||||
# PATCH-FIX-UPSTREAM gtk2-window-dragging.patch bgo#611313 -- Taken from Fedora, to support window dragging from menubars/toolbars
|
||||
Patch0: gtk2-window-dragging.patch
|
||||
# PATCH-FIX-OPENSUSE gtk64.patch sbrabec@novell.com - 64-bit dual install. See also the Fedora patch for a simpler way of doing this.
|
||||
Patch8: gtk64.patch
|
||||
# PATCH-FIX-OPENSUSE gtk2-GTK_PATH64.patch sbrabec@novell.com - 64-bit dual install. Use GTK_PATH64 environment variable instead of GTK_PATH
|
||||
Patch8: gtk2-GTK_PATH64.patch
|
||||
# PATCH-FEATURE-UPSTREAM bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff bnc129753 bgo319484 mfabian@novell.com - Translate the font styles in the GUI
|
||||
Patch22: bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff
|
||||
# PATCH-FIX-OPENSUSE bugzilla-131498-allow-xim-for-all-languages.patch bnc131498 mfabian@novell.com - Allow all languages to be run with the X Input Method
|
||||
@ -86,7 +86,7 @@ ranging from small one-off projects to complete application suites.
|
||||
%package -n libgtk-2_0-0
|
||||
Summary: The GTK+ toolkit library (version 2)
|
||||
Group: System/Libraries
|
||||
Requires(post): %{name}-tools
|
||||
Requires(post): %{name}-tools >= 2.24.20
|
||||
# While hicolor is not a Requires strictly speaking, we put it as
|
||||
# such instead of as a Recommends because many applications just
|
||||
# assume it's there and we need to have a low-level package to
|
||||
@ -135,8 +135,8 @@ This package provides the GObject Introspection bindings for GTK+.
|
||||
Summary: The GTK+ toolkit library (version 2) -- Amharic Input Method
|
||||
Group: System/Libraries
|
||||
Requires: %{name} = %{version}
|
||||
Requires(post): %{name}-tools
|
||||
Requires(postun): %{name}-tools
|
||||
Requires(post): %{name}-tools >= 2.24.20
|
||||
Requires(postun): %{name}-tools >= 2.24.20
|
||||
Provides: locale(%{name}:am)
|
||||
|
||||
%description immodule-amharic
|
||||
@ -150,8 +150,8 @@ This package provides an input method for Amharic.
|
||||
Summary: The GTK+ toolkit library (version 2) -- Inuktitut Input Method
|
||||
Group: System/Libraries
|
||||
Requires: %{name} = %{version}
|
||||
Requires(post): %{name}-tools
|
||||
Requires(postun): %{name}-tools
|
||||
Requires(post): %{name}-tools >= 2.24.20
|
||||
Requires(postun): %{name}-tools >= 2.24.20
|
||||
Provides: locale(%{name}:iu)
|
||||
|
||||
%description immodule-inuktitut
|
||||
@ -165,8 +165,8 @@ This package provides an input method for Inuktitut.
|
||||
Summary: The GTK+ toolkit library (version 2) -- Multipress Input Method
|
||||
Group: System/Libraries
|
||||
Requires: %{name} = %{version}
|
||||
Requires(post): %{name}-tools
|
||||
Requires(postun): %{name}-tools
|
||||
Requires(post): %{name}-tools >= 2.24.20
|
||||
Requires(postun): %{name}-tools >= 2.24.20
|
||||
|
||||
%description immodule-multipress
|
||||
GTK+ is a multi-platform toolkit for creating graphical user interfaces.
|
||||
@ -180,8 +180,8 @@ multi-press method, as on a mobile phone.
|
||||
Summary: The GTK+ toolkit library (version 2) -- Thai-Lao Input Method
|
||||
Group: System/Libraries
|
||||
Requires: %{name} = %{version}
|
||||
Requires(post): %{name}-tools
|
||||
Requires(postun): %{name}-tools
|
||||
Requires(post): %{name}-tools >= 2.24.20
|
||||
Requires(postun): %{name}-tools >= 2.24.20
|
||||
Provides: locale(%{name}:lo)
|
||||
Provides: locale(%{name}:th)
|
||||
|
||||
@ -196,8 +196,8 @@ This package provides an input method for Thai-Lao.
|
||||
Summary: The GTK+ toolkit library (version 2) -- Tigrigna Input Methods
|
||||
Group: System/Libraries
|
||||
Requires: %{name} = %{version}
|
||||
Requires(post): %{name}-tools
|
||||
Requires(postun): %{name}-tools
|
||||
Requires(post): %{name}-tools >= 2.24.20
|
||||
Requires(postun): %{name}-tools >= 2.24.20
|
||||
Provides: locale(%{name}:ti)
|
||||
|
||||
%description immodules-tigrigna
|
||||
@ -211,8 +211,8 @@ This package provides two input methods for Tigrigna.
|
||||
Summary: The GTK+ toolkit library (version 2) -- Vietnamese Input Method
|
||||
Group: System/Libraries
|
||||
Requires: %{name} = %{version}
|
||||
Requires(post): %{name}-tools
|
||||
Requires(postun): %{name}-tools
|
||||
Requires(post): %{name}-tools >= 2.24.20
|
||||
Requires(postun): %{name}-tools >= 2.24.20
|
||||
Provides: locale(%{name}:vi)
|
||||
|
||||
%description immodule-vietnamese
|
||||
@ -226,8 +226,8 @@ This package provides an input method for Vietnamese.
|
||||
Summary: The GTK+ toolkit library (version 2) -- X Input Method
|
||||
Group: System/Libraries
|
||||
Requires: %{name} = %{version}
|
||||
Requires(post): %{name}-tools
|
||||
Requires(postun): %{name}-tools
|
||||
Requires(post): %{name}-tools >= 2.24.20
|
||||
Requires(postun): %{name}-tools >= 2.24.20
|
||||
Provides: locale(%{name}:ja)
|
||||
Provides: locale(%{name}:ko)
|
||||
Provides: locale(%{name}:th)
|
||||
@ -354,10 +354,9 @@ rm %{buildroot}%{_datadir}/locale/kg/LC_MESSAGES/*
|
||||
%find_lang gtk20
|
||||
%find_lang gtk20-properties
|
||||
install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/gtk-2.0
|
||||
touch %{buildroot}%{_sysconfdir}/gtk-2.0/gtk.immodules
|
||||
touch %{buildroot}%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules.cache
|
||||
%if "%{_lib}" == "lib64"
|
||||
mv %{buildroot}%{_bindir}/gtk-query-immodules-2.0 %{buildroot}%{_bindir}/gtk-query-immodules-2.0-64
|
||||
mv %{buildroot}%{_sysconfdir}/gtk-2.0/gtk.immodules %{buildroot}%{_sysconfdir}/gtk-2.0/gtk64.immodules
|
||||
%endif
|
||||
# Alternatives for gtk-update-icon-cache
|
||||
mv %{buildroot}%{_bindir}/gtk-update-icon-cache %{buildroot}%{_bindir}/gtk-update-icon-cache-2.0
|
||||
@ -378,11 +377,10 @@ cp %{SOURCE5} %{buildroot}%{_sysconfdir}/rpm
|
||||
# Convenient %define for the scriplets
|
||||
%if "%{_lib}" == "lib64"
|
||||
%define _gtk_query_immodules %{_bindir}/gtk-query-immodules-2.0-64
|
||||
%define _gtk_query_immodules_update_cache %{_gtk_query_immodules} > %{_sysconfdir}/gtk-2.0/gtk64.immodules
|
||||
%else
|
||||
%define _gtk_query_immodules %{_bindir}/gtk-query-immodules-2.0
|
||||
%define _gtk_query_immodules_update_cache %{_gtk_query_immodules} > %{_sysconfdir}/gtk-2.0/gtk.immodules
|
||||
%endif
|
||||
%define _gtk_query_immodules_update_cache %{_gtk_query_immodules} --update-cache
|
||||
|
||||
%post -n libgtk-2_0-0
|
||||
/sbin/ldconfig
|
||||
@ -480,11 +478,6 @@ fi
|
||||
%doc README.SuSE
|
||||
%endif
|
||||
%dir %{_sysconfdir}/gtk-2.0
|
||||
%if "%{_lib}" == "lib64"
|
||||
%ghost %{_sysconfdir}/gtk-2.0/gtk64.immodules
|
||||
%else
|
||||
%ghost %{_sysconfdir}/gtk-2.0/gtk.immodules
|
||||
%endif
|
||||
%dir %{_libdir}/gtk-2.0
|
||||
%dir %{_libdir}/gtk-2.0/%{gtk_binary_version}
|
||||
%dir %{_libdir}/gtk-2.0/%{gtk_binary_version}/engines
|
||||
@ -497,6 +490,7 @@ fi
|
||||
%{_libdir}/gtk-2.0/%{gtk_binary_version}/printbackends/libprintbackend-cups.so
|
||||
%{_libdir}/gtk-2.0/%{gtk_binary_version}/printbackends/libprintbackend-file.so
|
||||
%{_libdir}/gtk-2.0/%{gtk_binary_version}/printbackends/libprintbackend-lpr.so
|
||||
%ghost %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules.cache
|
||||
%dir %{_libdir}/gtk-2.0/modules
|
||||
%{_libdir}/gtk-2.0/modules/libgail.so
|
||||
%{_libdir}/libgailutil.so.*
|
||||
|
||||
86
gtk64.patch
86
gtk64.patch
@ -1,86 +0,0 @@
|
||||
Index: gtk+-2.22.1/gtk/Makefile.am
|
||||
===================================================================
|
||||
--- gtk+-2.22.1.orig/gtk/Makefile.am
|
||||
+++ gtk+-2.22.1/gtk/Makefile.am
|
||||
@@ -976,7 +976,7 @@ distclean-local:
|
||||
|
||||
DEPS = $(gtktargetlib) $(top_builddir)/gdk/$(gdktargetlib)
|
||||
|
||||
-TEST_DEPS = $(DEPS) gtk.immodules
|
||||
+TEST_DEPS = $(DEPS) gtk64.immodules
|
||||
|
||||
LDADDS = \
|
||||
$(gtktargetlib) \
|
||||
Index: gtk+-2.22.1/gtk/gtkmodules.c
|
||||
===================================================================
|
||||
--- gtk+-2.22.1.orig/gtk/gtkmodules.c
|
||||
+++ gtk+-2.22.1/gtk/gtkmodules.c
|
||||
@@ -68,7 +68,7 @@ get_module_path (void)
|
||||
if (home_dir)
|
||||
home_gtk_dir = g_build_filename (home_dir, ".gtk-2.0", NULL);
|
||||
|
||||
- module_path_env = g_getenv ("GTK_PATH");
|
||||
+ module_path_env = g_getenv ("GTK_PATH64");
|
||||
exe_prefix = g_getenv ("GTK_EXE_PREFIX");
|
||||
|
||||
if (exe_prefix)
|
||||
Index: gtk+-2.22.1/gtk/gtkrc.c
|
||||
===================================================================
|
||||
--- gtk+-2.22.1.orig/gtk/gtkrc.c
|
||||
+++ gtk+-2.22.1/gtk/gtkrc.c
|
||||
@@ -450,7 +450,7 @@ gtk_rc_get_im_module_file (void)
|
||||
if (im_module_file)
|
||||
result = g_strdup (im_module_file);
|
||||
else
|
||||
- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
|
||||
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk64.immodules", NULL);
|
||||
}
|
||||
|
||||
return result;
|
||||
Index: gtk+-2.22.1/modules/input/Makefile.am
|
||||
===================================================================
|
||||
--- gtk+-2.22.1.orig/modules/input/Makefile.am
|
||||
+++ gtk+-2.22.1/modules/input/Makefile.am
|
||||
@@ -189,11 +189,11 @@ install-data-hook:
|
||||
@if $(RUN_QUERY_IMMODULES_TEST) ; then \
|
||||
echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
|
||||
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
|
||||
- echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
|
||||
- $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
|
||||
+ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk64.immodules" ; \
|
||||
+ $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk64.immodules ; \
|
||||
else \
|
||||
echo "***" ; \
|
||||
- echo "*** Warning: gtk.immodules not built" ; \
|
||||
+ echo "*** Warning: gtk64.immodules not built" ; \
|
||||
echo "***" ; \
|
||||
echo "*** Generate this file manually on host" ; \
|
||||
echo "*** system using gtk-query-immodules-2.0" ; \
|
||||
@@ -201,7 +201,7 @@ install-data-hook:
|
||||
fi
|
||||
|
||||
uninstall-local:
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
|
||||
+ rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk64.immodules
|
||||
|
||||
if BUILD_DYNAMIC_MODULES
|
||||
|
||||
@@ -237,14 +237,14 @@ noinst_LTLIBRARIES = \
|
||||
|
||||
included-modules: $(noinst_LTLIBRARIES)
|
||||
|
||||
-gtk.immodules: Makefile.am $(module_LTLIBRARIES)
|
||||
- $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
|
||||
+gtk64.immodules: Makefile.am $(module_LTLIBRARIES)
|
||||
+ $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk64.immodules
|
||||
|
||||
-CLEANFILES = gtk.immodules
|
||||
+CLEANFILES = gtk64.immodules
|
||||
|
||||
if CROSS_COMPILING
|
||||
else
|
||||
-all-local: gtk.immodules
|
||||
+all-local: gtk64.immodules
|
||||
endif
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
12
macros.gtk2
12
macros.gtk2
@ -12,15 +12,15 @@
|
||||
###
|
||||
|
||||
%gtk2_immodule_requires \
|
||||
Requires(post): gtk2 \
|
||||
Requires(postun): gtk2
|
||||
Requires(post): gtk2-tools >= 2.24.20 \
|
||||
Requires(postun): gtk2-tools >= 2.24.20
|
||||
|
||||
# On install, update the cache
|
||||
%gtk2_immodule_post \
|
||||
%if "%_lib" == "lib64" \
|
||||
%{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules \
|
||||
%{_bindir}/gtk-query-immodules-2.0-64 --update-cache \
|
||||
%else \
|
||||
%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules \
|
||||
%{_bindir}/gtk-query-immodules-2.0 --update-cache \
|
||||
%endif
|
||||
|
||||
# On uninstall, update the cache. Note: we ignore upgrades (already
|
||||
@ -28,8 +28,8 @@ Requires(postun): gtk2
|
||||
%gtk2_immodule_postun \
|
||||
if [ $1 -eq 0 ]; then \
|
||||
%if "%_lib" == "lib64" \
|
||||
%{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules \
|
||||
%{_bindir}/gtk-query-immodules-2.0-64 --update-cache \
|
||||
%else \
|
||||
%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules \
|
||||
%{_bindir}/gtk-query-immodules-2.0 --update-cache \
|
||||
%endif \
|
||||
fi
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user