From dev-return-63899-archive-asf-public=cust-asf.ponee.io@openoffice.apache.org Tue Oct 9 12:41:41 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id E6C57180668 for ; Tue, 9 Oct 2018 12:41:39 +0200 (CEST) Received: (qmail 15077 invoked by uid 500); 9 Oct 2018 10:41:38 -0000 Mailing-List: contact dev-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list dev@openoffice.apache.org Received: (qmail 15066 invoked by uid 99); 9 Oct 2018 10:41:38 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Oct 2018 10:41:38 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 69322180A78 for ; Tue, 9 Oct 2018 10:41:38 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.278 X-Spam-Level: X-Spam-Status: No, score=-0.278 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LOTSOFHASH=0.25, RCVD_IN_DNSWL_MED=-2.3, SPF_SOFTFAIL=0.972] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id gy8XWr3k2SCm for ; Tue, 9 Oct 2018 10:41:31 +0000 (UTC) Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.142]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTPS id 3C1A95F175 for ; Tue, 9 Oct 2018 10:41:31 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id E531F2400FB for ; Tue, 9 Oct 2018 12:41:29 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 42Tv0n1SBjz9rxP for ; Tue, 9 Oct 2018 12:41:29 +0200 (CEST) Subject: Re: svn commit: r1843108 - in /openoffice/branches/AOO416: ./ ext_libraries/serf/ main/ main/redland/ main/redland/prj/ main/redland/raptor/ main/redland/rasqal/ main/redland/redland/ main/scp2/source/ooo/ To: dev@openoffice.apache.org References: <20181008060922.635CD3A0162@svn01-us-west.apache.org> <1c827db6-2461-0d4b-03e3-954c67e2f23e@hamburg.de> <71395919-6d8d-b172-b61d-80d8d415afe6@hamburg.de> From: Peter Kovacs Organization: Open Office Project Message-ID: <5df2723b-eee9-f636-b61c-66f0e02d25e5@Apache.org> Date: Tue, 9 Oct 2018 12:41:28 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 In-Reply-To: <71395919-6d8d-b172-b61d-80d8d415afe6@hamburg.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Content-Language: en-US-large 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/step= s/configure/logs/stdio >>> >>> >>> Regards, >>> >>> =C2=A0=C2=A0=C2=A0 Matthias >>> >>> >>> Am 08.10.2018 um 08:09 schrieb petko@apache.org: >>>> Author: petko >>>> Date: Mon Oct=C2=A0 8 06:09:21 2018 >>>> New Revision: 1843108 >>>> >>>> URL: http://svn.apache.org/viewvc?rev=3D1843108&view=3Drev >>>> Log: >>>> merged in: Issue 127887 - update bundled redland/raptor/rasqal >>>> >>>> Added: >>>> =20 >>>> openoffice/branches/AOO416/main/redland/raptor/raptor2-2.0.15.patch.= dmake >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 - copied unchanged from r17577= 89, >>>> openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.dmake >>>> =20 >>>> openoffice/branches/AOO416/main/redland/raptor/raptor2-2.0.15.patch.= os2 >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 - copied unchanged from r18180= 98, >>>> openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.os2 >>>> =20 >>>> openoffice/branches/AOO416/main/redland/raptor/raptor2-2.0.15.patch.= win32 >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 - copied unchanged from r17577= 89, >>>> openoffice/trunk/main/redland/raptor/raptor2-2.0.15.patch.win32 >>>> =20 >>>> openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.33.patch.d= make >>>> >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 - copied unchanged from r17577= 89, >>>> openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.dmake >>>> =20 >>>> openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.33.patch.o= oo_build >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 - copied unchanged from r17577= 89, >>>> openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.ooo_build >>>> =20 >>>> openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.33.patch.w= in32 >>>> >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 - copied unchanged from r17577= 89, >>>> openoffice/trunk/main/redland/rasqal/rasqal-0.9.33.patch.win32 >>>> =20 >>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.17.patch= =2Eautotools >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 - copied unchanged from r17577= 89, >>>> openoffice/trunk/main/redland/redland/redland-1.0.17.patch.autotools= >>>> =20 >>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.17.patch= =2Edmake >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 - copied unchanged from r17577= 89, >>>> openoffice/trunk/main/redland/redland/redland-1.0.17.patch.dmake >>>> =20 >>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.17.patch= =2Eooo_build >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 - copied unchanged from r17577= 89, >>>> openoffice/trunk/main/redland/redland/redland-1.0.17.patch.ooo_build= >>>> =20 >>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.17.patch= =2Eos2 >>>> >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 - copied unchanged from r18180= 98, >>>> openoffice/trunk/main/redland/redland/redland-1.0.17.patch.os2 >>>> =20 >>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.17.patch= =2Ewin32 >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 - copied unchanged from r17577= 89, >>>> openoffice/trunk/main/redland/redland/redland-1.0.17.patch.win32 >>>> Removed: >>>> =20 >>>> openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.a= utotools >>>> =20 >>>> openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.d= make >>>> >>>> =20 >>>> openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.f= ixes >>>> >>>> =20 >>>> openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.o= oo_build >>>> =20 >>>> openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.o= s2 >>>> =20 >>>> openoffice/branches/AOO416/main/redland/raptor/raptor-1.4.18.patch.w= in32 >>>> >>>> =20 >>>> openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.a= utotools >>>> =20 >>>> openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.d= make >>>> >>>> =20 >>>> openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.o= oo_build >>>> =20 >>>> openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.o= s2 >>>> =20 >>>> openoffice/branches/AOO416/main/redland/rasqal/rasqal-0.9.16.patch.w= in32 >>>> >>>> =20 >>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.= autotools >>>> =20 >>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.= dmake >>>> =20 >>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.= ooo_build >>>> =20 >>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.= os2 >>>> =20 >>>> openoffice/branches/AOO416/main/redland/redland/redland-1.0.8.patch.= win32 >>>> Modified: >>>> =C2=A0=C2=A0=C2=A0=C2=A0 openoffice/branches/AOO416/=C2=A0=C2=A0 (p= rops changed) >>>> =C2=A0=C2=A0=C2=A0=C2=A0 openoffice/branches/AOO416/ext_libraries/s= erf/makefile.mk >>>> =C2=A0=C2=A0=C2=A0=C2=A0 openoffice/branches/AOO416/main/=C2=A0=C2=A0= (props changed) >>>> =C2=A0=C2=A0=C2=A0=C2=A0 openoffice/branches/AOO416/main/configure.= in >>>> =C2=A0=C2=A0=C2=A0=C2=A0 openoffice/branches/AOO416/main/external_d= eps.lst >>>> =C2=A0=C2=A0=C2=A0=C2=A0 openoffice/branches/AOO416/main/redland/=C2= =A0=C2=A0 (props changed) >>>> =C2=A0=C2=A0=C2=A0=C2=A0 openoffice/branches/AOO416/main/redland/pr= j/d.lst >>>> =C2=A0=C2=A0=C2=A0=C2=A0 openoffice/branches/AOO416/main/redland/ra= ptor/makefile.mk >>>> =C2=A0=C2=A0=C2=A0=C2=A0 openoffice/branches/AOO416/main/redland/ra= sqal/makefile.mk >>>> =C2=A0=C2=A0=C2=A0=C2=A0 openoffice/branches/AOO416/main/redland/re= dland/makefile.mk >>>> =C2=A0=C2=A0=C2=A0=C2=A0 openoffice/branches/AOO416/main/redland/re= dlandversion.mk >>>> =20 >>>> openoffice/branches/AOO416/main/scp2/source/ooo/file_library_ooo.scp= >>>> >>>> Propchange: openoffice/branches/AOO416/ >>>> --------------------------------------------------------------------= ---------- >>>> >>>> --- svn:mergeinfo (original) >>>> +++ svn:mergeinfo Mon Oct=C2=A0 8 06:09:21 2018 >>>> @@ -2,5 +2,5 @@ >>>> =C2=A0 /openoffice/branches/ia2:1417739-1541842 >>>> =20 >>>> /openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547= 030,1547392,1551920,1551954,1551958,1552283 >>>> =20 >>>> /openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,15= 49902,1560617 >>>> -/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1= 574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,15= 81746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,158= 5171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592= 716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,15971= 02,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,160086= 1,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,1= 610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,16= 23849-1623850,1642300-1642302,1647713,1652476,1654282,1668939,1669457,166= 9459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694= 131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543,17055= 51,1706649,1707397,1707659,1723875,1729921,1730154,174 >>>> >>>> =20 >>>> 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,1= 804182,1805208,1806314,1811013,1811435,1811737,1813450,1814994,1815700,18= 25850,1839130,1839837,1840427 >>>> +/openoffice/trunk:1571617,1571619,1571677,1572577,1572587,1573547,1= 574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,15= 81746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,158= 5171,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592= 716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,15971= 02,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,160086= 1,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,1= 610347,1610411,1610422,1610671,1611549,1612539,1612801,1621121,1623847,16= 23849-1623850,1642300-1642302,1647713,1652476,1654282,1668939,1669457,166= 9459,1669462-1669463,1669465,1689883,1689959,1690740,1690755,1690854,1694= 131-1694132,1694701,1702894,1702898,1702986,1702988,1705542-1705543,17055= 51,1706649,1707397,1707659,1723875,1729921,1730154,174 >>>> >>>> =20 >>>> 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,1= 803939,1804182,1805089,1805208,1806314,1811013,1811435,1811737,1813450,18= 14994,1815700,1818098,1825850,1839130,1839837,1840427 >>>> =C2=A0 /openoffice/trunk/main:1705369 >>>> >>>> Modified: openoffice/branches/AOO416/ext_libraries/serf/makefile.mk >>>> URL: >>>> http://svn.apache.org/viewvc/openoffice/branches/AOO416/ext_librarie= s/serf/makefile.mk?rev=3D1843108&r1=3D1843107&r2=3D1843108&view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>>> >>>> --- openoffice/branches/AOO416/ext_libraries/serf/makefile.mk >>>> (original) >>>> +++ openoffice/branches/AOO416/ext_libraries/serf/makefile.mk Mon >>>> Oct=C2=A0 8 06:09:21 2018 >>>> @@ -108,7 +108,7 @@ BUILD_FLAGS+=3D -j$(EXTMAXPROCESS) >>>> =C2=A0 # Serf names its library only with the major number. >>>> =C2=A0 # We are using minor and micro as well.=C2=A0 Fix that here >>>> =C2=A0 # by creating a copy with the right name. >>>> -SERF_ORIGINAL_LIB=3D.libs/libserf-$(SERF_MAJOR).0.0.0.dylib >>>> +SERF_ORIGINAL_LIB=3D.libs/libserf-$(SERF_MAJOR).0.dylib >>>> =C2=A0 SERF_FIXED_LIB=3D.libs/libserf-$(LIBSERFVERSION).0.dylib >>>> =C2=A0 INSTALL_ACTION=3Dif [ -f "$(SERF_ORIGINAL_LIB)" -a ! -f >>>> "$(SERF_FIXED_LIB)" ]; then cp $(SERF_ORIGINAL_LIB) >>>> $(SERF_FIXED_LIB); fi >>>> =C2=A0 .ENDIF >>>> >>>> Propchange: openoffice/branches/AOO416/main/ >>>> --------------------------------------------------------------------= ---------- >>>> >>>> --- svn:mergeinfo (original) >>>> +++ svn:mergeinfo Mon Oct=C2=A0 8 06:09:21 2018 >>>> @@ -2,4 +2,4 @@ >>>> =C2=A0 /openoffice/branches/ia2/main:1417739-1541842 >>>> =20 >>>> /openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934= ,1547030,1547392,1551920,1551954,1551958,1552283 >>>> =20 >>>> /openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,15363= 12,1549902,1560617 >>>> -/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574= 058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,15817= 46,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,158517= 1,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,1= 600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,16= 04028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,160= 7111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609= 302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-16120= 71,1612539,1612801,1616457,1616944,1620195,1621121,1623847,1623849-162385= 0,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 >>>> >>>> =20 >>>> 7,1700078,1700126,1700135,1702107,1702894,1702898,1702986,1702988,17= 05193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1706649,170= 7167,1707169-1707170,1707175,1707397,1707408,1707412,1707642,1707645,1707= 659,1707844,1708477,1708483,1709212,1709377,1709403,1723875,1729921,17301= 54,1748497,1754469,1755873,1756017,1758150,1760461,1761439,1761808,176301= 7,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,1574= 058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,15817= 46,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,158517= 1,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,1= 600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,16= 04028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,160= 7111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609= 302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-16120= 71,1612539,1612801,1616457,1616944,1620195,1621121,1623847,1623849-162385= 0,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 >>>> >>>> =20 >>>> 7,1700078,1700126,1700135,1702107,1702894,1702898,1702986,1702988,17= 05193,1705196,1705199,1705276,1705364,1705368-1705369,1705542,1706649,170= 7167,1707169-1707170,1707175,1707397,1707408,1707412,1707642,1707645,1707= 659,1707844,1708477,1708483,1709212,1709377,1709403,1723875,1729921,17301= 54,1748497,1754469,1755873,1756017,1757789,1758150,1760461,1761439,176180= 8,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,1= 839130,1839837,1840427 >>>> >>>> Modified: openoffice/branches/AOO416/main/configure.in >>>> URL: >>>> http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/configu= re.in?rev=3D1843108&r1=3D1843107&r2=3D1843108&view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>>> >>>> --- openoffice/branches/AOO416/main/configure.in (original) >>>> +++ openoffice/branches/AOO416/main/configure.in Mon Oct=C2=A0 8 06:= 09:21 >>>> 2018 >>>> @@ -1146,7 +1146,7 @@ case "$build_os" in >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 CC=3D"`xcrun -f clang` -arch x86_64" >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if test ! -n= "$CXX"; then >>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 CXX=3D= "`xcrun -f clang++` -arch x86_64 -std=3Dc++11" >>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 CXX=3D= "`xcCXX=3D"`xcrun -f clang++` -arch x86_64" >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ;; >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 os2*) >>>> @@ -3914,17 +3914,17 @@ dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >>>> =C2=A0 dnl Checks for a MacOS platform SDK compatible with an OSX 1= 0.7 >>>> deployment target >>>> =C2=A0 dnl >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >>>> =C2=A0 if test=C2=A0 "$_os" =3D "Darwin"; then >>>> -=C2=A0=C2=A0 sdk_target=3D10.7 >>>> +=C2=A0=C2=A0 sdk_target=3D10.9 >>>> =C2=A0=C2=A0=C2=A0=C2=A0 AC_MSG_CHECKING([checking SDK compatiblity= with OSX $sdk_target]) >>>> =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0 sdk_minor=3D`echo $sdk_target | cut= -d"." -f2` >>>> =C2=A0 -=C2=A0=C2=A0 if test "$sdk_minor" -lt "7"; then >>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 AC_MSG_ERROR([SDK version < 10.7 is = not longer supported]) >>>> +=C2=A0=C2=A0 if test "$sdk_minor" -lt "9"; then >>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 AC_MSG_ERROR([SDK version < 10.9 is = not longer supported]) >>>> =C2=A0=C2=A0=C2=A0=C2=A0 else >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 MACOSX_DEPLOYMENT_TARGET= =3D$sdk_target >>>> =C2=A0 -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sdk_found=3D`xcodebuild -sho= wsdks | egrep "sdk >>>> macosx10.(7|8|9|10|11)" | sed -e "s/.*sdk //" | tail -n1` >>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sdk_found=3D`xcodebuild -showsdks | = $EGREP "sdk >>>> macosx10.(9|10|11|12)" | sed -e "s/.*sdk //" | tail -n1` >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if test -z "$sdk_found";= then >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 AC_MSG= _ERROR([No SDK with OSX $sdk_target compatibility >>>> found]) >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 else >>>> >>>> Modified: openoffice/branches/AOO416/main/external_deps.lst >>>> URL: >>>> http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/externa= l_deps.lst?rev=3D1843108&r1=3D1843107&r2=3D1843108&view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>>> >>>> --- openoffice/branches/AOO416/main/external_deps.lst (original) >>>> +++ openoffice/branches/AOO416/main/external_deps.lst Mon Oct=C2=A0 = 8 >>>> 06:09:21 2018 >>>> @@ -85,21 +85,21 @@ if (ENABLE_NSS_MODULE!=3DNO && SYSTEM_NSS! >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 URL2 =3D $(OOO_EXTRAS)$(MD5)-$(name)= >>>> =C2=A0 =C2=A0 if (SYSTEM_REDLAND !=3D YES) >>>> -=C2=A0=C2=A0=C2=A0 MD5 =3D 284e768eeda0e2898b0d5bf7e26a016e >>>> -=C2=A0=C2=A0=C2=A0 name =3D raptor-1.4.18.tar.gz >>>> -=C2=A0=C2=A0=C2=A0 URL1 =3D http://download.librdf.org/source/rapto= r-1.4.18.tar.gz >>>> +=C2=A0=C2=A0=C2=A0 MD5 =3D a39f6c07ddb20d7dd2ff1f95fa21e2cd >>>> +=C2=A0=C2=A0=C2=A0 name =3D raptor2-2.0.15.tar.gz >>>> +=C2=A0=C2=A0=C2=A0 URL1 =3D http://download.librdf.org/source/rapto= r2-2.0.15.tar.gz >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 URL2 =3D $(OOO_EXTRAS)$(MD5)-$(name)= >>>> =C2=A0 =C2=A0 if (SYSTEM_REDLAND !=3D YES) >>>> -=C2=A0=C2=A0=C2=A0 MD5 =3D ca66e26082cab8bb817185a116db809b >>>> -=C2=A0=C2=A0=C2=A0 name =3D redland-1.0.8.tar.gz >>>> -=C2=A0=C2=A0=C2=A0 URL1 =3D http://download.librdf.org/source/redla= nd-1.0.8.tar.gz >>>> +=C2=A0=C2=A0=C2=A0 MD5 =3D e5be03eda13ef68aabab6e42aa67715e >>>> +=C2=A0=C2=A0=C2=A0 name =3D redland-1.0.17.tar.gz >>>> +=C2=A0=C2=A0=C2=A0 URL1 =3D http://download.librdf.org/source/redla= nd-1.0.17.tar.gz >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 URL2 =3D $(OOO_EXTRAS)$(MD5)-$(name)= >>>> =C2=A0 =C2=A0 if (SYSTEM_REDLAND !=3D YES) >>>> -=C2=A0=C2=A0=C2=A0 MD5 =3D fca8706f2c4619e2fa3f8f42f8fc1e9d >>>> -=C2=A0=C2=A0=C2=A0 name =3D rasqal-0.9.16.tar.gz >>>> -=C2=A0=C2=A0=C2=A0 URL1 =3D http://download.librdf.org/source/rasqa= l-0.9.16.tar.gz >>>> +=C2=A0=C2=A0=C2=A0 MD5 =3D 1f5def51ca0026cd192958ef07228b52 >>>> +=C2=A0=C2=A0=C2=A0 name =3D rasqal-0.9.33.tar.gz >>>> +=C2=A0=C2=A0=C2=A0 URL1 =3D http://download.librdf.org/source/rasqa= l-0.9.33.tar.gz >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 URL2 =3D $(OOO_EXTRAS)$(MD5)-$(name)= >>>> =C2=A0 =C2=A0 if (GUI!=3DUNX || SYSTEM_ZLIB!=3DYES) >>>> >>>> Propchange: openoffice/branches/AOO416/main/redland/ >>>> --------------------------------------------------------------------= ---------- >>>> >>>> --- svn:mergeinfo (added) >>>> +++ svn:mergeinfo Mon Oct=C2=A0 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,154657= 4,1546934,1547030,1547392,1551920,1551954,1551958,1552283 >>>> >>>> +/openoffice/branches/rejuvenate01/main/redland:1480411,1534063,1534= 098,1536312,1549902,1560617 >>>> >>>> +/openoffice/trunk/main/redland:1571617,1571677,1572569,1572577,1573= 547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,15807= 79,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,158398= 8,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,1= 600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,16= 03941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,160= 6706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609= 208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,16120= 70-1612071,1612539,1612801,1616457,1616944,1620195,1621121,1623847,162384= 9-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 >>>> >>>> =20 >>>> 2,1697807,1700078,1700126,1700135,1701344,1702107,1702894,1702898,17= 02986,1702988,1705193,1705196,1705199,1705276,1705364,1705368-1705369,170= 5542,1706649,1707167,1707169-1707170,1707175,1707397,1707408,1707412,1707= 642,1707645,1707659,1707844,1708477,1708483,1709212,1709377,1709403,17238= 75,1729921,1730154,1748497,1754469,1755873,1756017,1757789,1758150,176046= 1,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,1= 818098,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=3D1843108&r1=3D1843107&r2=3D1843108&view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>>> >>>> --- openoffice/branches/AOO416/main/redland/prj/d.lst (original) >>>> +++ openoffice/branches/AOO416/main/redland/prj/d.lst Mon Oct=C2=A0 = 8 >>>> 06:09:21 2018 >>>> @@ -1,13 +1,13 @@ >>>> =C2=A0 mkdir: %_DEST%\inc%_EXT%\external >>>> =C2=A0 ..\%__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.dyli= b >>>> -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.dyli= b >>>> -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.dy= lib >>>> +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.dyli= b >>>> +symlink: %_DEST%\lib%_EXT%\librasqal.3.dylib >>>> %_DEST%\lib%_EXT%\librasqal.dylib >>>> =C2=A0 ..\%__SRC%\lib\librdf.so.0 %_DEST%\lib%_EXT%\librdf.so.0 >>>> =C2=A0 symlink: %_DEST%\lib%_EXT%\librdf.so.0 %_DEST%\lib%_EXT%\lib= rdf.so >>>> =C2=A0 ..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib%_EXT%\librdf.0.dyl= ib >>>> >>>> Modified: openoffice/branches/AOO416/main/redland/raptor/makefile.mk= >>>> URL: >>>> http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/redland= /raptor/makefile.mk?rev=3D1843108&r1=3D1843107&r2=3D1843108&view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>>> >>>> --- openoffice/branches/AOO416/main/redland/raptor/makefile.mk >>>> (original) >>>> +++ openoffice/branches/AOO416/main/redland/raptor/makefile.mk Mon >>>> Oct=C2=A0 8 06:09:21 2018 >>>> @@ -40,28 +40,28 @@ all: >>>> =C2=A0 =C2=A0 .INCLUDE :=C2=A0=C2=A0=C2=A0 ../redlandversion.mk >>>> =C2=A0 -RAPTORVERSION=3D$(RAPTOR_MAJOR).4.18 >>>> +RAPTORVERSION=3D2.0.15 >>>> =C2=A0 -TARFILE_NAME=3Draptor-$(RAPTORVERSION) >>>> -TARFILE_MD5=3D284e768eeda0e2898b0d5bf7e26a016e >>>> +TARFILE_NAME=3Draptor2-$(RAPTORVERSION) >>>> +TARFILE_MD5=3Da39f6c07ddb20d7dd2ff1f95fa21e2cd >>>> =C2=A0 =C2=A0 ADDITIONAL_FILES=3Dsrc/makefile.mk src/raptor_config.= h >>>> =C2=A0 =C2=A0 OOO_PATCH_FILES=3D \ >>>> -=C2=A0=C2=A0=C2=A0 $(TARFILE_NAME).patch.autotools \ >>>> -=C2=A0=C2=A0=C2=A0 $(TARFILE_NAME).patch.ooo_build \ >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $(TARFILE_NAME).patch.dmake \ >>>> -=C2=A0=C2=A0=C2=A0 $(TARFILE_NAME).patch.win32 \ >>>> -=C2=A0=C2=A0=C2=A0 $(TARFILE_NAME).patch.fixes >>>> =C2=A0 =C2=A0 PATCH_FILES=3D$(OOO_PATCH_FILES) >>>> =C2=A0 =C2=A0 =C2=A0 .IF "$(OS)"=3D=3D"OS2" >>>> -BUILD_ACTION=3Ddmake >>>> -BUILD_DIR=3D$(CONFIGURE_DIR)/src >>>> -ADDITIONAL_FILES+=3Dsrc/windows.h >>>> =C2=A0 OOO_PATCH_FILES+=3D$(TARFILE_NAME).patch.os2 >>>> +CONFIGURE_DIR=3D >>>> +CONFIGURE_ACTION=3Dlibtoolize && aclocal && autoconf && .$/configur= e >>>> +# do not enable grddl parser (#i93768#) >>>> +CONFIGURE_FLAGS=3D--disable-static --disable-gtk-doc >>>> --with-openssl-digests --enable-parsers=3D"rdfxml ntriples turtle tr= ig >>>> guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql >>>> --without-postgresql --without-threestore >>>> --with-regex-library=3Dposix --with-decimal=3Dnone --with-www=3Dxml >>>> --prefix=3D$(PWD)/$(OUT) --includedir=3D(PWD)$/$(INCCOM) >>>> --libdir=3D$(PWD)$/$(LB) >>>> +BUILD_ACTION=3D$(GNUMAKE) >>>> +BUILD_FLAGS+=3D -j$(EXTMAXPROCESS) >>>> +BUILD_DIR=3D$(CONFIGURE_DIR) >>>> =C2=A0 .ELIF "$(OS)"=3D=3D"WNT" >>>> =C2=A0 .IF "$(COM)"=3D=3D"GCC" >>>> =C2=A0 OOO_PATCH_FILES+=3D$(TARFILE_NAME).patch.mingw >>>> @@ -77,12 +77,16 @@ raptor_LIBS+=3D$(MINGW_SHARED_LIBSTDCPP) >>>> =C2=A0 CONFIGURE_DIR=3D >>>> =C2=A0 CONFIGURE_ACTION=3D.$/configure >>>> =C2=A0 # do not enable grddl parser (#i93768#) >>>> -CONFIGURE_FLAGS=3D--disable-static --disable-gtk-doc >>>> --with-openssl-digests --with-xml-parser=3Dlibxml >>>> --enable-parsers=3D"rdfxml ntriples turtle trig guess rss-tag-soup" >>>> --without-bdb --without-sqlite --without-mysql --without-postgresql >>>> --without-threestore=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --with-rege= x-library=3Dposix >>>> --with-decimal=3Dnone --with-www=3Dxml --build=3Di586-pc-mingw32 >>>> --host=3Di586-pc-mingw32 lt_cv_cc_dll_switch=3D"-shared" >>>> CC=3D"$(raptor_CC)" CPPFLAGS=3D"-nostdinc $(INCLUDE)" >>>> LDFLAGS=3D"-no-undefined >>>> -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols >>>> -L$(ILIB:s/;/ -L/)" LIBS=3D"$(raptor_LIBS)" OBJDUMP=3D"$(WRAPCMD) >>>> objdump" LIBXML2LIB=3D$(LIBXML2LIB) XSLTLIB=3D"$(XSLTLIB)" >>>> +CONFIGURE_FLAGS=3D--disable-static --disable-gtk-doc >>>> --with-openssl-digests --enable-parsers=3D"rdfxml ntriples turtle tr= ig >>>> guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql >>>> --without-postgresql --without-threestore >>>> --with-regex-library=3Dposix --with-decimal=3Dnone --with-www=3Dxml >>>> --build=3Di586-pc-mingw32 --host=3Di586-pc-mingw32 >>>> lt_cv_cc_dll_switch=3D"-shared" --prefix=3D$(PWD)/$(OUT) >>>> --includedir=3D(PWD)$/$(INCCOM) --libdir=3D$(PWD)$/$(LB) >>>> --CC=3D"$(raptor_CC)" CPPFLAGS=3D"-nostdinc $(INCLUDE)" >>>> LDFLAGS=3D"-no-undefined >>>> -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols >>>> -L$(ILIB:s/;/ -L/)" LIBS=3D"$(raptor_LIBS)" OBJDUMP=3D"$(WRAPCMD) >>>> objdump" LIBXML2LIB=3D$(LIBXML2LIB) XSLTLIB=3D"$(XSLTLIB)" >>>> =C2=A0 BUILD_ACTION=3D$(GNUMAKE) >>>> =C2=A0 BUILD_FLAGS+=3D -j$(EXTMAXPROCESS) >>>> =C2=A0 BUILD_DIR=3D$(CONFIGURE_DIR) >>>> =C2=A0 .ELSE >>>> =C2=A0 # there is no wntmsci build environment in the tarball; we u= se >>>> custom dmakefile >>>> +OOO_PATCH_FILES+=3D$(TARFILE_NAME).patch.win32 >>>> +CONFIGURE_ACTION=3D ${PERL} -p -e '$$prefix=3D"'$(PWD)/$(OUT)'"; >>>> $$libdir=3D"'$(PWD)/$(LB)'"; $$incdir=3D"'$(PWD)/$(INCCOM)'"; >>>> $$ldflags=3D"-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/;'=C2=A0= < >>>> raptor2.pc.in > raptor2.pc && \ >>>> +=C2=A0=C2=A0=C2=A0 ${PERL} -p -e >>>> 's/\@RAPTOR_VERSION_DECIMAL\@/20015/;s/\@VERSION\@/2.0.15/;s/\@RAPTO= R_VERSION_MAJOR\@/2/;s/\@RAPTOR_VERSION_MINOR\@/0/;s/\@RAPTOR_VERSION_REL= EASE\@/15/' >>>> < src/raptor2.h.in > src/raptor2.h && \ >>>> +=C2=A0=C2=A0=C2=A0 $(COPY) src/raptor_config.h.in src/raptor_config= =2Eh >>>> =C2=A0 BUILD_ACTION=3Ddmake >>>> =C2=A0 BUILD_DIR=3D$(CONFIGURE_DIR)$/src >>>> =C2=A0 .ENDIF >>>> @@ -124,7 +128,11 @@ XSLTLIB!:=3D$(XSLTLIB) # expand dmake vari >>>> =C2=A0 CONFIGURE_DIR=3D >>>> =C2=A0 CONFIGURE_ACTION=3D.$/configure >>>> =C2=A0 # do not enable grddl parser (#i93768#) >>>> -CONFIGURE_FLAGS=3D--disable-static --disable-gtk-doc --with-threads= >>>> --with-openssl-digests --with-xml-parser=3Dlibxml >>>> --enable-parsers=3D"rdfxml ntriples turtle trig guess rss-tag-soup" >>>> --without-bdb --without-sqlite --without-mysql --without-postgresql >>>> --without-threestore=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --with-rege= x-library=3Dposix >>>> --with-decimal=3Dnone --with-www=3Dxml >>>> +CONFIGURE_FLAGS=3D--disable-static --disable-gtk-doc >>>> --enable-parsers=3D"rdfxml ntriples turtle trig guess rss-tag-soup" >>>> --with-www=3Dxml --prefix=3D$(PDW)/$(OUT) --includedir=3D$(PWD)/$(IN= CCOM) >>>> --libdir=3D$(PWD)/$(LB) >>>> +.IF "$(SYSTEM_LIBXML)" =3D=3D "NO" >>>> +CONFIGURE_FLAGS+=3D--with-xml2-config=3D${SOLARVERSION}/${INPATH}/b= in/xml2-config >>>> \ >>>> +=C2=A0=C2=A0=C2=A0 --with-xslt-config=3D${SOLARVERSION}/${INPATH}/b= in/xslt-config >>>> +.ENDIF >>>> =C2=A0 BUILD_ACTION=3D$(GNUMAKE) >>>> =C2=A0 BUILD_FLAGS+=3D -j$(EXTMAXPROCESS) >>>> =C2=A0 BUILD_DIR=3D$(CONFIGURE_DIR) >>>> @@ -133,24 +141,22 @@ BUILD_DIR=3D$(CONFIGURE_DIR) >>>> =C2=A0 .ENDIF >>>> =C2=A0 =C2=A0 -OUT2INC+=3Dsrc/raptor.h >>>> +OUT2INC+=3Dsrc/raptor.h src/raptor2.h src/raptor_config.h >>>> =C2=A0 =C2=A0 .IF "$(OS)"=3D=3D"MACOSX" >>>> -OUT2LIB+=3Dsrc$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib >>>> src$/.libs$/libraptor.dylib >>>> -OUT2BIN+=3Dsrc/raptor-config >>>> +OUT2LIB+=3Dsrc$/.libs$/libraptor2.$(RAPTOR_MAJOR).dylib >>>> src$/.libs$/libraptor2.dylib >>>> =C2=A0 .ELIF "$(OS)"=3D=3D"WNT" >>>> =C2=A0 .IF "$(COM)"=3D=3D"GCC" >>>> =C2=A0 OUT2LIB+=3Dsrc$/.libs$/*.a >>>> =C2=A0 OUT2BIN+=3Dsrc$/.libs$/*.dll >>>> -OUT2BIN+=3Dsrc/raptor-config >>>> =C2=A0 .ELSE >>>> =C2=A0 # if we use dmake, this is done automagically >>>> =C2=A0 .ENDIF >>>> =C2=A0 .ELIF "$(GUI)"=3D=3D"OS2" >>>> -# if we use dmake, this is done automagically >>>> +OUT2LIB+=3Dsrc$/.libs$/*.a >>>> +OUT2BIN+=3Dsrc$/.libs$/*.dll >>>> =C2=A0 .ELSE >>>> -OUT2LIB+=3Dsrc$/.libs$/libraptor.so.$(RAPTOR_MAJOR) >>>> src$/.libs$/libraptor.so >>>> -OUT2BIN+=3Dsrc/raptor-config >>>> +OUT2LIB+=3Dsrc$/.libs$/libraptor2.so.$(RAPTOR_MAJOR) >>>> src$/.libs$/libraptor2.so >>>> =C2=A0 .ENDIF >>>> =C2=A0 =C2=A0 # --- 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=3D1843108&r1=3D1843107&r2=3D1843108&view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>>> >>>> --- openoffice/branches/AOO416/main/redland/rasqal/makefile.mk >>>> (original) >>>> +++ openoffice/branches/AOO416/main/redland/rasqal/makefile.mk Mon >>>> Oct=C2=A0 8 06:09:21 2018 >>>> @@ -40,27 +40,27 @@ all: >>>> =C2=A0 =C2=A0 .INCLUDE :=C2=A0=C2=A0=C2=A0 ../redlandversion.mk >>>> =C2=A0 -RASQALVERSION=3D0.9.16 >>>> +RASQALVERSION=3D0.9.33 >>>> =C2=A0 =C2=A0 TARFILE_NAME=3Drasqal-$(RASQALVERSION) >>>> -TARFILE_MD5=3Dfca8706f2c4619e2fa3f8f42f8fc1e9d >>>> +TARFILE_MD5=3D1f5def51ca0026cd192958ef07228b52 >>>> =C2=A0 -ADDITIONAL_FILES=3Dsrc/makefile.mk src/rasqal_config.h >>>> +ADDITIONAL_FILES=3Dsrc/makefile.mk >>>> =C2=A0 =C2=A0 OOO_PATCH_FILES=3D \ >>>> -=C2=A0=C2=A0=C2=A0 $(TARFILE_NAME).patch.autotools \ >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $(TARFILE_NAME).patch.ooo_build \ >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $(TARFILE_NAME).patch.dmake \ >>>> -=C2=A0=C2=A0=C2=A0 $(TARFILE_NAME).patch.win32 >>>> =C2=A0 =C2=A0 PATCH_FILES=3D$(OOO_PATCH_FILES) >>>> =C2=A0 =C2=A0 =C2=A0 .IF "$(OS)"=3D=3D"OS2" >>>> -BUILD_ACTION=3Ddmake >>>> -BUILD_DIR=3D$(CONFIGURE_DIR)$/src >>>> -ADDITIONAL_FILES+=3Dsrc/windows.h >>>> -OOO_PATCH_FILES+=3D$(TARFILE_NAME).patch.os2 >>>> +CONFIGURE_DIR=3D >>>> +CONFIGURE_ACTION=3Dlibtoolize && aclocal && autoconf && .$/configur= e >>>> RAPTOR2_CFLAGS=3D-I${PWD}$/..$/${INPATH}/inc >>>> RAPTOR2_LIBS=3D'-L${PWD}$/..$/${INPATH}/lib -lraptor2 -lxml2 -lcurl'= >>>> PKG_CONFIG_PATH=3D'../raptor2-2.0.15;../rasqal-0.9.33' >>>> +CONFIGURE_FLAGS=3D--disable-static --disable-gtk-doc >>>> --with-regex-library=3Dposix --with-decimal=3Dnone >>>> +BUILD_ACTION=3D$(GNUMAKE) >>>> +BUILD_FLAGS+=3D -j$(EXTMAXPROCESS) >>>> +BUILD_DIR=3D$(CONFIGURE_DIR) >>>> =C2=A0 .ELIF "$(OS)"=3D=3D"WNT" >>>> =C2=A0 .IF "$(COM)"=3D=3D"GCC" >>>> =C2=A0 rasqal_CC=3D$(CC) -mthreads >>>> @@ -80,6 +80,12 @@ BUILD_FLAGS+=3D -j$(EXTMAXPROCESS) >>>> =C2=A0 BUILD_DIR=3D$(CONFIGURE_DIR) >>>> =C2=A0 .ELSE >>>> =C2=A0 # there is no wntmsci build environment in the tarball; we u= se >>>> custom dmakefile >>>> +OOO_PATCH_FILES+=3D $(TARFILE_NAME).patch.win32 >>>> +CONFIGURE_ACTION=3D ${PERL} -p -e '$$prefix=3D"'$(PWD)/$(OUT)'"; >>>> $$libdir=3D"'$(PWD)/$(LB)'"; $$incdir=3D"'$(PWD)/$(INCCOM)'"; >>>> $$ldflags=3D"-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 >=3D 2.0.7/; >>>> s/\@RAPTOR_LDFLAGS\@/$$ldflags/;'=C2=A0 < rasqal.pc.in > rasqal.pc &= & \ >>>> +=C2=A0=C2=A0=C2=A0 ${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_RELEA= SE\@/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 && \ >>>> +=C2=A0=C2=A0=C2=A0 $(COPY) src/rasqal_config.h.in src/rasqal_config= =2Eh && \ >>>> +=C2=A0=C2=A0=C2=A0 $(COPY) src/snprintf.c src/rasqal_snprintf.c && = \ >>>> +=C2=A0=C2=A0=C2=A0 $(COPY) libsv/sv.c src/sv.c >>>> =C2=A0 BUILD_ACTION=3Ddmake >>>> =C2=A0 BUILD_DIR=3D$(CONFIGURE_DIR)$/src >>>> =C2=A0 .ENDIF >>>> @@ -118,8 +124,11 @@ XSLTLIB!:=3D$(XSLTLIB) # expand dmake vari >>>> =C2=A0 .EXPORT: XSLTLIB >>>> =C2=A0 =C2=A0 CONFIGURE_DIR=3D >>>> -CONFIGURE_ACTION=3D.$/configure PATH=3D"..$/..$/..$/bin:$$PATH" >>>> -CONFIGURE_FLAGS=3D--disable-static --disable-gtk-doc --with-threads= >>>> --with-openssl-digests --with-xml-parser=3Dlibxml --without-bdb >>>> --without-sqlite --without-mysql --without-postgresql >>>> --without-threestore=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --with-rege= x-library=3Dposix >>>> --with-decimal=3Dnone --with-www=3Dxml >>>> +CONFIGURE_ACTION=3D.$/configure PATH=3D"..$/..$/..$/bin:$$PATH" >>>> RASQAL_CFLAGS=3D-I${PWD}$/..$/${INPATH}/inc >>>> RASQAL_LIBS=3D"-L${PWD}/..$/${INPATH}/lib -lrasqual" >>>> RAPTOR2_CFLAGS=3D-I${PWD}$/..$/${INPATH}/inc >>>> RAPTOR2_LIBS=3D"-L${PWD}/..$/${INPATH}/lib -lraptor2" >>>> PKG_CONFIG_PATH=3D"../raptor2-2.0.15:../rasqal-0.9.33" >>>> +CONFIGURE_FLAGS=3D--disable-static --disable-gtk-doc >>>> --with-regex-library=3Dposix --with-decimal=3Dnone >>>> +.IF "$(SYSTEM_LIBXML)" =3D=3D "NO" >>>> +CONFIGURE_FLAGS+=3D--with-xml2-config=3D${SOLARVERSION}/${INPATH}/b= in/xml2-config >>>> >>>> +.ENDIF >>>> =C2=A0 BUILD_ACTION=3D$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) >>>> =C2=A0 BUILD_FLAGS+=3D -j$(EXTMAXPROCESS) >>>> =C2=A0 BUILD_DIR=3D$(CONFIGURE_DIR) >>>> @@ -142,7 +151,8 @@ OUT2BIN+=3Dsrc/rasqal-config >>>> =C2=A0 # if we use dmake, this is done automagically >>>> =C2=A0 .ENDIF >>>> =C2=A0 .ELIF "$(OS)"=3D=3D"OS2" >>>> -# if we use dmake, this is done automagically >>>> +OUT2LIB+=3Dsrc$/.libs$/*.a >>>> +OUT2BIN+=3Dsrc$/.libs$/*.dll >>>> =C2=A0 .ELSE >>>> =C2=A0 OUT2LIB+=3Dsrc$/.libs$/librasqal.so.$(RASQAL_MAJOR) >>>> src$/.libs$/librasqal.so >>>> =C2=A0 OUT2BIN+=3Dsrc/rasqal-config >>>> >>>> Modified: openoffice/branches/AOO416/main/redland/redland/makefile.m= k >>>> URL: >>>> http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/redland= /redland/makefile.mk?rev=3D1843108&r1=3D1843107&r2=3D1843108&view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>>> >>>> --- openoffice/branches/AOO416/main/redland/redland/makefile.mk >>>> (original) >>>> +++ openoffice/branches/AOO416/main/redland/redland/makefile.mk Mon >>>> Oct=C2=A0 8 06:09:21 2018 >>>> @@ -40,27 +40,29 @@ all: >>>> =C2=A0 =C2=A0 .INCLUDE :=C2=A0=C2=A0=C2=A0 ../redlandversion.mk >>>> =C2=A0 -REDLANDVERSION=3D1.0.8 >>>> +REDLANDVERSION=3D1.0.17 >>>> =C2=A0 =C2=A0 TARFILE_NAME=3Dredland-$(REDLANDVERSION) >>>> -TARFILE_MD5=3Dca66e26082cab8bb817185a116db809b >>>> +TARFILE_MD5=3De5be03eda13ef68aabab6e42aa67715e >>>> =C2=A0 -ADDITIONAL_FILES=3Dlibrdf/makefile.mk librdf/rdf_config.h >>>> +ADDITIONAL_FILES=3Dsrc/makefile.mk src/rdf_config.h >>>> =C2=A0 =C2=A0 OOO_PATCH_FILES=3D \ >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $(TARFILE_NAME).patch.autotools \ >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $(TARFILE_NAME).patch.dmake \ >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $(TARFILE_NAME).patch.ooo_build \ >>>> -=C2=A0=C2=A0=C2=A0 $(TARFILE_NAME).patch.win32 >>>> =C2=A0 =C2=A0 PATCH_FILES=3D$(OOO_PATCH_FILES) \ >>>> =C2=A0 =C2=A0 =C2=A0 .IF "$(OS)"=3D=3D"OS2" >>>> -BUILD_ACTION=3Ddmake >>>> -BUILD_DIR=3D$(CONFIGURE_DIR)$/librdf >>>> -ADDITIONAL_FILES+=3Dlibrdf/windows.h >>>> =C2=A0 OOO_PATCH_FILES+=3D$(TARFILE_NAME).patch.os2 >>>> +CONFIGURE_DIR=3D >>>> +CONFIGURE_ACTION=3Dlibtoolize --force && aclocal && autoconf && >>>> .$/configure RAPTOR2_CFLAGS=3D-I${PWD}$/..$/${INPATH}/inc >>>> RAPTOR2_LIBS=3D'-L${PWD}/..$/${INPATH}/lib -lraptor2 -lxml2 -lcurl' >>>> PKG_CONFIG_PATH=3D'../raptor2-2.0.15;../rasqal-0.9.33' >>>> +CONFIGURE_FLAGS=3D--disable-dependency-tracking --disable-static >>>> --disable-gtk-doc --with-threads --with-openssl-digests >>>> --with-xml-parser=3Dlibxml --with-raptor=3Dsystem --with-rasqual=3Ds= ystem >>>> --without-bdb --without-sqlite --without-mysql --without-postgresql >>>> --without-threestore -without-iodbc --without-unixodbc >>>> --without-datadirect --without-virtuoso --with-regex-library=3Dposix= >>>> --with-decimal=3Dnone --with-www=3Dxml --disable-ltdl-install >>>> --disable-modular --without-included-ltdl --disable-ltdl-convenience= >>>> +BUILD_ACTION=3D$(GNUMAKE) >>>> +BUILD_FLAGS+=3D -j$(EXTMAXPROCESS) >>>> +BUILD_DIR=3D$(CONFIGURE_DIR) >>>> =C2=A0 .ELIF "$(OS)"=3D=3D"WNT" >>>> =C2=A0 .IF "$(COM)"=3D=3D"GCC" >>>> =C2=A0 redland_CC=3D$(CC) -mthreads >>>> @@ -80,8 +82,11 @@ BUILD_FLAGS+=3D -j$(EXTMAXPROCESS) >>>> =C2=A0 BUILD_DIR=3D$(CONFIGURE_DIR) >>>> =C2=A0 .ELSE >>>> =C2=A0 # there is no wntmsci build environment in the tarball; we u= se >>>> custom dmakefile >>>> +OOO_PATCH_FILES+=3D $(TARFILE_NAME).patch.win32 >>>> +CONFIGURE_ACTION=3D \ >>>> +=C2=A0=C2=A0=C2=A0 $(COPY) src/rdf_config.h.in src/rdf_config.h >>>> =C2=A0 BUILD_ACTION=3Ddmake >>>> -BUILD_DIR=3D$(CONFIGURE_DIR)$/librdf >>>> +BUILD_DIR=3D$(CONFIGURE_DIR)$/src >>>> =C2=A0 .ENDIF >>>> =C2=A0 .ELSE # "WNT" >>>> =C2=A0 @@ -122,8 +127,9 @@ XSLTLIB!:=3D$(XSLTLIB) # expand dmake va= ri >>>> =C2=A0 .EXPORT: XSLTLIB >>>> =C2=A0 =C2=A0 CONFIGURE_DIR=3D >>>> -CONFIGURE_ACTION=3D.$/configure PATH=3D"..$/..$/..$/bin:$$PATH" >>>> -CONFIGURE_FLAGS=3D--disable-static --disable-gtk-doc --with-threads= >>>> --with-openssl-digests --with-xml-parser=3Dlibxml --with-raptor=3Dsy= stem >>>> --with-rasqual=3Dsystem --without-bdb --without-sqlite --without-mys= ql >>>> --without-postgresql --without-threestore >>>> --with-regex-library=3Dposix --with-decimal=3Dnone --with-www=3Dxml >>>> +#CONFIGURE_ACTION=3D.$/configure PATH=3D"..$/..$/..$/bin:$$PATH" >>>> RAPTOR2_CFLAGS=3D-I${PWD}$/..$/${INPATH}/inc >>>> RAPTOR2_LIBS=3D"-L${PWD}/..$/${INPATH}/lib -lraptor2" >>>> PKG_CONFIG_PATH=3D"../raptor2-2.0.15:../rasqal-0.9.33" >>>> +CONFIGURE_ACTION=3D.$/configure PATH=3D"..$/..$/..$/bin:$$PATH" >>>> PKG_CONFIG_PATH=3D"../raptor2-2.0.15:../rasqal-0.9.33" >>>> +CONFIGURE_FLAGS=3D--disable-static --disable-gtk-doc --with-threads= >>>> --with-openssl-digests --with-xml-parser=3Dlibxml --with-raptor=3Dsy= stem >>>> --with-rasqual=3Dsystem --without-bdb --without-sqlite --without-mys= ql >>>> --without-postgresql --without-threestore -without-iodbc >>>> --without-unixodbc --without-datadirect --without-virtuoso >>>> --with-regex-library=3Dposix --with-decimal=3Dnone --with-www=3Dxml >>>> --disable-ltdl-install --disable-modular --without-included-ltdl >>>> --disable-ltdl-convenience >>>> =C2=A0 BUILD_ACTION=3D$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) >>>> =C2=A0 BUILD_FLAGS+=3D -j$(EXTMAXPROCESS) >>>> =C2=A0 BUILD_DIR=3D$(CONFIGURE_DIR) >>>> @@ -132,21 +138,41 @@ BUILD_DIR=3D$(CONFIGURE_DIR) >>>> =C2=A0 .ENDIF >>>> =C2=A0 =C2=A0 -OUT2INC+=3Dlibrdf$/*.h >>>> +OUT2INC+=3Dsrc$/librdf.h src$/redland.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_concepts.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_digest.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_hash.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_init.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_iterator.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_list.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_log.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_model.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_node.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_parser.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_query.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_raptor.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_serializer.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_statement.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_storage.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_storage_module.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_stream.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_uri.h \ >>>> +=C2=A0=C2=A0=C2=A0 src$/rdf_utf8.h \ >>>> =C2=A0 =C2=A0 .IF "$(OS)"=3D=3D"MACOSX" >>>> -OUT2LIB+=3Dlibrdf$/.libs$/librdf.$(REDLAND_MAJOR).dylib >>>> +OUT2LIB+=3Dsrc$/.libs$/librdf.$(REDLAND_MAJOR).dylib >>>> =C2=A0 .ELIF "$(OS)"=3D=3D"WNT" >>>> =C2=A0 .IF "$(COM)"=3D=3D"GCC" >>>> -OUT2LIB+=3Dlibrdf$/.libs$/*.a >>>> -OUT2BIN+=3Dlibrdf$/.libs$/*.dll >>>> +OUT2LIB+=3Dsrc$/.libs$/*.a >>>> +OUT2BIN+=3Dsrc$/.libs$/*.dll >>>> =C2=A0 .ELSE >>>> =C2=A0 # if we use dmake, this is done automagically >>>> =C2=A0 .ENDIF >>>> =C2=A0 .ELIF "$(OS)"=3D=3D"OS2" >>>> -# if we use dmake, this is done automagically >>>> +OUT2LIB+=3Dsrc$/.libs$/*.a >>>> +OUT2BIN+=3Dsrc$/.libs$/*.dll >>>> =C2=A0 .ELSE >>>> -OUT2LIB+=3Dlibrdf$/.libs$/librdf.so.$(REDLAND_MAJOR) >>>> +OUT2LIB+=3Dsrc$/.libs$/librdf.so.$(REDLAND_MAJOR) >>>> =C2=A0 .ENDIF >>>> =C2=A0 =C2=A0 # --- Targets >>>> ------------------------------------------------------ >>>> >>>> Modified: openoffice/branches/AOO416/main/redland/redlandversion.mk >>>> URL: >>>> http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/redland= /redlandversion.mk?rev=3D1843108&r1=3D1843107&r2=3D1843108&view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>>> >>>> --- openoffice/branches/AOO416/main/redland/redlandversion.mk >>>> (original) >>>> +++ openoffice/branches/AOO416/main/redland/redlandversion.mk Mon >>>> Oct=C2=A0 8 06:09:21 2018 >>>> @@ -21,8 +21,8 @@ >>>> =C2=A0 =C2=A0 =C2=A0 -RAPTOR_MAJOR=3D1 >>>> -RASQAL_MAJOR=3D1 >>>> +RAPTOR_MAJOR=3D0 >>>> +RASQAL_MAJOR=3D3 >>>> =C2=A0 # redland has no stable abi >>>> =C2=A0 REDLAND_MAJOR=3D0 >>>> =20 >>>> Modified: >>>> openoffice/branches/AOO416/main/scp2/source/ooo/file_library_ooo.scp= >>>> URL: >>>> http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/scp2/so= urce/ooo/file_library_ooo.scp?rev=3D1843108&r1=3D1843107&r2=3D1843108&vie= w=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>>> >>>> --- >>>> 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=C2=A0 8 06:09:21 2018 >>>> @@ -1839,9 +1839,9 @@ File gid_File_Lib_Raptor >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Dir =3D SCP2_OOO_BIN_DIR; >>>> =C2=A0=C2=A0=C2=A0 #ifdef UNX >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #ifdef MACOSX >>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Name =3D STRING(CONCAT4(librap= tor,.,RAPTOR_MAJOR,UNXSUFFIX)); >>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Name =3D STRING(CONCAT4(librap= tor2,.,RAPTOR_MAJOR,UNXSUFFIX)); >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #else >>>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Name =3D STRING(CONCAT4(librap= tor,UNXSUFFIX,.,RAPTOR_MAJOR)); >>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Name =3D STRING(CONCAT4(librap= tor2,UNXSUFFIX,.,RAPTOR_MAJOR)); >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #endif >>>> =C2=A0=C2=A0=C2=A0 #elif defined(OS2) >>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Name =3D "raptor.dll"; >>>> >>>> >>>> >> >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org >> For additional commands, e-mail: dev-help@openoffice.apache.org >> > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org For additional commands, e-mail: dev-help@openoffice.apache.org