[Libreoffice-commits] core.git: external/Module_external.mk external/redland redland/ExternalPackage_raptor.mk redland/ExternalPackage_rasqal.mk redland/ExternalPackage_redland.mk redland/ExternalProject_raptor.mk redland/ExternalProject_rasqal.mk redland/ExternalProject_redland.mk redland/Library_raptor.mk redland/Library_rasqal.mk redland/Library_rdf.mk redland/Makefile redland/Module_redland.mk redland/raptor redland/rasqal redland/README redland/redland redland/UnpackedTarball_raptor.mk redland/UnpackedTarball_rasqal.mk redland/UnpackedTarball_redland.mk RepositoryModule_host.mk

Khaled Hosny khaledhosny at eglug.org
Mon Nov 4 09:43:44 CET 2013


 RepositoryModule_host.mk                                           |    1 
 external/Module_external.mk                                        |    1 
 external/redland/ExternalPackage_raptor.mk                         |   24 
 external/redland/ExternalPackage_rasqal.mk                         |   24 
 external/redland/ExternalPackage_redland.mk                        |   24 
 external/redland/ExternalProject_raptor.mk                         |   56 
 external/redland/ExternalProject_rasqal.mk                         |   68 
 external/redland/ExternalProject_redland.mk                        |   73 
 external/redland/Library_raptor.mk                                 |   77 
 external/redland/Library_rasqal.mk                                 |  112 
 external/redland/Library_rdf.mk                                    |   73 
 external/redland/Makefile                                          |    7 
 external/redland/Module_redland.mk                                 |   36 
 external/redland/README                                            |   24 
 external/redland/UnpackedTarball_raptor.mk                         |   25 
 external/redland/UnpackedTarball_rasqal.mk                         |   28 
 external/redland/UnpackedTarball_redland.mk                        |   28 
 external/redland/raptor/raptor-android.patch.1                     |   13 
 external/redland/raptor/raptor-bundled-soname.patch.1              |   13 
 external/redland/raptor/raptor-freebsd.patch.1                     |   28 
 external/redland/raptor/raptor-mingw.patch.1                       |   13 
 external/redland/raptor/raptor2.h                                  | 2100 +++++++++
 external/redland/raptor/raptor_config.h                            |  393 +
 external/redland/rasqal/rasqal-aix.patch.1                         |   25 
 external/redland/rasqal/rasqal-android.patch.1                     |   14 
 external/redland/rasqal/rasqal-bundled-soname.patch.1              |   13 
 external/redland/rasqal/rasqal-freebsd.patch.1                     |   28 
 external/redland/rasqal/rasqal-mingw.patch.1                       |   13 
 external/redland/rasqal/rasqal-msvc.patch.1                        |   87 
 external/redland/rasqal/rasqal-pkgconfig.patch.1                   |  512 ++
 external/redland/rasqal/rasqal-xcompile.patch.1                    |   15 
 external/redland/rasqal/rasqal.h                                   | 2221 ++++++++++
 external/redland/redland/librdf.h                                  |  434 +
 external/redland/redland/redland-android.patch.1                   |   14 
 external/redland/redland/redland-bundled-soname.patch.1            |   13 
 external/redland/redland/redland-freebsd.patch.1                   |   28 
 external/redland/redland/redland-mingw.patch.1                     |   13 
 external/redland/redland/redland-msvc.patch.1                      |  146 
 external/redland/redland/redland-pkgconfig.patch.1                 |  619 ++
 external/redland/redland/redland-query-rasqal-avoid-assert.patch.1 |   17 
 external/redland/redland/redland-xcompile.patch.1                  |   15 
 redland/ExternalPackage_raptor.mk                                  |   24 
 redland/ExternalPackage_rasqal.mk                                  |   24 
 redland/ExternalPackage_redland.mk                                 |   24 
 redland/ExternalProject_raptor.mk                                  |   56 
 redland/ExternalProject_rasqal.mk                                  |   68 
 redland/ExternalProject_redland.mk                                 |   73 
 redland/Library_raptor.mk                                          |   77 
 redland/Library_rasqal.mk                                          |  112 
 redland/Library_rdf.mk                                             |   73 
 redland/Makefile                                                   |    7 
 redland/Module_redland.mk                                          |   36 
 redland/README                                                     |   24 
 redland/UnpackedTarball_raptor.mk                                  |   25 
 redland/UnpackedTarball_rasqal.mk                                  |   28 
 redland/UnpackedTarball_redland.mk                                 |   28 
 redland/raptor/raptor-android.patch.1                              |   13 
 redland/raptor/raptor-bundled-soname.patch.1                       |   13 
 redland/raptor/raptor-freebsd.patch.1                              |   28 
 redland/raptor/raptor-mingw.patch.1                                |   13 
 redland/raptor/raptor2.h                                           | 2100 ---------
 redland/raptor/raptor_config.h                                     |  393 -
 redland/rasqal/rasqal-aix.patch.1                                  |   25 
 redland/rasqal/rasqal-android.patch.1                              |   14 
 redland/rasqal/rasqal-bundled-soname.patch.1                       |   13 
 redland/rasqal/rasqal-freebsd.patch.1                              |   28 
 redland/rasqal/rasqal-mingw.patch.1                                |   13 
 redland/rasqal/rasqal-msvc.patch.1                                 |   87 
 redland/rasqal/rasqal-pkgconfig.patch.1                            |  512 --
 redland/rasqal/rasqal-xcompile.patch.1                             |   15 
 redland/rasqal/rasqal.h                                            | 2221 ----------
 redland/redland/librdf.h                                           |  434 -
 redland/redland/redland-android.patch.1                            |   14 
 redland/redland/redland-bundled-soname.patch.1                     |   13 
 redland/redland/redland-freebsd.patch.1                            |   28 
 redland/redland/redland-mingw.patch.1                              |   13 
 redland/redland/redland-msvc.patch.1                               |  146 
 redland/redland/redland-pkgconfig.patch.1                          |  619 --
 redland/redland/redland-query-rasqal-avoid-assert.patch.1          |   17 
 redland/redland/redland-xcompile.patch.1                           |   15 
 80 files changed, 7467 insertions(+), 7467 deletions(-)

