added patch for xmlcatalog

4 files changed, 36 insertions, 9 deletions

diff --git a/gnome-base/libglade/ChangeLog b/gnome-base/libglade/ChangeLog
index c95767c60b81..0febc4632632 100644
--- a/gnome-base/libglade/ChangeLog
+++ b/gnome-base/libglade/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/libglade
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.25 2003/08/29 20:28:25 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.26 2003/09/10 05:40:02 obz Exp $
+
+  10 Sep 2003; Mike Gardiner <obz@gentoo.org> libglade-2.0.1.ebuild,
+  files/Makefile.in.am-xmlcatalog.patch:
+  Added a patch to disable xmlcatalog, re bug: #26216
 
   29 Aug 2003; Alastair Tse <liquidx@gentoo.org> libglade-2.0.0.ebuild,
   libglade-2.0.1.ebuild:
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index 028f36bcd4a8..d7676533ad4f 100644
--- a/gnome-base/libglade/Manifest
+++ b/gnome-base/libglade/Manifest
@@ -1,11 +1,12 @@
-MD5 23a2b527397ab1398605cd69f78bdc76 ChangeLog 4196
+MD5 0ec8160db2ae441ced3aa7de4b421e63 libglade-2.0.1.ebuild 1469
 MD5 ea3320317ec7d39249c7024522b8ba17 libglade-0.17-r6.ebuild 1449
-MD5 e640da1a8e06d1615f91b71f4f277006 libglade-2.0.0-r1.ebuild 1441
 MD5 77982f0cb81b438a101f1ea6ce2e71d7 libglade-2.0.0.ebuild 1871
-MD5 5dcfeafb597c780eeda30c1c1e6d529a libglade-2.0.1.ebuild 1462
+MD5 e640da1a8e06d1615f91b71f4f277006 libglade-2.0.0-r1.ebuild 1441
+MD5 19d333e5456bcb6b9a973037c50a8717 ChangeLog 4357
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 27fc8beb290edf4dc9fcdc7327a2d5d5 files/Makefile.in-0.patch 446
-MD5 6876e5db1b80846b82a289a82b44408b files/digest-libglade-0.17-r6 65
 MD5 eedbc07c448a767187689677aa16a8c0 files/digest-libglade-2.0.0 67
-MD5 eedbc07c448a767187689677aa16a8c0 files/digest-libglade-2.0.0-r1 67
 MD5 77fafb164d53dc862957a5bd2b7511e4 files/digest-libglade-2.0.1 67
+MD5 6876e5db1b80846b82a289a82b44408b files/digest-libglade-0.17-r6 65
+MD5 eedbc07c448a767187689677aa16a8c0 files/digest-libglade-2.0.0-r1 67
+MD5 ba2eb9b8a5caed325917e267ef33d8ac files/Makefile.in.am-xmlcatalog.patch 958
+MD5 27fc8beb290edf4dc9fcdc7327a2d5d5 files/Makefile.in-0.patch 446
diff --git a/gnome-base/libglade/files/Makefile.in.am-xmlcatalog.patch b/gnome-base/libglade/files/Makefile.in.am-xmlcatalog.patch
new file mode 100644
index 000000000000..32dabef5558f
--- /dev/null
+++ b/gnome-base/libglade/files/Makefile.in.am-xmlcatalog.patch
@@ -0,0 +1,22 @@
+--- Makefile.am.old	2003-09-10 13:29:00.194074192 +0800
++++ Makefile.am	2003-09-10 13:29:19.210183304 +0800
+@@ -25,7 +25,7 @@
+ xml_DATA = glade-2.0.dtd
+ 
+ install-data-local:
+-	-xmlcatalog --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XMLCATALOG)
++#	-xmlcatalog --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XMLCATALOG)
+ uninstall-local:
+ 	-xmlcatalog --noout --del $(xmldir)/glade-2.0.dtd $(XMLCATALOG)
+ 
+--- Makefile.in.old	2003-09-10 13:29:04.892359944 +0800
++++ Makefile.in	2003-09-10 13:29:27.490924440 +0800
+@@ -636,7 +636,7 @@
+ 
+ 
+ install-data-local:
+-	-xmlcatalog --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XMLCATALOG)
++#	-xmlcatalog --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XMLCATALOG)
+ uninstall-local:
+ 	-xmlcatalog --noout --del $(xmldir)/glade-2.0.dtd $(XMLCATALOG)
+ 
diff --git a/gnome-base/libglade/libglade-2.0.1.ebuild b/gnome-base/libglade/libglade-2.0.1.ebuild
index 2f4cdb7c54f7..db1341a00e70 100644
--- a/gnome-base/libglade/libglade-2.0.1.ebuild
+++ b/gnome-base/libglade/libglade-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.0.1.ebuild,v 1.13 2003/09/06 23:51:37 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.0.1.ebuild,v 1.14 2003/09/10 05:40:02 obz Exp $
 
 IUSE="doc nls"
 
@@ -32,7 +32,7 @@ DEPEND=">=dev-util/pkgconfig-0.12.0
 
 src_compile() {
 	## patch for xml stuff
-	patch -p0 < ${FILESDIR}/Makefile.in-0.patch
+	patch -p0 < ${FILESDIR}/Makefile.in.am-xmlcatalog.patch
 	gnome2_src_configure
 	emake || die "die a horrible death"
 }