summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2008-01-26 13:27:26 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2008-01-26 13:27:26 +0000
commit3c3c8fe1fa3c27d3fbe63a9b94cd28ae5fe1bdfc (patch)
tree1cc9c3891ffcd3025d51ba194a4d559ec47a23fe /gnome-base/gconf/files
parentMoved autotools stuff to src_unpack, bug #207463, thank Diego Pettenò <flame... (diff)
downloadgentoo-2-3c3c8fe1fa3c27d3fbe63a9b94cd28ae5fe1bdfc.tar.gz
gentoo-2-3c3c8fe1fa3c27d3fbe63a9b94cd28ae5fe1bdfc.tar.bz2
gentoo-2-3c3c8fe1fa3c27d3fbe63a9b94cd28ae5fe1bdfc.zip
fix bug #207114 and clean up revision
(Portage version: 2.1.4)
Diffstat (limited to 'gnome-base/gconf/files')
-rw-r--r--gnome-base/gconf/files/digest-gconf-2.14.03
-rw-r--r--gnome-base/gconf/files/gconf-2.20.1-drop-gtk-doc.patch33
2 files changed, 33 insertions, 3 deletions
diff --git a/gnome-base/gconf/files/digest-gconf-2.14.0 b/gnome-base/gconf/files/digest-gconf-2.14.0
deleted file mode 100644
index 0be96ef76ea3..000000000000
--- a/gnome-base/gconf/files/digest-gconf-2.14.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d07c2efcaf477cf34225c604a04b6271 GConf-2.14.0.tar.bz2 1895477
-RMD160 4e281fc8046238df2056cbb1c1b068dc9663041b GConf-2.14.0.tar.bz2 1895477
-SHA256 040c512ebc39285bce78c177e9e434e7b6731fd53a001768ee3405a919837525 GConf-2.14.0.tar.bz2 1895477
diff --git a/gnome-base/gconf/files/gconf-2.20.1-drop-gtk-doc.patch b/gnome-base/gconf/files/gconf-2.20.1-drop-gtk-doc.patch
new file mode 100644
index 000000000000..62c2ef855169
--- /dev/null
+++ b/gnome-base/gconf/files/gconf-2.20.1-drop-gtk-doc.patch
@@ -0,0 +1,33 @@
+--- configure.in.old 2008-01-26 11:43:17.423830001 +0100
++++ configure.in 2008-01-26 11:44:23.137155036 +0100
+@@ -129,7 +129,12 @@
+ fi
+ fi
+
+-GTK_DOC_CHECK([1.0])
++dnl Crazy hack for dropping the dep on gtk-doc
++AC_DEFUN(GTK_DOC_CHECK, [])
++
++dnl Crazy hack for dropping the dep on gtk-doc
++AM_CONDITIONAL(ENABLE_GTK_DOC, 0, [])
++AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, 0, [])
+
+ AC_ARG_ENABLE(gtk,
+ AC_HELP_STRING([--enable-gtk],
+Index: Makefile.am
+===================================================================
+--- Makefile.am (révision 2495)
++++ Makefile.am (copie de travail)
+@@ -1,7 +1,11 @@
+
+-SUBDIRS = gconf backends po doc examples
++SUBDIRS = gconf backends po examples
+ DIST_SUBDIRS=tests $(SUBDIRS)
+
++if ENABLE_GTK_DOC
++SUBDIRS += doc
++endif
++
+ EXTRA_DIST = \
+ TODO \
+ gtk-doc.make \