working on requests from exherbo devs:

	mt-st: added empty MYOPTIONS, DEPENDENCIES
	bacual:
		- dropped nonfatal and some useless calls
		- dropped unused patches

9 files changed, 19 insertions, 238 deletions

diff --git a/packages/app-backup/bacula/bacula.exlib b/packages/app-backup/bacula/bacula.exlib
index 4b40a0b..cfac30c 100644
--- a/packages/app-backup/bacula/bacula.exlib
+++ b/packages/app-backup/bacula/bacula.exlib
@@ -155,7 +155,6 @@ bacula_src_install() {
         insinto /usr/$(exhost --target)/libexec/bacula/updatedb
         insopts -m0754
         doins "${WORK}"/updatedb/*
-        edo chmod 0640 "${IMAGE}"/usr/$(exhost --target)/libexec/bacula/updatedb/README
 
         # the logrotate configuration
         # (now unconditional wrt bug #258187)
@@ -190,27 +189,27 @@ bacula_src_install() {
     edo rm -vf "${IMAGE}"/usr/share/man/man1/bacula-tray-monitor.1*
 
     if option minimal || ! option bacula-dir; then
-        nonfatal edo rm -vf "${IMAGE}"/usr/share/man/man8/bacula-dir.8*
-        nonfatal edo rm -vf "${IMAGE}"/usr/share/man/man8/dbcheck.8*
-        nonfatal edo rm -vf "${IMAGE}"/usr/share/man/man1/bsmtp.1*
-        nonfatal edo rm -vf "${IMAGE}"/usr/libexec/bacula/create_*_database
-        nonfatal edo rm -vf "${IMAGE}"/usr/libexec/bacula/drop_*_database
-        nonfatal edo rm -vf "${IMAGE}"/usr/libexec/bacula/make_*_tables
-        nonfatal edo rm -vf "${IMAGE}"/usr/libexec/bacula/update_*_tables
-        nonfatal edo rm -vf "${IMAGE}"/usr/libexec/bacula/drop_*_tables
-        nonfatal edo rm -vf "${IMAGE}"/usr/libexec/bacula/grant_*_privileges
-        nonfatal edo rm -vf "${IMAGE}"/usr/libexec/bacula/*_catalog_backup
+        edo rm -vf "${IMAGE}"/usr/share/man/man8/bacula-dir.8*
+        edo rm -vf "${IMAGE}"/usr/share/man/man8/dbcheck.8*
+        edo rm -vf "${IMAGE}"/usr/share/man/man1/bsmtp.1*
+        edo rm -vf "${IMAGE}"/usr/libexec/bacula/create_*_database
+        edo rm -vf "${IMAGE}"/usr/libexec/bacula/drop_*_database
+        edo rm -vf "${IMAGE}"/usr/libexec/bacula/make_*_tables
+        edo rm -vf "${IMAGE}"/usr/libexec/bacula/update_*_tables
+        edo rm -vf "${IMAGE}"/usr/libexec/bacula/drop_*_tables
+        edo rm -vf "${IMAGE}"/usr/libexec/bacula/grant_*_privileges
+        edo rm -vf "${IMAGE}"/usr/libexec/bacula/*_catalog_backup
     fi
     if option minimal || ! option bacula-sd; then
-        nonfatal edo rm -vf "${IMAGE}"/usr/share/man/man8/bacula-sd.8*
-        nonfatal edo rm -vf "${IMAGE}"/usr/share/man/man8/bcopy.8*
-        nonfatal edo rm -vf "${IMAGE}"/usr/share/man/man8/bextract.8*
-        nonfatal edo rm -vf "${IMAGE}"/usr/share/man/man8/bls.8*
-        nonfatal edo rm -vf "${IMAGE}"/usr/share/man/man8/bscan.8*
-        nonfatal edo rm -vf "${IMAGE}"/usr/share/man/man8/btape.8*
-        nonfatal edo rm -vf "${IMAGE}"/usr/libexec/bacula/disk-changer
-        nonfatal edo rm -vf "${IMAGE}"/usr/libexec/bacula/mtx-changer
-        nonfatal edo rm -vf "${IMAGE}"/usr/libexec/bacula/dvd-handler
+        edo rm -vf "${IMAGE}"/usr/share/man/man8/bacula-sd.8*
+        edo rm -vf "${IMAGE}"/usr/share/man/man8/bcopy.8*
+        edo rm -vf "${IMAGE}"/usr/share/man/man8/bextract.8*
+        edo rm -vf "${IMAGE}"/usr/share/man/man8/bls.8*
+        edo rm -vf "${IMAGE}"/usr/share/man/man8/bscan.8*
+        edo rm -vf "${IMAGE}"/usr/share/man/man8/btape.8*
+        edo rm -vf "${IMAGE}"/usr/libexec/bacula/disk-changer
+        edo rm -vf "${IMAGE}"/usr/libexec/bacula/mtx-changer
+        edo rm -vf "${IMAGE}"/usr/libexec/bacula/dvd-handler
     fi
 
     if option examples; then
diff --git a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch
deleted file mode 100644
index 3cdee15..0000000
--- a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-Makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# stop build if there are errors in subdirs
---- Makefile.in.orig	2010-07-20 16:53:44.000000000 +0000
-+++ Makefile.in	2010-07-20 16:55:50.000000000 +0000
-@@ -44,9 +44,8 @@
- 
- all: Makefile
- 	@for I in ${all_subdirs}; \
--	  do (cd $$I; echo "==>Entering directory `pwd`"; \
--	      $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
--			    echo ""; echo ""; exit 1;)); \
-+	  do \
-+	      $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ || exit 1; \
- 	done
- 
- depend:
-@@ -55,9 +54,8 @@
- 	
- bacula-fd: Makefile	   
- 	@for I in ${fd_subdirs}; \
--	  do (cd $$I; echo "==>Entering directory `pwd`"; \
--	      $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo "   ====== Error in `pwd` ======"; \
--			    echo ""; echo ""; exit 1;)); \
-+	  do \
-+	        $(MAKE) DESTDIR=$(DESTDIR) -C $$I all ||  exit 1; \
- 	done
- 
- #-------------------------------------------------------------------------
diff --git a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch
deleted file mode 100644
index 98c6e6c..0000000
--- a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-doc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# drop automatic installation of doc files
---- Makefile.in.orig	2011-02-26 09:05:21.000000000 +0000
-+++ Makefile.in	2011-02-26 09:06:01.000000000 +0000
-@@ -34,8 +34,7 @@
- 	autoconf/config.h.in  autoconf/acconfig.h  autoconf/Make.common.in \
- 	autoconf/install-sh autoconf/mkinstalldirs
- 
--doc_files = VERIFYING technotes ChangeLog README ReleaseNotes LICENSE \
--	    INSTALL
-+doc_files = 
- 
- MKDIR = $(srcdir)/autoconf/mkinstalldirs
- LIBTOOL_DEPS = @LIBTOOL_DEPS@
diff --git a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch
deleted file mode 100644
index 94d8fb6..0000000
--- a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-# bat needs to respect LDFLAGS
---- src/qt-console/bat.pro.in.orig	2010-07-20 18:28:50.000000000 +0000
-+++ src/qt-console/bat.pro.in	2010-07-20 18:29:25.000000000 +0000
-@@ -26,6 +26,7 @@
- QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
- QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
- QMAKE_CLEAN += .libs/* bat
-+QMAKE_LFLAGS += @LDFLAGS@
- 
- qwt {
-   INCLUDEPATH += @QWT_INC@ 
diff --git a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch
deleted file mode 100644
index c3bded4..0000000
--- a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-lib-search-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# If upgrading the old libraries gets linked first. So fix order of lib search path.
---- src/console/Makefile.in.orig	2010-03-29 11:35:00.000000000 +0000
-+++ src/console/Makefile.in	2010-03-29 11:45:14.000000000 +0000
-@@ -47,7 +47,7 @@
- 
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
--	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
-+	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
- 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- 	      $(OPENSSL_LIBS)
- 
diff --git a/packages/app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch b/packages/app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch
deleted file mode 100644
index faf0d06..0000000
--- a/packages/app-backup/bacula/files/7.2.0/bacula-7.2.0-fix-static.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- src/console/Makefile.in.orig	2011-10-30 14:10:41.100802721 -0400
-+++ src/console/Makefile.in	2011-10-30 14:14:42.330488174 -0400
-@@ -29,10 +29,11 @@
- GETTEXT_LIBS = @LIBINTL@
- 
- CONS_INC=@CONS_INC@
- CONS_LIBS=@CONS_LIBS@
- CONS_LDFLAGS=@CONS_LDFLAGS@
-+ZLIBS=@ZLIBS@
- 
- .SUFFIXES:	.c .o
- .PHONY:
- .DONTCARE:
- 
-@@ -46,17 +47,17 @@
- 	@echo " "
- 
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS) $(ZLIBS)
- 	strip $@
- 
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
---- src/filed/Makefile.in.orig	2015-09-04 12:47:13.000000000 +0200
-+++ src/filed/Makefile.in	2015-09-04 12:49:39.000000000 +0200
-@@ -66,13 +66,13 @@
- bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
--	  $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-+	  $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 
- static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
--	   $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-+	   $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 	strip $@
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/packages/app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch b/packages/app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch
deleted file mode 100644
index bf6630a..0000000
--- a/packages/app-backup/bacula/files/9.0.2/bacula-9.0.2-fix-static.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- src/console/Makefile.in.orig	2017-07-25 19:03:05.664760298 +0200
-+++ src/console/Makefile.in	2017-07-25 19:05:43.576706091 +0200
-@@ -24,6 +24,7 @@
- CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@
- CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
- JSONOBJS = bbconsjson.o console_conf.o
-+ZLIBS=@ZLIBS@
- 
- # these are the objects that are changed by the .configure process
- EXTRAOBJS = @OBJLIST@
-@@ -50,18 +51,18 @@
- 
- bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 
- bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
--	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS)
-+	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
-+	      $(OPENSSL_LIBS) $(LIBS)
- 	strip $@
- 
- 
---- src/filed/Makefile.in.orig	2017-07-25 19:09:19.655852979 +0200
-+++ src/filed/Makefile.in	2017-07-25 19:11:39.519558592 +0200
-@@ -69,19 +69,19 @@
- bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
--	  $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-+	  $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 
- bfdjson:  Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \
--	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-+	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 
- static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
--	   $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
--	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
-+	   $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
-+	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
- 	strip $@
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-bat-pro.patch b/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-bat-pro.patch
deleted file mode 100644
index 3d055b8..0000000
--- a/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-bat-pro.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/qt-console/bat.pro.in.orig	2018-02-18 16:17:21.027921363 +0100
-+++ src/qt-console/bat.pro.in	2018-02-18 16:18:12.554137528 +0100
-@@ -12,7 +12,7 @@
- greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
- 
- bins.path = /$(DESTDIR)@sbindir@
--bins.files = bat
-+bins.files = .libs/bat
- confs.path = /$(DESTDIR)@sysconfdir@
- confs.commands = ./install_conf_file
- help.path = /$(DESTDIR)@docdir@
-@@ -29,6 +29,9 @@
- QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
- QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
- QMAKE_CLEAN += .libs/* bat
-+QMAKE_LFLAGS += @LDFLAGS@
-+QMAKE_CFLAGS += @CFLAGS@
-+QMAKE_CXXFLAGS += @CXXFLAGS@
- 
- qwt {
-   INCLUDEPATH += @QWT_INC@
diff --git a/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch b/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch
deleted file mode 100644
index 9d6507c..0000000
--- a/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-fix-pages-h-qt-includes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/qt-console/pages.h.orig 2017-11-21 12:37:16.000000000 -0500
-+++ src/qt-console/pages.h      2018-02-07 13:11:46.223273248 -0500
-@@ -20,10 +20,11 @@
- */
- /*
-  *   Dirk Bartley, March 2007
-  */
-
-+#include <QtGlobal>
- #if QT_VERSION >= 0x050000
- #include <QtWidgets>
- #else
- #include <QtGui>
- #endif
-