Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3648

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/3648/1

fdo#63197: convert fontunxafm

Change-Id: Ib382319a4916b711c820c06ba57928ca11d0b804
---
R afms/ExternalPackage_fontunxafm.mk
M afms/Module_afms.mk
M scp2/source/ooo/file_extra_ooo.scp
3 files changed, 7 insertions(+), 9 deletions(-)



diff --git a/afms/Zip_fontunxafm.mk b/afms/ExternalPackage_fontunxafm.mk
similarity index 82%
rename from afms/Zip_fontunxafm.mk
rename to afms/ExternalPackage_fontunxafm.mk
index 058ee7e..d2600a1 100644
--- a/afms/Zip_fontunxafm.mk
+++ b/afms/ExternalPackage_fontunxafm.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,fontunxafm,$(call gb_UnpackedTarball_get_dir,afms)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,afms_fontunxafm,afms))
 
-$(eval $(call gb_Zip_add_dependencies,fontunxafm,\
-       $(call gb_UnpackedTarball_get_target,afms) \
-))
+$(eval $(call gb_ExternalPackage_set_outdir,afms_fontunxafm,$(INSTDIR)))
 
-$(eval $(call gb_Zip_add_files,fontunxafm,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,afms_fontunxafm,share/psprint/fontmetric,\
        Courier-Bold.afm \
        Courier-BoldOblique.afm \
        Courier-Oblique.afm \
diff --git a/afms/Module_afms.mk b/afms/Module_afms.mk
index ee04aa9..5e0c750 100644
--- a/afms/Module_afms.mk
+++ b/afms/Module_afms.mk
@@ -11,7 +11,7 @@
 
 $(eval $(call gb_Module_add_targets,afms,\
        UnpackedTarball_afms \
-       Zip_fontunxafm \
+       ExternalPackage_fontunxafm \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 93ebc12..0a804d3 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -208,10 +208,10 @@
 
 #ifndef WITHOUT_AFMS
 File gid_File_Extra_Fontunxafm
-    Dir = gid_Dir_Psprint_Fontmetric;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    Name = "fontunxafm.zip";
+    Styles = (FILELIST);
+    Name = "afms_fontunxafm.filelist";
 End
 #endif
 

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

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


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.