Update of /cvsroot/fink/experimental/asari
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv13950
Modified Files:
openoffice.org.info.m4 openoffice.org.patch
Log Message:
Hoged 3.
Index: openoffice.org.info.m4
===================================================================
RCS file: /cvsroot/fink/experimental/asari/openoffice.org.info.m4,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- openoffice.org.info.m4 6 May 2007 22:18:33 -0000 1.20
+++ openoffice.org.info.m4 7 May 2007 09:28:35 -0000 1.21
@@ -306,7 +306,7 @@
Source2-MD5: e3a0b76dcd876f3d721ee7183729153d
PatchFile: %n.patch
-PatchFile-MD5: ad374fb2df0ca5d05cd205c02518ba4b
+PatchFile-MD5: 91f3a422c41b0bc0d3ef62d276174e71
PatchScript: <<
#!/bin/bash -ev
/usr/bin/sed 's|@PREFIX@|%p|g;s|@PKGNAME@|%n|g' %{PatchFile} |
/usr/bin/patch -p0
@@ -420,7 +420,7 @@
export X_LDFLAGS=$LDFLAGS
# $PKG_CONFIG_PATH is needed to configure with freetype219,
pango1-xft2-xft219
- export
PKG_CONFIG_PATH=%p/lib/freetype219/lib/pkgconfig:%p/lib/pango-xft219/lib/pkgconfig
+ export
PKG_CONFIG_PATH=%p/lib/freetype219/lib/pkgconfig:%p/lib/pango-ft219/lib/pkgconfig
]
ifelse(USE_FINK_PYTHON, 1,
[IF_10_4(
Index: openoffice.org.patch
===================================================================
RCS file: /cvsroot/fink/experimental/asari/openoffice.org.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- openoffice.org.patch 6 May 2007 20:52:56 -0000 1.28
+++ openoffice.org.patch 7 May 2007 09:28:35 -0000 1.29
@@ -150,8 +150,8 @@
done
### Add configure option to link against Fink's Python
---- configure.in.orig 2007-05-07 05:09:11.000000000 +0900
-+++ configure.in 2007-05-07 05:08:30.000000000 +0900
+--- config_office/configure.in.orig 2007-05-07 05:09:11.000000000 +0900
++++ config_office/configure.in 2007-05-07 05:08:30.000000000 +0900
@@ -286,6 +286,16 @@
AC_ARG_WITH(system-python,
[ --with-system-python Use python already on system
@@ -192,8 +192,8 @@
dnl check if the headers really work:
save_CPPFLAGS="$CPPFLAGS"
---- configure.orig 2007-05-07 05:09:20.000000000 +0900
-+++ configure 2007-05-07 05:11:31.000000000 +0900
+--- config_office/onfigure.orig 2007-05-07 05:09:20.000000000 +0900
++++ config_office/configure 2007-05-07 05:11:31.000000000 +0900
@@ -1733,6 +1733,10 @@
--with-system-python Use python already on system
@@ -205,9 +205,9 @@
--with-system-icu Use icu already on system
--with-system-db Use berkeley db already on system
-@@ -2788,6 +2792,19 @@
- fi
+@@ -2169,6 +2178,17 @@
+ fi;
+# Check whether --with-python-libs was given.
+if test "${with_python_libs+set}" = set; then
@@ -216,15 +216,13 @@
+ yes) with_python_libs=auto;;
+ no|"") with_python_libs=none;;
+esac
-+
+else
+ with_python_libs=auto
+fi
+
-+
- # Check whether --with-system-icu was given.
+ # Check whether --with-system-icu or --without-system-icu was given.
if test "${with_system_icu+set}" = set; then
- withval=$with_system_icu;
+ withval="$with_system_icu"
@@ -13061,11 +13078,16 @@
python_version=`$PYTHON -c "import distutils.sysconfig; print
distutils.sysconfig.get_config_var('VERSION');"`
PYTHON_CFLAGS="-I$python_include"
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
