svn commit: r1055819 - in /websites/production/ooo-site: cgi-bin/ content/

2020-01-28 Thread marcus 
Author: marcus
Date: Tue Jan 28 23:20:11 2020
New Revision: 1055819

Log:
Publishing svnmucc operation to ooo-site site by marcus

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r1055818, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r1055818, websites/staging/ooo-site/trunk/content/

svn commit: r1055818 [1/2] - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/stats/aoo-downloads.txt

2020-01-28 Thread buildbot 
Author: buildbot
Date: Tue Jan 28 23:16:52 2020
New Revision: 1055818

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/stats/aoo-downloads.txt

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jan 28 23:16:52 2020
@@ -1 +1 @@
-1873274
+1873275

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jan 28 23:16:52 2020
@@ -1 +1 @@
-1873274
+1873275

svn commit: r1055818 [2/2] - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/stats/aoo-downloads.txt

2020-01-28 Thread buildbot 
Modified: websites/staging/ooo-site/trunk/content/stats/aoo-downloads.txt
==
--- websites/staging/ooo-site/trunk/content/stats/aoo-downloads.txt (original)
+++ websites/staging/ooo-site/trunk/content/stats/aoo-downloads.txt Tue Jan 28 
23:16:52 2020
@@ -1,2821 +1,2821 @@
-"2012-05-07",28470,28470
-"2012-05-08",99148,127618
-"2012-05-09",128110,255728
-"2012-05-10",122781,378509
-"2012-05-11",107818,486327
-"2012-05-12",85471,571798
-"2012-05-13",93294,665092
-"2012-05-14",114311,779403
-"2012-05-15",115410,894813
-"2012-05-16",112302,1007115
-"2012-05-17",105583,1112698
-"2012-05-18",101209,1213907
-"2012-05-19",76480,1290387
-"2012-05-20",88578,1378965
-"2012-05-21",118753,1497718
-"2012-05-22",115414,1613132
-"2012-05-23",113039,1726171
-"2012-05-24",105471,1831642
-"2012-05-25",89767,1921409
-"2012-05-26",69376,1990785
-"2012-05-27",72385,2063170
-"2012-05-28",99719,2162889
-"2012-05-29",107076,2269965
-"2012-05-30",110765,2380730
-"2012-05-31",105122,2485852
-"2012-06-01",90444,2576296
-"2012-06-02",73739,2650035
-"2012-06-03",96508,2746543
-"2012-06-04",119468,2866011
-"2012-06-05",129193,2995204
-"2012-06-06",127069,3122273
-"2012-06-07",121679,3243952
-"2012-06-08",113921,3357873
-"2012-06-09",97133,3455006
-"2012-06-10",102985,3557991
-"2012-06-11",132160,3690151
-"2012-06-12",170082,3860233
-"2012-06-13",187336,4047569
-"2012-06-14",179898,4227467
-"2012-06-15",156003,4383470
-"2012-06-16",128725,4512195
-"2012-06-17",135444,4647639
-"2012-06-18",175015,4822654
-"2012-06-19",172608,4995262
-"2012-06-20",163257,5158519
-"2012-06-21",150747,5309266
-"2012-06-22",130555,5439821
-"2012-06-23",104819,5544640
-"2012-06-24",118520,5663160
-"2012-06-25",148143,5811303
-"2012-06-26",142649,5953952
-"2012-06-27",138339,6092291
-"2012-06-28",127185,6219476
-"2012-06-29",116478,6335954
-"2012-06-30",96481,6432435
-"2012-07-01",104713,6537148
-"2012-07-02",133696,6670844
-"2012-07-03",134130,6804974
-"2012-07-04",124308,6929282
-"2012-07-05",122463,7051745
-"2012-07-06",112957,7164702
-"2012-07-07",93434,7258136
-"2012-07-08",98926,7357062
-"2012-07-09",128352,7485414
-"2012-07-10",132198,7617612
-"2012-07-11",133099,7750711
-"2012-07-12",139353,7890064
-"2012-07-13",133626,8023690
-"2012-07-14",107561,8131251
-"2012-07-15",112292,8243543
-"2012-07-16",141441,8384984
-"2012-07-17",140186,8525170
-"2012-07-18",133148,8658318
-"2012-07-19",131430,8789748
-"2012-07-20",117792,8907540
-"2012-07-21",95511,9003051
-"2012-07-22",97661,9100712
-"2012-07-23",123073,9223785
-"2012-07-24",123164,9346949
-"2012-07-25",120669,9467618
-"2012-07-26",117253,9584871
-"2012-07-27",105917,9690788
-"2012-07-28",87392,9778180
-"2012-07-29",74987,9853167
-"2012-07-30",120773,9973940
-"2012-07-31",123177,10097117
-"2012-08-01",119099,10216216
-"2012-08-02",113469,10329685
-"2012-08-03",102371,10432056
-"2012-08-04",82774,10514830
-"2012-08-05",89798,10604628
-"2012-08-06",114127,10718755
-"2012-08-07",112385,10831140
-"2012-08-08",110107,10941247
-"2012-08-09",107397,11048644
-"2012-08-10",96047,11144691
-"2012-08-11",81920,11226611
-"2012-08-12",85182,11311793
-"2012-08-13",112965,11424758
-"2012-08-14",109622,11534380
-"2012-08-15",102807,11637187
-"2012-08-16",109834,11747021
-"2012-08-17",103984,11851005
-"2012-08-18",84541,11935546
-"2012-08-19",89990,12025536
-"2012-08-20",121139,12146675
-"2012-08-21",132204,12278879
-"2012-08-22",141925,12420804
-"2012-08-23",145146,12565950
-"2012-08-24",150277,12716227
-"2012-08-25",132694,12848921
-"2012-08-26",145760,12994681
-"2012-08-27",188971,13183652
-"2012-08-28",192305,13375957
-"2012-08-29",195305,13571262
-"2012-08-30",197479,13768741
-"2012-08-31",176792,13945533
-"2012-09-01",144125,14089658
-"2012-09-02",151034,14240692
-"2012-09-03",183539,14424231
-"2012-09-04",187121,14611352
-"2012-09-05",190121,14801473
-"2012-09-06",179891,14981364
-"2012-09-07",153375,15134739
-"2012-09-08",128751,15263490
-"2012-09-09",140539,15404029
-"2012-09-10",176726,15580755
-"2012-09-11",177792,15758547
-"2012-09-12",180170,15938717
-"2012-09-13",171055,16109772
-"2012-09-14",145515,16255287
-"2012-09-15",124254,16379541
-"2012-09-16",136372,16515913
-"2012-09-17",166754,16682667
-"2012-09-18",164798,16847465
-"2012-09-19",167321,17014786
-"2012-09-20",155965,17170751
-"2012-09-21",134957,17305708
-"2012-09-22",124295,17430003
-"2012-09-23",142119,17572122
-"2012-09-24",163225,17735347
-"2012-09-25",163550,17898897
-"2012-09-26",170277,18069174
-"2012-09-27",158667,18227841
-"2012-09-28",136772,18364613
-"2012-09-29",121366,18485979
-"2012-09-30",141200,18627179
-"2012-10-01",163056,18790235
-"2012-10-02",161649,18951884
-"2012-10-03",165662,19117546
-"2012-10-04",157033,19274579
-"2012-10-05",134408,19408987
-"2012-10-06",118410,19527397
-"2012-10-07",134176,19661573
-"2012-10-08",157809,19819382
-"2012-10-09",143443,19962825
-"2012-10-10",158938,20121763
-"2012-10-11",148673,20270436
-"2012-10-12",130728,20401164

