diff --git a/databases/sqlitestudio/Makefile b/databases/sqlitestudio/Makefile index e60e1e9cb178..4ede3c708d72 100644 --- a/databases/sqlitestudio/Makefile +++ b/databases/sqlitestudio/Makefile @@ -1,81 +1,78 @@ PORTNAME= sqlitestudio -DISTVERSION= 3.3.3 -PORTREVISION= 1 +DISTVERSION= 3.4.0 CATEGORIES= databases MAINTAINER= yuri@FreeBSD.org COMMENT= SQLite database GUI manager WWW= https://sqlitestudio.pl/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/../LICENSE OPTIONS_GROUP= PLUGINS OPTIONS_DEFAULT= ${OPTIONS_GROUP_PLUGINS} OPTIONS_SUB= yes PLUGINS_DESC= Install plugins: ALL_PLUGINS= CsvImport CsvExport DbSqliteCipher HtmlExport JsonExport MultiEditorImage PdfExport Printing \ RegExpImport SqlFormatterSimple SqlExport SqlEnterpriseFormatter XmlExport .for p in ${ALL_PLUGINS} OPTIONS_GROUP_PLUGINS+= PLUGIN${p:C/([A-Z])/_\1/g:tu} PLUGIN${p:C/([A-Z])/_\1/g:tu}_DESC= ${p} plugin PLUGIN${p:C/([A-Z])/_\1/g:tu}_VARS= PLUGIN_DIRS+=${p} .endfor PLUGIN_DB_SQLITE_CIPHER_USES= ssl PLUGIN_PRINTING_USE= QT=printsupport USES= compiler:c++17-lang gl gmake ncurses qmake qt:5 readline sqlite USE_GITHUB= yes GH_ACCOUNT= pawelsalawa -USE_QT= core concurrent gui network script sql sql-sqlite3:run svg widgets xml \ +USE_QT= core concurrent declarative gui network script sql sql-sqlite3:run svg widgets xml \ uitools buildtools:build linguisttools:build USE_GL= gl WRKSRC_SUBDIR= SQLiteStudio3 CXXFLAGS+= -I${WRKSRC}/coreSQLiteStudio DESKTOP_ENTRIES= "SQLite database manager" \ "Advanced SQLite database manager" \ "SQLiteStudio" \ "SQLiteStudio" \ - "Database;Viewer;DataVisualization;Development;Qt;" \ + "Viewer;DataVisualization;Development;Qt;" \ "" post-patch: - @${REINPLACE_CMD} -e 's|/usr/|${LOCALBASE}/|' \ - ${WRKSRC}/dirs.pri @${REINPLACE_CMD} -e 's|pluginDirs += QDir(CFG->getConfigDir()).absoluteFilePath("plugins");|pluginDirs += "${LOCALBASE}/lib/sqlitestudio";|' \ ${WRKSRC}/coreSQLiteStudio/services/impl/pluginmanagerimpl.cpp post-configure: # Fix for a suspected bug in qmake: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210418 @${REINPLACE_CMD} -E 's|SUBLIBS) -L[^ ]+|SUBLIBS) |' ${WRKSRC}/sqlitestudio/Makefile @${REINPLACE_CMD} -E 's|LIBS)$$|LIBS) -L${PREFIX}/lib|' ${WRKSRC}/sqlitestudio/Makefile @for plugin in ${PLUGIN_DIRS}; do \ cd ${WRKSRC}/../Plugins/$$plugin && \ ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH}; \ done; post-build: @for plugin in ${PLUGIN_DIRS}; do \ cd ${WRKSRC}/../Plugins/$$plugin && \ ${DO_MAKE_BUILD} ${ALL_TARGET}; \ done; post-install: @for plugin in ${PLUGIN_DIRS}; do \ cd ${WRKSRC}/../Plugins/$$plugin && \ ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; \ done; # install icons for the .desktop file to work @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps ${INSTALL_DATA} \ ${WRKSRC}/guiSQLiteStudio/img/sqlitestudio.svg \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/SQLiteStudio.svg # add the lowercase link to the executable for convenience @cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s SQLiteStudio sqlitestudio .include diff --git a/databases/sqlitestudio/distinfo b/databases/sqlitestudio/distinfo index c94a7cc7bb84..ba60d5afce61 100644 --- a/databases/sqlitestudio/distinfo +++ b/databases/sqlitestudio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619063721 -SHA256 (pawelsalawa-sqlitestudio-3.3.3_GH0.tar.gz) = f234e1ea87d27e80a1794f86d32116ebd8919d51be63d35a7d0816a77115ce31 -SIZE (pawelsalawa-sqlitestudio-3.3.3_GH0.tar.gz) = 8863232 +TIMESTAMP = 1668856780 +SHA256 (pawelsalawa-sqlitestudio-3.4.0_GH0.tar.gz) = 0295b2286b0f2830d398141341a7966dfac2748fc8792b50be0122fa7baf4a18 +SIZE (pawelsalawa-sqlitestudio-3.4.0_GH0.tar.gz) = 13149123 diff --git a/databases/sqlitestudio/files/patch-5e7ee1ed25222cdb193f862702d480b91d195fa9 b/databases/sqlitestudio/files/patch-5e7ee1ed25222cdb193f862702d480b91d195fa9 new file mode 100644 index 000000000000..caec05048c0e --- /dev/null +++ b/databases/sqlitestudio/files/patch-5e7ee1ed25222cdb193f862702d480b91d195fa9 @@ -0,0 +1,38 @@ +--- ../Plugins/ScriptingTcl/ScriptingTcl.pro ++++ ../Plugins/ScriptingTcl/ScriptingTcl.pro +@@ -44,7 +44,7 @@ linux: { + !exists($$TCL_CONFIG) { + # Debian case + DEBIAN_ARCH_PATH=$$system(dpkg-architecture -qDEB_HOST_MULTIARCH) +- TCL_CONFIG = /usr/lib/$$DEBIAN_ARCH_PATH/tcl$$TCL_VERSION/tclConfig.sh ++ TCL_CONFIG = $$PREFIX/lib/$$DEBIAN_ARCH_PATH/tcl$$TCL_VERSION/tclConfig.sh + } + message("Looking for $$TCL_CONFIG") + !exists($$TCL_CONFIG) { +--- Tests/TestUtils/TestUtils.pro ++++ Tests/TestUtils/TestUtils.pro +@@ -41,7 +41,7 @@ unix:!symbian { + maemo5 { + target.path = /opt/usr/lib + } else { +- target.path = /usr/lib ++ target.path = $$PREFIX/lib + } + INSTALLS += target + } +--- common.pri ++++ common.pri +@@ -40,11 +40,11 @@ portable { + + unix: { + isEmpty(LIBDIR) { +- LIBDIR = /usr/lib ++ LIBDIR = $$PREFIX/lib + } + export(LIBDIR) + isEmpty(BINDIR) { +- BINDIR = /usr/bin ++ BINDIR = $$PREFIX/bin + } + export(BINDIR) + }