From nobody Sat May 28 04:10:20 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 346B41B46E54; Sat, 28 May 2022 04:10:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L97W10n1Dz3Dq0; Sat, 28 May 2022 04:10:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653711021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lUOwh4g2Le62mTGbl2wSF877X6KG6sA8MWOHY9zjfDQ=; b=yADVDdd3rPYRd9sht+pQHy6uF4fjM1qxBBV0j9UwkLF1IBaWuAtZMJstXJM/k5KUbesqmD Ed10VhsqJecnJmNjhoNX19prYyt89vMQSQxN4aamBczrWUConAUgt7TKy6bPYZIHO8vVra KpST4PtqQgUD7xg0fST+G7hRcbga2JlRTykhk4rvweFUwZLjiucEqWsEX2/cFStjD7ujKl M0VY2QrPfGFlBWLUWubzwnk8XkQ61OZpXUWRbg2ukfgGw+TKOMnuFdHbHKES6JqAdXiYTv 6gSg1aqlHh9zzwvXWvSTVgObnZaR9vSj9edccUdgbmff3l7DGn+6ROVdeM5SSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E491A2FC8E; Sat, 28 May 2022 04:10:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24S4AK1s049366; Sat, 28 May 2022 04:10:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24S4AKaX049362; Sat, 28 May 2022 04:10:20 GMT (envelope-from git) Date: Sat, 28 May 2022 04:10:20 GMT Message-Id: <202205280410.24S4AKaX049362@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: c8c89adb913e - main - finance/alkimia: Update to 8.1.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8c89adb913e734c57a7b2b96d90a41f6e0298e2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653711021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lUOwh4g2Le62mTGbl2wSF877X6KG6sA8MWOHY9zjfDQ=; b=XOR61p47jOqlr4GvC8zuaR27uxFQLhPUR5ICvo14eyTyRmPFHN8GRam3NTD1AUsJeNMUlx C4F25rMzefEPuKhQhTpafwohmrOL+gej4lDY/g9iLfiDlrHD+fwAMyOdNqVHqn49w2i/kC I8/cmW29tcbOGZmzbY4COmd1uoks0udwMHqq7iZQTFy4/X2IYb15+OmCNX8gOEpzisi3c1 yjIbJYsQk9VYEgaslPqJopnvqiMfMYzlTD59SySqaEU2DPtCB1k8mgh/wuH9hnrhGCQwTC tV2mK2spiaayNOV/fOqmnRWh83OWLtykLgJcOFbZtNAQd3NWwLMAhG2s3Kh3BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653711021; a=rsa-sha256; cv=none; b=orhbS9Z9YpHUC4wJjha+8sXzBTB1V1Glzt3xfAsMmM0FpGe7xP7OaDq23jbPcMjvgGY8Rm UiGkNhIXIYXu0zH8cQkDnU75KhUabjQZdY/j05gfvucHXwP2BSUFs9XzcbhYHkHM2AgPVL UGWFwKRRoL2N1XS3k3GhCTz4h2Snw1etpIEzKoxYdsxHg6HFMm/NpdeWXOiJlGlhJZGKlY F4fHUgv9myYF5qDsr4p324zN2k5JyAGaXUde+VZgvoQ7aITSf/Pfv5kVo6AknNXC0auhhH 8HlyRymFA+XKj7QfyV2qKchs3LiXizrFosUSITNH4pnKbjm05afFlEvXgfTnCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=c8c89adb913e734c57a7b2b96d90a41f6e0298e2 commit c8c89adb913e734c57a7b2b96d90a41f6e0298e2 Author: Jason E. Hale AuthorDate: 2022-05-06 16:57:03 +0000 Commit: Jason E. Hale CommitDate: 2022-05-28 04:10:11 +0000 finance/alkimia: Update to 8.1.1 --- finance/alkimia/Makefile | 11 +++++----- finance/alkimia/distinfo | 6 +++--- finance/alkimia/files/patch-CMakeLists.txt | 22 +++++++++---------- finance/alkimia/files/patch-src_alkwebpage.h | 32 ---------------------------- finance/alkimia/pkg-plist | 12 ++++++++++- 5 files changed, 31 insertions(+), 52 deletions(-) diff --git a/finance/alkimia/Makefile b/finance/alkimia/Makefile index 7857e06f6fde..bbb5390fda24 100644 --- a/finance/alkimia/Makefile +++ b/finance/alkimia/Makefile @@ -1,5 +1,5 @@ PORTNAME= alkimia -PORTVERSION= 8.1.0 +PORTVERSION= 8.1.1 CATEGORIES= finance kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} @@ -16,16 +16,17 @@ RUN_DEPENDS= p5-Date-Manip>=0:devel/p5-Date-Manip \ p5-libwww>=0:www/p5-libwww USES= cmake compiler:c++11-lang kde:5 pathfix perl5 qt:5 \ - shebangfix tar:xz + shebangfix tar:xz xorg USE_LDCONFIG= yes USE_KDE= attica auth codecs completion config configwidgets coreaddons \ - i18n iconthemes jobwidgets kio newstuff service sonnet \ + i18n iconthemes jobwidgets kio newstuff service solid sonnet \ textwidgets widgetsaddons windowsystem xmlgui ecm_build USE_PERL5= run USE_QT= concurrent core dbus declarative gui network widgets xml \ buildtools_build qmake_build +USE_XORG= x11 -CMAKE_OFF= BUILD_DOXYGEN_DOCS +CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Doxygen PLIST_SUB= VER=${PORTVERSION:R} SHEBANG_FILES= src/financequote.pl @@ -58,7 +59,7 @@ TOOLS_DESC= Build tools TOOLS_CMAKE_BOOL= BUILD_TOOLS WEBENGINE_DESC= Qt Web Engine support -WEBENGINE_USE= QT=webengine +WEBENGINE_USE= QT=location,printsupport,webchannel,webengine WEBENGINE_CMAKE_BOOL= BUILD_WITH_WEBENGINE WEBKIT_DESC= Qt WebKit support diff --git a/finance/alkimia/distinfo b/finance/alkimia/distinfo index d01abaca3e23..d8d8b69f38ec 100644 --- a/finance/alkimia/distinfo +++ b/finance/alkimia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1615051962 -SHA256 (alkimia-8.1.0.tar.xz) = 916807352707b0490cdd9ca65682eff73b00ca523029bda6fe7a2749a1bc927c -SIZE (alkimia-8.1.0.tar.xz) = 230804 +TIMESTAMP = 1651762698 +SHA256 (alkimia-8.1.1.tar.xz) = 957adc63c0be54dd433e3268a37323be5456e5ab84ece27f73a1616a92db86d5 +SIZE (alkimia-8.1.1.tar.xz) = 252332 diff --git a/finance/alkimia/files/patch-CMakeLists.txt b/finance/alkimia/files/patch-CMakeLists.txt index 28a75a0453a5..0729feffa133 100644 --- a/finance/alkimia/files/patch-CMakeLists.txt +++ b/finance/alkimia/files/patch-CMakeLists.txt @@ -1,20 +1,20 @@ Make tests conditional ---- CMakeLists.txt.orig 2021-01-21 22:50:19 UTC +--- CMakeLists.txt.orig 2022-05-05 15:16:34 UTC +++ CMakeLists.txt -@@ -37,7 +37,7 @@ include(FeatureSummary) - # check for PkgConfig, Qt and MPIR/GMP - find_package(PkgConfig) - if(BUILD_QT4) -- find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui QtDBus QtTest QtWebKit QtDeclarative) -+ find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui QtDBus QtWebKit QtDeclarative) - set(QT_USE_LIBSPREFIX Qt4::Qt) - set(ALKIMIA_LIB_SUFFIX "") - set(ALKIMIA_INCLUDE_SUFFIX "Qt4") -@@ -107,7 +107,6 @@ else() +@@ -75,7 +75,7 @@ if(BUILD_QT4) + set(QT_NETWORK_COMPONENT) + endif() +- find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui QtDBus ${QT_NETWORK_COMPONENT} QtTest ${QT_BROWSER_COMPONENT} QtDeclarative) ++ find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui QtDBus ${QT_NETWORK_COMPONENT} ${QT_BROWSER_COMPONENT} QtDeclarative) + set(_kde4_uninstall_rule_created 1) + find_package(KDE4 REQUIRED) + if(NOT BUILD_WITH_QTNETWORK) +@@ -150,7 +150,6 @@ else() find_package(Qt5 REQUIRED COMPONENTS Core + ${QT_NETWORK_COMPONENT} - Test ${QT_BROWSER_COMPONENT} Qml diff --git a/finance/alkimia/files/patch-src_alkwebpage.h b/finance/alkimia/files/patch-src_alkwebpage.h deleted file mode 100644 index d415188b4cf3..000000000000 --- a/finance/alkimia/files/patch-src_alkwebpage.h +++ /dev/null @@ -1,32 +0,0 @@ -Fix build when both the WEBKIT and WEBENGINE options are set to OFF. - -/wrkdirs/usr/ports/finance/alkimia/work/alkimia-8.1.0/tools/onlinequoteseditor/mainwindow.cpp:52:28: error: member access into incomplete type 'const QUrl' - d->urlLine->setText(url.toString()); - ^ -/usr/local/include/qt5/QtCore/qmetatype.h:2089:1: note: forward declaration of 'QUrl' -QT_FOR_EACH_STATIC_CORE_CLASS(QT_FORWARD_DECLARE_STATIC_TYPES_ITER) -^ -/usr/local/include/qt5/QtCore/qmetatype.h:121:17: note: expanded from macro 'QT_FOR_EACH_STATIC_CORE_CLASS' - F(QUrl, 17, QUrl) \ - ^ -/wrkdirs/usr/ports/finance/alkimia/work/alkimia-8.1.0/tools/onlinequoteseditor/mainwindow.cpp:57:63: error: 'QUrl' is an incomplete type - AlkOnlineQuotesProfileManager::instance().webPage()->load(QUrl(d->urlLine->text()), d->quotesWidget->acceptLanguage()); - ^ -/usr/local/include/qt5/QtCore/qmetatype.h:2089:1: note: forward declaration of 'QUrl' -QT_FOR_EACH_STATIC_CORE_CLASS(QT_FORWARD_DECLARE_STATIC_TYPES_ITER) -^ -/usr/local/include/qt5/QtCore/qmetatype.h:121:17: note: expanded from macro 'QT_FOR_EACH_STATIC_CORE_CLASS' - F(QUrl, 17, QUrl) \ - ^ -2 errors generated. - ---- src/alkwebpage.h.orig 2021-03-10 18:46:11 UTC -+++ src/alkwebpage.h -@@ -83,6 +83,7 @@ class ALK_EXPORT AlkWebPage : public QWebView (private - - #else - -+#include - #include - - /** diff --git a/finance/alkimia/pkg-plist b/finance/alkimia/pkg-plist index 7dfc18ad3cda..824ea0a7196f 100644 --- a/finance/alkimia/pkg-plist +++ b/finance/alkimia/pkg-plist @@ -17,7 +17,7 @@ lib/cmake/LibAlkimia5-%%VER%%/LibAlkimia5Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/LibAlkimia5-%%VER%%/LibAlkimia5Targets.cmake lib/libalkimia5.so lib/libalkimia5.so.8 -lib/libalkimia5.so.8.1.0 +lib/libalkimia5.so.8.1.1 %%QT_QMLDIR%%/org/kde/alkimia/libqmlalkimia.so %%QT_QMLDIR%%/org/kde/alkimia/qmldir libdata/pkgconfig/libalkimia5.pc @@ -32,6 +32,7 @@ libdata/pkgconfig/libalkimia5.pc share/knsrcfiles/alkimia-quotes.knsrc share/knsrcfiles/kmymoney-quotes.knsrc share/knsrcfiles/skrooge-quotes.knsrc +%%PLASMA%%share/kservices5/plasma-applet-org.wincak.foreigncurrencies2.desktop share/locale/ca/LC_MESSAGES/alkimia.mo share/locale/ca/LC_MESSAGES/onlinequoteseditor.mo share/locale/ca/LC_MESSAGES/plasma_applet_onlinequote.mo @@ -74,6 +75,10 @@ share/locale/gl/LC_MESSAGES/alkimia.mo share/locale/gl/LC_MESSAGES/onlinequoteseditor.mo share/locale/gl/LC_MESSAGES/plasma_applet_onlinequote.mo share/locale/gl/LC_MESSAGES/plasma_applet_org.wincak.foreigncurrencies2.mo +share/locale/hu/LC_MESSAGES/alkimia.mo +share/locale/hu/LC_MESSAGES/onlinequoteseditor.mo +share/locale/hu/LC_MESSAGES/plasma_applet_onlinequote.mo +share/locale/hu/LC_MESSAGES/plasma_applet_org.wincak.foreigncurrencies2.mo share/locale/ia/LC_MESSAGES/alkimia.mo share/locale/ia/LC_MESSAGES/onlinequoteseditor.mo share/locale/ia/LC_MESSAGES/plasma_applet_onlinequote.mo @@ -114,6 +119,10 @@ share/locale/sk/LC_MESSAGES/alkimia.mo share/locale/sk/LC_MESSAGES/onlinequoteseditor.mo share/locale/sk/LC_MESSAGES/plasma_applet_onlinequote.mo share/locale/sk/LC_MESSAGES/plasma_applet_org.wincak.foreigncurrencies2.mo +share/locale/sl/LC_MESSAGES/alkimia.mo +share/locale/sl/LC_MESSAGES/onlinequoteseditor.mo +share/locale/sl/LC_MESSAGES/plasma_applet_onlinequote.mo +share/locale/sl/LC_MESSAGES/plasma_applet_org.wincak.foreigncurrencies2.mo share/locale/sv/LC_MESSAGES/alkimia.mo share/locale/sv/LC_MESSAGES/onlinequoteseditor.mo share/locale/sv/LC_MESSAGES/plasma_applet_onlinequote.mo @@ -130,6 +139,7 @@ share/locale/zh_TW/LC_MESSAGES/alkimia.mo share/locale/zh_TW/LC_MESSAGES/onlinequoteseditor.mo share/locale/zh_TW/LC_MESSAGES/plasma_applet_onlinequote.mo share/locale/zh_TW/LC_MESSAGES/plasma_applet_org.wincak.foreigncurrencies2.mo +%%TOOLS%%share/metainfo/org.kde.onlinequoteseditor5.appdata.xml %%PLASMA%%share/metainfo/org.wincak.foreigncurrencies2.appdata.xml %%PLASMA%%share/plasma/plasmoids/org.wincak.foreigncurrencies2/LICENSE %%PLASMA%%share/plasma/plasmoids/org.wincak.foreigncurrencies2/README