svn commit: r1873275 [2/2] - /openoffice/ooo-site/trunk/content/stats/aoo-downloads.txt

2020-01-28 Thread marcus 


Modified: openoffice/ooo-site/trunk/content/stats/aoo-downloads.txt
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/stats/aoo-downloads.txt?rev=1873275=1873274=1873275=diff
==
--- openoffice/ooo-site/trunk/content/stats/aoo-downloads.txt (original)
+++ openoffice/ooo-site/trunk/content/stats/aoo-downloads.txt Tue Jan 28 
23:16:07 2020
@@ -1,2821 +1,2821 @@
-"2012-05-07",28470,28470
-"2012-05-08",99148,127618
-"2012-05-09",128110,255728
-"2012-05-10",122781,378509
-"2012-05-11",107818,486327
-"2012-05-12",85471,571798
-"2012-05-13",93294,665092
-"2012-05-14",114311,779403
-"2012-05-15",115410,894813
-"2012-05-16",112302,1007115
-"2012-05-17",105583,1112698
-"2012-05-18",101209,1213907
-"2012-05-19",76480,1290387
-"2012-05-20",88578,1378965
-"2012-05-21",118753,1497718
-"2012-05-22",115414,1613132
-"2012-05-23",113039,1726171
-"2012-05-24",105471,1831642
-"2012-05-25",89767,1921409
-"2012-05-26",69376,1990785
-"2012-05-27",72385,2063170
-"2012-05-28",99719,2162889
-"2012-05-29",107076,2269965
-"2012-05-30",110765,2380730
-"2012-05-31",105122,2485852
-"2012-06-01",90444,2576296
-"2012-06-02",73739,2650035
-"2012-06-03",96508,2746543
-"2012-06-04",119468,2866011
-"2012-06-05",129193,2995204
-"2012-06-06",127069,3122273
-"2012-06-07",121679,3243952
-"2012-06-08",113921,3357873
-"2012-06-09",97133,3455006
-"2012-06-10",102985,3557991
-"2012-06-11",132160,3690151
-"2012-06-12",170082,3860233
-"2012-06-13",187336,4047569
-"2012-06-14",179898,4227467
-"2012-06-15",156003,4383470
-"2012-06-16",128725,4512195
-"2012-06-17",135444,4647639
-"2012-06-18",175015,4822654
-"2012-06-19",172608,4995262
-"2012-06-20",163257,5158519
-"2012-06-21",150747,5309266
-"2012-06-22",130555,5439821
-"2012-06-23",104819,5544640
-"2012-06-24",118520,5663160
-"2012-06-25",148143,5811303
-"2012-06-26",142649,5953952
-"2012-06-27",138339,6092291
-"2012-06-28",127185,6219476
-"2012-06-29",116478,6335954
-"2012-06-30",96481,6432435
-"2012-07-01",104713,6537148
-"2012-07-02",133696,6670844
-"2012-07-03",134130,6804974
-"2012-07-04",124308,6929282
-"2012-07-05",122463,7051745
-"2012-07-06",112957,7164702
-"2012-07-07",93434,7258136
-"2012-07-08",98926,7357062
-"2012-07-09",128352,7485414
-"2012-07-10",132198,7617612
-"2012-07-11",133099,7750711
-"2012-07-12",139353,7890064
-"2012-07-13",133626,8023690
-"2012-07-14",107561,8131251
-"2012-07-15",112292,8243543
-"2012-07-16",141441,8384984
-"2012-07-17",140186,8525170
-"2012-07-18",133148,8658318
-"2012-07-19",131430,8789748
-"2012-07-20",117792,8907540
-"2012-07-21",95511,9003051
-"2012-07-22",97661,9100712
-"2012-07-23",123073,9223785
-"2012-07-24",123164,9346949
-"2012-07-25",120669,9467618
-"2012-07-26",117253,9584871
-"2012-07-27",105917,9690788
-"2012-07-28",87392,9778180
-"2012-07-29",74987,9853167
-"2012-07-30",120773,9973940
-"2012-07-31",123177,10097117
-"2012-08-01",119099,10216216
-"2012-08-02",113469,10329685
-"2012-08-03",102371,10432056
-"2012-08-04",82774,10514830
-"2012-08-05",89798,10604628
-"2012-08-06",114127,10718755
-"2012-08-07",112385,10831140
-"2012-08-08",110107,10941247
-"2012-08-09",107397,11048644
-"2012-08-10",96047,11144691
-"2012-08-11",81920,11226611
-"2012-08-12",85182,11311793
-"2012-08-13",112965,11424758
-"2012-08-14",109622,11534380
-"2012-08-15",102807,11637187
-"2012-08-16",109834,11747021
-"2012-08-17",103984,11851005
-"2012-08-18",84541,11935546
-"2012-08-19",89990,12025536
-"2012-08-20",121139,12146675
-"2012-08-21",132204,12278879
-"2012-08-22",141925,12420804
-"2012-08-23",145146,12565950
-"2012-08-24",150277,12716227
-"2012-08-25",132694,12848921
-"2012-08-26",145760,12994681
-"2012-08-27",188971,13183652
-"2012-08-28",192305,13375957
-"2012-08-29",195305,13571262
-"2012-08-30",197479,13768741
-"2012-08-31",176792,13945533
-"2012-09-01",144125,14089658
-"2012-09-02",151034,14240692
-"2012-09-03",183539,14424231
-"2012-09-04",187121,14611352
-"2012-09-05",190121,14801473
-"2012-09-06",179891,14981364
-"2012-09-07",153375,15134739
-"2012-09-08",128751,15263490
-"2012-09-09",140539,15404029
-"2012-09-10",176726,15580755
-"2012-09-11",177792,15758547
-"2012-09-12",180170,15938717
-"2012-09-13",171055,16109772
-"2012-09-14",145515,16255287
-"2012-09-15",124254,16379541
-"2012-09-16",136372,16515913
-"2012-09-17",166754,16682667
-"2012-09-18",164798,16847465
-"2012-09-19",167321,17014786
-"2012-09-20",155965,17170751
-"2012-09-21",134957,17305708
-"2012-09-22",124295,17430003
-"2012-09-23",142119,17572122
-"2012-09-24",163225,17735347
-"2012-09-25",163550,17898897
-"2012-09-26",170277,18069174
-"2012-09-27",158667,18227841
-"2012-09-28",136772,18364613
-"2012-09-29",121366,18485979
-"2012-09-30",141200,18627179
-"2012-10-01",163056,18790235
-"2012-10-02",161649,18951884
-"2012-10-03",165662,19117546
-"2012-10-04",157033,19274579
-"2012-10-05",134408,19408987
-"2012-10-06",118410,19527397
-"2012-10-07",134176,19661573
-"2012-10-08",157809,19819382

svn commit: r1873275 [1/2] - /openoffice/ooo-site/trunk/content/stats/aoo-downloads.txt

2020-01-28 Thread marcus 
Author: marcus
Date: Tue Jan 28 23:16:07 2020
New Revision: 1873275

URL: http://svn.apache.org/viewvc?rev=1873275=rev
Log:
Updated download numbers for January

Modified:
openoffice/ooo-site/trunk/content/stats/aoo-downloads.txt

svn commit: r1055817 [1/2] - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/stats/aoo-downloads.txt

2020-01-28 Thread buildbot 
Author: buildbot
Date: Tue Jan 28 23:13:24 2020
New Revision: 1055817

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/stats/aoo-downloads.txt

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jan 28 23:13:24 2020
@@ -1 +1 @@
-1872976
+1873274

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Jan 28 23:13:24 2020
@@ -1 +1 @@
-1872976
+1873274

svn commit: r1055817 [2/2] - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/stats/aoo-downloads.txt

2020-01-28 Thread buildbot 
Modified: websites/staging/ooo-site/trunk/content/stats/aoo-downloads.txt
==
--- websites/staging/ooo-site/trunk/content/stats/aoo-downloads.txt (original)
+++ websites/staging/ooo-site/trunk/content/stats/aoo-downloads.txt Tue Jan 28 
23:13:24 2020
@@ -1,2807 +1,2821 @@
-2012-05-07,28470,28470
-2012-05-08,99148,127618
-2012-05-09,128110,255728
-2012-05-10,122781,378509
-2012-05-11,107818,486327
-2012-05-12,85471,571798
-2012-05-13,93294,665092
-2012-05-14,114311,779403
-2012-05-15,115410,894813
-2012-05-16,112302,1007115
-2012-05-17,105583,1112698
-2012-05-18,101209,1213907
-2012-05-19,76480,1290387
-2012-05-20,88578,1378965
-2012-05-21,118753,1497718
-2012-05-22,115414,1613132
-2012-05-23,113039,1726171
-2012-05-24,105471,1831642
-2012-05-25,89767,1921409
-2012-05-26,69376,1990785
-2012-05-27,72385,2063170
-2012-05-28,99719,2162889
-2012-05-29,107076,2269965
-2012-05-30,110765,2380730
-2012-05-31,105122,2485852
-2012-06-01,90444,2576296
-2012-06-02,73739,2650035
-2012-06-03,96508,2746543
-2012-06-04,119468,2866011
-2012-06-05,129193,2995204
-2012-06-06,127069,3122273
-2012-06-07,121679,3243952
-2012-06-08,113921,3357873
-2012-06-09,97133,3455006
-2012-06-10,102985,3557991
-2012-06-11,132160,3690151
-2012-06-12,170082,3860233
-2012-06-13,187336,4047569
-2012-06-14,179898,4227467
-2012-06-15,156003,4383470
-2012-06-16,128725,4512195
-2012-06-17,135444,4647639
-2012-06-18,175015,4822654
-2012-06-19,172608,4995262
-2012-06-20,163257,5158519
-2012-06-21,150747,5309266
-2012-06-22,130555,5439821
-2012-06-23,104819,5544640
-2012-06-24,118520,5663160
-2012-06-25,148143,5811303
-2012-06-26,142649,5953952
-2012-06-27,138339,6092291
-2012-06-28,127185,6219476
-2012-06-29,116478,6335954
-2012-06-30,96481,6432435
-2012-07-01,104713,6537148
-2012-07-02,133696,6670844
-2012-07-03,134130,6804974
-2012-07-04,124308,6929282
-2012-07-05,122463,7051745
-2012-07-06,112957,7164702
-2012-07-07,93434,7258136
-2012-07-08,98926,7357062
-2012-07-09,128352,7485414
-2012-07-10,132198,7617612
-2012-07-11,133099,7750711
-2012-07-12,139353,7890064
-2012-07-13,133626,8023690
-2012-07-14,107561,8131251
-2012-07-15,112292,8243543
-2012-07-16,141441,8384984
-2012-07-17,140186,8525170
-2012-07-18,133148,8658318
-2012-07-19,131430,8789748
-2012-07-20,117792,8907540
-2012-07-21,95511,9003051
-2012-07-22,97661,9100712
-2012-07-23,123073,9223785
-2012-07-24,123164,9346949
-2012-07-25,120669,9467618
-2012-07-26,117253,9584871
-2012-07-27,105917,9690788
-2012-07-28,87392,9778180
-2012-07-29,74987,9853167
-2012-07-30,120773,9973940
-2012-07-31,123177,10097117
-2012-08-01,119099,10216216
-2012-08-02,113469,10329685
-2012-08-03,102371,10432056
-2012-08-04,82774,10514830
-2012-08-05,89798,10604628
-2012-08-06,114127,10718755
-2012-08-07,112385,10831140
-2012-08-08,110107,10941247
-2012-08-09,107397,11048644
-2012-08-10,96047,11144691
-2012-08-11,81920,11226611
-2012-08-12,85182,11311793
-2012-08-13,112965,11424758
-2012-08-14,109622,11534380
-2012-08-15,102807,11637187
-2012-08-16,109834,11747021
-2012-08-17,103984,11851005
-2012-08-18,84541,11935546
-2012-08-19,89990,12025536
-2012-08-20,121139,12146675
-2012-08-21,132204,12278879
-2012-08-22,141925,12420804
-2012-08-23,145146,12565950
-2012-08-24,150277,12716227
-2012-08-25,132694,12848921
-2012-08-26,145760,12994681
-2012-08-27,188971,13183652
-2012-08-28,192305,13375957
-2012-08-29,195305,13571262
-2012-08-30,197479,13768741
-2012-08-31,176792,13945533
-2012-09-01,144125,14089658
-2012-09-02,151034,14240692
-2012-09-03,183539,14424231
-2012-09-04,187121,14611352
-2012-09-05,190121,14801473
-2012-09-06,179891,14981364
-2012-09-07,153375,15134739
-2012-09-08,128751,15263490
-2012-09-09,140539,15404029
-2012-09-10,176726,15580755
-2012-09-11,177792,15758547
-2012-09-12,180170,15938717
-2012-09-13,171055,16109772
-2012-09-14,145515,16255287
-2012-09-15,124254,16379541
-2012-09-16,136372,16515913
-2012-09-17,166754,16682667
-2012-09-18,164798,16847465
-2012-09-19,167321,17014786
-2012-09-20,155965,17170751
-2012-09-21,134957,17305708
-2012-09-22,124295,17430003
-2012-09-23,142119,17572122
-2012-09-24,163225,17735347
-2012-09-25,163550,17898897
-2012-09-26,170277,18069174
-2012-09-27,158667,18227841
-2012-09-28,136772,18364613
-2012-09-29,121366,18485979
-2012-09-30,141200,18627179
-2012-10-01,163056,18790235
-2012-10-02,161649,18951884
-2012-10-03,165662,19117546
-2012-10-04,157033,19274579
-2012-10-05,134408,19408987
-2012-10-06,118410,19527397
-2012-10-07,134176,19661573
-2012-10-08,157809,19819382
-2012-10-09,143443,19962825
-2012-10-10,158938,20121763
-2012-10-11,148673,20270436
-2012-10-12,130728,20401164
-2012-10-13,119061,20520225
-2012-10-14,135240,20655465
-2012-10-15,152532,20807997
-2012-10-16,155591,20963588
-2012-10-17,157453,21121041
-2012-10-18,149470,21270511
-2012-10-19,131860,21402371
-2012-10-20,117230,21519601
-2012-10-21,131672,21651273
-2012-10-22,151406,21802679
-2012-10-23,133543,21936222

svn commit: r1873274 [1/2] - /openoffice/ooo-site/trunk/content/stats/aoo-downloads.txt

2020-01-28 Thread marcus 
Author: marcus
Date: Tue Jan 28 23:11:10 2020
New Revision: 1873274

URL: http://svn.apache.org/viewvc?rev=1873274=rev
Log:
Updated download numbers for January

Modified:
openoffice/ooo-site/trunk/content/stats/aoo-downloads.txt

[openoffice] 02/03: Add commons-lang-2.4-src.tar.gz to OOO_EXTRAS.

2020-01-28 Thread pescetti 
This is an automated email from the ASF dual-hosted git repository.

