diff options
-rw-r--r-- | download.lst | 4 | ||||
-rw-r--r-- | external/libcdr/UnpackedTarball_libcdr.mk | 4 | ||||
-rw-r--r-- | external/libcdr/iOS.patch.0 | 20 |
3 files changed, 2 insertions, 26 deletions
diff --git a/download.lst b/download.lst index 864e8155714c..bdbc9c8446d5 100644 --- a/download.lst +++ b/download.lst @@ -16,8 +16,8 @@ export BZIP2_SHA256SUM := a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e29 export BZIP2_TARBALL := 00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz export CAIRO_SHA256SUM := d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20 export CAIRO_TARBALL := cairo-1.14.8.tar.xz -export CDR_SHA256SUM := 5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d -export CDR_TARBALL := libcdr-0.1.3.tar.bz2 +export CDR_SHA256SUM := e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d +export CDR_TARBALL := libcdr-0.1.4.tar.xz export CLUCENE_SHA256SUM := ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab export CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz export LIBCMIS_SHA256SUM := 6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk index 1e484bac2cfd..e3c218386f50 100644 --- a/external/libcdr/UnpackedTarball_libcdr.mk +++ b/external/libcdr/UnpackedTarball_libcdr.mk @@ -21,8 +21,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libcdr, \ endif endif -$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \ - external/libcdr/iOS.patch.0 \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/libcdr/iOS.patch.0 b/external/libcdr/iOS.patch.0 deleted file mode 100644 index 0b45ff304d1f..000000000000 --- a/external/libcdr/iOS.patch.0 +++ /dev/null @@ -1,20 +0,0 @@ ---- config.sub 2016-07-21 08:43:22.000000000 +0200 -+++ config.sub 2017-06-12 17:42:48.000000000 +0200 -@@ -253,7 +253,7 @@ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arceb \ -- | 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 \ -@@ -374,7 +374,7 @@ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ -- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \ - | avr-* | avr32-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ |