Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15208
Modified Files:
libgda.info libgda.patch
Log Message:
new version; apply patches to autotools templates so that they actually get
used; add BDep on autotools so that they actually exist
Index: libgda.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libgda.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- libgda.patch 11 Sep 2009 06:55:02 -0000 1.8
+++ libgda.patch 11 Oct 2009 16:58:29 -0000 1.9
@@ -1,18 +1,18 @@
-diff -Nurd -x'*~' libgda-4.0.4.orig/configure libgda-4.0.4/configure
---- libgda-4.0.4.orig/configure 2009-08-30 06:45:08.000000000 -0400
-+++ libgda-4.0.4/configure 2009-09-11 02:24:25.000000000 -0400
-@@ -20671,7 +20671,7 @@
- #define HAVE_CARBON 1
- _ACEOF
-
+diff -Nurd -x'*~' libgda-4.0.5.orig/configure.in libgda-4.0.5/configure.in
+--- libgda-4.0.5.orig/configure.in 2009-10-10 08:24:13.000000000 -0400
++++ libgda-4.0.5/configure.in 2009-10-11 12:40:11.000000000 -0400
+@@ -180,7 +180,7 @@
+ LIBTOOL_EXPORT_OPTIONS=$EXPORT_SYM_REGEX
+ LIBTOOL_PROV_EXPORT_OPTIONS=$EXPORT_PROV_SYM_REGEX
+ AC_DEFINE(HAVE_CARBON)
- LIBGDA_LIBS="$LIBGDA_LIBS -framework Carbon"
+ LIBGDA_LIBS="$LIBGDA_LIBS -Wl,-framework,Carbon"
- ;;
+ dnl SO_SUFFIX=dylib
+ ;;
*)
- { $as_echo "$as_me:$LINENO: result: Unix" >&5
-diff -Nurd -x'*~'
libgda-4.0.4.orig/libgda-report/RML/gda-report-rml-document.c
libgda-4.0.4/libgda-report/RML/gda-report-rml-document.c
---- libgda-4.0.4.orig/libgda-report/RML/gda-report-rml-document.c
2009-07-05 15:27:21.000000000 -0400
-+++ libgda-4.0.4/libgda-report/RML/gda-report-rml-document.c 2009-09-11
02:17:58.000000000 -0400
+diff -Nurd -x'*~'
libgda-4.0.5.orig/libgda-report/RML/gda-report-rml-document.c
libgda-4.0.5/libgda-report/RML/gda-report-rml-document.c
+--- libgda-4.0.5.orig/libgda-report/RML/gda-report-rml-document.c
2009-07-05 15:27:21.000000000 -0400
++++ libgda-4.0.5/libgda-report/RML/gda-report-rml-document.c 2009-10-11
12:39:02.000000000 -0400
@@ -198,7 +198,7 @@
if (!converter) {
converter = g_find_program_in_path ("trml2html.py");
@@ -31,34 +31,32 @@
if (!g_file_test (converter,
G_FILE_TEST_IS_EXECUTABLE)) {
g_free (converter);
converter = NULL;
-diff -Nurd -x'*~' libgda-4.0.4.orig/libgda-report/RML/trml2html/Makefile.in
libgda-4.0.4/libgda-report/RML/trml2html/Makefile.in
---- libgda-4.0.4.orig/libgda-report/RML/trml2html/Makefile.in 2009-08-30
14:59:25.000000000 -0400
-+++ libgda-4.0.4/libgda-report/RML/trml2html/Makefile.in 2009-09-11
02:25:31.000000000 -0400
-@@ -365,7 +365,7 @@
- target_alias = @target_alias@
+diff -Nurd -x'*~' libgda-4.0.5.orig/libgda-report/RML/trml2html/Makefile.am
libgda-4.0.5/libgda-report/RML/trml2html/Makefile.am
+--- libgda-4.0.5.orig/libgda-report/RML/trml2html/Makefile.am 2009-07-05
15:27:21.000000000 -0400
++++ libgda-4.0.5/libgda-report/RML/trml2html/Makefile.am 2009-10-11
12:40:53.000000000 -0400
+@@ -1,6 +1,6 @@
trml2html_SCRIPTS = trml2html.py
trml2html_DATA = __init__.py utils.py
-trml2htmldir = $(bindir)/gda_trml2html
+trml2htmldir = $(libexecdir)/gda_trml2html
+
EXTRA_DIST = \
$(trml2html_SCRIPTS) \
- $(trml2html_DATA)
-diff -Nurd -x'*~' libgda-4.0.4.orig/libgda-report/RML/trml2pdf/Makefile.in
libgda-4.0.4/libgda-report/RML/trml2pdf/Makefile.in
---- libgda-4.0.4.orig/libgda-report/RML/trml2pdf/Makefile.in 2009-08-30
14:59:25.000000000 -0400
-+++ libgda-4.0.4/libgda-report/RML/trml2pdf/Makefile.in 2009-09-11
02:25:57.000000000 -0400
-@@ -365,7 +365,7 @@
- target_alias = @target_alias@
+diff -Nurd -x'*~' libgda-4.0.5.orig/libgda-report/RML/trml2pdf/Makefile.am
libgda-4.0.5/libgda-report/RML/trml2pdf/Makefile.am
+--- libgda-4.0.5.orig/libgda-report/RML/trml2pdf/Makefile.am 2009-07-05
15:27:21.000000000 -0400
++++ libgda-4.0.5/libgda-report/RML/trml2pdf/Makefile.am 2009-10-11
12:41:18.000000000 -0400
+@@ -1,6 +1,6 @@
trml2pdf_SCRIPTS = trml2pdf.py
trml2pdf_DATA = __init__.py color.py utils.py
-trml2pdfdir = $(bindir)/gda_trml2pdf
+trml2pdfdir = $(libexecdir)/gda_trml2pdf
+
EXTRA_DIST = \
$(trml2pdf_SCRIPTS) \
- $(trml2pdf_DATA)
-diff -Nurd -x'*~' libgda-4.0.4.orig/libgda-report/engine/Makefile.in
libgda-4.0.4/libgda-report/engine/Makefile.in
---- libgda-4.0.4.orig/libgda-report/engine/Makefile.in 2009-08-30
14:59:25.000000000 -0400
-+++ libgda-4.0.4/libgda-report/engine/Makefile.in 2009-09-11
02:27:20.000000000 -0400
-@@ -400,8 +400,8 @@
+diff -Nurd -x'*~' libgda-4.0.5.orig/libgda-report/engine/Makefile.am
libgda-4.0.5/libgda-report/engine/Makefile.am
+--- libgda-4.0.5.orig/libgda-report/engine/Makefile.am 2009-04-17
12:32:22.000000000 -0400
++++ libgda-4.0.5/libgda-report/engine/Makefile.am 2009-10-11
12:39:02.000000000 -0400
+@@ -16,8 +16,8 @@
$(gda_report_headers) \
gda-report-engine.c
@@ -67,12 +65,12 @@
+libgda_report_engine_4_0_la_LIBADD = \
+ $(top_builddir)/libgda/libgda-4.0.la $(LIBGDA_LIBS)
- gdareportincludedir =
$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda-report
- gdareportinclude_HEADERS = $(gda_report_headers)
-diff -Nurd -x'*~' libgda-4.0.4.orig/libgda-xslt/Makefile.in
libgda-4.0.4/libgda-xslt/Makefile.in
---- libgda-4.0.4.orig/libgda-xslt/Makefile.in 2009-08-30 14:59:26.000000000
-0400
-+++ libgda-4.0.4/libgda-xslt/Makefile.in 2009-09-11 02:28:37.000000000
-0400
-@@ -405,8 +405,8 @@
+
gdareportincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda-report
+ gdareportinclude_HEADERS=$(gda_report_headers)
+diff -Nurd -x'*~' libgda-4.0.5.orig/libgda-xslt/Makefile.am
libgda-4.0.5/libgda-xslt/Makefile.am
+--- libgda-4.0.5.orig/libgda-xslt/Makefile.am 2009-04-17 12:32:22.000000000
-0400
++++ libgda-4.0.5/libgda-xslt/Makefile.am 2009-10-11 12:39:02.000000000
-0400
+@@ -20,8 +20,8 @@
sql_backend.c
libgda_xslt_4_0_la_LDFLAGS = -version-info
$(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) $(NO_UNDEFINED)
@@ -81,12 +79,12 @@
+libgda_xslt_4_0_la_LIBADD = \
+ $(top_builddir)/libgda/libgda-4.0.la $(LIBGDA_LIBS) $(LIBXSLT_LIBS)
- gdaxsltincludedir =
$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda-xslt
- gdaxsltinclude_HEADERS = $(gda_xslt_headers)
-diff -Nurd -x'*~' libgda-4.0.4.orig/providers/bdb/Makefile.in
libgda-4.0.4/providers/bdb/Makefile.in
---- libgda-4.0.4.orig/providers/bdb/Makefile.in 2009-08-30
14:59:28.000000000 -0400
-+++ libgda-4.0.4/providers/bdb/Makefile.in 2009-09-11 02:29:42.000000000
-0400
-@@ -413,9 +413,9 @@
+
gdaxsltincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda-xslt
+ gdaxsltinclude_HEADERS=$(gda_xslt_headers)
+diff -Nurd -x'*~' libgda-4.0.5.orig/providers/bdb/Makefile.am
libgda-4.0.5/providers/bdb/Makefile.am
+--- libgda-4.0.5.orig/providers/bdb/Makefile.am 2009-04-17
12:32:23.000000000 -0400
++++ libgda-4.0.5/providers/bdb/Makefile.am 2009-10-11 12:39:02.000000000
-0400
+@@ -24,9 +24,9 @@
gda_bdb_test_SOURCES = gda-bdb-test.c
gda_bdb_test_LDADD = \
@@ -96,5 +94,5 @@
- $(top_builddir)/libgda/libgda-4.0.la
+ $(BDB_LIBS)
- xmldir = $(datadir)/libgda-4.0
+ xmldir = $(datadir)/libgda-4.0
xml_in_files = bdb_specs_dsn.xml.in
Index: libgda.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libgda.info,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- libgda.info 11 Sep 2009 06:55:02 -0000 1.21
+++ libgda.info 11 Oct 2009 16:58:29 -0000 1.22
@@ -1,7 +1,9 @@
Package: libgda
-Version: 4.0.4
+Version: 4.0.5
Revision: 1
BuildDepends: <<
+ autoconf,
+ automake1.11,
gettext-bin,
gettext-tools,
fink (>= 0.24.12-1),
@@ -16,6 +18,7 @@
libgpg-error-shlibs,
libsoup2.4.1-ssl (>= 2.26.0-1),
libtasn1-3 (>= 2.2-2),
+ libtool2,
libxml2 (>= 2.6.30-1),
libxslt (>= 1.1.22-1),
pkgconfig (>= 0.23),
@@ -25,9 +28,9 @@
%N4.0-bin (>= %v-%r)
<<
Source: mirror:gnome:sources/%n/4.0/%n-%v.tar.bz2
-Source-MD5: 14a6f176763cda5270f1ac23699c42ab
+Source-MD5: c61dbbc85479d3de4371ee16da922124
PatchFile: %n.patch
-PatchFile-MD5: c1ee35e529dd6fd3342961ad97c09352
+PatchFile-MD5: bce7fdb7fcf36ed5c679fa78ad9bb22e
PatchScript: <<
%{default_script}
perl -pi -e 's,/usr/share/gtk-doc/html,%p/share/gtk-doc/html,g'
doc/C/html/*.html
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
