[PATCH] fdo#63197, convert sysui osxicons

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3440

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/3440/1

fdo#63197, convert sysui osxicons

Change-Id: Iab9cb3704385c115e1d25189a3d8833bd6721e24
---
M scp2/source/ooo/file_ooo.scp
M sysui/Module_sysui.mk
R sysui/Package_osxicons.mk
3 files changed, 9 insertions(+), 7 deletions(-)



diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index bd5b571..b5fe2a2 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1267,10 +1267,10 @@
 
 #ifdef MACOSX
 File gid_File_Icns_Bundle
-    ARCHIVE_TXT_FILE_BODY;
-    Dir = gid_Dir_Bundle_Contents_Resources;
-    Name = "osxicons.zip";
-    Styles = (ARCHIVE);
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "sysui_osxicons.filelist";
 End
 #endif
 
diff --git a/sysui/Module_sysui.mk b/sysui/Module_sysui.mk
index 9c5c76a..c668730 100644
--- a/sysui/Module_sysui.mk
+++ b/sysui/Module_sysui.mk
@@ -22,7 +22,7 @@
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_targets,sysui,\
-	Zip_osxicons \
+	Package_osxicons \
 	CustomTarget_infoplist \
 	Package_infoplist \
 ))
diff --git a/sysui/Zip_osxicons.mk b/sysui/Package_osxicons.mk
similarity index 84%
rename from sysui/Zip_osxicons.mk
rename to sysui/Package_osxicons.mk
index d9c1901..8a1e8c9 100644
--- a/sysui/Zip_osxicons.mk
+++ b/sysui/Package_osxicons.mk
@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,osxicons,$(SRCDIR)/sysui/desktop))
+$(eval $(call gb_Package_Package,sysui_osxicons,$(SRCDIR)/sysui/desktop))
 
-$(eval $(call gb_Zip_add_files,osxicons,\
+$(eval $(call gb_Package_set_outdir,sysui_osxicons,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,sysui_osxicons,presets,\
     icons/text.icns \
     icons/oasis-text.icns \
     icons/spreadsheet.icns \

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

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