svn commit: r511991 - in head: . x11-fonts x11-fonts/fontmatrix x11-fonts/fontmatrix/files
Emanuel Haupt
ehaupt at FreeBSD.org
Fri Sep 13 20:51:31 UTC 2019
Author: ehaupt
Date: Fri Sep 13 20:51:29 2019
New Revision: 511991
URL: https://svnweb.freebsd.org/changeset/ports/511991
Log:
Resurrect x11-fonts/fontmatrix. Upstream project has been forked and ported from
Qt4 to the Qt5 framework.
Take maintainership.
Added:
head/x11-fonts/fontmatrix/
- copied from r495966, head/x11-fonts/fontmatrix/
head/x11-fonts/fontmatrix/files/patch-CMakeLists.txt (contents, props changed)
head/x11-fonts/fontmatrix/files/patch-src_fmutils.cpp (contents, props changed)
Deleted:
head/x11-fonts/fontmatrix/files/patch-src__CMakeLists.txt
head/x11-fonts/fontmatrix/files/patch-src__prefspaneldialog.h
Modified:
head/MOVED
head/x11-fonts/Makefile
head/x11-fonts/fontmatrix/Makefile
head/x11-fonts/fontmatrix/distinfo
head/x11-fonts/fontmatrix/pkg-descr
head/x11-fonts/fontmatrix/pkg-plist
Modified: head/MOVED
==============================================================================
--- head/MOVED Fri Sep 13 20:48:38 2019 (r511990)
+++ head/MOVED Fri Sep 13 20:51:29 2019 (r511991)
@@ -11925,7 +11925,6 @@ x11/py-qt4-opengl||2019-03-16|Has expired: Qt4 has bee
x11/qt4-graphicssystems-opengl||2019-03-16|Has expired: Qt4 has been EOL since december 2015
x11/qt4-inputmethods||2019-03-16|Has expired: Qt4 has been EOL since december 2015
x11/qxkb||2019-03-16|Has expired: Qt4 has been EOL since december 2015
-x11-fonts/fontmatrix||2019-03-16|Has expired: Qt4 has been EOL since december 2015
x11-themes/qt4-style-float||2019-03-16|Has expired: Qt4 has been EOL since december 2015
x11-themes/qt4-style-phase||2019-03-16|Has expired: Qt4 has been EOL since december 2015
x11-themes/qt4-style-quantumstyle||2019-03-16|Has expired: Qt4 has been EOL since december 2015
Modified: head/x11-fonts/Makefile
==============================================================================
--- head/x11-fonts/Makefile Fri Sep 13 20:48:38 2019 (r511990)
+++ head/x11-fonts/Makefile Fri Sep 13 20:51:29 2019 (r511991)
@@ -98,6 +98,7 @@
SUBDIR += font-xfree86-type1
SUBDIR += fontconfig
SUBDIR += fontconfig-reference
+ SUBDIR += fontmatrix
SUBDIR += fonts-indic
SUBDIR += fonttosfnt
SUBDIR += freefont-ttf
Modified: head/x11-fonts/fontmatrix/Makefile
==============================================================================
--- head/x11-fonts/fontmatrix/Makefile Sat Mar 16 21:52:35 2019 (r495966)
+++ head/x11-fonts/fontmatrix/Makefile Fri Sep 13 20:51:29 2019 (r511991)
@@ -1,46 +1,25 @@
# $FreeBSD$
PORTNAME= fontmatrix
-DISTVERSIONPREFIX= v
-DISTVERSION= 0.6.0
+DISTVERSION= g20190429
CATEGORIES= x11-fonts
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= ehaupt at FreeBSD.org
COMMENT= Graphical font manager
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-DEPRECATED= Qt4 has been EOL since december 2015
-EXPIRATION_DATE= 2019-03-15
+LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
-BROKEN_armv6= fails to compile: src/fminfodisplay.cpp:155:17: no matching function for call to 'qMax'
-BROKEN_armv7= fails to compile: src/fminfodisplay.cpp:155:17: no matching function for call to 'qMax'
+USES= cmake qt:5
-RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
-LIB_DEPENDS= libfreetype.so:print/freetype2 \
- libfontconfig.so:x11-fonts/fontconfig
-
USE_GITHUB= yes
-GH_ACCOUNT= fontmatrix
+USE_QT= buildtools core gui linguisttools network printsupport \
+ qmake_build sql svg webkit widgets xml
-USES= cmake qt:4
-USE_QT= corelib xml gui svg network moc_build uic_build rcc_build qmake_build \
- linguisttools_build opengl sql webkit
-INSTALLS_ICONS= yes
-MANDIRS= ${PREFIX}/share/man/man1
-
-OPTIONS_DEFINE= FONTFORGE
-FONTFORGE_DESC= Install FontForge editor
-FONTFORGE_RUN_DEPENDS= ${LOCALBASE}/bin/fontforge:print/fontforge
-
-post-patch:
- @${REINPLACE_CMD} -e 's:/usr/bin/fontforge:${LOCALBASE}/bin/fontforge:g' \
- ${WRKSRC}/src/prefs_panel.ui ${WRKSRC}/src/typotek.cpp
-
-pre-configure:
- cd ${WRKSRC}/src/messages && \
- ${LUPDATE} -noobsolete ../ -ts *.ts && \
- ${LRELEASE} *.ts
+GH_ACCOUNT= fcoiffie
+GH_TAGNAME= 51dd8f2
.include <bsd.port.mk>
Modified: head/x11-fonts/fontmatrix/distinfo
==============================================================================
--- head/x11-fonts/fontmatrix/distinfo Sat Mar 16 21:52:35 2019 (r495966)
+++ head/x11-fonts/fontmatrix/distinfo Fri Sep 13 20:51:29 2019 (r511991)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487605409
-SHA256 (fontmatrix-fontmatrix-v0.6.0_GH0.tar.gz) = fa3ca2b189115c24c628f15334e0b506298d7a16e294bcc21bde79cba9c44a84
-SIZE (fontmatrix-fontmatrix-v0.6.0_GH0.tar.gz) = 2448848
+TIMESTAMP = 1568052852
+SHA256 (fcoiffie-fontmatrix-g20190429-51dd8f2_GH0.tar.gz) = a302e2ce1cad6c669e529f7fe95368d7bc0ecf1c8aa9685757f70efdaec0f6e5
+SIZE (fcoiffie-fontmatrix-g20190429-51dd8f2_GH0.tar.gz) = 1985176
Added: head/x11-fonts/fontmatrix/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-fonts/fontmatrix/files/patch-CMakeLists.txt Fri Sep 13 20:51:29 2019 (r511991)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig 2019-04-29 07:46:55 UTC
++++ CMakeLists.txt
+@@ -209,7 +209,7 @@ ADD_SUBDIRECTORY(src)
+
+ IF(UNIX AND NOT APPLE)
+ SET(DESKTOPDIR "share/applications/")
+- SET(MANDIR "share/man/")
++ SET(MANDIR "man/")
+ SET(ICONDIR "share/icons/hicolor/48x48/apps/")
+ SET(RESOURCESDIR "share/fontmatrix/resources/")
+ SET(HELPDIR "share/fontmatrix/help/")
Added: head/x11-fonts/fontmatrix/files/patch-src_fmutils.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-fonts/fontmatrix/files/patch-src_fmutils.cpp Fri Sep 13 20:51:29 2019 (r511991)
@@ -0,0 +1,18 @@
+--- src/fmutils.cpp.orig 2019-04-29 07:46:55 UTC
++++ src/fmutils.cpp
+@@ -12,7 +12,7 @@
+
+ #include "fmutils.h"
+
+-#if !defined(_WIN32) && !defined(Q_OS_MAC)
++#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(__FreeBSD__)
+ #include <execinfo.h>
+ #include <cxxabi.h>
+ #include <cstdlib>
+@@ -68,4 +68,4 @@ void printBacktrace ( int frames )
+ }
+
+
+-#endif
+\ No newline at end of file
++#endif
Modified: head/x11-fonts/fontmatrix/pkg-descr
==============================================================================
--- head/x11-fonts/fontmatrix/pkg-descr Sat Mar 16 21:52:35 2019 (r495966)
+++ head/x11-fonts/fontmatrix/pkg-descr Fri Sep 13 20:51:29 2019 (r511991)
@@ -5,4 +5,4 @@ of font dialogs. Basically, the Fontmatrix helps doing
activation and deactivation of fonts, tagging fonts and fontbook
generation.
-WWW: http://www.fontmatrix.net/
+WWW: https://github.com/fcoiffie/fontmatrix
Modified: head/x11-fonts/fontmatrix/pkg-plist
==============================================================================
--- head/x11-fonts/fontmatrix/pkg-plist Sat Mar 16 21:52:35 2019 (r495966)
+++ head/x11-fonts/fontmatrix/pkg-plist Fri Sep 13 20:51:29 2019 (r511991)
@@ -1,7 +1,6 @@
bin/fontmatrix
+man/man1/fontmatrix.1.gz
share/applications/fontmatrix.desktop
-share/icons/hicolor/48x48/apps/fontmatrix.png
-share/man/man1/fontmatrix.1.gz
%%DATADIR%%/help/en/additional.html
%%DATADIR%%/help/en/additional_db_check.html
%%DATADIR%%/help/en/additional_editing_panose.html
@@ -121,6 +120,7 @@ share/man/man1/fontmatrix.1.gz
%%DATADIR%%/resources/template_default.xml
%%DATADIR%%/resources/template_oneline.png
%%DATADIR%%/resources/template_oneline.xml
+%%DATADIR%%/resources/welcome_cs.html
%%DATADIR%%/resources/welcome_da.html
%%DATADIR%%/resources/welcome_de.html
%%DATADIR%%/resources/welcome_en.html
@@ -136,3 +136,4 @@ share/man/man1/fontmatrix.1.gz
%%DATADIR%%/resources/welcome_uk.html
%%DATADIR%%/resources/welcome_zh_CN.html
%%DATADIR%%/resources/welcome_zh_TW.html
+share/icons/hicolor/48x48/apps/fontmatrix.png
More information about the svn-ports-all
mailing list