[Libreoffice-commits] core.git: curl/curl-7.26.0_mingw.patch curl/curl-7.26.0_nspr.patch curl/curl-7.26.0.patch curl/curl-7.26.0_strlcat.patch curl/curl-7.26.0_win.patch curl/curl-7.26.0_win-proxy.patch curl/curl-aix.patch curl/curl-android.patch curl/ExternalPackage_curl.mk curl/ExternalProject_curl.mk curl/Makefile curl/Module_curl.mk curl/README curl/UnpackedTarball_curl.mk external/curl external/Module_external.mk RepositoryModule_host.mk
Khaled Hosny
khaledhosny at eglug.org
Thu Oct 17 23:51:00 PDT 2013
RepositoryModule_host.mk | 1
curl/ExternalPackage_curl.mk | 45 ----------
curl/ExternalProject_curl.mk | 78 ------------------
curl/Makefile | 7 -
curl/Module_curl.mk | 20 ----
curl/README | 1
curl/UnpackedTarball_curl.mk | 34 -------
curl/curl-7.26.0.patch | 86 -------------------
curl/curl-7.26.0_mingw.patch | 24 -----
curl/curl-7.26.0_nspr.patch | 17 ---
curl/curl-7.26.0_strlcat.patch | 9 --
curl/curl-7.26.0_win-proxy.patch | 130 ------------------------------
curl/curl-7.26.0_win.patch | 59 -------------
curl/curl-aix.patch | 13 ---
curl/curl-android.patch | 16 ---
external/Module_external.mk | 1
external/curl/ExternalPackage_curl.mk | 45 ++++++++++
external/curl/ExternalProject_curl.mk | 78 ++++++++++++++++++
external/curl/Makefile | 7 +
external/curl/Module_curl.mk | 18 ++++
external/curl/README | 1
external/curl/UnpackedTarball_curl.mk | 34 +++++++
external/curl/curl-7.26.0.patch | 86 +++++++++++++++++++
external/curl/curl-7.26.0_mingw.patch | 24 +++++
external/curl/curl-7.26.0_nspr.patch | 17 +++
external/curl/curl-7.26.0_strlcat.patch | 9 ++
external/curl/curl-7.26.0_win-proxy.patch | 130 ++++++++++++++++++++++++++++++
external/curl/curl-7.26.0_win.patch | 59 +++++++++++++
external/curl/curl-aix.patch | 13 +++
external/curl/curl-android.patch | 16 +++
30 files changed, 538 insertions(+), 540 deletions(-)
New commits:
commit a777285f9b8efc4e00183a25d39913f78eddc0ad
Author: Khaled Hosny <khaledhosny at eglug.org>
Date: Thu Oct 17 19:28:04 2013 +0200
fdo#70393: move curl to a subdir of external
Change-Id: I76401636aab7d4de198912b154d6ec3da35a711d
Reviewed-on: https://gerrit.libreoffice.org/6298
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index e88deaf..96091c1 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -37,7 +37,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
cpputools \
$(call gb_Helper_optional,CRASHREP,crashrep) \
cui \
- $(call gb_Helper_optional,CURL,curl) \
dbaccess \
desktop \
$(call gb_Helper_optional,DICTIONARIES,dictionaries) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 9be3b5a..8d5232b 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,CLUCENE,clucene) \
$(call gb_Helper_optional,CPPUNIT,cppunit) \
$(call gb_Helper_optional,CT2N,ct2n) \
+ $(call gb_Helper_optional,CURL,curl) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LIBPNG,libpng) \
))
diff --git a/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk
similarity index 100%
rename from curl/ExternalPackage_curl.mk
rename to external/curl/ExternalPackage_curl.mk
diff --git a/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
similarity index 100%
rename from curl/ExternalProject_curl.mk
rename to external/curl/ExternalProject_curl.mk
diff --git a/curl/Makefile b/external/curl/Makefile
similarity index 100%
rename from curl/Makefile
rename to external/curl/Makefile
diff --git a/curl/Module_curl.mk b/external/curl/Module_curl.mk
similarity index 94%
rename from curl/Module_curl.mk
rename to external/curl/Module_curl.mk
index 2f9c4b2..2b4c61c 100644
--- a/curl/Module_curl.mk
+++ b/external/curl/Module_curl.mk
@@ -9,12 +9,10 @@
$(eval $(call gb_Module_Module,curl))
-ifeq ($(SYSTEM_CURL),NO)
$(eval $(call gb_Module_add_targets,curl,\
UnpackedTarball_curl \
ExternalPackage_curl \
ExternalProject_curl \
))
-endif
# vim: set noet sw=4 ts=4:
diff --git a/curl/README b/external/curl/README
similarity index 100%
rename from curl/README
rename to external/curl/README
diff --git a/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk
similarity index 71%
rename from curl/UnpackedTarball_curl.mk
rename to external/curl/UnpackedTarball_curl.mk
index f90007f..aa3e413 100644
--- a/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -18,17 +18,17 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
lib/Makefile.vc9 \
))
$(eval $(call gb_UnpackedTarball_add_patches,curl,\
- curl/curl-7.26.0.patch \
- curl/curl-7.26.0_nspr.patch \
- curl/curl-aix.patch \
- curl/curl-7.26.0_win.patch \
- curl/curl-7.26.0_mingw.patch \
- curl/curl-7.26.0_win-proxy.patch \
- curl/curl-7.26.0_strlcat.patch \
+ external/curl/curl-7.26.0.patch \
+ external/curl/curl-7.26.0_nspr.patch \
+ external/curl/curl-aix.patch \
+ external/curl/curl-7.26.0_win.patch \
+ 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,\
- curl/curl-android.patch \
+ external/curl/curl-android.patch \
))
endif
# vim: set noet sw=4 ts=4:
diff --git a/curl/curl-7.26.0.patch b/external/curl/curl-7.26.0.patch
similarity index 100%
rename from curl/curl-7.26.0.patch
rename to external/curl/curl-7.26.0.patch
diff --git a/curl/curl-7.26.0_mingw.patch b/external/curl/curl-7.26.0_mingw.patch
similarity index 100%
rename from curl/curl-7.26.0_mingw.patch
rename to external/curl/curl-7.26.0_mingw.patch
diff --git a/curl/curl-7.26.0_nspr.patch b/external/curl/curl-7.26.0_nspr.patch
similarity index 100%
rename from curl/curl-7.26.0_nspr.patch
rename to external/curl/curl-7.26.0_nspr.patch
diff --git a/curl/curl-7.26.0_strlcat.patch b/external/curl/curl-7.26.0_strlcat.patch
similarity index 100%
rename from curl/curl-7.26.0_strlcat.patch
rename to external/curl/curl-7.26.0_strlcat.patch
diff --git a/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch
similarity index 100%
rename from curl/curl-7.26.0_win-proxy.patch
rename to external/curl/curl-7.26.0_win-proxy.patch
diff --git a/curl/curl-7.26.0_win.patch b/external/curl/curl-7.26.0_win.patch
similarity index 100%
rename from curl/curl-7.26.0_win.patch
rename to external/curl/curl-7.26.0_win.patch
diff --git a/curl/curl-aix.patch b/external/curl/curl-aix.patch
similarity index 100%
rename from curl/curl-aix.patch
rename to external/curl/curl-aix.patch
diff --git a/curl/curl-android.patch b/external/curl/curl-android.patch
similarity index 100%
rename from curl/curl-android.patch
rename to external/curl/curl-android.patch
More information about the Libreoffice-commits
mailing list