On Mon, Dec 10, 2018 at 11:01:48AM +0100, Landry Breuil wrote:
> On Mon, Dec 10, 2018 at 10:47:11AM +0100, Matthias Kilian wrote:
> > [answering to ports@]
> >
> > On Sun, Dec 09, 2018 at 10:31:21PM +0100, Antoine Jacoutot wrote:
> > > On Sun, Dec 09, 2018 at 10:47:46AM -0700, Matthias Kilian wrote:
> > > > CVSROOT: /cvs
> > > > Module name: ports
> > > > Changes by: k...@cvs.openbsd.org 2018/12/09 10:47:46
> > > >
> > > > Modified files:
> > > > print/poppler : Makefile distinfo
> > > > print/poppler/patches: patch-poppler_Form_cc
> > > > patch-poppler_XRef_cc
> > > > print/poppler/pkg: PLIST-main PLIST-qt4 PLIST-qt5
> > > > Removed files:
> > > > print/poppler/patches: patch-qt5_src_Makefile_in
> > > >
> > > > Log message:
> > > > Update to poppler-0.61.1.
> > > >
> > > > This is the last version containing qt4 bindings.
> > > > Update to 0.72 will happen when I've fixed build
> > > > problems of qt4 bindings from 0.61.1 with newer
> > > > versions of poppler.
> > >
> > > Do we really want to keep these bindings?
> >
> > I don't know. The following ports still seem to use them (according to
> > a quick grep through the ports tree):
> >
> > editors/ktikz
>
> https://github.com/fhackenberger/ktikz/commit/207af3ea668eb8c4cafe46c29a3dfd0363cda679
> seems to say it now supports qt5
Simple update to 0.12 attached, now uses qt5. Completely untested at
runtime of course :) Paul, do you still use that ? Im not sure the KtikZ
pkgname casing still makes sense..
> > editors/texworks
>
> https://github.com/TeXworks/texworks/releases seem to say that qt5 is
> supported
Our version is from 2012, and qt5 is the default since 0.6 per
https://raw.githubusercontent.com/TeXworks/texworks/release-0.6.2/NEWS -
edd@, care to update it ?
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/ktikz/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile 1 Jul 2018 18:33:35 -0000 1.8
+++ Makefile 10 Dec 2018 11:11:09 -0000
@@ -2,11 +2,10 @@
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 @@
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = http://www.hackenberger.at/ktikz/
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5PrintSupport Qt5Widgets c m
poppler-qt5
+
+MODULES = x11/qt5 \
+ devel/qmake
-WANTLIB += ${COMPILER_LIBCXX}
-WANTLIB += ICE QtGui QtXml SM X11 Xext Xi Xinerama Xrender c fontconfig
-WANTLIB += freetype m pthread poppler-qt4
-
-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
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/ktikz/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo 28 Mar 2017 07:24:40 -0000 1.1.1.1
+++ distinfo 10 Dec 2018 11:11:09 -0000
@@ -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
Index: patches/patch-app_app_pro
===================================================================
RCS file: patches/patch-app_app_pro
diff -N patches/patch-app_app_pro
--- patches/patch-app_app_pro 28 Mar 2017 07:24:40 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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)
-
Index: patches/patch-qtikz_pro
===================================================================
RCS file: patches/patch-qtikz_pro
diff -N patches/patch-qtikz_pro
--- patches/patch-qtikz_pro 28 Mar 2017 07:24:40 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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} ***)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/ktikz/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST 1 Jul 2018 18:33:35 -0000 1.3
+++ pkg/PLIST 10 Dec 2018 11:11:09 -0000
@@ -9,6 +9,7 @@
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
