Author: ydario
Date: Mon Sep 14 09:26:26 2015
New Revision: 1702880
URL: http://svn.apache.org/r1702880
Log:
#i118923# merge OS/2 trunk changesets from #i125501# #i125592# #i118932# into
AOO410 branch.
Added:
openoffice/branches/AOO410/ext_libraries/coinmp/coinmp-1.6.0-os2.patch
- copied unchanged from r1621121,
openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0-os2.patch
openoffice/branches/AOO410/main/libxmlsec/xmlsec1-os2.patch
Modified:
openoffice/branches/AOO410/ (props changed)
openoffice/branches/AOO410/ext_libraries/coinmp/makefile.mk
openoffice/branches/AOO410/ext_libraries/hunspell/makefile.mk
openoffice/branches/AOO410/main/ (props changed)
openoffice/branches/AOO410/main/boost/boost-os2.patch (props changed)
openoffice/branches/AOO410/main/configure.cmd
openoffice/branches/AOO410/main/dbaccess/ (props changed)
openoffice/branches/AOO410/main/drawinglayer/ (props changed)
openoffice/branches/AOO410/main/filter/ (props changed)
openoffice/branches/AOO410/main/jurt/ (props changed)
openoffice/branches/AOO410/main/libxmlsec/makefile.mk
openoffice/branches/AOO410/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
openoffice/branches/AOO410/main/lingucomponent/source/spellcheck/spell/makefile.mk
openoffice/branches/AOO410/main/sc/ (props changed)
openoffice/branches/AOO410/main/scp2/source/calc/makefile.mk
openoffice/branches/AOO410/main/scp2/source/ooo/file_library_ooo.scp
openoffice/branches/AOO410/main/sd/ (props changed)
openoffice/branches/AOO410/main/solenv/bin/modules/installer/globals.pm
openoffice/branches/AOO410/main/solenv/bin/modules/installer/parameter.pm
openoffice/branches/AOO410/main/solenv/bin/modules/pre2par/parameter.pm
openoffice/branches/AOO410/main/solenv/inc/libs.mk
openoffice/branches/AOO410/main/svgio/ (props changed)
openoffice/branches/AOO410/main/svtools/source/graphic/grfmgr2.cxx (props
changed)
openoffice/branches/AOO410/main/sw/ (props changed)
openoffice/branches/AOO410/main/xmlsecurity/prj/d.lst
openoffice/branches/AOO410/main/xmlsecurity/source/xmlsec/nss/makefile.mk
openoffice/branches/AOO410/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
openoffice/branches/AOO410/main/xmlsecurity/util/makefile.mk
openoffice/branches/AOO410/test/ (props changed)
openoffice/branches/AOO410/test/testcommon/source/org/openoffice/test/vcl/
(props changed)
Propchange: openoffice/branches/AOO410/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 09:26:26 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801
+/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1607111,1607793,1607836,1608348,1608359,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,1623849-1623850,1642300-1642302
Modified: openoffice/branches/AOO410/ext_libraries/coinmp/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/ext_libraries/coinmp/makefile.mk?rev=1702880&r1=1702879&r2=1702880&view=diff
==============================================================================
--- openoffice/branches/AOO410/ext_libraries/coinmp/makefile.mk (original)
+++ openoffice/branches/AOO410/ext_libraries/coinmp/makefile.mk Mon Sep 14
09:26:26 2015
@@ -46,6 +46,9 @@ TARFILE_NAME=CoinMP-1.6.0
TARFILE_MD5=2b5f1ca58d6ef30f18f1415b65bed81c
PATCH_FILES=coinmp-1.6.0.patch coinmp-1.6.0-clang.patch
+.IF "$(OS)"=="OS2"
+PATCH_FILES+=coinmp-1.6.0-os2.patch
+.ENDIF
.IF "$(COM)"=="MSC"
BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv
CoinMP\\MSVisualStudio\\v9\\CoinMP.sln "Release|Win32"
@@ -57,11 +60,18 @@ CONFIGURE_FLAGS=--disable-pkg-config --d
BUILD_ACTION= $(GNUMAKE) -j8
.ENDIF
+.IF "$(OS)"=="OS2"
+CONFIGURE_FLAGS+= --disable-shared --enable-static
+.ENDIF
+
OUT2INC+=CoinMP$/src/CoinMP.h
.IF "$(OS)"=="WNT"
OUT2BIN+=CoinMP$/MSVisualStudio$/v9$/release$/CoinMP.dll
OUT2LIB+=CoinMP$/MSVisualStudio$/v9$/release$/CoinMP.lib
+.ELIF "$(OS)"=="OS2"
+OUT2BIN+=CoinMP$/src$/CoinMP.dll
+OUT2LIB+=CoinMP$/src$/.libs/CoinMP.lib
.ELSE
OUT2LIB+=CoinMP$/src$/.libs$/libCoinMP*$(DLLPOST)*
OUT2LIB+=CoinUtils$/src$/.libs$/libCoinUtils*$(DLLPOST)*
Modified: openoffice/branches/AOO410/ext_libraries/hunspell/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/ext_libraries/hunspell/makefile.mk?rev=1702880&r1=1702879&r2=1702880&view=diff
==============================================================================
--- openoffice/branches/AOO410/ext_libraries/hunspell/makefile.mk (original)
+++ openoffice/branches/AOO410/ext_libraries/hunspell/makefile.mk Mon Sep 14
09:26:26 2015
@@ -90,7 +90,7 @@ BUILD_ACTION= cd src/hunspell && cp ../w
.ENDIF # "$(GUI)"=="WNT"
.IF "$(GUI)"=="OS2"
-BUILD_ACTION=cd src/hunspell && dmake
+BUILD_ACTION=cd src/hunspell && touch config.h && dmake
.ENDIF # "$(GUI)"=="OS2"
OUT2INC=
\
Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 09:26:26 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main:1417739-1541842
/openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1677190,1687177,1692551,1700135
+/openoffice/trunk/main:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1642300-1642302,1677190,1687177,1692551,1700135
Propchange: openoffice/branches/AOO410/main/boost/boost-os2.patch
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 09:26:26 2015
@@ -2,3 +2,4 @@
/openoffice/branches/ia2/main/boost/boost-os2.patch:1417739-1541842
/openoffice/branches/ooxml-osba/main/boost/boost-os2.patch:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/boost/boost-os2.patch:1480411,1534063,1534098,1549902
+/openoffice/trunk/main/boost/boost-os2.patch:1621121,1623847,1623849-1623850,1642300-1642302
Modified: openoffice/branches/AOO410/main/configure.cmd
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/configure.cmd?rev=1702880&r1=1702879&r2=1702880&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/configure.cmd (original)
+++ openoffice/branches/AOO410/main/configure.cmd Mon Sep 14 09:26:26 2015
@@ -27,5 +27,5 @@ SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_
set config_shell=sh
set perl_sh_dir=%UNIXROOT%/usr/bin
-sh ./configure --prefix=/@unixroot/usr --with-system-zlib --with-system-jpeg
--without-stlport --with-system-icu --with-system-curl --with-system-python
--with-system-openssl --with-system-libxml --with-system-libxslt
--disable-werror --disable-mozilla --disable-odk --with-x=no
--disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes
--disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit
--with-system-apr --with-system-apr-util --with-system-serf
--with-system-coinmp | tee configure.log
+sh ./configure --prefix=/@unixroot/usr --with-system-zlib --with-system-jpeg
--without-stlport --with-system-icu --with-system-curl --with-system-python
--with-system-openssl --with-system-libxml --with-system-libxslt
--disable-werror --disable-mozilla --disable-odk --with-x=no
--disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes
--disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit
--with-system-apr --with-system-apr-util --with-system-serf --with-system-nss
--enable-bundled-dictionaries --enable-category-b --with-lang="de es fr it nl
ru" | tee configure.log
endlocal
Propchange: openoffice/branches/AOO410/main/dbaccess/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 09:26:26 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/dbaccess:1417739-1541842
/openoffice/branches/ooxml-osba/main/dbaccess:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/dbaccess:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/dbaccess:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1626099,1677190,1687177,1692551
+/openoffice/trunk/main/dbaccess:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1626099,1642300-1642302,1677190,1687177,1692551
Propchange: openoffice/branches/AOO410/main/drawinglayer/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 09:26:26 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/drawinglayer:1417739-1541842
/openoffice/branches/ooxml-osba/main/drawinglayer:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/drawinglayer:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/drawinglayer:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1612866
+/openoffice/trunk/main/drawinglayer:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1612866,1621121,1623847,1623849-1623850,1642300-1642302
Propchange: openoffice/branches/AOO410/main/filter/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 09:26:26 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/filter:1417739-1541842
/openoffice/branches/ooxml-osba/main/filter:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/filter:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/filter:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1585498,1586242,1586249,1586325,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1607839,1692551
+/openoffice/trunk/main/filter:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1585498,1586242,1586249,1586325,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1607839,1621121,1623847,1623849-1623850,1642300-1642302,1692551
Propchange: openoffice/branches/AOO410/main/jurt/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 09:26:26 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/jurt:1417739-1541842
/openoffice/branches/ooxml-osba/main/jurt:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/jurt:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/jurt:1571619,1571942
+/openoffice/trunk/main/jurt:1571619,1571942,1621121,1623847,1623849-1623850,1642300-1642302
Modified: openoffice/branches/AOO410/main/libxmlsec/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/libxmlsec/makefile.mk?rev=1702880&r1=1702879&r2=1702880&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/libxmlsec/makefile.mk (original)
+++ openoffice/branches/AOO410/main/libxmlsec/makefile.mk Mon Sep 14 09:26:26
2015
@@ -63,6 +63,9 @@ PATCH_FILES=\
xmlsec1-mingw32.patch \
xmlsec1-mingw-keymgr-mscrypto.patch
+.IF "$(GUI)"=="OS2"
+PATCH_FILES+=xmlsec1-os2.patch
+.ENDIF
ADDITIONAL_FILES= \
include$/xmlsec$/mscrypto$/akmngr.h \
@@ -175,6 +178,9 @@ OUT2BIN+=src$/.libs$/libxmlsec1.dll src$
OUT2LIB+=win32$/binaries$/*.lib
OUT2BIN+=win32$/binaries$/*.dll
.ENDIF
+.ELIF "$(OS)"=="OS2"
+OUT2LIB+=src$/.libs$/xmlsec1.lib src$/nss$/.libs$/xmlsec1-nss.lib
+OUT2BIN+=src$/xmlsec1.dll src$/nss$/xmlsec1n.dll
.ELSE
OUT2LIB+=src$/.libs$/libxmlsec1.a src$/nss$/.libs$/libxmlsec1-nss.a
.ENDIF
Added: openoffice/branches/AOO410/main/libxmlsec/xmlsec1-os2.patch
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/libxmlsec/xmlsec1-os2.patch?rev=1702880&view=auto
==============================================================================
--- openoffice/branches/AOO410/main/libxmlsec/xmlsec1-os2.patch (added)
+++ openoffice/branches/AOO410/main/libxmlsec/xmlsec1-os2.patch Mon Sep 14
09:26:26 2015
@@ -0,0 +1,94 @@
+--- misc/xmlsec1-1.2.14/src/Makefile.in 2009-12-05 22:19:34.000000000
+0100
++++ misc/build/xmlsec1-1.2.14/src/Makefile.in 2014-11-26 22:02:00.000000000
+0100
+@@ -12,6 +12,11 @@
+ # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
++
++OS2_LA_NAME=xmlsec1
++OS2_DLL_NAME=xmlsec1
++OS2_DLL_OBJ=$(libxmlsec1_la_OBJECTS:%.lo=%.o)
++OS2_DLL_LIBS=-lxml2 -lz -lm -lurpo -lmmap -lpthread $(LIBS)
+
+ @SET_MAKE@
+
+@@ -736,7 +741,7 @@
+ done
+ check-am: all-am
+ check: check-recursive
+-all-am: Makefile $(LTLIBRARIES)
++all-am: Makefile $(LTLIBRARIES) $(OS2_DLL_NAME).dll
+ installdirs: installdirs-recursive
+ installdirs-am:
+ for dir in "$(DESTDIR)$(libdir)"; do \
+@@ -861,3 +866,13 @@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
++
++$(OS2_DLL_NAME).dll: lib$(OS2_LA_NAME).la
++ cp .libs/$(OS2_LA_NAME).a .libs/$(OS2_LA_NAME)_s.a
++ echo "LIBRARY $(OS2_DLL_NAME) INITINSTANCE TERMINSTANCE" >
$(OS2_DLL_NAME).def
++ echo "DATA MULTIPLE" >> $(OS2_DLL_NAME).def
++ echo "EXPORTS" >> $(OS2_DLL_NAME).def
++ emxexp $(OS2_DLL_OBJ) >> $(OS2_DLL_NAME).def
++ gcc -g -Zbin-files -Zhigh-mem -Zomf -Zdll $(OS2_DLL_NAME).def -o $@
$(OS2_DLL_OBJ) $(OS2_DLL_LIBS)
++ emximp -o .libs/$(OS2_LA_NAME).a $(OS2_DLL_NAME).def
++ emximp -o .libs/$(OS2_LA_NAME).lib $(OS2_DLL_NAME).def
+--- misc/xmlsec1-1.2.14/src/nss/Makefile.in 2014-11-26 22:02:36.000000000
+0100
++++ misc/build/xmlsec1-1.2.14/src/nss/Makefile.in 2014-11-26
22:02:28.000000000 +0100
+@@ -12,6 +12,11 @@
+ # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
++
++OS2_LA_NAME=xmlsec1-nss
++OS2_DLL_NAME=xmlsec1n
++OS2_DLL_OBJ=$(libxmlsec1_nss_la_OBJECTS:%.lo=%.o)
++OS2_DLL_LIBS=-l../.libs/xmlsec1 -lxml2 -lssl3 -lsmime3 -lnss3 -lnssutil3
-lplds4 -lplc4 -lnspr4 $(LIBS)
+
+ @SET_MAKE@
+
+@@ -691,7 +696,7 @@
+ done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(LTLIBRARIES)
++all-am: Makefile $(LTLIBRARIES) $(OS2_DLL_NAME).dll
+ installdirs:
+ for dir in "$(DESTDIR)$(libdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+@@ -812,3 +817,13 @@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
++
++$(OS2_DLL_NAME).dll: lib$(OS2_LA_NAME).la
++ cp .libs/$(OS2_LA_NAME).a .libs/$(OS2_LA_NAME)_s.a
++ echo "LIBRARY $(OS2_DLL_NAME) INITINSTANCE TERMINSTANCE" >
$(OS2_DLL_NAME).def
++ echo "DATA MULTIPLE" >> $(OS2_DLL_NAME).def
++ echo "EXPORTS" >> $(OS2_DLL_NAME).def
++ emxexp $(OS2_DLL_OBJ) >> $(OS2_DLL_NAME).def
++ gcc -g -Zbin-files -Zhigh-mem -Zomf -Zdll $(OS2_DLL_NAME).def -o $@
$(OS2_DLL_OBJ) $(OS2_DLL_LIBS)
++ emximp -o .libs/$(OS2_LA_NAME).a $(OS2_DLL_NAME).def
++ emximp -o .libs/$(OS2_LA_NAME).lib $(OS2_DLL_NAME).def
+--- misc/xmlsec1-1.2.14/src/nss/keywrapers.c 2014-11-26 21:59:58.000000000
+0100
++++ misc/build/xmlsec1-1.2.14/src/nss/keywrapers.c 2014-11-26
21:50:14.000000000 +0100
+@@ -1126,7 +1126,7 @@
+ NULL, /* void* reserved1; */
+ };
+
+-#ifndef __MINGW32__
++#if !defined(__MINGW32__) && !defined(__KLIBC__)
+ /**
+ * xmlSecNssTransformKWAes128GetKlass:
+ *
+@@ -1199,7 +1199,7 @@
+ NULL, /* void* reserved1; */
+ };
+
+-#ifndef __MINGW32__
++#if !defined(__MINGW32__) && !defined(__KLIBC__)
+ /**
+ * xmlSecNssTransformKWDes3GetKlass:
+ *
Modified:
openoffice/branches/AOO410/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk?rev=1702880&r1=1702879&r2=1702880&view=diff
==============================================================================
---
openoffice/branches/AOO410/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
(original)
+++
openoffice/branches/AOO410/main/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
Mon Sep 14 09:26:26 2015
@@ -29,7 +29,7 @@ ENABLE_EXCEPTIONS=TRUE
USE_DEFFILE=TRUE
.IF "$(GUI)"=="OS2"
-HNJLIB=hyphen.lib
+HNJLIB=-lhyphen
.ELIF "$(GUI)"=="UNX" || "$(COM)"=="GCC"
HNJLIB=-lhyphen
.ELSE
@@ -54,7 +54,11 @@ SLOFILES= \
$(SLO)$/hreg.obj\
$(SLO)$/hyphenimp.obj
+.IF "$(GUI)" == "OS2"
+REALNAME:=hyphen_u
+.ELSE
REALNAME:=hyphen.uno
+.ENDIF
SHL1TARGET= $(REALNAME)$(DLLPOSTFIX)
SHL1STDLIBS= \
Modified:
openoffice/branches/AOO410/main/lingucomponent/source/spellcheck/spell/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/lingucomponent/source/spellcheck/spell/makefile.mk?rev=1702880&r1=1702879&r2=1702880&view=diff
==============================================================================
---
openoffice/branches/AOO410/main/lingucomponent/source/spellcheck/spell/makefile.mk
(original)
+++
openoffice/branches/AOO410/main/lingucomponent/source/spellcheck/spell/makefile.mk
Mon Sep 14 09:26:26 2015
@@ -51,7 +51,11 @@ SLOFILES= \
$(SLO)$/sreg.obj\
$(SLO)$/sspellimp.obj
+.IF "$(GUI)" == "OS2"
+REALNAME:=$(TARGET)
+.ELSE
REALNAME:=$(TARGET).uno
+.ENDIF
SHL1TARGET= $(REALNAME)$(DLLPOSTFIX)
SHL1STDLIBS= \
Propchange: openoffice/branches/AOO410/main/sc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 09:26:26 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/sc:1417739-1541842
/openoffice/branches/ooxml-osba/main/sc:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/sc:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/sc:1571617,1571902,1594864
+/openoffice/trunk/main/sc:1571617,1571902,1594864,1621121,1623847,1623849-1623850,1642300-1642302
Modified: openoffice/branches/AOO410/main/scp2/source/calc/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/scp2/source/calc/makefile.mk?rev=1702880&r1=1702879&r2=1702880&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/scp2/source/calc/makefile.mk (original)
+++ openoffice/branches/AOO410/main/scp2/source/calc/makefile.mk Mon Sep 14
09:26:26 2015
@@ -36,7 +36,7 @@ TARGETTYPE=CUI
.IF "$(ENABLE_COINMP)" == "YES"
SCPDEFS+=-DENABLE_COINMP
.IF "$(SYSTEM_COINMP)" == "NO"
-.IF "$(GUI)"!="WNT"
+.IF "$(GUI)"!="WNT" && "$(GUI)"!="OS2"
# For the non-Windows platforms all libraries related to CoinMP have to be
# added explicitly.
SCPDEFS+=-DADD_ALL_COINMP_LIBRARIES
Modified: openoffice/branches/AOO410/main/scp2/source/ooo/file_library_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/scp2/source/ooo/file_library_ooo.scp?rev=1702880&r1=1702879&r2=1702880&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/scp2/source/ooo/file_library_ooo.scp
(original)
+++ openoffice/branches/AOO410/main/scp2/source/ooo/file_library_ooo.scp Mon
Sep 14 09:26:26 2015
@@ -1376,7 +1376,11 @@ End
File gid_File_Lib_Spell
TXT_FILE_BODY;
Styles = (PACKED);
+#ifdef OS2
+ Name = LIBNAME(spell);
+#else
Name = LIBNAME(spell.uno);
+#endif
Dir = SCP2_OOO_BIN_DIR;
End
#endif
@@ -1527,7 +1531,11 @@ End
File gid_File_Lib_Hyph
TXT_FILE_BODY;
Styles = (PACKED);
+#ifdef OS2
+ Name = LIBNAME(hyphen_u);
+#else
Name = LIBNAME(hyphen.uno);
+#endif
Dir = SCP2_OOO_BIN_DIR;
End
#endif
@@ -1662,6 +1670,8 @@ File gid_File_Lib_XSec_XmlSec
TXT_FILE_BODY;
#ifdef UNX
Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX));
+ #elif defined(OS2)
+ Name = "xsec_xs.dll";
#else
Name = "xsec_xmlsec.dll";
#endif
@@ -1673,6 +1683,8 @@ File gid_File_Lib_XSec_XMLSecurity
TXT_FILE_BODY;
#ifdef UNX
Name = STRING(CONCAT2(libxmlsecurity,UNXSUFFIX));
+ #elif defined(OS2)
+ Name = "xmlsecur.dll";
#else
Name = "xmlsecurity.dll";
#endif
@@ -1680,11 +1692,13 @@ File gid_File_Lib_XSec_XMLSecurity
Styles = (PACKED);
End
-#ifdef WNT
+#if defined(WNT) || defined(OS2)
File gid_File_Lib_LibXMLSec_xmlseccore
TXT_FILE_BODY;
- #ifdef _gcc3
+ #if defined(OS2)
+ Name = "xmlsec1.dll";
+ #elif defined(_gcc3)
Name = "libxmlsec1.dll";
#else
Name = "libxmlsec.dll";
@@ -1695,7 +1709,9 @@ End
File gid_File_Lib_LibXMLSec_xmlsecmscrypto
TXT_FILE_BODY;
- #ifdef _gcc3
+ #if defined(OS2)
+ Name = "xmlsec1n.dll";
+ #elif defined(_gcc3)
Name = "libxmlsec1-mscrypto.dll";
#else
Name = "libxmlsec-mscrypto.dll";
Propchange: openoffice/branches/AOO410/main/sd/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 09:26:26 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/sd:1417739-1541842
/openoffice/branches/ooxml-osba/main/sd:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/sd:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/sd:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1609118
+/openoffice/trunk/main/sd:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1609118,1621121,1623847,1623849-1623850,1642300-1642302
Modified:
openoffice/branches/AOO410/main/solenv/bin/modules/installer/globals.pm
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/solenv/bin/modules/installer/globals.pm?rev=1702880&r1=1702879&r2=1702880&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/solenv/bin/modules/installer/globals.pm
(original)
+++ openoffice/branches/AOO410/main/solenv/bin/modules/installer/globals.pm Mon
Sep 14 09:26:26 2015
@@ -499,7 +499,7 @@ BEGIN
$checksumfile = "so_checksum";
$unopkgfile = "unopkg.bin";
$separator = "/";
- $pathseparator = "\:";
+ $pathseparator = "\;";
$libextension = "\.dll";
$isunix = 0;
$iswin = 0;
Modified:
openoffice/branches/AOO410/main/solenv/bin/modules/installer/parameter.pm
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/solenv/bin/modules/installer/parameter.pm?rev=1702880&r1=1702879&r2=1702880&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/solenv/bin/modules/installer/parameter.pm
(original)
+++ openoffice/branches/AOO410/main/solenv/bin/modules/installer/parameter.pm
Mon Sep 14 09:26:26 2015
@@ -246,8 +246,15 @@ sub make_path_absolute
if (!($$pathref =~ /^\s*\w\:/)) # this is a relative
windows path (no dos drive)
{
$$pathref = cwd() .
$installer::globals::separator . $$pathref;
+ if ( $installer::globals::isos2 )
+ {
+ $$pathref =~ s/\\/\//g;
+ }
+ else
+ {
+ $$pathref =~ s/\//\\/g;
+ }
- $$pathref =~ s/\//\\/g;
}
}
}
@@ -376,6 +383,7 @@ sub setglobalvariables
{
$installer::globals::unpackpath = cwd();
if ( $installer::globals::iswin ) {
$installer::globals::unpackpath =~ s/\//\\/g; }
+ if ( $installer::globals::isos2 ) {
$installer::globals::unpackpath =~ s/\\/\//g; }
}
if ( $installer::globals::localunpackdir ne "" ) {
$installer::globals::unpackpath = $installer::globals::localunpackdir; }
Modified:
openoffice/branches/AOO410/main/solenv/bin/modules/pre2par/parameter.pm
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/solenv/bin/modules/pre2par/parameter.pm?rev=1702880&r1=1702879&r2=1702880&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/solenv/bin/modules/pre2par/parameter.pm
(original)
+++ openoffice/branches/AOO410/main/solenv/bin/modules/pre2par/parameter.pm Mon
Sep 14 09:26:26 2015
@@ -152,6 +152,15 @@ sub make_path_absolute
}
}
+ if ( $pre2par::globals::isos2 )
+ {
+ if (!($$pathref =~ /^\s*\w\:/)) # this is a relative os2 path
+ {
+ $$pathref = cwd() . $pre2par::globals::separator .
$$pathref;
+ $$pathref =~ s/\\/\//g;
+ }
+ }
+
$$pathref =~ s/\Q$pre2par::globals::separator\E\s*$//; # removing
ending slashes
}
Modified: openoffice/branches/AOO410/main/solenv/inc/libs.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/solenv/inc/libs.mk?rev=1702880&r1=1702879&r2=1702880&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/solenv/inc/libs.mk (original)
+++ openoffice/branches/AOO410/main/solenv/inc/libs.mk Mon Sep 14 09:26:26 2015
@@ -325,6 +325,8 @@ UDMLIB=-ludm
ULINGULIB=-lulingu
.IF "$(SYSTEM_HUNSPELL)" == "YES"
HUNSPELLLIB=$(HUNSPELL_LIBS)
+.ELIF "$(GUI)" == "OS2"
+HUNSPELLLIB=-lhunspell
.ELSE
HUNSPELLLIB=-lhunspell-1.3
.ENDIF
@@ -332,11 +334,12 @@ HUNSPELLLIB=-lhunspell-1.3
MYTHESLIB=$(MYTHES_LIBS)
.ELIF "$(GUI)" == "OS2"
MYTHESLIB=-lmythes
+COINMPLIBS=-lCoinMP
.ELSE
MYTHESLIB=-lmythes-1.2
+COINMPLIBS=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver
.ENDIF
PYUNOLIB=-lpyuno
-COINMPLIBS=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver
INTERNAL_APR_LIBS=-lapr-1
INTERNAL_APR_UTIL_LIBS=-laprutil-1
INTERNAL_SERF_LIBS=-lserf-1
Propchange: openoffice/branches/AOO410/main/svgio/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 09:26:26 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/svgio:1417739-1541842
/openoffice/branches/ooxml-osba/main/svgio:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/svgio:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/svgio:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1607682,1610953
+/openoffice/trunk/main/svgio:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1607682,1610953,1621121,1623847,1623849-1623850,1642300-1642302
Propchange: openoffice/branches/AOO410/main/svtools/source/graphic/grfmgr2.cxx
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 09:26:26 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/svtools/source/graphic/grfmgr2.cxx:1417739-1541842
/openoffice/branches/ooxml-osba/main/svtools/source/graphic/grfmgr2.cxx:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/svtools/source/graphic/grfmgr2.cxx:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/svtools/source/graphic/grfmgr2.cxx:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621730
+/openoffice/trunk/main/svtools/source/graphic/grfmgr2.cxx:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1621730,1623847,1623849-1623850,1642300-1642302
Propchange: openoffice/branches/AOO410/main/sw/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 09:26:26 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main/sw:1417739-1541842
/openoffice/branches/ooxml-osba/main/sw:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main/sw:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main/sw:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1605355,1605689,1606055,1606061,1607111,1607649,1608348,1608733,1610411,1610671,1611549,1612539
+/openoffice/trunk/main/sw:1571617,1571677,1572569,1572577,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1605355,1605689,1606055,1606061,1607111,1607649,1608348,1608733,1610411,1610671,1611549,1612539,1621121,1623847,1623849-1623850,1642300-1642302
Modified: openoffice/branches/AOO410/main/xmlsecurity/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/xmlsecurity/prj/d.lst?rev=1702880&r1=1702879&r2=1702880&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/xmlsecurity/prj/d.lst (original)
+++ openoffice/branches/AOO410/main/xmlsecurity/prj/d.lst Mon Sep 14 09:26:26
2015
@@ -2,7 +2,9 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid
..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
..\%__SRC%\bin\xsec_fw.dll %_DEST%\bin%_EXT%\xsec_fw.dll
..\%__SRC%\bin\xsec_xmlsec.dll %_DEST%\bin%_EXT%\xsec_xmlsec.dll
+..\%__SRC%\bin\xsec_xs.dll %_DEST%\bin%_EXT%\xsec_xs.dll
..\%__SRC%\bin\xmlsecurity.dll %_DEST%\bin%_EXT%\xmlsecurity.dll
+..\%__SRC%\bin\xmlsecur.dll %_DEST%\bin%_EXT%\xmlsecur.dll
..\%__SRC%\lib\libxsec_fw.so %_DEST%\lib%_EXT%\libxsec_fw.so
..\%__SRC%\lib\libxsec_xmlsec.so %_DEST%\lib%_EXT%\libxsec_xmlsec.so
..\%__SRC%\lib\libxmlsecurity.so %_DEST%\lib%_EXT%\libxmlsecurity.so
Modified:
openoffice/branches/AOO410/main/xmlsecurity/source/xmlsec/nss/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/xmlsecurity/source/xmlsec/nss/makefile.mk?rev=1702880&r1=1702879&r2=1702880&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/xmlsecurity/source/xmlsec/nss/makefile.mk
(original)
+++ openoffice/branches/AOO410/main/xmlsecurity/source/xmlsec/nss/makefile.mk
Mon Sep 14 09:26:26 2015
@@ -46,6 +46,9 @@ CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
NSS_INC = $(MOZ_INC)$/nss
NSPR_INC = $(MOZ_INC)$/nspr
+.ELIF "$(GUI)" == "OS2"
+NSS_INC = /@unixroot/usr/include/nss3
+NSPR_INC = /@unixroot/usr/include/nspr4
.ELSE
# TODO: better use pkgconfig to find the proper system include path
NSS_INC = /usr/include/nss3
Modified:
openoffice/branches/AOO410/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx?rev=1702880&r1=1702879&r2=1702880&view=diff
==============================================================================
---
openoffice/branches/AOO410/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
(original)
+++
openoffice/branches/AOO410/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
Mon Sep 14 09:26:26 2015
@@ -295,7 +295,10 @@ bool nsscrypto_initialize( const css::un
#endif
deleteRootsModule();
-#if defined SYSTEM_MOZILLA
+#if defined OS2
+ // YD the nss system dlls names are ending with 'k'
+ OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "nssckbik"
SAL_DLLEXTENSION));
+#elif defined SYSTEM_MOZILLA
OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "libnssckbi"
SAL_DLLEXTENSION));
#else
OUString rootModule(RTL_CONSTASCII_USTRINGPARAM(
"${OOO_BASE_DIR}/program/libnssckbi" SAL_DLLEXTENSION));
Modified: openoffice/branches/AOO410/main/xmlsecurity/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/xmlsecurity/util/makefile.mk?rev=1702880&r1=1702879&r2=1702880&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/xmlsecurity/util/makefile.mk (original)
+++ openoffice/branches/AOO410/main/xmlsecurity/util/makefile.mk Mon Sep 14
09:26:26 2015
@@ -68,6 +68,9 @@ DEF1EXPORTFILE = xsec_fw.dxp
#
SHL2NAME=xsec_xmlsec
+.IF "$(GUI)"=="OS2"
+SHL2NAME=xsec_xs
+.ENDIF
SHL2TARGET= $(SHL2NAME)
Propchange: openoffice/branches/AOO410/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 09:26:26 2015
@@ -10,4 +10,4 @@
/openoffice/branches/ia2/test:1417739-1541842
/openoffice/branches/rejuvenate01/test:1534063
/openoffice/branches/sidebar/test:1415095-1466374
-/openoffice/trunk/test:1571617
+/openoffice/trunk/test:1571617,1621121,1623847,1623849-1623850,1642300-1642302
Propchange:
openoffice/branches/AOO410/test/testcommon/source/org/openoffice/test/vcl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 09:26:26 2015
@@ -9,3 +9,4 @@
/openoffice/branches/ia2/test/testcommon/source/org/openoffice/test/vcl:1417739-1541842
/openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/vcl:1534063
/openoffice/branches/sidebar/test/testcommon/source/org/openoffice/test/vcl:1415095-1466374
+/openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:1621121,1623847,1623849-1623850,1642300-1642302
