--- pgl-2.3.1.old/configure.ac 2018-01-29 15:36:56.208142640 +0100 +++ pgl-2.3.1.old/configure.ac 2018-01-29 15:37:57.227785570 +0100 @@ -212,29 +212,28 @@ ## # initial QT_flags -QT_CXXFLAGS="" +QT_CXXFLAGS="-fPIC" QT_CPPFLAGS="-DVERSION=\\\"$VERSION\\\" -D_REENTRANT -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED" QT_LDFLAGS="" QT_LIBS="" +QT_MODULES="Qt5Core Qt5Gui Qt5Widgets" -# configure-switch for qt4 -AC_ARG_WITH([qt4], - [AS_HELP_STRING([--without-qt4], +# configure-switch for qt5 +AC_ARG_WITH([qt5], + [AS_HELP_STRING([--without-qt5], [build without gui])], - [with_qt4="$withval"], - [with_qt4="yes"]) # this only reflects the default ("if not given") + [with_qt5="$withval"], + [with_qt5="yes"]) # this only reflects the default ("if not given") -# modify QT4_flags if qt4 enabled and +# modify QT5_flags if qt5 enabled and # include pglgui as subdir in Makefile.am (QT_SUB) -AS_IF([test "x$with_qt4" = "xyes"], +AS_IF([test "x$with_qt5" = "xyes"], [AS_IF([test "x$enable_dbus" = "xyes"], - [PKG_CHECK_MODULES([QT4DBUS], [QtDBus])], - [AC_MSG_ERROR([qt4 needs dbus!])])] - [AC_CHECK_QT4(["4.3.0"])] # from qt4.m4 - [PKG_CHECK_MODULES([QT4], [QtCore QtGui])] + [QT_MODULES="$QT_MODULES Qt5DBus"])] + [AC_CHECK_QT5(["5.0.0"], ["$QT_MODULES"])] #from qt5.m4 [AC_SEARCH_LIBS([pthread_create], [pthread])] # adds -lpthread to LIBS - [QT_CPPFLAGS="$QT_CPPFLAGS $QT4_CFLAGS $QT4DBUS_CFLAGS"] - [QT_LIBS="$QT_LIBS $QT4_LIBS $QT4DBUS_LIBS"] + [QT_CPPFLAGS="$QT_CPPFLAGS $QT_CFLAGS"] + [QT_LIBS="$QT_LIBS"] [QT_SUB="pglgui"]) # targets @@ -315,7 +314,7 @@ else echo lowmem....................................... : no fi -if test "x$with_qt4" = "xyes"; then +if test "x$with_qt5" = "xyes"; then echo QT-gui....................................... : yes else echo QT-gui....................................... : no --- pgl-2.3.1.old/debian/control 2018-01-29 15:36:56.207142596 +0100 +++ pgl-2.3.1.old/debian/control 2018-01-29 15:38:25.036573721 +0100 @@ -11,8 +11,8 @@ libdbus-1-dev, libnetfilter-queue-dev (>= 1.0~), libnfnetlink-dev, - libqt4-dev, po-debconf, + qtbase5-dev, zlib1g-dev, Build-Conflicts: autoconf2.13, @@ -131,7 +131,7 @@ . pgl is based on the Linux kernel netfilter framework and iptables. . - This is the pgl Graphical User Interface pglgui (C++, Qt4). + This is the pgl Graphical User Interface pglgui (C++, Qt). Package: pglgui-dbg Section: debug @@ -152,6 +152,6 @@ . pgl is based on the Linux kernel netfilter framework and iptables. . - This is the pgl Graphical User Interface pglgui (C++, Qt4). + This is the pgl Graphical User Interface pglgui (C++, Qt). . This package contains the debugging symbols for pglgui. --- pgl-2.3.1.old/debian/control.orig 1970-01-01 01:00:00.000000000 +0100 +++ pgl-2.3.1.old/debian/control.orig 2015-11-16 20:44:32.000000000 +0100 @@ -0,0 +1,157 @@ +Source: pgl +Maintainer: PeerGuardian Linux Developers +Uploaders: + jre , +Section: net +Priority: optional +Build-Depends: + autoconf (>= 2.68~), + debhelper (>= 9~), + dh-autoreconf, + libdbus-1-dev, + libnetfilter-queue-dev (>= 1.0~), + libnfnetlink-dev, + libqt4-dev, + po-debconf, + zlib1g-dev, +Build-Conflicts: + autoconf2.13, + automake1.4, +Standards-Version: 3.9.6 +Bugs: mailto:peerguardian-devel@lists.sourceforge.net +Homepage: http://peerguardian.sourceforge.net/ +Vcs-Browser: http://peerguardian.git.sourceforge.net/ +Vcs-Git: git://git.code.sf.net/p/peerguardian/code + +Package: pgld +Architecture: any +Multi-Arch: foreign +Depends: + iptables, + ${misc:Depends}, + ${shlibs:Depends}, +Recommends: + dbus, + pglcmd, + pglgui, +Breaks: + moblock (<< 2~), +Replaces: + moblock (<< 2~), +Conflicts: + iplist, + nfblock, +Description: PeerGuardian Linux - pgld + PeerGuardian is a privacy oriented firewall application. It blocks connections + to and from hosts specified in huge blocklists (thousands or millions of IP + ranges). Its origins lie in targeting aggressive IPs while you use P2P. + . + pgl is based on the Linux kernel netfilter framework and iptables. + . + This is the pgl daemon pgld. It uses the netfilter xt_NFQUEUE kernel module. + +Package: pgld-dbg +Section: debug +Priority: extra +Architecture: any +Multi-Arch: foreign +Depends: + pgld (= ${binary:Version}), + ${misc:Depends}, +Description: PeerGuardian Linux - pgld (debug) + PeerGuardian is a privacy oriented firewall application. It blocks connections + to and from hosts specified in huge blocklists (thousands or millions of IP + ranges). Its origins lie in targeting aggressive IPs while you use P2P. + . + pgl is based on the Linux kernel netfilter framework and iptables. + . + This is the pgl daemon pgld. It uses the netfilter xt_NFQUEUE kernel module. + . + This package contains the debugging symbols for pgld. + +Package: pglcmd +Architecture: any +Multi-Arch: foreign +Depends: + iptables, + lsb-base, + pgld (= ${binary:Version}), + ${misc:Depends}, +Recommends: + p7zip | p7zip-full, + pglgui, + unzip, + wget, +Suggests: + mail-transport-agent, +Description: PeerGuardian Linux - pglcmd + PeerGuardian is a privacy oriented firewall application. It blocks connections + to and from hosts specified in huge blocklists (thousands or millions of IP + ranges). Its origins lie in targeting aggressive IPs while you use P2P. + . + pgl is based on the Linux kernel netfilter framework and iptables. + . + This is the pgl command line interface pglcmd. It provides easy ways to + interact with the pgl daemon and does all common related tasks. + . + Features: + - Start and stop pgld. Or let init do this automatically. + - Update your blocklists from online sources. Or let cron do this + automatically. Backups will be used if a problem occurs. Additionally you + may use your local blocklists. + - Remove lines by keyword from the blocklists. + - Handle your iptables rules: use a default setup, easily allow all traffic on + specific ports and use an allow list, or add your own sophisticated iptables + rules. + - Automatically make sure the LAN and the DNS server aren't blocked. If you + are on a public LAN, you probably want to disable this feature. + - Check the status and test pgl. + - Detects if kernel modules are needed and loads them if necessary. + - Set verbosity and logging options. + - Provides LSB 3.1 compatible init script. + - Daily rotation of the logfiles. + +Package: pglgui +Architecture: any +Multi-Arch: foreign +Depends: + pglcmd (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Breaks: + mobloquer (<< 2~), + pgl-gui, +Replaces: + mobloquer (<< 2~), + pgl-gui, +Description: PeerGuardian Linux GUI - pglgui + PeerGuardian is a privacy oriented firewall application. It blocks connections + to and from hosts specified in huge blocklists (thousands or millions of IP + ranges). Its origins lie in targeting aggressive IPs while you use P2P. + . + pgl is based on the Linux kernel netfilter framework and iptables. + . + This is the pgl Graphical User Interface pglgui (C++, Qt4). + +Package: pglgui-dbg +Section: debug +Priority: extra +Architecture: any +Multi-Arch: foreign +Depends: + pglgui (= ${binary:Version}), + ${misc:Depends}, +Breaks: + pgl-gui-dbg, +Replaces: + pgl-gui-dbg, +Description: PeerGuardian Linux GUI - pglgui (debug) + PeerGuardian is a privacy oriented firewall application. It blocks connections + to and from hosts specified in huge blocklists (thousands or millions of IP + ranges). Its origins lie in targeting aggressive IPs while you use P2P. + . + pgl is based on the Linux kernel netfilter framework and iptables. + . + This is the pgl Graphical User Interface pglgui (C++, Qt4). + . + This package contains the debugging symbols for pglgui. --- pgl-2.3.1.old/debian/copyright 2018-01-29 15:36:56.206142551 +0100 +++ pgl-2.3.1.old/debian/copyright 2018-01-29 15:38:25.037573766 +0100 @@ -138,7 +138,7 @@ Manually added ar-lib and config.h.in. See http://www.gnu.org/licenses/exceptions.html -Files: m4/qt4.m4 +Files: m4/qt5.m4 Copyright: 2004, 2007-2009, Juergen Heinemann, http://www.hjcms.de License: GPL-2+ This program is free software; you can redistribute it and/or modify --- pgl-2.3.1.old/debian/rules 2018-01-29 15:36:56.207142596 +0100 +++ pgl-2.3.1.old/debian/rules 2018-01-29 15:38:25.037573766 +0100 @@ -5,6 +5,10 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# Build with Qt5: +# See http://pkg-kde.alioth.debian.org/packagingqtbasedstuff.html +export QT_SELECT=5 + %: dh $@ --with autoreconf --- pgl-2.3.1.old/INSTALL 2018-01-29 15:36:56.211142774 +0100 +++ pgl-2.3.1.old/INSTALL 2018-01-29 15:38:11.708970395 +0100 @@ -51,7 +51,15 @@ autoreconf -Step 3.1: Configure +Step 3.1: Set correct Qt version. +--------------------------------- + +If you have multiple Qt versions installed on your system you might have to use +qtchooser to select Qt5: + export QT_SELECT=5 + + +Step 3.2: Configure ------------------- Pgl uses autotools which comes with several configure-switches you have @@ -76,7 +84,7 @@ For a slick installation you can build without the GUI and turn off dbus support: - --without-qt4 + --without-qt5 --disable-dbus Especially for embedded devices (like router or NAS box) you might disable @@ -106,7 +114,7 @@ --enable-logrotate \ --enable-networkmanager \ --enable-zlib \ - --with-qt4 \ + --with-qt5 \ --disable-lowmem Minimal example line for a complete build and full system integration (on a @@ -195,7 +203,7 @@ - libnetfilter-queue development files (>= 1.0, or use the git pgl_backport branch if you have a lower version) - libdbus development files (optional, required for the GUI) -- Qt4 development files including Qt4 dbus (optional, required for the GUI) +- Qt5 development files including Qt dbus (optional, required for the GUI) - zlib development files (optional, for loading gz compressed blocklists directly) @@ -243,7 +251,7 @@ Runtime environment pglgui: - pgld - pglcmd -- Qt4 +- Qt5 - dbus - whois --- pgl-2.3.1.old/m4/qt4.m4 2018-01-29 15:36:56.214142909 +0100 +++ pgl-2.3.1.old/m4/qt4.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,209 +0,0 @@ -dnl file://qt4.m4 -dnl ----------------------------------------------------------------------- -dnl Author: Juergen Heinemann http://www.hjcms.de, (C) 2007-2009 dnl -dnl dnl -dnl Copyright (C) 2004 by Juergen Heinemann dnl -dnl nospam __AT__ hjcms (DOT) de dnl -dnl dnl -dnl This program is free software; you can redistribute it and/or modify dnl -dnl it under the terms of the GNU General Public License as published by dnl -dnl the Free Software Foundation; either version 2 of the License, or dnl -dnl (at your option) any later version. dnl -dnl dnl -dnl This program is distributed in the hope that it will be useful, dnl -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl -dnl GNU General Public License for more details. dnl -dnl dnl -dnl You should have received a copy of the GNU General Public License dnl -dnl along with this program; if not, write to the dnl -dnl Free Software Foundation, Inc., dnl -dnl 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl -dnl ------------------------------------------------------------------------ - -dnl ----------------------------------------------- -dnl Phonon >= 4.2* http://www.kde.org -dnl ----------------------------------------------- - -AC_DEFUN([AC_CHECK_PHONON], -[ -AC_REQUIRE([AC_PROG_MAKE_SET]) dnl -AC_REQUIRE([PKG_PROG_PKG_CONFIG]) dnl - -dnl ----------------------------------------------- -dnl Minimal Version -dnl ----------------------------------------------- -PHONON_REQUIRED_VERSION=m4_default([$1], [4.2.70]) -AC_SUBST(PHONON_REQUIRED_VERSION) dnl - -PKG_CHECK_MODULES([PHONON],[phonon >= $PHONON_REQUIRED_VERSION], - AC_DEFINE(HAVE_PHONON,[1],[phonon exists]), - AC_MSG_ERROR([phonon >= $QT_REQUIRED_VERSION not found!]) -) - -]) - -dnl ----------------------------------------------- -dnl Qt >= 4.* and gettext Dependeces -dnl ----------------------------------------------- -AC_DEFUN([FUN_TYPE_BOOL], -[ - AC_REQUIRE([AC_PROG_CXX]) dnl - AC_LANG_PUSH(C++) dnl - AC_CHECK_TYPE(bool, ac_check_bool=yes, ac_check_bool=no) - AC_LANG_POP(C++) dnl - if test "x$ac_check_bool" = "xyes" ; then - AC_DEFINE(HAVE_BOOL,[],[define if bool is a built-in type]) - fi - - AH_BOTTOM([#ifndef HAVE_BOOL]) - AH_BOTTOM([enum booltyp { false, true }; typedef enum booltyp bool;]) - AH_BOTTOM([#endif]) -]) dnl FUN_TYPE_BOOL - -dnl ----------------------------------------------- -dnl Find Qt4 Program -dnl @example AC_CHECK_QT4_PROG([qhelpconverter]) -dnl @generate QHELPCONVERTER = qhelpconverter -dnl ----------------------------------------------- -m4_define([_QT_PROG_DEFUN],[m4_toupper([$1])]) - -AC_DEFUN([AC_CHECK_QT4_PROG], -[ - AC_REQUIRE([AC_ARG_PROGRAM]) dnl - AC_CHECK_PROGS(_QT_PROG_DEFUN($1),[$1 $14 $1-qt4]) dnl - test -n "$_QT_PROG_DEFUN($1)" || AC_MSG_WARN([can not find $1 for build subs]) -]) - -dnl ----------------------------------------------- -dnl Qt >= 4.* http://www.trolltech.com -dnl ----------------------------------------------- - -AC_DEFUN([AC_CHECK_QT4], -[ -AC_REQUIRE([AC_PROG_AWK]) dnl -AC_REQUIRE([AC_PROG_MAKE_SET]) dnl -AC_REQUIRE([AC_ARG_PROGRAM]) dnl -AC_REQUIRE([PKG_PROG_PKG_CONFIG]) dnl -AC_REQUIRE([FUN_TYPE_BOOL]) dnl - -dnl ----------------------------------------------- -dnl Minimal Version -dnl ----------------------------------------------- -QT_REQUIRED_VERSION=m4_default([$1], [4.4.0]) -AC_SUBST(QT_REQUIRED_VERSION) dnl - -dnl ----------------------------------------------- -dnl Required pkg-config Files -dnl ----------------------------------------------- -QT_REQUIRED_CONFIG=m4_default([$2], ["QtCore"]) -AC_SUBST(QT_REQUIRED_CONFIG) dnl - -dnl ----------------------------------------------- -dnl error if fail Section -dnl ----------------------------------------------- -PKG_CHECK_MODULES([QT],[$QT_REQUIRED_CONFIG >= $QT_REQUIRED_VERSION], - AC_DEFINE(HAVE_QT,[1],[$QT_REQUIRED_CONFIG exists]), - AC_MSG_ERROR([$QT_REQUIRED_CONFIG >= $QT_REQUIRED_VERSION not found!]) -) - -dnl ----------------------------------------------- -dnl check for moc compiler -dnl ----------------------------------------------- -AC_CHECK_PROGS([MOC],[moc moc4 moc-qt4]) -if test ! -n "$MOC" ; then - MOC="`$PKG_CONFIG --variable=moc_location QtCore`" - test -x "$MOC" || AC_MSG_ERROR([Qt moc MOC::Compiler not found!]) - AC_SUBST([MOC]) dnl -fi - -dnl ----------------------------------------------- -dnl check for uic -dnl ----------------------------------------------- -AC_CHECK_PROGS([UIC],[uic uic4 uic-qt4]) -if test ! -n "$UIC" ; then - UIC="`$PKG_CONFIG --variable=uic_location QtCore`" - test -x "$UIC" || AC_MSG_ERROR([Qt uic UI::Compiler not found!]) - AC_SUBST([UIC]) dnl -fi - -dnl ----------------------------------------------- -dnl check for rcc -dnl ----------------------------------------------- -AC_CHECK_PROGS([RCC],[rcc rcc4 rcc-qt4]) -if test ! -n "$RCC" ; then - RCC="rcc" - test -x "$RCC" || AC_MSG_ERROR([Qt rcc QRC::Compiler not found!]) - AC_SUBST([RCC]) dnl -fi - -dnl ----------------------------------------------- -dnl check for lupdate -dnl ----------------------------------------------- -AC_CHECK_PROGS([LUPDATE],[lupdate lupdate4 lupdate-qt4]) -test -n "$LUPDATE" || AC_MSG_ERROR([Qt lupdate Compiler not found!]) - -dnl ----------------------------------------------- -dnl check for lrelease -dnl ----------------------------------------------- -AC_CHECK_PROGS([LRELEASE],[lrelease lrelease4 lrelease-qt4]) -test -n "$LRELEASE" || AC_MSG_ERROR([Qt lrelease Compiler not found!]) - -dnl ----------------------------------------------- -dnl check for qmake -dnl ----------------------------------------------- -AC_CHECK_PROGS([QMAKE],[qmake qmake4 qmake-qt4]) -test -n "$QMAKE" || AC_MSG_ERROR([No QT3 to QT4 Support on this System]) dnl - -dnl ----------------------------------------------- -dnl set include dir -dnl ----------------------------------------------- -Q_INCLUDE_DIR="`$QMAKE -query QT_INSTALL_HEADERS`" -AC_SUBST(Q_INCLUDE_DIR) dnl - -dnl ----------------------------------------------- -dnl set include dir -dnl ----------------------------------------------- -Q_LIB_DIR="`$QMAKE -query QT_INSTALL_LIBS`" -AC_SUBST(Q_LIB_DIR) dnl - -dnl ----------------------------------------------- -dnl set plugin dir -dnl ----------------------------------------------- -Q_PLUGIN_DIR="`$QMAKE -query QT_INSTALL_PLUGINS`" -AC_SUBST(Q_PLUGIN_DIR) dnl - -dnl ----------------------------------------------- -dnl set tr locale dir -dnl ----------------------------------------------- -Q_LOCALE_DIR="`$QMAKE -query QT_INSTALL_TRANSLATIONS`" -AC_SUBST(Q_LOCALE_DIR) dnl - -dnl ----------------------------------------------- -dnl set tr locale dir -dnl ----------------------------------------------- -Q_DATA_DIR="`$QMAKE -query QT_INSTALL_DATA`" -AC_SUBST(Q_DATA_DIR) dnl - -dnl ----------------------------------------------- -dnl set mkspecs dir -dnl ----------------------------------------------- -Q_MKSPEC_DIR="`$QMAKE -query QT_INSTALL_DATA`/mkspecs" -AC_SUBST(Q_MKSPEC_DIR) dnl - -]) - -dnl ----------------------------------------------- -dnl Find Qt4 Library with pkg-config -dnl @example AC_CHECK_QT4_PKG([QtXml]) -dnl @generate QTXML_CFLAGS and QTXML_LIBS -dnl ----------------------------------------------- -AC_DEFUN([AC_CHECK_QT4_PKG], -[ -AC_REQUIRE([AC_CHECK_QT4]) dnl -PKG_CHECK_MODULES(_QT_PROG_DEFUN($1),[$1 >= $QT_REQUIRED_VERSION]) -]) - -dnl ----------------------------------------------- -dnl eof - --- pgl-2.3.1.old/m4/qt5.m4 1970-01-01 01:00:00.000000000 +0100 +++ pgl-2.3.1.old/m4/qt5.m4 2018-01-29 15:37:57.227785570 +0100 @@ -0,0 +1,187 @@ +dnl file://qt5.m4 +dnl ----------------------------------------------------------------------- +dnl Author: Juergen Heinemann http://www.hjcms.de, (C) 2007-2009 dnl +dnl dnl +dnl Copyright (C) 2004 by Juergen Heinemann dnl +dnl nospam __AT__ hjcms (DOT) de dnl +dnl dnl +dnl This program is free software; you can redistribute it and/or modify dnl +dnl it under the terms of the GNU General Public License as published by dnl +dnl the Free Software Foundation; either version 2 of the License, or dnl +dnl (at your option) any later version. dnl +dnl dnl +dnl This program is distributed in the hope that it will be useful, dnl +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl +dnl GNU General Public License for more details. dnl +dnl dnl +dnl You should have received a copy of the GNU General Public License dnl +dnl along with this program; if not, write to the dnl +dnl Free Software Foundation, Inc., dnl +dnl 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl +dnl ------------------------------------------------------------------------ + +dnl ----------------------------------------------- +dnl Qt >= 5.* and gettext Dependeces +dnl ----------------------------------------------- +AC_DEFUN([FUN_TYPE_BOOL], +[ + AC_REQUIRE([AC_PROG_CXX]) dnl + AC_LANG_PUSH(C++) dnl + AC_CHECK_TYPE(bool, ac_check_bool=yes, ac_check_bool=no) + AC_LANG_POP(C++) dnl + if test "x$ac_check_bool" = "xyes" ; then + AC_DEFINE(HAVE_BOOL,[],[define if bool is a built-in type]) + fi + + AH_BOTTOM([#ifndef HAVE_BOOL]) + AH_BOTTOM([enum booltyp { false, true }; typedef enum booltyp bool;]) + AH_BOTTOM([#endif]) +]) dnl FUN_TYPE_BOOL + +dnl ----------------------------------------------- +dnl Find Qt5 Program +dnl @example AC_CHECK_QT5_PROG([qhelpconverter]) +dnl @generate QHELPCONVERTER = qhelpconverter +dnl ----------------------------------------------- +m4_define([_QT_PROG_DEFUN],[m4_toupper([$1])]) + +AC_DEFUN([AC_CHECK_QT5_PROG], +[ + AC_REQUIRE([AC_ARG_PROGRAM]) dnl + AC_CHECK_PROGS(_QT_PROG_DEFUN($1),[$1 $14 $1-qt5]) dnl + test -n "$_QT_PROG_DEFUN($1)" || AC_MSG_WARN([can not find $1 for build subs]) +]) + +dnl ----------------------------------------------- +dnl Qt >= 5.* http://www.trolltech.com +dnl ----------------------------------------------- + +AC_DEFUN([AC_CHECK_QT5], +[ +AC_REQUIRE([AC_PROG_AWK]) dnl +AC_REQUIRE([AC_PROG_MAKE_SET]) dnl +AC_REQUIRE([AC_ARG_PROGRAM]) dnl +AC_REQUIRE([PKG_PROG_PKG_CONFIG]) dnl +AC_REQUIRE([FUN_TYPE_BOOL]) dnl + +dnl ----------------------------------------------- +dnl Minimal Version +dnl ----------------------------------------------- +QT_REQUIRED_VERSION=m4_default([$1], [5.0.0]) +AC_SUBST(QT_REQUIRED_VERSION) dnl + +dnl ----------------------------------------------- +dnl Required pkg-config Files +dnl ----------------------------------------------- +QT_REQUIRED_CONFIG=m4_default([$2], ["Qt5Core"]) +AC_SUBST(QT_REQUIRED_CONFIG) dnl + +dnl ----------------------------------------------- +dnl error if fail Section +dnl ----------------------------------------------- +PKG_CHECK_MODULES([QT],[$QT_REQUIRED_CONFIG >= $QT_REQUIRED_VERSION], + AC_DEFINE(HAVE_QT,[1],[$QT_REQUIRED_CONFIG exists]), + AC_MSG_ERROR([$QT_REQUIRED_CONFIG >= $QT_REQUIRED_VERSION not found!]) +) + +dnl ----------------------------------------------- +dnl check for moc compiler +dnl ----------------------------------------------- +AC_CHECK_PROGS([MOC],[moc moc5 moc-qt5]) +if test ! -n "$MOC" ; then + MOC="`$PKG_CONFIG --variable=moc_location Qt5Core`" + test -x "$MOC" || AC_MSG_ERROR([Qt moc MOC::Compiler not found!]) + AC_SUBST([MOC]) dnl +fi + +dnl ----------------------------------------------- +dnl check for uic +dnl ----------------------------------------------- +AC_CHECK_PROGS([UIC],[uic uic5 uic-qt5]) +if test ! -n "$UIC" ; then + UIC="`$PKG_CONFIG --variable=uic_location QtCore`" + test -x "$UIC" || AC_MSG_ERROR([Qt uic UI::Compiler not found!]) + AC_SUBST([UIC]) dnl +fi + +dnl ----------------------------------------------- +dnl check for rcc +dnl ----------------------------------------------- +AC_CHECK_PROGS([RCC],[rcc rcc5 rcc-qt5]) +if test ! -n "$RCC" ; then + RCC="rcc" + test -x "$RCC" || AC_MSG_ERROR([Qt rcc QRC::Compiler not found!]) + AC_SUBST([RCC]) dnl +fi + +dnl ----------------------------------------------- +dnl check for lupdate +dnl ----------------------------------------------- +AC_CHECK_PROGS([LUPDATE],[lupdate lupdate5 lupdate-qt5]) +test -n "$LUPDATE" || AC_MSG_ERROR([Qt lupdate Compiler not found!]) + +dnl ----------------------------------------------- +dnl check for lrelease +dnl ----------------------------------------------- +AC_CHECK_PROGS([LRELEASE],[lrelease lrelease5 lrelease-qt5]) +test -n "$LRELEASE" || AC_MSG_ERROR([Qt lrelease Compiler not found!]) + +dnl ----------------------------------------------- +dnl check for qmake +dnl ----------------------------------------------- +AC_CHECK_PROGS([QMAKE],[qmake qmake5 qmake-qt5]) +test -n "$QMAKE" || AC_MSG_ERROR([No QT3 to QT4 Support on this System]) dnl + +dnl ----------------------------------------------- +dnl set include dir +dnl ----------------------------------------------- +Q_INCLUDE_DIR="`$QMAKE -query QT_INSTALL_HEADERS`" +AC_SUBST(Q_INCLUDE_DIR) dnl + +dnl ----------------------------------------------- +dnl set include dir +dnl ----------------------------------------------- +Q_LIB_DIR="`$QMAKE -query QT_INSTALL_LIBS`" +AC_SUBST(Q_LIB_DIR) dnl + +dnl ----------------------------------------------- +dnl set plugin dir +dnl ----------------------------------------------- +Q_PLUGIN_DIR="`$QMAKE -query QT_INSTALL_PLUGINS`" +AC_SUBST(Q_PLUGIN_DIR) dnl + +dnl ----------------------------------------------- +dnl set tr locale dir +dnl ----------------------------------------------- +Q_LOCALE_DIR="`$QMAKE -query QT_INSTALL_TRANSLATIONS`" +AC_SUBST(Q_LOCALE_DIR) dnl + +dnl ----------------------------------------------- +dnl set tr locale dir +dnl ----------------------------------------------- +Q_DATA_DIR="`$QMAKE -query QT_INSTALL_DATA`" +AC_SUBST(Q_DATA_DIR) dnl + +dnl ----------------------------------------------- +dnl set mkspecs dir +dnl ----------------------------------------------- +Q_MKSPEC_DIR="`$QMAKE -query QT_INSTALL_DATA`/mkspecs" +AC_SUBST(Q_MKSPEC_DIR) dnl + +]) + +dnl ----------------------------------------------- +dnl Find Qt5 Library with pkg-config +dnl @example AC_CHECK_QT5_PKG([QtXml]) +dnl @generate QTXML_CFLAGS and QTXML_LIBS +dnl ----------------------------------------------- +AC_DEFUN([AC_CHECK_QT5_PKG], +[ +AC_REQUIRE([AC_CHECK_QT5]) dnl +PKG_CHECK_MODULES(_QT_PROG_DEFUN($1),[$1 >= $QT_REQUIRED_VERSION]) +]) + +dnl ----------------------------------------------- +dnl eof + --- pgl-2.3.1.old/pglgui/src/main.cpp 2018-01-29 15:36:56.210142730 +0100 +++ pgl-2.3.1.old/pglgui/src/main.cpp 2018-01-29 15:37:57.227785570 +0100 @@ -32,12 +32,12 @@ #include "pglgui.h" #include "command.h" -void customOutput( QtMsgType type, const char *msg ); +void customOutput(QtMsgType, const QMessageLogContext &, const QString &); int main(int argc, char *argv[]) { - qInstallMsgHandler( customOutput ); + qInstallMessageHandler( customOutput ); //Start the real application QApplication app(argc, argv); @@ -61,20 +61,21 @@ } -void customOutput( QtMsgType type, const char *msg ) { +void customOutput(QtMsgType type, const QMessageLogContext & context, const QString & msg) { + QByteArray localMsg = msg.toLocal8Bit(); switch( type ) { case QtDebugMsg: - fprintf( stderr, "** Debug: %s\n", msg ); + fprintf( stderr, "** Debug: %s\n", localMsg.constData() ); break; case QtWarningMsg: - fprintf( stderr, "** Warning: %s\n", msg ); + fprintf( stderr, "** Warning: %s\n", localMsg.constData() ); break; case QtCriticalMsg: - fprintf( stderr, "** Critical: %s\n", msg ); + fprintf( stderr, "** Critical: %s\n", localMsg.constData() ); break; case QtFatalMsg: - fprintf( stderr, "** Fatal: %s\n", msg ); + fprintf( stderr, "** Fatal: %s\n", localMsg.constData() ); break; }