Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2983/10.4-transitional/unstable/main/finkinfo/gnome
Modified Files:
gconf2.info gconf2.patch
Log Message:
New version.
Index: gconf2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/gconf2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gconf2.patch 19 Jun 2005 02:31:24 -0000 1.2
+++ gconf2.patch 6 Sep 2005 16:52:07 -0000 1.3
@@ -1,7 +1,226 @@
-diff -Naur GConf-2.10.1-old/doc/gconf/Makefile.in
GConf-2.10.1/doc/gconf/Makefile.in
---- GConf-2.10.0-old/doc/gconf/Makefile.in 2004-04-19 08:12:05.000000000
-0400
-+++ GConf-2.10.0/doc/gconf/Makefile.in 2005-06-09 06:31:22.000000000 -0400
-@@ -236,7 +236,7 @@
+diff -Nurd -x'*~' GConf-2.12.0.orig/configure GConf-2.12.0/configure
+--- GConf-2.12.0.orig/configure 2005-09-06 05:05:57.000000000 -0400
++++ GConf-2.12.0/configure 2005-09-06 12:36:39.000000000 -0400
+@@ -21437,215 +21437,6 @@
+
+
+ LDAP_LIBS=
+-if test "${ac_cv_header_ldap_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for ldap.h" >&5
+-echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6
+-if test "${ac_cv_header_ldap_h+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_ldap_h" >&5
+-echo "${ECHO_T}$ac_cv_header_ldap_h" >&6
+-else
+- # Is the header compilable?
+-echo "$as_me:$LINENO: checking ldap.h usability" >&5
+-echo $ECHO_N "checking ldap.h usability... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <ldap.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_header_compiler=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
+-
+-# Is the header present?
+-echo "$as_me:$LINENO: checking ldap.h presence" >&5
+-echo $ECHO_N "checking ldap.h presence... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <ldap.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: ldap.h: accepted by the compiler,
rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: ldap.h: accepted by the compiler, rejected by the
preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: ldap.h: proceeding with the compiler's
result" >&5
+-echo "$as_me: WARNING: ldap.h: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: ldap.h: present but cannot be compiled"
>&5
+-echo "$as_me: WARNING: ldap.h: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: ldap.h: check for missing
prerequisite headers?" >&5
+-echo "$as_me: WARNING: ldap.h: check for missing prerequisite headers?"
>&2;}
+- { echo "$as_me:$LINENO: WARNING: ldap.h: see the Autoconf documentation"
>&5
+-echo "$as_me: WARNING: ldap.h: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: ldap.h: section \"Present But Cannot
Be Compiled\"" >&5
+-echo "$as_me: WARNING: ldap.h: section \"Present But Cannot Be
Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: ldap.h: proceeding with the
preprocessor's result" >&5
+-echo "$as_me: WARNING: ldap.h: proceeding with the preprocessor's result"
>&2;}
+- { echo "$as_me:$LINENO: WARNING: ldap.h: in the future, the compiler will
take precedence" >&5
+-echo "$as_me: WARNING: ldap.h: in the future, the compiler will take
precedence" >&2;}
+- (
+- cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists. ##
+-## ------------------------------------------ ##
+-_ASBOX
+- ) |
+- sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-echo "$as_me:$LINENO: checking for ldap.h" >&5
+-echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6
+-if test "${ac_cv_header_ldap_h+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_cv_header_ldap_h=$ac_header_preproc
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_ldap_h" >&5
+-echo "${ECHO_T}$ac_cv_header_ldap_h" >&6
+-
+-fi
+-if test $ac_cv_header_ldap_h = yes; then
+-
+- echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
+-echo $ECHO_N "checking for ldap_init in -lldap... $ECHO_C" >&6
+-if test "${ac_cv_lib_ldap_ldap_init+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lldap $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char ldap_init ();
+-int
+-main ()
+-{
+-ldap_init ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_ldap_ldap_init=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_ldap_ldap_init=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_ldap_ldap_init" >&6
+-if test $ac_cv_lib_ldap_ldap_init = yes; then
+- LDAP_LIBS="-lldap"
+-fi
+-
+-
+-fi
+
+
+
+diff -Nurd -x'*~' GConf-2.12.0.orig/doc/gconf/Makefile.in
GConf-2.12.0/doc/gconf/Makefile.in
+--- GConf-2.12.0.orig/doc/gconf/Makefile.in 2005-09-06 05:05:54.000000000
-0400
++++ GConf-2.12.0/doc/gconf/Makefile.in 2005-09-06 12:35:43.000000000 -0400
+@@ -242,7 +242,7 @@
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
@@ -10,10 +229,10 @@
GTKDOC_LIBS = $(LDFLAGS) $(DEPENDENT_LIBS)
$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
@[EMAIL PROTECTED] = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-diff -Naur GConf-2.10.0-old/gconf/Makefile.in GConf-2.10.0/gconf/Makefile.in
---- GConf-2.10.0-old/gconf/Makefile.in 2004-04-19 08:11:03.000000000 -0400
-+++ GConf-2.10.0/gconf/Makefile.in 2005-06-09 06:31:22.000000000 -0400
-@@ -256,7 +256,7 @@
+diff -Nurd -x'*~' GConf-2.12.0.orig/gconf/Makefile.in
GConf-2.12.0/gconf/Makefile.in
+--- GConf-2.12.0.orig/gconf/Makefile.in 2005-09-06 05:05:55.000000000
-0400
++++ GConf-2.12.0/gconf/Makefile.in 2005-09-06 12:35:43.000000000 -0400
+@@ -263,7 +263,7 @@
gconfd.c
@@ -22,7 +241,7 @@
# gconf_testclient_SOURCES = \
-@@ -267,7 +267,7 @@
+@@ -274,13 +274,13 @@
gconftool.c
@@ -31,19 +250,17 @@
gconf_sanity_check_2_SOURCES = \
gconf-sanity-check.c
-@@ -273,7 +273,7 @@
- gconf-sanity-check.c
-gconf_sanity_check_2_LDADD = $(EFENCE) $(INTLLIBS)
$(DEPENDENT_WITH_XML_AND_GTK_LIBS) $(POPT_LIBS) libgconf-$(MAJOR_VERSION).la
+gconf_sanity_check_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE)
$(INTLLIBS) $(DEPENDENT_WITH_XML_AND_GTK_LIBS) $(POPT_LIBS)
- libgconf_2_la_SOURCES = \
- gconf-internals.c \
-diff -Naur GConf-2.10.-old/gconf/gconf-internals.c
GConf-2.10.0/gconf/gconf-internals.c
---- GConf-2.10.0-old/gconf/gconf-internals.c 2004-04-19 06:08:20.000000000
-0400
-+++ GConf-2.10.0/gconf/gconf-internals.c 2005-06-09 06:31:22.000000000
-0400
-@@ -2606,6 +2606,9 @@
+ @[EMAIL PROTECTED] = dllmain.c
+
+diff -Nurd -x'*~' GConf-2.12.0.orig/gconf/gconf-internals.c
GConf-2.12.0/gconf/gconf-internals.c
+--- GConf-2.12.0.orig/gconf/gconf-internals.c 2005-06-13 08:04:37.000000000
-0400
++++ GConf-2.12.0/gconf/gconf-internals.c 2005-09-06 12:35:43.000000000
-0400
+@@ -2715,6 +2715,9 @@
}
}
@@ -53,10 +270,10 @@
return lock;
}
-diff -Naur GConf-2.10.0-old/ltmain.sh GConf-2.10.0/ltmain.sh
---- GConf-2.10.0-old/ltmain.sh 2004-04-19 08:03:11.000000000 -0400
-+++ GConf-2.10.0/ltmain.sh 2005-06-09 06:31:22.000000000 -0400
-@@ -3845,6 +3845,11 @@
+diff -Nurd -x'*~' GConf-2.12.0.orig/ltmain.sh GConf-2.12.0/ltmain.sh
+--- GConf-2.12.0.orig/ltmain.sh 2005-06-28 10:33:00.000000000 -0400
++++ GConf-2.12.0/ltmain.sh 2005-09-06 12:35:43.000000000 -0400
+@@ -3883,6 +3883,11 @@
eval test_cmds=\"$archive_expsym_cmds\"
cmds=$archive_expsym_cmds
else
Index: gconf2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/gconf2.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gconf2.info 20 Jul 2005 16:28:10 -0000 1.5
+++ gconf2.info 6 Sep 2005 16:52:07 -0000 1.6
@@ -1,10 +1,10 @@
Package: gconf2
-Version: 2.10.1
+Version: 2.12.0
Revision: 1
-Depends: %N-shlibs (>= %v-%r), atk1-shlibs (>= 1.10.1-1), libgettext3-shlibs,
glib2 (>= 2.6.5-1), libiconv, libxml2-shlibs (>= 2.6.17-1), orbit2 (>=
2.12.2-1), x11, popt-shlibs (>= 1.7-5)
-BuildDepends: glib2-dev (>= 2.6.5-1), atk1 (>= 1.10.1-1), pango1-xft2-dev (>=
1.4.0-1), gtk+2-dev (>= 2.6.8-1), gtk+2 (>= 2.6.8-1), orbit2-dev (>= 2.12.2-1),
libxml2 (>= 2.6.17-1), gtk-doc (>= 1.2-1), pkgconfig, libgettext3-dev,
gettext-bin, gettext-tools, libiconv-dev, x11-dev, popt (>= 1.7-5)
-Source: mirror:gnome:sources/GConf/2.10/GConf-%v.tar.bz2
-Source-MD5: c411bd6e9e25362ea613bb9a084be904
+Depends: %N-shlibs (>= %v-%r), atk1-shlibs (>= 1.10.1-1), libgettext3-shlibs,
glib2 (>= 2.7.0-1), libiconv, libxml2-shlibs (>= 2.6.17-1), orbit2 (>=
2.12.2-1), x11, popt-shlibs (>= 1.7-5)
+BuildDepends: glib2-dev (>= 2.7.0-1), atk1 (>= 1.10.1-1), pango1-xft2-dev (>=
1.4.0-1), gtk+2-dev (>= 2.6.8-1), gtk+2 (>= 2.6.8-1), orbit2-dev (>= 2.12.2-1),
libxml2 (>= 2.6.17-1), gtk-doc (>= 1.2-1), pkgconfig, libgettext3-dev,
gettext-bin, gettext-tools, libiconv-dev, x11-dev, popt (>= 1.7-5)
+Source: mirror:gnome:sources/GConf/2.12/GConf-%v.tar.bz2
+Source-MD5: e674d838922a9e9de0cee9fd2ef1ea0c
Patch: %n.patch
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
@@ -15,7 +15,7 @@
InstallScript: make install DESTDIR=%d
SplitOff: <<
Package: %N-shlibs
- Depends: atk1-shlibs (>= 1.10.1-1), libgettext3-shlibs, glib2-shlibs (>=
2.6.5-1), libiconv, libxml2-shlibs (>= 2.6.17-1), orbit2-shlibs (>= 2.12.2-1),
popt-shlibs (>= 1.7-5)
+ Depends: atk1-shlibs (>= 1.10.1-1), libgettext3-shlibs, glib2-shlibs (>=
2.7.0-1), libiconv, libxml2-shlibs (>= 2.6.17-1), orbit2-shlibs (>= 2.12.2-1),
popt-shlibs (>= 1.7-5)
Files: <<
lib/libgconf-2.*.dylib
lib/GConf
@@ -29,7 +29,7 @@
DescPackaging: <<
Uses pkgconfig to allow other packages to link against this one.
Any package which BuildDepends on this one must also BuildDepend on:
- glib2-dev (>= 2.6.5-1), glib2 (>= 2.6.5-1), orbit2-dev (>= 2.12.2-1)
+ glib2-dev (>= 2.7.0-1), glib2 (>= 2.7.0-1), orbit2-dev (>= 2.12.2-1)
<<
BuildDependsOnly: True
Files: <<
@@ -52,6 +52,9 @@
Patched gconf_get_lock_or_current_holder() to call sync() after
ior was written in lockfile.
<<
+DescPackaging: <<
+ Disabling ldap/sasl so we don't have to be in section:crypto
+<<
License: LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Homepage: http://www.gnome.org/
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
