fdo#70393: move redland to a subdir of external

Change-Id: Ia857f943b8f2915c857ec4c9fa363760699e5206
Reviewed-on: https://gerrit.libreoffice.org/6551Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

RepositoryModule_host.mk

@@ -90,7 +90,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	$(call gb_Helper_optional,PYUNO,pyuno) \
 	$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
 	readlicense_oo \
-	$(call gb_Helper_optional,REDLAND,redland) \
 	registry \
 	remotebridges \
 	reportbuilder \

external/Module_external.mk

@@ -71,6 +71,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,POPPLER,poppler) \
 	$(call gb_Helper_optional,POSTGRESQL,postgresql) \
 	$(call gb_Helper_optional,PYTHON,python3) \
+	$(call gb_Helper_optional,REDLAND,redland) \
 	$(call gb_Helper_optional,VISIO,libvisio) \
 	$(call gb_Helper_optional,WPD,libwpd) \
 	$(call gb_Helper_optional,WPG,libwpg) \

redland/Makefile → external/redland/Makefile

@@ -2,6 +2,6 @@
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-include $(module_directory)/../solenv/gbuild/partial_build.mk
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:

redland/UnpackedTarball_raptor.mk → external/redland/UnpackedTarball_raptor.mk

@@ -12,14 +12,14 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,raptor))
 $(eval $(call gb_UnpackedTarball_set_tarball,raptor,$(RAPTOR_TARBALL),,redland))
 
 # configure generated files for MSVC
-$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor2.h,redland/raptor/raptor2.h))
-$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor_config.h,redland/raptor/raptor_config.h))
+$(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))
 
 $(eval $(call gb_UnpackedTarball_add_patches,raptor,\
-	redland/raptor/raptor-freebsd.patch.1 \
-	$(if $(filter WNTGCC,$(OS)$(COM)),redland/raptor/raptor-mingw.patch.1) \
-	$(if $(filter-out WNT,$(OS)),redland/raptor/raptor-bundled-soname.patch.1) \
-	$(if $(filter ANDROID,$(OS)),redland/raptor/raptor-android.patch.1) \
+	external/redland/raptor/raptor-freebsd.patch.1 \
+	$(if $(filter WNTGCC,$(OS)$(COM)),external/redland/raptor/raptor-mingw.patch.1) \
+	$(if $(filter-out WNT,$(OS)),external/redland/raptor/raptor-bundled-soname.patch.1) \
+	$(if $(filter ANDROID,$(OS)),external/redland/raptor/raptor-android.patch.1) \
 ))
 
 # vim: set noet sw=4 ts=4:

redland/UnpackedTarball_rasqal.mk → external/redland/UnpackedTarball_rasqal.mk

@@ -12,17 +12,17 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,rasqal))
 $(eval $(call gb_UnpackedTarball_set_tarball,rasqal,$(RASQAL_TARBALL),,redland))
 
 # configure generated files for MSVC
-$(eval $(call gb_UnpackedTarball_add_file,rasqal,src/rasqal.h,redland/rasqal/rasqal.h))
+$(eval $(call gb_UnpackedTarball_add_file,rasqal,src/rasqal.h,external/redland/rasqal/rasqal.h))
 
 $(eval $(call gb_UnpackedTarball_add_patches,rasqal,\
-	redland/rasqal/rasqal-pkgconfig.patch.1 \
-	redland/rasqal/rasqal-freebsd.patch.1 \
-	redland/rasqal/rasqal-msvc.patch.1 \
-	redland/rasqal/rasqal-aix.patch.1 \
-	$(if $(filter-out WNT,$(OS)),redland/rasqal/rasqal-bundled-soname.patch.1) \
-	$(if $(filter ANDROID,$(OS)),redland/rasqal/rasqal-android.patch.1) \
-	$(if $(filter WNTGCC,$(OS)$(COM)),redland/rasqal/rasqal-mingw.patch.1) \
-	$(if $(filter YES,$(CROSS_COMPILING)),redland/rasqal/rasqal-xcompile.patch.1) \
+	external/redland/rasqal/rasqal-pkgconfig.patch.1 \
+	external/redland/rasqal/rasqal-freebsd.patch.1 \
+	external/redland/rasqal/rasqal-msvc.patch.1 \
+	external/redland/rasqal/rasqal-aix.patch.1 \
+	$(if $(filter-out WNT,$(OS)),external/redland/rasqal/rasqal-bundled-soname.patch.1) \
+	$(if $(filter ANDROID,$(OS)),external/redland/rasqal/rasqal-android.patch.1) \
+	$(if $(filter WNTGCC,$(OS)$(COM)),external/redland/rasqal/rasqal-mingw.patch.1) \
+	$(if $(filter YES,$(CROSS_COMPILING)),external/redland/rasqal/rasqal-xcompile.patch.1) \
 ))
 
 # vim: set noet sw=4 ts=4:

redland/UnpackedTarball_redland.mk → external/redland/UnpackedTarball_redland.mk

@@ -12,17 +12,17 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,redland))
 $(eval $(call gb_UnpackedTarball_set_tarball,redland,$(REDLAND_TARBALL),,redland))
 
 # configure generated files for MSVC
-$(eval $(call gb_UnpackedTarball_add_file,redland,src/librdf.h,redland/redland/librdf.h))
+$(eval $(call gb_UnpackedTarball_add_file,redland,src/librdf.h,external/redland/redland/librdf.h))
 
 $(eval $(call gb_UnpackedTarball_add_patches,redland,\
-	redland/redland/redland-query-rasqal-avoid-assert.patch.1 \
-	redland/redland/redland-pkgconfig.patch.1 \
-	redland/redland/redland-freebsd.patch.1 \
-	redland/redland/redland-msvc.patch.1 \
-	$(if $(filter-out WNT,$(OS)),redland/redland/redland-bundled-soname.patch.1) \
-	$(if $(filter ANDROID,$(OS)),redland/redland/redland-android.patch.1) \
-	$(if $(filter WNTGCC,$(OS)$(COM)),redland/redland/redland-mingw.patch.1) \
-	$(if $(filter YES,$(CROSS_COMPILING)),redland/redland/redland-xcompile.patch.1) \
+	external/redland/redland/redland-query-rasqal-avoid-assert.patch.1 \
+	external/redland/redland/redland-pkgconfig.patch.1 \
+	external/redland/redland/redland-freebsd.patch.1 \
+	external/redland/redland/redland-msvc.patch.1 \
+	$(if $(filter-out WNT,$(OS)),external/redland/redland/redland-bundled-soname.patch.1) \
+	$(if $(filter ANDROID,$(OS)),external/redland/redland/redland-android.patch.1) \
+	$(if $(filter WNTGCC,$(OS)$(COM)),external/redland/redland/redland-mingw.patch.1) \
+	$(if $(filter YES,$(CROSS_COMPILING)),external/redland/redland/redland-xcompile.patch.1) \
 ))
 
 # vim: set noet sw=4 ts=4: