Port misc/qbrew away from Qt4 to Qt5. While at it, assume maintainership.

This was discussed over email with David. Upstream is unmaintained, but
it works with these minor patches.

10 files changed, 185 insertions, 10 deletions

diff --git a/misc/qbrew/Makefile b/misc/qbrew/Makefile
index dd2705e970ed..372d1435a901 100644
--- a/misc/qbrew/Makefile
+++ b/misc/qbrew/Makefile
@@ -3,18 +3,20 @@
 
 PORTNAME=	qbrew
 PORTVERSION=	0.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	misc
 MASTER_SITES=	http://www.usermode.org/code/
 
-MAINTAINER=	david@usermode.org
+MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	Homebrewer's recipe calculator
 
-BROKEN=		fails to build
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		qmake qt:4
-USE_QT=		moc_build uic_build rcc_build xml gui
-PORTDOCS=	*
+USES=		qmake qt:5
+USE_GL=		gl
+USE_QT=		buildtools_build qmake_build \
+		core gui printsupport widgets xml
 
 QMAKE_ARGS=	CONFIG+="configure"
 QMAKE_ENV+=	BINDIR="${PREFIX}/bin" \
@@ -23,6 +25,8 @@ QMAKE_ENV+=	BINDIR="${PREFIX}/bin" \
 
 OPTIONS_DEFINE=	DOCS
 
+PORTDOCS=	*
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbrew
 
diff --git a/misc/qbrew/files/patch-qbrew.pro b/misc/qbrew/files/patch-qbrew.pro
index 94b02da1a59b..8e7117e0dd78 100644
--- a/misc/qbrew/files/patch-qbrew.pro
+++ b/misc/qbrew/files/patch-qbrew.pro
@@ -1,10 +1,24 @@
---- qbrew.pro.org       2008-05-25 22:35:35.000000000 -0700
-+++ qbrew.pro   2008-05-25 22:35:44.000000000 -0700
+Q_WS_* is deprecated. Rather than editing the code, just
+convince ourselves that on BSD, we would still be using X11.
+
+	https://www.kdab.com/porting-from-qt-4-to-qt-5/
+
+--- qbrew.pro.orig	2008-05-26 02:21:05 UTC
++++ qbrew.pro
 @@ -6,6 +6,7 @@
  TARGET = qbrew
  TEMPLATE = app
  CONFIG += qt warn_on
-+QT += xml
-
++QT += printsupport widgets xml
+ 
  MOC_DIR = build
  OBJECTS_DIR = build
