Update of /cvsroot/fink/experimental/asari
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32706
Modified Files:
openoffice.org.info openoffice.org.patch
Log Message:
Now copiles OK with system mozilla and with some system libs.
Index: openoffice.org.patch
===================================================================
RCS file: /cvsroot/fink/experimental/asari/openoffice.org.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- openoffice.org.patch 8 Aug 2005 08:10:42 -0000 1.6
+++ openoffice.org.patch 12 Aug 2005 23:06:10 -0000 1.7
@@ -102,3 +102,16 @@
.ELSE
JPEG3RDLIB=-ljpeg
.ENDIF
+--- libxmlsec/xmlsec1-1.2.6.patch 2005-05-31 18:34:29.000000000 +0200
++++ libxmlsec/xmlsec1-1.2.6.patch.new 2005-07-07 13:32:26.000000000 +0200
+@@ -710,6 +710,10 @@
+ ! dummy
+ --- 1,44 ----
+ ! #! /bin/sh
++!
++! if test "$SYSTEM_LIBXML" = "YES"
++! then xml2-config "$@"; exit 0
++! fi
+ !
+ ! prefix=${SOLARVERSION}/${INPATH}
+ ! includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
Index: openoffice.org.info
===================================================================
RCS file: /cvsroot/fink/experimental/asari/openoffice.org.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- openoffice.org.info 8 Aug 2005 08:10:42 -0000 1.9
+++ openoffice.org.info 12 Aug 2005 23:06:10 -0000 1.10
@@ -2,7 +2,7 @@
Package: openoffice.org
Description: Integrated office productivity suite
Version: 1.9m121
-Revision: 61
+Revision: 62
License: OSI-Approved
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
@@ -40,6 +40,7 @@
PatchScript: <<
/bin/mv gpc231/gpc.{c,h} external/gpc
/usr/bin/bzip2 -dc openoffice.org.113to121.patch.bz2 | /usr/bin/patch -p1
+ ( cd scp2 && /usr/bin/cvs update -dP -jCWS_SRC680_NOJAVA3_ANCHOR
-jcws_src680_nojava3 )
/usr/bin/sed "s|@FINK_PREFIX@|%p|g" < %a/%n.patch | /usr/bin/patch -p0
/bin/mkdir FINKLIBS
/bin/ln -s %p/lib/libdb_java-4.2.jnilib FINKLIBS
@@ -60,7 +61,6 @@
--with-system-jpeg \
--with-system-expat \
--with-system-freetype \
- --with-system-libxml \
--with-system-db \
--with-db-jar=%p/share/java/db42-ssl-java/db.jar \
--with-system-sablot \
@@ -81,6 +81,7 @@
# --with-system-altlinuxhyph # not in Fink
# --with-system-boost # error ocurres?
# --with-system-python # fails building instsetooo_native?
+# --with-system-libxml # error occurs?
GCC: 3.3
CompileScript: <<
@@ -137,5 +138,7 @@
* Mac OS X SDK (which comes with Xcode) is needed for compiling portaudio.
* /usr/bin/pkg-config prevents the build of mozilla.
* Sometimes checking getaddrinfo() fails on configuring python (on Panther?)
+
+ * Applied the patch #5 of IssueZilla #51542 to fix libxmlsec problem.
<<
<<
-------------------------------------------------------
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