New commits:
commit fa560217dbd4c15abb3f7623d99cf7017dcb3f2a
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sun Nov 3 20:33:32 2013 +0200

    fdo#70393: move redland to a subdir of external
    
    Change-Id: Ia857f943b8f2915c857ec4c9fa363760699e5206
    Reviewed-on: https://gerrit.libreoffice.org/6551
    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 cf4d8c3..1f60a30 100644
--- a/RepositoryModule_host.mk
+++ b/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 \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 45f0ba2..aeba824 100644
--- a/external/Module_external.mk
+++ b/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) \
diff --git a/redland/ExternalPackage_raptor.mk b/external/redland/ExternalPackage_raptor.mk
similarity index 100%
rename from redland/ExternalPackage_raptor.mk
rename to external/redland/ExternalPackage_raptor.mk
diff --git a/redland/ExternalPackage_rasqal.mk b/external/redland/ExternalPackage_rasqal.mk
similarity index 100%
rename from redland/ExternalPackage_rasqal.mk
rename to external/redland/ExternalPackage_rasqal.mk
diff --git a/redland/ExternalPackage_redland.mk b/external/redland/ExternalPackage_redland.mk
similarity index 100%
rename from redland/ExternalPackage_redland.mk
rename to external/redland/ExternalPackage_redland.mk
diff --git a/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk
similarity index 100%
rename from redland/ExternalProject_raptor.mk
rename to external/redland/ExternalProject_raptor.mk
diff --git a/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk
similarity index 100%
rename from redland/ExternalProject_rasqal.mk
rename to external/redland/ExternalProject_rasqal.mk
diff --git a/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk
similarity index 100%
rename from redland/ExternalProject_redland.mk
rename to external/redland/ExternalProject_redland.mk
diff --git a/redland/Library_raptor.mk b/external/redland/Library_raptor.mk
similarity index 100%
rename from redland/Library_raptor.mk
rename to external/redland/Library_raptor.mk
diff --git a/redland/Library_rasqal.mk b/external/redland/Library_rasqal.mk
similarity index 100%
rename from redland/Library_rasqal.mk
rename to external/redland/Library_rasqal.mk
diff --git a/redland/Library_rdf.mk b/external/redland/Library_rdf.mk
similarity index 100%
rename from redland/Library_rdf.mk
rename to external/redland/Library_rdf.mk
diff --git a/redland/Makefile b/external/redland/Makefile
similarity index 71%
rename from redland/Makefile
rename to external/redland/Makefile
index ccb1c85..e4968cf 100644
--- a/redland/Makefile
+++ b/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:
diff --git a/redland/Module_redland.mk b/external/redland/Module_redland.mk
similarity index 100%
rename from redland/Module_redland.mk
rename to external/redland/Module_redland.mk
diff --git a/redland/README b/external/redland/README
similarity index 100%
rename from redland/README
rename to external/redland/README
diff --git a/redland/UnpackedTarball_raptor.mk b/external/redland/UnpackedTarball_raptor.mk
similarity index 59%
rename from redland/UnpackedTarball_raptor.mk
rename to external/redland/UnpackedTarball_raptor.mk
index e2d2252..90a1799 100644
--- a/redland/UnpackedTarball_raptor.mk
+++ b/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:
diff --git a/external/redland/UnpackedTarball_rasqal.mk b/external/redland/UnpackedTarball_rasqal.mk
new file mode 100644
index 0000000..0017fac
--- /dev/null
+++ b/external/redland/UnpackedTarball_rasqal.mk
@@ -0,0 +1,28 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(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,external/redland/rasqal/rasqal.h))
+
+$(eval $(call gb_UnpackedTarball_add_patches,rasqal,\
+	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:
diff --git a/external/redland/UnpackedTarball_redland.mk b/external/redland/UnpackedTarball_redland.mk
new file mode 100644
index 0000000..8fb1258
--- /dev/null
+++ b/external/redland/UnpackedTarball_redland.mk
@@ -0,0 +1,28 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(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,external/redland/redland/librdf.h))
+
+$(eval $(call gb_UnpackedTarball_add_patches,redland,\
+	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:
diff --git a/redland/raptor/raptor-android.patch.1 b/external/redland/raptor/raptor-android.patch.1
similarity index 100%
rename from redland/raptor/raptor-android.patch.1
rename to external/redland/raptor/raptor-android.patch.1
diff --git a/redland/raptor/raptor-bundled-soname.patch.1 b/external/redland/raptor/raptor-bundled-soname.patch.1
similarity index 100%
rename from redland/raptor/raptor-bundled-soname.patch.1
rename to external/redland/raptor/raptor-bundled-soname.patch.1
diff --git a/redland/raptor/raptor-freebsd.patch.1 b/external/redland/raptor/raptor-freebsd.patch.1
similarity index 100%
rename from redland/raptor/raptor-freebsd.patch.1
rename to external/redland/raptor/raptor-freebsd.patch.1
diff --git a/redland/raptor/raptor-mingw.patch.1 b/external/redland/raptor/raptor-mingw.patch.1
similarity index 100%
rename from redland/raptor/raptor-mingw.patch.1
rename to external/redland/raptor/raptor-mingw.patch.1
diff --git a/redland/raptor/raptor2.h b/external/redland/raptor/raptor2.h
similarity index 100%
rename from redland/raptor/raptor2.h
rename to external/redland/raptor/raptor2.h
diff --git a/redland/raptor/raptor_config.h b/external/redland/raptor/raptor_config.h
similarity index 100%
rename from redland/raptor/raptor_config.h
rename to external/redland/raptor/raptor_config.h
diff --git a/redland/rasqal/rasqal-aix.patch.1 b/external/redland/rasqal/rasqal-aix.patch.1
similarity index 100%
rename from redland/rasqal/rasqal-aix.patch.1
rename to external/redland/rasqal/rasqal-aix.patch.1
diff --git a/redland/rasqal/rasqal-android.patch.1 b/external/redland/rasqal/rasqal-android.patch.1
similarity index 100%
rename from redland/rasqal/rasqal-android.patch.1
rename to external/redland/rasqal/rasqal-android.patch.1
diff --git a/redland/rasqal/rasqal-bundled-soname.patch.1 b/external/redland/rasqal/rasqal-bundled-soname.patch.1
similarity index 100%
rename from redland/rasqal/rasqal-bundled-soname.patch.1
rename to external/redland/rasqal/rasqal-bundled-soname.patch.1
diff --git a/redland/rasqal/rasqal-freebsd.patch.1 b/external/redland/rasqal/rasqal-freebsd.patch.1
similarity index 100%
rename from redland/rasqal/rasqal-freebsd.patch.1
rename to external/redland/rasqal/rasqal-freebsd.patch.1
diff --git a/redland/rasqal/rasqal-mingw.patch.1 b/external/redland/rasqal/rasqal-mingw.patch.1
similarity index 100%
rename from redland/rasqal/rasqal-mingw.patch.1
rename to external/redland/rasqal/rasqal-mingw.patch.1
diff --git a/redland/rasqal/rasqal-msvc.patch.1 b/external/redland/rasqal/rasqal-msvc.patch.1
similarity index 100%
rename from redland/rasqal/rasqal-msvc.patch.1
rename to external/redland/rasqal/rasqal-msvc.patch.1
diff --git a/redland/rasqal/rasqal-pkgconfig.patch.1 b/external/redland/rasqal/rasqal-pkgconfig.patch.1
similarity index 100%
rename from redland/rasqal/rasqal-pkgconfig.patch.1
rename to external/redland/rasqal/rasqal-pkgconfig.patch.1
diff --git a/redland/rasqal/rasqal-xcompile.patch.1 b/external/redland/rasqal/rasqal-xcompile.patch.1
similarity index 100%
rename from redland/rasqal/rasqal-xcompile.patch.1
rename to external/redland/rasqal/rasqal-xcompile.patch.1
diff --git a/redland/rasqal/rasqal.h b/external/redland/rasqal/rasqal.h
similarity index 100%
rename from redland/rasqal/rasqal.h
rename to external/redland/rasqal/rasqal.h
diff --git a/redland/redland/librdf.h b/external/redland/redland/librdf.h
similarity index 100%
rename from redland/redland/librdf.h
rename to external/redland/redland/librdf.h
diff --git a/redland/redland/redland-android.patch.1 b/external/redland/redland/redland-android.patch.1
similarity index 100%
rename from redland/redland/redland-android.patch.1
rename to external/redland/redland/redland-android.patch.1
diff --git a/redland/redland/redland-bundled-soname.patch.1 b/external/redland/redland/redland-bundled-soname.patch.1
similarity index 100%
rename from redland/redland/redland-bundled-soname.patch.1
rename to external/redland/redland/redland-bundled-soname.patch.1
diff --git a/redland/redland/redland-freebsd.patch.1 b/external/redland/redland/redland-freebsd.patch.1
similarity index 100%
rename from redland/redland/redland-freebsd.patch.1
rename to external/redland/redland/redland-freebsd.patch.1
diff --git a/redland/redland/redland-mingw.patch.1 b/external/redland/redland/redland-mingw.patch.1
similarity index 100%
rename from redland/redland/redland-mingw.patch.1
rename to external/redland/redland/redland-mingw.patch.1
diff --git a/redland/redland/redland-msvc.patch.1 b/external/redland/redland/redland-msvc.patch.1
similarity index 100%
rename from redland/redland/redland-msvc.patch.1
rename to external/redland/redland/redland-msvc.patch.1
diff --git a/redland/redland/redland-pkgconfig.patch.1 b/external/redland/redland/redland-pkgconfig.patch.1
similarity index 100%
rename from redland/redland/redland-pkgconfig.patch.1
rename to external/redland/redland/redland-pkgconfig.patch.1
diff --git a/redland/redland/redland-query-rasqal-avoid-assert.patch.1 b/external/redland/redland/redland-query-rasqal-avoid-assert.patch.1
similarity index 100%
rename from redland/redland/redland-query-rasqal-avoid-assert.patch.1
rename to external/redland/redland/redland-query-rasqal-avoid-assert.patch.1
diff --git a/redland/redland/redland-xcompile.patch.1 b/external/redland/redland/redland-xcompile.patch.1
similarity index 100%
rename from redland/redland/redland-xcompile.patch.1
rename to external/redland/redland/redland-xcompile.patch.1
diff --git a/redland/UnpackedTarball_rasqal.mk b/redland/UnpackedTarball_rasqal.mk
deleted file mode 100644
index feb5fcf..0000000
--- a/redland/UnpackedTarball_rasqal.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(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_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) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/redland/UnpackedTarball_redland.mk b/redland/UnpackedTarball_redland.mk
deleted file mode 100644
index 8ad2b63..0000000
--- a/redland/UnpackedTarball_redland.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(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_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) \
-))
-
-# vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list