[Libreoffice-commits] core.git: 2 commits - external/libepubgen external/redland
David Tardon
dtardon at redhat.com
Wed Nov 8 19:19:42 UTC 2017
external/libepubgen/UnpackedTarball_libepubgen.mk | 2 --
external/libepubgen/libepubgen-ios.patch.1 | 21 ---------------------
external/redland/UnpackedTarball_raptor.mk | 3 ++-
external/redland/UnpackedTarball_rasqal.mk | 3 ++-
external/redland/UnpackedTarball_redland.mk | 7 +++++--
external/redland/raptor/iOS.patch.0 | 21 ---------------------
external/redland/rasqal/iOS.patch.0 | 21 ---------------------
external/redland/redland/iOS-libltdl.patch.0 | 21 ---------------------
external/redland/redland/iOS.patch.0 | 21 ---------------------
9 files changed, 9 insertions(+), 111 deletions(-)
New commits:
commit 679b3d92085b6114c5116f95f1f848b98a7f9610
Author: David Tardon <dtardon at redhat.com>
Date: Wed Nov 8 20:15:23 2017 +0100
redland: update autoconf configs the gbuild way
Change-Id: I8a46a2ee60bb028c7fd9edcfdcd389813498ba9b
diff --git a/external/redland/UnpackedTarball_raptor.mk b/external/redland/UnpackedTarball_raptor.mk
index daf4e0c64bca..517b11a3d14f 100644
--- a/external/redland/UnpackedTarball_raptor.mk
+++ b/external/redland/UnpackedTarball_raptor.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,raptor))
$(eval $(call gb_UnpackedTarball_set_tarball,raptor,$(RAPTOR_TARBALL),,redland))
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,raptor,build))
+
# configure generated files for MSVC
$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor2.h,external/redland/raptor/raptor2.h))
$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor_config.h,external/redland/raptor/raptor_config.h))
@@ -27,7 +29,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,raptor,\
external/redland/raptor/xml2-config.patch \
external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 \
external/redland/raptor/libtool.patch \
- external/redland/raptor/iOS.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/redland/UnpackedTarball_rasqal.mk b/external/redland/UnpackedTarball_rasqal.mk
index 5bd7fb803dc7..bb44f39a6f5a 100644
--- a/external/redland/UnpackedTarball_rasqal.mk
+++ b/external/redland/UnpackedTarball_rasqal.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,rasqal))
$(eval $(call gb_UnpackedTarball_set_tarball,rasqal,$(RASQAL_TARBALL),,redland))
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,rasqal,build))
+
# configure generated files for MSVC
$(eval $(call gb_UnpackedTarball_add_file,rasqal,src/rasqal.h,external/redland/rasqal/rasqal.h))
@@ -27,7 +29,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,rasqal,\
external/redland/rasqal/rpath.patch \
external/redland/rasqal/clang-cl.patch \
external/redland/rasqal/libtool.patch \
- external/redland/rasqal/iOS.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/redland/UnpackedTarball_redland.mk b/external/redland/UnpackedTarball_redland.mk
index 8a4e8f4617dc..66e766d20fee 100644
--- a/external/redland/UnpackedTarball_redland.mk
+++ b/external/redland/UnpackedTarball_redland.mk
@@ -11,6 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,redland))
$(eval $(call gb_UnpackedTarball_set_tarball,redland,$(REDLAND_TARBALL),,redland))
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,redland,\
+ build \
+ libltdl/config \
+))
+
# configure generated files for MSVC
$(eval $(call gb_UnpackedTarball_add_file,redland,src/librdf.h,external/redland/redland/librdf.h))
@@ -28,8 +33,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,redland,\
external/redland/redland/rpath.patch \
external/redland/redland/clang-cl.patch \
external/redland/redland/libtool.patch \
- external/redland/redland/iOS.patch.0 \
- external/redland/redland/iOS-libltdl.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/redland/raptor/iOS.patch.0 b/external/redland/raptor/iOS.patch.0
deleted file mode 100644
index ecd51db1b720..000000000000
--- a/external/redland/raptor/iOS.patch.0
+++ /dev/null
@@ -1,21 +0,0 @@
---- build/config.sub 2014-11-02 07:04:37.000000000 +0100
-+++ build/config.sub 2017-06-13 09:17:33.000000000 +0200
-@@ -259,7 +259,8 @@
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
-- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 \
-+ | avr | avr32 \
- | be32 | be64 \
- | bfin \
- | c4x | clipper \
-@@ -371,7 +372,7 @@
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- | avr-* | avr32-* \
- | be32-* | be64-* \
- | bfin-* | bs2000-* \
diff --git a/external/redland/rasqal/iOS.patch.0 b/external/redland/rasqal/iOS.patch.0
deleted file mode 100644
index 5d34175ef9cf..000000000000
--- a/external/redland/rasqal/iOS.patch.0
+++ /dev/null
@@ -1,21 +0,0 @@
---- build/config.sub 2014-03-17 03:39:35.000000000 +0100
-+++ build/config.sub 2017-06-13 09:44:04.000000000 +0200
-@@ -259,7 +259,8 @@
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
-- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 \
-+ | avr | avr32 \
- | be32 | be64 \
- | bfin \
- | c4x | clipper \
-@@ -371,7 +372,7 @@
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- | avr-* | avr32-* \
- | be32-* | be64-* \
- | bfin-* | bs2000-* \
diff --git a/external/redland/redland/iOS-libltdl.patch.0 b/external/redland/redland/iOS-libltdl.patch.0
deleted file mode 100644
index 6f26d591ace0..000000000000
--- a/external/redland/redland/iOS-libltdl.patch.0
+++ /dev/null
@@ -1,21 +0,0 @@
---- libltdl/config/config.sub 2013-06-09 22:45:46.000000000 +0200
-+++ libltdl/config/config.sub 2017-06-13 10:05:41.000000000 +0200
-@@ -259,7 +259,8 @@
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
-- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 \
-+ | avr | avr32 \
- | be32 | be64 \
- | bfin \
- | c4x | clipper \
-@@ -371,7 +372,7 @@
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- | avr-* | avr32-* \
- | be32-* | be64-* \
- | bfin-* | bs2000-* \
diff --git a/external/redland/redland/iOS.patch.0 b/external/redland/redland/iOS.patch.0
deleted file mode 100644
index facaa0c0ee77..000000000000
--- a/external/redland/redland/iOS.patch.0
+++ /dev/null
@@ -1,21 +0,0 @@
---- build/config.sub 2013-06-09 22:45:51.000000000 +0200
-+++ build/config.sub 2017-06-13 09:48:08.000000000 +0200
-@@ -259,7 +259,8 @@
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
-- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 \
-+ | avr | avr32 \
- | be32 | be64 \
- | bfin \
- | c4x | clipper \
-@@ -371,7 +372,7 @@
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
- | avr-* | avr32-* \
- | be32-* | be64-* \
- | bfin-* | bs2000-* \
commit 985f4d61b805e1407f1ddcdd1d90989e0049d022
Author: David Tardon <dtardon at redhat.com>
Date: Wed Nov 8 20:10:11 2017 +0100
drop obsolete patch
Change-Id: Iabcb334fc3304c1c77e8e77826f2b665cb4daf55
diff --git a/external/libepubgen/UnpackedTarball_libepubgen.mk b/external/libepubgen/UnpackedTarball_libepubgen.mk
index 312facb2bb11..0134768c57aa 100644
--- a/external/libepubgen/UnpackedTarball_libepubgen.mk
+++ b/external/libepubgen/UnpackedTarball_libepubgen.mk
@@ -18,8 +18,6 @@ epubgen_patches += libepubgen-validation3.patch.1
epubgen_patches += libepubgen-vc.patch.1
# Backport of <https://sourceforge.net/p/libepubgen/code/ci/2e9e9af9f49a78cca75d3c862c8dd4b5f7cc7eb2/> (and its deps).
epubgen_patches += libepubgen-epub3.patch.1
-# iOS patch to support arm64
-epubgen_patches += libepubgen-ios.patch.1
ifeq ($(COM_IS_CLANG),TRUE)
diff --git a/external/libepubgen/libepubgen-ios.patch.1 b/external/libepubgen/libepubgen-ios.patch.1
deleted file mode 100644
index 74ca30c47794..000000000000
--- a/external/libepubgen/libepubgen-ios.patch.1
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur libepubgen/config.sub libepubgen.new/config.sub
---- libepubgen/config.sub 2014-06-08 18:24:47.000000000 +0200
-+++ libepubgen.new/config.sub 2017-09-04 21:41:46.000000000 +0200
-@@ -257,7 +257,7 @@
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
- | arc \
-- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
- | avr | avr32 \
- | be32 | be64 \
- | bfin \
-@@ -370,7 +370,7 @@
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64* \
- | avr-* | avr32-* \
- | be32-* | be64-* \
- | bfin-* | bs2000-* \
More information about the Libreoffice-commits
mailing list