Attachment #175156 for bug #212395




# Created by: loïc bartoletti <lbartoletti@tuxfamily.org>
# $FreeBSD$

PORTNAME=	sqlitebrowser
PORTVERSION=	3.9.0
DISTVERSIONPREFIX=	v
PORTREVISION?=	1
CATEGORIES=	databases

MAINTAINER=	lbartoletti@tuxfamily.org
COMMENT=	DB Browser for SQLite is a visual tool to manage SQLite databases

CONFLICTS_INSTALL?=	${PORTNAME}-qt5-*

LICENSE=	MPL GPLv3
LICENSE_COMB=	dual

BUILD_DEPENDS=	${LOCALBASE}/include/antlr/AST.hpp:devel/antlr

CONFLICTS_INSTALL?=	${PORTNAME}-qt5-*

USE_GITHUB=	yes

USES=		cmake desktop-file-utils sqlite

.if empty(PKGNAMESUFFIX)
CMAKE_ARGS+=	-DUSE_QT5:BOOL=FALSE
USE_QT4=	corelib network gui qmake_build linguisttools_build \
		moc_build uic_build rcc_build
CMAKE_ARGS+=	-DUSE_QT5:BOOL=FALSE
.else
USE_QT5=	core gui network printsupport testlib widgets \
		buildtools_build linguisttools_build qmake_build
CMAKE_ARGS+=	-DUSE_QT5:BOOL=TRUE
USE_QT5=	core widgets network gui qmake buildtools linguisttools printsupport testlib
.endif

post-patch:

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (sqlitebrowser-sqlitebrowser-v3.8.0_GH0.tar.gz) = f638a751bccde4bf0305a75685e2a72d26fc3e3a69d7e15fd84573f88c1a4d92	1	TIMESTAMP = 1472301221
2	SIZE (sqlitebrowser-sqlitebrowser-v3.8.0_GH0.tar.gz) = 1538043	2	SHA256 (sqlitebrowser-sqlitebrowser-v3.9.0_GH0.tar.gz) = 0ccbf05e9c5f544a542399332dd70ef365fab4ded6b838e29ba4fb1375872bf2
		3	SIZE (sqlitebrowser-sqlitebrowser-v3.9.0_GH0.tar.gz) = 1701943

Line 0 Link Here

(-)files/patch-CMakeLists.txt (+8 lines)
	1	--- CMakeLists.txt.orig 2016-08-24 11:00:01 UTC
	2	+++ CMakeLists.txt
	3	@@ -1,4 +1,4 @@
	4	-project("DB Browser for SQLite")
	5	+project("sqlitebrowser")
	6	cmake_minimum_required(VERSION 2.8.7)
	7
	8	set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")




