[PATCH] fdo#63197, convert Zip_accessoriesgallery

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3416

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/3416/1

fdo#63197, convert Zip_accessoriesgallery

Change-Id: I23d31c9574269f9d945a6940728c90cb7a9ae51d
---
R extras/ExternalPackage_accessoriesgallery.mk
M extras/Module_extras.mk
M scp2/source/accessories/file_gallery_accessories.scp
3 files changed, 10 insertions(+), 9 deletions(-)



diff --git a/extras/Zip_accessoriesgallery.mk b/extras/ExternalPackage_accessoriesgallery.mk
similarity index 92%
rename from extras/Zip_accessoriesgallery.mk
rename to extras/ExternalPackage_accessoriesgallery.mk
index 87324f8..6fbd99e 100644
--- a/extras/Zip_accessoriesgallery.mk
+++ b/extras/ExternalPackage_accessoriesgallery.mk
@@ -7,13 +7,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,accessoriesgallery,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories))
+$(eval $(call gb_ExternalPackage_ExternalPackage,accessoriesgallery,gallery-pack))
 
-$(eval $(call gb_Zip_add_dependencies,accessoriesgallery,\
-	$(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
+$(eval $(call gb_ExternalPackage_set_outdir,accessoriesgallery,$(INSTDIR)))
 
-$(eval $(call gb_Zip_add_files,accessoriesgallery,\
+$(eval $(call gb_ExternalPackage_use_unpacked,accessoriesgallery,gallery-pack))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,accessoriesgallery,share/gallery/accessories,\
 	sg1010.sdg \
 	sg1010.sdv \
 	sg1010.thm \
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 77223c3..7b494e4 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -60,7 +60,7 @@
 ifeq ($(WITH_EXTRA_GALLERY),YES)
 $(eval $(call gb_Module_add_targets,extras,\
 	UnpackedTarball_gallery_pack \
-	Zip_accessoriesgallery \
+	ExternalPackage_accessoriesgallery \
 	Zip_accessoriesgallerydrawspeople \
 	Zip_accessoriesgalleryelementsbullets2 \
 	Zip_accessoriesgallerynonfree \
diff --git a/scp2/source/accessories/file_gallery_accessories.scp b/scp2/source/accessories/file_gallery_accessories.scp
index 46706e1..2fa2550 100644
--- a/scp2/source/accessories/file_gallery_accessories.scp
+++ b/scp2/source/accessories/file_gallery_accessories.scp
@@ -35,9 +35,10 @@
 #ifdef WITH_EXTRA_GALLERY
 
 File gid_File_Extra_Gallery_Accessories
-    Dir = gid_Dir_Gallery;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgallery.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (PACKED, FILELIST);
+    Name = "accessoriesgallery.filelist";
 End
 
 File gid_File_Extra_Gallery_Draws_People_Accessories

-- 
To view, visit https://gerrit.libreoffice.org/3416
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I23d31c9574269f9d945a6940728c90cb7a9ae51d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet <serval2412 at yahoo.fr>