Hi Peter, I have yet to find out. ;-)
Yes, they are macOS only, but they are the only changes in configure in that commit. Matthias Am 09.10.2018 um 12:41 schrieb Peter Kovacs: > Did reverting of the changes solve the issue? > > Because the changes there are only MacOSx related. ;) > > > On 10/8/18 8:56 PM, Matthias Seidel wrote: >> I don't think so... >> >> Maybe we can just revert the changes in configure.in? >> I will try tomorrow. >> >> >> Am 08.10.2018 um 20:06 schrieb Peter Kovacs: >>> I thought it is my stupidity. Maybe I have merged wrong? >>> >>> On 10/8/18 7:49 PM, Matthias Seidel wrote: >>>> Hi all, >>>> >>>> This one breaks our builds in configure: >>>> >>>> https://ci.apache.org/builders/openoffice-linux64-41x/builds/158/steps/configure/logs/stdio >>>> >>>> >>>> >>>> Regards, >>>> >>>> Matthias >>>> >>>> >>>> Am 08.10.2018 um 08:09 schrieb pe...@apache.org: >>>>> Author: petko >>>>> Date: Mon Oct 8 06:09:21 2018 >>>>> New Revision: 1843108 >>>>> >>>>> URL: http://svn.apache.org/viewvc?rev=1843108&view=rev >>>>> Log: >>>>> merged in: Issue 127887 - update bundled redland/raptor/rasqal >>>>> >>>>> Added: >>>>> >>>>> openoffice/branches/AOO416/main/redland/raptor/raptor2-2.0.15.patch.dmake >>>>> - copied unchanged from r1757789, >>>>> openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.dmake >>>>> >>>>> openoffice/branches/AOO416/main/redland/raptor/raptor2-2.0.15.patch.os2 >>>>> >>>>> - copied unchanged from r1818098, >>>>> openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.os2 >>>>> >>>>> openoffice/branches/AOO416/main/redland/raptor/raptor2-2.0.15.patch.win32 >>>>> - copied unchanged from r1757789, >>>>> openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.win32 >>>>> >>>>> openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.33.patch.dmake >>>>> >>>>> >>>>> - copied unchanged from r1757789, >>>>> openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.dmake >>>>> >>>>> openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.33.patch.ooo_build >>>>> - copied unchanged from r1757789, >>>>> openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.ooo_build >>>>> >>>>> openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.33.patch.win32 >>>>> >>>>> >>>>> - copied unchanged from r1757789, >>>>> openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.win32 >>>>> >>>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.17.patch.autotools >>>>> - copied unchanged from r1757789, >>>>> openoffice/trunk/main/redland/redland/redland-1.0.17.patch.autotools >>>>> >>>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.17.patch.dmake >>>>> - copied unchanged from r1757789, >>>>> openoffice/trunk/main/redland/redland/redland-1.0.17.patch.dmake >>>>> >>>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.17.patch.ooo_build >>>>> - copied unchanged from r1757789, >>>>> openoffice/trunk/main/redland/redland/redland-1.0.17.patch.ooo_build >>>>> >>>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.17.patch.os2 >>>>> >>>>> >>>>> - copied unchanged from r1818098, >>>>> openoffice/trunk/main/redland/redland/redland-1.0.17.patch.os2 >>>>> >>>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.17.patch.win32 >>>>> - copied unchanged from r1757789, >>>>> openoffice/trunk/main/redland/redland/redland-1.0.17.patch.win32 >>>>> Removed: >>>>> >>>>> openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.autotools >>>>> >>>>> openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.dmake >>>>> >>>>> >>>>> >>>>> openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.fixes >>>>> >>>>> >>>>> >>>>> openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.ooo_build >>>>> >>>>> openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.os2 >>>>> >>>>> >>>>> openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.win32 >>>>> >>>>> >>>>> >>>>> openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.autotools >>>>> >>>>> openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.dmake >>>>> >>>>> >>>>> >>>>> openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.ooo_build >>>>> >>>>> openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.os2 >>>>> >>>>> >>>>> openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.win32 >>>>> >>>>> >>>>> >>>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.autotools >>>>> >>>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.dmake >>>>> >>>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.ooo_build >>>>> >>>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.os2 >>>>> >>>>> >>>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.win32 >>>>> Modified: >>>>> openoffice/branches/AOO416/ (props changed) >>>>> openoffice/branches/AOO416/ext_libraries/serf/makefile.mk >>>>> openoffice/branches/AOO416/main/ (props changed) >>>>> openoffice/branches/AOO416/main/configure.in >>>>> openoffice/branches/AOO416/main/external_deps.lst >>>>> openoffice/branches/AOO416/main/redland/ (props changed) >>>>> openoffice/branches/AOO416/main/redland/prj/d.lst >>>>> openoffice/branches/AOO416/main/redland/raptor/makefile.mk >>>>> openoffice/branches/AOO416/main/redland/rasqal/makefile.mk >>>>> openoffice/branches/AOO416/main/redland/redland/makefile.mk >>>>> openoffice/branches/AOO416/main/redland/redlandversion.mk >>>>> >>>>> openoffice/branches/AOO416/main/scp2/source/ooo/file_library_ooo.scp >>>>> >>>>> Propchange: openoffice/branches/AOO416/ >>>>> ------------------------------------------------------------------------------ >>>>> >>>>> >>>>> --- svn:mergeinfo (original) >>>>> +++ svn:mergeinfo Mon Oct 8 06:09:21 2018 >>>>> @@ -2,5 +2,5 @@ >>>>> /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,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,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,1647713,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543,1705551,1706649,1707397,1707659,1723875,1729921,1730154,174 >>>>> >>>>> >>>>> >>>>> 8497,1754469,1755873,1756017,1758150,1760461,1761439,1761808,1763017,1763019,1765170,1766467,1766530,1766915,1772139,1780015,1784925,1784961,1785175,1791815,1793216,1797494,1800077,1800568,1802428,1803787,1803939,1804182,1805208,1806314,1811013,1811435,1811737,1813450,1814994,1815700,1825850,1839130,1839837,1840427 >>>>> +/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,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,1647713,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543,1705551,1706649,1707397,1707659,1723875,1729921,1730154,174 >>>>> >>>>> >>>>> >>>>> 8497,1754469,1755873,1756017,1757789,1758150,1760461,1761439,1761808,1763017,1763019,1765170,1766467,1766530,1766915,1772139,1780015,1784925,1784961,1785175,1791815,1793216,1797494,1800077,1800568,1802428,1803787,1803939,1804182,1805089,1805208,1806314,1811013,1811435,1811737,1813450,1814994,1815700,1818098,1825850,1839130,1839837,1840427 >>>>> /openoffice/trunk/main:1705369 >>>>> >>>>> Modified: openoffice/branches/AOO416/ext_libraries/serf/makefile.mk >>>>> URL: >>>>> http://svn.apache.org/viewvc/openoffice/branches/AOO416/ext_libraries/serf/makefile.mk?rev=1843108&r1=1843107&r2=1843108&view=diff >>>>> >>>>> ============================================================================== >>>>> >>>>> >>>>> --- openoffice/branches/AOO416/ext_libraries/serf/makefile.mk >>>>> (original) >>>>> +++ openoffice/branches/AOO416/ext_libraries/serf/makefile.mk Mon >>>>> Oct 8 06:09:21 2018 >>>>> @@ -108,7 +108,7 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS) >>>>> # Serf names its library only with the major number. >>>>> # We are using minor and micro as well. Fix that here >>>>> # by creating a copy with the right name. >>>>> -SERF_ORIGINAL_LIB=.libs/libserf-$(SERF_MAJOR).0.0.0.dylib >>>>> +SERF_ORIGINAL_LIB=.libs/libserf-$(SERF_MAJOR).0.dylib >>>>> SERF_FIXED_LIB=.libs/libserf-$(LIBSERFVERSION).0.dylib >>>>> INSTALL_ACTION=if [ -f "$(SERF_ORIGINAL_LIB)" -a ! -f >>>>> "$(SERF_FIXED_LIB)" ]; then cp $(SERF_ORIGINAL_LIB) >>>>> $(SERF_FIXED_LIB); fi >>>>> .ENDIF >>>>> >>>>> Propchange: openoffice/branches/AOO416/main/ >>>>> ------------------------------------------------------------------------------ >>>>> >>>>> >>>>> --- svn:mergeinfo (original) >>>>> +++ svn:mergeinfo Mon Oct 8 06:09:21 2018 >>>>> @@ -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,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,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,1620195,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1643177,1650314,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,169780 >>>>> >>>>> >>>>> >>>>> 7,1700078,1700126,1700135,1702107,1702894,1702898,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1706649,1707167,1707169-1707170,1707175,1707397,1707408,1707412,1707642,1707645,1707659,1707844,1708477,1708483,1709212,1709377,1709403,1723875,1729921,1730154,1748497,1754469,1755873,1756017,1758150,1760461,1761439,1761808,1763017,1763019,1765170,1766467,1766915,1772139,1780015,1784925,1784961,1785175,1791815,1793216,1797494,1800077,1800568,1802428,1803787,1803939,1804182,1805208,1806314,1811737,1813450,1815700,1825850,1839130,1839837,1840427 >>>>> +/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,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,1620195,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1643177,1650314,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,169780 >>>>> >>>>> >>>>> >>>>> 7,1700078,1700126,1700135,1702107,1702894,1702898,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1706649,1707167,1707169-1707170,1707175,1707397,1707408,1707412,1707642,1707645,1707659,1707844,1708477,1708483,1709212,1709377,1709403,1723875,1729921,1730154,1748497,1754469,1755873,1756017,1757789,1758150,1760461,1761439,1761808,1763017,1763019,1765170,1766467,1766915,1772139,1780015,1784925,1784961,1785175,1791815,1793216,1797494,1800077,1800568,1802428,1803787,1803939,1804182,1805089,1805208,1806314,1811737,1813450,1815700,1818098,1825850,1839130,1839837,1840427 >>>>> >>>>> Modified: openoffice/branches/AOO416/main/configure.in >>>>> URL: >>>>> http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/configure.in?rev=1843108&r1=1843107&r2=1843108&view=diff >>>>> >>>>> ============================================================================== >>>>> >>>>> >>>>> --- openoffice/branches/AOO416/main/configure.in (original) >>>>> +++ openoffice/branches/AOO416/main/configure.in Mon Oct 8 06:09:21 >>>>> 2018 >>>>> @@ -1146,7 +1146,7 @@ case "$build_os" in >>>>> CC="`xcrun -f clang` -arch x86_64" >>>>> fi >>>>> if test ! -n "$CXX"; then >>>>> - CXX="`xcrun -f clang++` -arch x86_64 -std=c++11" >>>>> + CXX="`xcCXX="`xcrun -f clang++` -arch x86_64" >>>>> fi >>>>> ;; >>>>> os2*) >>>>> @@ -3914,17 +3914,17 @@ dnl ==================================== >>>>> dnl Checks for a MacOS platform SDK compatible with an OSX 10.7 >>>>> deployment target >>>>> dnl >>>>> =================================================================== >>>>> if test "$_os" = "Darwin"; then >>>>> - sdk_target=10.7 >>>>> + sdk_target=10.9 >>>>> AC_MSG_CHECKING([checking SDK compatiblity with OSX >>>>> $sdk_target]) >>>>> sdk_minor=`echo $sdk_target | cut -d"." -f2` >>>>> - if test "$sdk_minor" -lt "7"; then >>>>> - AC_MSG_ERROR([SDK version < 10.7 is not longer supported]) >>>>> + if test "$sdk_minor" -lt "9"; then >>>>> + AC_MSG_ERROR([SDK version < 10.9 is not longer supported]) >>>>> else >>>>> MACOSX_DEPLOYMENT_TARGET=$sdk_target >>>>> - sdk_found=`xcodebuild -showsdks | egrep "sdk >>>>> macosx10.(7|8|9|10|11)" | sed -e "s/.*sdk //" | tail -n1` >>>>> + sdk_found=`xcodebuild -showsdks | $EGREP "sdk >>>>> macosx10.(9|10|11|12)" | sed -e "s/.*sdk //" | tail -n1` >>>>> if test -z "$sdk_found"; then >>>>> AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility >>>>> found]) >>>>> else >>>>> >>>>> Modified: openoffice/branches/AOO416/main/external_deps.lst >>>>> URL: >>>>> http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/external_deps.lst?rev=1843108&r1=1843107&r2=1843108&view=diff >>>>> >>>>> ============================================================================== >>>>> >>>>> >>>>> --- openoffice/branches/AOO416/main/external_deps.lst (original) >>>>> +++ openoffice/branches/AOO416/main/external_deps.lst Mon Oct 8 >>>>> 06:09:21 2018 >>>>> @@ -85,21 +85,21 @@ if (ENABLE_NSS_MODULE!=NO && SYSTEM_NSS! >>>>> URL2 = $(OOO_EXTRAS)$(MD5)-$(name) >>>>> if (SYSTEM_REDLAND != YES) >>>>> - MD5 = 284e768eeda0e2898b0d5bf7e26a016e >>>>> - name = raptor-1.4.18.tar.gz >>>>> - URL1 = http://download.librdf.org/source/raptor-1.4.18.tar.gz >>>>> + MD5 = a39f6c07ddb20d7dd2ff1f95fa21e2cd >>>>> + name = raptor2-2.0.15.tar.gz >>>>> + URL1 = http://download.librdf.org/source/raptor2-2.0.15.tar.gz >>>>> URL2 = $(OOO_EXTRAS)$(MD5)-$(name) >>>>> if (SYSTEM_REDLAND != YES) >>>>> - MD5 = ca66e26082cab8bb817185a116db809b >>>>> - name = redland-1.0.8.tar.gz >>>>> - URL1 = http://download.librdf.org/source/redland-1.0.8.tar.gz >>>>> + MD5 = e5be03eda13ef68aabab6e42aa67715e >>>>> + name = redland-1.0.17.tar.gz >>>>> + URL1 = http://download.librdf.org/source/redland-1.0.17.tar.gz >>>>> URL2 = $(OOO_EXTRAS)$(MD5)-$(name) >>>>> if (SYSTEM_REDLAND != YES) >>>>> - MD5 = fca8706f2c4619e2fa3f8f42f8fc1e9d >>>>> - name = rasqal-0.9.16.tar.gz >>>>> - URL1 = http://download.librdf.org/source/rasqal-0.9.16.tar.gz >>>>> + MD5 = 1f5def51ca0026cd192958ef07228b52 >>>>> + name = rasqal-0.9.33.tar.gz >>>>> + URL1 = http://download.librdf.org/source/rasqal-0.9.33.tar.gz >>>>> URL2 = $(OOO_EXTRAS)$(MD5)-$(name) >>>>> if (GUI!=UNX || SYSTEM_ZLIB!=YES) >>>>> >>>>> Propchange: openoffice/branches/AOO416/main/redland/ >>>>> ------------------------------------------------------------------------------ >>>>> >>>>> >>>>> --- svn:mergeinfo (added) >>>>> +++ svn:mergeinfo Mon Oct 8 06:09:21 2018 >>>>> @@ -0,0 +1,5 @@ >>>>> +/openoffice/branches/AOO400/main/redland:1503684 >>>>> +/openoffice/branches/ia2/main/redland:1417739-1541842 >>>>> +/openoffice/branches/ooxml-osba/main/redland:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283 >>>>> >>>>> >>>>> +/openoffice/branches/rejuvenate01/main/redland:1480411,1534063,1534098,1536312,1549902,1560617 >>>>> >>>>> >>>>> +/openoffice/trunk/main/redland:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,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,1620195,1621121,1623847,1623849-1623850,1630814,1633294,1633297,1635806,1642300-1642302,1643177,1650314,1652476,1654282,1668939,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,169596 >>>>> >>>>> >>>>> >>>>> 2,1697807,1700078,1700126,1700135,1701344,1702107,1702894,1702898,1702986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1706649,1707167,1707169-1707170,1707175,1707397,1707408,1707412,1707642,1707645,1707659,1707844,1708477,1708483,1709212,1709377,1709403,1723875,1729921,1730154,1748497,1754469,1755873,1756017,1757789,1758150,1760461,1761439,1761808,1763017,1763019,1765170,1766467,1766915,1772139,1780015,1784925,1784961,1785175,1791815,1793216,1797494,1800077,1800568,1802428,1803787,1803939,1804182,1805089,1805208,1806314,1811737,1813450,1815700,1818098,1825850,1839130,1839837,1840427 >>>>> >>>>> Modified: openoffice/branches/AOO416/main/redland/prj/d.lst >>>>> URL: >>>>> http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/redland/prj/d.lst?rev=1843108&r1=1843107&r2=1843108&view=diff >>>>> >>>>> ============================================================================== >>>>> >>>>> >>>>> --- openoffice/branches/AOO416/main/redland/prj/d.lst (original) >>>>> +++ openoffice/branches/AOO416/main/redland/prj/d.lst Mon Oct 8 >>>>> 06:09:21 2018 >>>>> @@ -1,13 +1,13 @@ >>>>> mkdir: %_DEST%\inc%_EXT%\external >>>>> ..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\*.h >>>>> -..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so.1 >>>>> -symlink: %_DEST%\lib%_EXT%\libraptor.so.1 >>>>> %_DEST%\lib%_EXT%\libraptor.so >>>>> -..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib%_EXT%\libraptor.1.dylib >>>>> -symlink: %_DEST%\lib%_EXT%\libraptor.1.dylib >>>>> %_DEST%\lib%_EXT%\libraptor.dylib >>>>> -..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib%_EXT%\librasqal.so.1 >>>>> -symlink: %_DEST%\lib%_EXT%\librasqal.so.1 >>>>> %_DEST%\lib%_EXT%\librasqal.so >>>>> -..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib%_EXT%\librasqal.1.dylib >>>>> -symlink: %_DEST%\lib%_EXT%\librasqal.1.dylib >>>>> %_DEST%\lib%_EXT%\librasqal.dylib >>>>> +..\%__SRC%\lib\libraptor2.so.0 %_DEST%\lib%_EXT%\libraptor2.so.0 >>>>> +symlink: %_DEST%\lib%_EXT%\libraptor2.so.0 >>>>> %_DEST%\lib%_EXT%\libraptor2.so >>>>> +..\%__SRC%\lib\libraptor2.0.dylib >>>>> %_DEST%\lib%_EXT%\libraptor2.0.dylib >>>>> +symlink: %_DEST%\lib%_EXT%\libraptor2.0.dylib >>>>> %_DEST%\lib%_EXT%\libraptor2.dylib >>>>> +..\%__SRC%\lib\librasqal.so.3 %_DEST%\lib%_EXT%\librasqal.so.3 >>>>> +symlink: %_DEST%\lib%_EXT%\librasqal.so.3 >>>>> %_DEST%\lib%_EXT%\librasqal.so >>>>> +..\%__SRC%\lib\librasqal.3.dylib %_DEST%\lib%_EXT%\librasqal.3.dylib >>>>> +symlink: %_DEST%\lib%_EXT%\librasqal.3.dylib >>>>> %_DEST%\lib%_EXT%\librasqal.dylib >>>>> ..\%__SRC%\lib\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so.0 >>>>> symlink: %_DEST%\lib%_EXT%\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so >>>>> ..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.0.dylib >>>>> >>>>> Modified: openoffice/branches/AOO416/main/redland/raptor/makefile.mk >>>>> URL: >>>>> http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/redland/raptor/makefile.mk?rev=1843108&r1=1843107&r2=1843108&view=diff >>>>> >>>>> ============================================================================== >>>>> >>>>> >>>>> --- openoffice/branches/AOO416/main/redland/raptor/makefile.mk >>>>> (original) >>>>> +++ openoffice/branches/AOO416/main/redland/raptor/makefile.mk Mon >>>>> Oct 8 06:09:21 2018 >>>>> @@ -40,28 +40,28 @@ all: >>>>> .INCLUDE : ../redlandversion.mk >>>>> -RAPTORVERSION=$(RAPTOR_MAJOR).4.18 >>>>> +RAPTORVERSION=2.0.15 >>>>> -TARFILE_NAME=raptor-$(RAPTORVERSION) >>>>> -TARFILE_MD5=284e768eeda0e2898b0d5bf7e26a016e >>>>> +TARFILE_NAME=raptor2-$(RAPTORVERSION) >>>>> +TARFILE_MD5=a39f6c07ddb20d7dd2ff1f95fa21e2cd >>>>> ADDITIONAL_FILES=src/makefile.mk src/raptor_config.h >>>>> OOO_PATCH_FILES= \ >>>>> - $(TARFILE_NAME).patch.autotools \ >>>>> - $(TARFILE_NAME).patch.ooo_build \ >>>>> $(TARFILE_NAME).patch.dmake \ >>>>> - $(TARFILE_NAME).patch.win32 \ >>>>> - $(TARFILE_NAME).patch.fixes >>>>> PATCH_FILES=$(OOO_PATCH_FILES) >>>>> .IF "$(OS)"=="OS2" >>>>> -BUILD_ACTION=dmake >>>>> -BUILD_DIR=$(CONFIGURE_DIR)/src >>>>> -ADDITIONAL_FILES+=src/windows.h >>>>> OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2 >>>>> +CONFIGURE_DIR= >>>>> +CONFIGURE_ACTION=libtoolize && aclocal && autoconf && .$/configure >>>>> +# do not enable grddl parser (#i93768#) >>>>> +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc >>>>> --with-openssl-digests --enable-parsers="rdfxml ntriples turtle trig >>>>> guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql >>>>> --without-postgresql --without-threestore >>>>> --with-regex-library=posix --with-decimal=none --with-www=xml >>>>> --prefix=$(PWD)/$(OUT) --includedir=(PWD)$/$(INCCOM) >>>>> --libdir=$(PWD)$/$(LB) >>>>> +BUILD_ACTION=$(GNUMAKE) >>>>> +BUILD_FLAGS+= -j$(EXTMAXPROCESS) >>>>> +BUILD_DIR=$(CONFIGURE_DIR) >>>>> .ELIF "$(OS)"=="WNT" >>>>> .IF "$(COM)"=="GCC" >>>>> OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw >>>>> @@ -77,12 +77,16 @@ raptor_LIBS+=$(MINGW_SHARED_LIBSTDCPP) >>>>> CONFIGURE_DIR= >>>>> CONFIGURE_ACTION=.$/configure >>>>> # do not enable grddl parser (#i93768#) >>>>> -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc >>>>> --with-openssl-digests --with-xml-parser=libxml >>>>> --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" >>>>> --without-bdb --without-sqlite --without-mysql --without-postgresql >>>>> --without-threestore --with-regex-library=posix >>>>> --with-decimal=none --with-www=xml --build=i586-pc-mingw32 >>>>> --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" >>>>> CC="$(raptor_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" >>>>> LDFLAGS="-no-undefined >>>>> -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols >>>>> -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) >>>>> objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)" >>>>> +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc >>>>> --with-openssl-digests --enable-parsers="rdfxml ntriples turtle trig >>>>> guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql >>>>> --without-postgresql --without-threestore >>>>> --with-regex-library=posix --with-decimal=none --with-www=xml >>>>> --build=i586-pc-mingw32 --host=i586-pc-mingw32 >>>>> lt_cv_cc_dll_switch="-shared" --prefix=$(PWD)/$(OUT) >>>>> --includedir=(PWD)$/$(INCCOM) --libdir=$(PWD)$/$(LB) >>>>> --CC="$(raptor_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" >>>>> LDFLAGS="-no-undefined >>>>> -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols >>>>> -L$(ILIB:s/;/ -L/)" LIBS="$(raptor_LIBS)" OBJDUMP="$(WRAPCMD) >>>>> objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)" >>>>> BUILD_ACTION=$(GNUMAKE) >>>>> BUILD_FLAGS+= -j$(EXTMAXPROCESS) >>>>> BUILD_DIR=$(CONFIGURE_DIR) >>>>> .ELSE >>>>> # there is no wntmsci build environment in the tarball; we use >>>>> custom dmakefile >>>>> +OOO_PATCH_FILES+=$(TARFILE_NAME).patch.win32 >>>>> +CONFIGURE_ACTION= ${PERL} -p -e '$$prefix="'$(PWD)/$(OUT)'"; >>>>> $$libdir="'$(PWD)/$(LB)'"; $$incdir="'$(PWD)/$(INCCOM)'"; >>>>> $$ldflags="-L$(SOLARLIBDIR) -lxml2 -lm";' -e >>>>> 's/\@prefix\@/$$prefix/; s/\@exec_prefix\@/\$${prefix}/; >>>>> s/\@libdir\@/$$libdir/; s/\@includedir\@/$$incdir/; >>>>> s/\@PACKAGE\@/raptor2/; s/\@VERSION\@/2.0.15/; >>>>> s/\@PKG_CONFIG_REQUIRES\@//; s/\@RAPTOR_LDFLAGS\@/$$ldflags/;' < >>>>> raptor2.pc.in > raptor2.pc && \ >>>>> + ${PERL} -p -e >>>>> 's/\@RAPTOR_VERSION_DECIMAL\@/20015/;s/\@VERSION\@/2.0.15/;s/\@RAPTOR_VERSION_MAJOR\@/2/;s/\@RAPTOR_VERSION_MINOR\@/0/;s/\@RAPTOR_VERSION_RELEASE\@/15/' >>>>> >>>>> < src/raptor2.h.in > src/raptor2.h && \ >>>>> + $(COPY) src/raptor_config.h.in src/raptor_config.h >>>>> BUILD_ACTION=dmake >>>>> BUILD_DIR=$(CONFIGURE_DIR)$/src >>>>> .ENDIF >>>>> @@ -124,7 +128,11 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake vari >>>>> CONFIGURE_DIR= >>>>> CONFIGURE_ACTION=.$/configure >>>>> # do not enable grddl parser (#i93768#) >>>>> -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads >>>>> --with-openssl-digests --with-xml-parser=libxml >>>>> --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" >>>>> --without-bdb --without-sqlite --without-mysql --without-postgresql >>>>> --without-threestore --with-regex-library=posix >>>>> --with-decimal=none --with-www=xml >>>>> +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc >>>>> --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" >>>>> --with-www=xml --prefix=$(PDW)/$(OUT) --includedir=$(PWD)/$(INCCOM) >>>>> --libdir=$(PWD)/$(LB) >>>>> +.IF "$(SYSTEM_LIBXML)" == "NO" >>>>> +CONFIGURE_FLAGS+=--with-xml2-config=${SOLARVERSION}/${INPATH}/bin/xml2-config >>>>> >>>>> \ >>>>> + --with-xslt-config=${SOLARVERSION}/${INPATH}/bin/xslt-config >>>>> +.ENDIF >>>>> BUILD_ACTION=$(GNUMAKE) >>>>> BUILD_FLAGS+= -j$(EXTMAXPROCESS) >>>>> BUILD_DIR=$(CONFIGURE_DIR) >>>>> @@ -133,24 +141,22 @@ BUILD_DIR=$(CONFIGURE_DIR) >>>>> .ENDIF >>>>> -OUT2INC+=src/raptor.h >>>>> +OUT2INC+=src/raptor.h src/raptor2.h src/raptor_config.h >>>>> .IF "$(OS)"=="MACOSX" >>>>> -OUT2LIB+=src$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib >>>>> src$/.libs$/libraptor.dylib >>>>> -OUT2BIN+=src/raptor-config >>>>> +OUT2LIB+=src$/.libs$/libraptor2.$(RAPTOR_MAJOR).dylib >>>>> src$/.libs$/libraptor2.dylib >>>>> .ELIF "$(OS)"=="WNT" >>>>> .IF "$(COM)"=="GCC" >>>>> OUT2LIB+=src$/.libs$/*.a >>>>> OUT2BIN+=src$/.libs$/*.dll >>>>> -OUT2BIN+=src/raptor-config >>>>> .ELSE >>>>> # if we use dmake, this is done automagically >>>>> .ENDIF >>>>> .ELIF "$(GUI)"=="OS2" >>>>> -# if we use dmake, this is done automagically >>>>> +OUT2LIB+=src$/.libs$/*.a >>>>> +OUT2BIN+=src$/.libs$/*.dll >>>>> .ELSE >>>>> -OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) >>>>> src$/.libs$/libraptor.so >>>>> -OUT2BIN+=src/raptor-config >>>>> +OUT2LIB+=src$/.libs$/libraptor2.so.$(RAPTOR_MAJOR) >>>>> src$/.libs$/libraptor2.so >>>>> .ENDIF >>>>> # --- Targets >>>>> ------------------------------------------------------ >>>>> >>>>> Modified: openoffice/branches/AOO416/main/redland/rasqal/makefile.mk >>>>> URL: >>>>> http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/redland/rasqal/makefile.mk?rev=1843108&r1=1843107&r2=1843108&view=diff >>>>> >>>>> ============================================================================== >>>>> >>>>> >>>>> --- openoffice/branches/AOO416/main/redland/rasqal/makefile.mk >>>>> (original) >>>>> +++ openoffice/branches/AOO416/main/redland/rasqal/makefile.mk Mon >>>>> Oct 8 06:09:21 2018 >>>>> @@ -40,27 +40,27 @@ all: >>>>> .INCLUDE : ../redlandversion.mk >>>>> -RASQALVERSION=0.9.16 >>>>> +RASQALVERSION=0.9.33 >>>>> TARFILE_NAME=rasqal-$(RASQALVERSION) >>>>> -TARFILE_MD5=fca8706f2c4619e2fa3f8f42f8fc1e9d >>>>> +TARFILE_MD5=1f5def51ca0026cd192958ef07228b52 >>>>> -ADDITIONAL_FILES=src/makefile.mk src/rasqal_config.h >>>>> +ADDITIONAL_FILES=src/makefile.mk >>>>> OOO_PATCH_FILES= \ >>>>> - $(TARFILE_NAME).patch.autotools \ >>>>> $(TARFILE_NAME).patch.ooo_build \ >>>>> $(TARFILE_NAME).patch.dmake \ >>>>> - $(TARFILE_NAME).patch.win32 >>>>> PATCH_FILES=$(OOO_PATCH_FILES) >>>>> .IF "$(OS)"=="OS2" >>>>> -BUILD_ACTION=dmake >>>>> -BUILD_DIR=$(CONFIGURE_DIR)$/src >>>>> -ADDITIONAL_FILES+=src/windows.h >>>>> -OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2 >>>>> +CONFIGURE_DIR= >>>>> +CONFIGURE_ACTION=libtoolize && aclocal && autoconf && .$/configure >>>>> RAPTOR2_CFLAGS=-I${PWD}$/..$/${INPATH}/inc >>>>> RAPTOR2_LIBS='-L${PWD}$/..$/${INPATH}/lib -lraptor2 -lxml2 -lcurl' >>>>> PKG_CONFIG_PATH='../raptor2-2.0.15;../rasqal-0.9.33' >>>>> +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc >>>>> --with-regex-library=posix --with-decimal=none >>>>> +BUILD_ACTION=$(GNUMAKE) >>>>> +BUILD_FLAGS+= -j$(EXTMAXPROCESS) >>>>> +BUILD_DIR=$(CONFIGURE_DIR) >>>>> .ELIF "$(OS)"=="WNT" >>>>> .IF "$(COM)"=="GCC" >>>>> rasqal_CC=$(CC) -mthreads >>>>> @@ -80,6 +80,12 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS) >>>>> BUILD_DIR=$(CONFIGURE_DIR) >>>>> .ELSE >>>>> # there is no wntmsci build environment in the tarball; we use >>>>> custom dmakefile >>>>> +OOO_PATCH_FILES+= $(TARFILE_NAME).patch.win32 >>>>> +CONFIGURE_ACTION= ${PERL} -p -e '$$prefix="'$(PWD)/$(OUT)'"; >>>>> $$libdir="'$(PWD)/$(LB)'"; $$incdir="'$(PWD)/$(INCCOM)'"; >>>>> $$ldflags="-L$(SOLARLIBDIR) -lraptor2 -lm";' -e >>>>> 's/\@prefix\@/$$prefix/; s/\@exec_prefix\@/\$${prefix}/; >>>>> s/\@libdir\@/$$libdir/; s/\@includedir\@/$$incdir/; >>>>> s/\@PACKAGE\@/rasqal/; s/\@VERSION\@/0.9.33/; >>>>> s/\@PKG_CONFIG_REQUIRES\@/raptor2 >= 2.0.7/; >>>>> s/\@RAPTOR_LDFLAGS\@/$$ldflags/;' < rasqal.pc.in > rasqal.pc && \ >>>>> + ${PERL} -p -e >>>>> 's/\@RASQAL_VERSION_DECIMAL\@/933/;s/\@VERSION\@/0.9.33/;s/\@RASQAL_VERSION_MAJOR\@/0/;s/\@RASQAL_VERSION_MINOR\@/9/;s/\@RASQAL_VERSION_RELEASE\@/33/;s/\@HAVE_SYS_TIME_H\@/0/;s/\@HAVE_TIME_H\@/1/;s/\@RAPTOR_VERSION_DEC\@/2.0.15/' >>>>> >>>>> < src/rasqal.h.in > src/rasqal.h && \ >>>>> + $(COPY) src/rasqal_config.h.in src/rasqal_config.h && \ >>>>> + $(COPY) src/snprintf.c src/rasqal_snprintf.c && \ >>>>> + $(COPY) libsv/sv.c src/sv.c >>>>> BUILD_ACTION=dmake >>>>> BUILD_DIR=$(CONFIGURE_DIR)$/src >>>>> .ENDIF >>>>> @@ -118,8 +124,11 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake vari >>>>> .EXPORT: XSLTLIB >>>>> CONFIGURE_DIR= >>>>> -CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" >>>>> -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads >>>>> --with-openssl-digests --with-xml-parser=libxml --without-bdb >>>>> --without-sqlite --without-mysql --without-postgresql >>>>> --without-threestore --with-regex-library=posix >>>>> --with-decimal=none --with-www=xml >>>>> +CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" >>>>> RASQAL_CFLAGS=-I${PWD}$/..$/${INPATH}/inc >>>>> RASQAL_LIBS="-L${PWD}/..$/${INPATH}/lib -lrasqual" >>>>> RAPTOR2_CFLAGS=-I${PWD}$/..$/${INPATH}/inc >>>>> RAPTOR2_LIBS="-L${PWD}/..$/${INPATH}/lib -lraptor2" >>>>> PKG_CONFIG_PATH="../raptor2-2.0.15:../rasqal-0.9.33" >>>>> +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc >>>>> --with-regex-library=posix --with-decimal=none >>>>> +.IF "$(SYSTEM_LIBXML)" == "NO" >>>>> +CONFIGURE_FLAGS+=--with-xml2-config=${SOLARVERSION}/${INPATH}/bin/xml2-config >>>>> >>>>> >>>>> +.ENDIF >>>>> BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) >>>>> BUILD_FLAGS+= -j$(EXTMAXPROCESS) >>>>> BUILD_DIR=$(CONFIGURE_DIR) >>>>> @@ -142,7 +151,8 @@ OUT2BIN+=src/rasqal-config >>>>> # if we use dmake, this is done automagically >>>>> .ENDIF >>>>> .ELIF "$(OS)"=="OS2" >>>>> -# if we use dmake, this is done automagically >>>>> +OUT2LIB+=src$/.libs$/*.a >>>>> +OUT2BIN+=src$/.libs$/*.dll >>>>> .ELSE >>>>> OUT2LIB+=src$/.libs$/librasqal.so.$(RASQAL_MAJOR) >>>>> src$/.libs$/librasqal.so >>>>> OUT2BIN+=src/rasqal-config >>>>> >>>>> Modified: openoffice/branches/AOO416/main/redland/redland/makefile.mk >>>>> URL: >>>>> http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/redland/redland/makefile.mk?rev=1843108&r1=1843107&r2=1843108&view=diff >>>>> >>>>> ============================================================================== >>>>> >>>>> >>>>> --- openoffice/branches/AOO416/main/redland/redland/makefile.mk >>>>> (original) >>>>> +++ openoffice/branches/AOO416/main/redland/redland/makefile.mk Mon >>>>> Oct 8 06:09:21 2018 >>>>> @@ -40,27 +40,29 @@ all: >>>>> .INCLUDE : ../redlandversion.mk >>>>> -REDLANDVERSION=1.0.8 >>>>> +REDLANDVERSION=1.0.17 >>>>> TARFILE_NAME=redland-$(REDLANDVERSION) >>>>> -TARFILE_MD5=ca66e26082cab8bb817185a116db809b >>>>> +TARFILE_MD5=e5be03eda13ef68aabab6e42aa67715e >>>>> -ADDITIONAL_FILES=librdf/makefile.mk librdf/rdf_config.h >>>>> +ADDITIONAL_FILES=src/makefile.mk src/rdf_config.h >>>>> OOO_PATCH_FILES= \ >>>>> $(TARFILE_NAME).patch.autotools \ >>>>> $(TARFILE_NAME).patch.dmake \ >>>>> $(TARFILE_NAME).patch.ooo_build \ >>>>> - $(TARFILE_NAME).patch.win32 >>>>> PATCH_FILES=$(OOO_PATCH_FILES) \ >>>>> .IF "$(OS)"=="OS2" >>>>> -BUILD_ACTION=dmake >>>>> -BUILD_DIR=$(CONFIGURE_DIR)$/librdf >>>>> -ADDITIONAL_FILES+=librdf/windows.h >>>>> OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2 >>>>> +CONFIGURE_DIR= >>>>> +CONFIGURE_ACTION=libtoolize --force && aclocal && autoconf && >>>>> .$/configure RAPTOR2_CFLAGS=-I${PWD}$/..$/${INPATH}/inc >>>>> RAPTOR2_LIBS='-L${PWD}/..$/${INPATH}/lib -lraptor2 -lxml2 -lcurl' >>>>> PKG_CONFIG_PATH='../raptor2-2.0.15;../rasqal-0.9.33' >>>>> +CONFIGURE_FLAGS=--disable-dependency-tracking --disable-static >>>>> --disable-gtk-doc --with-threads --with-openssl-digests >>>>> --with-xml-parser=libxml --with-raptor=system --with-rasqual=system >>>>> --without-bdb --without-sqlite --without-mysql --without-postgresql >>>>> --without-threestore -without-iodbc --without-unixodbc >>>>> --without-datadirect --without-virtuoso --with-regex-library=posix >>>>> --with-decimal=none --with-www=xml --disable-ltdl-install >>>>> --disable-modular --without-included-ltdl --disable-ltdl-convenience >>>>> +BUILD_ACTION=$(GNUMAKE) >>>>> +BUILD_FLAGS+= -j$(EXTMAXPROCESS) >>>>> +BUILD_DIR=$(CONFIGURE_DIR) >>>>> .ELIF "$(OS)"=="WNT" >>>>> .IF "$(COM)"=="GCC" >>>>> redland_CC=$(CC) -mthreads >>>>> @@ -80,8 +82,11 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS) >>>>> BUILD_DIR=$(CONFIGURE_DIR) >>>>> .ELSE >>>>> # there is no wntmsci build environment in the tarball; we use >>>>> custom dmakefile >>>>> +OOO_PATCH_FILES+= $(TARFILE_NAME).patch.win32 >>>>> +CONFIGURE_ACTION= \ >>>>> + $(COPY) src/rdf_config.h.in src/rdf_config.h >>>>> BUILD_ACTION=dmake >>>>> -BUILD_DIR=$(CONFIGURE_DIR)$/librdf >>>>> +BUILD_DIR=$(CONFIGURE_DIR)$/src >>>>> .ENDIF >>>>> .ELSE # "WNT" >>>>> @@ -122,8 +127,9 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake vari >>>>> .EXPORT: XSLTLIB >>>>> CONFIGURE_DIR= >>>>> -CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" >>>>> -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads >>>>> --with-openssl-digests --with-xml-parser=libxml --with-raptor=system >>>>> --with-rasqual=system --without-bdb --without-sqlite --without-mysql >>>>> --without-postgresql --without-threestore >>>>> --with-regex-library=posix --with-decimal=none --with-www=xml >>>>> +#CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" >>>>> RAPTOR2_CFLAGS=-I${PWD}$/..$/${INPATH}/inc >>>>> RAPTOR2_LIBS="-L${PWD}/..$/${INPATH}/lib -lraptor2" >>>>> PKG_CONFIG_PATH="../raptor2-2.0.15:../rasqal-0.9.33" >>>>> +CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" >>>>> PKG_CONFIG_PATH="../raptor2-2.0.15:../rasqal-0.9.33" >>>>> +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads >>>>> --with-openssl-digests --with-xml-parser=libxml --with-raptor=system >>>>> --with-rasqual=system --without-bdb --without-sqlite --without-mysql >>>>> --without-postgresql --without-threestore -without-iodbc >>>>> --without-unixodbc --without-datadirect --without-virtuoso >>>>> --with-regex-library=posix --with-decimal=none --with-www=xml >>>>> --disable-ltdl-install --disable-modular --without-included-ltdl >>>>> --disable-ltdl-convenience >>>>> BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) >>>>> BUILD_FLAGS+= -j$(EXTMAXPROCESS) >>>>> BUILD_DIR=$(CONFIGURE_DIR) >>>>> @@ -132,21 +138,41 @@ BUILD_DIR=$(CONFIGURE_DIR) >>>>> .ENDIF >>>>> -OUT2INC+=librdf$/*.h >>>>> +OUT2INC+=src$/librdf.h src$/redland.h \ >>>>> + src$/rdf_concepts.h \ >>>>> + src$/rdf_digest.h \ >>>>> + src$/rdf_hash.h \ >>>>> + src$/rdf_init.h \ >>>>> + src$/rdf_iterator.h \ >>>>> + src$/rdf_list.h \ >>>>> + src$/rdf_log.h \ >>>>> + src$/rdf_model.h \ >>>>> + src$/rdf_node.h \ >>>>> + src$/rdf_parser.h \ >>>>> + src$/rdf_query.h \ >>>>> + src$/rdf_raptor.h \ >>>>> + src$/rdf_serializer.h \ >>>>> + src$/rdf_statement.h \ >>>>> + src$/rdf_storage.h \ >>>>> + src$/rdf_storage_module.h \ >>>>> + src$/rdf_stream.h \ >>>>> + src$/rdf_uri.h \ >>>>> + src$/rdf_utf8.h \ >>>>> .IF "$(OS)"=="MACOSX" >>>>> -OUT2LIB+=librdf$/.libs$/librdf.$(REDLAND_MAJOR).dylib >>>>> +OUT2LIB+=src$/.libs$/librdf.$(REDLAND_MAJOR).dylib >>>>> .ELIF "$(OS)"=="WNT" >>>>> .IF "$(COM)"=="GCC" >>>>> -OUT2LIB+=librdf$/.libs$/*.a >>>>> -OUT2BIN+=librdf$/.libs$/*.dll >>>>> +OUT2LIB+=src$/.libs$/*.a >>>>> +OUT2BIN+=src$/.libs$/*.dll >>>>> .ELSE >>>>> # if we use dmake, this is done automagically >>>>> .ENDIF >>>>> .ELIF "$(OS)"=="OS2" >>>>> -# if we use dmake, this is done automagically >>>>> +OUT2LIB+=src$/.libs$/*.a >>>>> +OUT2BIN+=src$/.libs$/*.dll >>>>> .ELSE >>>>> -OUT2LIB+=librdf$/.libs$/librdf.so.$(REDLAND_MAJOR) >>>>> +OUT2LIB+=src$/.libs$/librdf.so.$(REDLAND_MAJOR) >>>>> .ENDIF >>>>> # --- Targets >>>>> ------------------------------------------------------ >>>>> >>>>> Modified: openoffice/branches/AOO416/main/redland/redlandversion.mk >>>>> URL: >>>>> http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/redland/redlandversion.mk?rev=1843108&r1=1843107&r2=1843108&view=diff >>>>> >>>>> ============================================================================== >>>>> >>>>> >>>>> --- openoffice/branches/AOO416/main/redland/redlandversion.mk >>>>> (original) >>>>> +++ openoffice/branches/AOO416/main/redland/redlandversion.mk Mon >>>>> Oct 8 06:09:21 2018 >>>>> @@ -21,8 +21,8 @@ >>>>> -RAPTOR_MAJOR=1 >>>>> -RASQAL_MAJOR=1 >>>>> +RAPTOR_MAJOR=0 >>>>> +RASQAL_MAJOR=3 >>>>> # redland has no stable abi >>>>> REDLAND_MAJOR=0 >>>>> Modified: >>>>> openoffice/branches/AOO416/main/scp2/source/ooo/file_library_ooo.scp >>>>> URL: >>>>> http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/scp2/source/ooo/file_library_ooo.scp?rev=1843108&r1=1843107&r2=1843108&view=diff >>>>> >>>>> ============================================================================== >>>>> >>>>> >>>>> --- >>>>> openoffice/branches/AOO416/main/scp2/source/ooo/file_library_ooo.scp >>>>> (original) >>>>> +++ >>>>> openoffice/branches/AOO416/main/scp2/source/ooo/file_library_ooo.scp >>>>> Mon Oct 8 06:09:21 2018 >>>>> @@ -1839,9 +1839,9 @@ File gid_File_Lib_Raptor >>>>> Dir = SCP2_OOO_BIN_DIR; >>>>> #ifdef UNX >>>>> #ifdef MACOSX >>>>> - Name = STRING(CONCAT4(libraptor,.,RAPTOR_MAJOR,UNXSUFFIX)); >>>>> + Name = STRING(CONCAT4(libraptor2,.,RAPTOR_MAJOR,UNXSUFFIX)); >>>>> #else >>>>> - Name = STRING(CONCAT4(libraptor,UNXSUFFIX,.,RAPTOR_MAJOR)); >>>>> + Name = STRING(CONCAT4(libraptor2,UNXSUFFIX,.,RAPTOR_MAJOR)); >>>>> #endif >>>>> #elif defined(OS2) >>>>> Name = "raptor.dll"; >>>>> >>>>> >>>>> >>> >>> >>> >>> --------------------------------------------------------------------- >>> To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org >>> For additional commands, e-mail: dev-h...@openoffice.apache.org >>> >> > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org > For additional commands, e-mail: dev-h...@openoffice.apache.org >
smime.p7s
Description: S/MIME Cryptographic Signature
