diff --git a/common/shlibs b/common/shlibs index 575e90e348d..e35a84f11fb 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1836,7 +1836,7 @@ libephysics.so.1 efl-1.11.2_2 libgunicode.so.5 fontforge-2.0.20190317_1 libgutils.so.3 fontforge-2.0.20190317_1 libgioftp.so.2 fontforge-2.0.20140101_3 -libfontforge.so.3 fontforge-2.0.20190317_1 +libfontforge.so.4 fontforge-20200314_1 libgdraw.so.6 fontforge-2.0.20190317_1 libfontforgeexe.so.3 fontforge-2.0.20190317_1 libwraster.so.6 WindowMaker-0.95.8_1 diff --git a/srcpkgs/fontforge-devel b/srcpkgs/fontforge-devel deleted file mode 120000 index 8253f0559c6..00000000000 --- a/srcpkgs/fontforge-devel +++ /dev/null @@ -1 +0,0 @@ -fontforge \ No newline at end of file diff --git a/srcpkgs/fontforge/template b/srcpkgs/fontforge/template index a485e9d06e9..2f5fb442ba7 100644 --- a/srcpkgs/fontforge/template +++ b/srcpkgs/fontforge/template @@ -1,13 +1,14 @@ # Template file for 'fontforge' pkgname=fontforge -version=20190801 -revision=3 -build_style=gnu-configure -hostmakedepends="automake ca-certificates git libltdl-devel libtool m4 +version=20200314 +revision=1 +build_style=cmake +hostmakedepends="automake ca-certificates gettext git libltdl-devel libtool m4 pkg-config python3" makedepends="libltdl-devel python3-devel zlib-devel pango-devel readline-devel giflib-devel libpng-devel libjpeg-turbo-devel tiff-devel libxml2-devel - libspiro-devel hicolor-icon-theme desktop-file-utils libuninameslist-devel" + libspiro-devel hicolor-icon-theme desktop-file-utils libuninameslist-devel + gtk+3-devel" depends="desktop-files-utils" depends="hicolor-icon-theme desktop-file-utils" short_desc="Create and modify PostScript, TrueType and SVG fonts" @@ -16,36 +17,14 @@ license="GPL-3.0-or-later" homepage="http://fontforge.github.io/en-US/" distfiles="https://github.com/fontforge/fontforge/archive/${version}.tar.gz http://fontforge.github.io/cidmaps.tgz" -checksum="e4501de5bd8e7f6c68fe7d3abd4667bf44a07b981d342ffa00e8f42e155ce633 +checksum="ad0eb017379c6f7489aa8e2d7c160f19140d1ac6351f20df1d9857d9428efcf2 1bf9c7eb8835e6ed94e62cb49f1141bc046c562849e52e6c3c7f1d7cfc95c7b3" -pre_configure() { - # Fix linking to python 3.8 - vsed -e 's|python-"${PYTHON_VERSION}"|python-"${PYTHON_VERSION}"-embed|g' -i m4/fontforge_arg_enable.m4 - ./bootstrap -} - -pre_build() { +post_extract() { # Disable unused #include - sed -i fontforge/cvundoes.c -e "s;\(.*#include \);//\1;" + vsed -i fontforge/cvundoes.c -e "s;\(.*#include \);//\1;" } post_install() { vcopy ../Adobe-* usr/share/fontforge - vmkdir usr/share/icons/hicolor - vcopy "desktop/tango/*x*" usr/share/icons/hicolor - vcopy desktop/tango/scalable usr/share/icons/hicolor - vinstall desktop/org.fontforge.FontForge.desktop 644 usr/share/applications - vinstall desktop/fontforge.xml 644 /usr/share/mime/packages -} - -fontforge-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" -- development files" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - } }