[Libreoffice-commits] .: 2 commits - scp2/source stlport/makefile.mk stlport/STLport-4.5-cxx0x.patch

[Caolán McNamara]

 scp2/source/ooo/module_hidden_ooo.scp |   56 ++++++++++++++++++++++++++++++++++
 stlport/STLport-4.5-cxx0x.patch       |   17 ++++++++++
 stlport/makefile.mk                   |    5 ++-
 3 files changed, 77 insertions(+), 1 deletion(-)

New commits:
commit b6daa1965e63d7906f430843f8afa76e3cfdd65a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 7 15:25:53 2010 +0000

    make possible to build with c++0x

diff --git a/stlport/STLport-4.5-cxx0x.patch b/stlport/STLport-4.5-cxx0x.patch
new file mode 100644
index 0000000..88d96d0
--- /dev/null
+++ b/stlport/STLport-4.5-cxx0x.patch
@@ -0,0 +1,17 @@
+--- misc/STLport-4.5/stlport/config/stl_gcc.h
++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h
+@@ -239,10 +239,10 @@
+ 
+ 
+ /* strict ANSI prohibits "long long" ( gcc) */
+-#  if defined ( __STRICT_ANSI__ )
+-#    undef _STLP_LONG_LONG
+-// #    define _STLP_STRICT_ANSI 1
+-#  endif
++//#  if defined ( __STRICT_ANSI__ )
++//#    undef _STLP_LONG_LONG
++//// #    define _STLP_STRICT_ANSI 1
++//#  endif
+ 
+ //# if !defined (__STRICT_ANSI__) || defined (__BUILDING_STLPORT)
+ //#    define _STLP_USE_TEMPLATE_EXPORT
diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index 907c093..532a5dd 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -63,7 +63,10 @@ $(INCCOM)$/stlport$/vector: systemstl$/$$(@:f)
 .IF "$(COMID)"=="gcc3"
     TARFILE_NAME=STLport-4.5
     TARFILE_MD5=18f577b374d60b3c760a3a3350407632
-    PATCH_FILES=STLport-4.5.patch STLport-4.5-gcc43_warnings.patch
+    PATCH_FILES=\
+                STLport-4.5.patch \
+                STLport-4.5-gcc43_warnings.patch \
+                STLport-4.5-cxx0x.patch
 .ELIF "$(GUI)"=="WNT"
     .IF "$(CCNUMVER)"<="001300000000"
         TARFILE_NAME=STLport-4.0
commit 2b87a4aaf482e9138f7ab82bbf2b6d66b8262e19
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 7 13:55:42 2010 +0000

    add some links here

diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 7a14c62..b276571 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -27,6 +27,52 @@
 
 #include "macros.inc"
 
+#ifdef AIX
+#ifndef SYSTEM_CURL
+Unixlink gid_Unixlink_File_Lib_Curl
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(libcurl,UNXSUFFIX));
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = STRING(CONCAT3(libcurl,UNXSUFFIX,.3));
+End
+#endif
+#ifndef SYSTEM_REDLAND
+Unixlink gid_Unixlink_File_Lib_Raptor
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(libraptor,UNXSUFFIX));
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = STRING(CONCAT3(libraptor,UNXSUFFIX,.1));
+End
+
+Unixlink gid_Unixlink_File_Lib_Rasqal
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(librasqal,UNXSUFFIX));
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = STRING(CONCAT3(librasqal,UNXSUFFIX,.1));
+End
+
+Unixlink gid_Unixlink_File_Lib_Rdf
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(librdf,UNXSUFFIX));
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = STRING(CONCAT3(librdf,UNXSUFFIX,.0));
+End
+#endif
+#ifndef SYSTEM_LIBXSLT
+Unixlink gid_Unixlink_File_Lib_Xslt
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(libxslt,UNXSUFFIX));
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = STRING(CONCAT3(libxslt,UNXSUFFIX,.1));
+End
+#endif
+#endif
+
 Module gid_Module_Root_Files_2
     PackageInfo = "packinfo_office.txt";
 	ParentID = gid_Module_Root;
@@ -275,6 +321,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Adabas,
 	gid_File_Lib_Cached1,
 	gid_File_Lib_Curl,
+	gid_Unixlink_File_Lib_Curl,
 	gid_File_Lib_Db,
 	gid_File_Lib_Dbpool,
 	gid_File_Lib_Embobj,
@@ -334,8 +381,11 @@ Module gid_Module_Root_Files_5
 	gid_File_Ucptdoc1,
 	gid_File_Ucpexpand1,
 	gid_File_Lib_Raptor,
+	gid_Unixlink_File_Lib_Raptor,
 	gid_File_Lib_Rasqal,
+	gid_Unixlink_File_Lib_Rasqal,
 	gid_File_Lib_Rdf,
+	gid_Unixlink_File_Lib_Rdf,
 	gid_File_Lib_Unordf,
 	gid_File_Lib_Sndfile,
 	gid_File_Lib_Tvhlp1,
@@ -349,6 +399,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Ucphier1,
 	gid_File_Lib_Ucppkg1,
 	gid_File_Lib_Xslt,
+	gid_Unixlink_File_Lib_Xslt,
 	gid_File_Lib_LibXMLSec_xmlsecnss,
 	gid_File_Lib_LibXMLSec_xmlseccore,
 	gid_File_Lib_LibXMLSec_xmlsecmscrypto,
@@ -417,6 +468,11 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Cli_Oootypes_Assembly,
 	gid_File_Lib_Policy_Cli_Oootypes_Assembly,
 	gid_File_Lib_Policy_Cli_Oootypes_Config);
+    Unixlinks = (gid_Unixlink_File_Lib_Curl,
+	gid_Unixlink_File_Lib_Raptor,
+	gid_Unixlink_File_Lib_Rasqal,
+	gid_Unixlink_File_Lib_Rdf,
+	gid_Unixlink_File_Lib_Xslt);
 End
 
 Module gid_Module_Root_Files_6