+@@ -72,6 +73,8 @@ unix:!macx {
+         doc.path = /usr/local/share/doc/qbrew
+     }
+ 
++    DEFINES += Q_WS_X11
++
+     trans.files = translations/*.qm
+     data.files = data/* pics/splash.png
+     doc.files = docs/book/*.html docs/primer/*.html README LICENSE
diff --git a/misc/qbrew/files/patch-src_beerxmlreader.cpp b/misc/qbrew/files/patch-src_beerxmlreader.cpp
new file mode 100644
index 000000000000..c09a6ef1aabe
--- /dev/null
+++ b/misc/qbrew/files/patch-src_beerxmlreader.cpp
@@ -0,0 +1,13 @@
+false no longer implicitly converts via integer. Return empty recipe.
+
+--- src/beerxmlreader.cpp.orig	2018-11-26 11:43:40 UTC
++++ src/beerxmlreader.cpp
+@@ -254,7 +254,7 @@ Recipe BeerXmlReader::readSingleRecipe()
+     }
+     if (hasError()) {
+         raiseError("Problem reading recipe");
+-        return false;
++        return Recipe(0);
+     }
+ 
+     // set grain use according to recipe type
diff --git a/misc/qbrew/files/patch-src_databasetool.cpp b/misc/qbrew/files/patch-src_databasetool.cpp
new file mode 100644
index 000000000000..6c3dfbf18112
--- /dev/null
+++ b/misc/qbrew/files/patch-src_databasetool.cpp
@@ -0,0 +1,40 @@
+QHeaderView API change.
+
+--- src/databasetool.cpp.orig	2018-11-26 11:45:00 UTC
++++ src/databasetool.cpp
+@@ -65,7 +65,7 @@ DatabaseTool::DatabaseTool(QWidget* pare
+ 
+     grainpage.view->verticalHeader()->setDefaultSectionSize(mh);
+     grainpage.view->verticalHeader()->hide();
+-    grainpage.view->horizontalHeader()->setClickable(true);
++    grainpage.view->horizontalHeader()->setSectionsClickable(true);
+     grainpage.view->horizontalHeader()->setHighlightSections(false);
+ 
+     grainpage.view->setColumnWidth(GrainModel::NAME, 20*mw);
+@@ -88,7 +88,7 @@ DatabaseTool::DatabaseTool(QWidget* pare
+ 
+     hoppage.view->verticalHeader()->setDefaultSectionSize(mh);
+     hoppage.view->verticalHeader()->hide();
+-    hoppage.view->horizontalHeader()->setClickable(true);
++    hoppage.view->horizontalHeader()->setSectionsClickable(true);
+     hoppage.view->horizontalHeader()->setHighlightSections(false);
+ 
+     hoppage.view->setColumnHidden(HopModel::WEIGHT, true);
+@@ -110,7 +110,7 @@ DatabaseTool::DatabaseTool(QWidget* pare
+ 
+     miscpage.view->verticalHeader()->setDefaultSectionSize(mh);
+     miscpage.view->verticalHeader()->hide();
+-    miscpage.view->horizontalHeader()->setClickable(true);
++    miscpage.view->horizontalHeader()->setSectionsClickable(true);
+     miscpage.view->horizontalHeader()->setHighlightSections(false);
+ 
+     miscpage.view->setColumnHidden(MiscModel::QUANTITY, true);
+@@ -131,7 +131,7 @@ DatabaseTool::DatabaseTool(QWidget* pare
+ 
+     stylepage.view->verticalHeader()->setDefaultSectionSize(mh);
+     stylepage.view->verticalHeader()->hide();
+-    stylepage.view->horizontalHeader()->setClickable(true);
++    stylepage.view->horizontalHeader()->setSectionsClickable(true);
+     stylepage.view->horizontalHeader()->setHighlightSections(false);
+ 
+     stylepage.view->setColumnWidth(StyleModel::NAME, 20*mw);
diff --git a/misc/qbrew/files/patch-src_grainmodel.cpp b/misc/qbrew/files/patch-src_grainmodel.cpp
new file mode 100644
index 000000000000..01bcb57ed089
--- /dev/null
+++ b/misc/qbrew/files/patch-src_grainmodel.cpp
@@ -0,0 +1,14 @@
+QAbstractItemModel API change
+
+--- src/grainmodel.cpp.orig	2018-11-26 11:49:13 UTC
++++ src/grainmodel.cpp
+@@ -38,7 +38,8 @@ GrainModel::~GrainModel(){}
+ 
+ void GrainModel::flush()
+ {
+-    reset();
++    beginResetModel();
++    endResetModel();
+ }
+ 
+ //////////////////////////////////////////////////////////////////////////////
diff --git a/misc/qbrew/files/patch-src_hopmodel.cpp b/misc/qbrew/files/patch-src_hopmodel.cpp
new file mode 100644
index 000000000000..01f8bb42a8a6
--- /dev/null
+++ b/misc/qbrew/files/patch-src_hopmodel.cpp
@@ -0,0 +1,14 @@
+QAbstractItemModel API change
+
+--- src/hopmodel.cpp.orig	2018-11-26 11:54:52 UTC
++++ src/hopmodel.cpp
+@@ -34,7 +34,8 @@ HopModel::~HopModel() {}
+ 
+ void HopModel::flush()
+ {
+-    reset();
++    beginResetModel();
++    endResetModel(); 
+ }
+ 
+ //////////////////////////////////////////////////////////////////////////////
diff --git a/misc/qbrew/files/patch-src_miscmodel.cpp b/misc/qbrew/files/patch-src_miscmodel.cpp
new file mode 100644
index 000000000000..6bc7bb9d6c3b
--- /dev/null
+++ b/misc/qbrew/files/patch-src_miscmodel.cpp
@@ -0,0 +1,14 @@
+QAbstractItemModel API change
+
+--- src/miscmodel.cpp.orig	2018-11-26 11:55:17 UTC
++++ src/miscmodel.cpp
+@@ -34,7 +34,8 @@ MiscModel::~MiscModel() {}
+ 
+ void MiscModel::flush()
+ {
+-    reset();
++    beginResetModel();
++    endResetModel(); 
+ }
+ 
+ //////////////////////////////////////////////////////////////////////////////
diff --git a/misc/qbrew/files/patch-src_qbrew.cpp b/misc/qbrew/files/patch-src_qbrew.cpp
new file mode 100644
index 000000000000..b3953e6ef1f8
--- /dev/null
+++ b/misc/qbrew/files/patch-src_qbrew.cpp
@@ -0,0 +1,17 @@
+Missing includes, these live in QtWidgets now.
+
+--- src/qbrew.cpp.orig	2018-11-26 11:56:17 UTC
++++ src/qbrew.cpp
+@@ -9,6 +9,12 @@
+ 
+ #include <QtGui>
+ 
++#include <QFileDialog>
++#include <QMessageBox>
++#include <QSplashScreen>
++#include <QStyleFactory>
++#include <QWhatsThis>
++
+ #include "alcoholtool.h"
+ #include "configure.h"
+ #include "data.h"
diff --git a/misc/qbrew/files/patch-src_stylemodel.cpp b/misc/qbrew/files/patch-src_stylemodel.cpp
new file mode 100644
index 000000000000..196e1b9784e1
--- /dev/null
+++ b/misc/qbrew/files/patch-src_stylemodel.cpp
@@ -0,0 +1,14 @@
+QAbstractItemModel API change.
+
+--- src/stylemodel.cpp.orig	2018-11-26 11:58:44 UTC
++++ src/stylemodel.cpp
+@@ -34,7 +34,8 @@ StyleModel::~StyleModel(){}
+ 
+ void StyleModel::flush()
+ {
+-    reset();
++    beginResetModel();
++    endResetModel(); 
+ }
+ 
+ //////////////////////////////////////////////////////////////////////////////
diff --git a/misc/qbrew/files/patch-src_view.cpp b/misc/qbrew/files/patch-src_view.cpp
new file mode 100644
index 000000000000..eb219aa8db09
--- /dev/null
+++ b/misc/qbrew/files/patch-src_view.cpp
@@ -0,0 +1,31 @@
+QHeaderView API change
+
+--- src/view.cpp.orig	2018-11-26 11:59:12 UTC
++++ src/view.cpp
+@@ -72,7 +72,7 @@ View::View(QWidget *parent, Recipe *reci
+ 
+     grainpage.view->verticalHeader()->setDefaultSectionSize(mh);
+     grainpage.view->verticalHeader()->hide();
+-    grainpage.view->horizontalHeader()->setClickable(true);
++    grainpage.view->horizontalHeader()->setSectionsClickable(true);
+     grainpage.view->horizontalHeader()->setHighlightSections(false);
+ 
+     grainpage.view->setColumnWidth(GrainModel::NAME, 20*mw);
+@@ -94,7 +94,7 @@ View::View(QWidget *parent, Recipe *reci
+ 
+     hoppage.view->verticalHeader()->setDefaultSectionSize(mh);
+     hoppage.view->verticalHeader()->hide();
+-    hoppage.view->horizontalHeader()->setClickable(true);
++    hoppage.view->horizontalHeader()->setSectionsClickable(true);
+     hoppage.view->horizontalHeader()->setHighlightSections(false);
+ 
+     hoppage.view->setColumnWidth(HopModel::NAME, 20*mw);
+@@ -115,7 +115,7 @@ View::View(QWidget *parent, Recipe *reci
+ 
+     miscpage.view->verticalHeader()->setDefaultSectionSize(mh);
+     miscpage.view->verticalHeader()->hide();
+-    miscpage.view->horizontalHeader()->setClickable(true);
++    miscpage.view->horizontalHeader()->setSectionsClickable(true);
+     miscpage.view->horizontalHeader()->setHighlightSections(false);
+ 
+     miscpage.view->setColumnWidth(MiscModel::NAME, 20*mw);