Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10891
Modified Files:
gconf2.info gconf2.patch
Log Message:
new version
Index: gconf2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gconf2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gconf2.patch 15 Jul 2008 01:40:55 -0000 1.3
+++ gconf2.patch 14 Oct 2008 06:03:49 -0000 1.4
@@ -1,7 +1,19 @@
-diff -Nurd -x'*~' GConf-2.14.0.orig/gconf/gconf-internals.c
GConf-2.14.0/gconf/gconf-internals.c
---- GConf-2.14.0.orig/gconf/gconf-internals.c 2006-01-03 11:36:30.000000000
-0500
-+++ GConf-2.14.0/gconf/gconf-internals.c 2006-07-10 22:30:33.000000000
-0400
-@@ -2685,6 +2685,9 @@
+diff -Nurd -x'*~' GConf-2.24.0.orig/backends/Makefile.in
GConf-2.24.0/backends/Makefile.in
+--- GConf-2.24.0.orig/backends/Makefile.in 2008-09-22 14:03:50.000000000
-0400
++++ GConf-2.24.0/backends/Makefile.in 2008-10-14 01:29:46.000000000 -0400
+@@ -34,7 +34,7 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-noinst_PROGRAMS = xml-test$(EXEEXT)
++noinst_PROGRAMS =
+ bin_PROGRAMS = gconf-merge-tree$(EXEEXT)
+ subdir = backends
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+diff -Nurd -x'*~' GConf-2.24.0.orig/gconf/gconf-internals.c
GConf-2.24.0/gconf/gconf-internals.c
+--- GConf-2.24.0.orig/gconf/gconf-internals.c 2008-06-28 05:58:36.000000000
-0400
++++ GConf-2.24.0/gconf/gconf-internals.c 2008-10-14 01:03:28.000000000
-0400
+@@ -2618,6 +2618,9 @@
}
}
@@ -11,18 +23,3 @@
return lock;
}
-diff -Nurd -x'*~' GConf-2.14.0.orig/ltmain.sh GConf-2.14.0/ltmain.sh
---- GConf-2.14.0.orig/ltmain.sh 2006-03-11 13:49:04.000000000 -0500
-+++ GConf-2.14.0/ltmain.sh 2006-07-10 22:29:55.000000000 -0400
-@@ -4023,6 +4023,11 @@
- eval test_cmds=\"$archive_expsym_cmds\"
- cmds=$archive_expsym_cmds
- else
-+ if test "x$verstring" = "x0.0"; then
-+ tmp_verstring=
-+ else
-+ tmp_verstring="$verstring"
-+ fi
- eval test_cmds=\"$archive_cmds\"
- cmds=$archive_cmds
- fi
Index: gconf2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gconf2.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gconf2.info 15 Jul 2008 01:40:55 -0000 1.4
+++ gconf2.info 14 Oct 2008 06:03:49 -0000 1.5
@@ -1,68 +1,84 @@
Package: gconf2
-Version: 2.20.1
+Version: 2.24.0
Revision: 1
Depends: <<
%N-shlibs (>= %v-%r),
- atk1-shlibs (>= 1.20.0-1),
- glib2-shlibs (>= 2.14.0-1),
- gtk+2-shlibs (>= 2.12.0-1),
+ atk1-shlibs (>= 1.24.0-1),
+ cairo-shlibs (>= 1.8-1),
+ dbus-shlibs (>= 1.2.1-1),
+ expat1-shlibs,
+ fontconfig2-shlibs (>= 2.4.1-1),
+ freetype219-shlibs (>= 2.3.7-7),
+ glib2-shlibs (>= 2.18.0-1),
+ glitz-shlibs,
+ gtk+2-shlibs (>= 2.14.0-1),
libgettext3-shlibs,
libiconv,
+ libpng3-shlibs,
libxml2-shlibs (>= 2.6.30-1),
- orbit2 (>= 2.14.9-1),
- pango1-xft2-ft219-shlibs (>= 1.18.4-4),
+ orbit2 (>= 2.14.16-1),
+ pango1-xft2-ft219-shlibs (>= 1.22.0-4),
+ pixman-shlibs (>= 0.12.0-1),
x11-shlibs
<<
BuildDepends: <<
- atk1 (>= 1.20.0-1),
- cairo (>= 1.6-1),
+ atk1 (>= 1.24.0-1),
+ cairo (>= 1.8-1),
+ cyrus-sasl2-dev,
+ db44-aes | db44,
+ dbus-dev (>= 1.2.1-1),
expat1,
fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.5-1),
+ freetype219 (>= 2.3.7-7),
gettext-bin,
gettext-tools,
- glib2-dev (>= 2.14.0-1),
+ glib2-dev (>= 2.18.0-1),
glitz,
- gtk+2-dev (>= 2.12.0-1),
+ gtk+2-dev (>= 2.14.0-1),
gtk-doc (>= 1.8-1),
- intltool (>= 0.36.0-1),
- orbit2-dev (>= 2.14.9-1),
+ intltool40,
+ orbit2-dev (>= 2.14.16-1),
libgettext3-dev,
libiconv-dev,
libpng3,
libxml2 (>= 2.6.30-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
- pixman (>= 0.10.0-1),
- pkgconfig (>= 0.21-1),
+ openldap23-dev (>= 2.3.40-1),
+ pango1-xft2-ft219-dev (>= 1.22.0-4),
+ pixman (>= 0.12.0-1),
+ pkgconfig (>= 0.23),
+ system-openssl-dev,
x11-dev,
xft2-dev
<<
-Source: mirror:gnome:sources/GConf/2.20/GConf-%v.tar.bz2
-Source-MD5: 646fc896c6282a8f103365af0fa2e303
+Source: mirror:gnome:sources/GConf/2.24/GConf-%v.tar.bz2
+Source-MD5: 4971d96f5ba94fe4a69396267bd5afe8
PatchFile: %n.patch
-PatchFile-MD5: 7c7a541b9a128eb9cfaaed18a02ead83
-NoSetCPPFLAGS: true
-SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -I%p/include
-I%p/include/sys
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
-SetLIBS: -L%p/lib
+PatchFile-MD5: 51fe515030c680574598a90699b8ac7c
+SetCPPFLAGS: -I%p/lib/fontconfig2/include
+SetLDFLAGS: -L%p/lib/fontconfig2/lib -L%p/lib/system-openssl/lib
SetCFLAGS: -Os
-SetCXXFLAGS: -Os
-ConfigureParams: --mandir=%p/share/man --libexecdir=%p/lib/%n --disable-debug
--disable-dependency-tracking --enable-gtk-doc --enable-gtk
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+ConfigureParams: --mandir=%p/share/man --libexecdir=%p/lib/%n --disable-debug
--disable-dependency-tracking --disable-static --disable-gtk-doc --enable-gtk
--disable-defaults-service
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
CompileScript: <<
- PERL=/usr/bin/perl ac_cv_header_ldap_h=no ac_cv_lib_ldap_ldap_init=no
./configure %c
+ PERL=/usr/bin/perl ./configure %c
make
<<
-InstallScript: make -j1 install DESTDIR=%d
+InstallScript: <<
+ make -j1 install DESTDIR=%d
+ perl -pi -e 's,-L%p/lib/system-openssl/lib,,' %i/lib/libgconf-2.la
+<<
SplitOff: <<
Package: %N-shlibs
Depends: <<
- glib2-shlibs (>= 2.14.0-1),
+ cyrus-sasl2-shlibs,
+ db44-aes-shlibs | db44-shlibs,
+ dbus-shlibs (>= 1.2.1-1),
+ glib2-shlibs (>= 2.18.0-1),
libgettext3-shlibs,
libiconv,
libxml2-shlibs (>= 2.6.30-1),
- orbit2-shlibs (>= 2.14.9-1)
+ openldap23-shlibs (>= 2.3.40-1),
+ orbit2-shlibs (>= 2.14.16-1)
<<
Files: <<
lib/libgconf-2.*.dylib
@@ -117,11 +133,14 @@
ior was written in lockfile.
<<
DescPackaging: <<
- Disabling ldap/sasl so we don't have to be in section:crypto
-
gconf.h may include popt.h if it exists, but does nothing with
it and there is no use of libpopt, so no reason to depend on
the popt packages
+
+ defaults-service requires polkit; disable so we get consistent
+ build even if fink eventually gets a polkit package.
+
+ Disable xml-test because it tries to link against a .so
<<
License: LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
