[Libreoffice-commits] core.git: 6 commits - basctl/Module_basctl.mk external/epoxy external/harfbuzz ios/experimental postprocess/Rdb_services.mk sd/Library_sd.mk solenv/bin xmlsecurity/Module_xmlsecurity.mk
Tor Lillqvist
tml at collabora.com
Thu Dec 15 14:50:27 UTC 2016
basctl/Module_basctl.mk | 4 +--
external/epoxy/Library_epoxy.mk | 2 -
external/harfbuzz/ExternalProject_harfbuzz.mk | 2 -
external/harfbuzz/UnpackedTarball_harfbuzz.mk | 4 +++
external/harfbuzz/harfbuzz-ios.patch | 11 +++++++++
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 12 +++++-----
postprocess/Rdb_services.mk | 4 +--
sd/Library_sd.mk | 2 -
solenv/bin/native-code.py | 2 -
xmlsecurity/Module_xmlsecurity.mk | 6 ++++-
10 files changed, 34 insertions(+), 15 deletions(-)
New commits:
commit 48e956e506b056eefcbf5c24a706b6152e7ea8b3
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Dec 15 16:43:43 2016 +0200
Try to fix Android and iOS build
Fix what probably is fallout from
a7c35729e00f18f79156b3f8f57472506f786074.
Just bypass all of xmlsecurity for Android and iOS. At least the iOS
demo app, TiledLibreOffice, builds then.
Change-Id: Ibc9486c0d67d1aeafa08932809b23ceeb9b5c2f3
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index cd95213..0c1614c 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -109,9 +109,9 @@ $(eval $(call gb_Rdb_add_components,services,\
xmloff/source/transform/xof \
xmloff/util/xo \
xmlscript/util/xmlscript \
- xmlsecurity/util/xmlsecurity \
- xmlsecurity/util/xsec_fw \
$(if $(filter-out ANDROID IOS,$(OS)), \
+ xmlsecurity/util/xmlsecurity \
+ xmlsecurity/util/xsec_fw \
xmlsecurity/util/xsec_xmlsec$(if $(filter WNT,$(OS)),.windows)) \
$(if $(ENABLE_COINMP), \
sccomp/source/solver/coinmpsolver \
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 7b3beea2..ae4bed4 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -94,7 +94,7 @@ $(eval $(call gb_Library_use_libraries,sd,\
ucbhelper \
utl \
vcl \
- xmlsecurity \
+ $(if $(filter-out ANDROID IOS,$(OS)),xmlsecurity) \
$(gb_UWINAPI) \
))
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index ef527e7..e2c7b69 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -48,7 +48,7 @@ core_factory_list = [
("libunordflo.a", "unordf_component_getFactory"),
("libunoxmllo.a", "unoxml_component_getFactory"),
("libutllo.a", "utl_component_getFactory"),
- ("libxmlsecurity.a", "xmlsecurity_component_getFactory"),
+ ("libxmlsecurity.a", "xmlsecurity_component_getFactory", "#if !defined ANDROID && !defined IOS"),
("libxoflo.a", "xof_component_getFactory"),
("libxolo.a", "xo_component_getFactory"),
("libxsec_xmlsec.a", "xsec_xmlsec_component_getFactory", "#if !defined ANDROID && !defined IOS"),
diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
index 6fdc86e..4f00c22 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -9,10 +9,12 @@
$(eval $(call gb_Module_Module,xmlsecurity))
+ifneq (,$(filter-out ANDROID IOS,$(OS)))
+
$(eval $(call gb_Module_add_targets,xmlsecurity,\
Library_xmlsecurity \
Library_xsec_fw \
- $(if $(filter-out ANDROID IOS,$(OS)),Library_xsec_xmlsec) \
+ Library_xsec_xmlsec \
))
$(eval $(call gb_Module_add_slowcheck_targets,xmlsecurity,\
@@ -45,4 +47,6 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\
endif
+endif
+
# vim: set noet sw=4 ts=4:
commit 86a553753170b20a03ac1038798c910ece95cbaf
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Dec 15 13:20:39 2016 +0200
Bump iOS version here, too
Change-Id: I60bf7a31e5a92a0b140404a7ad84c581ba1267e3
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 860299c..057d4c7 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -2387,7 +2387,7 @@
"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
);
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 9.3;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
SDKROOT = iphoneos;
@@ -2430,7 +2430,7 @@
"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
);
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 9.3;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
SDKROOT = iphoneos;
commit 8e1730b3d7b10de8cb0225b04e0dc64ceb5a6e60
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Dec 15 13:18:16 2016 +0200
We use ICU 58 now
Change-Id: I911c24c01937c25ad147992885a67852880c255d
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index f7ec7ef..860299c 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
- BE03BF9318F9A7CC00620DC7 /* icudt57l.dat in Resources */ = {isa = PBXBuildFile; fileRef = BE03BF9218F9A7CC00620DC7 /* icudt57l.dat */; };
+ BE03BF9318F9A7CC00620DC7 /* icudt58l.dat in Resources */ = {isa = PBXBuildFile; fileRef = BE03BF9218F9A7CC00620DC7 /* icudt58l.dat */; };
BE55B06D18D87CC600950228 /* DocumentTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BE55B06C18D87CC600950228 /* DocumentTableViewController.m */; };
BE82BD7618218E2E00A447B5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE82BD7518218E2E00A447B5 /* Foundation.framework */; };
BE82BD7818218E2E00A447B5 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE82BD7718218E2E00A447B5 /* CoreGraphics.framework */; };
@@ -39,7 +39,7 @@
/* Begin PBXFileReference section */
BE03BF9118F9648F00620DC7 /* udata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = udata.cpp; path = ../../../workdir/UnpackedTarball/icu/source/common/udata.cpp; sourceTree = "<group>"; };
- BE03BF9218F9A7CC00620DC7 /* icudt57l.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = icudt57l.dat; path = ../../../../workdir/UnpackedTarball/icu/source/data/in/icudt57l.dat; sourceTree = "<group>"; };
+ BE03BF9218F9A7CC00620DC7 /* icudt58l.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = icudt58l.dat; path = ../../../../workdir/UnpackedTarball/icu/source/data/in/icudt58l.dat; sourceTree = "<group>"; };
BE03BF9518FC1A1C00620DC7 /* xdictionary.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xdictionary.cxx; path = ../../../i18npool/source/breakiterator/xdictionary.cxx; sourceTree = "<group>"; };
BE0898E81860D42B0021A679 /* brand.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = brand.cxx; path = ../../../vcl/source/app/brand.cxx; sourceTree = "<group>"; };
BE0898E91860D42B0021A679 /* dbggui.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbggui.cxx; path = ../../../vcl/source/app/dbggui.cxx; sourceTree = "<group>"; };
@@ -2241,7 +2241,7 @@
BEEEFDFE1860A82C00FBDE67 /* unorc */,
BEEE02D01860ABB700FBDE67 /* services */,
BEEEF9691860A25400FBDE67 /* test1.odt */,
- BE03BF9218F9A7CC00620DC7 /* icudt57l.dat */,
+ BE03BF9218F9A7CC00620DC7 /* icudt58l.dat */,
);
name = Resources;
path = TiledLibreOffice;
@@ -2307,7 +2307,7 @@
BEEEFE041860A89100FBDE67 /* rc in Resources */,
BEEEFE051860A89100FBDE67 /* services.rdb in Resources */,
BEEE02D21860ABDB00FBDE67 /* share in Resources */,
- BE03BF9318F9A7CC00620DC7 /* icudt57l.dat in Resources */,
+ BE03BF9318F9A7CC00620DC7 /* icudt58l.dat in Resources */,
BEEEFE061860A89100FBDE67 /* udkapi.rdb in Resources */,
BEEEFE071860A89100FBDE67 /* unorc in Resources */,
BEEE02D31860ABDB00FBDE67 /* services in Resources */,
commit 3e973760b788c49396c7a18404bffa0505e65a04
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Dec 15 13:16:00 2016 +0200
Build HarfBuzz with CoreText support also for iOS
Change-Id: Id755894def35d59836dff8cff7df1273a8e296b2
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk
index ea0635d..dbd88de 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
--with-cairo=no \
--with-glib=no \
--with-graphite2=yes \
- $(if $(filter MACOSX,$(OS)),--with-coretext=yes) \
+ $(if $(filter IOS MACOSX,$(OS)),--with-coretext=yes) \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
CXXFLAGS=' \
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 7d408d2..888251f 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -24,4 +24,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
))
endif
+$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
+ external/harfbuzz/harfbuzz-ios.patch \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/harfbuzz-ios.patch b/external/harfbuzz/harfbuzz-ios.patch
new file mode 100644
index 0000000..2c8e7df
--- /dev/null
+++ b/external/harfbuzz/harfbuzz-ios.patch
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -19046,6 +19046,8 @@
+
+ else
+ # On iOS CoreText and CoreGraphics are stand-alone frameworks
++ # Forget the cache failure to find CTFontRef above
++ unset ac_cv_type_CTFontRef
+ if test "x$have_coretext" != "xtrue"; then
+ ac_fn_c_check_type "$LINENO" "CTFontRef" "ac_cv_type_CTFontRef" "#include <CoreText/CoreText.h>
+ "
commit 5ed995fabbd90cd4274b857f15fa153b3b3821ff
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Dec 15 11:00:14 2016 +0200
No EGL on iOS either
Change-Id: I44b935e2093a5b630f8009af939ce8e83413c35b
diff --git a/external/epoxy/Library_epoxy.mk b/external/epoxy/Library_epoxy.mk
index 10be001..16c19e2 100644
--- a/external/epoxy/Library_epoxy.mk
+++ b/external/epoxy/Library_epoxy.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_generated_cobjects,epoxy,\
UnpackedTarball/epoxy/src/dispatch_wgl \
UnpackedTarball/epoxy/src/wgl_generated_dispatch \
))
-else ifeq ($(OS),MACOSX)
+else ifneq ($(filter IOS MAXOSX,$(OS)),)
# nothing
else ifeq ($(OS),ANDROID)
$(eval $(call gb_Library_add_generated_cobjects,epoxy,\
commit 3099953097b4af3ae1f19c1c5d8417957b90e987
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Dec 15 09:35:20 2016 +0200
Fix iOS (and --disable-scripting in general?) build
Change-Id: I93b26283f7faa937a528c2e4806b3407348ed8b1
diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk
index 7d0901c..5fcc49f 100644
--- a/basctl/Module_basctl.mk
+++ b/basctl/Module_basctl.mk
@@ -29,12 +29,12 @@ $(eval $(call gb_Module_add_l10n_targets,basctl,\
AllLangResTarget_basctl \
))
-endif
-
$(eval $(call gb_Module_add_l10n_targets,basctl,\
UIConfig_basicide \
))
+endif
+
# screenshots
$(eval $(call gb_Module_add_screenshot_targets,basctl,\
CppunitTest_basctl_dialogs_test \
More information about the Libreoffice-commits
mailing list