Re: [Libreoffice-qa] Minutes of ESC call: 2018-05-30

[Jan Iversen]

Enviado desde mi iPad

> El 30 may 2018, a las 18:38, Jan Holesovsky  escribió:
> 
> * Present:
>+ Thorsten, Kendy, Heiko, Noel, Olivier, Xisco, Bubli, Stephan, Sophie,
>  Michael W., Drew, Eike, Cloph
+ jani (I was the first, when you asked for names).
Rgds
Jan I.
> 
> * Completed Action Items:
> 
> * Pending Action Items:
> 
> * Release Engineering update (Christian)
>+ 6.0.5 – RC1 – this week.
>+ about to tag  
>+ 6.1.0 beta 1 status …
>+ out for a few days now
>+ beta 2 on June 12th – Cloph plans to do the Beta 2
>+ 6.1 late features
>+ calc threading default / fixing (Miklos)
>   + ongoing – more fixes this week.
>+ writer – red-lining re-factoring (Michael S)
>   + ongoing, to be pushed the next week hopefully
>   + switch to switch those 2
>+ KDE5 work (Bubli/Thorsten)
>   + canceled for 6.1, gets merged into master the next days, with the 
> view
> to ship it in 6.2 then
>+ Help format (Stephan)
>   + still trying to figure out how to make extension help work with 
> the
> new format
>+ Get-involved info-bar & Help/About menu (Michael)
>+ Renewed the Windows certificate for another year (watch out QA).
>+ Remotes
>+ iOS remote pending Apple’s approval.
>+ Android viewer
>+ Online
>+ waiting for -6-1 branch.
> 
> * Documentation (Olivier)
>+ New Help
> + Tested build with sberg : OK
> + has a localized build now
> + Discuss: Need a tinderbox to build offline new Help 
>+ “--with-help=html”
> + Tweaks for GDPR in online pages.
>+ Help Pages
> + fixes 
> + Doc bugs triaging.
>+ Guides
> + Sprint Revision week 
>  + 6 of 16 chapters ready for publication
>  + 10 more needed still, but progressing
>  + Missing team members
> 
> * UX Update (Heiko)
>+ Bugzilla (topicUI) statistics
>247(247) (topicUI) bugs open, 315(315) (needsUXEval)
>+ Updates:
>BZ changes   1 week   1 month3 months   12 months  
> added 1(-2)  7(-7) 33(-5) 103(-5) 
> commented 8(-32)   110(-67)   461(-51)   1890(-64)
>   removed 0(0)   0(0)   2(0)   11(0)  
>  resolved 2(1)   5(-1) 31(1)  180(0)  
>+ top 10 contributors:
>  Tietze, Heiko made 46 changes in 1 month, and 813 changes in 1 year
>  Pedro made 35 changes in 1 month, and 44 changes in 1 year
>  Cor Nouws made 14 changes in 1 month, and 155 changes in 1 year
>  Thomas Lendo made 12 changes in 1 month, and 395 changes in 1 year
>  Dieter Praas made 10 changes in 1 month, and 141 changes in 1 year
>  Xisco Faulí made 8 changes in 1 month, and 330 changes in 1 year
>  Foote, V Stuart made 8 changes in 1 month, and 265 changes in 1 year
>  Henschel, Regina made 7 changes in 1 month, and 107 changes in 1 year
>  Kainz, Andreas made 7 changes in 1 month, and 23 changes in 1 year
>  Buovjaga made 7 changes in 1 month, and 191 changes in 1 year
> 
>  + Late feature coming with flat MIME icons
>+ https://bugs.documentfoundation.org/show_bug.cgi?id=117456
>+ https://gerrit.libreoffice.org/#/c/54990/
>+ Andreas K. working on this
>+ documentation team informed
> 
> * Crash Reporting (Caolan)
>+ 6(-11) import failure, 3(+0) export failures
>   + 2 exports – mst layout asserts.
>   + fast-parser fix integrated.
>+ coverity
>+ ?? 6 (+3, -9)
>+ forcepoint round 7.
>+ ??
>+ oss-fuzz ?? (10 outstanding, 9 minor)
> 
> * Crash Reporting (Xisco)
>+ http://crashreport.libreoffice.org/stats/version/5.4.5.1 
>  + 650 (last 7 days) (+35)
>+ http://crashreport.libreoffice.org/stats/version/5.4.6.2 
>  + 724 (last 7 days) (+63)
>+ http://crashreport.libreoffice.org/stats/version/5.4.7.2
>  + 340 (last 7 days) (+116)
>+ http://crashreport.libreoffice.org/stats/version/6.0.3.2
>  + 1167 (last 7 days) (-165)
>+ http://crashreport.libreoffice.org/stats/version/6.0.4.2
>  + 1228 (last 7 days) (+216)
> 
> * Budget ranking (Thorsten)
>   + on ESC share - “Budget2018” - add your ranking.
> 
> * GSoC schedule (Heiko)
>   + Coding: May 14 - August 6
>   + please tell students to send a weekly status upate.
>   + Evaluation 1: June 11 - 15
>   + Evaluation 2: July 9 - 13
>   + Students Submit Code and Final Evaluations: August 6 - 14
>   + Mentors Submit Final Evaluations: August 14 - 21
>   + Results Announced: August 22
>   + https://wiki.documentfoundation.org/Development/GSoC/2018
> 
> * Hackfests & Events
>   + a hole here – potential one in Switzerland later in the year.
>   + call for papers for the LibreOffice Conference still ongoing! (Sophie)
>  + deadline: mid-July
> 
> * 

Re: Minutes of ESC call: 2018-05-30

[Jan Iversen]

Enviado desde mi iPad

> El 30 may 2018, a las 18:38, Jan Holesovsky  escribió:
> 
> * Present:
>+ Thorsten, Kendy, Heiko, Noel, Olivier, Xisco, Bubli, Stephan, Sophie,
>  Michael W., Drew, Eike, Cloph
+ jani (I was the first, when you asked for names).
Rgds
Jan I.
> 
> * Completed Action Items:
> 
> * Pending Action Items:
> 
> * Release Engineering update (Christian)
>+ 6.0.5 – RC1 – this week.
>+ about to tag  
>+ 6.1.0 beta 1 status …
>+ out for a few days now
>+ beta 2 on June 12th – Cloph plans to do the Beta 2
>+ 6.1 late features
>+ calc threading default / fixing (Miklos)
>   + ongoing – more fixes this week.
>+ writer – red-lining re-factoring (Michael S)
>   + ongoing, to be pushed the next week hopefully
>   + switch to switch those 2
>+ KDE5 work (Bubli/Thorsten)
>   + canceled for 6.1, gets merged into master the next days, with the 
> view
> to ship it in 6.2 then
>+ Help format (Stephan)
>   + still trying to figure out how to make extension help work with 
> the
> new format
>+ Get-involved info-bar & Help/About menu (Michael)
>+ Renewed the Windows certificate for another year (watch out QA).
>+ Remotes
>+ iOS remote pending Apple’s approval.
>+ Android viewer
>+ Online
>+ waiting for -6-1 branch.
> 
> * Documentation (Olivier)
>+ New Help
> + Tested build with sberg : OK
> + has a localized build now
> + Discuss: Need a tinderbox to build offline new Help 
>+ “--with-help=html”
> + Tweaks for GDPR in online pages.
>+ Help Pages
> + fixes 
> + Doc bugs triaging.
>+ Guides
> + Sprint Revision week 
>  + 6 of 16 chapters ready for publication
>  + 10 more needed still, but progressing
>  + Missing team members
> 
> * UX Update (Heiko)
>+ Bugzilla (topicUI) statistics
>247(247) (topicUI) bugs open, 315(315) (needsUXEval)
>+ Updates:
>BZ changes   1 week   1 month3 months   12 months  
> added 1(-2)  7(-7) 33(-5) 103(-5) 
> commented 8(-32)   110(-67)   461(-51)   1890(-64)
>   removed 0(0)   0(0)   2(0)   11(0)  
>  resolved 2(1)   5(-1) 31(1)  180(0)  
>+ top 10 contributors:
>  Tietze, Heiko made 46 changes in 1 month, and 813 changes in 1 year
>  Pedro made 35 changes in 1 month, and 44 changes in 1 year
>  Cor Nouws made 14 changes in 1 month, and 155 changes in 1 year
>  Thomas Lendo made 12 changes in 1 month, and 395 changes in 1 year
>  Dieter Praas made 10 changes in 1 month, and 141 changes in 1 year
>  Xisco Faulí made 8 changes in 1 month, and 330 changes in 1 year
>  Foote, V Stuart made 8 changes in 1 month, and 265 changes in 1 year
>  Henschel, Regina made 7 changes in 1 month, and 107 changes in 1 year
>  Kainz, Andreas made 7 changes in 1 month, and 23 changes in 1 year
>  Buovjaga made 7 changes in 1 month, and 191 changes in 1 year
> 
>  + Late feature coming with flat MIME icons
>+ https://bugs.documentfoundation.org/show_bug.cgi?id=117456
>+ https://gerrit.libreoffice.org/#/c/54990/
>+ Andreas K. working on this
>+ documentation team informed
> 
> * Crash Reporting (Caolan)
>+ 6(-11) import failure, 3(+0) export failures
>   + 2 exports – mst layout asserts.
>   + fast-parser fix integrated.
>+ coverity
>+ ?? 6 (+3, -9)
>+ forcepoint round 7.
>+ ??
>+ oss-fuzz ?? (10 outstanding, 9 minor)
> 
> * Crash Reporting (Xisco)
>+ http://crashreport.libreoffice.org/stats/version/5.4.5.1 
>  + 650 (last 7 days) (+35)
>+ http://crashreport.libreoffice.org/stats/version/5.4.6.2 
>  + 724 (last 7 days) (+63)
>+ http://crashreport.libreoffice.org/stats/version/5.4.7.2
>  + 340 (last 7 days) (+116)
>+ http://crashreport.libreoffice.org/stats/version/6.0.3.2
>  + 1167 (last 7 days) (-165)
>+ http://crashreport.libreoffice.org/stats/version/6.0.4.2
>  + 1228 (last 7 days) (+216)
> 
> * Budget ranking (Thorsten)
>   + on ESC share - “Budget2018” - add your ranking.
> 
> * GSoC schedule (Heiko)
>   + Coding: May 14 - August 6
>   + please tell students to send a weekly status upate.
>   + Evaluation 1: June 11 - 15
>   + Evaluation 2: July 9 - 13
>   + Students Submit Code and Final Evaluations: August 6 - 14
>   + Mentors Submit Final Evaluations: August 14 - 21
>   + Results Announced: August 22
>   + https://wiki.documentfoundation.org/Development/GSoC/2018
> 
> * Hackfests & Events
>   + a hole here – potential one in Switzerland later in the year.
>   + call for papers for the LibreOffice Conference still ongoing! (Sophie)
>  + deadline: mid-July
> 
> * 

Make not using dependencies.

[Jan Iversen]

Hi

I have over time had a problem with make (iOS build). When I update my master 
repo and simply call “make” it works like a charm for osx, but I often get 
unresolved dependencies for iOS:

[build LNK] iOS dylib
Undefined symbols for architecture arm64:
  "ScNoteUtil::CreateNoteFromObjectData(ScDocument&, ScAddress const&, 
SfxItemSet*, OutlinerParaObject*, tools::Rectangle const&, bool, bool)", 
referenced from:
  XclImpNoteObj::DoPreProcessSdrObj(XclImpDffConverter&, SdrObject&) const 
in libscfiltlo.a(xiescher.o)
  "ScColumn::SetEditText(int, EditTextObject*)", referenced from:
  (anonymous namespace)::setSuffixCell(ScColumn&, int, int, unsigned short, 
rtl::OUString const&, CellType, bool) in libsclo.a(table4.o)
  "ScDocumentImport::setEditCell(ScAddress const&, EditTextObject*)", 
referenced from:
  oox::xls::WorksheetGlobals::insertHyperlink(ScAddress const&, 
rtl::OUString const&) in libscfiltlo.a(worksheethelper.o)
  oox::xls::WorksheetHelper::putRichString(ScAddress const&, 
oox::xls::RichString const&, oox::xls::Font const*) in 
libscfiltlo.a(worksheethelper.o)
  (anonymous namespace)::lclInsertUrl(XclImpRoot&, rtl::OUString const&, 
short, int, short) in libscfiltlo.a(xicontent.o)
  
"svtools::executeRestartDialog(com::sun::star::uno::Reference
 const&, vcl::Window*, svtools::RestartReason)", referenced from:
  (anonymous namespace)::lcl_tryLoadBibliography() in libsfxlo.a(appserv.o)
  "ScDocument::SetEditText(ScAddress const&, EditTextObject*)", referenced from:
  ScDocFunc::SetEditCell(ScAddress const&, EditTextObject const&, bool) in 
libsclo.a(docfunc.o)
  ScDocument::TransliterateText(ScMarkData const&, TransliterationFlags) in 
libsclo.a(documen8.o)
  ScCellRangesBase::SetOnePropertyValue(SfxItemPropertySimpleEntry const*, 
com::sun::star::uno::Any const&) in libsclo.a(cellsuno.o)
  ScTransferObj::StripRefs(ScDocument*, short, int, short, int, 
ScDocument*) in libsclo.a(transobj.o)
  ScUndoReplace::Undo() in libsclo.a(undoblk3.o)
  "ScUndoEnterData::ScUndoEnterData(ScDocShell*, ScAddress const&, 
std::__1::vector&, rtl::OUString const&, 
EditTextObject*)", referenced from:
  ScDocFunc::SetNormalString(bool&, ScAddress const&, rtl::OUString const&, 
bool) in libsclo.a(docfunc.o)

This is from master today. When I do (in this case) “cd sc; make” it tells me 
there are nothing to build, but if I do “cd sc; make clean; make; cd ..; make” 
it links correctly, so it is as if the iOS build has somehow “shortcutted” the 
dependencies.

I have tried to find the relevant part in Solenv/gbuild but without success, so 
any idea/pointer are most welcome.

Thanks in advance.
rgds
Jan I.

Ps. I know I made the iOS port, but obviously something is missing between 
generating a full LO and generating LibreOfficeKit.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: "Microsoft Excel Is Going Beyond Text and Numbers"

[Jan Iversen]

Sent from my iPad

> On 5 Apr 2018, at 11:40, toki  wrote:
> 
>> On 04/04/2018 09:31 PM, Thorsten Behrens wrote:
>> 
>> Great list, thx for breaking it down!
> 
> Were I working on a set of extensions to provide that functionality, I'd
> break it down into even more groups. That discussion, and breakdown
> would occur on day one of a Scrum Sprint.
> 
>> There's an until-the-beginning-of-EUR times archive for
>> EUR-vs-other-currencies archive, IIRC even with sell/buy/daily median
>> data
>> (https://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml?4e6747038ab5c1e1bf2d9e383e39a2d3
>> etc). Also, what about oanda.com?
> 
> XE.COM is the only source I'm familiar with. If other sources provide
> the same data, use them.
> 
>> I have some python code for the above, that we use for TDF's accounting.
> 
> 
> 
>> (obligatory rant: _current_ exchange or stock market rates in
>> spreadsheet functions have close to zero practical value, and only
> 
> The only reason/use case I have for both currency exchange rates, and
> stock market prices, is to determine value for today.
you use historical data to build and monitor trends, f.x. I have a 1 year trend 
analysis on my portfolio, this helps in deciding when to sell (e.g. not sell in 
panic today for reasons of the beginning trade war). So having historical 
values for stocks and exchange rates are useful.

rgds
jan i 
> 
>> encourage people to do shitty accounting.
> 
> If one is stupid enough to use the same spreadsheet for historical data,
> as for current data, then your description is way too kind.
> 
>>> * I don't know what the rules are, for any current vendors of stock
>>> market data. I didn't use Get_Quote, because it didn't cover the stock
>>> exchange I tracked - each stock market probably needs its own extension.
>>> 
>> A great opportunity to mine websites, and perhaps push for more open data?
> 
> Maybe.
> The limiting function here being federal/state/local legislation
> concerning securities.
> 
>>> probably can be pulled, at least in part, from WikiData.
>> Do you have any further pointers for that?
> 
> https://www.wikidata.org/wiki/Wikidata:Main_Page
> 
> Distributed under a CC0 license.
> (https://creativecommons.org/publicdomain/zero/1.0/)
> 
> Database dumps available as:
> * JSON;
> * RDF;
> * XML;
> 
> JSON is updated daily, and is the recommended format for downloading the
> database.
> 
> The database model is described at
> https://www.mediawiki.org/wiki/Wikibase/DataModel/Primer
> 
> The database schema is described at
> https://www.mediawiki.org/wiki/Wikibase/Schema
> 
> Database dumps are available at
> https://archive.org/details/wikimediadownloads?and[]=%22Wikidata%20entity%20dumps%22
> 
> The GZIP archive for 20180328 is 19.3 GB.
> 
> https://dumps.wikimedia.org/wikidatawiki/entities/
> also has database dumps.
> 
> The GZIP archive for 20180402 is 31,445,496,877 bytes.
> 
> jonathon
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: ios/LibreOfficeLight

[jan Iversen]

 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
 |   40 ++
 
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
   |4 -
 
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Release.xcscheme
 |4 -
 ios/LibreOfficeLight/LibreOfficeLight/ButtonScrollView.swift   
 |2 
 ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift 
 |6 -
 ios/LibreOfficeLight/LibreOfficeLight/DocumentOverlaysView.swift   
 |2 
 ios/LibreOfficeLight/LibreOfficeLight/LOKit/DocumentHolder.swift   
 |2 
 7 files changed, 17 insertions(+), 43 deletions(-)

New commits:
commit ac65efa1cff5c3ae763c24d0f1340617625e3fbc
Author: jan Iversen <j...@libreoffice.org>
Date:   Mon Apr 2 12:27:13 2018 +0200

iOS, update source to xcode 9.3 swift 4.1

Change-Id: I68464a213303ebe7dd850659031baf4cd7bdfa73

diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 48a6475acad0..67e33800b54a 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -97,19 +97,10 @@
3992D8591E5B762A00BEA987 /* DocumentController.swift */ = {isa 
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; 
name = DocumentController.swift; path = 
LibreOfficeLight/DocumentController.swift; sourceTree = SOURCE_ROOT; };
399648461E5B87DC00E73E83 /* ViewProperties.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewProperties.swift; path = LibreOfficeLight/ViewProperties.swift; 
sourceTree = SOURCE_ROOT; };
39B092501E5F3DEA00682A59 /* LibreOfficeLight-Prefix.pch */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; 
path = "LibreOfficeLight-Prefix.pch"; sourceTree = ""; };
+   39B4245D2060FB2300347588 /* ucbhelper.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = ucbhelper.cxx; path = ../../unotools/source/ucbhelper/ucbhelper.cxx; 
sourceTree = ""; };
39E950521FC9842000D82C49 /* source */ = {isa = 
PBXFileReference; lastKnownFileType = folder; name = source; path = ../source; 
sourceTree = ""; };
39EE81531FA644E800B73AB8 /* Info.plist */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = 
Info.plist; sourceTree = ""; };
39EF4E2E1FA500C9001914AC /* PropertiesController.swift */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.swift; path = PropertiesController.swift; sourceTree = ""; };
-   39FD89C9204E87E900E7179F /* except.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = except.cxx; path = 
"../../bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx"; sourceTree = 
""; };
-   39FD89D8204E8EEE00E7179F /* call.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = call.cxx; path = 
"../../bridges/source/cpp_uno/gcc3_macosx_x86-64/call.cxx"; sourceTree = 
""; };
-   39FD89D9204E8EEE00E7179F /* abi.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = abi.cxx; path = 
"../../bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx"; sourceTree = 
""; };
-   39FD89DA204E8EEE00E7179F /* uno2cpp.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = uno2cpp.cxx; path = 
"../../bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx"; sourceTree = 
""; };
-   39FD89DB204E8EEE00E7179F /* share.hxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name 
= share.hxx; path = 
"../../bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx"; sourceTree = 
""; };
-   39FD89DC204E8EEE00E7179F /* call.hxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name 
= call.hxx; path = "../../bridges/source/cpp_uno/gcc3_macosx_x86-64/call.hxx"; 
sourceTree = ""; };
-   39FD89DD204E8EEE00E7179F /* abi.hxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name 
= abi.hxx; path = "../../bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx"; 
sourceTree = ""; };
-   39FD89DE204E8EEE00E7179F /* callvirtualmethod.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c

[Libreoffice-commits] core.git: 2 commits - configure.ac README.md vcl/source

[jan Iversen]

 README.md  |4 ++--
 configure.ac   |2 +-
 vcl/source/filter/ipdf/pdfread.cxx |4 
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 6e7f6dd20aa58cb4c9ab66260a62d71a53002b9b
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Apr 1 18:21:38 2018 +0200

iOS, void unused paramters.

Change-Id: I60b7d1a49d9e9073470ee8d0d6e68b34cdd0bdad

diff --git a/vcl/source/filter/ipdf/pdfread.cxx 
b/vcl/source/filter/ipdf/pdfread.cxx
index 572a4c2f6831..7f31e0ac15de 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -195,6 +195,10 @@ bool getCompatibleStream(SvStream& rInStream, SvStream& 
rOutStream, sal_uInt64 n
 size_t generatePreview(SvStream&, std::vector&, sal_uInt64 nPos, 
sal_uInt64 nSize,
size_t nFirstPage = 0, int nLastPage = 0)
 {
+(void)nPos;
+(void)nSize;
+(void)nFirstPage;
+(void)nLastPage;
 return false;
 }
 
commit e63a65174800968cfe5adb38e8f9ca28f22984d0
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Apr 1 18:15:58 2018 +0200

iOS, bump versions

SDK needed is 11.3
Xcode needed is 9.3

Change-Id: If26eda81f969f63500d94e3274dda8efb59dec12

diff --git a/README.md b/README.md
index 1bbf9b58a481..c59f68122473 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,8 @@ run and compile LibreOffice, also used by the TDF builds:
 * Runtime: RHEL 6 or CentOS 6
 * Build: GCC 4.8.1 or Clang
 * iOS (only for LibreOfficeKit):
-* Runtime: 11.2 (only support for newer i devices == 64 bit)
-* Build: Xcode 9.0 and iPhone SDK 11.2
+* Runtime: 11.3 (only support for newer i devices == 64 bit)
+* Build: Xcode 9.3 and iPhone SDK 11.3
 
 At least Clang 3.4.2 is known to be too old to pass the configure.ac check 
"whether $CXX supports
 C++17, C++14, or C++11" in its current form (due to the #pragma GCC diagnostic 
ignored "-Wpragmas"
diff --git a/configure.ac b/configure.ac
index 73bc7b16a14d..e2d5c8c5e320 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2925,7 +2925,7 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=11.2
+current_sdk_ver=11.3
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=$current_sdk_ver
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: 'StylePoolImpl::createIterator': function does not take 0 arguments

[Jan Iversen]

> 
> As it happens, in LibreOffice code, "#ifdef DEBUG" is 1:1 equivalent to "#if 
> (OSL_DEBUG_LEVEL >= 2)", and the thought was that perhaps all instances of 
> "#ifdef DEBUG" should be changed to that instead, to make it more clear that 
> it is a rather rare way to build, that code inside "#ifdef DEBUG" is *not* 
> compiled in a normal --enable-debug or --enable-dbgutil build, but one needs 
> the much more rare case of increasing the dbglevel thing.
> 
> It has even been suggested in the past we should get rid of those dbglevel, 
> or OSL_DEBUG_LEVEL, things, to make the configuration space smaller. It is 
> quite enough (in my opinion) to have --enable-debug, --enable-dbgutil, 
> --enable-symbols, --enable-assert-always-abort, and --enable-sal-log, that 
> all have related but different meanings. Also --enable-release-build could be 
> interpreted as being related. And I probably forgot some...

Having fallen into this pitfall a couple of times and got a headache 
understanding why the code was not executed, I highly favor to at least change 
to OSL_DEBUG_LEVEL >= 2.

I am one of those who would like to remove the debug levels, but lately 
(spending far too much time in the internal UNO workings), I am a little afraid 
that we have a lot of bit rotten code waiting to become a problem. So doing 
this change in a branch would be wise.

rgds
jan I
> 
> Currently, when somebody loosely talks about "debug mode" vs "release mode" 
> (as is common for people coming from a background of Visual Studio projects, 
> for instance), it is fairly unclear what they actually mean. We should strive 
> to make it clearer.
> 
> What you say "make my own DEBUG build", what do you mean exactly?
> 
> --tml
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: bridges/source

[jan Iversen]

 bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx|   39 ++---
 bridges/source/cpp_uno/gcc3_ios/ios64_helper.s |   12 ---
 2 files changed, 17 insertions(+), 34 deletions(-)

New commits:
commit 5747ed051440a8baff4b503b3b45146510f198bc
Author: jan Iversen <j...@libreoffice.org>
Date:   Tue Mar 20 13:14:07 2018 +0100

iOS, simplified assembler

RC of cpp_vtable_call is never used in the asm part, so remove it.

Change-Id: Iabda12541fbb574a21395a8430c52a3e9f892947

diff --git a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
index 9ad3954e4504..4c7bb8354ab1 100644
--- a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
@@ -290,11 +290,13 @@ namespace
 }
 
 
-static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex,
-  sal_Int32 nVtableOffset,
-  void ** pCallStack,
-  sal_Int64 * pRegisterReturn )
+static void cpp_mediate(sal_Int32 nFunctionIndex,
+sal_Int32 nVtableOffset,
+void ** pCallStack)
 {
+sal_Int64 nRegReturn;
+sal_Int64 *pRegisterReturn = 
+
 // pCallStack: x8, lr, d0..d7, x0..x7, rest of params originally on 
stack
 // _this_ ptr is patched cppu_XInterfaceProxy object
 void *pThis = pCallStack[2 + 8];
@@ -409,7 +411,8 @@ namespace
 }
 }
 
-return eRet;
+(void)eRet;
+return;
 }
 }
 
@@ -419,31 +422,9 @@ namespace
  */
 
 extern "C" void cpp_vtable_call( sal_Int32 func, sal_Int32 offset,
- void **pCallStack )
+ void **pStack )
 {
-sal_Int64 nRegReturn;
-typelib_TypeClass aType = cpp_mediate( func, offset, pCallStack, 
 );
-
-switch( aType )
-{
-case typelib_TypeClass_BOOLEAN:
-case typelib_TypeClass_BYTE:
-nRegReturn = (unsigned long)(*(unsigned char *));
-break;
-case typelib_TypeClass_CHAR:
-case typelib_TypeClass_UNSIGNED_SHORT:
-case typelib_TypeClass_SHORT:
-nRegReturn = (unsigned long)(*(unsigned short *));
-break;
-case typelib_TypeClass_ENUM:
-case typelib_TypeClass_UNSIGNED_LONG:
-case typelib_TypeClass_LONG:
-nRegReturn = (unsigned long)(*(unsigned int *));
-break;
-case typelib_TypeClass_VOID:
-default:
-break;
-}
+cpp_mediate(func, offset, pStack);
 }
 
 namespace
diff --git a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s 
b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
index e08910db8e55..12308f1a9855 100644
--- a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
+++ b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
@@ -199,8 +199,6 @@ _privateSnippetExecutor:
 .cfi_offset w29, -16
 
 // _privateSnippetExecutor is jumped to from codeSnippet_*
