diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-11 14:42:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-18 14:27:40 -0600 |
| commit | 88e65df2e4be47ae3ae1ae1b3a30003f4cfe4b11 (patch) | |
| tree | 320c7d09ddf863a23b49aeef455372f15fb41159 /external/curl/UnpackedTarball_curl.mk | |
| parent | 6a826ddc4ee40a9727131cd4b13365bf6ae16319 (diff) | |
curl: upgrade to version 7.33.0
- from curl-7.26.0.patch:
* drop ADDCFLAGS stuff, must be some dmake relic
* drop wspiapi.h, presumably for backward compat with NT 5.0/Win2000
which is unsupported (and ws2_32.lib is linked anyway...)
* split out curl-freebsd.patch.1
- curl-7.26.0_win.patch:
* drop the library renaming stuff - can be handled in Package and
RepositoryExternal.mk without patch
* rename the rest to curl-msvc.patch.1
- drop curl-aix.patch:
presumably don't need special check for V7BETA since it's released now
- drop curl-7.26.0_strlcat.patch (obsolete)
Change-Id: Ie8c1d9e72f82ada95f42c49d22d90e43b1a6c3c0
Reviewed-on: https://gerrit.libreoffice.org/6642
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/curl/UnpackedTarball_curl.mk')
| -rw-r--r-- | external/curl/UnpackedTarball_curl.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk index 2e75f38821ab..0516a31e70c9 100644 --- a/external/curl/UnpackedTarball_curl.mk +++ b/external/curl/UnpackedTarball_curl.mk @@ -14,20 +14,20 @@ $(eval $(call gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL),,curl)) $(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1)) $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\ - Makefile.msvc.names \ lib/Makefile.vc9 \ )) + $(eval $(call gb_UnpackedTarball_add_patches,curl,\ - external/curl/curl-7.26.0.patch \ - external/curl/curl-aix.patch \ - external/curl/curl-7.26.0_win.patch \ + external/curl/curl-freebsd.patch.1 \ + external/curl/curl-msvc.patch.1 \ external/curl/curl-7.26.0_mingw.patch \ external/curl/curl-7.26.0_win-proxy.patch \ - external/curl/curl-7.26.0_strlcat.patch \ )) + ifeq ($(OS),ANDROID) $(eval $(call gb_UnpackedTarball_add_patches,curl,\ external/curl/curl-android.patch \ )) endif + # vim: set noet sw=4 ts=4: |