--- src/Application.cpp.orig	2016-09-25 11:30:50 UTC
+++ src/Application.cpp
@@ -30,8 +30,16 @@ Application::Application(int& argc, char
 
     // First of all try to load the application translation file.
     m_translatorApp = new QTranslator(this);

     ok = m_translatorApp->load("sqlb_" + name,
                                QCoreApplication::applicationDirPath() + "/translations");
+#endif
+
     // If failed then try to load .qm file from resources
     if (ok == false) {
         ok = m_translatorApp->load("sqlb_" + name, ":/translations");
@@ -51,7 +58,9 @@ Application::Application(int& argc, char
         ok = m_translatorQt->load("qt_" + name,
                                   QLibraryInfo::location(QLibraryInfo::TranslationsPath));
         if (ok == false)
+	{
             ok = m_translatorQt->load("qt_" + name, "translations");
+	}
         if (ok == true)
             installTranslator(m_translatorQt);
     }




--- src/PreferencesDialog.cpp.org	2016-09-25 13:45:26.476810000 +0200
+++ src/PreferencesDialog.cpp	2016-09-25 13:46:35.935807000 +0200
@@ -465,8 +465,13 @@
 
 void PreferencesDialog::fillLanguageBox()
 {
-    QDir translationsDir(QCoreApplication::applicationDirPath() + "/translations",
+
+#ifdef Q_OS_FREEBSD
+    QDir translationsDir("%%DATADIR%%/translations",
+                         "sqlb_*.qm");
+#else
     QDir translationsDir(QCoreApplication::applicationDirPath() + "/translations",
                          "sqlb_*.qm");
+#else
+     QDir translationsDir(QCoreApplication::applicationDirPath() + "/translations",
+                          "sqlb_*.qm");
+
+#endif
 
     QLocale systemLocale = QLocale::system();

Return to bug 212395

Lines 1-32 Link Here

(-)Makefile (-9 / +9 lines)
1	# Created by: loïc bartoletti <coder@tuxfamily.org>	1	# Created by: loïc bartoletti <lbartoletti@tuxfamily.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= sqlitebrowser	4	PORTNAME= sqlitebrowser
5	PORTVERSION= 3.8.0	5	PORTVERSION= 3.9.0
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION?= 1
8	CATEGORIES= databases	7	CATEGORIES= databases
9		8
10	MAINTAINER= coder@tuxfamily.org	9	MAINTAINER= lbartoletti@tuxfamily.org
11	COMMENT= DB Browser for SQLite is a visual tool to manage SQLite databases	10	COMMENT= DB Browser for SQLite is a visual tool to manage SQLite databases
12		11
13	CONFLICTS_INSTALL?= ${PORTNAME}-qt5-*
14
15	LICENSE= MPL GPLv3	12	LICENSE= MPL GPLv3
16	LICENSE_COMB= dual	13	LICENSE_COMB= dual
17		14
		15	BUILD_DEPENDS= ${LOCALBASE}/include/antlr/AST.hpp:devel/antlr
		16
		17	CONFLICTS_INSTALL?= ${PORTNAME}-qt5-*
		18
18	USE_GITHUB= yes	19	USE_GITHUB= yes
19		20
20	USES= cmake desktop-file-utils sqlite	21	USES= cmake desktop-file-utils sqlite
21		22
22	.if empty(PKGNAMESUFFIX)	23	.if empty(PKGNAMESUFFIX)
		24	CMAKE_ARGS+= -DUSE_QT5:BOOL=FALSE
23	USE_QT4= corelib network gui qmake_build linguisttools_build \	25	USE_QT4= corelib network gui qmake_build linguisttools_build \
24	moc_build uic_build rcc_build	26	moc_build uic_build rcc_build
25	CMAKE_ARGS+= -DUSE_QT5:BOOL=FALSE
26	.else	27	.else
27	USE_QT5= core gui network printsupport testlib widgets \
28	buildtools_build linguisttools_build qmake_build
29	CMAKE_ARGS+= -DUSE_QT5:BOOL=TRUE	28	CMAKE_ARGS+= -DUSE_QT5:BOOL=TRUE
		29	USE_QT5= core widgets network gui qmake buildtools linguisttools printsupport testlib
30	.endif	30	.endif
31		31
32	post-patch:	32	post-patch:

Lines 1-6 Link Here

(-)files/patch-src-Application.cpp (-12 / +3 lines)
1	--- src/Application.cpp.orig 2015-06-14 10:13:37 UTC	1	--- src/Application.cpp.orig 2016-09-25 11:30:50 UTC
2	+++ src/Application.cpp	2	+++ src/Application.cpp
3	@@ -30,8 +30,15 @@ Application::Application(int& argc, char	3	@@ -30,8 +30,16 @@ Application::Application(int& argc, char
4		4
5	// First of all try to load the application translation file.	5	// First of all try to load the application translation file.
6	m_translatorApp = new QTranslator(this);	6	m_translatorApp = new QTranslator(this);
Lines 13-28 Link Here
13	ok = m_translatorApp->load("sqlb_" + name,	13	ok = m_translatorApp->load("sqlb_" + name,
14	QCoreApplication::applicationDirPath() + "/translations");	14	QCoreApplication::applicationDirPath() + "/translations");
15	+#endif	15	+#endif
		16	+
16	// If failed then try to load .qm file from resources	17	// If failed then try to load .qm file from resources
17	if (ok == false) {	18	if (ok == false) {
18	ok = m_translatorApp->load("sqlb_" + name, ":/translations");	19	ok = m_translatorApp->load("sqlb_" + name, ":/translations");
19	@@ -51,7 +58,9 @@ Application::Application(int& argc, char
20	ok = m_translatorQt->load("qt_" + name,
21	QLibraryInfo::location(QLibraryInfo::TranslationsPath));
22	if (ok == false)
23	+ {
24	ok = m_translatorQt->load("qt_" + name, "translations");
25	+ }
26	if (ok == true)
27	installTranslator(m_translatorQt);
28	}

Lines 1-18 Link Here

(-)files/patch-src-PreferencesDialog.cpp (-9 / +6 lines)
1	--- src/PreferencesDialog.cpp.orig 2015-04-27 09:31:47 UTC	1	--- src/PreferencesDialog.cpp.org 2016-09-25 13:45:26.476810000 +0200
2	+++ src/PreferencesDialog.cpp	2	+++ src/PreferencesDialog.cpp 2016-09-25 13:46:35.935807000 +0200
3	@@ -356,8 +356,15 @@ void PreferencesDialog::removeExtension(	3	@@ -465,8 +465,13 @@
4		4
5	void PreferencesDialog::fillLanguageBox()	5	void PreferencesDialog::fillLanguageBox()
6	{	6	{
7	- QDir translationsDir(QCoreApplication::applicationDirPath() + "/translations",
8	+
9	+#ifdef Q_OS_FREEBSD	7	+#ifdef Q_OS_FREEBSD
10	+ QDir translationsDir("%%DATADIR%%/translations",	8	+ QDir translationsDir("%%DATADIR%%/translations",
		9	+ "sqlb_*.qm");
		10	+#else
		11	QDir translationsDir(QCoreApplication::applicationDirPath() + "/translations",
11	"sqlb_*.qm");	12	"sqlb_*.qm");
12	+#else
13	+ QDir translationsDir(QCoreApplication::applicationDirPath() + "/translations",
14	+ "sqlb_*.qm");
15	+
16	+#endif	13	+#endif
17		14
18	QLocale systemLocale = QLocale::system();	15	QLocale systemLocale = QLocale::system();