svn commit: r454970 - in head/databases/sqlitestudio: . files

[Yuri Victorovich]

Author: yuri
Date: Mon Nov 27 17:14:43 2017
New Revision: 454970
URL: https://svnweb.freebsd.org/changeset/ports/454970

Log:
  databases/sqlitestudio: Unbroke the build by including QVariant where it was missing
  
  Approved by:	tcberner (mentor), mat
  Differential Revision:	https://reviews.freebsd.org/D13203

Added:
  head/databases/sqlitestudio/files/patch-coreSQLiteStudio_services_functionmanager.h   (contents, props changed)
Modified:
  head/databases/sqlitestudio/Makefile
  head/databases/sqlitestudio/files/patch-coreSQLiteStudio_db_db.h

Modified: head/databases/sqlitestudio/Makefile
==============================================================================
--- head/databases/sqlitestudio/Makefile	Mon Nov 27 16:15:44 2017	(r454969)
+++ head/databases/sqlitestudio/Makefile	Mon Nov 27 17:14:43 2017	(r454970)
@@ -3,11 +3,11 @@
 
 PORTNAME=	sqlitestudio
 PORTVERSION=	3.1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases
 MASTER_SITES=	http://sqlitestudio.pl/files/sqlitestudio3/complete/tar/
 
-MAINTAINER=	yuri at rawbw.com
+MAINTAINER=	yuri at FreeBSD.org
 COMMENT=	SQLite database GUI manager
 
 LICENSE=	GPLv3
@@ -34,14 +34,14 @@ OPTIONS_DEFAULT=	PLUGIN_CSV_IMPORT PLUGIN_CSV_EXPORT P
 OPTIONS_DEFAULT+=	PLUGIN_JSON_EXPORT PLUGIN_PDF_EXPORT PLUGIN_PRINTING PLUGIN_REGEXP_IMPORT
 OPTIONS_DEFAULT+=	PLUGIN_SQL_FORMATTER_SIMPLE PLUGIN_SQL_EXPORT PLUGIN_SQL_ENTERPRISE_FORMATTER
 OPTIONS_DEFAULT+=	PLUGIN_XML_EXPORT
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
 
 WRKSRC=		${WRKDIR}/SQLiteStudio3
 
 USES=		compiler:c++11-lib gmake ncurses qmake readline sqlite
 USE_CXXSTD=	c++11
-USE_QT5=	core gui svg sql xml network sql-sqlite3_run widgets script \
-		concurrent uitools buildtools_build linguisttools_build
+USE_QT5=	core concurrent gui network script sql sql-sqlite3_run svg widgets xml \
+		uitools buildtools_build linguisttools_build
 USE_GL=		gl
 USE_LDCONFIG=	yes
 

Modified: head/databases/sqlitestudio/files/patch-coreSQLiteStudio_db_db.h
==============================================================================
--- head/databases/sqlitestudio/files/patch-coreSQLiteStudio_db_db.h	Mon Nov 27 16:15:44 2017	(r454969)
+++ head/databases/sqlitestudio/files/patch-coreSQLiteStudio_db_db.h	Mon Nov 27 17:14:43 2017	(r454970)
@@ -1,6 +1,21 @@
---- coreSQLiteStudio/db/db.h.orig	2016-01-21 10:33:48 UTC
+--- coreSQLiteStudio/db/db.h.orig	2016-11-04 15:27:43 UTC
 +++ coreSQLiteStudio/db/db.h
-@@ -17,6 +17,7 @@
+@@ -1,6 +1,7 @@
+ #ifndef DB_H
+ #define DB_H
+ 
++#include <QVariant> // upstream didn't fix the broken build for many months
+ #include "returncode.h"
+ #include "dialect.h"
+ #include "services/functionmanager.h"
+@@ -10,13 +11,13 @@
+ #include "interruptable.h"
+ #include "dbobjecttype.h"
+ #include <QObject>
+-#include <QVariant>
+ #include <QList>
+ #include <QHash>
+ #include <QReadWriteLock>
  #include <QRunnable>
  #include <QStringList>
  #include <QSet>

Added: head/databases/sqlitestudio/files/patch-coreSQLiteStudio_services_functionmanager.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/sqlitestudio/files/patch-coreSQLiteStudio_services_functionmanager.h	Mon Nov 27 17:14:43 2017	(r454970)
@@ -0,0 +1,10 @@
+--- coreSQLiteStudio/services/functionmanager.h.orig	2017-11-23 00:59:57 UTC
++++ coreSQLiteStudio/services/functionmanager.h
+@@ -3,6 +3,7 @@
+ 
+ #include "coreSQLiteStudio_global.h"
+ #include "common/global.h"
++#include <QVariant> // upstream didn't fix the broken build for many months
+ #include <QList>
+ #include <QSharedPointer>
+ #include <QObject>