pescetti pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 8fbde01fb522d001d77fb9e0a7d97dd856e5ab5a
Author: Andrea Pescetti 
AuthorDate: Tue Jan 28 23:37:48 2020 +0100

Add commons-lang-2.4-src.tar.gz to OOO_EXTRAS.
---
 main/external_deps.lst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/main/external_deps.lst b/main/external_deps.lst
index 269e092..35ca6b7 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -150,8 +150,7 @@ if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
 MD5 = 625ff5f2f968dd908bca43c9469d6e6b
 name = commons-lang-2.4-src.tar.gz
 URL1 = 
http://archive.apache.org/dist/commons/lang/source/commons-lang-2.4-src.tar.gz
-# TODO missing in OOO_EXTRAS
-# URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
 MD5 = c813c065dd53d7bd0a560a870ddd0af5

[openoffice] 01/03: Add commons-codec-1.6-src.tar.gz to OOO_EXTRAS.

2020-01-28 Thread pescetti 
This is an automated email from the ASF dual-hosted git repository.

pescetti pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit f079cbc9dbaf00224f1903890ff2959cce429564
Author: Andrea Pescetti 
AuthorDate: Tue Jan 28 23:35:38 2020 +0100

Add commons-codec-1.6-src.tar.gz to OOO_EXTRAS.
---
 main/external_deps.lst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/main/external_deps.lst b/main/external_deps.lst
index 1388ffe..269e092 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -119,8 +119,7 @@ if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
 MD5 = 2e482c7567908d334785ce7d69ddfff7
 name = commons-codec-1.6-src.tar.gz
 URL1 = 
http://archive.apache.org/dist/commons/codec/source/commons-codec-1.6-src.tar.gz
-# TODO missing in OOO_EXTRAS
-# URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if ( true )
 MD5 = 2f6ecca935948f7db92d925d88d0d078

[openoffice] branch AOO418 updated (960266d -> 2553627)

2020-01-28 Thread pescetti 
This is an automated email from the ASF dual-hosted git repository.

pescetti pushed a change to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git.


from 960266d  Updated English dictionary
 new f079cbc  Add commons-codec-1.6-src.tar.gz to OOO_EXTRAS.
 new 8fbde01  Add commons-lang-2.4-src.tar.gz to OOO_EXTRAS.
 new 2553627  Add apache-rat-incubating-0.8-bin.tar.bz2 to OOO_EXTRAS.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 main/external_deps.lst | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

[openoffice] 03/03: Add apache-rat-incubating-0.8-bin.tar.bz2 to OOO_EXTRAS.

2020-01-28 Thread pescetti 
This is an automated email from the ASF dual-hosted git repository.

pescetti pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 25536278275ccc2974a504b851a5cc696ad9a8bb
Author: Andrea Pescetti 
AuthorDate: Tue Jan 28 23:38:27 2020 +0100

Add apache-rat-incubating-0.8-bin.tar.bz2 to OOO_EXTRAS.
---
 main/external_deps.lst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/main/external_deps.lst b/main/external_deps.lst
index 35ca6b7..b7bc3c8 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -251,8 +251,7 @@ if (RAT_JAR_HOME==BUILD)
 MD5 = e4244e69eb3644e71c254aea5952a918
 name = apache-rat-incubating-0.8-bin.tar.bz2 
 URL1 = http://archive.apache.org/dist/incubator/rat/binaries/$(name)
-# TODO missing in OOO_EXTRAS
-# URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 ###
 # Libraries with category B license

[openoffice] 03/08: pyuno: convert some tabs to spaces

2020-01-28 Thread mseidel 
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 8842d6ca47c03d8364dbb7b95b2dc2e54e3bccfa
Author: Damjan Jovanovic 
AuthorDate: Wed Jan 15 19:31:08 2020 +0200

pyuno: convert some tabs to spaces

Patch by: me

(cherry picked from commit 37058acdf5d65adaf7ee2d972967a68be69f5cf1)
---
 main/pyuno/source/loader/pyuno_loader.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/pyuno/source/loader/pyuno_loader.cxx 
b/main/pyuno/source/loader/pyuno_loader.cxx
index 6ba2d1c..4768290 100644
--- a/main/pyuno/source/loader/pyuno_loader.cxx
+++ b/main/pyuno/source/loader/pyuno_loader.cxx
@@ -119,8 +119,8 @@ static void setPythonHome ( const OUString & pythonHome )
 #else
 static wchar_t *wpath = Py_DecodeLocale(o.pData->buffer, NULL);
 if (wpath == NULL) {
-   PyErr_SetString(PyExc_SystemError, "Cannot decode python home path");
-   return;
+PyErr_SetString(PyExc_SystemError, "Cannot decode python home path");
+return;
 }
 Py_SetPythonHome(wpath);
 #endif

[openoffice] 04/08: scripting: add Python 3 support to the Python provider

2020-01-28 Thread mseidel 
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit b4375c204007c475db6255f030c4d5f60ed834dd
Author: Damjan Jovanovic 
AuthorDate: Sat Jan 18 09:52:51 2020 +0200

scripting: add Python 3 support to the Python provider

Patch by: me

(cherry picked from commit 4f686187ecfc86b8d293f1b6c9a49fee4b0bf393)
---
 main/scripting/source/pyprov/pythonscript.py | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/main/scripting/source/pyprov/pythonscript.py 
b/main/scripting/source/pyprov/pythonscript.py
index 23e82b5..af01bb0 100644
--- a/main/scripting/source/pyprov/pythonscript.py
+++ b/main/scripting/source/pyprov/pythonscript.py
@@ -56,7 +56,10 @@ ENABLE_EDIT_DIALOG=False# offers a 
minimal editor for editin
 #---
 
 def encfile(uni):
-return uni.encode( sys.getfilesystemencoding())
+if sys.version_info[0] > 2:
+return uni
+else:
+return uni.encode( sys.getfilesystemencoding())
 
 def lastException2String():
 (excType,excInstance,excTraceback) = sys.exc_info()
@@ -81,7 +84,7 @@ def getLogTarget():
 userInstallation =  pathSubst.getSubstituteVariableValue( "user" )
 if len( userInstallation ) > 0:
 systemPath = uno.fileUrlToSystemPath( userInstallation + 
"/Scripts/python/log.txt" )
-ret = file( systemPath , "a" )
+ret = open( systemPath , "a" )
 except Exception as e:
 print("Exception during creation of pythonscript logfile: "+ 
lastException2String() + "\n, delagating log to stdout\n")
 return ret
@@ -153,13 +156,16 @@ g_implName = 
"org.openoffice.pyuno.LanguageScriptProviderFor"+LANGUAGENAME
 BLOCK_SIZE = 65536
 def readTextFromStream( inputStream ):
 # read the file
-code = uno.ByteSequence( "" )
+code = uno.ByteSequence( b"" )
 while True:
 read,out = inputStream.readBytes( None , BLOCK_SIZE )
 code = code + out
 if read < BLOCK_SIZE:
 break
-return code.value
+if sys.version_info[0] > 2:
+return str( code.value, 'utf-8' )
+else:
+return code.value
 
 def toIniName( str ):
 # TODO: what is the official way to get to know whether i am on the 
windows platform ?

[openoffice] 05/08: pyuno: wrap the right entrypoint for Python 3 in the pyuno dlopen wrapper

2020-01-28 Thread mseidel 
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit bee4b9955243a08e7572e1fc52f40544baf3c55f
Author: Damjan Jovanovic 
AuthorDate: Sat Jan 18 10:20:44 2020 +0200

pyuno: wrap the right entrypoint for Python 3 in the pyuno dlopen wrapper

