From d24b33e19bd8c81a9d746ac234e3935e729905d9 Mon Sep 17 00:00:00 2001 From: Nuno Teixeira Date: Fri, 21 Jun 2024 14:27:17 +0100 Subject: [PATCH] databases/opendbviewer: Update to 1.2.0 - Switch to DISTVERSION - Drop compiler from USES - Pet Q/A check - Take maintainership ChangeLog: https://github.com/Seek-One/opendbviewer/blob/master/ChangeLog --- databases/opendbviewer/Makefile | 17 ++++++++--------- databases/opendbviewer/distinfo | 6 +++--- .../opendbviewer/files/patch-CMakeLists.txt | 11 ----------- ...atch-CMakeModules_ProjectCommonConfig.cmake | 17 +++++++++++++++++ .../files/patch-src_Widget_QDropAreaWidget.cpp | 10 ---------- databases/opendbviewer/pkg-plist | 18 ++++++++++++++++++ 6 files changed, 46 insertions(+), 33 deletions(-) delete mode 100644 databases/opendbviewer/files/patch-CMakeLists.txt create mode 100644 databases/opendbviewer/files/patch-CMakeModules_ProjectCommonConfig.cmake delete mode 100644 databases/opendbviewer/files/patch-src_Widget_QDropAreaWidget.cpp diff --git a/databases/opendbviewer/Makefile b/databases/opendbviewer/Makefile index b0946c57cd19..98d4ccd09c37 100644 --- a/databases/opendbviewer/Makefile +++ b/databases/opendbviewer/Makefile @@ -1,28 +1,27 @@ PORTNAME= opendbviewer -PORTVERSION= 1.1.1 -PORTREVISION= 1 DISTVERSIONPREFIX= v +DISTVERSION= 1.2.0 CATEGORIES= databases -MAINTAINER= ports@FreeBSD.org +MAINTAINER= eduardo@FreeBSD.org COMMENT= Simple database explorer WWW= https://github.com/Jet1oeil/opendbviewer LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake compiler:c++11-lang magick:6,build qt:5 +USES= cmake gl magick:build qt:5 xorg USE_GITHUB= yes GH_ACCOUNT= Jet1oeil -USE_QT= core gui network sql sql-sqlite3 testlib widgets \ +USE_GL= egl +USE_QT= core dbus gui network sql sql-sqlite3 testlib widgets \ buildtools:build linguisttools:build qmake:build +USE_XORG= x11 xcb -OPTIONS_DEFINE= DOCS PGSQL MYSQL +OPTIONS_DEFINE= DOCS MYSQL PGSQL OPTIONS_DEFAULT= PGSQL -PGSQL_USE= QT=sql-pgsql MYSQL_USE= QT=sql-mysql - -CMAKE_ARGS+= -DCMAKE_CXX_STANDARD=11 +PGSQL_USE= QT=sql-pgsql .include diff --git a/databases/opendbviewer/distinfo b/databases/opendbviewer/distinfo index 4ff4ec4727e5..e7e3b7dec98c 100644 --- a/databases/opendbviewer/distinfo +++ b/databases/opendbviewer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563900989 -SHA256 (Jet1oeil-opendbviewer-v1.1.1_GH0.tar.gz) = 15b90b4a864de10b729b0d4b393aba5d221378399798d77bfa38f6e03e1cf34a -SIZE (Jet1oeil-opendbviewer-v1.1.1_GH0.tar.gz) = 2082740 +TIMESTAMP = 1718958859 +SHA256 (Jet1oeil-opendbviewer-v1.2.0_GH0.tar.gz) = ffdc02216d9fae56ea3a74e23e506f1677b2615476cbe743a8f2ef1c67575deb +SIZE (Jet1oeil-opendbviewer-v1.2.0_GH0.tar.gz) = 2114830 diff --git a/databases/opendbviewer/files/patch-CMakeLists.txt b/databases/opendbviewer/files/patch-CMakeLists.txt deleted file mode 100644 index ac7184ddd22a..000000000000 --- a/databases/opendbviewer/files/patch-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2019-07-23 17:03:09 UTC -+++ CMakeLists.txt -@@ -58,7 +58,7 @@ elseif(APPLE) - else(WIN32) - set(INSTALL_PATH_BIN "bin/") - set(INSTALL_PATH_SHARE "share/${APPLICATION_PACKAGE_NAME}") -- set(INSTALL_PATH_DOC "share/${APPLICATION_PACKAGE_NAME}/doc") -+ set(INSTALL_PATH_DOC "share/doc/${APPLICATION_PACKAGE_NAME}") - set(INSTALL_PATH_APPLICATIONS "share/applications") - set(INSTALL_PATH_ICONS "share/icons/") - endif(WIN32) diff --git a/databases/opendbviewer/files/patch-CMakeModules_ProjectCommonConfig.cmake b/databases/opendbviewer/files/patch-CMakeModules_ProjectCommonConfig.cmake new file mode 100644 index 000000000000..7817c38677da --- /dev/null +++ b/databases/opendbviewer/files/patch-CMakeModules_ProjectCommonConfig.cmake @@ -0,0 +1,17 @@ +--- CMakeModules/ProjectCommonConfig.cmake.orig 2024-06-18 16:17:49 UTC ++++ CMakeModules/ProjectCommonConfig.cmake +@@ -48,12 +48,12 @@ else() + set(INSTALL_PATH_ICONS ".") + set(INSTALL_PATH_ETC "../etc") + else() +- set(INSTALL_PATH_BIN "share/${APPLICATION_PACKAGE_NAME}/bin") ++ set(INSTALL_PATH_BIN "bin") + set(INSTALL_PATH_SHARE "share/${APPLICATION_PACKAGE_NAME}") + set(INSTALL_PATH_LIB "share/${APPLICATION_PACKAGE_NAME}/lib") + set(INSTALL_PATH_INCLUDE "share/${APPLICATION_PACKAGE_NAME}/include") + set(INSTALL_PATH_PLUGIN "share/${APPLICATION_PACKAGE_NAME}/plugins") +- set(INSTALL_PATH_DOC "share/${APPLICATION_PACKAGE_NAME}/doc") ++ set(INSTALL_PATH_DOC "share/doc/${APPLICATION_PACKAGE_NAME}") + set(INSTALL_PATH_LICENSE "share/${APPLICATION_PACKAGE_NAME}/license") + set(INSTALL_PATH_APPLICATIONS "share/applications") + set(INSTALL_PATH_ICONS "share/icons") diff --git a/databases/opendbviewer/files/patch-src_Widget_QDropAreaWidget.cpp b/databases/opendbviewer/files/patch-src_Widget_QDropAreaWidget.cpp deleted file mode 100644 index 930a0b6a0c96..000000000000 --- a/databases/opendbviewer/files/patch-src_Widget_QDropAreaWidget.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Widget/QDropAreaWidget.cpp.orig 2020-05-21 08:16:02 UTC -+++ src/Widget/QDropAreaWidget.cpp -@@ -6,6 +6,7 @@ - */ - - #include -+#include - - #include "QDropAreaWidget.h" - diff --git a/databases/opendbviewer/pkg-plist b/databases/opendbviewer/pkg-plist index 801aa4f318af..461c91af39ed 100644 --- a/databases/opendbviewer/pkg-plist +++ b/databases/opendbviewer/pkg-plist @@ -10,14 +10,26 @@ share/icons/hicolor/32x32/apps/opendbviewer.png share/icons/hicolor/48x48/apps/opendbviewer.png share/icons/hicolor/64x64/apps/opendbviewer.png share/icons/opendbviewer.png +%%DATADIR%%/icons_themes/app_default/actions/112x70/database-add.png +%%DATADIR%%/icons_themes/app_default/actions/112x70/database.png +%%DATADIR%%/icons_themes/app_default/actions/112x70/folder.png +%%DATADIR%%/icons_themes/app_default/actions/112x70/history.png %%DATADIR%%/icons_themes/app_default/actions/128/database-add.png %%DATADIR%%/icons_themes/app_default/actions/128/database.png %%DATADIR%%/icons_themes/app_default/actions/128/folder.png %%DATADIR%%/icons_themes/app_default/actions/128/history.png +%%DATADIR%%/icons_themes/app_default/actions/144x90/database-add.png +%%DATADIR%%/icons_themes/app_default/actions/144x90/database.png +%%DATADIR%%/icons_themes/app_default/actions/144x90/folder.png +%%DATADIR%%/icons_themes/app_default/actions/144x90/history.png %%DATADIR%%/icons_themes/app_default/actions/16/database-add.png %%DATADIR%%/icons_themes/app_default/actions/16/database.png %%DATADIR%%/icons_themes/app_default/actions/16/folder.png %%DATADIR%%/icons_themes/app_default/actions/16/history.png +%%DATADIR%%/icons_themes/app_default/actions/192x120/database-add.png +%%DATADIR%%/icons_themes/app_default/actions/192x120/database.png +%%DATADIR%%/icons_themes/app_default/actions/192x120/folder.png +%%DATADIR%%/icons_themes/app_default/actions/192x120/history.png %%DATADIR%%/icons_themes/app_default/actions/22/database-add.png %%DATADIR%%/icons_themes/app_default/actions/22/database.png %%DATADIR%%/icons_themes/app_default/actions/22/folder.png @@ -38,5 +50,11 @@ share/icons/opendbviewer.png %%DATADIR%%/icons_themes/app_default/actions/64/database.png %%DATADIR%%/icons_themes/app_default/actions/64/folder.png %%DATADIR%%/icons_themes/app_default/actions/64/history.png +%%DATADIR%%/icons_themes/app_default/actions/svg/database-add.svg +%%DATADIR%%/icons_themes/app_default/actions/svg/database.svg +%%DATADIR%%/icons_themes/app_default/actions/svg/folder.svg +%%DATADIR%%/icons_themes/app_default/actions/svg/history.svg %%DATADIR%%/icons_themes/app_default/author %%DATADIR%%/icons_themes/app_default/index.theme +%%DATADIR%%/plugins/xcbglintegrations/libqxcb-egl-integration.so +%%DATADIR%%/plugins/xcbglintegrations/libqxcb-glx-integration.so