Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Oct 2016 01:05:15 +0000 (UTC)
From:      Ruslan Makhmatkhanov <rm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r423030 - in head/databases/sqlitebrowser: . files
Message-ID:  <201610010105.u9115F4r027780@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rm
Date: Sat Oct  1 01:05:14 2016
New Revision: 423030
URL: https://svnweb.freebsd.org/changeset/ports/423030

Log:
  databases/sqlitebrowser: update to 3.9.0
  
  - update to 3.9.0
  - update maintainer's email
  - pet portlint
  
  PR:		212395
  Submitted by:	 lbartoletti <lbartoletti@tuxfamily.org> (maintainer)

Added:
  head/databases/sqlitebrowser/files/patch-CMakeLists.txt   (contents, props changed)
Modified:
  head/databases/sqlitebrowser/Makefile
  head/databases/sqlitebrowser/distinfo
  head/databases/sqlitebrowser/files/patch-src-Application.cpp
  head/databases/sqlitebrowser/files/patch-src-PreferencesDialog.cpp

Modified: head/databases/sqlitebrowser/Makefile
==============================================================================
--- head/databases/sqlitebrowser/Makefile	Fri Sep 30 23:41:18 2016	(r423029)
+++ head/databases/sqlitebrowser/Makefile	Sat Oct  1 01:05:14 2016	(r423030)
@@ -1,32 +1,33 @@
-# Created by: loïc bartoletti <coder@tuxfamily.org>
+# Created by: loïc bartoletti <lbartoletti@tuxfamily.org>
 # $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
-
-CONFLICTS_INSTALL?=	${PORTNAME}-qt5-*
+MAINTAINER=	lbartoletti@tuxfamily.org
+COMMENT=	Visual tool to manage SQLite databases
 
 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:

Modified: head/databases/sqlitebrowser/distinfo
==============================================================================
--- head/databases/sqlitebrowser/distinfo	Fri Sep 30 23:41:18 2016	(r423029)
+++ head/databases/sqlitebrowser/distinfo	Sat Oct  1 01:05:14 2016	(r423030)
@@ -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

Added: head/databases/sqlitebrowser/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/sqlitebrowser/files/patch-CMakeLists.txt	Sat Oct  1 01:05:14 2016	(r423030)
@@ -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}")

Modified: head/databases/sqlitebrowser/files/patch-src-Application.cpp
==============================================================================
--- head/databases/sqlitebrowser/files/patch-src-Application.cpp	Fri Sep 30 23:41:18 2016	(r423029)
+++ head/databases/sqlitebrowser/files/patch-src-Application.cpp	Sat Oct  1 01:05:14 2016	(r423030)
@@ -1,6 +1,6 @@
---- 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);
@@ -13,16 +13,7 @@
      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);
-     }

Modified: head/databases/sqlitebrowser/files/patch-src-PreferencesDialog.cpp
==============================================================================
--- head/databases/sqlitebrowser/files/patch-src-PreferencesDialog.cpp	Fri Sep 30 23:41:18 2016	(r423029)
+++ head/databases/sqlitebrowser/files/patch-src-PreferencesDialog.cpp	Sat Oct  1 01:05:14 2016	(r423030)
@@ -1,18 +1,15 @@
---- 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();



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610010105.u9115F4r027780>