Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27313/10.3/unstable/main/finkinfo/gnome
Modified Files:
libgdome0.info libgdome0.patch
Log Message:
Don't require glib(1) for this glib(2) package.
Index: libgdome0.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/libgdome0.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libgdome0.info 8 Mar 2006 22:56:27 -0000 1.3
+++ libgdome0.info 30 Mar 2006 07:45:53 -0000 1.4
@@ -34,7 +34,9 @@
over instead of trying to patch it.
Make sure to find pkg-config before trying to use it, and clarify
- diagnostics about what glib is being checked.
+ diagnostics about what glib is being checked. Rip out glib1 detection
+ (configure is regenerated from configure.in, and keeping it would mean
+ we'd need BuildDepends:glib in order to get AM_PATH_GLIB)
Don't put a .c's private variable in its .h file.
<<
Index: libgdome0.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/libgdome0.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libgdome0.patch 17 Mar 2006 15:21:18 -0000 1.2
+++ libgdome0.patch 30 Mar 2006 07:45:53 -0000 1.3
@@ -1,23 +1,33 @@
diff -Nurd -x'*~' gdome2-0.8.1.orig/configure.in gdome2-0.8.1/configure.in
--- gdome2-0.8.1.orig/configure.in 2003-10-05 10:39:27.000000000 -0400
-+++ gdome2-0.8.1/configure.in 2006-03-03 18:04:11.000000000 -0500
-@@ -62,6 +62,7 @@
- [ --enable-glib-1=[no] Specify if you want to use
glib 1],
- GLIB_1=yes
- )
++++ gdome2-0.8.1/configure.in 2006-03-30 02:37:37.000000000 -0500
+@@ -57,24 +57,12 @@
+ dnl find glib
+ dnl
+
+-GLIB_1="no"
+-AC_ARG_ENABLE(glib-1,
+- [ --enable-glib-1=[no] Specify if you want to use
glib 1],
+- GLIB_1=yes
+-)
+PKG_PROG_PKG_CONFIG()
- if test "x$GLIB_1" = "xyes"
- then
-@@ -73,7 +74,7 @@
+-if test "x$GLIB_1" = "xyes"
+-then
+- PKG_CHECK_MODULES(GLIB, glib)
+- GLIB_REQUIRED="glib"
+- GLIB_MIN_VERSION=1.2.10
+- AM_PATH_GLIB($GLIB_MIN_VERSION,,AC_MSG_ERROR(Could not find GLIB (see
config.log for details).))
+-else
PKG_CHECK_MODULES(GLIB, glib-2.0)
GLIB_REQUIRED="glib-2.0"
GLIB_MIN_VERSION=2.2.0
- AM_PATH_GLIB_2_0($GLIB_MIN_VERSION,,AC_MSG_ERROR(Could not find GLIB
(see config.log for details).))
+-fi
+ AM_PATH_GLIB_2_0($GLIB_MIN_VERSION,,AC_MSG_ERROR(Could not find GLIB2
(see config.log for details).))
- fi
AC_SUBST(GLIB_MIN_VERSION)
AC_SUBST(GLIB_LIBS)
+ AC_SUBST(GLIB_REQUIRED)
diff -Nurd -x'*~' gdome2-0.8.1.orig/gtk-doc/Makefile.am
gdome2-0.8.1/gtk-doc/Makefile.am
--- gdome2-0.8.1.orig/gtk-doc/Makefile.am 2002-04-04 01:58:04.000000000
-0500
+++ gdome2-0.8.1/gtk-doc/Makefile.am 2006-03-03 18:24:03.000000000 -0500
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
