Update of /cvsroot/fink/experimental/asari
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv29466
Modified Files:
openoffice.org.info openoffice.org.patch
Log Message:
Allowed libxmlsec to accept SeaMonkey; Use LINKLIB rule instead of simple COPY
for versioned libs; IZ 73052
Index: openoffice.org.patch
===================================================================
RCS file: /cvsroot/fink/experimental/asari/openoffice.org.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- openoffice.org.patch 3 May 2007 03:00:43 -0000 1.21
+++ openoffice.org.patch 3 May 2007 04:14:10 -0000 1.22
@@ -234,3 +234,172 @@
elif test -n "$with_xulrunner" && test "$with_xulrunner" != "no"; then
MOZ_FLAVOUR=xulrunner
else
+
+### Accept SeaMonkey!
+--- libxmlsec/xmlsec1-1.2.6.patch.orig 2006-10-24 22:31:14.000000000 +0900
++++ libxmlsec/xmlsec1-1.2.6.patch 2007-05-03 12:47:42.000000000 +0900
+@@ -236,7 +236,7 @@
+
+ XMLSEC_NO_NSS="1"
+ MOZILLA_MIN_VERSION="1.4"
+-+ if test "z$MOZ_FLAVOUR" = "zfirefox" ; then
+++ if test "z$MOZ_FLAVOUR" = "zfirefox" || test "z$MOZ_FLAVOUR" =
"zseamonkey"; then
+ + MOZILLA_MIN_VERSION="1.0"
+ + fi
+ NSS_MIN_VERSION="3.2"
+
+### Use LINKLIB rule instead of simple COPY for versioned libs; IZ 73052
+diff -urN ooo_SRC680_m198_src.orig/icu/icu-3.6.patch
ooo_SRC680_m198_src/icu/icu-3.6.patch
+--- icu/icu-3.6.patch 2007-01-03 09:54:31.000000000 +0100
++++ icu/icu-3.6.patch 2007-01-03 09:55:04.000000000 +0100
+@@ -1,5 +1,5 @@
+ *** misc/icu/source/common/putil.c Mon Jul 31 20:14:28 2006
+---- misc/build/icu/source/common/putil.c Fri Dec 15 10:40:22 2006
++--- misc/build/icu/source/common/putil.c Wed Jan 3 09:40:21 2007
+ ***************
+ *** 48,54 ****
+ #endif
+@@ -19,7 +19,7 @@
+ #endif
+
+ *** misc/icu/source/config/mh-darwin Wed Feb 1 08:52:42 2006
+---- misc/build/icu/source/config/mh-darwin Fri Dec 15 10:50:25 2006
++--- misc/build/icu/source/config/mh-darwin Wed Jan 3 09:41:43 2007
+ ***************
+ *** 25,31 ****
+ SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS)
+@@ -33,12 +33,12 @@
+ SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS)
+
+ ## Compiler switches to embed a library name and version information
+-! LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR)
-Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name
@executable_path/$(notdir $(MIDDLE_SO_TARGET))
++! LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR)
-Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name
@executable_path/$(notdir $(FINAL_SO_TARGET))
+
+ ## Compiler switch to embed a runtime search path
+ LD_RPATH=
+ *** misc/icu/source/config/mh-irix Thu Mar 23 19:51:52 2006
+---- misc/build/icu/source/config/mh-irix Fri Dec 15 10:40:22 2006
++--- misc/build/icu/source/config/mh-irix Wed Jan 3 09:40:21 2007
+ ***************
+ *** 23,28 ****
+ --- 23,31 ----
+@@ -52,7 +52,7 @@
+ THREADSCPPFLAGS = -D_REENTRANT -D_PTHREADS
+ LIBCPPFLAGS =
+ *** misc/icu/source/config/mh-linux Thu Mar 23 19:51:52 2006
+---- misc/build/icu/source/config/mh-linux Fri Dec 15 10:40:22 2006
++--- misc/build/icu/source/config/mh-linux Wed Jan 3 09:40:21 2007
+ ***************
+ *** 20,25 ****
+ --- 20,32 ----
+@@ -70,7 +70,7 @@
+ LDFLAGSICUDT=-nodefaultlibs -nostdlib
+
+ *** misc/icu/source/config/mh-solaris Fri Feb 24 20:31:14 2006
+---- misc/build/icu/source/config/mh-solaris Fri Dec 15 10:40:22 2006
++--- misc/build/icu/source/config/mh-solaris Wed Jan 3 09:40:21 2007
+ ***************
+ *** 18,34 ****
+
+@@ -117,7 +117,7 @@
+
+ ## Compiler switch to embed a library name
+ *** misc/icu/source/data/Makefile.in Sat Aug 12 00:22:24 2006
+---- misc/build/icu/source/data/Makefile.in Fri Dec 15 10:40:22 2006
++--- misc/build/icu/source/data/Makefile.in Wed Jan 3 09:40:21 2007
+ ***************
+ *** 344,350 ****
+ ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)
+@@ -136,7 +136,7 @@
+ @echo "$@" > $@
+ endif
+ *** misc/icu/source/layout/GXLayoutEngine.cpp Fri Sep 2 20:22:10 2005
+---- misc/build/icu/source/layout/GXLayoutEngine.cpp Fri Dec 15 10:40:22 2006
++--- misc/build/icu/source/layout/GXLayoutEngine.cpp Wed Jan 3 09:40:21 2007
+ ***************
+ *** 39,45 ****
+ return 0;
+@@ -155,7 +155,7 @@
+ if (LE_FAILURE(success)) {
+ return 0;
+ *** misc/icu/source/layout/LESwaps.h Thu Jun 23 00:39:36 2005
+---- misc/build/icu/source/layout/LESwaps.h Fri Dec 15 10:40:22 2006
++--- misc/build/icu/source/layout/LESwaps.h Wed Jan 3 09:40:21 2007
+ ***************
+ *** 2,7 ****
+ --- 2,8 ----
+@@ -231,7 +231,7 @@
+ * This class is used to access data which stored in big endian order
+ * regardless of the conventions of the platform. It has been designed
+ *** misc/icu/source/test/intltest/loctest.cpp Thu Jul 6 03:50:04 2006
+---- misc/build/icu/source/test/intltest/loctest.cpp Fri Dec 15 10:40:22 2006
++--- misc/build/icu/source/test/intltest/loctest.cpp Wed Jan 3 09:40:21 2007
+ ***************
+ *** 4,9 ****
+ --- 4,10 ----
+@@ -243,7 +243,7 @@
+ #include "unicode/decimfmt.h"
+ #include "unicode/ucurr.h"
+ *** misc/icu/source/test/intltest/tsputil.cpp Wed Jul 19 00:18:10 2006
+---- misc/build/icu/source/test/intltest/tsputil.cpp Fri Dec 15 10:40:22 2006
++--- misc/build/icu/source/test/intltest/tsputil.cpp Wed Jan 3 09:40:21 2007
+ ***************
+ *** 4,9 ****
+ --- 4,10 ----
+@@ -255,7 +255,7 @@
+
+ #include <float.h> // DBL_MAX, DBL_MIN
+ *** misc/icu/source/test/intltest/uobjtest.cpp Thu Mar 23 01:54:12 2006
+---- misc/build/icu/source/test/intltest/uobjtest.cpp Fri Dec 15 10:40:22 2006
++--- misc/build/icu/source/test/intltest/uobjtest.cpp Wed Jan 3 09:40:21 2007
+ ***************
+ *** 4,9 ****
+ --- 4,10 ----
+@@ -267,7 +267,7 @@
+ #include "cmemory.h" // UAlignedMemory
+ #include <string.h>
+ *** misc/icu/source/test/intltest/ustrtest.cpp Tue Dec 28 22:13:54 2004
+---- misc/build/icu/source/test/intltest/ustrtest.cpp Fri Dec 15 10:40:22 2006
++--- misc/build/icu/source/test/intltest/ustrtest.cpp Wed Jan 3 09:40:21 2007
+ ***************
+ *** 4,9 ****
+ --- 4,10 ----
+diff -urN ooo_SRC680_m198_src.orig/icu/prj/d.lst
ooo_SRC680_m198_src/icu/prj/d.lst
+--- icu/prj/d.lst 2007-01-03 09:54:31.000000000 +0100
++++ icu/prj/d.lst 2007-01-03 09:55:56.000000000 +0100
+@@ -6,8 +6,6 @@
+ ..\%__SRC%\misc\build\icu\source\common\unicode\*.h
%_DEST%\inc%_EXT%\external\unicode\*.h
+ ..\%__SRC%\misc\build\icu\source\i18n\unicode\*.h
%_DEST%\inc%_EXT%\external\unicode\*.h
+
+-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+-..\%__SRC%\lib\*.dylib.* %_DEST%\lib%_EXT%\*.dylib.*
+ ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+ ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
+
+@@ -24,15 +22,15 @@
+ ..\%__SRC%\bin\gencmn %_DEST%\bin%_EXT%\gencmn
+ ..\%__SRC%\bin\gencmn.exe %_DEST%\bin%_EXT%\gencmn.exe
+
+-..\%__SRC%\lib\libicudata.so.*.* %_DEST%\lib%_EXT%\
+-..\%__SRC%\lib\libicui18n.so.*.* %_DEST%\lib%_EXT%\
+-..\%__SRC%\lib\libicule.so.*.* %_DEST%\lib%_EXT%\
+-..\%__SRC%\lib\libicuuc.so.*.* %_DEST%\lib%_EXT%\
+-..\%__SRC%\lib\libicutu.so.*.* %_DEST%\lib%_EXT%\
++..\%__SRC%\lib\libicudata.*.*.* %_DEST%\lib%_EXT%\
++..\%__SRC%\lib\libicui18n.*.*.* %_DEST%\lib%_EXT%\
++..\%__SRC%\lib\libicule.*.*.* %_DEST%\lib%_EXT%\
++..\%__SRC%\lib\libicuuc.*.*.* %_DEST%\lib%_EXT%\
++..\%__SRC%\lib\libicutu.*.*.* %_DEST%\lib%_EXT%\
+ ..\icuversion.mk %_DEST%\inc%_EXT%\icuversion.mk
+
+-linklib: libicudata.so.*.*
+-linklib: libicui18n.so.*.*
+-linklib: libicule.so.*.*
+-linklib: libicuuc.so.*.*
+-linklib: libicutu.so.*.*
+\ No newline at end of file
++linklib: libicudata.*.*.*
++linklib: libicui18n.*.*.*
++linklib: libicule.*.*.*
++linklib: libicuuc.*.*.*
++linklib: libicutu.*.*.*
Index: openoffice.org.info
===================================================================
RCS file: /cvsroot/fink/experimental/asari/openoffice.org.info,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- openoffice.org.info 3 May 2007 03:00:43 -0000 1.39
+++ openoffice.org.info 3 May 2007 04:14:10 -0000 1.40
@@ -170,7 +170,7 @@
SourceDirectory: OOF680_m15
PatchFile: %n.patch
-PatchFile-MD5: 4af7292d3ec668a7186d9df94036f7f3
+PatchFile-MD5: 73ac029ccff0671fbd24c6e540f3f053
PatchScript: <<
#!/bin/bash -ev
/usr/bin/patch -p0 < %{PatchFile}
-------------------------------------------------------------------------
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
