This commit is contained in:
parent
3d1502df6d
commit
a3ba3139a3
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 26 18:55:40 CET 2007 - sbrabec@suse.cz
|
||||
|
||||
- Fixed gtk64.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 16 12:05:17 CST 2007 - maw@suse.de
|
||||
|
||||
|
@ -23,7 +23,7 @@ Group: System/Libraries
|
||||
Autoreqprov: on
|
||||
PreReq: /usr/bin/touch /bin/rm /bin/rmdir
|
||||
Version: 2.10.9
|
||||
Release: 1
|
||||
Release: 3
|
||||
Summary: Library for Creation of Graphical User Interfaces
|
||||
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.10/%{_name}-%{version}.tar.bz2
|
||||
Source1: SuSEconfig.gtk2
|
||||
@ -335,6 +335,8 @@ fi
|
||||
%{_datadir}/gtk-doc/html/*
|
||||
|
||||
%changelog
|
||||
* Mon Feb 26 2007 - sbrabec@suse.cz
|
||||
- Fixed gtk64.patch.
|
||||
* Fri Feb 16 2007 - maw@suse.de
|
||||
- Update to 2.10.9
|
||||
- Remove gtk2-pa.patch, gtk-pixbuf-226710.patch which are now
|
||||
|
50
gtk64.patch
50
gtk64.patch
@ -1,5 +1,5 @@
|
||||
--- gtk+-2.10.6/demos/Makefile.am
|
||||
+++ gtk+-2.10.6/demos/Makefile.am
|
||||
--- gtk+-2.10.9/demos/Makefile.am
|
||||
+++ gtk+-2.10.9/demos/Makefile.am
|
||||
@@ -38,8 +38,8 @@
|
||||
pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
|
||||
pixbuf_csource_deps=
|
||||
@ -11,8 +11,8 @@
|
||||
endif
|
||||
|
||||
test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
|
||||
--- gtk+-2.10.6/gdk-pixbuf/Makefile.am
|
||||
+++ gtk+-2.10.6/gdk-pixbuf/Makefile.am
|
||||
--- gtk+-2.10.9/gdk-pixbuf/Makefile.am
|
||||
+++ gtk+-2.10.9/gdk-pixbuf/Makefile.am
|
||||
@@ -359,7 +359,7 @@
|
||||
gdk-pixbuf-enum-types.c \
|
||||
gdk-pixbuf-marshal.h \
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
#
|
||||
# gdk-pixbuf-enum-types.h
|
||||
@@ -467,10 +467,10 @@
|
||||
@@ -454,10 +454,10 @@
|
||||
install-data-hook: install-ms-lib install-def-file
|
||||
@if $(RUN_QUERY_LOADER_TEST) ; then \
|
||||
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
|
||||
@ -35,7 +35,7 @@
|
||||
echo "***" ; \
|
||||
echo "*** Generate this file manually on host" ; \
|
||||
echo "*** system using gdk-pixbuf-query-loaders" ; \
|
||||
@@ -478,25 +478,25 @@
|
||||
@@ -465,25 +465,25 @@
|
||||
fi
|
||||
|
||||
uninstall-local: uninstall-ms-lib uninstall-def-file
|
||||
@ -68,8 +68,8 @@
|
||||
- touch gdk-pixbuf.loaders;
|
||||
+ touch gdk-pixbuf64.loaders;
|
||||
endif
|
||||
--- gtk+-2.10.6/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
+++ gtk+-2.10.6/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
--- gtk+-2.10.9/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
+++ gtk+-2.10.9/gdk-pixbuf/gdk-pixbuf-io.c
|
||||
@@ -258,7 +258,7 @@
|
||||
{
|
||||
/* This is an entry put there by gdk-pixbuf-query-loaders on the
|
||||
@ -88,8 +88,8 @@
|
||||
|
||||
return result;
|
||||
}
|
||||
--- gtk+-2.10.6/gtk/Makefile.am
|
||||
+++ gtk+-2.10.6/gtk/Makefile.am
|
||||
--- gtk+-2.10.9/gtk/Makefile.am
|
||||
+++ gtk+-2.10.9/gtk/Makefile.am
|
||||
@@ -842,7 +842,7 @@
|
||||
|
||||
DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)
|
||||
@ -99,17 +99,17 @@
|
||||
|
||||
LDADDS = \
|
||||
$(gtktargetlib) \
|
||||
@@ -1117,7 +1117,7 @@
|
||||
|
||||
gtkbuiltincache.h: @REBUILD@ stamp-icons
|
||||
$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
|
||||
@@ -1119,7 +1119,7 @@
|
||||
gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
|
||||
else
|
||||
gtk_update_icon_cache_program = \
|
||||
- GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \
|
||||
+ GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf64.loaders \
|
||||
./gtk-update-icon-cache --force --ignore-theme-index \
|
||||
--source builtin_icons stock-icons > gtkbuiltincache.h
|
||||
./gtk-update-icon-cache
|
||||
endif
|
||||
|
||||
--- gtk+-2.10.6/gtk/gtkmodules.c
|
||||
+++ gtk+-2.10.6/gtk/gtkmodules.c
|
||||
--- gtk+-2.10.9/gtk/gtkmodules.c
|
||||
+++ gtk+-2.10.9/gtk/gtkmodules.c
|
||||
@@ -69,7 +69,7 @@
|
||||
if (home_dir)
|
||||
home_gtk_dir = g_build_filename (home_dir, ".gtk-2.0", NULL);
|
||||
@ -119,8 +119,8 @@
|
||||
exe_prefix = g_getenv ("GTK_EXE_PREFIX");
|
||||
|
||||
if (exe_prefix)
|
||||
--- gtk+-2.10.6/gtk/gtkrc.c
|
||||
+++ gtk+-2.10.6/gtk/gtkrc.c
|
||||
--- gtk+-2.10.9/gtk/gtkrc.c
|
||||
+++ gtk+-2.10.9/gtk/gtkrc.c
|
||||
@@ -447,7 +447,7 @@
|
||||
if (im_module_file)
|
||||
result = g_strdup (im_module_file);
|
||||
@ -130,9 +130,9 @@
|
||||
}
|
||||
|
||||
return result;
|
||||
--- gtk+-2.10.6/modules/input/Makefile.am
|
||||
+++ gtk+-2.10.6/modules/input/Makefile.am
|
||||
@@ -102,11 +102,11 @@
|
||||
--- gtk+-2.10.9/modules/input/Makefile.am
|
||||
+++ gtk+-2.10.9/modules/input/Makefile.am
|
||||
@@ -107,11 +107,11 @@
|
||||
@if $(RUN_QUERY_IMMODULES_TEST) ; then \
|
||||
echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
|
||||
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
|
||||
@ -147,7 +147,7 @@
|
||||
echo "***" ; \
|
||||
echo "*** Generate this file manually on host" ; \
|
||||
echo "*** system using gtk-query-immodules-2.0" ; \
|
||||
@@ -114,7 +114,7 @@
|
||||
@@ -119,7 +119,7 @@
|
||||
fi
|
||||
|
||||
uninstall-local:
|
||||
@ -156,7 +156,7 @@
|
||||
|
||||
module_LTLIBRARIES = \
|
||||
$(IM_XIM_MODULE) \
|
||||
@@ -129,12 +129,12 @@
|
||||
@@ -134,12 +134,12 @@
|
||||
im-viqr.la \
|
||||
$(IM_IME_MODULE)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user