diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-01-08 13:17:28 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-03-03 17:53:57 +0100 |
| commit | 36788e95fdbe96ac27c71197fdbfee178b53f52c (patch) | |
| tree | 31c45984896a72ee3c1aaaeca2a5ba0d1ad06104 /external/liborcus/UnpackedTarball_liborcus.mk | |
| parent | fdo#61320: Allow user to choose whether to create thumbnails inside odf. (diff) | |
| download | core-36788e95fdbe96ac27c71197fdbfee178b53f52c.tar.gz core-36788e95fdbe96ac27c71197fdbfee178b53f52c.zip | |
upgrade liborcus
Conflicts:
external/boost/StaticLibrary_boost_system.mk
Change-Id: Ie4af26c87a100b67baeedbaa7fb1ac428845f92b
Diffstat (limited to 'external/liborcus/UnpackedTarball_liborcus.mk')
| -rw-r--r-- | external/liborcus/UnpackedTarball_liborcus.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 930543c9b664..d046f80f4743 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -16,14 +16,11 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,0)) liborcus_patches := # make config.sub recognize arm-linux-androideabi -liborcus_patches += liborcus_0.1.0-configure.patch +# liborcus_patches += liborcus_0.1.0-configure.patch # don't use dllimport liborcus_patches += liborcus_0.1.0-dllimport.patch -# fdo#63844 -liborcus_patches += liborcus-handle-invalid-xml.patch.1 - ifeq ($(OS),MACOSX) # no "tac" command on OS X, but "tail -r" liborcus_patches += liborcus_0.1.0-tac.patch |