Attachment 175156 Details for Bug 212395 – Fix patch (DATADIR) for sqlitebrowser-3.9.0

[patch] Fix patch (DATADIR) for sqlitebrowser-3.9.0

sqlitebrowser-3.9.0.diff (text/plain), 5.02 KB, created by Loïc Bartoletti on 2016-09-25 12:37:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2016-09-25 12:37:53 UTC

Size: 5.02 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 422748)
>+++ Makefile	(working copy)
>@@ -1,32 +1,32 @@
>-# 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
>+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:
>Index: distinfo
>===================================================================
>--- distinfo	(revision 422748)
>+++ distinfo	(working copy)
>@@ -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: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(nonexistent)
>+++ files/patch-CMakeLists.txt	(working copy)
>@@ -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: 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: files/patch-src-Application.cpp
>===================================================================
>--- files/patch-src-Application.cpp	(revision 422748)
>+++ files/patch-src-Application.cpp	(working copy)
>@@ -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);
>-     }
>Index: files/patch-src-PreferencesDialog.cpp
>===================================================================
>--- files/patch-src-PreferencesDialog.cpp	(revision 422748)
>+++ files/patch-src-PreferencesDialog.cpp	(working copy)
>@@ -1,18 +1,15 @@
>---- src/PreferencesDialog.cpp.orig	2015-04-27 09:31:47 UTC
>-+++ src/PreferencesDialog.cpp
>-@@ -356,8 +356,15 @@ void PreferencesDialog::removeExtension(
>+--- 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();

Flags:

lbartoletti: maintainer-approval+

Actions: View | Diff

Attachments on bug 212395: 174396 | 174397 | 175015 | 175018 | 175156