Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/x11
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28723/10.4-transitional/unstable/main/finkinfo/x11
Modified Files:
openoffice.org-lang.info openoffice.org.info
openoffice.org.patch
Log Message:
New libiconv ready. (tweak DYLD_LIBRARY_PATH in building)
Index: openoffice.org.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/x11/openoffice.org.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- openoffice.org.patch 5 Aug 2005 03:28:11 -0000 1.5
+++ openoffice.org.patch 7 Sep 2005 17:13:12 -0000 1.6
@@ -50,3 +50,21 @@
+ #ifndef NSSPKI1T_H
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
+--- config_office/set_soenv.in Wed Sep 7 05:47:52 2005
++++ config_office/set_soenv.in.fink Wed Sep 7 19:03:32 2005
+@@ -1227,6 +1227,7 @@
+ elsif ($platform =~ m/darwin/)
+ { $SOLARLIB = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
+ $L_STLPORT_LIB.
++ ' $FINK_SOLARLIB'.
+ $L.$USR_LIB;
+ # [ed] 6/15/02 Add in X11 libraries onto the library path
+ if ($GUIBASE eq "unx") {
+@@ -1331,6 +1332,7 @@
+ { $SOLARINC .= $STLPORT_stlport.
+
$I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Versions".$ds."Current".$ds."Headers".
+
$I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
++ $SOLARINC .= ' $FINK_SOLARINC';
+ # [ed] 6/15/02 Add in X11 headers as appropriate for the build
+ if ($GUIBASE eq "unx") {
+ $SOLARINC .= $I.$XINC.
Index: openoffice.org.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/x11/openoffice.org.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- openoffice.org.info 5 Aug 2005 03:28:11 -0000 1.8
+++ openoffice.org.info 7 Sep 2005 17:13:12 -0000 1.9
@@ -2,7 +2,7 @@
Package: openoffice.org
Description: Integrated office productivity suite
Version: 1.9m121
-Revision: 59
+Revision: 60
License: OSI-Approved
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
@@ -57,8 +57,9 @@
CompileScript: <<
#!/bin/bash -ev
(cd config_office && ./configure %c)
+ export FINK_SOLARLIB="-L%p/lib" FINK_SOLARINC="-I%p/include"
./bootstrap
- . MacosxEnv.Set.sh
+ . ./MacosxEnv.Set.sh
export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
dmake
<<
Index: openoffice.org-lang.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/x11/openoffice.org-lang.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- openoffice.org-lang.info 6 Sep 2005 16:29:04 -0000 1.6
+++ openoffice.org-lang.info 7 Sep 2005 17:13:12 -0000 1.7
@@ -2,7 +2,7 @@
Package: openoffice.org-%type_pkg[lang]
Description: Language Pack(%type_pkg[lang]) for OpenOffice.org
Version: 1.9m121
-Revision: 59
+Revision: 60
Type: lang (af ar bg ca cs cy da de el en-gb eo es et eu fi fr gl he hi-in hu
it ja km kn-in ko lt ms nb nl nn ns pl pt pt-br ru sk sl sv th tn tr xh zh-cn
zh-tw zu)
License: OSI-Approved
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
@@ -75,8 +75,9 @@
fi
(cd config_office && ./configure --with-lang=$OOO_LANG %c)
+ export FINK_SOLARLIB="-L%p/lib" FINK_SOLARINC="-I%p/include"
./bootstrap
- . MacosxEnv.Set.sh
+ . ./MacosxEnv.Set.sh
export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
dmake
(cd instsetoo_native/util && dmake ooolanguagepack)
-------------------------------------------------------
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
