fdo#63197: convert liblangtag_data

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

liblangtag/Zip_liblangtag_data.mk → liblangtag/ExternalPackage_liblangtag_data.mk

@@ -7,24 +7,24 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,liblangtag_data,$(call gb_UnpackedTarball_get_dir,langtag/data)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag_data,langtag))
 
-$(eval $(call gb_Zip_use_unpacked,liblangtag_data,langtag))
+$(eval $(call gb_ExternalPackage_set_outdir,liblangtag_data,$(INSTDIR)))
 
-$(eval $(call gb_Zip_add_files,liblangtag_data,\
-	language-subtag-registry.xml \
-	common/bcp47/calendar.xml \
-	common/bcp47/collation.xml \
-	common/bcp47/currency.xml \
-	common/bcp47/number.xml \
-	common/bcp47/timezone.xml \
-	common/bcp47/transform.xml \
-	common/bcp47/transform_ime.xml \
-	common/bcp47/transform_keyboard.xml \
-	common/bcp47/transform_mt.xml \
-	common/bcp47/transform_private_use.xml \
-	common/bcp47/variant.xml \
-	common/supplemental/likelySubtags.xml \
+$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,share/liblangtag,\
+	data/language-subtag-registry.xml \
+	data/common/bcp47/calendar.xml \
+	data/common/bcp47/collation.xml \
+	data/common/bcp47/currency.xml \
+	data/common/bcp47/number.xml \
+	data/common/bcp47/timezone.xml \
+	data/common/bcp47/transform.xml \
+	data/common/bcp47/transform_ime.xml \
+	data/common/bcp47/transform_keyboard.xml \
+	data/common/bcp47/transform_mt.xml \
+	data/common/bcp47/transform_private_use.xml \
+	data/common/bcp47/variant.xml \
+	data/common/supplemental/likelySubtags.xml \
 ))
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:

liblangtag/Module_liblangtag.mk

@@ -17,7 +17,7 @@ $(eval $(call gb_Module_add_targets,liblangtag,\
 	ExternalPackage_langtag_data \
 	ExternalPackage_langtag \
 	ExternalProject_langtag \
-	Zip_liblangtag_data \
+	ExternalPackage_liblangtag_data \
 ))
 endif
 endif

scp2/source/ooo/file_extra_ooo.scp

@@ -147,10 +147,10 @@ End
 
 #if defined( ENABLE_LIBLANGTAG ) && !defined( SYSTEM_LIBLANGTAG )
 File gid_File_Extra_Liblangtag
-    Dir = gid_Dir_Share_Liblangtag;
+    Dir = FILELIST_DIR;
     USER_FILE_BODY;
-    Styles = (ARCHIVE);
-    Name = "liblangtag_data.zip";
+    Styles = (FILELIST);
+    Name = "liblangtag_data.filelist";
 End
 #endif