Patch by: me

(cherry picked from commit 29716487c9dd2d298fa194b73f148072e7f0a3e7)
---
 main/pyuno/Library_pyuno_loader.mk |  2 ++
 main/pyuno/source/module/pyuno_dlopenwrapper.c | 39 --
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/main/pyuno/Library_pyuno_loader.mk 
b/main/pyuno/Library_pyuno_loader.mk
index afbea6f..c13cee7 100644
--- a/main/pyuno/Library_pyuno_loader.mk
+++ b/main/pyuno/Library_pyuno_loader.mk
@@ -38,6 +38,8 @@ else ifeq ($(OS),MACOSX)
 $(eval $(call gb_Library_add_libs,pyuno_loader,-ldl))
 endif
 
+$(call gb_Library_use_external,pyuno_loader,python)
+
 $(eval $(call gb_Library_add_cobjects,pyuno_loader,\
pyuno/source/module/pyuno_dlopenwrapper \
 ))
diff --git a/main/pyuno/source/module/pyuno_dlopenwrapper.c 
b/main/pyuno/source/module/pyuno_dlopenwrapper.c
index beef85b..bb6614c 100644
--- a/main/pyuno/source/module/pyuno_dlopenwrapper.c
+++ b/main/pyuno/source/module/pyuno_dlopenwrapper.c
@@ -21,6 +21,22 @@
 
 
 
+#ifndef Py_PYTHON_H
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
+#ifdef _DEBUG
+#undef _DEBUG
+#include 
+#define _DEBUG
+#else
+#include 
+#endif // #ifdef _DEBUG
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+#endif // #ifdef Py_PYTHON_H
+
 #include 
 
 #include 
@@ -33,12 +49,24 @@
 #endif
 #include 
 
+#if PY_MAJOR_VERSION >= 3
+SAL_DLLPUBLIC_EXPORT void* PyInit_pyuno(void)
+#else
 SAL_DLLPUBLIC_EXPORT void initpyuno ()
+#endif
 {
 Dl_info dl_info;
+#if PY_MAJOR_VERSION >= 3
+void* (*func)(void);
+#else
 void (*func)(void);
+#endif
 
+#if PY_MAJOR_VERSION >= 3
+if (dladdr((void*)_pyuno, _info) != 0) {
+#else
 if (dladdr((void*), _info) != 0) { 
+#endif
 void* h = 0;
size_t len = strrchr(dl_info.dli_fname, '/') - dl_info.dli_fname + 1;
char* libname = malloc(len + RTL_CONSTASCII_LENGTH( SAL_DLLPREFIX 
"pyuno" SAL_DLLEXTENSION ) + 1);
@@ -49,8 +77,15 @@ SAL_DLLPUBLIC_EXPORT void initpyuno ()
free(libname);
 if( h )
 {
-func = (void (*)())dlsym (h, "initpyuno");
-(func) ();
+#if PY_MAJOR_VERSION >= 3
+func = (void* (*)(void))dlsym (h, "PyInit_pyuno");
+#else
+func = (void (*)(void))dlsym (h, "initpyuno");
+#endif
+return (func) ();
 }
 } 
+#if PY_MAJOR_VERSION >= 3
+return NULL;
+#endif
 }

[openoffice] 01/08: Workaround most of the Python 3 issues.

2020-01-28 Thread mseidel 
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 3df2737ca010ccdeca49710afd6535548f04954b
Author: Pedro Giffuni 
AuthorDate: Tue Jan 14 21:38:18 2020 -0500

Workaround most of the Python 3 issues.

(cherry picked from commit d1c4de67fb18833166e1ea82395d623806d5e7a6)
---
 main/pyuno/source/loader/pyuno_loader.cxx | 9 +
 main/pyuno/source/module/pyuno.cxx| 6 +++---
 main/pyuno/source/module/pyuno_util.cxx   | 2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/main/pyuno/source/loader/pyuno_loader.cxx 
b/main/pyuno/source/loader/pyuno_loader.cxx
index f8884d7..62b8460 100644
--- a/main/pyuno/source/loader/pyuno_loader.cxx
+++ b/main/pyuno/source/loader/pyuno_loader.cxx
@@ -113,8 +113,17 @@ static void setPythonHome ( const OUString & pythonHome )
 OUString systemPythonHome;
 osl_getSystemPathFromFileURL( pythonHome.pData, &(systemPythonHome.pData) 
);
 OString o = rtl::OUStringToOString( systemPythonHome, 
osl_getThreadTextEncoding() );
+#if PY_MAJOR_VERSION < 3 || PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 4
 rtl_string_acquire(o.pData); // leak this string (thats the api!)
 Py_SetPythonHome( o.pData->buffer);
+#else
+wchar_t *wpath = Py_DecodeLocale(o.pData->buffer, NULL);
+if (wpath == NULL) {
+   PyErr_SetString(PyExc_SystemError, "Cannot decode python home path");
+   return;
+}
+Py_SetPythonHome(wpath);
+#endif
 }
 
 static void prependPythonPath( const OUString & pythonPathBootstrap )
diff --git a/main/pyuno/source/module/pyuno.cxx 
b/main/pyuno/source/module/pyuno.cxx
index 38f5782..30506b5 100644
--- a/main/pyuno/source/module/pyuno.cxx
+++ b/main/pyuno/source/module/pyuno.cxx
@@ -450,7 +450,7 @@ PyObject* PyUNO_getattr (PyObject* self, char* name)
 {
 PyUNO* me;
 
-#if PY_VERSION_HEX >= 0x0303
+#if PY_VERSION_HEX >= 0x0303 && PY_VERSION_HEX < 0x0306
 char *name = PyUnicode_AsUTF8(attr_name);
 #elif PY_MAJOR_VERSION >= 3
 PyRef pUtf8(PyUnicode_AsUTF8String(attr_name), SAL_NO_ACQUIRE);
@@ -568,7 +568,7 @@ int PyUNO_setattr (PyObject* self, char* name, PyObject* 
value)
 {
 PyUNO* me;
 
-#if PY_VERSION_HEX >= 0x0303
+#if PY_VERSION_HEX >= 0x0303 && PY_VERSION_HEX < 0x0306
 char *name = PyUnicode_AsUTF8(attr_name);
 #elif PY_MAJOR_VERSION >= 3
 PyRef pUtf8(PyUnicode_AsUTF8String(attr_name), SAL_NO_ACQUIRE);
@@ -818,7 +818,7 @@ static PyTypeObject PyUNOType =
 NULL,
 NULL,
 (destructor)0
-#if PY_VERSION_HEX >= 0x0206
+#if PY_VERSION_HEX >= 0x0206 && PY_VERSION_HEX < 0x0306
 , 0
 #endif
 };
diff --git a/main/pyuno/source/module/pyuno_util.cxx 
b/main/pyuno/source/module/pyuno_util.cxx
index 77df033..6cdd7ec 100644
--- a/main/pyuno/source/module/pyuno_util.cxx
+++ b/main/pyuno/source/module/pyuno_util.cxx
@@ -86,7 +86,7 @@ OUString pyString2ustring( PyObject *pystr )
 #if Py_UNICODE_SIZE == 2
ret = OUString( (sal_Unicode * ) PyUnicode_AS_UNICODE( pystr ) );
 #else
-#if PY_VERSION_HEX >= 0x0303
+#if PY_VERSION_HEX >= 0x0303 && PY_VERSION_HEX < 0x0306
 Py_ssize_t size;
 char *pUtf8 = PyUnicode_AsUTF8AndSize(pystr, );
 ret = OUString(pUtf8, size, RTL_TEXTENCODING_UTF8);

[openoffice] 08/08: gtest patch to allow building with Python 3.

2020-01-28 Thread mseidel 
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit d12e9282201a631f4e41c9c584d98b1f338e38d9
Author: Damjan Jovanovic 
AuthorDate: Sat Jan 25 02:59:46 2020 +0200

gtest patch to allow building with Python 3.

Patch by: me

(cherry picked from commit aec63fa3669010e9bec513e6cd55a25fc335d90e)
---
 ext_libraries/gtest/gtest-python3.patch | 96 +
 ext_libraries/gtest/makefile.mk |  2 +-
 2 files changed, 97 insertions(+), 1 deletion(-)

diff --git a/ext_libraries/gtest/gtest-python3.patch 
b/ext_libraries/gtest/gtest-python3.patch
new file mode 100644
index 000..54e7d6f
--- /dev/null
+++ b/ext_libraries/gtest/gtest-python3.patch
@@ -0,0 +1,96 @@
+--- misc/build/gtest-1.7.0/scripts/fuse_gtest_files.py 2020-01-25 
02:36:23.509596000 +0200
 misc/build/gtest-1.7.0/scripts/fuse_gtest_files.py 2020-01-25 
02:50:02.624028000 +0200
+@@ -60,7 +60,10 @@
+ 
+ import os
+ import re
+-import sets
++try:
++import sets
++except ImportError:
++pass
+ import sys
+ 
+ # We assume that this file is in the scripts/ directory in the Google
+@@ -90,8 +93,8 @@
+   """
+ 
+   if not os.path.isfile(os.path.join(directory, relative_path)):
+-print 'ERROR: Cannot find %s in directory %s.' % (relative_path,
+-  directory)
++print ('ERROR: Cannot find %s in directory %s.' % (relative_path,
++  directory))
+ print ('Please either specify a valid project root directory '
+'or omit it on the command line.')
+ sys.exit(1)
+@@ -123,7 +126,7 @@
+(relative_path, output_dir))
+ answer = sys.stdin.readline().strip()
+ if answer not in ['y', 'Y']:
+-  print 'ABORTED.'
++  print ('ABORTED.')
+   sys.exit(1)
+ 
+   # Makes sure the directory holding the output file exists; creates
+@@ -146,8 +149,11 @@
+ def FuseGTestH(gtest_root, output_dir):
+   """Scans folder gtest_root to generate gtest/gtest.h in output_dir."""
+ 
+-  output_file = file(os.path.join(output_dir, GTEST_H_OUTPUT), 'w')
+-  processed_files = sets.Set()  # Holds all gtest headers we've processed.
++  output_file = open(os.path.join(output_dir, GTEST_H_OUTPUT), 'w')
++  if sys.version_info[0] > 2:
++  processed_files = set()
++  else:
++  processed_files = sets.Set()  # Holds all gtest headers we've processed.
+ 
+   def ProcessFile(gtest_header_path):
+ """Processes the given gtest header file."""
+@@ -159,7 +165,7 @@
+ processed_files.add(gtest_header_path)
+ 
+ # Reads each line in the given gtest header.
+-for line in file(os.path.join(gtest_root, gtest_header_path), 'r'):
++for line in open(os.path.join(gtest_root, gtest_header_path), 'r'):
+   m = INCLUDE_GTEST_FILE_REGEX.match(line)
+   if m:
+ # It's '#include "gtest/..."' - let's process it recursively.
+@@ -175,7 +181,10 @@
+ def FuseGTestAllCcToFile(gtest_root, output_file):
+   """Scans folder gtest_root to generate gtest/gtest-all.cc in output_file."""
+ 
+-  processed_files = sets.Set()
++  if sys.version_info[0] > 2:
++  processed_files = set()
++  else:
++  processed_files = sets.Set()
+ 
+   def ProcessFile(gtest_source_file):
+ """Processes the given gtest source file."""
+@@ -187,7 +196,7 @@
+ processed_files.add(gtest_source_file)
+ 
+ # Reads each line in the given gtest source file.
+-for line in file(os.path.join(gtest_root, gtest_source_file), 'r'):
++for line in open(os.path.join(gtest_root, gtest_source_file), 'r'):
+   m = INCLUDE_GTEST_FILE_REGEX.match(line)
+   if m:
+ if 'include/' + m.group(1) == GTEST_SPI_H_SEED:
+@@ -218,7 +227,7 @@
+ def FuseGTestAllCc(gtest_root, output_dir):
+   """Scans folder gtest_root to generate gtest/gtest-all.cc in output_dir."""
+ 
+-  output_file = file(os.path.join(output_dir, GTEST_ALL_CC_OUTPUT), 'w')
++  output_file = open(os.path.join(output_dir, GTEST_ALL_CC_OUTPUT), 'w')
+   FuseGTestAllCcToFile(gtest_root, output_file)
+   output_file.close()
+ 
+@@ -242,7 +251,7 @@
+ # fuse_gtest_files.py GTEST_ROOT_DIR OUTPUT_DIR
+ FuseGTest(sys.argv[1], sys.argv[2])
+   else:
+-print __doc__
++print (__doc__)
+ sys.exit(1)
+ 
+ 
diff --git a/ext_libraries/gtest/makefile.mk b/ext_libraries/gtest/makefile.mk
index 0b811e5..4c0b1c4 100644
--- a/ext_libraries/gtest/makefile.mk
+++ b/ext_libraries/gtest/makefile.mk
@@ -46,7 +46,7 @@ TARFILE_NAME=$(PRJNAME)-$(LIBGTESTVERSION)
 # thankfully, does not care.
 TARFILE_MD5=2d6ec8ccdf5c46b05ba54a9fd1d130d7
 
-PATCH_FILES= use-own-tuple.patch
+PATCH_FILES= use-own-tuple.patch gtest-python3.patch
 
 .IF "$(OS)"=="WNT"

[openoffice] 02/08: Workaround most of the Python 3 issues.

2020-01-28 Thread mseidel 
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 12ae17966a29cfdb844f2f0ef63118c662a57c66
Author: Pedro Giffuni 
AuthorDate: Wed Jan 15 00:42:50 2020 -0500

Workaround most of the Python 3 issues.

(cherry picked from commit 3fca2ba9cd48b30a6c5f46ea5e1c985440d981d7)
---
 main/pyuno/source/loader/pyuno_loader.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/pyuno/source/loader/pyuno_loader.cxx 
b/main/pyuno/source/loader/pyuno_loader.cxx
index 62b8460..6ba2d1c 100644
--- a/main/pyuno/source/loader/pyuno_loader.cxx
+++ b/main/pyuno/source/loader/pyuno_loader.cxx
@@ -117,7 +117,7 @@ static void setPythonHome ( const OUString & pythonHome )
 rtl_string_acquire(o.pData); // leak this string (thats the api!)
 Py_SetPythonHome( o.pData->buffer);
 #else
-wchar_t *wpath = Py_DecodeLocale(o.pData->buffer, NULL);
+static wchar_t *wpath = Py_DecodeLocale(o.pData->buffer, NULL);
 if (wpath == NULL) {
PyErr_SetString(PyExc_SystemError, "Cannot decode python home path");
return;

[openoffice] 07/08: Detect Python's CFLAGS and LIBS using pkg-config when possible.

2020-01-28 Thread mseidel 
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 2919536114762ddf4d9608d31112b8e01ef4b937
Author: Damjan Jovanovic 
AuthorDate: Sat Jan 25 02:11:54 2020 +0200

Detect Python's CFLAGS and LIBS using pkg-config when possible.

This fixes linking to Python on FreeBSD with Python 3.

Patch by: me

(cherry picked from commit 00503fad63e905b0ef1d175bb9780a358bc27263)
---
 main/configure.ac | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/main/configure.ac b/main/configure.ac
index 4ec5594..d6e943e 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -4010,8 +4010,11 @@ elif test -n "$with_system_python" -o -n 
"$with_system_libs" && \
 
python_include=`$PYTHON -c "import distutils.sysconfig; 
print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
python_version=`$PYTHON -c "import distutils.sysconfig; 
print(distutils.sysconfig.get_config_var('VERSION'));"`
-   PYTHON_CFLAGS="-I$python_include"
-   PYTHON_LIBS="-lpython$python_version"
+   PKG_CHECK_MODULES(PYTHON, python-$python_version, PYTHON_PC="TRUE", 
PYTHON_PC="" )
+   if test "$PYTHON_PC" != "TRUE"; then
+   PYTHON_CFLAGS="-I$python_include"
+   PYTHON_LIBS="-lpython$python_version"
+   fi
 fi
 if test "$with_system_python" = "yes" ; then
SYSTEM_PYTHON=YES

[openoffice] branch AOO42X updated (0f827ae -> d12e928)

2020-01-28 Thread mseidel 
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a change to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git.


from 0f827ae  Added missing space in help files
 new 3df2737  Workaround most of the Python 3 issues.
 new 12ae179  Workaround most of the Python 3 issues.
 new 8842d6c  pyuno: convert some tabs to spaces
 new b4375c2  scripting: add Python 3 support to the Python provider
 new bee4b99  pyuno: wrap the right entrypoint for Python 3 in the pyuno 
dlopen wrapper
 new 043e4bd  pyuno: export the entrypoint for Python 3 from libpyuno
 new 2919536  Detect Python's CFLAGS and LIBS using pkg-config when 
possible.
 new d12e928  gtest patch to allow building with Python 3.

The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ext_libraries/gtest/gtest-python3.patch| 96 ++
 ext_libraries/gtest/makefile.mk|  2 +-
 main/configure.ac  |  7 +-
 main/pyuno/Library_pyuno_loader.mk |  2 +
 main/pyuno/inc/pyuno/pyuno.hxx |  4 ++
 main/pyuno/source/loader/pyuno_loader.cxx  |  9 +++
 main/pyuno/source/module/pyuno.cxx |  6 +-
 main/pyuno/source/module/pyuno_dlopenwrapper.c | 39 ++-
 main/pyuno/source/module/pyuno_module.cxx  |  2 +-
 main/pyuno/source/module/pyuno_util.cxx|  2 +-
 main/scripting/source/pyprov/pythonscript.py   | 14 ++--
 11 files changed, 169 insertions(+), 14 deletions(-)
 create mode 100644 ext_libraries/gtest/gtest-python3.patch

[openoffice] 06/08: pyuno: export the entrypoint for Python 3 from libpyuno

2020-01-28 Thread mseidel 
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 043e4bd29f32f6539fd153e5f1e39aa5fb8141b1
Author: Damjan Jovanovic 
AuthorDate: Sat Jan 18 10:25:34 2020 +0200

pyuno: export the entrypoint for Python 3 from libpyuno

Patch by: me

(cherry picked from commit 827897c355691c72f37439b8706bc13261c25889)
---
 main/pyuno/inc/pyuno/pyuno.hxx| 4 
 main/pyuno/source/module/pyuno_module.cxx | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/main/pyuno/inc/pyuno/pyuno.hxx b/main/pyuno/inc/pyuno/pyuno.hxx
index 1245921..cc5e366 100644
--- a/main/pyuno/inc/pyuno/pyuno.hxx
+++ b/main/pyuno/inc/pyuno/pyuno.hxx
@@ -76,7 +76,11 @@
 preconditions: python has been initialized before and
the global interpreter lock is held 
 */
+#if PY_MAJOR_VERSION >= 3
+PY_DLLEXPORT PyMODINIT_FUNC PyInit_pyuno();
+#else
 extern "C" PY_DLLEXPORT void SAL_CALL initpyuno();
+#endif
 
 
 namespace pyuno
diff --git a/main/pyuno/source/module/pyuno_module.cxx 
b/main/pyuno/source/module/pyuno_module.cxx
index e44b0d3..b781035 100644
--- a/main/pyuno/source/module/pyuno_module.cxx
+++ b/main/pyuno/source/module/pyuno_module.cxx
@@ -746,7 +746,7 @@ static struct PyModuleDef PyUNOModule =
 }
 
 #if PY_MAJOR_VERSION >= 3
-extern "C" PyMODINIT_FUNC PyInit_pyuno(void)
+PY_DLLEXPORT PyMODINIT_FUNC PyInit_pyuno()
 {
 PyObject *m;

[openoffice] branch AOO42X updated: Added missing space in help files

2020-01-28 Thread mseidel 
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO42X by this push:
 new 0f827ae  Added missing space in help files
0f827ae is described below

commit 0f827ae2a387fc09b513df59628a2613003d367b
Author: mseidel 
AuthorDate: Tue Jan 28 13:33:39 2020 +0100

Added missing space in help files

(cherry picked from commit a93eb608df6ec3069abb7756c56c7b52278395de)
---
 main/helpcontent2/source/auxiliary/sbasic.tree   | 6 +++---
 main/helpcontent2/source/text/sbasic/shared/03020103.xhp | 4 ++--
 main/helpcontent2/source/text/sbasic/shared/03090203.xhp | 4 ++--
 main/helpcontent2/source/text/sbasic/shared/03103700.xhp | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/main/helpcontent2/source/auxiliary/sbasic.tree 
b/main/helpcontent2/source/auxiliary/sbasic.tree
index d6cda0b..8769293 100644
--- a/main/helpcontent2/source/auxiliary/sbasic.tree
+++ b/main/helpcontent2/source/auxiliary/sbasic.tree
@@ -182,7 +182,7 @@
 Oct Function 
[Runtime]
 On Error GoTo ... Resume 
Statement [Runtime]
 On...GoSub Statement; 
On...GoTo Statement [Runtime]
-Open 
Statement[Runtime]
+Open Statement 
[Runtime]
 Option Base Statement 
[Runtime]
 Option Explicit Statement 
[Runtime]
 Optional (in Function 
Statement) [Runtime]
@@ -207,7 +207,7 @@
 Seek Statement 
[Runtime]
 Select...Case Statement 
[Runtime]
 SetAttr Statement 
[Runtime]
-Set 
Statement[Runtime]
+Set Statement 
[Runtime]
 Sgn Function 
[Runtime]
 Shell Function 
[Runtime]
 Sin Function 
[Runtime]
@@ -237,7 +237,7 @@
 Val Function 
[Runtime]
 Wait Statement 
[Runtime]
 WeekDay Function 
[Runtime]
-While...Wend 
Statement[Runtime]
+While...Wend Statement 
[Runtime]
 With Statement 
[Runtime]
 Write Statement 
[Runtime]
 Xor Operator 
[Runtime]
diff --git a/main/helpcontent2/source/text/sbasic/shared/03020103.xhp 
b/main/helpcontent2/source/text/sbasic/shared/03020103.xhp
index 842c1a7..2b4bcfe 100644
--- a/main/helpcontent2/source/text/sbasic/shared/03020103.xhp
+++ b/main/helpcontent2/source/text/sbasic/shared/03020103.xhp
@@ -27,7 +27,7 @@
 
 
 
-Open Statement[Runtime]
+Open Statement [Runtime]
 /text/sbasic/shared/03020103.xhp
 
 
@@ -39,7 +39,7 @@
 
 Open statement
 
-Open Statement[Runtime]
+Open Statement [Runtime]
 Opens a data channel.
 
 Syntax:
diff --git a/main/helpcontent2/source/text/sbasic/shared/03090203.xhp 
b/main/helpcontent2/source/text/sbasic/shared/03090203.xhp
index 249c109..ecf489f 100644
--- a/main/helpcontent2/source/text/sbasic/shared/03090203.xhp
+++ b/main/helpcontent2/source/text/sbasic/shared/03090203.xhp
@@ -25,7 +25,7 @@
 
 
 
-While...Wend Statement[Runtime]
+While...Wend Statement [Runtime]
 /text/sbasic/shared/03090203.xhp
 
 
@@ -37,7 +37,7 @@
   
   
   
-  While;While...Wend 
loopWhile...Wend Statement[Runtime]
+  While;While...Wend 
loopWhile...Wend Statement [Runtime]
   When a program encounters a While statement, it tests the condition. 
If the condition is False, the program continues directly following the Wend 
statement. If the condition is True, the loop is executed until the program 
finds Wend and then jumps back to the While statement. If the 
condition is still True, the loop is executed again.
   
   Unlike the Do...Loop statement, you cannot cancel a 
While...Wend loop with Exit. Never exit a 
While...Wend loop with GoTo, since this can cause a run-time error.
diff --git a/main/helpcontent2/source/text/sbasic/shared/03103700.xhp 
b/main/helpcontent2/source/text/sbasic/shared/03103700.xhp
index a379cb1..678b22b 100644
--- a/main/helpcontent2/source/text/sbasic/shared/03103700.xhp
+++ b/main/helpcontent2/source/text/sbasic/shared/03103700.xhp
@@ -27,7 +27,7 @@
 
 
 
-Set Statement[Runtime]
+Set Statement [Runtime]
 /text/sbasic/shared/03103700.xhp
 
 
@@ -40,7 +40,7 @@
 Set statement
 Nothing object
 
-Set Statement[Runtime]
+Set Statement [Runtime]
 Sets an object reference on a variable or a Property.
 
 Syntax:

[openoffice] branch trunk updated: Added missing space in help files

2020-01-28 Thread mseidel 
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
 new a93eb60  Added missing space in help files
a93eb60 is described below

commit a93eb608df6ec3069abb7756c56c7b52278395de
Author: mseidel 
AuthorDate: Tue Jan 28 13:33:39 2020 +0100

Added missing space in help files
---
 main/helpcontent2/source/auxiliary/sbasic.tree   | 6 +++---
 main/helpcontent2/source/text/sbasic/shared/03020103.xhp | 4 ++--
 main/helpcontent2/source/text/sbasic/shared/03090203.xhp | 4 ++--
 main/helpcontent2/source/text/sbasic/shared/03103700.xhp | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/main/helpcontent2/source/auxiliary/sbasic.tree 
b/main/helpcontent2/source/auxiliary/sbasic.tree
index d6cda0b..8769293 100644
--- a/main/helpcontent2/source/auxiliary/sbasic.tree
+++ b/main/helpcontent2/source/auxiliary/sbasic.tree
@@ -182,7 +182,7 @@
 Oct Function 
[Runtime]
 On Error GoTo ... Resume 
Statement [Runtime]
 On...GoSub Statement; 
On...GoTo Statement [Runtime]
-Open 
Statement[Runtime]
+Open Statement 
[Runtime]
 Option Base Statement 
[Runtime]
 Option Explicit Statement 
[Runtime]
 Optional (in Function 
Statement) [Runtime]
@@ -207,7 +207,7 @@
 Seek Statement 
[Runtime]
 Select...Case Statement 
[Runtime]
 SetAttr Statement 
[Runtime]
-Set 
Statement[Runtime]
+Set Statement 
[Runtime]
 Sgn Function 
[Runtime]
 Shell Function 
[Runtime]
 Sin Function 
[Runtime]
@@ -237,7 +237,7 @@
 Val Function 
[Runtime]
 Wait Statement 
[Runtime]
 WeekDay Function 
[Runtime]
-While...Wend 
Statement[Runtime]
+While...Wend Statement 
[Runtime]
 With Statement 
[Runtime]
 Write Statement 
[Runtime]
 Xor Operator 
[Runtime]
diff --git a/main/helpcontent2/source/text/sbasic/shared/03020103.xhp 
b/main/helpcontent2/source/text/sbasic/shared/03020103.xhp
index 842c1a7..2b4bcfe 100644
--- a/main/helpcontent2/source/text/sbasic/shared/03020103.xhp
+++ b/main/helpcontent2/source/text/sbasic/shared/03020103.xhp
@@ -27,7 +27,7 @@
 
 
 
-Open Statement[Runtime]
+Open Statement [Runtime]
 /text/sbasic/shared/03020103.xhp
 
 
@@ -39,7 +39,7 @@
 
 Open statement
 
-Open Statement[Runtime]
+Open Statement [Runtime]
 Opens a data channel.
 
 Syntax:
diff --git a/main/helpcontent2/source/text/sbasic/shared/03090203.xhp 
b/main/helpcontent2/source/text/sbasic/shared/03090203.xhp
index 249c109..ecf489f 100644
--- a/main/helpcontent2/source/text/sbasic/shared/03090203.xhp
+++ b/main/helpcontent2/source/text/sbasic/shared/03090203.xhp
@@ -25,7 +25,7 @@
 
 
 
-While...Wend Statement[Runtime]
+While...Wend Statement [Runtime]
 /text/sbasic/shared/03090203.xhp
 
 
@@ -37,7 +37,7 @@
   
   
   
-  While;While...Wend 
loopWhile...Wend Statement[Runtime]
+  While;While...Wend 
loopWhile...Wend Statement [Runtime]
   When a program encounters a While statement, it tests the condition. 
If the condition is False, the program continues directly following the Wend 
statement. If the condition is True, the loop is executed until the program 
finds Wend and then jumps back to the While statement. If the 
condition is still True, the loop is executed again.
   
   Unlike the Do...Loop statement, you cannot cancel a 
While...Wend loop with Exit. Never exit a 
While...Wend loop with GoTo, since this can cause a run-time error.
diff --git a/main/helpcontent2/source/text/sbasic/shared/03103700.xhp 
b/main/helpcontent2/source/text/sbasic/shared/03103700.xhp
index a379cb1..678b22b 100644
--- a/main/helpcontent2/source/text/sbasic/shared/03103700.xhp
+++ b/main/helpcontent2/source/text/sbasic/shared/03103700.xhp
@@ -27,7 +27,7 @@
 
 
 
-Set Statement[Runtime]
+Set Statement [Runtime]
 /text/sbasic/shared/03103700.xhp
 
 
@@ -40,7 +40,7 @@
 Set statement
 Nothing object
 
-Set Statement[Runtime]
+Set Statement [Runtime]
 Sets an object reference on a variable or a Property.
 
 Syntax:

buildbot failure in on openoffice-linux64-nightly

2020-01-28 Thread buildbot 
The Buildbot has detected a new failure on builder openoffice-linux64-nightly 
while building . Full details are available at:
https://ci.apache.org/builders/openoffice-linux64-nightly/builds/668

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb_slave8_ubuntu

Build Reason: The Nightly scheduler named 'openoffice-linux64-nightly' 
triggered this build
Build Source Stamp: [branch trunk] HEAD
Blamelist: 

BUILD FAILED: failed bootstrap

Sincerely,
 -The Buildbot