-stp x29, x30, [sp, #-0x10]!
-mov x29, sp
 
 // push all GP, FP/SIMD registers to the stack
 stp x6, x7, [sp, #-16]!
@@ -221,10 +219,14 @@ _privateSnippetExecutor:
 mov x1, x15
 mov x2, sp
 bl  _cpp_vtable_call
-.globl _jantest
-ldp x8, lr, [sp, #0]
+
+// restore x8 (RC pointer) and lr (skip RC from cpp_vtable_call)
+ldp x8, lr, [sp, #0]
+
+// restore stack
 add sp, sp, #144
-ldp x29, x30, [sp], #0x10
+
+// continue with throw/catch
 ret lr
 .cfi_endproc
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/source

[jan Iversen]

 bridges/source/cpp_uno/gcc3_ios/ios64_helper.s |   40 +++--
 1 file changed, 19 insertions(+), 21 deletions(-)

New commits:
commit b9cf7da2907f759c98b801939e7c04cf0b80388f
Author: jan Iversen <j...@libreoffice.org>
Date:   Sat Mar 17 21:32:10 2018 +0100

iOS, balanced return stack

stack balenced for entering and exiting _privateSnippetExecutor

Change-Id: I381c487d3412a39b113e9725807fd018b2b4036a

diff --git a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s 
b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
index 4c09f2b1b2f9..e08910db8e55 100644
--- a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
+++ b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
@@ -199,35 +199,33 @@ _privateSnippetExecutor:
 .cfi_offset w29, -16
 
 // _privateSnippetExecutor is jumped to from codeSnippet_*
-stpx29, x30, [sp, #-0x10]!
-movx29, sp
+stp x29, x30, [sp, #-0x10]!
+mov x29, sp
 
 // push all GP, FP/SIMD registers to the stack
-stp x6, x7, [sp, #-16]!
-stp x4, x5, [sp, #-16]!
-stp x2, x3, [sp, #-16]!
-stp x0, x1, [sp, #-16]!
-stp d6, d7, [sp, #-16]!
-stp d4, d5, [sp, #-16]!
-stp d2, d3, [sp, #-16]!
-stp d0, d1, [sp, #-16]!
+stp x6, x7, [sp, #-16]!
+stp x4, x5, [sp, #-16]!
+stp x2, x3, [sp, #-16]!
+stp x0, x1, [sp, #-16]!
+stp d6, d7, [sp, #-16]!
+stp d4, d5, [sp, #-16]!
+stp d2, d3, [sp, #-16]!
+stp d0, d1, [sp, #-16]!
 
 // push x8 (RC pointer) and lr to stack
 stp x8, lr, [sp, #-16]!
 
 // First argument (x15 set up in the codeSnippet instance)
 // Second argument: The pointer to all the above
-mov x0, x14
-mov x1, x15
-mov x2, sp
-
-bl  _cpp_vtable_call
-//ldp x8, lr, [sp, #0]
-//add sp, sp, #144
-//ret lr
-add sp, sp, #144
-ldpx29, x30, [sp], #0x10
-ret
+mov x0, x14
+mov x1, x15
+mov x2, sp
+bl  _cpp_vtable_call
+.globl _jantest
+ldp x8, lr, [sp, #0]
+add sp, sp, #144
+ldp x29, x30, [sp], #0x10
+ret lr
 .cfi_endproc
 
 // vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/source

[jan Iversen]

 bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h |   16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 8c3d13471815054ef564227425c065b840c39829
Author: jan Iversen <j...@libreoffice.org>
Date:   Sat Mar 17 08:03:16 2018 +0100

iOS update unwind abi to v. 26

Change-Id: Id149b6a17dec8e6030d78e235c7451b2244152d1

diff --git a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h 
b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
index 034baff5738e..6d6c9dbeb987 100644
--- a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
+++ b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
@@ -33,10 +33,6 @@
 #ifndef _UNWIND_CXX_H
 #define _UNWIND_CXX_H 1
 
-#ifndef __LP64__
-#define __LP64__ 0
-#endif
-
 // Level 2: C++ ABI
 
 #include 
@@ -91,7 +87,7 @@ struct __cxa_exception
   // Stack of exceptions in cleanups.
   __cxa_exception* nextPropagatingException;
 
-  // The number of active cleanup handlers for this exception.
+  // The nuber of active cleanup handlers for this exception.
   int propagationCount;
 #else
   // Cache parsed handler data from the personality routine Phase 1
@@ -139,7 +135,7 @@ struct __cxa_dependent_exception
   // Stack of exceptions in cleanups.
   __cxa_exception* nextPropagatingException;
 
-  // The number of active cleanup handlers for this exception.
+  // The nuber of active cleanup handlers for this exception.
   int propagationCount;
 #else
   // Cache parsed handler data from the personality routine Phase 1
@@ -177,7 +173,7 @@ struct __cxa_eh_globals
 extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
 extern "C" __cxa_eh_globals *__cxa_get_globals_fast () throw();
 
-// Allocate memory for the exception plus the thrown object.
+// Allocate memory for the exception plus the thown object.
 extern "C" void *__cxa_allocate_exception(size_t thrown_size) throw();
 
 // Free the space allocated for the exception.
@@ -188,6 +184,12 @@ extern "C" void *__cxa_allocate_dependent_exception() 
throw();
 extern "C" void __cxa_free_dependent_exception(void *thrown_exception) throw();
 #pragma GCC visibility pop
 
+// Throw the exception.
+extern "C" void __cxa_throw (void *thrown_exception,
+ std::type_info *tinfo,
+ void (*dest) (void *))
+ __attribute__((noreturn));
+
 // Used to implement exception handlers.
 extern "C" void *__cxa_get_exception_ptr (void *) throw();
 extern "C" void *__cxa_begin_catch (void *) throw();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/LibreOfficeLight

[jan Iversen]

 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 0df72d80e8a253937a36f42e98847480eff420c2
Author: jan Iversen <j...@libreoffice.org>
Date:   Sat Mar 17 07:48:18 2018 +0100

iOS, remove copy of source code to instdir

The build phase contained copy statements for
bridges/source/cpp_uno/ which should not happen

Change-Id: Ied4c1b2ef29effe4642f5ca0e7dc3a5b41ef0b68

diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 65cbb068613c..48a6475acad0 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -25,9 +25,6 @@
3941EF22204B4C8A00082486 /* config in Resources */ = {isa = 
PBXBuildFile; fileRef = 3941EF13204B4C8900082486 /* config */; };
3941EF23204B4C8A00082486 /* share in Resources */ = {isa = 
PBXBuildFile; fileRef = 3941EF14204B4C8900082486 /* share */; };
39514E002057DC55005599D0 /* shared in Resources */ = {isa = 
PBXBuildFile; fileRef = 39514DFF2057DC55005599D0 /* shared */; };
-   39514E022057DC92005599D0 /* gcc3_ios in Resources */ = {isa = 
PBXBuildFile; fileRef = 39514E012057DC92005599D0 /* gcc3_ios */; };
-   39514E042057DCE7005599D0 /* gcc3_macosx_x86-64 in Resources */ 
= {isa = PBXBuildFile; fileRef = 39514E032057DCE7005599D0 /* gcc3_macosx_x86-64 
*/; };
-   39514E062057DD17005599D0 /* gcc3_linux_aarch64 in Resources */ 
= {isa = PBXBuildFile; fileRef = 39514E052057DD17005599D0 /* gcc3_linux_aarch64 
*/; };
39514E082057E4A8005599D0 /* inc in Resources */ = {isa = 
PBXBuildFile; fileRef = 39514E072057E4A8005599D0 /* inc */; };
396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */ = 
{isa = PBXBuildFile; fileRef = 396F92F61E7AE62400A28C82 /* Settings.bundle */; 
};
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = 
{isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; 
};
@@ -343,7 +340,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
-   39514E042057DCE7005599D0 /* gcc3_macosx_x86-64 
in Resources */,
3941EF15204B4C8A00082486 /* unorc in Resources 
*/,
3941EF19204B4C8A00082486 /* oovbaapi.rdb in 
Resources */,
3941EF1D204B4C8A00082486 /* filter in Resources 
*/,
@@ -351,7 +347,6 @@
397868D61E59A3EA007F9248 /* LaunchScreen.xib in 
Resources */,
39514E002057DC55005599D0 /* shared in Resources 
*/,
3941EF1A204B4C8A00082486 /* registry in 
Resources */,
-   39514E062057DD17005599D0 /* gcc3_linux_aarch64 
in Resources */,
3941EF18204B4C8A00082486 /* services.rdb in 
Resources */,
3941EF1C204B4C8A00082486 /* offapi.rdb in 
Resources */,
3941EF22204B4C8A00082486 /* config in Resources 
*/,
@@ -362,7 +357,6 @@
3941EF21204B4C8A00082486 /* welcome.odt in 
Resources */,
397E09031E597BD8001374E0 /* Main.storyboard in 
Resources */,
3941EF20204B4C8A00082486 /* icudt60l.dat in 
Resources */,
-   39514E022057DC92005599D0 /* gcc3_ios in 
Resources */,
3941EF16204B4C8A00082486 /* fundamentalrc in 
Resources */,
39514E082057E4A8005599D0 /* inc in Resources */,
3941EF1F204B4C8A00082486 /* udkapi.rdb in 
Resources */,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/source

[jan Iversen]

 bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx|6 ++
 bridges/source/cpp_uno/gcc3_ios/ios64_helper.s |9 +++--
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 8a8663a49b6d2ba297587c730860cc8ca9d139da
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Mar 16 20:29:02 2018 +0100

iOS, solved call stack problem.

Stack was not corrupted, but the call stack was not intact when
passing the assembler code.

Change-Id: If07909dce2b4a73634a130e5f50e84312115b845

diff --git a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
index 748d276ac21b..9ad3954e4504 100644
--- a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
@@ -418,8 +418,8 @@ namespace
  * (called by asm snippets)
  */
 
-extern "C" sal_Int64 cpp_vtable_call( sal_Int32 func, sal_Int32 offset,
-  void **pCallStack )
+extern "C" void cpp_vtable_call( sal_Int32 func, sal_Int32 offset,
+ void **pCallStack )
 {
 sal_Int64 nRegReturn;
 typelib_TypeClass aType = cpp_mediate( func, offset, pCallStack, 
 );
@@ -444,8 +444,6 @@ extern "C" sal_Int64 cpp_vtable_call( sal_Int32 func, 
sal_Int32 offset,
 default:
 break;
 }
-
-return nRegReturn;
 }
 
 namespace
diff --git a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s 
b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
index 67620c38e426..4c09f2b1b2f9 100644
--- a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
+++ b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
@@ -199,6 +199,8 @@ _privateSnippetExecutor:
 .cfi_offset w29, -16
 
 // _privateSnippetExecutor is jumped to from codeSnippet_*
+stpx29, x30, [sp, #-0x10]!
+movx29, sp
 
 // push all GP, FP/SIMD registers to the stack
 stp x6, x7, [sp, #-16]!
@@ -220,9 +222,12 @@ _privateSnippetExecutor:
 mov x2, sp
 
 bl  _cpp_vtable_call
-ldp x8, lr, [sp, #0]
+//ldp x8, lr, [sp, #0]
+//add sp, sp, #144
+//ret lr
 add sp, sp, #144
-ret lr
+ldpx29, x30, [sp], #0x10
+ret
 .cfi_endproc
 
 // vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/source

[jan Iversen]

 bridges/source/cpp_uno/gcc3_ios/except.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 09d842887d7fe6bc7854290f8d87c50fa48e6d4e
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Mar 16 09:21:12 2018 +0100

iOS, added description of __cxa_throw

Change-Id: I6a537957528a0d2de989b347bde1167e21544236

diff --git a/bridges/source/cpp_uno/gcc3_ios/except.cxx 
b/bridges/source/cpp_uno/gcc3_ios/except.cxx
index 1d1eeccd97ae..747ebe3d7144 100644
--- a/bridges/source/cpp_uno/gcc3_ios/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/except.cxx
@@ -338,6 +338,9 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * 
pUno2Cpp )
 }
 }
 
+// void __cxa_throw(void* thrown_exception,
+//  struct std::type_info * tinfo,
+//  void (*dest)(void*));
 __cxxabiv1::__cxa_throw( pCppExc, rtti, deleteException );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/source

[jan Iversen]

 bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx|   12 +---
 bridges/source/cpp_uno/gcc3_ios/ios64_helper.s |6 --
 2 files changed, 5 insertions(+), 13 deletions(-)

New commits:
commit aab3bffeb8d3a4ca6dcf75852e197eb754b1417c
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Mar 15 19:56:49 2018 +0100

iOS, move assembler constants to C++

Change-Id: Iad94a2e2e55bb158d2ac42e3a67a6d94f84ffedd

diff --git a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
index 7a927f6bc58c..748d276ac21b 100644
--- a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
@@ -16,25 +16,23 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
 #include 
 #include 
 #include 
 #include 
-
 #include "bridge.hxx"
 #include "cppinterfaceproxy.hxx"
 #include "types.hxx"
 #include "vtablefactory.hxx"
-
 #include "share.hxx"
 
 
 
-extern "C" {
-extern int nFunIndexes, nVtableOffsets;
-extern int codeSnippets[];
-}
+extern "C" int codeSnippets[];
+const int nFunIndexes = 8;
+const int nVtableOffsets = 4;
+
+
 
 using namespace ::com::sun::star::uno;
 
diff --git a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s 
b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
index c5c02ea8149b..67620c38e426 100644
--- a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
+++ b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
@@ -152,12 +152,6 @@ codeSnippet_7_3:
 mov x15, 3
 b _privateSnippetExecutor
 
-.globl _nFunIndexes
-_nFunIndexes:
-.long 8
-.globl _nVtableOffsets
-_nVtableOffsets:
-.long 4
 .globl _codeSnippets
 _codeSnippets:
 .long codeSnippet_0_0 - _codeSnippets
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/source

[jan Iversen]

 bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx|4 
 bridges/source/cpp_uno/gcc3_ios/ios64_helper.s |  290 +++--
 2 files changed, 134 insertions(+), 160 deletions(-)

New commits:
commit d47749c76949515992b4144e59d7c51f7e976dda
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Mar 15 19:39:44 2018 +0100

iOS, simplified bridge assembler code.

Use x14 and x15 as function and offset instead of
having x15 as a pointer to 2 words.

Change-Id: I1cb3af4e86e3abe1b56fba2509eda31af0435885

diff --git a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
index 1e2e94d090b2..7a927f6bc58c 100644
--- a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
@@ -420,11 +420,11 @@ namespace
  * (called by asm snippets)
  */
 
-extern "C" sal_Int64 cpp_vtable_call( sal_Int32 *pFunctionAndOffset,
+extern "C" sal_Int64 cpp_vtable_call( sal_Int32 func, sal_Int32 offset,
   void **pCallStack )
 {
 sal_Int64 nRegReturn;
-typelib_TypeClass aType = cpp_mediate( pFunctionAndOffset[0], 
pFunctionAndOffset[1], pCallStack,  );
+typelib_TypeClass aType = cpp_mediate( func, offset, pCallStack, 
 );
 
 switch( aType )
 {
diff --git a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s 
b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
index 6737f73dde6f..c5c02ea8149b 100644
--- a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
+++ b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
@@ -19,166 +19,139 @@
 .section__TEXT,__text,regular,pure_instructions
 
 .p2align2
-codeSnippet__0:
-adr x15, .+8
+codeSnippet_0_0:
+mov x14, 0
+mov x15, 0
 b _privateSnippetExecutor
-.long 
-.long 0
-codeSnippet__1:
-adr x15, .+8
+codeSnippet_0_1:
+mov x14, 0
+mov x15, 1
 b _privateSnippetExecutor
-.long 
-.long 1
-codeSnippet__2:
-adr x15, .+8
+codeSnippet_0_2:
+mov x14, 0
+mov x15, 2
 b _privateSnippetExecutor
-.long 
-.long 2
-codeSnippet__3:
-adr x15, .+8
+codeSnippet_0_3:
+mov x14, 0
+mov x15, 3
 b _privateSnippetExecutor
-.long 
-.long 3
-codeSnippet_0001_0:
-adr x15, .+8
+codeSnippet_1_0:
+mov x14, 1
+mov x15, 0
 b _privateSnippetExecutor
 .long 0x01
 .long 0
-codeSnippet_0001_1:
-adr x15, .+8
+codeSnippet_1_1:
+mov x14, 1
+mov x15, 1
 b _privateSnippetExecutor
-.long 0x01
-.long 1
-codeSnippet_0001_2:
-adr x15, .+8
+codeSnippet_1_2:
+mov x14, 1
+mov x15, 2
 b _privateSnippetExecutor
-.long 0x01
-.long 2
-codeSnippet_0001_3:
-adr x15, .+8
+codeSnippet_1_3:
+mov x14, 1
+mov x15, 3
 b _privateSnippetExecutor
-.long 0x01
-.long 3
-codeSnippet_0002_0:
-adr x15, .+8
+codeSnippet_2_0:
+mov x14, 2
+mov x15, 0
 b _privateSnippetExecutor
-.long 0x02
-.long 0
-codeSnippet_0002_1:
-adr x15, .+8
+codeSnippet_2_1:
+mov x14, 2
+mov x15, 1
 b _privateSnippetExecutor
-.long 0x02
-.long 1
-codeSnippet_0002_2:
-adr x15, .+8
+codeSnippet_2_2:
+mov x14, 2
+mov x15, 2
 b _privateSnippetExecutor
-.long 0x02
-.long 2
-codeSnippet_0002_3:
-adr x15, .+8
+codeSnippet_2_3:
+mov x14, 2
+mov x15, 3
 b _privateSnippetExecutor
 .long 0x02
 .long 3
-codeSnippet_0003_0:
-adr x15, .+8
+codeSnippet_3_0:
+mov x14, 3
+mov x15, 0
 b _privateSnippetExecutor
-.long 0x03
-.long 0
-codeSnippet_0003_1:
-adr x15, .+8
+codeSnippet_3_1:
+mov x14, 3
+mov x15, 1
 b _privateSnippetExecutor
-.long 0x03
-.long 1
-codeSnippet_0003_2:
-adr x15, .+8
+codeSnippet_3_2:
+mov x14, 3
+mov x15, 2
 b _privateSnippetExecutor
-.long 0x03
-.long 2
-codeSnippet_0003_3:
-adr x15, .+8
+codeSnippet_3_3:
+mov x14, 3
+mov x15, 3
 b _privateSnippetExecutor
-.long 0x03
-.long 3
-codeSnippet_0004_0:
-adr x15, .+8
+codeSnippet_4_0:
+mov x14, 4
+mov x15, 0
 b _privateSnippetExecutor
-.long 0x04
-.long 0
-codeSnippet_0004_1:
-adr x15, .+8
+codeSnippet_4_1:
+mov x14, 4
+mov x15, 1
 b _privateSnippetExecutor
-.long 0x04
-.long 1
-codeSnippet_0004_2:
-adr x15, .+8
+codeSnippet_4_2:
+mov x14, 4
+mov x15, 2
 b _privateSnippetExecutor
-.long 0x04
-.long 2
-codeSnippet_0004_3:
-adr x15, .+8
+codeSnippet_4_3:
+mov x14, 4
+mov x15, 3
 b _privateSnippetExecutor
-.long 0x04
-.long 3
-codeSnippet_0005_0:
-adr x15, .+8
+codeSnippet_5_0:
+mov x14, 5
+mov x15, 0
 b _privateSnippetExecutor
-.long 0x05
-.long 0
-codeSnippe

[Libreoffice-commits] core.git: bridges/source ios/LibreOfficeLight

[jan Iversen]

 bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx |   34 
 bridges/source/cpp_uno/gcc3_ios/ios64_helper.s  |   40 
+
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |   42 
--
 3 files changed, 58 insertions(+), 58 deletions(-)

New commits:
commit 1caf3b9380f3873b7ca165a743f65d332e46ea66
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Mar 15 13:26:41 2018 +0100

iOS, solved corrupted stack in cpp -> uno

Solved problem in assembler code, so the call chain is correct.

There are still something missing for uno to work correctly

Change-Id: Ieb3b3d6b15153576159e07b52ced0efedd135713

diff --git a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
index 98d859c69cde..1e2e94d090b2 100644
--- a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
@@ -30,40 +30,6 @@
 #include "share.hxx"
 
 
-// Snippet code done inline
-extern "C" void privateSnippetExecutor()
-{
-// _privateSnippetExecutor is jumped to from each codeSnippet_*
-asm volatile (
- // Store potential args in general purpose registers
- "   stp x6, x7, [sp, #-16]!\n"
- "   stp x4, x5, [sp, #-16]!\n"
- "   stp x2, x3, [sp, #-16]!\n"
- "   stp x0, x1, [sp, #-16]!\n"
-
- // Store potential args in floating point/SIMD registers
- "   stp d6, d7, [sp, #-16]!\n"
- "   stp d4, d5, [sp, #-16]!\n"
- "   stp d2, d3, [sp, #-16]!\n"
- "   stp d0, d1, [sp, #-16]!\n"
-
- // First argument to cpp_vtable_call: The x15 set up in the 
codeSnippet instance
- "   mov x0, x15\n"
-
- // Store x8 (potential pointer to return value storage) and lr
- "   stp x8, lr, [sp, #-16]!\n"
-
- // Second argument: The pointer to all the above
- "   mov x1, sp\n"
-
- "   b   _cpp_vtable_call\n"
-
- "   ldp x8, lr, [sp, #0]\n"
- "   add sp, sp, #144\n"
-// "   ret lr\n"
-);
-}
-
 
 extern "C" {
 extern int nFunIndexes, nVtableOffsets;
diff --git a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s 
b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
index 14a62a012e11..6737f73dde6f 100644
--- a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
+++ b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
@@ -16,9 +16,9 @@
 //   except in compliance with the License. You may obtain a copy of
 //   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 //
-.text
-.align 4
+.section__TEXT,__text,regular,pure_instructions
 
+.p2align2
 codeSnippet__0:
 adr x15, .+8
 b _privateSnippetExecutor
@@ -221,4 +221,40 @@ _codeSnippets:
 .long codeSnippet_0007_3 - _codeSnippets
 
 
+
+.private_extern _privateSnippetExecutor
+.globl  _privateSnippetExecutor
+.p2align2
+_privateSnippetExecutor:
+.cfi_startproc
+.cfi_def_cfa w29, 16
+.cfi_offset w30, -8
+.cfi_offset w29, -16
+
+// _privateSnippetExecutor is jumped to from codeSnippet_*
+
+// push all GP, FP/SIMD registers to the stack
+stp x6, x7, [sp, #-16]!
+stp x4, x5, [sp, #-16]!
+stp x2, x3, [sp, #-16]!
+stp x0, x1, [sp, #-16]!
+stp d6, d7, [sp, #-16]!
+stp d4, d5, [sp, #-16]!
+stp d2, d3, [sp, #-16]!
+stp d0, d1, [sp, #-16]!
+
+// push x8 (RC pointer) and lr to stack
+stp x8, lr, [sp, #-16]!
+
+// First argument (x15 set up in the codeSnippet instance)
+// Second argument: The pointer to all the above
+mov x0, x15
+mov x1, sp
+
+bl  _cpp_vtable_call
+ldp x8, lr, [sp, #0]
+add sp, sp, #144
+ret lr
+.cfi_endproc
+
 // vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index c702cef65d22..65cbb068613c 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -24,6 +24,11 @@
3941EF21204B4C8A00082486 /* welcome.odt in Resources */ = {isa 
= PBXBuildFile; fileRef = 3941EF12204B4C8900082486 /* welcome.odt */; };
3941EF22204B4C8A00082486 /* config in Resources */ = {isa = 
PBXBuildFile; fileRef = 3941EF13204B4C8900082486 /* config */; };
3941EF23204B4C8A00082486 /* share in Resources */ = {isa = 
PBXBuildFile; fileRef = 3941EF14204B4C8900082486 /* share */; };
+   39514E002057D

[Libreoffice-commits] core.git: 3 commits - bridges/source ios/LibreOfficeLight

[jan Iversen]

 bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx |   44 ++--
 bridges/source/cpp_uno/gcc3_ios/ios64_helper.s  |   36 --
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |   52 
++
 3 files changed, 88 insertions(+), 44 deletions(-)

New commits:
commit 814bd40070db654d80a16d9f813610cae3b12dd6
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Mar 11 19:05:09 2018 +0100

iOS, calling cpp_vtable_call does not corrupt stack

Changing bl -> b (jump long to jump) allowed cpp_vtable_call
to work without corrumping the stack.

However return still corrumpts the stack.

Change-Id: I3437a73139b65af13dcf6fa0c959bb1c847564b9

diff --git a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
index 1250beedbcda..98d859c69cde 100644
--- a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
@@ -56,11 +56,11 @@ extern "C" void privateSnippetExecutor()
  // Second argument: The pointer to all the above
  "   mov x1, sp\n"
 
- "   bl  _cpp_vtable_call\n"
+ "   b   _cpp_vtable_call\n"
 
  "   ldp x8, lr, [sp, #0]\n"
  "   add sp, sp, #144\n"
- "   ret lr\n"
+// "   ret lr\n"
 );
 }
 
commit a414d362350df8eacd82104545a6aaf4ce102011
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Mar 11 18:22:38 2018 +0100

iOS, updated xcode project file

the only change is that addition of files needed to debug the
stack corruption problem.

Change-Id: I3598cdba2e84f51a3a90387dbe3439eafb34f878

diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index e02182b1d8e7..c702cef65d22 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -93,6 +93,24 @@
39E950521FC9842000D82C49 /* source */ = {isa = 
PBXFileReference; lastKnownFileType = folder; name = source; path = ../source; 
sourceTree = ""; };
39EE81531FA644E800B73AB8 /* Info.plist */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = 
Info.plist; sourceTree = ""; };
39EF4E2E1FA500C9001914AC /* PropertiesController.swift */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.swift; path = PropertiesController.swift; sourceTree = ""; };
+   39FD89C9204E87E900E7179F /* except.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = except.cxx; path = 
"../../bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx"; sourceTree = 
""; };
+   39FD89CB204E87FD00E7179F /* except.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = except.cxx; path = ../../bridges/source/cpp_uno/gcc3_ios/except.cxx; 
sourceTree = ""; };
+   39FD89CF204E8EB900E7179F /* cpp2uno.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = cpp2uno.cxx; path = ../../bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx; 
sourceTree = ""; };
+   39FD89D1204E8ED000E7179F /* share.hxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name 
= share.hxx; path = ../../bridges/source/cpp_uno/gcc3_ios/share.hxx; sourceTree 
= ""; };
+   39FD89D2204E8ED000E7179F /* unwind-cxx.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = 
"unwind-cxx.h"; path = "../../bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h"; 
sourceTree = ""; };
+   39FD89D3204E8ED000E7179F /* rtti.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = 
rtti.h; path = ../../bridges/source/cpp_uno/gcc3_ios/rtti.h; sourceTree = 
""; };
+   39FD89D4204E8ED000E7179F /* ios64_helper.s */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = 
ios64_helper.s; path = ../../bridges/source/cpp_uno/gcc3_ios/ios64_helper.s; 
sourceTree = ""; };
+   39FD89D5204E8ED000E7179F /* uno2cpp.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = uno2cpp.cxx; path = ../../bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx; 
sourceTree = ""; };
+   39FD89D8204E8EEE00E7179F /* call.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = call.cxx; path = 
"../../bridges/source

[Libreoffice-commits] core.git: 2 commits - bridges/inc bridges/source

[jan Iversen]

 bridges/inc/vtablefactory.hxx   |2 +-
 bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx |5 -
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 5facd232c181e3bd47f1140245bd32a5efb2b21b
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Mar 11 17:19:05 2018 +0100

iOS, removed unneeded #ifdef arm64

Change-Id: Ie568c461ae834b33b9220c4b9fb42ec66b5e7ce0

diff --git a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
index 0ca1401ba960..17ed29f60789 100644
--- a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifdef __arm64
-
 // For iOS devices (64-bit ARM). Originally a copy of
 // ../gcc3_linux_arm/cpp2uno.cxx.
 
@@ -555,7 +553,6 @@ unsigned char * 
bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
 return code;
 }
 
-#endif
 
 
 void bridges::cpp_uno::shared::VtableFactory::flushCode(
commit 6ec77e28f131a03cd6209ef3de5bd8afb2442086
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Mar 11 13:05:57 2018 +0100

iOS, revert bed135e02bf7db2ef8c29747bbf79f26da71e9ca

using USE_DOUBLE_MMAP worked well on the device, but caused
problems with the simulator, that depends on the GCC3_MAC* implementation.

Change-Id: Ifbc1d48b3642567029c5271054a545eaacaf18ed

diff --git a/bridges/inc/vtablefactory.hxx b/bridges/inc/vtablefactory.hxx
index 04e3addc3149..70c87c385952 100644
--- a/bridges/inc/vtablefactory.hxx
+++ b/bridges/inc/vtablefactory.hxx
@@ -31,7 +31,7 @@
 /*See: http://people.redhat.com/drepper/selinux-mem.html*/
 #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
 || defined(NETBSD) || defined(DRAGONFLY) || defined (ANDROID) \
-|| defined(HAIKU)  || defined(IOS)
+|| defined(HAIKU)
 #define USE_DOUBLE_MMAP
 #endif
 
diff --git a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
index 8008d3a2193e..0ca1401ba960 100644
--- a/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx
@@ -512,13 +512,11 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock(
 unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
 Slot ** slots,
 unsigned char * code,
-sal_PtrDiff writetoexecdiff,
 typelib_InterfaceTypeDescription const * type,
 sal_Int32 functionOffset,
 sal_Int32 functionCount,
 sal_Int32 vtableOffset)
 {
-(void)writetoexecdiff;
 (*slots) -= functionCount;
 Slot * s = *slots;
 for (sal_Int32 i = 0; i < type->nMembers; ++i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in

[jan Iversen]

 Makefile.in |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e6d2332eae92b8f288d3d3f8aa2090abfa777098
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Mar 11 12:27:43 2018 +0100

Allow use of "git worktree" in Makefile.in

When using git worktree $(SRCDIR)/.git is a file and not a directory, 
therefore
get-submodules: fails in "./g -z".

Eliminating call to "./g -z" in worktree directories, but keeping it in the
cloned directory.

Change-Id: I88d8e3e06cac2a2710da21ae233364d8119fe5ef

diff --git a/Makefile.in b/Makefile.in
index 470c6956cc0e..0b2340a0ef58 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -241,7 +241,9 @@ get-submodules:
 ifneq ($(foreach i,$(GIT_NEEDED_SUBMODULES),$(i)/.git),$(wildcard $(foreach 
i,$(GIT_NEEDED_SUBMODULES),$(i)/.git)))
cd $(SRCDIR) && ./g -f clone
 endif
+ifeq ($(shell test -d $(SRCDIR)/.git; echo $$?),0)
@cd $(SRCDIR) && ./g -z # make sure the git hooks are in place even if 
no submodules are needed
+endif
 
 else # these sources are from a tarball, so get the other source tarballs
 gb_LO_VER := $(shell . $(SRCDIR)/sources.ver && echo $$lo_sources_ver)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Mac build error.

[Jan Iversen]

> The 'g' script in turn is called in 'Makefile'/'Makefile.in’.

Thanks, I got my problem identified.

I work on 2 branches in parallel (iOS and master), so I use “git worktree” in 
order not to have 2 clones (a lot less diskspace).

I know I could switch branches with the help of “git stash”, but it  does not 
allow me to work on one branch while the other branch does its rather lengthy 
compile.

However the worktree version, does not have a .git directory but a .git file 
pointing the clone.

rgds
Jan I.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - bridges/Library_cpp_uno.mk bridges/source

[jan Iversen]

 bridges/Library_cpp_uno.mk   |   18 -
 bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx  |2 
 bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl |   55 -
 bridges/source/cpp_uno/gcc3_ios/ios64_helper.s   |  205 ++-
 4 files changed, 206 insertions(+), 74 deletions(-)

New commits:
commit 02f6aa7355d77842caa0416217e0a572144467c3
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Mar 11 09:19:39 2018 +0100

iOS, removed perl script in bridges

The perl script just generated static asm code, this
code is now included directly in ios64_helper.s

Change-Id: I3ebc6f85865287e1a1d11f82be72fc2407bcb40f

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 4c6d7ec95046..902b735b3d65 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -26,24 +26,6 @@ bridges_SELECTED_BRIDGE := gcc3_ios
 bridge_noopt_objects := cpp2uno except uno2cpp
 bridge_asm_objects := ios64_helper
 
-#HACK
-$(eval $(call gb_Library_set_include,$(gb_CPPU_ENV)_uno,\
-$$(INCLUDE) \
--I $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios) \
-))
-
-$(SRCDIR)/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s: \
-   $(call 
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios)/codesnippets.S
-
-$(call 
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios)/codesnippets.S: \
-   $(SRCDIR)/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl \
-| $(call 
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios)/.dir
-   $(PERL) $< > $@
-
-$(call gb_Library_get_clean_target,$(gb_CPPU_ENV)_uno) :
-   rm -f 
$(WORKDIR)/CustomTarget/bridges/source/cpp_uno/gcc3_ios/codesnippets.S
-
-
 else ifeq ($(CPUNAME),AARCH64)
 
 ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
diff --git a/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl 
b/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl
deleted file mode 100755
index 3a3b0a3fbb1a..
--- a/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/perl -w # -*- tab-width: 4; indent-tabs-mode: nil; 
cperl-indent-level: 4 -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-my $nFunIndexes = 8;
-my $nVtableOffsets = 4;
-
-sub gen_arm ($$)
-{
-my ($funIndex, $vtableOffset) = @_;
-printf ("codeSnippet_%08x_%d:\n", $funIndex, $vtableOffset);
-printf ("adr x15, .+8\n");
-printf ("b _privateSnippetExecutor\n");
-printf (".long %#08x\n", $funIndex);
-printf (".long %d\n", $vtableOffset);
-}
-
-printf (".text\n");
-printf ("\n");
-printf (".align 4\n");
-printf ("\n");
-
-foreach my $funIndex (0 .. $nFunIndexes-1)
-{
-   foreach my $vtableOffset (0 .. $nVtableOffsets-1)
-   {
-   gen_arm ($funIndex, $vtableOffset);
-   }
-}
-
-printf (".globl _nFunIndexes\n");
-printf ("_nFunIndexes:\n");
-printf (".long %d\n", $nFunIndexes);
-
-printf (".globl _nVtableOffsets\n");
-printf ("_nVtableOffsets:\n");
-printf (".long %d\n", $nVtableOffsets);
-
-printf (".globl _codeSnippets\n");
-printf ("_codeSnippets:\n");
-
-foreach my $funIndex (0 .. $nFunIndexes-1)
-{
-foreach my $vtableOffset (0 .. $nVtableOffsets-1)
-{
-printf (".long codeSnippet_%08x_%d - _codeSnippets\n", $funIndex, 
$vtableOffset);
-}
-}
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s 
b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
index 51e4d160dafe..6e6e8c74b347 100644
--- a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
+++ b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
@@ -16,8 +16,211 @@
 //   except in compliance with the License. You may obtain a copy of
 //   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 //
+.text
+.align 4
+
+codeSnippet__0:
+adr x15, .+8
+b _privateSnippetExecutor
+.long 
+.long 0
+codeSnippet__1:
+adr x15, .+8
+b _privateSnippetExecutor
+.long 
+.long 1
+codeSnippet__2:
+adr x15, .+8
+b _privateSnippetExecutor
+.long 
+.long 2
+codeSnippet__3:
+adr x15, .+8
+b _privateSnippetExecutor
+.long 
+.long 3
+codeSnippet_0001_0:
+adr x15, .+8
+b _privateSnippetExecutor
+.long 0x01
+.long 0
+codeSnippet_0001_1:
+adr x15, .+8
+b _privateSnippetExecutor
+.long 0x01
+.long 1
+codeSnippet_0001_2:
+adr x15, .+8
+b _privateSnippe

[Libreoffice-commits] core.git: 2 commits - bridges/inc bridges/source

[jan Iversen]

 bridges/inc/vtablefactory.hxx|2 
 bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl |   59 --
 bridges/source/cpp_uno/gcc3_ios/ios64_helper.s   |  414 ---
 3 files changed, 1 insertion(+), 474 deletions(-)

New commits:
commit bed135e02bf7db2ef8c29747bbf79f26da71e9ca
Author: jan Iversen <j...@libreoffice.org>
Date:   Sat Mar 10 19:44:25 2018 +0100

iOS, activate USE_DOUBLE_MMAP

If not activated code assumes dymanic behaivour.

Change-Id: I6b2807f4a2402a7adfa0839454586b425ee1ae29

diff --git a/bridges/inc/vtablefactory.hxx b/bridges/inc/vtablefactory.hxx
index 70c87c385952..04e3addc3149 100644
--- a/bridges/inc/vtablefactory.hxx
+++ b/bridges/inc/vtablefactory.hxx
@@ -31,7 +31,7 @@
 /*See: http://people.redhat.com/drepper/selinux-mem.html*/
 #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
 || defined(NETBSD) || defined(DRAGONFLY) || defined (ANDROID) \
-|| defined(HAIKU)
+|| defined(HAIKU)  || defined(IOS)
 #define USE_DOUBLE_MMAP
 #endif
 
commit be65314d131ea75610d9ed21323ce6025a615c99
Author: jan Iversen <j...@libreoffice.org>
Date:   Sat Mar 10 19:24:03 2018 +0100

bridges,iOS removed suport for x86 and arm.

Only arm64 is supported, code is more readable

Change-Id: I6940b0d03dc26c9c8f10c1cb105a7564471f2ca5

diff --git a/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl 
b/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl
index a8548836fef3..3a3b0a3fbb1a 100755
--- a/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl
+++ b/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl
@@ -13,45 +13,15 @@ my $nVtableOffsets = 4;
 sub gen_arm ($$)
 {
 my ($funIndex, $vtableOffset) = @_;
-if ($funIndex & 0x8000) {
-printf ("#ifndef __arm64\n");
-}
 printf ("codeSnippet_%08x_%d:\n", $funIndex, $vtableOffset);
-printf ("#ifdef __arm\n");
-# Note: pc is the address of instruction being executed plus 8
-printf ("mov ip, pc\n");
-printf ("#else\n");
 printf ("adr x15, .+8\n");
-printf ("#endif\n");
 printf ("b _privateSnippetExecutor\n");
 printf (".long %#08x\n", $funIndex);
 printf (".long %d\n", $vtableOffset);
-if ($funIndex & 0x8000) {
-printf ("#endif\n");
-}
-}
-
-sub gen_x86 ($$$)
-{
-my ($funIndex, $vtableOffset, $executor) = @_;
-printf ("codeSnippet_%08x_%d_%s:\n", $funIndex, $vtableOffset, $executor);
-printf ("movl \$%#08x, %%eax\n", $funIndex);
-printf ("movl \$%d, %%edx\n", $vtableOffset);
-printf ("jmp _privateSnippetExecutor%s\n", $executor);
 }
 
 printf (".text\n");
-
-printf ("#if defined(__arm) || defined(__arm64)\n");
-
 printf ("\n");
-printf ("// Each codeSnippetX function stores into ip (arm64: x15) an address 
and branches to _privateSnippetExecutor\n");
-printf ("// The address is that following the branch instruction, containing 
two 32-bit ints:\n");
-printf ("// - the function index, which for 32-bit can have the 0x8000 bit 
set\n");
-printf ("//   to indicate that a hidden parameter is used for returning large 
values\n");
-printf ("// - the vtable offset\n");
-printf ("\n");
-
 printf (".align 4\n");
 printf ("\n");
 
@@ -60,27 +30,9 @@ foreach my $funIndex (0 .. $nFunIndexes-1)
foreach my $vtableOffset (0 .. $nVtableOffsets-1)
{
gen_arm ($funIndex, $vtableOffset);
-   gen_arm ($funIndex|0x8000, $vtableOffset);
}
 }
 
-printf ("#else\n");
-printf (".align 1, 0x90\n");
-
-foreach my $funIndex (0 .. $nFunIndexes-1)
-{
-foreach my $vtableOffset (0 .. $nVtableOffsets-1)
-{
-foreach my $executor ('General', 'Void', 'Hyper', 'Float', 'Double', 
'Class')
-{
-gen_x86 ($funIndex, $vtableOffset, $executor);
-gen_x86 ($funIndex|0x8000, $vtableOffset, $executor);
-}
-}
-  }
-
-printf ("#endif\n");
-
 printf (".globl _nFunIndexes\n");
 printf ("_nFunIndexes:\n");
 printf (".long %d\n", $nFunIndexes);
@@ -96,18 +48,7 @@ foreach my $funIndex (0 .. $nFunIndexes-1)
 {
 foreach my $vtableOffset (0 .. $nVtableOffsets-1)
 {
-printf ("#if defined(__arm) || defined(__arm64)\n");
 printf (".long codeSnippet_%08x_%d - _codeSnippets\n", $funIndex, 
$vtableOffset);
-printf ("#ifndef __arm64\n");
-printf (".long codeSnippet_%08x_%d - _codeSnippets\n", 
$funIndex|0x8000, $vtableOffset);
-printf ("#endif\n");
-printf ("#else\n");
-foreach my $executor ('General', 'Void', 'Hyper', 'F

Mac build error.

[Jan Iversen]

Hi

On my Mac build I am starting to get these errors:

rm: .git/hooks/README: Not a directory
ln: .git/hooks/README: Not a directory
rm: .git/hooks/commit-msg: Not a directory
ln: .git/hooks/commit-msg: Not a directory
rm: .git/hooks/post-merge: Not a directory
ln: .git/hooks/post-merge: Not a directory
rm: .git/hooks/pre-commit: Not a directory
ln: .git/hooks/pre-commit: Not a directory


I suppose it is because the script assume SRCDIR == BUILDDIR, which is not the 
case always.

I have tried to find in which *.mk this happens but without success, Funny 
thing it does not happen with my iOS builds, so something is strange.

Can someone can give me a pointer (might be it is a script), so I can correct 
it.

rgds
Jan I.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: svx/source

[jan Iversen]

 svx/source/unodraw/unopage.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit bfaae016b225e775264008935cddef1564b07e66
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Mar 9 18:56:38 2018 +0100

svx, compile error with !HAVE_FEATURE_DESKTOP

solved unused parameter referer in case of !HAVE_FEATURE_DESKTOP

Change-Id: I64e2707ad87822ba784ed40c45801c6d101e6386

diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 3f182ffefc82..d7f14d3676c5 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -580,6 +580,10 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( 
sal_uInt16 nType, SdrInvent
 (void) referer;
 #endif
 SvxShape* pRet = nullptr;
+#if !HAVE_FEATURE_DESKTOP
+(void)referer;
+#endif
+
 switch( nInventor )
 {
 case SdrInventor::E3d:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Cppuno in bridges, HELP needed.

[Jan Iversen]

> On 6 Mar 2018, at 14:17, Stephan Bergmann <sberg...@redhat.com> wrote:
> 
> On 06.03.2018 11:38, Jan Iversen wrote:
>> At some point a piece of code (in the same executable) decides to make a uno 
>> call, this looks like
>> Cpp2uno_call() ->
>>  raise_exception()
>>  __cxa_throw() ->
>>  ( C++ throw handling) ->
>>  getCaughtException() ->
>>  UnoInterfaceProxyDispatch() ->
>>  cpp_call() ->
>>  CallVirtualMethod() ->
>>  ( Call requested 
>> function )
> 
> Hard to tell what you're actually looking at without seeing a real backtrace 
> (e.g., I have no idea what "Cpp2uno_call()" is supposed to mean).

No problem, I just tried to limit the mail size :-) cpp2uno_call is a function 
implemented in bridges/source/cppuno/gcc*

Backtrace:

(lldb) bt
* thread #10, name = 'LOKitThread.queue', stop reason = breakpoint 14.1
  * frame #0: 0x00010cb6b416 
libKit.dylib`gcc3::callVirtualMethod(pThis=0x0001173b0f20, nVtableIndex=4, 
pRegisterReturn=0x, pReturnTypeRef=0x60898830, 
bSimpleReturn=true, pStack=0x72a04dd0, nStack=0, 
pGPR=0x72a050e0, pFPR=0x72a050a0) at callvirtualmethod.cxx:73
frame #1: 0x00010cb6a48f 
libKit.dylib`cpp_call(pThis=0x604000e76c40, aVtableSlot=(offset = 0, index 
= 4), pReturnTypeRef=0x60898830, nParams=0, pParams=0x, 
pUnoReturn=0x, pUnoArgs=0x, 
ppUnoExc=0x72a053f0) at uno2cpp.cxx:233
frame #2: 0x00010cb69bee 
libKit.dylib`unoInterfaceProxyDispatch(pUnoI=0x604000e76c40, 
pMemberDescr=0x60c00015bcd0, pReturn=0x, 
pArgs=0x, ppException=0x72a053f0) at uno2cpp.cxx:418
frame #3: 0x0001133528cd 
libKit.dylib`com::sun::star::uno::UnoInterfaceReference::dispatch(this=0x72a05418,
 pMemberType=0x60c00015bcd0, pReturn=0x, 
pArgs=0x, ppException=0x72a053f0) const at 
dispatcher.hxx:173
frame #4: 0x000113352558 libKit.dylib`cppu::getCaughtException() at 
exc_thrower.cxx:238
frame #5: 0x00011371d85f 
libKit.dylib`utl::UCBContentHelper::IsDocument(url=0x72a059e0) at 
ucbhelper.cxx:150
frame #6: 0x00010c83d005 
libKit.dylib`FSStorageFactory::createInstanceWithArguments(this=0x61a6b300,
 aArguments=0x72a05b40) at fsfactory.cxx:128
frame #7: 0x00010c83d883 libKit.dylib`non-virtual thunk to 
FSStorageFactory::createInstanceWithArguments(this=0x61a6b300, 
aArguments=0x72a05b40) at fsfactory.cxx:0
frame #8: 0x00010c917d91 
libKit.dylib`framework::PresetHandler::getOrCreateRootStorageShare(this=0x601f2500)
 at presethandler.cxx:226
frame #9: 0x00010c918d52 
libKit.dylib`framework::PresetHandler::connectToResource(this=0x601f2500,
 eConfigType=E_MODULES, sResource=0x72a06740, 
sModule=0x7fb0704781a0, xDocumentRoot=0x72a06738, 
rLanguageTag=0x72a067a0) at presethandler.cxx:349
frame #10: 0x00010cab7a6c libKit.dylib`(anonymous 
namespace)::ModuleUIConfigurationManager::ModuleUIConfigurationManager(this=0x7fb0704780a0,
 xContext=0x72a06890, aArguments=0x72a06de0) at 
moduleuiconfigurationmanager.cxx:888
frame #11: 0x00010cab6dd5 libKit.dylib`(anonymous 
namespace)::ModuleUIConfigurationManager::ModuleUIConfigurationManager(this=0x7fb0704780a0,
 xContext=0x72a06890, aArguments=0x72a06de0) at 
moduleuiconfigurationmanager.cxx:855
frame #12: 0x00010cab6cba 
libKit.dylib`::com_sun_star_comp_framework_ModuleUIConfigurationManager_get_implementation(context=0x60800012af00,
 arguments=0x72a06de0) at moduleuiconfigurationmanager.cxx:1676
frame #13: 0x0001133c55a0 libKit.dylib`com::sun::star::uno::XInterface* 
std::__1::__invoke_void_return_wrapper<com::sun::star::uno::XInterface*>::__call<com::sun::star::uno::XInterface*
 (*&)(com::sun::star::uno::XComponentContext*, 
com::sun::star::uno::Sequence const&), 
com::sun::star::uno::XComponentContext*, 
com::sun::star::uno::Sequence 
const&>(com::sun::star::uno::XInterface* 
(*&&&)(com::sun::star::uno::XComponentContext*, 
com::sun::star::uno::Sequence const&), 
com::sun::star::uno::XComponentContext*&&, 
com::sun::star::uno::Sequence const&&&) [inlined] 
decltype(__f=0x600f6998, __args=0x72a069c0, 
__args=0x72a06de0)(com::sun::star::uno::XComponentContext*, 
com::sun::star::uno::Sequence 
const&)>(fp)(std::__1::forward<com::sun::star::uno::XComponentContext*, 
com::sun::star::uno::Sequence cons

Cppuno in bridges, HELP needed.

[Jan Iversen]

Hi.

I am still trying to get my head around understanding bridges, and how I can 
make it work for arm64/iOS.

At some point a piece of code (in the same executable) decides to make a uno 
call, this looks like

Cpp2uno_call() ->
raise_exception()
__cxa_throw() ->
( C++ throw handling) ->
getCaughtException() ->
UnoInterfaceProxyDispatch() ->
cpp_call() ->
CallVirtualMethod() ->
( Call requested 
function )

Now it all looks synchronous to me, and I right in assuming this all happens 
without any dispatch.

If my assumption is correct, I should be able to shortcut the whole lot and 
make a simple:
Cpp2uno_call() ->
( Call requested function )

Because on iOS, no external process will ever call the UNO interface, it is 1 
single executable (I also removed the pipes etc).

Can someone please tell me, if/where I am thinking totally wrong. My objective 
is to get rid of all the ugly assembler code.

Thanks in advance.
rgds
Jan I.


Ps. I had never expected the need to “expert” on the lower layers of LO, but 
after having been fighting SAL_TIMER, then threads and now cppuno, I think I am 
slowly understanding how the very low level of LO works. This might be a good 
thing when/if we do another port (or just want to optimise).


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/ios

[jan Iversen]

 vcl/ios/dummies.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f5c00cd780dab434c96bd2760821e1565475fc0f
Author: jan Iversen <j...@libreoffice.org>
Date:   Mon Mar 5 09:32:35 2018 +0100

vcl, make ios/dummies compile

Point  were not defined

Change-Id: I725b3058d44d527ca2d3201060e4f467fd69c78d

diff --git a/vcl/ios/dummies.cxx b/vcl/ios/dummies.cxx
index 56fd92a93f3a..ff8991dfacfa 100644
--- a/vcl/ios/dummies.cxx
+++ b/vcl/ios/dummies.cxx
@@ -16,13 +16,14 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
+#include 
 #include "salprn.hxx"
 #include "headless/svpgdi.hxx"
 #include "headless/svpinst.hxx"
 #include "unx/fontmanager.hxx"
 #include "unx/gendata.hxx"
 
+
 SalPrinter* SvpSalInstance::CreatePrinter( SalInfoPrinter* /* pInfoPrinter */ )
 {
 return NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/LibreOfficeLight

[jan Iversen]

 ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4f4137d0e20e6693037846c870857c887979770b
Author: jan Iversen <j...@libreoffice.org>
Date:   Sat Mar 3 22:40:50 2018 +0100

iOS, change example.odt -> welcome.odt

It must be changed in the swift code also.

Change-Id: Ide7ccbb89d94f91a9f6e0dbbd7a29035c46f7f4f

diff --git a/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift 
b/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
index 88c3ccdcd67e..e9c554b31646 100755
--- a/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
+++ b/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
@@ -66,7 +66,7 @@ class DocumentController: UIViewController, MenuDelegate, 
UIDocumentBrowserViewC
 super.viewDidAppear(animated)
 
 // Always load the 'welcome' file, as per the android app
-let res = Bundle.main.url(forResource: "example", withExtension: "odt")
+let res = Bundle.main.url(forResource: "welcome", withExtension: "odt")
 
 // uncomment for test data in resources until the doc picker works 
properly
 //let res = Bundle.main.url(forResource: "testdata/2", withExtension: 
"xlsx")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk ios/LibreOfficeLight

[jan Iversen]

 ios/CustomTarget_iOS_setup.mk   |   18 -
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |  108 
+-
 2 files changed, 69 insertions(+), 57 deletions(-)

New commits:
commit 652749a32b347a9114acd1d9585d0697a7d8dbc0
Author: jan Iversen <j...@libreoffice.org>
Date:   Sat Mar 3 22:36:40 2018 +0100

iOS, moved resources from share to direct.

Change-Id: I266fe71a6c58d8b80fa917198e8d84b356dfe296

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 3c7573ae5330..a9f98850c6d8 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -20,8 +20,8 @@ IOSDIRS = $(IOSGEN) \
   $(IOSRES)/services \
$(IOSRES)/program \
   $(IOSRES)/share \
-  $(IOSRES)/share/config \
-   $(IOSRES)/share/filter \
+  $(IOSRES)/config \
+   $(IOSRES)/filter \
  $(WORKDIR)/ios
 
 
@@ -60,12 +60,12 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
cp $(INSTDIR)/program/types/oovbaapi.rdb$(IOSRES)
cp $(INSTDIR)/program/services/services.rdb $(IOSRES)/services
cp $(INSTDIR)/program/services.rdb  $(IOSRES)
-   cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRES)/share/config
-   cp $(INSTDIR)/share/filter/oox-drawingml-adj-names 
$(IOSRES)/share/filter
-   cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets 
$(IOSRES)/share/filter
-   cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/share/filter
-   cp -R $(INSTDIR)/share/registry $(IOSRES)/share
-   cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
+   cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRES)/config
+   cp $(INSTDIR)/share/filter/oox-drawingml-adj-names $(IOSRES)/filter
+   cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets $(IOSRES)/filter
+   cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/filter
+   cp -R $(INSTDIR)/share/registry $(IOSRES)
+   cp $(INSTDIR)/share/config/*zip $(IOSRES)/config
cp $(SRCDIR)/ios/welcome.odt $(IOSRES)
 
# Set up rc (the "inifile", fundamentalrc, unorc, bootstraprc and 
versionrc.
@@ -79,7 +79,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
 && echo 'BRAND_INI_DIR=file:://$$APP_DATA_DIR' \
 && echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \
 && echo '##BRAND_SHARE_RESOURCE_SUBDIR=$(LIBO_SHARE_RESOURCE_FOLDER)' \
-&& echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry 
' \
+&& echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/registry ' \
'res:$${BRAND_BASE_DIR}/registry' \
&& echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' \
&& echo 'UNO_TYPES=file://$$APP_DATA_DIR/udkapi.rdb ' \
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index a1559d21bb48..e02182b1d8e7 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -7,13 +7,23 @@
objects = {
 
 /* Begin PBXBuildFile section */
-   39022C1B1EDC2A0E00100066 /* program in Resources */ = {isa = 
PBXBuildFile; fileRef = 39022C1A1EDC2A0E00100066 /* program */; };
-   39022C1D1EDC2A2C00100066 /* services in Resources */ = {isa = 
PBXBuildFile; fileRef = 39022C1C1EDC2A2C00100066 /* services */; };
-   39022C1F1EDC2AB000100066 /* share in Resources */ = {isa = 
PBXBuildFile; fileRef = 39022C1E1EDC2AB000100066 /* share */; };
-   39022C211EDC2D0800100066 /* icudt60l.dat in Resources */ = {isa 
= PBXBuildFile; fileRef = 39022C201EDC2D0800100066 /* icudt60l.dat */; };
39284DB31FA5F207006F43E4 /* DocumentActions.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = 39284DB21FA5F207006F43E4 /* 
DocumentActions.swift */; };
392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources 
*/ = {isa = PBXBuildFile; fileRef = 392ED9B21E5E4B03005C8435 /* 
ViewPrintManager.swift */; };
-   3941EF05204B4AC200082486 /* welcome.odt in Resources */ = {isa 
= PBXBuildFile; fileRef = 3941EF04204B4AC200082486 /* welcome.odt */; };
+   3941EF15204B4C8A00082486 /* unorc in Resources */ = {isa = 
PBXBuildFile; fileRef = 3941EF06204B4C8900082486 /* unorc */; };
+   3941EF16204B4C8A00082486 /* fundamentalrc in Resources */ = 
{isa = PBXBuildFile; fileRef = 3941EF07204B4C8900082486 /* fundamentalrc */; };
+   3941EF17204B4C8A00082486 /* program in Resources */ = {isa = 
PBXBuildFile; fileRef = 3941EF08204B4C8900082486 /* program */; };
+   3941EF18204B4C8A00082486 /* services.rdb in Resources */ = {isa 
= PBXBuildFile; fileRef = 3941EF09204B4C8900082486 /* services.rdb */; };
+   3941EF1

[Libreoffice-commits] core.git: 2 commits - ios/CustomTarget_iOS_setup.mk ios/LibreOfficeLight ios/welcome.odt

[jan Iversen]

 ios/CustomTarget_iOS_setup.mk   |2 +-
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |   10 
--
 ios/welcome.odt |binary
 3 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 97d03a120911c738fe47172b8798a0068ed2d3db
Author: jan Iversen <j...@libreoffice.org>
Date:   Sat Mar 3 22:28:49 2018 +0100

iOS, updated resource paths.

changed name of example.odt to welcome.odt

Change-Id: I59625949f4aaad3b3f75bfa243f1a4186d563822

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 00cf2cf203c9..3c7573ae5330 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -66,7 +66,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/share/filter
cp -R $(INSTDIR)/share/registry $(IOSRES)/share
cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
-   cp $(SRCDIR)/ios/source/example.odt $(IOSRES)
+   cp $(SRCDIR)/ios/welcome.odt $(IOSRES)
 
# Set up rc (the "inifile", fundamentalrc, unorc, bootstraprc and 
versionrc.
(echo '[Bootstrap]' \
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 77df259ecbe1..a1559d21bb48 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -13,7 +13,7 @@
39022C211EDC2D0800100066 /* icudt60l.dat in Resources */ = {isa 
= PBXBuildFile; fileRef = 39022C201EDC2D0800100066 /* icudt60l.dat */; };
39284DB31FA5F207006F43E4 /* DocumentActions.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = 39284DB21FA5F207006F43E4 /* 
DocumentActions.swift */; };
392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources 
*/ = {isa = PBXBuildFile; fileRef = 392ED9B21E5E4B03005C8435 /* 
ViewPrintManager.swift */; };
-   3941EED7204B347B00082486 /* example.odt in Resources */ = {isa 
= PBXBuildFile; fileRef = 3941EED6204B347B00082486 /* example.odt */; };
+   3941EF05204B4AC200082486 /* welcome.odt in Resources */ = {isa 
= PBXBuildFile; fileRef = 3941EF04204B4AC200082486 /* welcome.odt */; };
396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */ = 
{isa = PBXBuildFile; fileRef = 396F92F61E7AE62400A28C82 /* Settings.bundle */; 
};
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = 
{isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; 
};
397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = 397E08FD1E597BD8001374E0 /* AppDelegate.swift 
*/; };
@@ -28,7 +28,6 @@
39B08BD91E5F0BB600682A59 /* services.rdb in Resources */ = {isa 
= PBXBuildFile; fileRef = 39B085241E5F0BB400682A59 /* services.rdb */; };
39B091CD1E5F0BB800682A59 /* udkapi.rdb in Resources */ = {isa = 
PBXBuildFile; fileRef = 39B08B9B1E5F0BB600682A59 /* udkapi.rdb */; };
39B091CE1E5F0BB800682A59 /* unorc in Resources */ = {isa = 
PBXBuildFile; fileRef = 39B08B9C1E5F0BB600682A59 /* unorc */; };
-   39E950531FC9842000D82C49 /* source in Resources */ = {isa = 
PBXBuildFile; fileRef = 39E950521FC9842000D82C49 /* source */; };
39EF4E2F1FA500C9001914AC /* PropertiesController.swift in 
Sources */ = {isa = PBXBuildFile; fileRef = 39EF4E2E1FA500C9001914AC /* 
PropertiesController.swift */; };
FC31D01E2012F65500E7F402 /* DocumentHolder.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = FC31D01D2012F65500E7F402 /* 
DocumentHolder.swift */; };
FC31D0202012F6D300E7F402 /* RenderCache.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = FC31D01F2012F6D300E7F402 /* RenderCache.swift 
*/; };
@@ -66,8 +65,7 @@
39022C201EDC2D0800100066 /* icudt60l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt60l.dat; path = 
../generated/resources/icudt60l.dat; sourceTree = ""; };
39284DB21FA5F207006F43E4 /* DocumentActions.swift */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.swift; path = 
DocumentActions.swift; sourceTree = ""; };
392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewPrintManager.swift; path = LibreOfficeLight/ViewPrintManager.swift; 
sourceTree = SOURCE_ROOT; };
-   3941EED6204B347B00082486 /* example.odt */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = example.odt; path = 
../source/example.odt; sourceTree = ""; };
-   3941EED8204B350900082486 /* example.odt */ = {isa = 
PBXFileReference; last

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_link.mk

[jan Iversen]

 ios/CustomTarget_iOS_link.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b8431e03bdedfbd2126f78e0464921b0583f7f9a
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Mar 2 18:28:13 2018 +0100

iOS, allow "make" call in ios directory

config_host.mk is not read before Custom_target_ios_link, which gives
problems with the global variables

Change-Id: I9738b5123f4e7aa848de17b00b39b8a03b3a477c

diff --git a/ios/CustomTarget_iOS_link.mk b/ios/CustomTarget_iOS_link.mk
index fc926a535d9d..9d868ca181cd 100644
--- a/ios/CustomTarget_iOS_link.mk
+++ b/ios/CustomTarget_iOS_link.mk
@@ -67,7 +67,7 @@ $(IOSKIT): $(IOSOBJ) $(IOSLIBS)
-single_module \
-compatibility_version 1 \
-current_version 1 \
-   $(IOSLIBS) \
+   `$(SRCDIR)/bin/lo-all-static-libs` \
$(IOSOBJ) \
-o $(IOSKIT)
 ifeq ($(origin IOS_CODEID),undefined)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: unotools/source

[jan Iversen]

 unotools/source/i18n/resmgr.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6b8a3ab2108480a2d23ad91ef30418f8f831cf8c
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Mar 2 12:56:48 2018 +0100

iOS, added same limitations as MACOSX

Change-Id: Ic8490fcea37221f580734e7764e90bb21c9cc28f

diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
index 61c681f63ff9..d27245156493 100644
--- a/unotools/source/i18n/resmgr.cxx
+++ b/unotools/source/i18n/resmgr.cxx
@@ -36,7 +36,7 @@
 #include 
 #include 
 #include 
-#if defined UNX && !defined MACOSX
+#if defined UNX && !defined MACOSX && !defined IOS
 #   include 
 #endif
 
@@ -119,7 +119,7 @@ namespace Translate
 osl::File::getSystemPathFromFileURL(uri, path);
 OString sPath(OUStringToOString(path, osl_getThreadTextEncoding()));
 gen.add_messages_path(sPath.getStr());
-#if defined UNX && !defined MACOSX
+#if defined UNX && !defined MACOSX && !defined IOS
 bindtextdomain(pPrefixName, sPath.getStr());
 #endif
 gen.add_messages_domain(pPrefixName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[jan Iversen]

 configure.ac |   16 
 1 file changed, 12 insertions(+), 4 deletions(-)

New commits:
commit a542dba422505942f9c3c2f6e47a394e68b396a7
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Mar 1 18:48:31 2018 +0100

iOS, do not use LXML

removed LXML from iOS build.

changed false "if -z" to "if test -z"

Change-Id: Icf316392ce972213da039f96a8ec35495cc2ea58

diff --git a/configure.ac b/configure.ac
index f407c743babb..e5fcd807f461 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8147,13 +8147,17 @@ if test $enable_python = system; then
 PYTHON_FOR_BUILD=$PYTHON
 fi
 
-if -z "$PYTHON_FOR_BUILD"; then
+if test -z "$PYTHON_FOR_BUILD"; then
 case $build_os in
 cygwin)
 AC_MSG_WARN([No system-provided python lxml, gla11y will only 
report widget classes and ids])
 ;;
 *)
-BUILD_TYPE="$BUILD_TYPE LXML"
+   if test "$OS" != "IOS"; then
+   if test "$enable_ios_simulator" != "yes"; then
+   BUILD_TYPE="$BUILD_TYPE LXML"
+   fi
+   fi
 ;;
 esac
 else
@@ -8166,8 +8170,12 @@ else
 AC_MSG_RESULT([no, gla11y will only report widget classes and 
ids])
 ;;
 *)
-BUILD_TYPE="$BUILD_TYPE LXML"
-AC_MSG_RESULT([no, using internal lxml])
+   if test "$OS" != "IOS"; then
+   if test "$enable_ios_simulator" != "yes"; then
+   BUILD_TYPE="$BUILD_TYPE LXML"
+AC_MSG_RESULT([no, using internal lxml])
+   fi
+   fi
 ;;
 esac
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/headless

[jan Iversen]

 vcl/headless/svpinst.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 9c8cc8e46c917042ca85d392f175b320205c0f7e
Author: jan Iversen <j...@libreoffice.org>
Date:   Wed Feb 28 13:06:02 2018 +0100

iOS, removed read to pipes

needed to run iOS

Change-Id: I1176ce24023cde21846c71ffadb1bf01cb2c8399

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 096dcb252a3c..61fc93883f6a 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -327,7 +327,11 @@ void SvpSalYieldMutex::doAcquire(sal_uInt32 const 
nLockCount)
 m_bNoYieldLock = true;
 bool const bEvents = pInst->DoYield(false, request == 
SvpRequest::MainThreadDispatchAllEvents);
 m_bNoYieldLock = false;
+#ifdef IOS
+(void)bEvents;
+#else
 write(m_FeedbackFDs[1], , sizeof(bool));
+#endif
 }
 }
 while (true);
@@ -454,10 +458,11 @@ bool SvpSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
 : SvpRequest::MainThreadDispatchOneEvent);
 
 bool bDidWork(false);
+#ifndef IOS
 // blocking read (for synchronisation)
 auto const nRet = read(pMutex->m_FeedbackFDs[0], , 
sizeof(bool));
 assert(nRet == 1); (void) nRet;
-
+#endif
 if (!bDidWork && bWait)
 {
 // block & release YieldMutex until the main thread does something
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/headless

[jan Iversen]

 vcl/headless/svpinst.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7c30bf05ec891b0d8cba117838ff20e9d0b6d63e
Author: jan Iversen <j...@libreoffice.org>
Date:   Mon Feb 26 19:50:26 2018 +0100

vcl, solve iOS compile failure.

"voided" new formal parameter

Change-Id: I7d8849765eb6a2642f48159bae34c3b8bec3a8cd

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 6d867fcf28a1..096dcb252a3c 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -167,7 +167,9 @@ void SvpSalInstance::Wakeup(SvpRequest const request)
 g_CheckedMutex = true;
 }
 #endif
-#ifndef IOS
+#ifdef IOS
+(void)request;
+#else
 SvpSalYieldMutex *const 
pMutex(static_cast<SvpSalYieldMutex*>(mpSalYieldMutex.get()));
 std::unique_lock g(pMutex->m_WakeUpMainMutex);
 if (request != SvpRequest::NONE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Constraining LibreOffice as called in LibreOfficeKit to improve stability

[jan iversen]

On Wed, 21 Feb 2018 at 13:55, Sander Maijers  wrote:

> I’m running LibreOffice 6 through LibreOfficeKit calls (saveAs), and I’m
> interested in stabilizing and isolating LibreOffice during calls into it.
> My only purpose is document conversion. How can I minimize:
>

If you look on how LibreOfficeLight is generated (directory ios), you will
see that it limits LibreOffice quite a lot, by removing libraries.

Rgds
Jan I.

-- 
Sent from My iPad, sorry for any misspellings.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk

[jan Iversen]

 bridges/Library_cpp_uno.mk |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 32288245d57765821172182cbd132489d404db88
Author: jan Iversen <j...@libreoffice.org>
Date:   Wed Feb 21 10:33:17 2018 +0100

iOS, solved problem with -I for asm module

Change-Id: I9e699eea04231eeeff4146657124ee4f0e68412d

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 5cc6b247126a..4c6d7ec95046 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -27,8 +27,9 @@ bridge_noopt_objects := cpp2uno except uno2cpp
 bridge_asm_objects := ios64_helper
 
 #HACK
-$(eval $(call gb_Library_use_custom_headers,$(gb_CPPU_ENV)_uno,\
-bridges/source/cpp_uno/gcc3_ios \
+$(eval $(call gb_Library_set_include,$(gb_CPPU_ENV)_uno,\
+$$(INCLUDE) \
+-I $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios) \
 ))
 
 $(SRCDIR)/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s: \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - bridges/source vcl/source

[jan Iversen]

 bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h |6 --
 vcl/source/app/scheduler.cxx |3 ++-
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 61f3c760e573044bc51b94f00470c4fdd6d5c22f
Author: jan Iversen <j...@libreoffice.org>
Date:   Mon Feb 19 16:14:16 2018 +0100

iOS, remove throw definition

clean cpp_uno part.

Change-Id: Ief08e4cf596b375243ae215d8dc2e1cdb5830ac1

diff --git a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h 
b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
index 2ffa69e70257..034baff5738e 100644
--- a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
+++ b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
@@ -188,12 +188,6 @@ extern "C" void *__cxa_allocate_dependent_exception() 
throw();
 extern "C" void __cxa_free_dependent_exception(void *thrown_exception) throw();
 #pragma GCC visibility pop
 
-// Throw the exception.
-extern "C" void __cxa_throw (void *thrown_exception,
-std::type_info *tinfo,
-void (*dest) (void *))
- __attribute__((noreturn));
-
 // Used to implement exception handlers.
 extern "C" void *__cxa_get_exception_ptr (void *) throw();
 extern "C" void *__cxa_begin_catch (void *) throw();
commit 18d50b61ce1da7e989127fb518bbf5d140a3ba7a
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Feb 18 12:39:13 2018 +0100

vcl/scheduler adjusted time check.

the sal_timer might be off with a fraction, so when comparing
it is -1 (due to use of int), which lead to adding 250 ticks.

Changed check to be
if time < wanted time - 1
add extra time

Change-Id: I788b3e3b491a513f44f7b495727d1a6842af6109

diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index 1928161aecea..d7f80e1f1783 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -345,7 +345,8 @@ bool Scheduler::ProcessTaskScheduling()
 return false;
 
 sal_uInt64 nTime = tools::Time::GetSystemTicks();
-if ( nTime < rSchedCtx.mnTimerStart + rSchedCtx.mnTimerPeriod )
+// Allow for decimals, so subtract in the compare (needed at least on iOS)
+if ( nTime < rSchedCtx.mnTimerStart + rSchedCtx.mnTimerPeriod -1)
 {
 SAL_WARN( "vcl.schedule", "we're too early - restart the timer!" );
 UpdateSystemTimer( rSchedCtx,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

cpp2uno throw problems.

[jan iversen]

Hi

I am trying to get iOS to work on a device and not only in the simulator. I
am stuck in a cpp_uno call, which acts very strangely during documentLoad

The simulator (which is compiled as macosx just with iOS libraries loads
the document without problems, but on the device the same code makes a
throw.

I have debugged the 2 "versions", and found the exact point where they
differentiate, however that is a statement, I have problems understanding.

I am in DocumentLoad, LoadEnv

frame.cxx, 1270,  implts_sendFrameActionEvent(
css::frame::FrameAction_FRAME_ACTIVATED );
cpp2uno.cxx, 204 (Mac version) CPPU_CURRENT_NAMESPACE::raiseException(
, pThis->getBridge()->getUno2Cpp() ); // has to destruct the any
except.cxx, 290 (Mac version) void raiseException( uno_Any * pUnoExc,
uno_Mapping * pUno2Cpp )

line 341 in raisException: __cxxabiv1::__cxa_throw( pCppExc, rtti,
deleteException );

calls:

exc_thrower.cxx, 205, Any SAL_CALL getCaughtException()

and then

uno2cpp.cxx, 305, unoInterfaceProxyDispatch()
as expected.


Doing the same on the device, everything is identical until
line 341 in raisException: __cxxabiv1::__cxa_throw( pCppExc, rtti,
deleteException );

which throws an exception that ends up in LoadEnv::~LoadEnv().

can somebody please help me under the line __cxxabiv1::__cxa_throw(
pCppExc, rtti, deleteException );
how it in one enviroment uses getCaughtException and in another not.

 I discussed earlier with Tor on IRC, if it was the ASM code in
bridges/source/cpp_uno, but that does not seem to be the problem.

Hope somebody can give me a hint.

rgds
jan I.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - bridges/Library_cpp_uno.mk bridges/source

[jan Iversen]

 bridges/Library_cpp_uno.mk |   18 
 bridges/source/cpp_uno/gcc3_ios/ios64_helper.s | 2825 -
 2 files changed, 38 insertions(+), 2805 deletions(-)

New commits:
commit 4c0dec9988e77aaeec152deb9c2fd32173a32814
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Feb 16 19:50:22 2018 +0100

iOS, add custom include for codesnippets.S

Change-Id: I285838f6f3e8ec57a63239f71a403809154c47e2

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 6cbbc00bdf2e..11d3ea8808a4 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -27,6 +27,10 @@ bridge_noopt_objects := cpp2uno except uno2cpp
 bridge_asm_objects := ios64_helper
 
 #HACK
+$(eval $(call gb_Library_use_custom_headers,$(gb_CPPU_ENV)_uno,\
+bridges/source/cpp_uno/gcc3_ios \
+))
+
 $(SRCDIR)/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s: \
$(call 
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios)/codesnippets.S
 
commit 3a91ebb89d05d626a55f7304b6e427c650587bc3
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Feb 16 19:46:36 2018 +0100

iOS, readded perl script to generate codesnippets

Change-Id: Ie9f3aa8057e9b50beedf47ff892188cf3b362194

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 51eaa5624788..6cbbc00bdf2e 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -22,11 +22,23 @@ $(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktarget,gcc3_uno)) : \
 endif
 
 else ifeq ($(CPUNAME),ARM64)
-
 bridges_SELECTED_BRIDGE := gcc3_ios
 bridge_noopt_objects := cpp2uno except uno2cpp
 bridge_asm_objects := ios64_helper
 
+#HACK
+$(SRCDIR)/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s: \
+   $(call 
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios)/codesnippets.S
+
+$(call 
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios)/codesnippets.S: \
+   $(SRCDIR)/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl \
+| $(call 
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios)/.dir
+   $(PERL) $< > $@
+
+$(call gb_Library_get_clean_target,$(gb_CPPU_ENV)_uno) :
+   rm -f 
$(WORKDIR)/CustomTarget/bridges/source/cpp_uno/gcc3_ios/codesnippets.S
+
+
 else ifeq ($(CPUNAME),AARCH64)
 
 ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
diff --git a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s 
b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
index 9c4af3e98318..7461cbccc4e7 100644
--- a/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
+++ b/bridges/source/cpp_uno/gcc3_ios/ios64_helper.s
@@ -17,2815 +17,32 @@
 //   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 //
 
-#ifdef __arm64
+#include "codesnippets.S"
 
-.text
-#if defined(__arm) || defined(__arm64)
-
-// Each codeSnippetX function stores into ip (arm64: x15) an address and 
branches to _privateSnippetExecutor
-// The address is that following the branch instruction, containing two 32-bit 
ints:
-// - the function index, which for 32-bit can have the 0x8000 bit set
-//   to indicate that a hidden parameter is used for returning large values
-// - the vtable offset
+#if defined(__arm)
+// ARM support code for LibreOffice C++/UNO bridging
+//
+// Written by Peter Naulls <pe...@chocky.org>
+// Modified by Caolan McNamara <caol...@redhat.com>
+// Fixed by Michael Casadevall <mcasadev...@kubuntu.org>
+// Modified for iOS by Tor Lillqvist <t...@iki.fi>
 
+.text
 .align 4
 
-codeSnippet__0:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetExecutor
-.long 
-.long 0
-#ifndef __arm64
-codeSnippet_8000_0:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetExecutor
-.long 0x8000
-.long 0
-#endif
-codeSnippet__1:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetExecutor
-.long 
-.long 1
-#ifndef __arm64
-codeSnippet_8000_1:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetExecutor
-.long 0x8000
-.long 1
-#endif
-codeSnippet__2:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetExecutor
-.long 
-.long 2
-#ifndef __arm64
-codeSnippet_8000_2:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetExecutor
-.long 0x8000
-.long 2
-#endif
-codeSnippet__3:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetExecutor
-.long 
-.long 3
-#ifndef __arm64
-codeSnippet_8000_3:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnippetExecutor
-.long 0x8000
-.long 3
-#endif
-codeSnippet_0001_0:
-#ifdef __arm
-mov ip, pc
-#else
-adr x15, .+8
-#endif
-b _privateSnipp

[Libreoffice-commits] core.git: 2 commits - bridges/source

[jan Iversen]

 bridges/source/cpp_uno/gcc3_ios/cpp2uno.cxx  |   14 ++
 bridges/source/cpp_uno/gcc3_ios/except.cxx   |2 
 bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl |  114 +++
 bridges/source/cpp_uno/gcc3_ios/uno2cpp.cxx  |3 
 4 files changed, 130 insertions(+), 3 deletions(-)

New commits:
commit f563a81000ce43e95e117229b72228386077f94e
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Feb 15 18:00:33 2018 +0100

iOS, add old snippet script.

We need to check if the script generated the same code always.
Looks like nFunIndexes is never changed.

Change-Id: Ic247cccbf1e4a75e6a0acf5807fdcf84bfcf4cb3

diff --git a/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl 
b/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl
new file mode 100755
index ..a8548836fef3
--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl
@@ -0,0 +1,114 @@
+#!/usr/bin/perl -w # -*- tab-width: 4; indent-tabs-mode: nil; 
cperl-indent-level: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+my $nFunIndexes = 8;
+my $nVtableOffsets = 4;
+
+sub gen_arm ($$)
+{
+my ($funIndex, $vtableOffset) = @_;
+if ($funIndex & 0x8000) {
+printf ("#ifndef __arm64\n");
+}
+printf ("codeSnippet_%08x_%d:\n", $funIndex, $vtableOffset);
+printf ("#ifdef __arm\n");
+# Note: pc is the address of instruction being executed plus 8
+printf ("mov ip, pc\n");
+printf ("#else\n");
+printf ("adr x15, .+8\n");
+printf ("#endif\n");
+printf ("b _privateSnippetExecutor\n");
+printf (".long %#08x\n", $funIndex);
+printf (".long %d\n", $vtableOffset);
+if ($funIndex & 0x8000) {
+printf ("#endif\n");
+}
+}
+
+sub gen_x86 ($$$)
+{
+my ($funIndex, $vtableOffset, $executor) = @_;
+printf ("codeSnippet_%08x_%d_%s:\n", $funIndex, $vtableOffset, $executor);
+printf ("movl \$%#08x, %%eax\n", $funIndex);
+printf ("movl \$%d, %%edx\n", $vtableOffset);
+printf ("jmp _privateSnippetExecutor%s\n", $executor);
+}
+
+printf (".text\n");
+
+printf ("#if defined(__arm) || defined(__arm64)\n");
+
+printf ("\n");
+printf ("// Each codeSnippetX function stores into ip (arm64: x15) an address 
and branches to _privateSnippetExecutor\n");
+printf ("// The address is that following the branch instruction, containing 
two 32-bit ints:\n");
+printf ("// - the function index, which for 32-bit can have the 0x8000 bit 
set\n");
+printf ("//   to indicate that a hidden parameter is used for returning large 
values\n");
+printf ("// - the vtable offset\n");
+printf ("\n");
+
+printf (".align 4\n");
+printf ("\n");
+
+foreach my $funIndex (0 .. $nFunIndexes-1)
+{
+   foreach my $vtableOffset (0 .. $nVtableOffsets-1)
+   {
+   gen_arm ($funIndex, $vtableOffset);
+   gen_arm ($funIndex|0x8000, $vtableOffset);
+   }
+}
+
+printf ("#else\n");
+printf (".align 1, 0x90\n");
+
+foreach my $funIndex (0 .. $nFunIndexes-1)
+{
+foreach my $vtableOffset (0 .. $nVtableOffsets-1)
+{
+foreach my $executor ('General', 'Void', 'Hyper', 'Float', 'Double', 
'Class')
+{
+gen_x86 ($funIndex, $vtableOffset, $executor);
+gen_x86 ($funIndex|0x8000, $vtableOffset, $executor);
+}
+}
+  }
+
+printf ("#endif\n");
+
+printf (".globl _nFunIndexes\n");
+printf ("_nFunIndexes:\n");
+printf (".long %d\n", $nFunIndexes);
+
+printf (".globl _nVtableOffsets\n");
+printf ("_nVtableOffsets:\n");
+printf (".long %d\n", $nVtableOffsets);
+
+printf (".globl _codeSnippets\n");
+printf ("_codeSnippets:\n");
+
+foreach my $funIndex (0 .. $nFunIndexes-1)
+{
+foreach my $vtableOffset (0 .. $nVtableOffsets-1)
+{
+printf ("#if defined(__arm) || defined(__arm64)\n");
+printf (".long codeSnippet_%08x_%d - _codeSnippets\n", $funIndex, 
$vtableOffset);
+printf ("#ifndef __arm64\n");
+printf (".long codeSnippet_%08x_%d - _codeSnippets\n", 
$funIndex|0x8000, $vtableOffset);
+printf ("#endif\n");
+printf ("#else\n");
+foreach my $executor ('General', 'Void', 'Hyper', 'Float', 'Double', 
'Class')
+{
+printf (".long codeSnippet_%08x_%d_%s - _codeSnippets\n

[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk bridges/source

[jan Iversen]

 bridges/Library_cpp_uno.mk|2 
 bridges/source/cpp_uno/gcc3_ios/abi.cxx   |  328 --
 bridges/source/cpp_uno/gcc3_ios/abi.hxx   |   61 ---
 bridges/source/cpp_uno/gcc3_ios/call.cxx  |   78 
 bridges/source/cpp_uno/gcc3_ios/call.hxx  |   37 --
 bridges/source/cpp_uno/gcc3_ios/callvirtualmethod.cxx |  180 -
 bridges/source/cpp_uno/gcc3_ios/callvirtualmethod.hxx |   40 --
 7 files changed, 1 insertion(+), 725 deletions(-)

New commits:
commit 9a62dcf333b2e9b470d5aa1b5c2ddaae6732ad32
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Feb 15 15:55:30 2018 +0100

iOS, reduce arm64 files to actually needed

Still comparing the "old" gcc3_ios_arm with the new one, in order to make
the asm code work.

Change-Id: I3a2fdfc1891a6a4d7065917f5ef8bd19c49b3987

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 73744d2d682c..51eaa5624788 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -24,7 +24,7 @@ endif
 else ifeq ($(CPUNAME),ARM64)
 
 bridges_SELECTED_BRIDGE := gcc3_ios
-bridge_noopt_objects := abi call callvirtualmethod cpp2uno except uno2cpp
+bridge_noopt_objects := cpp2uno except uno2cpp
 bridge_asm_objects := ios64_helper
 
 else ifeq ($(CPUNAME),AARCH64)
diff --git a/bridges/source/cpp_uno/gcc3_ios/abi.cxx 
b/bridges/source/cpp_uno/gcc3_ios/abi.cxx
deleted file mode 100644
index 042a857bae32..
--- a/bridges/source/cpp_uno/gcc3_ios/abi.cxx
+++ /dev/null
@@ -1,328 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifdef __x86_64
-
-// This is an implementation of the x86-64 ABI as described in 'System V
-// Application Binary Interface, AMD64 Architecture Processor Supplement'
-// (http://www.x86-64.org/documentation/abi-0.95.pdf)
-//
-// The code in this file is a modification of src/x86/ffi64.c from libffi
-// (http://sources.redhat.com/libffi/) which is under the following license:
-
-/* ---
-   ffi.c - Copyright (c) 2002  Bo Thorsen <b...@suse.de>
-
-   x86-64 Foreign Function Interface
-
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-   ``Software''), to deal in the Software without restriction, including
-   without limitation the rights to use, copy, modify, merge, publish,
-   distribute, sublicense, and/or sell copies of the Software, and to
-   permit persons to whom the Software is furnished to do so, subject to
-   the following conditions:
-
-   The above copyright notice and this permission notice shall be included
-   in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
-   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-   IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-   OTHER DEALINGS IN THE SOFTWARE.
-   --- */
-
-#include "sal/config.h"
-
-#include "abi.hxx"
-
-#include 
-
-using namespace x86_64;
-
-/* Register class used for passing given 64bit part of the argument.
-   These represent classes as documented by the PS ABI, with the exception
-   of SSESF, SSEDF classes, that are basically SSE class, just gcc will
-   use SF or DFmode move instead of DImode to avoid reformatting penalties.
-
-   Similarly we play games with INTEGERSI_CLASS to use cheaper SImode moves
-   whenever possible (upper half does contain padding).
- */
-enum x86_64_reg_class
-{
-X86_64_NO_CLASS,
-X86_64_INTEGER_CLASS,
-X86_64_INTEGERSI_CLASS,
-X86_64_SSE_CLASS,
-X86_64_SSESF_CLASS,
-X86_64_SSEDF_CLASS,
-X86_64_SSEUP_C

[Libreoffice-commits] core.git: 3 commits - bridges/Library_cpp_uno.mk bridges/source

[jan Iversen]

 bridges/Library_cpp_uno.mk|   65 +-
 bridges/source/cpp_uno/gcc3_ios/cpp2uno-simulator.cxx |  520 --
 bridges/source/cpp_uno/gcc3_ios/uno2cpp-simulator.cxx |  444 ---
 3 files changed, 33 insertions(+), 996 deletions(-)

New commits:
commit 54a5b5d7f3e8ebe52783379aa67fad41de32a695
Author: jan Iversen <j...@libreoffice.org>
Date:   Wed Feb 14 15:01:38 2018 +0100

iOS, add gcc3 helper for ARM64

Change-Id: Iad8cfd72803864bd1c8a5d01c74e1f856c27685d

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 26aaf59ff8f1..73744d2d682c 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -21,6 +21,12 @@ $(call gb_LinkTarget_get_target,$(call 
gb_Library_get_linktarget,gcc3_uno)) : \
EXTRAOBJECTLISTS += $(call 
gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
 endif
 
+else ifeq ($(CPUNAME),ARM64)
+
+bridges_SELECTED_BRIDGE := gcc3_ios
+bridge_noopt_objects := abi call callvirtualmethod cpp2uno except uno2cpp
+bridge_asm_objects := ios64_helper
+
 else ifeq ($(CPUNAME),AARCH64)
 
 ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
diff --git a/bridges/source/cpp_uno/gcc3_ios/cpp2uno-simulator.cxx 
b/bridges/source/cpp_uno/gcc3_ios/cpp2uno-simulator.cxx
deleted file mode 100644
index d350d0c4c3e1..
--- a/bridges/source/cpp_uno/gcc3_ios/cpp2uno-simulator.cxx
+++ /dev/null
@@ -1,520 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef __arm64
-
-#include 
-#include 
-
-#include 
-#include 
-
-#include 
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include 
-#include 
-
-#include "bridge.hxx"
-#include "cppinterfaceproxy.hxx"
-#include "types.hxx"
-#include "vtablefactory.hxx"
-
-#include "abi.hxx"
-#include "call.hxx"
-#include "share.hxx"
-
-using namespace ::osl;
-using namespace ::com::sun::star::uno;
-
-
-// Perform the UNO call
-//
-// We must convert the parameters stored in gpreg, fpreg and ovrflw to UNO
-// arguments and call pThis->getUnoI()->pDispatcher.
-//
-// gpreg:  [ret *], this, [gpr params]
-// fpreg:  [fpr params]
-// ovrflw: [gpr or fpr params (properly aligned)]
-//
-// [ret *] is present when we are returning a structure bigger than 16 bytes
-// Simple types are returned in rax, rdx (int), or xmm0, xmm1 (fp).
-// Similarly structures <= 16 bytes are in rax, rdx, xmm0, xmm1 as necessary.
-static typelib_TypeClass cpp2uno_call(
-bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
-const typelib_TypeDescription * pMemberTypeDescr,
-typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void 
return
-sal_Int32 nParams, typelib_MethodParameter * pParams,
-void ** gpreg, void ** fpreg, void ** ovrflw,
-sal_uInt64 * pRegisterReturn /* space for register return */ )
-{
-unsigned int nr_gpr = 0; //number of gpr registers used
-unsigned int nr_fpr = 0; //number of fpr registers used
-
-// return
-typelib_TypeDescription * pReturnTypeDescr = nullptr;
-if (pReturnTypeRef)
-TYPELIB_DANGER_GET( , pReturnTypeRef );
-
-void * pUnoReturn = nullptr;
-void * pCppReturn = nullptr; // complex return ptr: if != 0 && != 
pUnoReturn, reconversion need
-
-if ( pReturnTypeDescr )
-{
-if ( x86_64::return_in_hidden_param( pReturnTypeRef ) )
-{
-pCppReturn = *gpreg++;
-nr_gpr++;
-
-pUnoReturn = ( bridges::cpp_uno::shared::relatesToInterfaceType( 
pReturnTypeDescr )
-   ? alloca( pReturnTypeDescr->nSize )
-   : pCppReturn ); // direct way
-}
-else
-pUnoReturn = pRegisterReturn; // direct way for simple types
-}
-
-// pop this
-gpreg++;
-nr_gpr++;
-
-// stack space
-// parameters
-void ** pUnoArgs = static_cast(alloca( 4 * sizeof(void *) * 
nParams ));
-void ** pCppArgs = pUnoArgs + nParams;
-// indices of values t

[Libreoffice-commits] core.git: ios/LibreOfficeLight

[jan Iversen]

 
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
 |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit fc956e424b99492bbcd8a0df98c60e526ddb9bfd
Author: jan Iversen <j...@libreoffice.org>
Date:   Tue Feb 13 18:17:52 2018 +0100

iOS, SAL_LOG added to debug builds

Change-Id: Ibd5406c8f2ea7b46e3b4863ca1eba5a788bd270a

diff --git 
a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
index b860af5cc7e5..676048c6e6d7 100644
--- 
a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
+++ 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
@@ -63,6 +63,13 @@
 ReferencedContainer = "container:LibreOfficeLight.xcodeproj">
  
   
+  
+ 
+ 
+  
   
   

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOfficeKit header files include directives

[jan iversen]

Hi

your patch does not work with the iOS modules. I also did a short rust
search, and it seems include path is supported:

https://stackoverflow.com/questions/42741815/setting-the-include-path-with-bindgen

I recommend not to activate this patch.

RGDS
Jan I

On Sun, 11 Feb 2018 at 18:04, Sander Maijers  wrote:

> At this revision
> (
> https://github.com/LibreOffice/online/tree/341c9dcc96dcf84cadfabcce2c3eabc09c1bf8d1/bundled/include/LibreOfficeKit
> ),
> I can’t generate bindings for Rust from LibreOfficeKit header files. The
> reason is that I have no way to specify include paths while the
> LibreOfficeKit header files assume their sibling header files are to be
> found in the system include paths, based on the `< >` include directive
> syntax. I think that’s incorrect since LibreOfficeKit is a unit itself;
> all header files are supposed to be adjacent in the same directory tree.
> I found support for my view in this previous discussion
> (
> https://lists.freedesktop.org/archives/libreoffice/2017-October/078601.html
> ).
>
> I propose the attached patch. With it, generating Rust bindings for
> LibreOfficeKit has been tested to succeed.
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
-- 
Sent from My iPad, sorry for any misspellings.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: ios/LibreOfficeLight

[jan Iversen]

 ios/LibreOfficeLight/LibreOfficeLight/LOKit/DocumentHolder.swift |4 
 1 file changed, 4 insertions(+)

New commits:
commit f81f63aff6e25d970d3183a12af6ff6fc0c23789
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Feb 11 13:10:17 2018 +0100

iOS, added missing document state in callback

Change-Id: Ib710eb4ce1186571732588948726874a0fb9cb58

diff --git a/ios/LibreOfficeLight/LibreOfficeLight/LOKit/DocumentHolder.swift 
b/ios/LibreOfficeLight/LibreOfficeLight/LOKit/DocumentHolder.swift
index c0760b8614a4..0871c678dcaa 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight/LOKit/DocumentHolder.swift
+++ b/ios/LibreOfficeLight/LibreOfficeLight/LOKit/DocumentHolder.swift
@@ -166,6 +166,10 @@ public class DocumentHolder
 // TODO: callback?
 }
 
+case LOK_CALLBACK_STATE_CHANGED:
+// TODO: call backback
+print("onDocumentEvent type: LOK_CALLBACK_STATE_CHANGED: \(payload 
?? "")")
+
 default:
 print("onDocumentEvent type:\(type) not handled!")
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

[jan Iversen]

 ios/CustomTarget_iOS_setup.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2db0c3e04348d3096dff72c568c461be3cb1a0c6
Author: jan Iversen <j...@libreoffice.org>
Date:   Mon Feb 5 19:37:43 2018 +0100

iOS, add tango theme to avoid vcl problem.

Change-Id: I73bee8ce04ec6234187224d03f0e081f09037e72

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 8fea759249e9..eb102f669bf3 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -66,6 +66,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets 
$(IOSRES)/share/filter
cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/share/filter
cp -R $(INSTDIR)/share/registry $(IOSRES)/share
+   cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
 
# Set up rc (the "inifile", fundamentalrc, unorc, bootstraprc and 
versionrc.
(echo '[Bootstrap]' \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - ios/CustomTarget_iOS_setup.mk ios/LibreOfficeLight

[jan Iversen]

 ios/CustomTarget_iOS_setup.mk  
 |1 
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
 |3 
 
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
   |   93 ++
 
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Release.xcscheme
 |   93 ++
 4 files changed, 187 insertions(+), 3 deletions(-)

New commits:
commit f17d0ff5234d88816198becb0f3d8ea7f00f7eb0
Author: jan Iversen <j...@libreoffice.org>
Date:   Mon Feb 5 11:09:43 2018 +0100

iOS, correctly build release/debug versions

Added 2 schemes Debug/Release as shared to make sure they are
available. Not having them as shared and cleaning causes them to be
"forgotten"

Change-Id: I4cb66c7088f770c7cda592994f3610e98fb1b7f0

diff --git 
a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
new file mode 100644
index ..b860af5cc7e5
--- /dev/null
+++ 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
@@ -0,0 +1,93 @@
+
+
+   
+  
+ 
+
+
+ 
+  
+   
+   
+  
+  
+  
+ 
+ 
+  
+  
+  
+   
+   
+  
+ 
+ 
+  
+  
+  
+   
+   
+  
+ 
+ 
+  
+   
+   
+   
+   
+   
+
diff --git 
a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Release.xcscheme
 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Release.xcscheme
new file mode 100644
index ..4861ceef6913
--- /dev/null
+++ 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Release.xcscheme
@@ -0,0 +1,93 @@
+
+
+   
+  
+ 
+
+
+ 
+  
+   
+   
+  
+  
+  
+ 
+ 
+  
+  
+  
+   
+   
+  
+ 
+ 
+  
+  
+  
+   
+   
+  
+ 
+ 
+  
+   
+   
+   
+   
+   
+
commit 1ed8f225ab0328055dbb6724060d21584b393bd5
Author: jan Iversen <j...@libreoffice.org>
Date:   Mon Feb 5 11:06:22 2018 +0100

iOS, removed OTHER_LDFLAGS

Change-Id: Ib07c1c4823deda7fa4ba389e9679f6eff99691d8

diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index c85096aa1a60..17263df41d76 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -494,7 +494,6 @@
MACH_O_TYPE = mh_execute;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
-   OTHER_LDFLAGS = "";
SDKROOT = iphoneos;
SWIFT_OBJC_BRIDGING_HEADER = 
"lokit-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -529,7 +528,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) 
@executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = "";
ONLY_ACTIVE_ARCH = YES;
-   OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
PRODUCT_BUNDLE_IDENTIFIER = 
com.jani.Editors.LibreOfficeLight;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = 
"LibreOfficeLight/lokit-Bridging-Header.h";
@@ -563,7 +561,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) 
@executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = "";
ONLY_ACTIVE_ARCH = YES;
-   OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
PRODUCT_BUNDLE_IDENTIFIER = 
com.jani.Editors.LibreOfficeLight;
PRODUCT_NAME = "$(TARGET_NAME)";
        SWIFT_OBJC_BRIDGING_HEADER = 
"LibreOfficeLight/lokit-Bridging-Header.h";
commit 8258b425e85bc360f67d776a0196a7a091e7975f
Author: jan Iversen <j...@libreoffice.org>
Date:   Mon Feb 5 09:14:01 2018 +0100

iOS, allow x86 release builds

Added dir for x86_64 release builds

Change-Id: If8c5e775ecd1283d9386a764441019c2423170f9

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 0ca73a345ffb..8fea759249e9 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -14,6 +14,7 

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_link.mk ios/CustomTarget_iOS_setup.mk ios/LibreOfficeLight

[jan Iversen]

 ios/CustomTarget_iOS_link.mk|8 ++--
 ios/CustomTarget_iOS_setup.mk   |   17 
+-
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |4 +-
 3 files changed, 10 insertions(+), 19 deletions(-)

New commits:
commit 1bd8cd252c749aea1e078699915928ac01b61da6
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Feb 4 17:56:40 2018 +0100

iOS, simplified lib ref and copy to device

Named libKit directories so they can be referenced simple within xCode

Change-Id: Ic05fa4e87b6cc87e2823177474c3ed9ac3433dd3

diff --git a/ios/CustomTarget_iOS_link.mk b/ios/CustomTarget_iOS_link.mk
index ef6303a217d8..fc926a535d9d 100644
--- a/ios/CustomTarget_iOS_link.mk
+++ b/ios/CustomTarget_iOS_link.mk
@@ -18,13 +18,13 @@ IOSSRC = $(SRCDIR)/ios/source/LibreOfficeKit.c
 
 ifeq ($(ENABLE_DEBUG),TRUE)
 ifeq ($(CPUNAME),X86_64)
-IOSKIT = $(IOSGEN)/simulator/libKit.dylib
+IOSKIT = $(IOSGEN)/Debug_x86_64/libKit.dylib
 else
-IOSKIT = $(IOSGEN)/debug/libKit.dylib
+IOSKIT = $(IOSGEN)/Debug_arm64/libKit.dylib
 endif
 else
 ifeq ($(CPUNAME),ARM64)
-IOSKIT = $(IOSGEN)/release/libKit.dylib
+IOSKIT = $(IOSGEN)/Release_arm64/libKit.dylib
 endif
 endif
 
@@ -81,7 +81,7 @@ endif
 
 #- clean ios  -
 $(call gb_CustomTarget_get_clean_target,ios/iOS_link):
-   rm -f $(IOSKIT).dylib
+   rm -f $(IOSKIT)
 
 
 
diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index b3e7843abba3..0ca73a345ffb 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -12,9 +12,9 @@
 IOSGEN  = $(SRCDIR)/ios/generated
 IOSRES  = $(IOSGEN)/resources
 IOSDIRS = $(IOSGEN) \
-  $(IOSGEN)/simulator \
-  $(IOSGEN)/debug \
-  $(IOSGEN)/release \
+  $(IOSGEN)/Debug_x86_64 \
+  $(IOSGEN)/Debug_arm64 \
+  $(IOSGEN)/Release_arm64 \
  $(IOSRES) \
   $(IOSRES)/services \
$(IOSRES)/program \
@@ -108,16 +108,5 @@ $(call gb_CustomTarget_get_clean_target,ios/iOS_setup):
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),ENV,2)
rm -rf $(IOSRES)/* $(IOSGEN)/native-code.h $(IOSGEN)/build
rm -rf $(WORKDIR)/ios
-ifeq ($(ENABLE_DEBUG),TRUE)
-ifeq ($(CPUNAME),X86_64)
-   rm -f $(IOSGEN)/simulator/*
-else
-   rm -f $(IOSGEN)/debug/*
-endif
-else
-ifeq ($(CPUNAME),ARM64)
-   rm -f $(IOSGEN)/release/*
-endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 2d01b21c6832..c85096aa1a60 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -324,7 +324,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
-   shellScript = "echo 
hello\n\nGEN=$PROJECT_DIR/../generated\necho $arch\nif [ $arch = \"x86_64\" ]; 
then\nLIB=$GEN/simulator/libKit.dylib\nelse\nLIB=$GEN/release/libKit.dylib\nfi\necho
 $LIB\nln -sf $LIB $TARGET_BUILD_DIR/libKit.dylib\n\n\n\n\n";
+   shellScript = 
"\nGEN=$PROJECT_DIR/../generated/$CONFIGURATION\\_$arch/libKit.dylib\ncp $GEN 
$TARGET_BUILD_DIR/libKit.dylib\n\n\n\n\n";
};
 /* End PBXShellScriptBuildPhase section */
 
@@ -527,6 +527,7 @@
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) 
@executable_path/Frameworks";
+   LIBRARY_SEARCH_PATHS = "";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
PRODUCT_BUNDLE_IDENTIFIER = 
com.jani.Editors.LibreOfficeLight;
@@ -560,6 +561,7 @@
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) 
@executable_path/Frameworks";
+   LIBRARY_SEARCH_PATHS = "";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
PRODUCT_BUNDLE_IDENTIFIER = 
com.jani.Editors.LibreOfficeLight;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - ios/LibreOfficeLight

[jan Iversen]

 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
   |  108 -
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/DEVICE  
   |  186 --
 
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/SIMULATOR.xcscheme
 |   89 
 ios/LibreOfficeLight/LibreOfficeLight/en.lproj/LaunchScreen.xib
   |  142 ---
 4 files changed, 84 insertions(+), 441 deletions(-)

New commits:
commit f7cdb48dfc3f1acd7b0b891eddb184251160f3af
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Feb 2 20:43:01 2018 +0100

iOS, launchScreen size update

Change-Id: Ic00d5f623fafdf05c467e7a260320894d8a27c5b

diff --git a/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/LaunchScreen.xib 
b/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/LaunchScreen.xib
index 30c669d0948b..fa0ccf2ff001 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/LaunchScreen.xib
+++ b/ios/LibreOfficeLight/LibreOfficeLight/en.lproj/LaunchScreen.xib
@@ -64,24 +64,22 @@
 
 
 
-
+
 
 
 
 
 
 
-
 
 
 
 
 
-
 
 
-
 
+
 
 
 
@@ -92,11 +90,13 @@
 
 
 
+
 
 
+
 
 
-
+
 
 
 
@@ -104,6 +104,6 @@
 
 
 
-
+
 
 
commit 4d184c262c42baa71ef58c7d0f32158090d5b1da
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Feb 2 20:10:54 2018 +0100

iOS, removed buildConfiguration Simulator

We only work with Debug/Release and then let the target determinate active
architecture.

Change-Id: Iccc6a658168a26c9d6b1650b0928466479cf68dc

diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 4310b7862e3b..2d01b21c6832 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -573,108 +573,6 @@
};
name = Release;
};
-   39ACF41A1F8A358000DA7334 /* Simulator */ = {
-   isa = XCBuildConfiguration;
-   buildSettings = {
-   ALWAYS_SEARCH_USER_PATHS = NO;
-   CLANG_ANALYZER_NONNULL = YES;
-   CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-   CLANG_CXX_LIBRARY = "libc++";
-   CLANG_ENABLE_MODULES = YES;
-   CLANG_ENABLE_OBJC_ARC = YES;
-   CLANG_OPTIMIZATION_PROFILE_FILE = 
"$(SRCROOT)/../generated/$(PROJECT_NAME).profdata";
-   CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-   CLANG_WARN_BOOL_CONVERSION = YES;
-   CLANG_WARN_COMMA = YES;
-   CLANG_WARN_CONSTANT_CONVERSION = YES;
-   CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-   CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
-   CLANG_WARN_EMPTY_BODY = YES;
-   CLANG_WARN_ENUM_CONVERSION = YES;
-   CLANG_WARN_INFINITE_RECURSION = YES;
-   CLANG_WARN_INT_CONVERSION = YES;
-   CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-   CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-   CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-   CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-   CLANG_WARN_STRICT_PROTOTYPES = YES;
-   CLANG_WARN_SUSPICIOUS_MOVE = YES;
-   CLANG_WARN_UNREACHABLE_CODE = YES;
-   CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-   "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone 
Developer";
-   COPY_PHASE_STRIP = NO;
-   DEBUG_INFORMATION_FORMAT = dwarf;
-   ENABLE_BITCODE = NO;
-   ENABLE_STRICT_OBJC_MSGSEND = YES;
-   ENABLE_TESTABILITY = YES;
-

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - external/libmspub

[jan Iversen]

 external/libmspub/UnpackedTarball_libmspub.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6e1e8225bea130c0e586029500cfe14130d5691c
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Jan 4 22:47:28 2018 +0100

libmspub, add update of config.sub

Change-Id: Ia843520afae808fc8ed7dec6ae017400720394e7
(cherry picked from commit 7c026c92b6d03508ae9af9cf0313b809a4097212)
Reviewed-on: https://gerrit.libreoffice.org/49036
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/external/libmspub/UnpackedTarball_libmspub.mk 
b/external/libmspub/UnpackedTarball_libmspub.mk
index 57845333cb4e..5ea3053d6f69 100644
--- a/external/libmspub/UnpackedTarball_libmspub.mk
+++ b/external/libmspub/UnpackedTarball_libmspub.mk
@@ -17,6 +17,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmspub,\
 external/libmspub/ubsan.patch \
 ))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmspub))
+
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libmspub, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/LibreOfficeLight

[jan Iversen]

 ios/LibreOfficeLight/LibreOfficeLight/Info.plist |   23 +++
 1 file changed, 23 insertions(+)

New commits:
commit 2cbcaa58b9fdbe78119b43a2a4404bebbb3fcebd
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Jan 26 15:46:20 2018 +0100

iOS, add support for PDF

Updated Document Types and import types.

Change-Id: Id7e5aef91cdf52783a83672becfd7bbb78f986ad

diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Info.plist 
b/ios/LibreOfficeLight/LibreOfficeLight/Info.plist
index 8e26191c6a76..c50ff60567f3 100755
--- a/ios/LibreOfficeLight/LibreOfficeLight/Info.plist
+++ b/ios/LibreOfficeLight/LibreOfficeLight/Info.plist
@@ -349,6 +349,7 @@
org.libreoffice.cdr-document
org.libreoffice.visio-document
org.libreoffice.mspub-document
+   com.adobe.pdf



@@ -1784,6 +1785,28 @@ file, You can obtain one at 
http://mozilla.org/MPL/2.0/.



+   
+   UTTypeConformsTo
+   
+   public.data
+   public.composite-​content
+   
+   UTTypeDescription
+Apple PDF pasteboard type PDF data
+   UTTypeIdentifier
+   com.adobe.pdf
+   UTTypeTagSpecification
+   
+   public.filename-extension
+
+pdf
+
+public.mime-type
+
+application/pdf
+
+   
+   

 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - ios/LibreOfficeLight

[jan Iversen]

 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
|   36 --
 ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/intro.imageset/intro.png 
|binary
 2 files changed, 36 deletions(-)

New commits:
commit e27398165237a9137b926e0743dabf7a81066839
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Jan 25 18:57:30 2018 +0100

iOS, update intro screen

Update to intro.png used for version 6

Change-Id: Ieeb71854eb98eb3f1be815ea15fecce424a5eba9

diff --git 
a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/intro.imageset/intro.png
 
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/intro.imageset/intro.png
index 8c1025f6d84c..d27f8858dc6c 100644
Binary files 
a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/intro.imageset/intro.png
 and 
b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/intro.imageset/intro.png
 differ
commit 121d3213e04c4e8be7de36ceeef2a4e545ad314c
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Jan 25 18:47:16 2018 +0100

iOS, removed unused libraries

libz, libiconv etc are now hidden in loKit.dylib

Change-Id: I64e7be0c3ad2087f8c13bcc99d693087e4c6732b

diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 4897f40a1641..856d8b353bfb 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -13,9 +13,6 @@
39022C211EDC2D0800100066 /* icudt60l.dat in Resources */ = {isa 
= PBXBuildFile; fileRef = 39022C201EDC2D0800100066 /* icudt60l.dat */; };
39284DB31FA5F207006F43E4 /* DocumentActions.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = 39284DB21FA5F207006F43E4 /* 
DocumentActions.swift */; };
392ED9B31E5E4B03005C8435 /* ViewPrintManager.swift in Sources 
*/ = {isa = PBXBuildFile; fileRef = 392ED9B21E5E4B03005C8435 /* 
ViewPrintManager.swift */; };
-   393975781F8BECB0002DC80B /* libiconv.tbd in Frameworks */ = 
{isa = PBXBuildFile; fileRef = 393975771F8BECB0002DC80B /* libiconv.tbd */; };
-   3939757A1F8BECC1002DC80B /* libz.tbd in Frameworks */ = {isa = 
PBXBuildFile; fileRef = 393975791F8BECC1002DC80B /* libz.tbd */; };
-   39503A751F94D44900F19C78 /* libc++.tbd in Frameworks */ = {isa 
= PBXBuildFile; fileRef = 39503A741F94D44900F19C78 /* libc++.tbd */; };
396C833F1FC9D89E008E662A /* libKit.dylib in Frameworks */ = 
{isa = PBXBuildFile; fileRef = 396C833E1FC9D89D008E662A /* libKit.dylib */; };
396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */ = 
{isa = PBXBuildFile; fileRef = 396F92F61E7AE62400A28C82 /* Settings.bundle */; 
};
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = 
{isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; 
};
@@ -54,16 +51,11 @@
39022C201EDC2D0800100066 /* icudt60l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt60l.dat; path = 
../generated/resources/icudt60l.dat; sourceTree = ""; };
39284DB21FA5F207006F43E4 /* DocumentActions.swift */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.swift; path = 
DocumentActions.swift; sourceTree = ""; };
392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewPrintManager.swift; path = LibreOfficeLight/ViewPrintManager.swift; 
sourceTree = SOURCE_ROOT; };
-   393975771F8BECB0002DC80B /* libiconv.tbd */ = {isa = 
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; 
name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
-   393975791F8BECC1002DC80B /* libz.tbd */ = {isa = 
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; 
name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
39503A6F1F94C4AC00F19C78 /* lokit-Bridging-Header.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
"lokit-Bridging-Header.h"; sourceTree = ""; };
-   39503A741F94D44900F19C78 /* libc++.tbd */ = {isa = 
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; 
name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
396C833E1FC9D89D008E662A /* libKit.dylib */ = {isa = 
PBXFileReference; lastKnownFileType = archive.ar; name = libKit.dylib; path = 
../generated/simulator/libKit.dylib; sourceTree = ""; };
396F92F61E7AE62400A28C82 /* Settings.bundle */ = {isa = 
PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = 

[Libreoffice-commits] core.git: 2 commits - ios/CustomTarget_iOS_link.mk ios/CustomTarget_iOS_prelink.mk ios/CustomTarget_iOS_setup.mk ios/Module_ios.mk ios/StaticLibrary_iOSkit.mk

[jan Iversen]

 ios/CustomTarget_iOS_link.mk  |   71 +-
 ios/CustomTarget_iOS_setup.mk |   55 ++--
 ios/Module_ios.mk |5 +-
 ios/StaticLibrary_iOSkit.mk   |   28 
 4 files changed, 64 insertions(+), 95 deletions(-)

New commits:
commit bf0117cce987dd92f6e658de0e186a282677b17f
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Jan 25 15:14:36 2018 +0100

iOS, simplified dylib build

Change-Id: Icea9a5e4796dda288fafcd478a769fa7087baab2

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_link.mk
similarity index 52%
rename from ios/CustomTarget_iOS_prelink.mk
rename to ios/CustomTarget_iOS_link.mk
index 0534264d416c..ab5ad721d8d7 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_link.mk
@@ -5,60 +5,50 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
 #- Env 
-IOSLIB = ''
-IOSLD = 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
-IOSCLANG = 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
-IOSOBJ = $(WORKDIR)/CObject/ios/Kit.o
+IOSGEN   = $(SRCDIR)/ios/generated
+IOSLIBS := $(shell \
+(export INSTDIR=$(INSTDIR);export OS=$(OS); \
+ export WORKDIR=$(WORKDIR);export LIBO_LIB_FOLDER=$(LIBO_LIB_FOLDER); \
+ $(SRCDIR)/bin/lo-all-static-libs))
+IOSOBJ = $(WORKDIR)/ios/Kit.o
+IOSSRC = $(SRCDIR)/ios/source/LibreOfficeKit.c
 
 ifeq ($(ENABLE_DEBUG),TRUE)
 ifeq ($(CPUNAME),X86_64)
-IOSKIT = $(IOSGEN)/simulator/libKit
+IOSKIT = $(IOSGEN)/simulator/libKit.dylib
 else
-IOSKIT = $(IOSGEN)/debug/libKit
+IOSKIT = $(IOSGEN)/debug/libKit.dylib
 endif
 else
 ifeq ($(CPUNAME),ARM64)
-IOSKIT = $(IOSGEN)/release/libKit
+IOSKIT = $(IOSGEN)/release/libKit.dylib
 endif
 endif
 
 
 
 #- Top level  -
-$(eval $(call gb_CustomTarget_CustomTarget,ios/iOS_prelink))
-
-$(call gb_CustomTarget_get_target,ios/iOS_prelink): $(IOSKIT).dylib
+$(eval $(call gb_CustomTarget_CustomTarget,ios/iOS_link))
 
+$(call gb_CustomTarget_get_target,ios/iOS_link): $(IOSKIT)
 
 
 #- build  -
-.PHONY: FORCE
-FORCE:
-
-
-IOSPREBUILD: FORCE
-   $(eval IOSLIBS = `$(SRCDIR)/bin/lo-all-static-libs`)
-
-
-
-$(IOSKIT).a: IOSPREBUILD $(WORKDIR)/ios $(call 
gb_StaticLibrary_get_target,iOS_kitBridge) \
-   $(IOSLIBS)
-   $(call gb_Output_announce,iOS prelink object,$(true),LNK,2)
-   $(IOSLD) -r -ios_version_min $(IOS_DEPLOYMENT_VERSION) \
-   -syslibroot $(MACOSX_SDK_PATH) \
-   -arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
-   -o $(IOSOBJ) \
-   $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
-   $(IOSLIBS)
-   $(AR) -r $(IOSKIT).a $(IOSOBJ)
-
-
-$(IOSKIT).dylib: $(IOSKIT).a
+$(IOSOBJ): $(IOSSRC) $(call gb_CustomTarget_get_target,ios/iOS_setup)
+   $(call gb_Output_announce,iOS compile interface,$(true),C,2)
+   $(gb_CC) $(gb_COMPILERDEFS) $(gb_OSDEFS) $(gb_CFLAGS) \
+   -DDISABLE_DYNLOADING -DLIBO_INTERNAL_ONLY \
+   -fvisibility=hidden -Werror -O0 -fstrict-overflow \
+   $(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS) -g) \
+   -c $(IOSSRC) -o $(IOSOBJ) \
+   -I$(SRCDIR)/include -I$(BUILDDIR)/config_host \
+
+$(IOSKIT): $(IOSOBJ) $(IOSLIBS)
$(call gb_Output_announce,iOS dylib,$(true),LNK,2)
-   $(IOSCLANG) -dynamiclib 
-mios-simulator-version-min=$(IOS_DEPLOYMENT_VERSION) \
-   -arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
-   -isysroot $(MACOSX_SDK_PATH) \
+   $(gb_CC) -dynamiclib \
-Xlinker -rpath -Xlinker @executable_path/Frameworks \
-Xlinker -rpath -Xlinker @loader_path/Frameworks \
-dead_strip \
@@ -76,22 +66,21 @@ $(IOSKIT).dylib: $(IOSKIT).a
-single_module \
-compatibility_version 1 \
-current_version 1 \
+   $(IOSLIBS) \
$(IOSOBJ) \
-   -o $(IOSKIT).dylib
+   -o $(IOSKIT)
 ifeq ($(origin IOS_CODEID),undefined)
@echo "please define environment variable IOS_CODEID as\n" \
  "export IOS_CODEID="
@exit -1
 else
-   codesign -s "$(IOS_CODEID)" $(IOSKIT).dylib
+   codesign -s "$(IOS_CODEID)" $(IOSKIT)
 endif
 
 
-
-
 #- clean ios  -
-$(call gb_CustomTarget_get_clean_target,ios/iOS_prelink):
-   rm -f $(IOSKIT).a $(IOSKIT).dylib
+$(call gb_CustomTarget_get_clean_target,ios/iOS_link):
+   rm -f $(IOSKIT).dylib
 
 
 
diff --git

[Libreoffice-commits] core.git: ios/LibreOfficeLight

[jan Iversen]

 ios/LibreOfficeLight/LibreOfficeLight/Info.plist |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e0e19de6eccf83caa82013ca2fefbfcc114816a0
Author: jan Iversen <j...@libreoffice.org>
Date:   Mon Jan 22 12:44:57 2018 +0100

iOS, allow orientations for all devices

Info.plist is no longer limited to ipad

Change-Id: Ibe807183fab7e2820e5234fa7fa773fda2c32926

diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Info.plist 
b/ios/LibreOfficeLight/LibreOfficeLight/Info.plist
index b999d30f8cfd..8e26191c6a76 100755
--- a/ios/LibreOfficeLight/LibreOfficeLight/Info.plist
+++ b/ios/LibreOfficeLight/LibreOfficeLight/Info.plist
@@ -406,7 +406,7 @@ file, You can obtain one at 
http://mozilla.org/MPL/2.0/.

UIRequiresFullScreen

-   UISupportedInterfaceOrientations~ipad
+   UISupportedInterfaceOrientations

UIInterfaceOrientationPortraitUpsideDown
UIInterfaceOrientationPortrait
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/LibreOfficeLight

[jan Iversen]

 
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/SIMULATOR.xcscheme
 |1 -
 ios/LibreOfficeLight/LibreOfficeLight/Info.plist   
   |9 ++---
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 331b971e7b239f3cd5d619f653d6d694295e0826
Author: jan Iversen <j...@libreoffice.org>
Date:   Mon Jan 22 11:24:34 2018 +0100

iOS, performance update

Set SAL_LOG to empty in SIMULATOR scheme, allowing to easy add
+WARN+INFO when testing.

Removed duplicate entry in Info.plist

Change-Id: I7d0231b0c30fd710e578f91b450c3c16696deb08

diff --git 
a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/SIMULATOR.xcscheme
 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/SIMULATOR.xcscheme
index ea2830f52976..949407de5d96 100644
--- 
a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/SIMULATOR.xcscheme
+++ 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/SIMULATOR.xcscheme
@@ -66,7 +66,6 @@
   
  
  
   
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Info.plist 
b/ios/LibreOfficeLight/LibreOfficeLight/Info.plist
index e8c48f1789c3..b999d30f8cfd 100755
--- a/ios/LibreOfficeLight/LibreOfficeLight/Info.plist
+++ b/ios/LibreOfficeLight/LibreOfficeLight/Info.plist
@@ -406,13 +406,6 @@ file, You can obtain one at 
http://mozilla.org/MPL/2.0/.

UIRequiresFullScreen

-   UISupportedInterfaceOrientations
-   
-   UIInterfaceOrientationLandscapeLeft
-   UIInterfaceOrientationLandscapeRight
-   UIInterfaceOrientationPortraitUpsideDown
-   UIInterfaceOrientationPortrait
-   
UISupportedInterfaceOrientations~ipad

UIInterfaceOrientationPortraitUpsideDown
@@ -420,6 +413,8 @@ file, You can obtain one at 
http://mozilla.org/MPL/2.0/.
UIInterfaceOrientationLandscapeLeft
UIInterfaceOrientationLandscapeRight

+   UISupportsDocumentBrowser
+   
UTExportedTypeDeclarations


___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source

[jan Iversen]

 desktop/source/lib/init.cxx |   14 --
 1 file changed, 14 deletions(-)

New commits:
commit 57fd33408a5a3ae4d2a9ff68ee5513ff1192b6ad
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Jan 21 12:57:59 2018 +0100

iOS, removed iOS special handling in init()

Removed the need for the (limited) init() used earlier by iOS.

Due to problems solved below init() it is now posible to use
the standard init !!

init.cxx still have some special handling of paintTile, which we should try
to eliminate

Change-Id: I42234aea8ac6b8dfcf8c3c88b386b4d4a97bba74

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 468a145f31c6..b3631ba3ade7 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3504,7 +3504,6 @@ static bool initialize_uno(const OUString& aAppProgramURL)
 return true;
 }
 
-#ifndef IOS
 static void lo_startmain(void*)
 {
 osl_setThreadName("lo_startmain");
@@ -3516,7 +3515,6 @@ static void lo_startmain(void*)
 
 Application::ReleaseSolarMutex();
 }
-#endif
 
 static bool bInitialized = false;
 
@@ -3651,14 +3649,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 // CommandLineArgs):
 desktop::Desktop::GetCommandLineArgs().setHeadless();
 
-#ifdef IOS
-// mpDefInst need to be initialized, which only happens in 
InitVCL(),
-// there might be more elegant ways to get InitVCL() called, but
-// this one works :-)
-InitVCL();
-SfxApplication::GetOrCreate();
-#endif
-
 if (eStage == PRE_INIT)
 {
 std::cerr << "Init vcl\n";
@@ -3714,16 +3704,12 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 if (eStage != PRE_INIT)
 {
 SAL_INFO("lok", "Enabling RequestHandler");
-#ifdef IOS
-RequestHandler::Enable(true);
-#else
 RequestHandler::Enable(false);
 SAL_INFO("lok", "Starting soffice_main");
 RequestHandler::SetReady(false);
 pLib->maThread = osl_createThread(lo_startmain, nullptr);
 SAL_INFO("lok", "Waiting for RequestHandler");
 RequestHandler::WaitForReady();
-#endif
 SAL_INFO("lok", "RequestHandler ready -- continuing");
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - desktop/source ios/CustomTarget_iOS_setup.mk

[jan Iversen]

 desktop/source/app/appinit.cxx |7 +++
 ios/CustomTarget_iOS_setup.mk  |1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit cc2b9a257b6436ab6f84d6e158a64c09b0937eb6
Author: jan Iversen <j...@libreoffice.org>
Date:   Sat Jan 20 18:52:39 2018 +0100

iOS, remove double [bootstrap]

two bootstrap sections in one rc file seems wrong.

Change-Id: Ic7f8eac2d3d07b35736d11ad1fbe705135cb1785

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 543ef306a7db..6242354eeebe 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -58,7 +58,6 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
(echo '[Bootstrap]' \
&& echo 'URE_BOOTSTRAP=file://$$APP_DATA_DIR/fundamentalrc' \
&& echo 'HOME=$$SYSUSERHOME'  \
-   && echo '[Bootstrap]' \
) > $(IOSRES)/rc
 
# Set up fundamentalrc, unorc, bootstraprc and versionrc.
commit feb601b75142f3234bb51f9566a70c4db488a061
Author: jan Iversen <j...@libreoffice.org>
Date:   Sat Jan 20 18:51:13 2018 +0100

iOS, allow unorc to be read

One reason why init did not work, was that it did a throw due
to a wrong path on unorc

Change-Id: I928f25358befe05f8986e9ebcffda27e8beb397c

diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 853eaf8734ae..826c525eb6c1 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -80,6 +80,13 @@ void Desktop::InitApplicationServiceManager()
 sm.set(
 cppu::defaultBootstrap_InitialComponentContext( aUnoRc 
)->getServiceManager(),
 UNO_QUERY_THROW);
+#elif defined(IOS)
+OUString uri( "$APP_DATA_DIR" );
+rtl_bootstrap_expandMacros(  );
+OUString aUnoRc("file://" + uri  + "/unorc");
+sm.set(
+   cppu::defaultBootstrap_InitialComponentContext( aUnoRc 
)->getServiceManager(),
+   UNO_QUERY_THROW);
 #else
 sm.set(
 cppu::defaultBootstrap_InitialComponentContext()->getServiceManager(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source

[jan Iversen]

 desktop/source/lib/init.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 09449750fe9c698688ae5fb92c9ac4556b2a371f
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Jan 18 12:26:05 2018 +0100

iOS, readded function declaration.

Function declaration got lost in the different gerrit patches

Change-Id: Iec2b0449c0c6e41fb1b5568d6f5651b697a2daa5

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index db8a5c5142c9..4c0b96b85951 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3806,6 +3806,7 @@ static void lo_destroy(LibreOfficeKit* pThis)
 extern "C"
 {
 __attribute__((visibility("default")))
+void temporaryHackToInvokeCallbackHandlers(LibreOfficeKitDocument* pThis)
 {
 SolarMutexGuard aGuard;
 LibLODocument_Impl* pDocument = static_cast<LibLODocument_Impl*>(pThis);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

[jan Iversen]

 ios/CustomTarget_iOS_setup.mk |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e2ef73648ad9a9d531d563668d85eb6721d88d79
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Jan 18 12:02:17 2018 +0100

iOS, directory creation as part of setup

Corrected sequence for creating directories

Change-Id: I7a148b5568694c67e382e75a2e1629d3e23bf197

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 81dac6686fbb..543ef306a7db 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -21,21 +21,21 @@ $(call gb_CustomTarget_get_target,ios/iOS_setup): 
$(IOSGEN)/native-code.h
 
 #- Generate dynamic files  ---
 $(IOSGEN) $(WORKDIR)/ios:
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),EN1,2)
mkdir -p $(IOSGEN) $(IOSRES) $(IOSRES)/services \
 $(IOSRES)/share/config $(IOSRES)/share/filter 
$(IOSRES)/program \
 $(IOSGEN)/simulator \
 $(IOSGEN)/debug \
 $(IOSGEN)/release \
-$(IOSGEN) $(WORKDIR)/ios;
+$(WORKDIR)/ios;
 
 
 
 $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
  $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
-$(SRCDIR)/solenv/bin/native-code.py
-$(IOSGEN)/ios:
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
+$(SRCDIR)/solenv/bin/native-code.py \
+$(IOSGEN) $(WORKDIR)/ios
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),EN2,2)
$(SRCDIR)/solenv/bin/native-code.py \
-C -g core -g writer -g calc -g draw -g edit \
> $(IOSGEN)/native-code.h
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

[jan Iversen]

 ios/CustomTarget_iOS_setup.mk |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit bccb5c54cdcaaea09ee8a3929c7bcc4b94972c11
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Jan 18 11:38:16 2018 +0100

iOS, avoid racing conflict in dependencies

WORDIR might be deleted, but generated kept, situation solved

Change-Id: I5847d590affa7f80ef734bf314dbee9a6fc81669

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 28636c7f0759..81dac6686fbb 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -20,19 +20,22 @@ $(call gb_CustomTarget_get_target,ios/iOS_setup): 
$(IOSGEN)/native-code.h
 
 
 #- Generate dynamic files  ---
-$(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
- $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
-$(SRCDIR)/solenv/bin/native-code.py
+$(IOSGEN) $(WORKDIR)/ios:
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
-
-   # prepare directories
mkdir -p $(IOSGEN) $(IOSRES) $(IOSRES)/services \
 $(IOSRES)/share/config $(IOSRES)/share/filter 
$(IOSRES)/program \
 $(IOSGEN)/simulator \
 $(IOSGEN)/debug \
 $(IOSGEN)/release \
 $(IOSGEN) $(WORKDIR)/ios;
-   # generate file with call declarations
+
+
+
+$(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
+ $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
+$(SRCDIR)/solenv/bin/native-code.py
+$(IOSGEN)/ios:
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
$(SRCDIR)/solenv/bin/native-code.py \
-C -g core -g writer -g calc -g draw -g edit \
> $(IOSGEN)/native-code.h
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/LibreOfficeLight

[jan Iversen]

 
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/SIMULATOR.xcscheme
 |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 08bad4b589dfecf4dd96909e228163080009f94d
Author: jan Iversen <j...@libreoffice.org>
Date:   Tue Jan 16 20:11:32 2018 +0100

iOS, actived SAL_INFO + SAL_WARN in debug

SAL_INFO and SAL_WARN are now sending output to the debugger
window (which can be saved to a file, in the xcode menu)

Change-Id: I0a9b98f8da469e71c6fd56d624dad446561c1153

diff --git 
a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/SIMULATOR.xcscheme
 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/SIMULATOR.xcscheme
index 09077ed7fb93..ea2830f52976 100644
--- 
a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/SIMULATOR.xcscheme
+++ 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/SIMULATOR.xcscheme
@@ -63,6 +63,13 @@
 ReferencedContainer = "container:LibreOfficeLight.xcodeproj">
  
   
+  
+ 
+ 
+  
   
   

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Help needed !!! SolarMutex

[jan iversen]

Hi

I need help. I am debugging the iOS version of LibreOfficeKit init() to
find a missing SolarMutex release (Xcode 9 debugger).

Can someone please tell me how to "see" (in the debugger) if the SolarMutex
is locked, and if so to which task.

rgds
jan I.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

[jan Iversen]

 ios/CustomTarget_iOS_setup.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e16668e16441406db20f2adf587a9e1fed75b9aa
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Jan 14 12:27:22 2018 +0100

iOS, typo

Change-Id: I59db4b822a7d0f697f887f99805893e9adb54667

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index ab303a837efd..28636c7f0759 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -20,7 +20,7 @@ $(call gb_CustomTarget_get_target,ios/iOS_setup): 
$(IOSGEN)/native-code.h
 
 
 #- Generate dynamic files  ---
-$(IOSGEN)/native-code.h: $(WORKDIR)/ios $(BUILDDIR)/config_host.mk \
+$(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
  $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
 $(SRCDIR)/solenv/bin/native-code.py
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk ios/StaticLibrary_iOSkit.mk

[jan Iversen]

 ios/CustomTarget_iOS_setup.mk |   20 ++--
 ios/StaticLibrary_iOSkit.mk   |2 ++
 2 files changed, 8 insertions(+), 14 deletions(-)

New commits:
commit 35020496e22317715140278a4b4cc974e48889da
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Jan 14 12:24:44 2018 +0100

iOS, static library depeneds on setup

added dependency to static library

Change-Id: Ib0d7f7eec1f34ff275600cc9e825fa606f1ef40d

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 20b58c7623e5..ab303a837efd 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -17,29 +17,21 @@ $(eval $(call gb_CustomTarget_CustomTarget,ios/iOS_setup))
 
 $(call gb_CustomTarget_get_target,ios/iOS_setup): $(IOSGEN)/native-code.h
 
-#- build  -
-.PHONY: FORCE
-FORCE:
 
 
+#- Generate dynamic files  ---
+$(IOSGEN)/native-code.h: $(WORKDIR)/ios $(BUILDDIR)/config_host.mk \
+ $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
+$(SRCDIR)/solenv/bin/native-code.py
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
 
-$(WORKDIR)/ios:
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRE,2)
+   # prepare directories
mkdir -p $(IOSGEN) $(IOSRES) $(IOSRES)/services \
 $(IOSRES)/share/config $(IOSRES)/share/filter 
$(IOSRES)/program \
 $(IOSGEN)/simulator \
 $(IOSGEN)/debug \
 $(IOSGEN)/release \
 $(IOSGEN) $(WORKDIR)/ios;
-
-
-
-#- Generate dynamic files  ---
-$(IOSGEN)/native-code.h: $(WORKDIR)/ios $(BUILDDIR)/config_host.mk \
- $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
-$(SRCDIR)/solenv/bin/native-code.py
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
-
# generate file with call declarations
$(SRCDIR)/solenv/bin/native-code.py \
-C -g core -g writer -g calc -g draw -g edit \
diff --git a/ios/StaticLibrary_iOSkit.mk b/ios/StaticLibrary_iOSkit.mk
index f36ef856a8dc..a543e494a344 100644
--- a/ios/StaticLibrary_iOSkit.mk
+++ b/ios/StaticLibrary_iOSkit.mk
@@ -23,4 +23,6 @@ $(eval $(call gb_StaticLibrary_add_cobjects,iOS_kitBridge,\
 ios/source/LibreOfficeKit \
 ))
 
+$(call gb_StaticLibrary_get_target,ios/iOS_kitBridge): $(call 
gb_CustomTarget_get_target,ios/iOS_setup)
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - ios/source ios/StaticLibrary_iOSkit.mk Makefile.in

[jan Iversen]

 Makefile.in |3 +++
 ios/StaticLibrary_iOSkit.mk |5 -
 ios/source/LibreOfficeKit.c |2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 73259891a3fa77497b76b8378a795c83944d74e4
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Jan 14 12:02:29 2018 +0100

iOS changed reference to native-code.h

Change-Id: Icadbdc4463ffb9591353e820f66474c65efd12cf

diff --git a/ios/StaticLibrary_iOSkit.mk b/ios/StaticLibrary_iOSkit.mk
index 67f8b086cfcf..f36ef856a8dc 100644
--- a/ios/StaticLibrary_iOSkit.mk
+++ b/ios/StaticLibrary_iOSkit.mk
@@ -19,11 +19,6 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,iOS_kitBridge))
 
-$(eval $(call gb_StaticLibrary_set_include,iOS_kitBridge,\
-$$(INCLUDE) \
--I$(SRCDIR)/ios/generated \
-))
-
 $(eval $(call gb_StaticLibrary_add_cobjects,iOS_kitBridge,\
 ios/source/LibreOfficeKit \
 ))
diff --git a/ios/source/LibreOfficeKit.c b/ios/source/LibreOfficeKit.c
index b403b356d171..1868ae7b21fa 100644
--- a/ios/source/LibreOfficeKit.c
+++ b/ios/source/LibreOfficeKit.c
@@ -15,7 +15,7 @@
 #include 
 
 // generated by solenv/bin/native-code.py:
-#include "native-code.h"
+#include "../generated/native-code.h"
 
 
 // pointers to our instance
commit 0ff9e57e0f4ee7a5bf846ae61fc97012434d3be8
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Jan 14 12:01:13 2018 +0100

iOS updated "make clean"

make clean now knows how to clean the iOS special part

Change-Id: If132172d95823754f0983241a8121d143fcc3007

diff --git a/Makefile.in b/Makefile.in
index 006c98c3f41a..1ccb676795fa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -174,6 +174,9 @@ clean-host:
rm -fr $(TESTINSTALLDIR)
rm -fr $(INSTDIR)
rm -fr $(WORKDIR)
+ifeq ($(OS),IOS)
+   rm -fr $(SRCDIR)/ios/generated
+endif
 
 clean-build:
 ifneq ($(CROSS_COMPILING),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - ios/LibreOfficeLight ios/README

[jan Iversen]

 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |2 
 ios/README  |   39 
+++---
 2 files changed, 16 insertions(+), 25 deletions(-)

New commits:
commit 3c8ebbdca744d87fcc42f97b76e04cef5a7b5c1f
Author: jan Iversen <j...@libreoffice.org>
Date:   Sat Jan 13 14:26:21 2018 +0100

iOS, debugged callback

Callback now calls the swift function.

It is time to see if we can do without the thread queue.

Change-Id: If9a76c884ca7e5018243ae3f4bee20b61dbba40d

diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 650895263ca6..a0b303ce58a4 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -58,6 +58,7 @@
397275391E77D9F1006ACDCC /* LibreOfficeLight.entitlements */ = 
{isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = 
LibreOfficeLight.entitlements; sourceTree = ""; };
3975A8C91FBD70EE00A87B3A /* LibreOfficeKit.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; name = LibreOfficeKit.h; 
path = ../../include/LibreOfficeKit/LibreOfficeKit.h; sourceTree = ""; };
397868D71E59A3EA007F9248 /* en */ = {isa = PBXFileReference; 
lastKnownFileType = file.xib; name = en; path = en.lproj/LaunchScreen.xib; 
sourceTree = ""; };
+   397A9624200937990073F066 /* init.cxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; 
name = init.cxx; path = ../../desktop/source/lib/init.cxx; sourceTree = 
""; };
397E08FA1E597BD8001374E0 /* LibreOfficeLight.app */ = {isa = 
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; 
path = LibreOfficeLight.app; sourceTree = BUILT_PRODUCTS_DIR; };
397E08FD1E597BD8001374E0 /* AppDelegate.swift */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.swift; name = 
AppDelegate.swift; path = LibreOfficeLight/AppDelegate.swift; sourceTree = 
SOURCE_ROOT; };
397E09021E597BD8001374E0 /* en */ = {isa = PBXFileReference; 
lastKnownFileType = file.storyboard; name = en; path = 
en.lproj/Main.storyboard; sourceTree = ""; };
@@ -114,6 +115,7 @@
3956B72D1FAB3DBF00BF5DE4 /* extra */ = {
isa = PBXGroup;
children = (
+   397A9624200937990073F066 /* init.cxx */,
39E950521FC9842000D82C49 /* source */,
3975A8C91FBD70EE00A87B3A /* LibreOfficeKit.h */,
);
commit f64ae9b0ba80dec1e3e16502debc947f30c31bf4
Author: jan Iversen <j...@libreoffice.org>
Date:   Sat Jan 13 10:30:38 2018 +0100

iOS, updated README

Changed README to reflect dylib, and new structure

Change-Id: I4230eed75572c0c0eefc059e284bfe92d5d9c506

diff --git a/ios/README b/ios/README
index 6ad40d2ef8a4..a5433cc99a36 100644
--- a/ios/README
+++ b/ios/README
@@ -1,8 +1,5 @@
 iOS app and LibreOfficeKit.
 
--- LibreOfficeKit
-prelink all LO libraries into one to facilitate easier linking
-
 -- LibreOfficeLight
 a swift based UI, very much work in progress
 
@@ -26,35 +23,27 @@ the 3 configurations of LO first, and then link against 
those.
 Due to the multiple workdirs a separate work directories are needed as follows:
 (names/locations can be changes, they are "linked" together by running 
autogen.sh)
./core - libreoffice git clone (name can be changed)
-   ./ios-arm64 - workdir for production, autogen.input:
-standard +
-#--enable-debug
-#--enable-ios-simulator
---host=arm64-apple-darwin
-   ./ios-arm64-debug - workdir for debug on device, autogen.input:
-standard +
---enable-debug
-#--enable-ios-simulator
---host=arm64-apple-darwin
-   ./ios-simulator - workdir for simulator-debug, autogen.input:
-standard +
---enable-debug
---enable-ios-simulator
-#--host=arm64-apple-darwin
+   ./ios-arm64 - workdir for production
+   ./ios-arm64-debug - workdir for debug on device
+   ./ios-simulator - workdir for simulator-debug
 
 -- Steps to generate
 1) copy ./core/distro-configs/LibreOfficeiOS.conf to autogen.input in
./ios-arm64, ./ios-arm64-debug, ./ios-simulator
-   Correct as per above, add your local setup (e.g. location of tarballs)
+   Correct as defined in the conf file,
+   add your local setup (e.g. location of tarballs)
 2) run ../core/autogen.sh in ios-arm64, ios-arm64-debug and io

[Libreoffice-commits] core.git: 2 commits - ios/CustomTarget_iOS_prelink.mk ios/CustomTarget_iOS_setup.mk

[jan Iversen]

 ios/CustomTarget_iOS_prelink.mk |7 ++-
 ios/CustomTarget_iOS_setup.mk   |4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit dacb12d219fd060504553bf29e8536bdb747c930
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Jan 12 18:26:21 2018 +0100

iOS, split .a and .dylib generation

Added new dependency/action

Change-Id: I378bc517e74e1569f81c9c7154be154021f1df3c

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index d7834cac50b3..0534264d416c 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -42,7 +42,9 @@ IOSPREBUILD: FORCE
 
 
 
-$(IOSKIT).dylib: IOSPREBUILD $(WORKDIR)/ios $(call 
gb_StaticLibrary_get_target,iOS_kitBridge) $(IOSLIBS)
+$(IOSKIT).a: IOSPREBUILD $(WORKDIR)/ios $(call 
gb_StaticLibrary_get_target,iOS_kitBridge) \
+   $(IOSLIBS)
+   $(call gb_Output_announce,iOS prelink object,$(true),LNK,2)
$(IOSLD) -r -ios_version_min $(IOS_DEPLOYMENT_VERSION) \
-syslibroot $(MACOSX_SDK_PATH) \
-arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
@@ -51,6 +53,9 @@ $(IOSKIT).dylib: IOSPREBUILD $(WORKDIR)/ios $(call 
gb_StaticLibrary_get_target,i
$(IOSLIBS)
$(AR) -r $(IOSKIT).a $(IOSOBJ)
 
+
+$(IOSKIT).dylib: $(IOSKIT).a
+   $(call gb_Output_announce,iOS dylib,$(true),LNK,2)
$(IOSCLANG) -dynamiclib 
-mios-simulator-version-min=$(IOS_DEPLOYMENT_VERSION) \
-arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
-isysroot $(MACOSX_SDK_PATH) \
commit b61791533edca81551fcc7948ea7202d9ba6e5c4
Author: jan Iversen <j...@libreoffice.org>
Date:   Sat Jan 13 05:40:29 2018 +0100

iOS, Correct BRAND_* in rc

Wrong BRAND_BASE_DIR and BRAND_INI_DIR reference.

Change-Id: I85295a9de3807a60d0afb05c160be9acae2e4aec

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index e159e2433fd2..20b58c7623e5 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -68,8 +68,8 @@ $(IOSGEN)/native-code.h: $(WORKDIR)/ios 
$(BUILDDIR)/config_host.mk \
 
# Set up fundamentalrc, unorc, bootstraprc and versionrc.
(echo '[Bootstrap]' \
-&& echo 'BRAND_BASE_DIR=$$APP_DATA_DIR/..' \
-&& echo 'BRAND_INI_DIR=$$APP_DATA_DIR' \
+&& echo 'BRAND_BASE_DIR=file://$$APP_DATA_DIR' \
+&& echo 'BRAND_INI_DIR=file:://$$APP_DATA_DIR' \
 && echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \
 && echo '##BRAND_SHARE_RESOURCE_SUBDIR=$(LIBO_SHARE_RESOURCE_FOLDER)' \
 && echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry 
' \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

[jan Iversen]

 ios/CustomTarget_iOS_setup.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a5eea680720dd8f3c78143ac635dafdf09b5dd14
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Jan 12 17:05:59 2018 +0100

iOS, add .py dependency to native-code.h

Change-Id: I165d59228c2b273d758d1222dce8e653bdca0039

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 9b7986cfda46..e159e2433fd2 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -36,7 +36,8 @@ $(WORKDIR)/ios:
 
 #- Generate dynamic files  ---
 $(IOSGEN)/native-code.h: $(WORKDIR)/ios $(BUILDDIR)/config_host.mk \
- $(SRCDIR)/ios/CustomTarget_iOS_setup.mk
+ $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
+$(SRCDIR)/solenv/bin/native-code.py
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
 
# generate file with call declarations
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: is _lo_get_constructor_map and _lo_get_factory_map processor dependent ?

[jan iversen]

> Definitions for those functions are generated by bin/native-code.py.  I
> do see uses of that (and of the generated native-code.h) in module ios
> (but have no further insight into that module).


Thanks that helps, I have seen native_code.h being generated when I do
fresh build, so it seems to be
a missing dependency or native-code.py have been changed.

Will take a look at that.
rgds
jan i

>
> --
Sent from My iPad, sorry for any misspellings.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: include/LibreOfficeKit

[jan Iversen]

 include/LibreOfficeKit/LibreOfficeKitInit.h |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2a80ce62d373d734db26741858b4bee1c3994564
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Jan 12 14:03:55 2018 +0100

Repair windows build break.

Forgot to isolate extern declaration, mac/linux had no problem,
but windows breaks.

Change-Id: Ib09119661225193d9cfb1cd9118b78cf7d9bd2f4

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index f33a9868cf26..69316f524130 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -244,8 +244,10 @@ typedef LibreOfficeKit *(LokHookFunction2)( const char 
*install_path, const char
 
 typedef int (LokHookPreInit)  ( const char *install_path, const 
char *user_profile_url );
 
+#if defined(IOS)
 extern __attribute__ ((visibility("default")))
 LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const 
char* user_profile_path);
+#endif
 
 static LibreOfficeKit *lok_init_2( const char *install_path,  const char 
*user_profile_url )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - desktop/source include/LibreOfficeKit ios/source

[jan Iversen]

 desktop/source/lib/init.cxx |2 +-
 include/LibreOfficeKit/LibreOfficeKitInit.h |   19 +++
 ios/source/LibreOfficeKit.c |6 --
 3 files changed, 12 insertions(+), 15 deletions(-)

New commits:
commit e25d7cc9052cddbaed24cea8a2ea88d8d785d083
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Jan 12 13:11:33 2018 +0100

iOS, removed hook reference

Change-Id: I9a9d9613313ac8d0e611f4d7f766c42ab71963e1

diff --git a/ios/source/LibreOfficeKit.c b/ios/source/LibreOfficeKit.c
index e9344ca89a2c..b403b356d171 100644
--- a/ios/source/LibreOfficeKit.c
+++ b/ios/source/LibreOfficeKit.c
@@ -18,12 +18,6 @@
 #include "native-code.h"
 
 
-// Force reference to libreofficekit_hook
-extern __attribute__((used))
-LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* 
user_profile_path);
-static __attribute__((used))
-LibreOfficeKit *(*foop)(const char *, const char *) = libreofficekit_hook_2;
-
 // pointers to our instance
 static LibreOfficeKit* kit;
 static LibreOfficeKitDocument* document;
commit 162ea65aae8addf606d62bd4cace5c9246002964
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Jan 12 13:08:59 2018 +0100

iOS, stop trying to do dynamic load in init()

LibreOfficeKit, tries traditionally to load a dylib, and
locate the symbols, for iOS this is already linked to a
single Kit.o.

Code is changed to a simple call

Change-Id: Ie94a447260cb3007e7e2b56c1b67896ad40d79d3

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index a0c111a9e0e2..f33a9868cf26 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -68,7 +68,6 @@ extern "C"
 {
 (void)pPath;
 }
-#endif // IOS
 
 static void *lok_dlsym(void *Hnd, const char *pName)
 {
@@ -79,6 +78,7 @@ extern "C"
 {
 return dlclose(Hnd);
 }
+#endif // IOS
 
 
 #else
@@ -165,12 +165,12 @@ extern "C"
 }
 #endif
 
+#if !defined(IOS)
 static void *lok_dlopen( const char *install_path, char ** _imp_lib )
 {
 char *imp_lib;
 void *dlhandle;
 
-#if !defined(IOS)
 size_t partial_length, imp_lib_size;
 struct stat dir_st;
 
@@ -233,14 +233,10 @@ static void *lok_dlopen( const char *install_path, char 
** _imp_lib )
 return NULL;
 }
 }
-#else
-(void)install_path;
-imp_lib = strdup("the app executable");
-dlhandle = RTLD_MAIN_ONLY;
-#endif
 *_imp_lib = imp_lib;
 return dlhandle;
 }
+#endif
 
 typedef LibreOfficeKit *(LokHookFunction)( const char *install_path);
 
@@ -248,10 +244,14 @@ typedef LibreOfficeKit *(LokHookFunction2)( const char 
*install_path, const char
 
 typedef int (LokHookPreInit)  ( const char *install_path, const 
char *user_profile_url );
 
+extern __attribute__ ((visibility("default")))
+LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const 
char* user_profile_path);
+
 static LibreOfficeKit *lok_init_2( const char *install_path,  const char 
*user_profile_url )
 {
-char *imp_lib;
+#if !defined(IOS)
 void *dlhandle;
+char *imp_lib;
 LokHookFunction *pSym;
 LokHookFunction2 *pSym2;
 
@@ -288,6 +288,9 @@ static LibreOfficeKit *lok_init_2( const char 
*install_path,  const char *user_p
 // dlhandle is "leaked"
 // coverity[leaked_storage]
 return pSym2( install_path, user_profile_url );
+#else
+return libreofficekit_hook_2( install_path, user_profile_url );
+#endif
 }
 
 static
commit 433063362df51e4b3e128f3c913070629793f148
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Jan 12 13:06:37 2018 +0100

iOS, correct rc file name

the rc is called fundamentalrc and not sofficerc

Now it is getting loaded.

Change-Id: Id0aab9609f8499e194b21e2d8afa74525a5a1c62

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 7b97d1beeca0..99c3f997ae68 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3438,7 +3438,7 @@ static bool initialize_uno(const OUString& aAppProgramURL)
 {
 #ifdef IOS
 // For iOS we already hardcode the inifile as "rc" in the .app directory.
-rtl::Bootstrap::setIniFilename(aAppProgramURL + "/" 
SAL_CONFIGFILE("soffice"));
+rtl::Bootstrap::setIniFilename(aAppProgramURL + "/" 
SAL_CONFIGFILE("fundamental"));
 xContext = cppu::defaultBootstrap_InitialComponentContext(aAppProgramURL + 
"/rc");
 #elif defined MACOSX
 rtl::Bootstrap::setIniFilename(aAppProgramURL + "/../Resources/" 
SAL_CONFIGFILE("soffice"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

is _lo_get_constructor_map and _lo_get_factory_map processor dependent ?

[jan iversen]

Hi

During today (updated master early evening) I started getting strange
linker errors:

When linking for ARM64 with or without debug I get:

Undefined symbols for architecture arm64:

  "_lo_get_constructor_map", referenced from:

  cppuhelper::detail::loadSharedLibComponentFactory(rtl::OUString
const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&,
rtl::OUString const&,
com::sun::star::uno::Reference
const&, std::__1::function*,
com::sun::star::uno::Reference*) in Kit.o

  "_lo_get_factory_map", referenced from:

  cppuhelper::detail::loadSharedLibComponentFactory(rtl::OUString
const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&,
rtl::OUString const&,
com::sun::star::uno::Reference
const&, std::__1::function*,
com::sun::star::uno::Reference*)


When I link for X86_64 it works fine.


It seems the 2 functions are defined in a number of fuzzer files, so maybe
they should not be referenced at all, and loadSharedLIbComponentFactory
should have an #ifdef


Any advice (or fix) is highly apriciated.


Thanks in advance
-- 
Sent from My iPad, sorry for any misspellings.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: ios/LibreOfficeLight

[jan Iversen]

 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj  |   
58 
 ios/LibreOfficeLight/LibreOfficeLight/AppDelegate.swift  |   
26 
 ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift   |  
177 ++-
 ios/LibreOfficeLight/LibreOfficeLight/DocumentTiledView.swift|  
229 +++
 ios/LibreOfficeLight/LibreOfficeLight/LOKit/AsyncUtil.swift  |   
92 +
 ios/LibreOfficeLight/LibreOfficeLight/LOKit/Document.swift   |  
589 ++
 ios/LibreOfficeLight/LibreOfficeLight/LOKit/LOKitThread.swift|  
287 
 ios/LibreOfficeLight/LibreOfficeLight/LOKit/LibreOfficeKitIOSTests.swift |  
102 +
 ios/LibreOfficeLight/LibreOfficeLight/LOKit/LibreOfficeKitWrapper.swift  |  
227 +++
 ios/LibreOfficeLight/LibreOfficeLight/LOKit/Util.swift   |   
43 
 ios/LibreOfficeLight/LibreOfficeLight/en.lproj/Main.storyboard   |   
63 -
 ios/LibreOfficeLight/LibreOfficeLight/lokit-Bridging-Header.h|
1 
 12 files changed, 1864 insertions(+), 30 deletions(-)

New commits:
commit dd51c589774a88010d78530fc6d152a9af98f095
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Jan 11 15:36:16 2018 +0100

iOS, Rendering document.

This patch is with thanks to Jon Nermut.

With this patch, the iPad renders documents as it should be
rendered

Change-Id: I54903fde3204b949d8c608842c004cd49a211d9a

diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 13b0a4675179..650895263ca6 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -33,6 +33,13 @@
39B091CE1E5F0BB800682A59 /* unorc in Resources */ = {isa = 
PBXBuildFile; fileRef = 39B08B9C1E5F0BB600682A59 /* unorc */; };
39E950531FC9842000D82C49 /* source in Resources */ = {isa = 
PBXBuildFile; fileRef = 39E950521FC9842000D82C49 /* source */; };
39EF4E2F1FA500C9001914AC /* PropertiesController.swift in 
Sources */ = {isa = PBXBuildFile; fileRef = 39EF4E2E1FA500C9001914AC /* 
PropertiesController.swift */; };
+   FCC2E3FA2004A01500CEB504 /* Document.swift in Sources */ = {isa 
= PBXBuildFile; fileRef = FCC2E3F62004A01400CEB504 /* Document.swift */; };
+   FCC2E3FC2004A01500CEB504 /* LibreOfficeKitWrapper.swift in 
Sources */ = {isa = PBXBuildFile; fileRef = FCC2E3F82004A01400CEB504 /* 
LibreOfficeKitWrapper.swift */; };
+   FCC2E3FD2004A01500CEB504 /* LOKitThread.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = FCC2E3F92004A01400CEB504 /* LOKitThread.swift 
*/; };
+   FCC2E3FF2004B59B00CEB504 /* DocumentTiledView.swift in Sources 
*/ = {isa = PBXBuildFile; fileRef = FCC2E3FE2004B59B00CEB504 /* 
DocumentTiledView.swift */; };
+   FCC2E4012004B65E00CEB504 /* example.odt in Resources */ = {isa 
= PBXBuildFile; fileRef = FCC2E4002004B65E00CEB504 /* example.odt */; };
+   FCC2E4032004B72700CEB504 /* Util.swift in Sources */ = {isa = 
PBXBuildFile; fileRef = FCC2E4022004B72700CEB504 /* Util.swift */; };
+   FCC2E4052004B74000CEB504 /* AsyncUtil.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = FCC2E4042004B74000CEB504 /* AsyncUtil.swift */; 
};
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -68,7 +75,13 @@
39E950521FC9842000D82C49 /* source */ = {isa = 
PBXFileReference; lastKnownFileType = folder; name = source; path = ../source; 
sourceTree = ""; };
39EE81531FA644E800B73AB8 /* Info.plist */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = 
Info.plist; sourceTree = ""; };
39EF4E2E1FA500C9001914AC /* PropertiesController.swift */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.swift; path = PropertiesController.swift; sourceTree = ""; };
-   39FF0D4C200681F300A3657D /* LibreOfficeKitInit.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = 
LibreOfficeKitInit.h; path = ../../include/LibreOfficeKit/LibreOfficeKitInit.h; 
sourceTree = ""; };
+   FCC2E3F62004A01400CEB504 /* Document.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= Document.swift; sourceTree = ""; };
+   FCC2E3F82004A01400CEB504 /* LibreOfficeKitWrapper.swift */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.swift; path = LibreOfficeKitWrapper.swift; sourceTree = ""; };
+   FCC2E3F92004A01400CEB504 /* LOKitThread.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path 
= LOKitThread.swift; sourceTree = ""; };
+

[Libreoffice-commits] core.git: ios/LibreOfficeLight

[jan Iversen]

 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |4 
 ios/LibreOfficeLight/LibreOfficeLight/dummyLOkit.c  |   64 
--
 2 files changed, 2 insertions(+), 66 deletions(-)

New commits:
commit d2d5f9665e298d4bfec1bc0c726827bf8247b47f
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Jan 11 09:15:33 2018 +0100

iOS, removed dummyLOkit

dummyLOkit was only usefull to speed up UI test, due to slow
linking, so it is no longer needed.

Change-Id: Ib9e2cf259aaa7df4dab21d346e4283cb6ce81dd0

diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index e3a115d66c4b..13b0a4675179 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -40,7 +40,6 @@
39022C1C1EDC2A2C00100066 /* services */ = {isa = 
PBXFileReference; lastKnownFileType = folder; name = services; path = 
../generated/resources/services; sourceTree = ""; };
39022C1E1EDC2AB000100066 /* share */ = {isa = PBXFileReference; 
lastKnownFileType = folder; name = share; path = ../generated/resources/share; 
sourceTree = ""; };
39022C201EDC2D0800100066 /* icudt60l.dat */ = {isa = 
PBXFileReference; lastKnownFileType = file; name = icudt60l.dat; path = 
../generated/resources/icudt60l.dat; sourceTree = ""; };
-   39284DB01FA5E150006F43E4 /* dummyLOkit.c */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.c; path = dummyLOkit.c; 
sourceTree = ""; };
39284DB21FA5F207006F43E4 /* DocumentActions.swift */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.swift; path = 
DocumentActions.swift; sourceTree = ""; };
392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name 
= ViewPrintManager.swift; path = LibreOfficeLight/ViewPrintManager.swift; 
sourceTree = SOURCE_ROOT; };
393975771F8BECB0002DC80B /* libiconv.tbd */ = {isa = 
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; 
name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
@@ -69,6 +68,7 @@
39E950521FC9842000D82C49 /* source */ = {isa = 
PBXFileReference; lastKnownFileType = folder; name = source; path = ../source; 
sourceTree = ""; };
39EE81531FA644E800B73AB8 /* Info.plist */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = 
Info.plist; sourceTree = ""; };
39EF4E2E1FA500C9001914AC /* PropertiesController.swift */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.swift; path = PropertiesController.swift; sourceTree = ""; };
+   39FF0D4C200681F300A3657D /* LibreOfficeKitInit.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = 
LibreOfficeKitInit.h; path = ../../include/LibreOfficeKit/LibreOfficeKitInit.h; 
sourceTree = ""; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -101,6 +101,7 @@
3956B72D1FAB3DBF00BF5DE4 /* extra */ = {
isa = PBXGroup;
children = (
+   39FF0D4C200681F300A3657D /* 
LibreOfficeKitInit.h */,
39E950521FC9842000D82C49 /* source */,
3975A8C91FBD70EE00A87B3A /* LibreOfficeKit.h */,
);
@@ -143,7 +144,6 @@
children = (
39EE81531FA644E800B73AB8 /* Info.plist */,
39503A6F1F94C4AC00F19C78 /* 
lokit-Bridging-Header.h */,
-   39284DB01FA5E150006F43E4 /* dummyLOkit.c */,
397E08FD1E597BD8001374E0 /* AppDelegate.swift 
*/,
3992D8591E5B762A00BEA987 /* 
DocumentController.swift */,
39284DB21FA5F207006F43E4 /* 
DocumentActions.swift */,
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/dummyLOkit.c 
b/ios/LibreOfficeLight/LibreOfficeLight/dummyLOkit.c
deleted file mode 100644
index 309d00506cf3..
--- a/ios/LibreOfficeLight/LibreOfficeLight/dummyLOkit.c
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// This file is part of the LibreOffice project.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-//
-#include "lokit-Bridging-Header.h"
-
-
-
-// replaces LibreOfficeKit and thereby reducing turn around time, which is
-// favorized while wor

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_prelink.mk

[jan Iversen]

 ios/CustomTarget_iOS_prelink.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 6cbea52dd0123cd9d15f901280a1e1a7517e88e5
Author: jan Iversen <j...@libreoffice.org>
Date:   Wed Jan 10 17:25:45 2018 +0100

iOS, missed remove debug line

Change-Id: I018f733cd2697f9b8456c6e4d720817d612b341b

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index d15189b7738d..d7834cac50b3 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -43,7 +43,6 @@ IOSPREBUILD: FORCE
 
 
 $(IOSKIT).dylib: IOSPREBUILD $(WORKDIR)/ios $(call 
gb_StaticLibrary_get_target,iOS_kitBridge) $(IOSLIBS)
-   echo "JAN" $(IOSLIBS)
$(IOSLD) -r -ios_version_min $(IOS_DEPLOYMENT_VERSION) \
-syslibroot $(MACOSX_SDK_PATH) \
-arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_prelink.mk ios/LibreOfficeLight

[jan Iversen]

 ios/CustomTarget_iOS_prelink.mk |5 +++--
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |   10 
--
 2 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 7590db54ea9572a3f341a5ecf67e6648560f60d6
Author: jan Iversen <j...@libreoffice.org>
Date:   Wed Jan 10 17:20:29 2018 +0100

iOS, update to compile app

The dylib reference was wrong, when starting from scratch

Change-Id: I88f1a2bf5634683d3d13faa71a1aa8c039f0c472

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index d105c135e76b..d15189b7738d 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -42,7 +42,8 @@ IOSPREBUILD: FORCE
 
 
 
-$(IOSKIT).dylib: $(WORKDIR)/ios $(call 
gb_StaticLibrary_get_target,iOS_kitBridge) $(IOSLIBS)
+$(IOSKIT).dylib: IOSPREBUILD $(WORKDIR)/ios $(call 
gb_StaticLibrary_get_target,iOS_kitBridge) $(IOSLIBS)
+   echo "JAN" $(IOSLIBS)
$(IOSLD) -r -ios_version_min $(IOS_DEPLOYMENT_VERSION) \
-syslibroot $(MACOSX_SDK_PATH) \
-arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
@@ -71,7 +72,7 @@ $(IOSKIT).dylib: $(WORKDIR)/ios $(call 
gb_StaticLibrary_get_target,iOS_kitBridge
-single_module \
-compatibility_version 1 \
-current_version 1 \
-   $(IOSKIT).a \
+   $(IOSOBJ) \
-o $(IOSKIT).dylib
 ifeq ($(origin IOS_CODEID),undefined)
@echo "please define environment variable IOS_CODEID as\n" \
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 5134985d5b18..e3a115d66c4b 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -16,7 +16,7 @@
393975781F8BECB0002DC80B /* libiconv.tbd in Frameworks */ = 
{isa = PBXBuildFile; fileRef = 393975771F8BECB0002DC80B /* libiconv.tbd */; };
3939757A1F8BECC1002DC80B /* libz.tbd in Frameworks */ = {isa = 
PBXBuildFile; fileRef = 393975791F8BECC1002DC80B /* libz.tbd */; };
39503A751F94D44900F19C78 /* libc++.tbd in Frameworks */ = {isa 
= PBXBuildFile; fileRef = 39503A741F94D44900F19C78 /* libc++.tbd */; };
-   396C833F1FC9D89E008E662A /* libKit_X86_64_debug.dylib in 
Frameworks */ = {isa = PBXBuildFile; fileRef = 396C833E1FC9D89D008E662A /* 
libKit_X86_64_debug.dylib */; };
+   396C833F1FC9D89E008E662A /* libKit.dylib in Frameworks */ = 
{isa = PBXBuildFile; fileRef = 396C833E1FC9D89D008E662A /* libKit.dylib */; };
396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */ = 
{isa = PBXBuildFile; fileRef = 396F92F61E7AE62400A28C82 /* Settings.bundle */; 
};
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = 
{isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; 
};
397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = 397E08FD1E597BD8001374E0 /* AppDelegate.swift 
*/; };
@@ -47,7 +47,7 @@
393975791F8BECC1002DC80B /* libz.tbd */ = {isa = 
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; 
name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
39503A6F1F94C4AC00F19C78 /* lokit-Bridging-Header.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
"lokit-Bridging-Header.h"; sourceTree = ""; };
39503A741F94D44900F19C78 /* libc++.tbd */ = {isa = 
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; 
name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
-   396C833E1FC9D89D008E662A /* libKit_X86_64_debug.dylib */ = {isa 
= PBXFileReference; lastKnownFileType = archive.ar; name = 
libKit_X86_64_debug.dylib; path = ../generated/libKit_X86_64_debug.dylib; 
sourceTree = ""; };
+   396C833E1FC9D89D008E662A /* libKit.dylib */ = {isa = 
PBXFileReference; lastKnownFileType = archive.ar; name = libKit.dylib; path = 
../generated/simulator/libKit.dylib; sourceTree = ""; };
396F92F61E7AE62400A28C82 /* Settings.bundle */ = {isa = 
PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = 
Settings.bundle; sourceTree = ""; };
397275391E77D9F1006ACDCC /* LibreOfficeLight.entitlements */ = 
{isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = 
LibreOfficeLight.entitlements; sourceTree = ""; };
3975A8C91FBD70EE00A87B3A /* LibreOfficeKit.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; name = LibreOfficeKit.h; 
path = ..

[Libreoffice-commits] core.git: 3 commits - desktop/source ios/CustomTarget_iOS_prelink.mk ios/CustomTarget_iOS_setup.mk ios/source

[jan Iversen]

 desktop/source/lib/init.cxx |7 ---
 ios/CustomTarget_iOS_prelink.mk |   37 +++--
 ios/CustomTarget_iOS_setup.mk   |   39 ---
 ios/source/LibreOfficeKit.c |6 --
 4 files changed, 63 insertions(+), 26 deletions(-)

New commits:
commit d9bde4c6af35beca7be6da93834fc56a6c1bf753
Author: jan Iversen <j...@libreoffice.org>
Date:   Wed Jan 10 14:20:19 2018 +0100

iOS, corrected path in LO

Patch thanks to Jon Nermut.

LO looked in the wrong directories on iOS

Change-Id: I8a9c019f7443445b780bc2ce1c77c998f74239e8

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ae0a99b8424f..7b97d1beeca0 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3438,14 +3438,15 @@ static bool initialize_uno(const OUString& 
aAppProgramURL)
 {
 #ifdef IOS
 // For iOS we already hardcode the inifile as "rc" in the .app directory.
-(void) aAppProgramURL;
+rtl::Bootstrap::setIniFilename(aAppProgramURL + "/" 
SAL_CONFIGFILE("soffice"));
+xContext = cppu::defaultBootstrap_InitialComponentContext(aAppProgramURL + 
"/rc");
 #elif defined MACOSX
 rtl::Bootstrap::setIniFilename(aAppProgramURL + "/../Resources/" 
SAL_CONFIGFILE("soffice"));
+xContext = cppu::defaultBootstrap_InitialComponentContext();
 #else
 rtl::Bootstrap::setIniFilename(aAppProgramURL + "/" 
SAL_CONFIGFILE("soffice"));
-#endif
-
 xContext = cppu::defaultBootstrap_InitialComponentContext();
+#endif
 
 if (!xContext.is())
 {
diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 91fd2a0cfe33..9b7986cfda46 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -67,10 +67,10 @@ $(IOSGEN)/native-code.h: $(WORKDIR)/ios 
$(BUILDDIR)/config_host.mk \
 
# Set up fundamentalrc, unorc, bootstraprc and versionrc.
(echo '[Bootstrap]' \
-&& echo 'BRAND_BASE_DIR=$${ORIGIN}/..' \
-&& echo 'BRAND_INI_DIR=$${ORIGIN}' \
+&& echo 'BRAND_BASE_DIR=$$APP_DATA_DIR/..' \
+&& echo 'BRAND_INI_DIR=$$APP_DATA_DIR' \
 && echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \
-&& echo 'BRAND_SHARE_RESOURCE_SUBDIR=$(LIBO_SHARE_RESOURCE_FOLDER)' \
+&& echo '##BRAND_SHARE_RESOURCE_SUBDIR=$(LIBO_SHARE_RESOURCE_FOLDER)' \
 && echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry 
' \
    'res:$${BRAND_BASE_DIR}/registry' \
&& echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' \
commit e4f5c5cebbca1e1ceab0b4ab68031f275e46b504
Author: jan Iversen <j...@libreoffice.org>
Date:   Wed Jan 10 13:16:52 2018 +0100

iOS, reference to hook_2 wrong

Change-Id: I4f0051bac812969988b701383a9df7db96ce245e

diff --git a/ios/source/LibreOfficeKit.c b/ios/source/LibreOfficeKit.c
index 4ed3c919bafb..e9344ca89a2c 100644
--- a/ios/source/LibreOfficeKit.c
+++ b/ios/source/LibreOfficeKit.c
@@ -19,8 +19,10 @@
 
 
 // Force reference to libreofficekit_hook
-extern __attribute__((used)) void *libreofficekit_hook_2(const char *);
-static __attribute__((used)) void *(*foop)(const char *) = 
libreofficekit_hook_2;
+extern __attribute__((used))
+LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* 
user_profile_path);
+static __attribute__((used))
+LibreOfficeKit *(*foop)(const char *, const char *) = libreofficekit_hook_2;
 
 // pointers to our instance
 static LibreOfficeKit* kit;
commit ffd994298d62f86a36b00e98fd41c326e0e9bad0
Author: jan Iversen <j...@libreoffice.org>
Date:   Wed Jan 10 08:35:42 2018 +0100

iOS, catch library changes in make

Updated makefiles to be dependent on the static libs, ensuring
that iOS is rebuild when a core library changed.

Change-Id: I5ebd1d703eb9a3af0e284910cdc307dd62f4d3fc

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index fec4fd271511..d105c135e76b 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -6,16 +6,21 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #- Env 
+IOSLIB = ''
 IOSLD = 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
 IOSCLANG = 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
 IOSOBJ = $(WORKDIR)/CObject/ios/Kit.o
 
 ifeq ($(ENABLE_DEBUG),TRUE)
-IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.dylib
-IOSKIT2 = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.a
+ifeq ($(CPUNAME),X86_64)
+IOSKIT = $(IOSGEN)/simulator/libKit
 else
-IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)

[Libreoffice-commits] core.git: ios/source

[jan Iversen]

 ios/source/LibreOfficeKit.c |   11 ---
 ios/source/LibreOfficeKit.h |2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit da745e2f1440592bbf22edc00b29aac93e5ff7d4
Author: jan Iversen <j...@libreoffice.org>
Date:   Mon Jan 8 20:03:44 2018 +0100

iOS, add bridge function to expose kit pointer.

Change-Id: I534dc7e418c342d50762fbb69ae442a75610b278

diff --git a/ios/source/LibreOfficeKit.c b/ios/source/LibreOfficeKit.c
index 841c19ceff26..4ed3c919bafb 100644
--- a/ios/source/LibreOfficeKit.c
+++ b/ios/source/LibreOfficeKit.c
@@ -19,11 +19,11 @@
 
 
 // Force reference to libreofficekit_hook
-extern __attribute__((used)) void *libreofficekit_hook(const char *);
-static __attribute__((used)) void *(*foop)(const char *) = libreofficekit_hook;
+extern __attribute__((used)) void *libreofficekit_hook_2(const char *);
+static __attribute__((used)) void *(*foop)(const char *) = 
libreofficekit_hook_2;
 
 // pointers to our instance
-LibreOfficeKit* kit;
+static LibreOfficeKit* kit;
 static LibreOfficeKitDocument* document;
 
 
@@ -119,3 +119,8 @@ int BridgeLOkit_LeaveHipernate()
 return 0;
 }
 
+__attribute__((visibility("default")))
+LibreOfficeKit* BridgeLOkit_getLOK()
+{
+return kit;
+}
diff --git a/ios/source/LibreOfficeKit.h b/ios/source/LibreOfficeKit.h
index 0f5ca6edc95f..c4624371b347 100644
--- a/ios/source/LibreOfficeKit.h
+++ b/ios/source/LibreOfficeKit.h
@@ -29,6 +29,6 @@ int BridgeLOkit_LeaveHipernate(void);
 #include 
 #include 
 
-extern LibreOfficeKit* kit;
+LibreOfficeKit* BridgeLOkit_getLOK(void);
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - ios/CustomTarget_iOS_prelink.mk ios/LibreOfficeLight

[jan Iversen]

 ios/CustomTarget_iOS_prelink.mk |7 +
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |   14 
--
 2 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit cdfd99e27d4c72b43b8f36a6c62c86c68b463199
Author: jan Iversen <j...@libreoffice.org>
Date:   Mon Jan 8 15:36:51 2018 +0100

iOS, codesigning .dylib

.dylib can only be loaded if signed, so added
codesign to make

In order not to expose the code identity, this is added through
use of an environment variable IOS_CODESIGN

Change-Id: I03ee7a6f2bfa8493a08b3e90163ab6c68d3c94a9

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index affd32e5bf59..fec4fd271511 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -64,6 +64,13 @@ $(IOSKIT): $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o
$(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
`$(SRCDIR)/bin/lo-all-static-libs` \
-o $(IOSKIT)
+ifeq ($(origin IOS_CODEID),undefined)
+   @echo "please define environment variable IOS_CODEID as\n" \
+ "export IOS_CODEID="
+   @exit -1
+else
+   codesign -s "$(IOS_CODEID)" $(IOSKIT) 
+endif
 
 
 
commit ee3edd994597e751baa279b9cafc14c3db6e39f1
Author: jan Iversen <j...@libreoffice.org>
Date:   Mon Jan 8 13:41:29 2018 +0100

iOS, switched simulator to use .dylib

changed static lib to .dylib causing link times to be 1-2 seconds.

However .dylib have a "missing code signature".

Change-Id: I59e95444a0db5406075bc15360f0acb6ab08b65b

diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 08e146c58d8c..5134985d5b18 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -16,7 +16,7 @@
393975781F8BECB0002DC80B /* libiconv.tbd in Frameworks */ = 
{isa = PBXBuildFile; fileRef = 393975771F8BECB0002DC80B /* libiconv.tbd */; };
3939757A1F8BECC1002DC80B /* libz.tbd in Frameworks */ = {isa = 
PBXBuildFile; fileRef = 393975791F8BECC1002DC80B /* libz.tbd */; };
39503A751F94D44900F19C78 /* libc++.tbd in Frameworks */ = {isa 
= PBXBuildFile; fileRef = 39503A741F94D44900F19C78 /* libc++.tbd */; };
-   396C833F1FC9D89E008E662A /* libKit_X86_64_debug.a in Frameworks 
*/ = {isa = PBXBuildFile; fileRef = 396C833E1FC9D89D008E662A /* 
libKit_X86_64_debug.a */; };
+   396C833F1FC9D89E008E662A /* libKit_X86_64_debug.dylib in 
Frameworks */ = {isa = PBXBuildFile; fileRef = 396C833E1FC9D89D008E662A /* 
libKit_X86_64_debug.dylib */; };
396F92F71E7AE62400A28C82 /* Settings.bundle in Resources */ = 
{isa = PBXBuildFile; fileRef = 396F92F61E7AE62400A28C82 /* Settings.bundle */; 
};
397868D61E59A3EA007F9248 /* LaunchScreen.xib in Resources */ = 
{isa = PBXBuildFile; fileRef = 397868D81E59A3EA007F9248 /* LaunchScreen.xib */; 
};
397E08FE1E597BD8001374E0 /* AppDelegate.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = 397E08FD1E597BD8001374E0 /* AppDelegate.swift 
*/; };
@@ -47,8 +47,7 @@
393975791F8BECC1002DC80B /* libz.tbd */ = {isa = 
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; 
name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
39503A6F1F94C4AC00F19C78 /* lokit-Bridging-Header.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
"lokit-Bridging-Header.h"; sourceTree = ""; };
39503A741F94D44900F19C78 /* libc++.tbd */ = {isa = 
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; 
name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
-   396C833C1FC9D62B008E662A /* libtest.a */ = {isa = 
PBXFileReference; lastKnownFileType = archive.ar; name = libtest.a; path = 
../generated/libtest.a; sourceTree = ""; };
-   396C833E1FC9D89D008E662A /* libKit_X86_64_debug.a */ = {isa = 
PBXFileReference; lastKnownFileType = archive.ar; name = libKit_X86_64_debug.a; 
path = ../generated/libKit_X86_64_debug.a; sourceTree = ""; };
+   396C833E1FC9D89D008E662A /* libKit_X86_64_debug.dylib */ = {isa 
= PBXFileReference; lastKnownFileType = archive.ar; name = 
libKit_X86_64_debug.dylib; path = ../generated/libKit_X86_64_debug.dylib; 
sourceTree = ""; };
396F92F61E7AE62400A28C82 /* Settings.bundle */ = {isa = 
PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = 
Settings.bundle; sourceTree = ""; };
397275391E77D9F1006AC

[Libreoffice-commits] core.git: 2 commits - basic/Library_sb.mk basic/source ios/CustomTarget_iOS_prelink.mk

[jan Iversen]

 basic/Library_sb.mk  |4 ++--
 basic/source/runtime/basrdll.cxx |3 +++
 basic/source/sbx/sbxdate.cxx |7 +++
 basic/source/sbx/sbxscan.cxx |6 ++
 ios/CustomTarget_iOS_prelink.mk  |   26 --
 5 files changed, 34 insertions(+), 12 deletions(-)

New commits:
commit b9bfda051a4248a0e209fa9fa59a4bfe8a48b853
Author: jan Iversen <j...@libreoffice.org>
Date:   Mon Jan 8 11:53:31 2018 +0100

iOS, forgot make dependency.

and also added -Objc to allow use of NS functions.

Change-Id: I236cefa53f54531d035881768d2f99749dd00cea

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index a50a1209630b..affd32e5bf59 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -7,6 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #- Env 
 IOSLD = 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
+IOSCLANG = 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
 IOSOBJ = $(WORKDIR)/CObject/ios/Kit.o
 
 ifeq ($(ENABLE_DEBUG),TRUE)
@@ -31,7 +32,7 @@ $(call gb_CustomTarget_get_target,ios/iOS_prelink): $(IOSKIT)
 FORCE:
 
 
-$(IOSKIT):
+$(IOSKIT): $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o
$(IOSLD) -r -ios_version_min 11.2 \
-syslibroot $(MACOSX_SDK_PATH) \
-arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
@@ -40,28 +41,33 @@ $(IOSKIT):
`$(SRCDIR)/bin/lo-all-static-libs`
$(AR) -r $(IOSKIT2) $(IOSOBJ)
 
-   $(IOSLD) -dylib -ios_version_min $(IOS_DEPLOYMENT_VERSION) \
-   -syslibroot $(MACOSX_SDK_PATH) \
+   $(IOSCLANG) -dynamiclib 
-mios-simulator-version-min=$(IOS_DEPLOYMENT_VERSION) \
-arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
+   -isysroot $(MACOSX_SDK_PATH) \
+   -Xlinker -rpath -Xlinker @executable_path/Frameworks \
+   -Xlinker -rpath -Xlinker @loader_path/Frameworks \
+   -dead_strip \
+   -Xlinker -export_dynamic \
+   -Xlinker -no_deduplicate \
+   -Xlinker -objc_abi_version -Xlinker 2 \
+   -fobjc-link-runtime \
-framework CoreFoundation \
-framework CoreGraphics \
-framework CoreText \
+   -liconv \
-lc++ \
-   -lobjc \
-lz \
-   -liconv \
-lpthread \
-   -objc_abi_version 2 \
-   -rpath  @executable_path/Frameworks \
-   -rpath  @loader_path/Frameworks \
-   -export_dynamic \
-   -no_deduplicate \
+   -single_module \
+   -compatibility_version 1 \
+   -current_version 1 \
$(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
`$(SRCDIR)/bin/lo-all-static-libs` \
-o $(IOSKIT)
 
 
 
+
 #- clean ios  -
 $(call gb_CustomTarget_get_clean_target,ios/iOS_prelink):
rm -f $(IOSKIT) $(IOSKIT2)
commit ee4b074ce26029092d0e5f27c22a358abe101312
Author: jan Iversen <j...@libreoffice.org>
Date:   Mon Jan 8 11:52:17 2018 +0100

basic, solve link problems

When not using scripting, there were a number of
unresolved symbols. First aproach did not work, so this
commit is the more extensive.

Change-Id: Iaf78bde10d9a43862d58d1aa8f46b14aa075eddb

diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 88cae207b166..c1b47e27daa6 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -97,15 +97,15 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/props \
basic/source/runtime/stdobj \
basic/source/runtime/stdobj1 \
+   basic/source/runtime/runtime \
+   basic/source/classes/errobject \
 ))
 endif
 
 $(eval $(call gb_Library_add_exception_objects,sb,\
-   basic/source/classes/errobject \
basic/source/runtime/basrdll \
basic/source/runtime/methods \
basic/source/runtime/methods1 \
-   basic/source/runtime/runtime \
basic/source/classes/sbintern \
basic/source/sbx/sbxarray \
basic/source/sbx/sbxbool \
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index d84e3953284e..e7a639a5a069 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 struct BasicDLL::Impl
 {
@@ -85,6 +86,7 @@ void BasicDLL::BasicBreak()
 {
 BasicDLL* pThis = BASIC_DLL;
 DBG_ASSERT( pThis, "BasicDLL::EnableBreak: No instance yet!" );
+#if HAVE_FEATURE_SCRIPTING
 if ( pThis )
 {
 // bJustStopping: if there's someone pressing STOP like crazy umpteen 
times,
@@ -99,6 +101,7 @@ void BasicDLL::BasicBreak()

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_prelink.mk

[jan Iversen]

 ios/CustomTarget_iOS_prelink.mk |   27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 2d28107c294e72e69fa0ce4fc20bad9e11ef1118
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Jan 7 17:19:27 2018 +0100

iOS, create both static and dylib.

for now the dylib is experimental.

Change-Id: Id32e90a61b9695c0a73554db80b072a98234a9f5

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index 4ced2da31977..a50a1209630b 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -11,8 +11,10 @@ IOSOBJ = $(WORKDIR)/CObject/ios/Kit.o
 
 ifeq ($(ENABLE_DEBUG),TRUE)
 IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.dylib
+IOSKIT2 = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.a
 else
-IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME).a
+IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME).dylib
+IOSKIT2 = $(SRCDIR)/ios/generated/libKit_$(CPUNAME).a
 endif
 
 
@@ -29,9 +31,15 @@ $(call gb_CustomTarget_get_target,ios/iOS_prelink): $(IOSKIT)
 FORCE:
 
 
-$(IOSKIT): $(IOSOBJ)
-   $(SRCDIR)/bin/lo-all-static-libs > $(SRCDIR)/ios/generated/lib.list
-ifeq ($(ENABLE_DEBUG),TRUE)
+$(IOSKIT):
+   $(IOSLD) -r -ios_version_min 11.2 \
+   -syslibroot $(MACOSX_SDK_PATH) \
+   -arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
+   -o $(IOSOBJ) \
+   $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
+   `$(SRCDIR)/bin/lo-all-static-libs`
+   $(AR) -r $(IOSKIT2) $(IOSOBJ)
+
$(IOSLD) -dylib -ios_version_min $(IOS_DEPLOYMENT_VERSION) \
-syslibroot $(MACOSX_SDK_PATH) \
-arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
@@ -51,21 +59,12 @@ ifeq ($(ENABLE_DEBUG),TRUE)
$(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
`$(SRCDIR)/bin/lo-all-static-libs` \
-o $(IOSKIT)
-else
-   $(IOSLD) -r -ios_version_min 11.2 \
-   -syslibroot $(MACOSX_SDK_PATH) \
-   -arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
-   -o $(IOSOBJ) \
-   $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
-   `$(SRCDIR)/bin/lo-all-static-libs`
-   $(AR) -r $(IOSKIT) $(IOSOBJ)
-endif
 
 
 
 #- clean ios  -
 $(call gb_CustomTarget_get_clean_target,ios/iOS_prelink):
-   rm $(IOSKIT)
+   rm -f $(IOSKIT) $(IOSKIT2)
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - basic/Library_sb.mk ios/CustomTarget_iOS_prelink.mk svx/source sw/source vcl/source

[jan Iversen]

 basic/Library_sb.mk |2 +-
 ios/CustomTarget_iOS_prelink.mk |   30 +++---
 svx/source/svdraw/svdomedia.cxx |   10 ++
 svx/source/unodraw/unoshap4.cxx |   30 ++
 sw/source/uibase/app/swmodule.cxx   |2 ++
 vcl/source/opengl/OpenGLContext.cxx |4 
 6 files changed, 74 insertions(+), 4 deletions(-)

New commits:
commit 54cd9ab0e1051f78a5d23bfbeeaf400abfccafcc
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Jan 7 14:17:00 2018 +0100

iOS, first step towards use of .dylib

.dylib will shorten the swift link time with factors.

Change-Id: Icfbc649f058988580005fe66eb8c03d7b242fe2d

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index 1d1e54f703a2..4ced2da31977 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#  -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
@@ -10,7 +10,7 @@ IOSLD = 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoo
 IOSOBJ = $(WORKDIR)/CObject/ios/Kit.o
 
 ifeq ($(ENABLE_DEBUG),TRUE)
-IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.a
+IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.dylib
 else
 IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME).a
 endif
@@ -28,7 +28,30 @@ $(call gb_CustomTarget_get_target,ios/iOS_prelink): $(IOSKIT)
 .PHONY: FORCE
 FORCE:
 
-$(IOSKIT): $(call gb_StaticLibrary_get_target,iOS_kitBridge) FORCE
+
+$(IOSKIT): $(IOSOBJ)
+   $(SRCDIR)/bin/lo-all-static-libs > $(SRCDIR)/ios/generated/lib.list
+ifeq ($(ENABLE_DEBUG),TRUE)
+   $(IOSLD) -dylib -ios_version_min $(IOS_DEPLOYMENT_VERSION) \
+   -syslibroot $(MACOSX_SDK_PATH) \
+   -arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
+   -framework CoreFoundation \
+   -framework CoreGraphics \
+   -framework CoreText \
+   -lc++ \
+   -lobjc \
+   -lz \
+   -liconv \
+   -lpthread \
+   -objc_abi_version 2 \
+   -rpath  @executable_path/Frameworks \
+   -rpath  @loader_path/Frameworks \
+   -export_dynamic \
+   -no_deduplicate \
+   $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
+   `$(SRCDIR)/bin/lo-all-static-libs` \
+   -o $(IOSKIT)
+else
$(IOSLD) -r -ios_version_min 11.2 \
-syslibroot $(MACOSX_SDK_PATH) \
-arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
@@ -36,6 +59,7 @@ $(IOSKIT): $(call gb_StaticLibrary_get_target,iOS_kitBridge) 
FORCE
$(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
`$(SRCDIR)/bin/lo-all-static-libs`
$(AR) -r $(IOSKIT) $(IOSOBJ)
+endif
 
 
 
commit 1807d095b48889ce2b3a88d807124e51a38c73c2
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Jan 7 14:16:06 2018 +0100

vcl, added checks for HAVE_FEATURE_OPENGL

missing HAVE_FEATURE_OPENGL caused link errors

Change-Id: I1c44f9c9f729f351b6acf17ae60cd855b69394db

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 958c59925db2..886c8fbe80d3 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -32,6 +32,8 @@
 
 #include 
 
+#include 
+
 using namespace com::sun::star;
 
 #define MAX_FRAMEBUFFER_COUNT 30
@@ -505,8 +507,10 @@ rtl::Reference 
OpenGLContext::getVCLContext(bool bMakeIfNecessary
 if (pDefWindow)
 {
 // create our magic fallback window context.
+#if HAVE_FEATURE_OPENGL
 xContext = pDefWindow->GetGraphics()->GetOpenGLContext();
 assert(xContext.is());
+#endif
 }
 else
 xContext = pContext;
commit 54982d5fea21d9e81e1561a74fd341ddb0570c91
Author: jan Iversen <j...@libreoffice.org>
Date:   Sun Jan 7 13:16:25 2018 +0100

svx, check HAVE_FEATURE_AVMEDIA

unoshap4.cxx did not obey HAVE_FEATURE_AVMEDIA.

Change-Id: Id41cddd0a74c43819adc0b64c0dd84ae9d4f54ed

diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 974cf3b56300..bece1c68cece 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -308,8 +308,10 @@ void 
SdrMediaObj::SetInputStream(uno::Reference const& xStream
 if (bSuccess)
 {
 m_xImpl->m_pTempFile.reset(new MediaTempFile(tempFileURL));
+#if HAVE_FEATURE_AVMEDIA
 m_xImpl->m_MediaProperties.setURL(
 m_xImpl->m_LastFailedPkgURL, tempFileURL, "");
+#endif
 }
 m_xImpl->m_LastFailedPkgURL.clear(); // once only
 }
@@ -378,12 +380,16 @@ void SdrMediaObj::mediaPropertiesChanged( const 
::avmedia::MediaItem& rNewProper
 {
 m_xImpl->m_pTempFile.reset

[Libreoffice-commits] core.git: 2 commits - ios/CustomTarget_iOS_prelink.mk ios/source vcl/quartz

[jan Iversen]

 ios/CustomTarget_iOS_prelink.mk |6 ++
 ios/source/LibreOfficeKit.c |9 -
 ios/source/LibreOfficeKit.h |   14 ++
 vcl/quartz/salgdicommon.cxx |2 +-
 4 files changed, 21 insertions(+), 10 deletions(-)

New commits:
commit 1dd5f10c3c6e0189ada4ecd6d08beb4c5fd1d42d
Author: jan Iversen <j...@libreoffice.org>
Date:   Sat Jan 6 09:20:54 2018 +0100

iOS, correct DPIX calculation

Patch is thanks to Jon N.

Change-Id: Idba9ec9b32b144523f0e7da5f7273f6af9fdfd31

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 192bdc5aa47e..62b40f840bfc 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1542,7 +1542,7 @@ void AquaSalGraphics::GetResolution( sal_Int32& rDPIX, 
sal_Int32& rDPIY )
 rDPIX = mnRealDPIX;
 rDPIY = mnRealDPIY;
 #else
-rDPIX = rDPIY = 200; // FIXME
+rDPIX = rDPIY = 96;
 #endif
 }
 
commit 72db74239a0853df72f323e756d304cb3e5dae02
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Jan 5 22:53:57 2018 +0100

iOS, allow calls to LibreOfficeKit from swift

Extended the bridge to include original LibreOfficeKit.h
as well as Kit pointer (set in init call)

Change-Id: I5e96f2706ac4d1ee897b977d3322bdc1b91f1a0b

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index 718a797f5a34..1d1e54f703a2 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -6,8 +6,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #- Env 
-IOSDEV = /Applications/Xcode.app/Contents/Developer/
-IOSLD = $(IOSDEV)Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
+IOSLD = 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
 IOSOBJ = $(WORKDIR)/CObject/ios/Kit.o
 
 ifeq ($(ENABLE_DEBUG),TRUE)
@@ -35,8 +34,7 @@ $(IOSKIT): $(call gb_StaticLibrary_get_target,iOS_kitBridge) 
FORCE
-arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
-o $(IOSOBJ) \
$(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
-   `$(SRCDIR)/bin/lo-all-static-libs` \
-   $(call gb_StaticLibrary_get_target,iOS_kitBridge)
+   `$(SRCDIR)/bin/lo-all-static-libs`
$(AR) -r $(IOSKIT) $(IOSOBJ)
 
 
diff --git a/ios/source/LibreOfficeKit.c b/ios/source/LibreOfficeKit.c
index cdd1c09a8ed5..841c19ceff26 100644
--- a/ios/source/LibreOfficeKit.c
+++ b/ios/source/LibreOfficeKit.c
@@ -7,14 +7,13 @@
 //
 #include 
 #include 
-#define LOK_USE_UNSTABLE_API
+#define LOK_USE_UNSTABLE_API 1
+#include "LibreOfficeKit.h"
+
 #include 
 
 #include 
 
-//#include 
-//#include 
-
 // generated by solenv/bin/native-code.py:
 #include "native-code.h"
 
@@ -24,7 +23,7 @@ extern __attribute__((used)) void *libreofficekit_hook(const 
char *);
 static __attribute__((used)) void *(*foop)(const char *) = libreofficekit_hook;
 
 // pointers to our instance
-static LibreOfficeKit* kit;
+LibreOfficeKit* kit;
 static LibreOfficeKitDocument* document;
 
 
diff --git a/ios/source/LibreOfficeKit.h b/ios/source/LibreOfficeKit.h
index 3c6498c06854..0f5ca6edc95f 100644
--- a/ios/source/LibreOfficeKit.h
+++ b/ios/source/LibreOfficeKit.h
@@ -18,3 +18,17 @@ int BridgeLOkit_open(const char *path);
 int BridgeLOkit_ClientCommand(const char *input);
 int BridgeLOkit_Hipernate(void);
 int BridgeLOkit_LeaveHipernate(void);
+
+
+// Use LOK_USE_UNSTABLE_API to get access to the low level
+// LibreOfficeKit.
+// REMARK: There are no guarantee these functions will work !!
+// REMARK: BridgeLOkit_Init MUST be called, NOT the original init()
+
+#ifdef LOK_USE_UNSTABLE_API
+#include 
+#include 
+
+extern LibreOfficeKit* kit;
+#endif
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_prelink.mk

[jan Iversen]

 ios/CustomTarget_iOS_prelink.mk |   21 ++---
 1 file changed, 6 insertions(+), 15 deletions(-)

New commits:
commit ed746579fec3da102c8b646cb24548cd3c084ca9
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Jan 5 13:21:15 2018 +0100

iOS, cherry-picked wrong version.

Reverting CustomTarget_iOS_prelink.mk to static lib version

Change-Id: I44d7441ce4284ed0551637a3827e93c2df369af9

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index ba8cc9dacb06..718a797f5a34 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -6,11 +6,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #- Env 
-IOSLD = 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
+IOSDEV = /Applications/Xcode.app/Contents/Developer/
+IOSLD = $(IOSDEV)Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
 IOSOBJ = $(WORKDIR)/CObject/ios/Kit.o
 
 ifeq ($(ENABLE_DEBUG),TRUE)
-IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.dylib
+IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.a
 else
 IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME).a
 endif
@@ -29,24 +30,14 @@ $(call gb_CustomTarget_get_target,ios/iOS_prelink): 
$(IOSKIT)
 FORCE:
 
 $(IOSKIT): $(call gb_StaticLibrary_get_target,iOS_kitBridge) FORCE
-#ifeq ($(ENABLE_DEBUG),TRUE)
-   $(IOSLD) -dylib -ios_version_min 11.2 \
+   $(IOSLD) -r -ios_version_min 11.2 \
-syslibroot $(MACOSX_SDK_PATH) \
-arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
-   -o $(IOSKIT) \
+   -o $(IOSOBJ) \
$(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
`$(SRCDIR)/bin/lo-all-static-libs` \
$(call gb_StaticLibrary_get_target,iOS_kitBridge)
-#else
-#  $(IOSLD) -r -ios_version_min 11.2 \
-#  -syslibroot $(MACOSX_SDK_PATH) \
-#  -arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
-#  -o $(IOSOBJ) \
-#  $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
-#  `$(SRCDIR)/bin/lo-all-static-libs` \
-#  $(call gb_StaticLibrary_get_target,iOS_kitBridge)
-#  $(AR) -r $(IOSKIT) $(IOSOBJ)
-#endif
+   $(AR) -r $(IOSKIT) $(IOSOBJ)
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOfficeLight / iOS

[jan iversen]

Hi

On 5 January 2018 at 06:35, Jon Nermut  wrote:

> Hi Jan,
> I've added the UIScrollView into the mix - you can now scroll and zoom and
> it's nicely re-rendering at higher res when zooming. It surprisingly good
> for a first cut. Havent tried it on device yet.
>
> One question - is there meant to be rendered page backgrounds/edges?
> Currently the entire background is white, with no page edges, so the pages
> kind of run into each other on a large doc.
>
My intention was to use the whole size for the text, to maximise that text
viewable, and thus no need for edges. However it would be nice if the
program has something like night settings as in iBook.

>
> The glitchiness problem on the tile edges was a wrong hardcoded DPI
> constant in salgdicommon.cxx:
>
> -rDPIX = rDPIY = 200; // FIXME
> +// This matches the default for VirtualDevice, and the calculations
> +// in the paint tile methods. (SwViewShell::PaintTile and elsewhere)
> +rDPIX = rDPIY = 96;
>
I will look into this as well

>
> I was compensating for this with a scaling of 2.0, which isn't exactly
> 200/96, hence the small problems at the tile edges.
>
> All good now, and fixing this meant less messing around with the scaling
> etc.
>

As you might have seen, I have made several commits on master, solving the
libassuan issue as well as other issues you reported, I am right now
working on the dylib and solar mutex issues.

rgds
jan I
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_prelink.mk

[jan Iversen]

 ios/CustomTarget_iOS_prelink.mk |   21 +++--
 1 file changed, 15 insertions(+), 6 deletions(-)

New commits:
commit 5c23224ca60abdf8d0e99010ea1066474b57d396
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Jan 5 08:55:11 2018 +0100

iOS, removed unused declaration

Change-Id: I8867048756a0484d1b75515335f3a2002f128e6d

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index 718a797f5a34..ba8cc9dacb06 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -6,12 +6,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #- Env 
-IOSDEV = /Applications/Xcode.app/Contents/Developer/
-IOSLD = $(IOSDEV)Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
+IOSLD = 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
 IOSOBJ = $(WORKDIR)/CObject/ios/Kit.o
 
 ifeq ($(ENABLE_DEBUG),TRUE)
-IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.a
+IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.dylib
 else
 IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME).a
 endif
@@ -30,14 +29,24 @@ $(call gb_CustomTarget_get_target,ios/iOS_prelink): 
$(IOSKIT)
 FORCE:
 
 $(IOSKIT): $(call gb_StaticLibrary_get_target,iOS_kitBridge) FORCE
-   $(IOSLD) -r -ios_version_min 11.2 \
+#ifeq ($(ENABLE_DEBUG),TRUE)
+   $(IOSLD) -dylib -ios_version_min 11.2 \
-syslibroot $(MACOSX_SDK_PATH) \
-arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
-   -o $(IOSOBJ) \
+   -o $(IOSKIT) \
$(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
`$(SRCDIR)/bin/lo-all-static-libs` \
$(call gb_StaticLibrary_get_target,iOS_kitBridge)
-   $(AR) -r $(IOSKIT) $(IOSOBJ)
+#else
+#  $(IOSLD) -r -ios_version_min 11.2 \
+#  -syslibroot $(MACOSX_SDK_PATH) \
+#  -arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
+#  -o $(IOSOBJ) \
+#  $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
+#  `$(SRCDIR)/bin/lo-all-static-libs` \
+#  $(call gb_StaticLibrary_get_target,iOS_kitBridge)
+#  $(AR) -r $(IOSKIT) $(IOSOBJ)
+#endif
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/LibreOfficeLight

[jan Iversen]

 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |   12 
+-
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 007e0bb010014619396e9fd8cd5a47203016cbbf
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Jan 4 23:16:33 2018 +0100

iOS, bump LibreOfficeLight to 11.2

Change-Id: Idd7737d2d4494a336ce8592c773a07055908646c

diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 2aec9e56f8a1..08e146c58d8c 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -355,7 +355,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(inherited)";
-   IPHONEOS_DEPLOYMENT_TARGET = 11.1;
+   IPHONEOS_DEPLOYMENT_TARGET = 11.2;
LD_MAP_FILE_PATH = "";
LIBRARY_SEARCH_PATHS = 
$PROJECT_DIR/../generated/;
MACH_O_TYPE = mh_execute;
@@ -418,7 +418,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(inherited)";
-   IPHONEOS_DEPLOYMENT_TARGET = 11.1;
+   IPHONEOS_DEPLOYMENT_TARGET = 11.2;
LD_MAP_FILE_PATH = "";
LIBRARY_SEARCH_PATHS = 
$PROJECT_DIR/../generated/;
MACH_O_TYPE = mh_execute;
@@ -452,7 +452,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
-   IPHONEOS_DEPLOYMENT_TARGET = 11.1;
+   IPHONEOS_DEPLOYMENT_TARGET = 11.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) 
@executable_path/Frameworks";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
@@ -481,7 +481,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = 
"LibreOfficeLight/LibreOfficeLight-Prefix.pch";
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
-   IPHONEOS_DEPLOYMENT_TARGET = 11.1;
+   IPHONEOS_DEPLOYMENT_TARGET = 11.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) 
@executable_path/Frameworks";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
@@ -545,7 +545,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(inherited)";
-   IPHONEOS_DEPLOYMENT_TARGET = 11.1;
+   IPHONEOS_DEPLOYMENT_TARGET = 11.2;
LD_MAP_FILE_PATH = "";
LIBRARY_SEARCH_PATHS = 
$PROJECT_DIR/../generated/;
MACH_O_TYPE = mh_execute;
@@ -581,7 +581,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
-   IPHONEOS_DEPLOYMENT_TARGET = 11.1;
+   IPHONEOS_DEPLOYMENT_TARGET = 11.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) 
@executable_path/Frameworks";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - external/libmspub external/libqxp

[jan Iversen]

 external/libmspub/UnpackedTarball_libmspub.mk |2 ++
 external/libqxp/UnpackedTarball_libqxp.mk |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 90c22bf8a1e41cb6f4f8124f554e5efe081cc756
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Jan 4 22:54:55 2018 +0100

libqxp, add update of config.sub

Change-Id: I4999be84c45fa32d0ae6f62f667b2c7470972f49

diff --git a/external/libqxp/UnpackedTarball_libqxp.mk 
b/external/libqxp/UnpackedTarball_libqxp.mk
index 017b21d9f55c..8519e983d957 100644
--- a/external/libqxp/UnpackedTarball_libqxp.mk
+++ b/external/libqxp/UnpackedTarball_libqxp.mk
@@ -13,6 +13,8 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libqxp,$(QXP_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libqxp,0))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libqxp))
+
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libqxp, \
commit 7c026c92b6d03508ae9af9cf0313b809a4097212
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Jan 4 22:47:28 2018 +0100

libmspub, add update of config.sub

Change-Id: Ia843520afae808fc8ed7dec6ae017400720394e7

diff --git a/external/libmspub/UnpackedTarball_libmspub.mk 
b/external/libmspub/UnpackedTarball_libmspub.mk
index 57845333cb4e..5ea3053d6f69 100644
--- a/external/libmspub/UnpackedTarball_libmspub.mk
+++ b/external/libmspub/UnpackedTarball_libmspub.mk
@@ -17,6 +17,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmspub,\
 external/libmspub/ubsan.patch \
 ))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmspub))
+
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libmspub, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

[jan Iversen]

 ios/CustomTarget_iOS_setup.mk |   53 +++---
 1 file changed, 30 insertions(+), 23 deletions(-)

New commits:
commit 61ab976bff4195beb77b749791d4f368cc9b71ee
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Jan 4 19:29:58 2018 +0100

iOS added BRAND_* to fundamentalrc

Updated the content of fundamentalrc

Change-Id: I0e7ce7ffc8e61f572ad96f8c07872e41677cc421

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index b6796d5d4721..8b128d463580 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -46,35 +46,42 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/ios/CustomTarget_i
cp -R $(INSTDIR)/share/registry $(IOSRES)/share
 
# Set up rc, the "inifile". See getIniFileName_Impl().
-   echo '[Bootstrap]' > $(IOSRES)/rc
-   echo 'URE_BOOTSTRAP=file://$$APP_DATA_DIR/fundamentalrc' >> $(IOSRES)/rc
-   echo 'HOME=$$SYSUSERHOME' >> $(IOSRES)/rc
+   (echo '[Bootstrap]' \
+   && echo 'URE_BOOTSTRAP=file://$$APP_DATA_DIR/fundamentalrc' \
+   && echo 'HOME=$$SYSUSERHOME'  \
+   && echo '[Bootstrap]' \
+   ) > $(IOSRES)/rc
 
# Set up fundamentalrc, unorc, bootstraprc and versionrc.
-   file=$(IOSRES)/fundamentalrc; \
-   echo '[Bootstrap]'  >  
$(IOSRES)/fundamentalrc
-   echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/'>> 
$(IOSRES)/fundamentalrc
-   echo 'BRAND_BASE_DIR=file://$$APP_DATA_DIR' >> 
$(IOSRES)/fundamentalrc
-   echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry ' \
-'res:$${BRAND_BASE_DIR}/registry' >> $(IOSRES)/fundamentalrc
-   echo 'UNO_TYPES=file://$$APP_DATA_DIR/udkapi.rdb ' \
-'file://$$APP_DATA_DIR/offapi.rdb' >> $(IOSRES)/fundamentalrc
-   echo 'UNO_SERVICES=file://$$APP_DATA_DIR/services.rdb ' \
-'file://$$APP_DATA_DIR/services/services.rdb' >> 
$(IOSRES)/fundamentalrc
-   echo 'OSL_SOCKET_PATH=$$APP_DATA_DIR/cache' >> $(IOSRES)/fundamentalrc
+   (echo '[Bootstrap]' \
+&& echo 'BRAND_BASE_DIR=$${ORIGIN}/..' \
+&& echo 'BRAND_INI_DIR=$${ORIGIN}' \
+&& echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \
+&& echo 'BRAND_SHARE_RESOURCE_SUBDIR=$(LIBO_SHARE_RESOURCE_FOLDER)' \
+&& echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry 
' \
+   'res:$${BRAND_BASE_DIR}/registry' \
+   && echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' \
+   && echo 'UNO_TYPES=file://$$APP_DATA_DIR/udkapi.rdb ' \
+   'file://$$APP_DATA_DIR/offapi.rdb' \
+   && echo 'UNO_SERVICES=file://$$APP_DATA_DIR/services.rdb ' \
+   'file://$$APP_DATA_DIR/services/services.rdb' \
+   && echo 'OSL_SOCKET_PATH=$$APP_DATA_DIR/cache' \
+   ) > $(IOSRES)/fundamentalrc;
 
echo '[Bootstrap]' > $(IOSRES)/unorc
 
# bootstraprc must be in $BRAND_BASE_DIR/program
-   echo '[Bootstrap]' >  
$(IOSRES)/program/bootstraprc
-   echo 'InstallMode='   >> 
$(IOSRES)/program/bootstraprc
-   echo "ProductKey=LibreOffice $(PRODUCTVERSION)">> 
$(IOSRES)/program/bootstraprc
-   echo 'UserInstallation=$$SYSUSERHOME/userinstallation' >> 
$(IOSRES)/program/bootstraprc
-
-   echo '[Version]'>  $(IOSRES)/program/versionrc
-   echo 'AllLanguages=en-US'   >> $(IOSRES)/program/versionrc
-   echo 'BuildVersion='>> $(IOSRES)/program/versionrc
-   echo "buildid=$(BUILDID)"   >> $(IOSRES)/program/versionrc
+   (echo '[Bootstrap]' \
+   && echo 'InstallMode=' \
+   && echo "ProductKey=LibreOffice $(PRODUCTVERSION)" \
+   && echo 'UserInstallation=$$SYSUSERHOME/userinstallation' \
+   ) > $(IOSRES)/program/bootstraprc
+
+   (echo '[Version]' \
+   && echo 'AllLanguages=en-US' \
+   && echo 'BuildVersion=' \
+   && echo "buildid=$(BUILDID)" \
+   ) > $(IOSRES)/program/versionrc
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac distro-configs/LibreOfficeiOS.conf

[jan Iversen]

 configure.ac   |7 ++-
 distro-configs/LibreOfficeiOS.conf |   12 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 3584c954337a625c93dae692849a53b6793d5a1e
Author: jan Iversen <j...@libreoffice.org>
Date:   Thu Jan 4 18:17:43 2018 +0100

iOS disable gpgme

Disable gpgme called for passing parameters to configure, when called
internally (to generate config_build etc).

Update the distro-conf, with info on the different supported models

Change-Id: I884c8638bf7b1c9fbc8ea4bdaa4dfca019857f45

diff --git a/configure.ac b/configure.ac
index f125bd980be9..ce7598305e54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -633,6 +633,7 @@ darwin*) # Mac OS X or iOS
 AC_MSG_NOTICE([sanitized the PATH to $PATH])
 fi
 if test "$host_cpu" = "arm64" -o "$enable_ios_simulator" = "yes"; then
+build_for_ios=YES
 _os=iOS
 test_gtk=no
 test_cups=no
@@ -4379,6 +4380,7 @@ if test "$cross_compiling" = "yes"; then
 test $with_junit = no && sub_conf_opts="$sub_conf_opts --without-junit"
 test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts 
--with-external-tar=$TARFILE_LOCATION"
 test "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build" 
= "force" && sub_conf_opts="$sub_conf_opts --with-system-icu"
+test "$build_for_ios" = "YES" && sub_conf_opts="$sub_conf_opts 
build_for_ios=YES"
 sub_conf_opts="$sub_conf_opts $with_build_platform_configure_options"
 # Don't bother having configure look for stuff not needed for the build 
platform anyway
 ./configure \
@@ -10120,7 +10122,10 @@ fi
 AC_SUBST(ENABLE_PDFIUM)
 
 SYSTEM_GPGMEPP=
-if test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" = "WINNT" ; then
+
+if test "$build_for_ios" = "YES"; then
+AC_MSG_CHECKING([gpgmepp disabled due to iOS])
+elif test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" = "WINNT" ; then
 dnl ===
 dnl Check for system gpgme
 dnl ===
diff --git a/distro-configs/LibreOfficeiOS.conf 
b/distro-configs/LibreOfficeiOS.conf
index 2041cabe51a9..57080907e3d1 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -27,9 +27,17 @@
 --disable-python
 
 --without-tls
-
---enable-debug
 --enable-werror
 
+# iOS simulator (debug)
+#--enable-ios-simulator
+#--enable-debug
+
+# iOS Device (debug)
 #--enable-ios-simulator
+#--enable-debug
+#--host=arm64-apple-darwin
+
+# iOS Device (release)
 --host=arm64-apple-darwin
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOfficeLight / iOS

[jan iversen]

> Sorry for not being clear - please disable GPGME for iOS (for both
> build and host). It currently serves no useful purpose on that
> platform, and is certainly not necessary for building.
>

You were perfectly clear, and it is disabled for the iOS build (== host),
but the tools (build-tools) is done for MACOSX and at least svidl demands
libassuan, I will try to find a way to disable GPGME for MACOSX when cross
compiling.

thanks.
rgds
jan I.

>
> HTH,
>
> -- Thorsten
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_prelink.mk

[jan Iversen]

 ios/CustomTarget_iOS_prelink.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d09d90079c93f9364caa7157d0d47dac3047b3ab
Author: jan Iversen <j...@libreoffice.org>
Date:   Wed Jan 3 18:32:00 2018 +0100

iOS jump version for prelinking

Change-Id: I7dc7c3ef28ced1b80073dcb922454d3d057db452

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index c1f5cc79c2da..718a797f5a34 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -30,7 +30,7 @@ $(call gb_CustomTarget_get_target,ios/iOS_prelink): $(IOSKIT)
 FORCE:
 
 $(IOSKIT): $(call gb_StaticLibrary_get_target,iOS_kitBridge) FORCE
-   $(IOSLD) -r -ios_version_min 11.1 \
+   $(IOSLD) -r -ios_version_min 11.2 \
-syslibroot $(MACOSX_SDK_PATH) \
-arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
-o $(IOSOBJ) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOfficeLight / iOS

[jan iversen]

>
> Ah, for makefiles, use ENABLE_GPGMEPP to check if that's
> available. HAVE_FEATURE_GPGME is for source code, and defined in
> config_host/config_gpgme.h
>

 I have just checked my different build environments:

MACOS (works)

config_host.mk

export BUILD_TYPE=... LIBGPGERROR LIBASSUAN GPGMEPP ...

export ENABLE_GPGMEPP=TRUE


config_host/config_gpgme.h

#define HAVE_FEATURE_GPGME 1


All builds and works




iOS (tools build but cannot run due to missing libassuan dylib)


config_build.mk

export BUILD_TYPE=... LIBGPGERROR LIBASSUAN GPGMEPP ...

export ENABLE_GPGMEPP=TRUE


config_build/config_gpgme.h

#define HAVE_FEATURE_GPGME 1

config_host.mk

export BUILD_TYPE=... ... (no build of GPG related matters)

export ENABLE_GPGMEPP=


config_host/config_gpgme.h

#define HAVE_FEATURE_GPGME 0



This looks quite OK to me, but when building sfx2, I get the error that
svidl cannot load libassuan. The libassuan dylib exit in

workdir_for_build/UnpackedTarball/libassuan/src/.libs/libassuan.0.dylib


it does not exist in instdir_for_build. Do I need to do something special
in external/libassuan to copy it (I thought it worked automatically) ?


when I copy libassuan.0.dylib, libgpgme.11.dylib and libgpg-error.0.dylib
it works. I am confused because I see other dylib being copied
automatically.


Thanks in advance.

reds

Jan I.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: LibreOfficeLight / iOS

[jan iversen]

Manually adding BRAND_SHARE_SUBDIR=share

> to fundamentalrc allowed me to render a tile using the CGContext based
> code in the unit test, and save it to a png. Woohoo!
>
> I'm not sure where that should be added?
>
It is generated in iOS/CustomTarget_iOS_setup.mk line 54-64, once I get my
things to compile again, I will have a closer look.

rgds
jan I
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: LibreOfficeLight / iOS

[jan iversen]

libassuan is part of the gpg4libre subsystem, and rather certainly not
> useful on iOS. I suggest to disable that, like on Android (there's a
> feature check define now, HAVE_FEATURE_GPGME).
>

Thanks for the info, I can see HAVE_FEATURE_GPGME is being defined in
configure.ac, but it not declared in
config_host/config_features.h.in or config_host.mk.in

so it seems not to be available to clang or make ?

I cannot see how to disable it, I need to disable it both for iOS and for
cross-toolset (that runs on normal Mac).

My problem is svidl (part of cross-toolset), when called it tries to load
libassuan.

Funny thing is that when I build for MAC I have no problem.

Please advice me, how to disable GPGME for both build and host
configuration.

Thanks in advance.
rgds
jan I.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: LibreOfficeLight / iOS

[jan iversen]

Happy new year, very interesting work.

I have just updated my master, and now I see your problem with libassuan,
which I am trying to solve. It is being build locally but not copied to the
right place. I did a couple of commits yesterday to a.o. include your idea
on how to make LIBRARY_PATH relative, thanks for that.

> try the -r flag which is for prelinking. you can see that in the .mk file

> Couldn't get that to do anything. I also tried -flto=thin which supposedly
> can do incremental linking, but again little effect
>

Look in iOS/CustomTarget_iOS_prelink.mk, there you will find

$(IOSLD) -r -ios_version_min 11.1 \

-syslibroot $(MACOSX_SDK_PATH) \

-arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \

-o $(IOSOBJ) \

$(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \

`$(SRCDIR)/bin/lo-all-static-libs` \

$(call gb_StaticLibrary_get_target,iOS_kitBridge)

$(AR) -r $(IOSKIT) $(IOSOBJ)

which does prelinking (different from incremental linking). You can see it
generated and .o file, which is then put into an archive.


> Nah it would be very difficult if not impossible to get a swift Framework
> built through make - one thing that I've learnt in iOS development is don't
> fight XCode. You'ld end up just calling xcodebuild anyway, which still
> needs the project set up correctly.
>
??? xcode runs perfect on the command line, so I do not understand why you
say it is impossible.


>
>
* The linking of the framework takes just as long as the app did. But once
> you have it built, as long as you don't touch the framework, rebuilds of
> the app are fast
>
This is as expected. The framework is basically a dylib so of course
linking to that is a lot faster.

I am still not convinced making a framework is a better solution than just
linking a dylib directly, at least I do not see the advantages and at least
one disadvantage, one more xcode project to maintain.


> * It's only been tested on the simulator. Needs some more stuffing about
> to link the correct lib for device.
>

dylib works very well in the simulator, my first test on my iPad (iOS 11.2)
did not turn out very well. I am also looking into another problem, it
seems that the App Store, still only allows upload of statically linked

*** The way it's set up in the app at the moment with 3 schemes isn't as it
> should be - you should have just one scheme, and use Configuration is for
> debug/release, and platform/arch for simulator vs device. This will work ok
> in the app once the framework is configured to link the correct .a file.
> Which I will sort out if you move forward with this
>

The reason for using different schemes, is that the xcode doc recommends
it, and it make the use simpler, since you just have to select a scheme.

Why do you think just having 1 scheme is better ?


> * I built out the Swift wrappers to cover all of the LibreOfficeKit
> functions. Have a look at Document.swift in particular. The next step would
> be to make an extension of Document to make iOS friendly methods for eg
> rendering to a UIImage
>

It is a different approach, but one I like, we do however still need the C
file.



> * I tried to get a tile rendering both in the test and the app. No good.
>
> Firstly I was trying to pass a byte buffer to paintTile as per the method
> signature, but it force casts that param to a CGContextRef a couple of
> layers down...
> But even after creating one of those to render into a image, it crashes
> with an uncaught exception of type 
> com::sun::star::container::NoSuchElementException
> (see pic of stack trace below)
> Which took me deep into debugging core LibreOffice, which I didn't really
> want to be, and was a bit frustrating. Maybe I'm missing some init code, or
> passing the wrong params.
> Feels like it might be bitrot of this tiling code that was written as a
> POC in 2015 or so? I wonder when the last time it worked was. You mentioned
> that you couldn't get it working either?
>
My problem was more how to use the returned array in order to render it
effectively.

The paintTile code is used both in the android version (see core/android)
and the online (separate git repo), so it works.

You might have run into a problem with swift delivering a false type of
array.


> Anyway, I really think splitting into a Framework is the way to go - I
> think the rendering problems are probably independent of this.
> It provides a good separation between app and library, and makes the app
> be able to be pure swift.
> It would certainly make using LOK in another app much much easier, than
> trying to unpick the example app.
>
Which example app ?

The old example app have been removed because it was very outdated.

keep up the good work, I will get around to integrate part of it soon.

rgds
jan I.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org

[Libreoffice-commits] core.git: ios/LibreOfficeLight

[jan Iversen]

 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e33dbe2c8383cb55748753c68d551050a5c424ff
Author: jan Iversen <j...@libreoffice.org>
Date:   Sat Dec 30 19:43:23 2017 +0100

iOS, make LIBRARY path relative.

Patch based on suggestion from jon Nermut.

Change-Id: I91244ad839b2a7f532b45c0ca8b37228c2ff27b1

diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 5f7b1797d843..2aec9e56f8a1 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -357,7 +357,7 @@
HEADER_SEARCH_PATHS = "$(inherited)";
IPHONEOS_DEPLOYMENT_TARGET = 11.1;
LD_MAP_FILE_PATH = "";
-   LIBRARY_SEARCH_PATHS = 
/Users/jani/LO/core/ios/generated/;
+   LIBRARY_SEARCH_PATHS = 
$PROJECT_DIR/../generated/;
MACH_O_TYPE = mh_execute;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
@@ -420,7 +420,7 @@
HEADER_SEARCH_PATHS = "$(inherited)";
IPHONEOS_DEPLOYMENT_TARGET = 11.1;
LD_MAP_FILE_PATH = "";
-   LIBRARY_SEARCH_PATHS = 
/Users/jani/LO/core/ios/generated/;
+   LIBRARY_SEARCH_PATHS = 
$PROJECT_DIR/../generated/;
MACH_O_TYPE = mh_execute;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
@@ -547,7 +547,7 @@
HEADER_SEARCH_PATHS = "$(inherited)";
IPHONEOS_DEPLOYMENT_TARGET = 11.1;
LD_MAP_FILE_PATH = "";
-   LIBRARY_SEARCH_PATHS = 
/Users/jani/LO/core/ios/generated/;
+   LIBRARY_SEARCH_PATHS = 
$PROJECT_DIR/../generated/;
MACH_O_TYPE = mh_execute;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac README.md

[jan Iversen]

 README.md|4 ++--
 configure.ac |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9e7073e822d5f4d18e34df9b5a92bbc51493937e
Author: jan Iversen <j...@libreoffice.org>
Date:   Sat Dec 30 09:48:31 2017 +0100

iOS, bump version to 11.2

Change-Id: Ia24e872f138a78d3d585150e3cde78858de60b77

diff --git a/README.md b/README.md
index 9721813c23f1..1a91674665e7 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,8 @@ run and compile LibreOffice, also used by the TDF builds:
 * Runtime: RHEL 6 or CentOS 6
 * Build: GCC 4.8.1 or Clang
 * iOS (only for LibreOfficeKit):
-* Runtime: 11.0 (only support for newer i devices == 64 bit)
-* Build: Xcode 9.0 and iPhone SDK 11.1
+* Runtime: 11.2 (only support for newer i devices == 64 bit)
+* Build: Xcode 9.0 and iPhone SDK 11.2
 
 At least Clang 3.4.2 is known to be too old to pass the configure.ac check 
"whether $CXX supports
 C++17, C++14, or C++11" in its current form (due to the #pragma GCC diagnostic 
ignored "-Wpragmas"
diff --git a/configure.ac b/configure.ac
index b5a7b2b378d2..f125bd980be9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2858,7 +2858,7 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=11.1
+current_sdk_ver=11.2
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=$current_sdk_ver
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOfficeLight / iOS

[jan iversen]

try the -r flag which is for prelinking. you can see that in the .mk file

And of course a debug version contains tons of symbols in order for the
debugger to be able to do its work.


> iOS has allowed dylibs since iOS 8 and the introduction of Swift. In fact
> you can't produce a static lib with Swift, only a dylib.
> For our Pdfium wrapper we produce a static lib out of the Pdfium code
> itself, and link that in a framework project with the swift wrappers, to
> produce a dylib which is a swift module that can be imported into an app.
> Beside the linking benefits this then gives you a nice encapsulated library
> that is easy to consume from swift.
>
that was my first attempt but the apple developers said no, will try to
scan through the doc again.


> If I have time over the next couple of days I'll have a go at creating a
> framework to see if it does actually behave as I expect.
>
or a lot easier simply change the .mk to build a .dylib instead of the .a
thr .o file within both should be identical.

rgds
jan i

-- 
Sent from My iPad, sorry for any misspellings.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice