Index: head/databases/sqlitebrowser/Makefile =================================================================== --- head/databases/sqlitebrowser/Makefile (revision 423029) +++ head/databases/sqlitebrowser/Makefile (revision 423030) @@ -1,38 +1,39 @@ -# Created by: loïc bartoletti +# Created by: loïc bartoletti # $FreeBSD$ PORTNAME= sqlitebrowser -PORTVERSION= 3.8.0 +PORTVERSION= 3.9.0 DISTVERSIONPREFIX= v -PORTREVISION?= 1 CATEGORIES= databases -MAINTAINER= coder@tuxfamily.org -COMMENT= DB Browser for SQLite is a visual tool to manage SQLite databases +MAINTAINER= lbartoletti@tuxfamily.org +COMMENT= Visual tool to manage SQLite databases -CONFLICTS_INSTALL?= ${PORTNAME}-qt5-* - LICENSE= MPL GPLv3 LICENSE_COMB= dual +BUILD_DEPENDS= ${LOCALBASE}/lib/libantlr.a: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 +CMAKE_ARGS+= -DUSE_QT5:BOOL=TRUE USE_QT5= core gui network printsupport testlib widgets \ buildtools_build linguisttools_build qmake_build -CMAKE_ARGS+= -DUSE_QT5:BOOL=TRUE .endif post-patch: @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \ ${WRKSRC}/src/PreferencesDialog.cpp @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \ ${WRKSRC}/src/Application.cpp .include Index: head/databases/sqlitebrowser/distinfo =================================================================== --- head/databases/sqlitebrowser/distinfo (revision 423029) +++ head/databases/sqlitebrowser/distinfo (revision 423030) @@ -1,2 +1,3 @@ -SHA256 (sqlitebrowser-sqlitebrowser-v3.8.0_GH0.tar.gz) = f638a751bccde4bf0305a75685e2a72d26fc3e3a69d7e15fd84573f88c1a4d92 -SIZE (sqlitebrowser-sqlitebrowser-v3.8.0_GH0.tar.gz) = 1538043 +TIMESTAMP = 1472301221 +SHA256 (sqlitebrowser-sqlitebrowser-v3.9.0_GH0.tar.gz) = 0ccbf05e9c5f544a542399332dd70ef365fab4ded6b838e29ba4fb1375872bf2 +SIZE (sqlitebrowser-sqlitebrowser-v3.9.0_GH0.tar.gz) = 1701943 Index: head/databases/sqlitebrowser/files/patch-CMakeLists.txt =================================================================== --- head/databases/sqlitebrowser/files/patch-CMakeLists.txt (nonexistent) +++ head/databases/sqlitebrowser/files/patch-CMakeLists.txt (revision 423030) @@ -0,0 +1,8 @@ +--- CMakeLists.txt.orig 2016-08-24 11:00:01 UTC ++++ CMakeLists.txt +@@ -1,4 +1,4 @@ +-project("DB Browser for SQLite") ++project("sqlitebrowser") + cmake_minimum_required(VERSION 2.8.7) + + set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}") Property changes on: head/databases/sqlitebrowser/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/sqlitebrowser/files/patch-src-Application.cpp =================================================================== --- head/databases/sqlitebrowser/files/patch-src-Application.cpp (revision 423029) +++ head/databases/sqlitebrowser/files/patch-src-Application.cpp (revision 423030) @@ -1,28 +1,19 @@ ---- src/Application.cpp.orig 2015-06-14 10:13:37 UTC +--- src/Application.cpp.orig 2016-09-25 11:30:50 UTC +++ src/Application.cpp -@@ -30,8 +30,15 @@ Application::Application(int& argc, char +@@ -30,8 +30,16 @@ Application::Application(int& argc, char // First of all try to load the application translation file. m_translatorApp = new QTranslator(this); + +#ifdef Q_OS_FREEBSD + QString trans_dir = "%%DATADIR%%/translations"; + ok = m_translatorApp->load("sqlb_" + name, + trans_dir); +#else 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); - } Index: head/databases/sqlitebrowser/files/patch-src-PreferencesDialog.cpp =================================================================== --- head/databases/sqlitebrowser/files/patch-src-PreferencesDialog.cpp (revision 423029) +++ head/databases/sqlitebrowser/files/patch-src-PreferencesDialog.cpp (revision 423030) @@ -1,19 +1,16 @@ ---- src/PreferencesDialog.cpp.orig 2015-04-27 09:31:47 UTC +--- src/PreferencesDialog.cpp.orig 2016-08-24 11:00:01 UTC +++ src/PreferencesDialog.cpp -@@ -356,8 +356,15 @@ void PreferencesDialog::removeExtension( +@@ -465,8 +465,13 @@ void PreferencesDialog::removeExtension( void PreferencesDialog::fillLanguageBox() { -- QDir translationsDir(QCoreApplication::applicationDirPath() + "/translations", -+ +#ifdef Q_OS_FREEBSD + QDir translationsDir("%%DATADIR%%/translations", - "sqlb_*.qm"); ++ "sqlb_*.qm"); +#else -+ QDir translationsDir(QCoreApplication::applicationDirPath() + "/translations", -+ "sqlb_*.qm"); -+ + QDir translationsDir(QCoreApplication::applicationDirPath() + "/translations", + "sqlb_*.qm"); +#endif QLocale systemLocale = QLocale::system();