Update to ktikz 0.12

switches to qt5, so that's one less consumer for poppler-qt4..

ok pirofti@ (maintainer)
This commit is contained in:
landry 2018-12-28 19:02:40 +00:00
parent e26a1161d1
commit 30ccb065e4
5 changed files with 19 additions and 47 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.8 2018/07/01 18:33:35 espie Exp $
# $OpenBSD: Makefile,v 1.9 2018/12/28 19:02:40 landry Exp $
COMMENT = editor for the TikZ language
V = 0.10
DISTNAME = ktikz_${V}
PKGNAME = KtikZ-${V}
REVISION = 4
GH_ACCOUNT = fhackenberger
GH_PROJECT = ktikz
GH_TAGNAME = 0.12
PKGNAME = KtikZ-${GH_TAGNAME}
CATEGORIES = editors
HOMEPAGE = http://www.hackenberger.at/blog/ktikz-editor-for-the-tikz-language/
@ -15,37 +14,30 @@ MAINTAINER = Paul Irofti <pirofti@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = http://www.hackenberger.at/ktikz/
WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5PrintSupport Qt5Widgets c m poppler-qt5
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += ICE QtGui QtXml SM X11 Xext Xi Xinerama Xrender c fontconfig
WANTLIB += freetype m pthread poppler-qt4
MODULES = x11/qt5 \
devel/qmake
MODULES = devel/qmake \
x11/qt4
MODQMAKE_ARGS= DESKTOPDIR=${LOCALBASE}/share/applications \
ICONDIR=${LOCALBASE}/share/pixmaps \
MIMEDIR=${LOCALBASE}/share/mime/packages \
MANDIR=${LOCALBASE}/man \
LRELEASECOMMAND=${LOCALBASE}/bin/lrelease4 \
QCOLLECTIONGENERATORCOMMAND=${LOCALBASE}/lib/qt4/bin/qcollectiongenerator
MODQMAKE_ARGS= DESKTOP_INSTALL_DIR=${LOCALBASE}/share/applications \
MIME_INSTALL_DIR=${LOCALBASE}/share/mime/packages \
MAN_INSTALL_DIR=${LOCALBASE}/man \
LRELEASECOMMAND=${LOCALBASE}/bin/lrelease-qt5 \
QCOLLECTIONGENERATORCOMMAND=${LOCALBASE}/lib/qt5/bin/qcollectiongenerator
# c++-11 reqwuired for poppler
COMPILER= base-clang ports-gcc
MAKE_ENV = MAKEOBJDIR=.
WRKDIST = ${WRKDIR}/ktikz
MODQMAKE_PROJECTS = qtikz.pro \
app/app.pro
MODQMAKE_PROJECTS = qtikz.pro
RUN_DEPENDS = print/texlive/base \
print/poppler,-utils \
misc/shared-mime-info \
devel/desktop-file-utils
# XXX: pkg_add poppler-qt4 because otherwise it pulls qt5 as well
LIB_DEPENDS = print/poppler,,-qt4
LIB_DEPENDS = print/poppler,,-qt5
NO_TEST = Yes

View File

@ -1,2 +1,2 @@
SHA256 (ktikz_0.10.tar.gz) = MdGKsukges9VB+10u2848GsqLrKqivLgWHvwdnIiVKY=
SIZE (ktikz_0.10.tar.gz) = 1527034
SHA256 (ktikz-0.12.tar.gz) = 7xX+cPTgV+q3Ttc4iG+OSlPVsbzfHuMpkwvwbiL1bp0=
SIZE (ktikz-0.12.tar.gz) = 2039771

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-app_app_pro,v 1.1.1.1 2017/03/28 07:24:40 pirofti Exp $
--- app/app.pro.orig Mon Mar 27 00:15:41 2017
+++ app/app.pro Mon Mar 27 00:15:48 2017
@@ -1,4 +1,4 @@
-include(../conf.pri)
+#include(../conf.pri)
include(../defaults.pri)
include(../macros.pri)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-qtikz_pro,v 1.1.1.1 2017/03/28 07:24:40 pirofti Exp $
--- qtikz.pro.orig Mon Mar 27 00:10:14 2017
+++ qtikz.pro Mon Mar 27 00:10:20 2017
@@ -8,7 +8,7 @@ CONFIG += warn_on \
qt \
thread
-include(conf.pri)
+#include(conf.pri)
include(defaults.pri)
message(*** QTikZ v$${APPVERSION} ***)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2018/07/01 18:33:35 espie Exp $
@comment $OpenBSD: PLIST,v 1.4 2018/12/28 19:02:40 landry Exp $
@bin bin/qtikz
@man man/man1/qtikz.1
share/applications/qtikz.desktop
@ -9,6 +9,7 @@ share/qtikz/documentation/
share/qtikz/documentation/qtikz.qch
share/qtikz/documentation/qtikz.qhc
share/qtikz/locale/
share/qtikz/locale/qtikz_cs.qm
share/qtikz/locale/qtikz_de.qm
share/qtikz/locale/qtikz_es.qm
share/qtikz/locale/qtikz_fr.qm