summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2009-03-18 23:59:37 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2009-03-18 23:59:37 +0000
commitf4fa6ed6fb5d64087dc9998b8fcc5cb9e64d5701 (patch)
treea7a396df3eaa7415a4e8691eaba1a0b915044f4c /gnome-base/libglade/files
parentmaxima no longer installs imaxima - there is a separate package (bug #260663,... (diff)
downloadgentoo-2-f4fa6ed6fb5d64087dc9998b8fcc5cb9e64d5701.tar.gz
gentoo-2-f4fa6ed6fb5d64087dc9998b8fcc5cb9e64d5701.tar.bz2
gentoo-2-f4fa6ed6fb5d64087dc9998b8fcc5cb9e64d5701.zip
Bump to 2.6.4. Code cleanup and build fixes for single includes.
(Portage version: 2.2_rc25/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/libglade/files')
-rw-r--r--gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch10
-rw-r--r--gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch4
2 files changed, 6 insertions, 8 deletions
diff --git a/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch b/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch
index 4cf6a0170c2e..059cdc20f794 100644
--- a/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch
+++ b/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch
@@ -1,6 +1,5 @@
-diff -ur libglade-2.4.1/Makefile.am libglade-2.4.1-patched/Makefile.am
---- libglade-2.4.1/Makefile.am 2004-11-11 18:56:13.000000000 +0800
-+++ libglade-2.4.1-patched/Makefile.am 2004-12-06 11:00:24.501734048 +0800
+--- a/Makefile.am 2004-11-11 18:56:13.000000000 +0800
++++ b/Makefile.am 2004-12-06 11:00:24.501734048 +0800
@@ -24,7 +24,7 @@
if HAVE_XMLCATALOG
@@ -10,9 +9,8 @@ diff -ur libglade-2.4.1/Makefile.am libglade-2.4.1-patched/Makefile.am
uninstall-local:
-$(XMLCATALOG) --noout --del $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
endif
-diff -ur libglade-2.4.1/Makefile.in libglade-2.4.1-patched/Makefile.in
---- libglade-2.4.1/Makefile.in 2004-11-11 19:21:38.000000000 +0800
-+++ libglade-2.4.1-patched/Makefile.in 2004-12-06 11:00:49.786890120 +0800
+--- a/Makefile.in 2004-11-11 19:21:38.000000000 +0800
++++ b/Makefile.in 2004-12-06 11:00:49.786890120 +0800
@@ -819,7 +819,7 @@
diff --git a/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch b/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch
index c26ff83d9c15..37c5b69e544c 100644
--- a/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch
+++ b/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch
@@ -1,5 +1,5 @@
---- tests/test-libglade-gtk.glade.orig 2008-09-27 16:50:40.164242312 +0300
-+++ tests/test-libglade-gtk.glade 2008-09-27 16:50:43.460908927 +0300
+--- a/tests/test-libglade-gtk.glade 2008-09-27 16:50:40.164242312 +0300
++++ b/tests/test-libglade-gtk.glade 2008-09-27 16:50:43.460908927 +0300
@@ -470,7 +470,7 @@
<upper>100</upper>
<step>1</step>