pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/sqlitebrowser Install icons and application ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3a2841dec878
branches:  trunk
changeset: 318986:3a2841dec878
user:      brook <brook%pkgsrc.org@localhost>
date:      Sat Feb 02 08:48:06 2019 +0000

description:
Install icons and application resources on all Unix platforms.

As discussed on tech-pkg, icons and application resources should be
installed uniformly on all Unix platforms.  Previously, CMakeLists.txt
excluded these on Darwin but not on other Unix platforms.
Consequently, the PLIST was broken on Darwin.  This was fixed with
upstream commit 21d8800ce613775c995212f61d7e95c2189f6da6, which has
been backported here to v3.8.0.

While here, add two buildlink3.mk files, also discussed on tech-pkg,
that should have been present all along but for some reason were not.

diffstat:

 databases/sqlitebrowser/Makefile                     |   7 +++--
 databases/sqlitebrowser/distinfo                     |   3 +-
 databases/sqlitebrowser/patches/patch-CMakeLists.txt |  26 ++++++++++++++++++++
 3 files changed, 32 insertions(+), 4 deletions(-)

diffs (67 lines):

diff -r e3ad408a31bf -r 3a2841dec878 databases/sqlitebrowser/Makefile
--- a/databases/sqlitebrowser/Makefile  Sat Feb 02 08:44:44 2019 +0000
+++ b/databases/sqlitebrowser/Makefile  Sat Feb 02 08:48:06 2019 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2018/12/09 18:52:21 adam Exp $
+# $NetBSD: Makefile,v 1.29 2019/02/02 08:48:06 brook Exp $
 
 DISTNAME=      sqlitebrowser-3.8.0
-PKGREVISION=   10
+PKGREVISION=   11
 CATEGORIES=    databases x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=sqlitebrowser/}
-GITHUB_PROJECT=        sqlitebrowser
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -16,6 +15,8 @@
 USE_CMAKE=     yes
 
 .include "../../databases/sqlite3/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e3ad408a31bf -r 3a2841dec878 databases/sqlitebrowser/distinfo
--- a/databases/sqlitebrowser/distinfo  Sat Feb 02 08:44:44 2019 +0000
+++ b/databases/sqlitebrowser/distinfo  Sat Feb 02 08:48:06 2019 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2016/03/05 07:45:21 ryoon Exp $
+$NetBSD: distinfo,v 1.8 2019/02/02 08:48:06 brook Exp $
 
 SHA1 (sqlitebrowser-3.8.0.tar.gz) = 466ef6692c569e2e95158fcb6ac8a4f6ea38fc6f
 RMD160 (sqlitebrowser-3.8.0.tar.gz) = a4af8ecc97a02b042552f539ef67c907042f2c60
 SHA512 (sqlitebrowser-3.8.0.tar.gz) = 6e262e3bd3b26a1574a69cc9f306774cc9fe69f87c3253aba6b40c35f2491bc0636b6d5e705526e039ee9d8ed27d21a4529a624d62e8879a3917cfb502a65589
 Size (sqlitebrowser-3.8.0.tar.gz) = 1538043 bytes
+SHA1 (patch-CMakeLists.txt) = 303617c11c807241cc13a2f664fe667282ce7bda
diff -r e3ad408a31bf -r 3a2841dec878 databases/sqlitebrowser/patches/patch-CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/sqlitebrowser/patches/patch-CMakeLists.txt      Sat Feb 02 08:48:06 2019 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2019/02/02 08:48:06 brook Exp $
+
+Icons and application resources should be installed on all unix platforms.
+
+See upstream commit 21d8800ce613775c995212f61d7e95c2189f6da6.
+
+--- CMakeLists.txt.orig        2015-12-26 12:10:05.000000000 +0000
++++ CMakeLists.txt
+@@ -301,7 +301,7 @@ if(ENABLE_TESTING)
+       add_subdirectory(src/tests)
+ endif()
+ 
+-if(UNIX AND NOT APPLE)
++if(UNIX)
+       install(FILES src/icons/${PROJECT_NAME}.png
+               DESTINATION share/icons/hicolor/256x256/apps/)
+       
+@@ -310,7 +310,7 @@ if(UNIX AND NOT APPLE)
+ 
+       install(FILES distri/${PROJECT_NAME}.desktop.appdata.xml
+               DESTINATION share/appdata/)
+-endif(UNIX AND NOT APPLE)
++endif(UNIX)
+ 
+ if(WIN32 AND MSVC)
+       set(QT5_BIN_PATH ${QT5_PATH}/bin)



Home | Main Index | Thread Index | Old Index