CVS commit: pkgsrc/textproc

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jul 27 07:39:12 UTC 2018

Modified Files:
        pkgsrc/textproc/highlight: PLIST options.mk
        pkgsrc/textproc/libhighlight: distinfo
Added Files:
        pkgsrc/textproc/libhighlight/patches: patch-src_gui-qt_mainwindow.cpp
            patch-src_gui-qt_showtextfile.cpp

Log Message:
Fix textproc/highlight build with 'x11' option.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/highlight/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/highlight/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/libhighlight/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp \
    pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_showtextfile.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/highlight/PLIST
diff -u pkgsrc/textproc/highlight/PLIST:1.7 pkgsrc/textproc/highlight/PLIST:1.8
--- pkgsrc/textproc/highlight/PLIST:1.7 Mon Apr  9 20:17:46 2018
+++ pkgsrc/textproc/highlight/PLIST     Fri Jul 27 07:39:12 2018
@@ -1,11 +1,14 @@
-@comment $NetBSD: PLIST,v 1.7 2018/04/09 20:17:46 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.8 2018/07/27 07:39:12 schmonz Exp $
 bin/highlight
 ${PLIST.x11}bin/highlight-gui
 man/man1/highlight.1
 ${PLIST.x11}share/applications/highlight.desktop
 ${PLIST.x11}share/highlight/gui_files/ext/fileopenfilter.conf
+${PLIST.x11}share/highlight/gui_files/l10n/highlight_bg_BG.qm
 ${PLIST.x11}share/highlight/gui_files/l10n/highlight_cs_CZ.qm
 ${PLIST.x11}share/highlight/gui_files/l10n/highlight_de_DE.qm
 ${PLIST.x11}share/highlight/gui_files/l10n/highlight_es_ES.qm
+${PLIST.x11}share/highlight/gui_files/l10n/highlight_fr_FR.qm
+${PLIST.x11}share/highlight/gui_files/l10n/highlight_it_IT.qm
 ${PLIST.x11}share/highlight/gui_files/l10n/highlight_zh_CN.qm
 ${PLIST.x11}share/pixmaps/highlight.xpm

Index: pkgsrc/textproc/highlight/options.mk
diff -u pkgsrc/textproc/highlight/options.mk:1.2 pkgsrc/textproc/highlight/options.mk:1.3
--- pkgsrc/textproc/highlight/options.mk:1.2    Thu May  3 13:13:50 2018
+++ pkgsrc/textproc/highlight/options.mk        Fri Jul 27 07:39:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2018/05/03 13:13:50 schmonz Exp $
+# $NetBSD: options.mk,v 1.3 2018/07/27 07:39:12 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.highlight
 PKG_SUPPORTED_OPTIONS= x11
@@ -7,8 +7,10 @@ PKG_SUPPORTED_OPTIONS= x11
 
 PLIST_VARS+=           x11
 .if !empty(PKG_OPTIONS:Mx11)
-.include "../../x11/qt5-qttools/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 BUILD_TARGET+=         gui
 INSTALL_TARGET+=       install-gui
 PLIST.x11=             yes
+pre-configure:
+       ${LN} -sf ${QTDIR}/bin/qmake ${TOOLS_DIR}/bin
 .endif

Index: pkgsrc/textproc/libhighlight/distinfo
diff -u pkgsrc/textproc/libhighlight/distinfo:1.3 pkgsrc/textproc/libhighlight/distinfo:1.4
--- pkgsrc/textproc/libhighlight/distinfo:1.3   Mon Jul 23 05:16:43 2018
+++ pkgsrc/textproc/libhighlight/distinfo       Fri Jul 27 07:39:12 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2018/07/23 05:16:43 schmonz Exp $
+$NetBSD: distinfo,v 1.4 2018/07/27 07:39:12 schmonz Exp $
 
 SHA1 (highlight-3.44.tar.bz2) = c01ea650bc9462df833afa59e566be32cd47e3f0
 RMD160 (highlight-3.44.tar.bz2) = d7997c545d98c21c2fd09f68989e3cb8cf3713da
@@ -7,4 +7,6 @@ Size (highlight-3.44.tar.bz2) = 1335764 
 SHA1 (patch-extras_swig_makefile) = 2bb62f7519cd5baed60b1af5f606ce22444c346f
 SHA1 (patch-makefile) = c3ba1882befaf0293ad4ff69b2b6067d42bb3e57
 SHA1 (patch-src_core_platform__fs.cpp) = 65b7f4b665b820eec4b835474bd308e49080526e
+SHA1 (patch-src_gui-qt_mainwindow.cpp) = d073a80a1d853f9cc2bbedf7a402125ec7a994d2
+SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
 SHA1 (patch-src_makefile) = 6d9343af73f1d9cc1cd62958c654089865f1a2bc

Added files:

Index: pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp
diff -u /dev/null pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp:1.1
--- /dev/null   Fri Jul 27 07:39:12 2018
+++ pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp        Fri Jul 27 07:39:12 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_gui-qt_mainwindow.cpp,v 1.1 2018/07/27 07:39:12 schmonz Exp $
+
+Use X11 on Darwin, like everywhere else.
+
+--- src/gui-qt/mainwindow.cpp.orig     2018-07-19 17:57:22.000000000 +0000
++++ src/gui-qt/mainwindow.cpp
+@@ -36,6 +36,8 @@ along with Highlight.  If not, see <http
+ #include "io_report.h"
+ #include "syntax_chooser.h"
+ 
++#undef Q_OS_OSX
++
+ MainWindow::MainWindow(QWidget *parent)
+     : QMainWindow(parent), ui(new Ui::MainWindowClass), themesClassicIdx(0), themesBase16Idx(0), getDataFromCP(false)
+ {
Index: pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_showtextfile.cpp
diff -u /dev/null pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_showtextfile.cpp:1.1
--- /dev/null   Fri Jul 27 07:39:12 2018
+++ pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_showtextfile.cpp      Fri Jul 27 07:39:12 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_gui-qt_showtextfile.cpp,v 1.1 2018/07/27 07:39:12 schmonz Exp $
+
+Use X11 on Darwin, like everywhere else.
+
+--- src/gui-qt/showtextfile.cpp.orig   2018-07-19 17:57:22.000000000 +0000
++++ src/gui-qt/showtextfile.cpp
+@@ -30,6 +30,8 @@ along with Highlight.  If not, see <http
+ #include <QFile>
+ #include <QDir>
+ 
++#undef Q_OS_OSX
++
+ ShowTextFile::ShowTextFile(QWidget *parent) :
+     QDialog(parent),
+     m_ui(new Ui::ShowTextFile)