diff --git a/desktop/font/fontforge/actions.py b/desktop/font/fontforge/actions.py index 6a88b656c2..8f25978f27 100644 --- a/desktop/font/fontforge/actions.py +++ b/desktop/font/fontforge/actions.py @@ -1,33 +1,31 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. # See the file http://www.gnu.org/licenses/gpl.txt -from pisi.actionsapi import pythonmodules from pisi.actionsapi import shelltools -from pisi.actionsapi import autotools +from pisi.actionsapi import cmaketools from pisi.actionsapi import pisitools -from pisi.actionsapi import libtools from pisi.actionsapi import get -#WorkDir = "fontforge-%s-b" % get.srcVERSION().split('_')[-1] - def setup(): - shelltools.export("PYTHON", "/usr/bin/python3") - #pisitools.dosed("configure.ac", "fontforge_package_name", "fontforge") - shelltools.system("""sed -e 's|python-"${PYTHON_VERSION}"|python-"${PYTHON_VERSION}"-embed|g' -i m4/fontforge_arg_enable.m4""") - shelltools.system("./bootstrap --force") + shelltools.makedirs("build") + shelltools.cd("build") - autotools.configure("--without-libuninameslist \ - --disable-static") - - pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_MAINTAINER_TOOLS=TRUE \ + -DENABLE_FONTFORGE_EXTRAS=TRUE \ + -DUNIX=TRUE", sourceDir="..") def build(): - autotools.make() + cmaketools.make("-C build") + cmaketools.make("-C build doc") def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.dodoc("AUTHORS", "LICENSE") + pisitools.dodoc("AUTHORS", "LICENSE", "README.md") + + shelltools.cd("build") + cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) diff --git a/desktop/font/fontforge/files/fontforge-doc-no-warn-error.patch b/desktop/font/fontforge/files/fontforge-doc-no-warn-error.patch new file mode 100644 index 0000000000..9bc8843850 --- /dev/null +++ b/desktop/font/fontforge/files/fontforge-doc-no-warn-error.patch @@ -0,0 +1,24 @@ +From e8164ed0fa747bfc8e7e80e6ff6b9a34b7c1a33f Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Mon, 27 Apr 2020 20:00:54 -0400 +Subject: [PATCH] doc: do not treat warnings as errors + +--- + doc/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index 6c4601a05..e5aeaed4f 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -21,7 +21,7 @@ file(STRINGS manifest.txt _manifest) + configure_file(manifest.txt manifest.txt COPYONLY) + + add_custom_command(OUTPUT sphinx-docs +- COMMAND "${Sphinx_BUILD_BINARY}" -q -n -W -b html -d doctrees "${CMAKE_CURRENT_SOURCE_DIR}/sphinx" sphinx-docs ++ COMMAND "${Sphinx_BUILD_BINARY}" -q -n -b html -d doctrees "${CMAKE_CURRENT_SOURCE_DIR}/sphinx" sphinx-docs + DEPENDS ${_manifest} + ) + +-- +2.26.2 diff --git a/desktop/font/fontforge/pspec.xml b/desktop/font/fontforge/pspec.xml index 555d25ec45..018e657a3b 100644 --- a/desktop/font/fontforge/pspec.xml +++ b/desktop/font/fontforge/pspec.xml @@ -1,5 +1,5 @@ - + fontforge @@ -14,56 +14,64 @@ app:gui Font editor and converter FontForge is a font editor that lets you create your own postscript, truetype, opentype, cid-keyed, multi-master, cff, svg and bitmap (bdf, FON, NFNT) fonts, or edit existing ones. Also lets you convert one format to another. FontForge also has support for many macintosh font formats. - https://github.com/fontforge/fontforge/releases/download/20190801/fontforge-20190801.tar.gz - https://fontforge.github.io/cidmaps.tgz + https://github.com/fontforge/fontforge/releases/download/20220308/fontforge-20220308.tar.xz + https://fontforge.github.io/cidmaps.tgz git + cmake + libtool + xdg-utils + gtk3-devel + tiff-devel + libXi-devel + cairo-devel + pango-devel + libtool-ltdl + libpng-devel + libXft-devel + giflib-devel + python3-devel + libxml2-devel + freetype-devel + readline-devel + python3-sphinx + libspiro-devel + fontconfig-devel shared-mime-info desktop-file-utils libjpeg-turbo-devel - tiff-devel - cairo-devel - pango-devel - libpng-devel - libXft-devel - libXi-devel - giflib-devel - libspiro-devel - xdg-utils - fontconfig-devel - python3-devel - libxml2-devel - readline-devel - libtool-ltdl - fontforge-20190801-fix-metainfo.xml-file.patch + fontforge + gtk3 zlib - glib2 - libX11 - libpng - python3 - libxml2 - freetype - readline - libtool-ltdl tiff cairo libXi pango + glib2 + libX11 + libpng libXft giflib + potrace + python3 + libxml2 + freetype + readline libspiro + libtool-ltdl libjpeg-turbo - /usr/lib + /usr/lib/libfontforge.so* + /usr/lib/python3.9/site-packages /usr/share/doc /usr/share/man /usr/bin @@ -78,7 +86,7 @@ - + + + 2022-04-02 + 2.0.20220308 + Version bump + Mustafa Cinasal + muscnsl@gmail.com + 2020-01-18 2.0.20190801 diff --git a/desktop/font/fontforge/translations.xml b/desktop/font/fontforge/translations.xml index 8a77d4d805..c51fcf223c 100644 --- a/desktop/font/fontforge/translations.xml +++ b/desktop/font/fontforge/translations.xml @@ -6,8 +6,8 @@ FontForge kendi postscript, truetype, opentype, cid-keyed, multi-master, cff, svg, bitmap (bdf, FON, NFNT) fontlarınızı yaratmanıza veya hali hazırda varolan fontlarınızı düzenlemenize olanak tanıyan bir font düzenleyicidir. FontForge Macintosh font formatlarının çoğunu da desteklemektedir. - + diff --git a/distribution.xml b/distribution.xml index 69825f33aa..1810318bbc 100644 --- a/distribution.xml +++ b/distribution.xml @@ -166,5 +166,6 @@ xorg-video-tga xorg-video-mach64 xorg-video-glint + fontforge-devel diff --git a/pisi-index.xml b/pisi-index.xml index aacc5a6eed..c00af0b612 100644 --- a/pisi-index.xml +++ b/pisi-index.xml @@ -1397,56 +1397,61 @@ FontForge is a font editor that lets you create your own postscript, truetype, opentype, cid-keyed, multi-master, cff, svg and bitmap (bdf, FON, NFNT) fonts, or edit existing ones. Also lets you convert one format to another. FontForge also has support for many macintosh font formats. FontForge kendi postscript, truetype, opentype, cid-keyed, multi-master, cff, svg, bitmap (bdf, FON, NFNT) fontlarınızı yaratmanıza veya hali hazırda varolan fontlarınızı düzenlemenize olanak tanıyan bir font düzenleyicidir. FontForge Macintosh font formatlarının çoğunu da desteklemektedir. fontforge - https://github.com/fontforge/fontforge/releases/download/20190801/fontforge-20190801.tar.gz - https://fontforge.github.io/cidmaps.tgz + https://github.com/fontforge/fontforge/releases/download/20220308/fontforge-20220308.tar.xz + https://fontforge.github.io/cidmaps.tgz git + cmake + libtool + xdg-utils + gtk3-devel + tiff-devel + libXi-devel + cairo-devel + pango-devel + libtool-ltdl + libpng-devel + libXft-devel + giflib-devel + python3-devel + libxml2-devel + freetype-devel + readline-devel + python3-sphinx + libspiro-devel + fontconfig-devel shared-mime-info desktop-file-utils libjpeg-turbo-devel - tiff-devel - cairo-devel - pango-devel - libpng-devel - libXft-devel - libXi-devel - giflib-devel - libspiro-devel - xdg-utils - fontconfig-devel - python3-devel - libxml2-devel - readline-devel - libtool-ltdl - - fontforge-20190801-fix-metainfo.xml-file.patch - desktop/font/fontforge/pspec.xml fontforge + gtk3 zlib - glib2 - libX11 - libpng - python3 - libxml2 - freetype - readline - libtool-ltdl tiff cairo libXi pango + glib2 + libX11 + libpng libXft giflib + potrace + python3 + libxml2 + freetype + readline libspiro + libtool-ltdl libjpeg-turbo - /usr/lib + /usr/lib/libfontforge.so* + /usr/lib/python3.9/site-packages /usr/share/doc /usr/share/man /usr/bin @@ -1460,24 +1465,14 @@ /usr/share/locale - - fontforge-devel - Development files for fontforge - fontforge için geliştirme dosyaları - - tiff-devel - pango-devel - cairo-devel - zlib-devel - python3-devel - fontforge - - - /usr/include - /usr/lib/pkgconfig - - + + 2022-04-02 + 2.0.20220308 + Version bump + Mustafa Cinasal + muscnsl@gmail.com + 2020-01-18 2.0.20190801 diff --git a/pisi-index.xml.sha1sum b/pisi-index.xml.sha1sum index 88e7c2e8a0..99c2bfab01 100644 --- a/pisi-index.xml.sha1sum +++ b/pisi-index.xml.sha1sum @@ -1 +1 @@ -1f913eb6585645ac3a8679eea7d797f5000087bc \ No newline at end of file +ff3df9624ed02e038c5fa626a9e1ef26d161a9e9 \ No newline at end of file diff --git a/pisi-index.xml.xz b/pisi-index.xml.xz index 54f549b369..1834739333 100644 Binary files a/pisi-index.xml.xz and b/pisi-index.xml.xz differ diff --git a/pisi-index.xml.xz.sha1sum b/pisi-index.xml.xz.sha1sum index 00e93c165e..dc38cca7d0 100644 --- a/pisi-index.xml.xz.sha1sum +++ b/pisi-index.xml.xz.sha1sum @@ -1 +1 @@ -6ee44815a2782cefd629cd752ffaabc53cfcf966 \ No newline at end of file +619647ec4df739d35e671bf6964a60c9cb9a2ecb \ No newline at end of file