From nobody Mon Jun 06 20:48:29 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 431381BDE014; Mon, 6 Jun 2022 20:48:30 +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 4LH5DY6vvcz3JjK; Mon, 6 Jun 2022 20:48:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654548510; 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=PmDIetClnURsadwEY7r6uGDwyR8ArPUcMQrVvFouYbQ=; b=u2CpBjv/QmWBKpnWdIEw/6zby9PsiaU338uOXp1HSx8TrvDBOyfhiL8lQ4FRLuJ5PdVugi Q5VE8KzIWhd2PbcFdox3FF4zVsjGgCqEzd3rVrlTDGVXR3E5mGmnniSUI2r/chXTDQ5llh 1Gy0SQ7lficx41PBvh8lKlMbcsbQ8LAMxmuJ5UgOjs3UjbJ+jahQD/GGFBmIXS2Cc/wLVG FRTtMrATSytBTzjl3zIiNPjQl3XEjWNk667PoD2DbM4/ozrQ30QOGHWcHJ3+CIhIqa8yzG BUNMWTqclH8rW36cwsgHDZoiSxMlsW4mhWHPfidevNcZaI0S3xka/uXoOcrBsw== 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 A09EC5537; Mon, 6 Jun 2022 20:48:29 +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 256KmTEZ086207; Mon, 6 Jun 2022 20:48:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 256KmTFJ086206; Mon, 6 Jun 2022 20:48:29 GMT (envelope-from git) Date: Mon, 6 Jun 2022 20:48:29 GMT Message-Id: <202206062048.256KmTFJ086206@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 53478e6988b6 - main - math/rkward: upgrade RKWard to 0.7.4 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53478e6988b607af95e14fa6270ed020299e1256 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654548510; 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=PmDIetClnURsadwEY7r6uGDwyR8ArPUcMQrVvFouYbQ=; b=wab1MF6LxbfAO+i/IrW2zblJheDY9QXlzap/IllJ55SSynuRwjw3vFEB+idqyMx3iEY/S/ V4n7eGHk9gZX5h7Nta0KZaDRRrxsIAif5BHqJwxunkIOlu9BculSUxEreuR9zJIM/MQjs2 aNoeZYCAEYcHY41YIoiPk9armVyA4uWbRR7iHFANjbddbeyMJ/Fdz8fDKC2CCikPzOMfwo BRkkGca4351pbKaTR4393M7RW9/itc/SrFjx/H//l8i+luQvrAgLAN1EIpj6WY814clOPK sOrmHTBKwlucF/VxseGUGaGh8NUpEbXr/S31ETkVKKx6rdma1yvw7at33THIQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654548510; a=rsa-sha256; cv=none; b=WaAMBZ0cINKPrFgpKgeKNuXQLanYkEURXINq5Sdv+OSvzWSYOYNnxdTnq02pbXi45qZwJy eF/zY45SvewIUWmnHkcwODg9nbRcTPWKq5CEUivxOysoLq03S/kPflnNrvAnlxTVB656BO +nCZAREyq33QIT8wSqNBW+83JTt9om0gayCMM69OXktEZ1DZ+PAdReJVwzI6rRKB+HbE19 U5NDoEyctsMSoYp529QbxIOkYXzw0ooXYneP/29sndtadCt1lufCUgEFBZl/xKLDLXJRXf xmEoLmIKAhRoL9bHMKzVrN1yuhTCjh8xrpNtfEkAVItDke7TFvyvNW4dV7nsQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=53478e6988b607af95e14fa6270ed020299e1256 commit 53478e6988b607af95e14fa6270ed020299e1256 Author: Thierry Thomas AuthorDate: 2022-06-06 20:43:20 +0000 Commit: Thierry Thomas CommitDate: 2022-06-06 20:48:23 +0000 math/rkward: upgrade RKWard to 0.7.4 Release notes at . --- math/rkward/Makefile | 7 +++-- math/rkward/distinfo | 6 ++-- .../files/patch-rkward_windows_rkhtmlwindow.cpp | 34 ---------------------- math/rkward/files/patch-tests_all__tests.R | 16 ---------- math/rkward/pkg-plist | 12 ++++++++ 5 files changed, 19 insertions(+), 56 deletions(-) diff --git a/math/rkward/Makefile b/math/rkward/Makefile index 9ce2c484fa29..5e5c73550121 100644 --- a/math/rkward/Makefile +++ b/math/rkward/Makefile @@ -1,9 +1,9 @@ # Created by: thierry@pompo.net PORTNAME= rkward -PORTVERSION= 0.7.3 +PORTVERSION= 0.7.4 CATEGORIES= math -MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION:C/b//}/src +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/ MAINTAINER= thierry@FreeBSD.org COMMENT= IDE/GUI for the R-project @@ -12,6 +12,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libR.so:math/R RUN_DEPENDS= kbibtex:databases/kbibtex \ + pandoc:textproc/hs-pandoc \ ${LR_MOD_DIR}/R2HTML/INDEX:textproc/R-cran-R2HTML \ ${LR_MOD_DIR}/rmarkdown/INDEX:textproc/R-cran-rmarkdown TEST_DEPENDS= ${LR_MOD_DIR}/FAdist/INDEX:science/R-cran-FAdist @@ -21,7 +22,7 @@ USES= cmake compiler:c++11-lang desktop-file-utils gettext fortran \ USE_QT= buildtools concurrent core dbus declarative gui location \ network printsupport qmake script webchannel webengine webkit \ widgets xml -USE_XORG= x11 +USE_XORG= ice x11 xext USE_KDE= archive auth bookmarks codecs completion config configwidgets coreaddons\ crash doctools ecm i18n itemviews jobwidgets kate_run kdewebkit kio \ notifications parts service solid sonnet syntaxhighlighting texteditor \ diff --git a/math/rkward/distinfo b/math/rkward/distinfo index a908aa16fb31..6d8e838876ea 100644 --- a/math/rkward/distinfo +++ b/math/rkward/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651044867 -SHA256 (rkward-0.7.3.tar.gz) = 49b118c11c41605e05434e4214f06bbf3a45c8bbc5ab54499dca117ca9efe7da -SIZE (rkward-0.7.3.tar.gz) = 5486401 +TIMESTAMP = 1654545611 +SHA256 (rkward-0.7.4.tar.gz) = 7633f3b269f6cf2c067b3b09cbe3da3e0ffdcd9dc3ecb9a9fa63b4f865e8161e +SIZE (rkward-0.7.4.tar.gz) = 5677112 diff --git a/math/rkward/files/patch-rkward_windows_rkhtmlwindow.cpp b/math/rkward/files/patch-rkward_windows_rkhtmlwindow.cpp deleted file mode 100644 index f03863cfaacf..000000000000 --- a/math/rkward/files/patch-rkward_windows_rkhtmlwindow.cpp +++ /dev/null @@ -1,34 +0,0 @@ ---- rkward/windows/rkhtmlwindow.cpp.orig 2022-04-16 22:02:17 UTC -+++ rkward/windows/rkhtmlwindow.cpp -@@ -109,8 +109,9 @@ class RKWebPage : public QWebEnginePage { (public) - QUrl url () { - return mainFrame ()->url (); - } -- void setHtml (const QString &html) { -- mainFrame ()->setHtml (html); -+ void setHtmlWrapper(const QString &html, const QUrl &baseurl) { -+ direct_load = true; -+ mainFrame()->setHtml(html, baseurl); - } - QPointF scrollPosition () const { - return mainFrame ()->scrollPosition (); -@@ -127,6 +128,10 @@ class RKWebPage : public QWebEnginePage { (public) - }); - } - #else -+ void setHtmlWrapper(const QString &html, const QUrl &baseurl) { -+ direct_load = true; -+ setHtml(html, baseurl); -+ } - bool supportsContentType (const QString &name) { - if (name.startsWith("text")) return true; - #ifdef __GNUC__ -@@ -617,7 +622,7 @@ bool RKHTMLWindow::openURL (const QUrl &url) { - RK_DEBUG (APP, DL_WARNING, "Applying workaround for https://bugs.kde.org/show_bug.cgi?id=405386"); - QFile f (url.toLocalFile ()); - f.open (QIODevice::ReadOnly); -- page->setHtml (f.readAll()); -+ page->setHtmlWrapper(f.readAll(), url.adjusted(QUrl::RemoveFilename)); - f.close (); - } else { - page->load (url); diff --git a/math/rkward/files/patch-tests_all__tests.R b/math/rkward/files/patch-tests_all__tests.R deleted file mode 100644 index 36e754821c0e..000000000000 --- a/math/rkward/files/patch-tests_all__tests.R +++ /dev/null @@ -1,16 +0,0 @@ ---- tests/all_tests.R.orig 2022-04-11 21:08:17 UTC -+++ tests/all_tests.R -@@ -2,10 +2,10 @@ require (rkwardtests) - - ## add your test suite files, to this vector: - testsuites <- c ( -- "rkward_application_tests.R" -- "import_export_plugins.R" -+ "rkward_application_tests.R", -+ "import_export_plugins.R", - "item_response_theory.R", -- "analysis_plugins.R" -+ "analysis_plugins.R", - "distributions.R", - "plots.R", - "data_plugin_tests.R" diff --git a/math/rkward/pkg-plist b/math/rkward/pkg-plist index c61f65ea2b16..833bd9561ddd 100644 --- a/math/rkward/pkg-plist +++ b/math/rkward/pkg-plist @@ -75,6 +75,8 @@ share/ktexteditor_snippets/data/RKWardRMd.xml %%NLS%%share/locale/tr/LC_MESSAGES/rkward.mo %%NLS%%share/locale/uk/LC_MESSAGES/rkward.mo share/metainfo/org.kde.rkward.appdata.xml +share/mime/packages/vnd.kde.rkward-output.xml +share/mime/packages/vnd.kde.rmarkdown.xml share/mime/packages/vnd.rkward.r.xml share/org.kde.syntax-highlighting/syntax/rkward.xml %%DATADIR%%/00saveload/import/convert_encoding.js @@ -82,6 +84,9 @@ share/org.kde.syntax-highlighting/syntax/rkward.xml %%DATADIR%%/00saveload/import/import_csv.js %%DATADIR%%/00saveload/import/import_csv.rkh %%DATADIR%%/00saveload/import/import_csv.xml +%%DATADIR%%/00saveload/import/import_generic_rio.js +%%DATADIR%%/00saveload/import/import_generic_rio.rkh +%%DATADIR%%/00saveload/import/import_generic_rio.xml %%DATADIR%%/00saveload/import/import_spss.js %%DATADIR%%/00saveload/import/import_spss.rkh %%DATADIR%%/00saveload/import/import_spss.xml @@ -462,6 +467,7 @@ share/org.kde.syntax-highlighting/syntax/rkward.xml %%DATADIR%%/distributions/wilcoxon.rkh %%DATADIR%%/distributions/wilcoxon.xml %%DATADIR%%/embedded.pluginmap +%%DATADIR%%/icons/64-apps-rkward.png %%DATADIR%%/icons/data-factor.png %%DATADIR%%/icons/data-logical.png %%DATADIR%%/icons/data-numeric.png @@ -479,6 +485,9 @@ share/org.kde.syntax-highlighting/syntax/rkward.xml %%DATADIR%%/icons/window_back.png %%DATADIR%%/icons/window_forward.png %%DATADIR%%/import_export.pluginmap +%%DATADIR%%/internal/Installfromgit.js +%%DATADIR%%/internal/Installfromgit.rkh +%%DATADIR%%/internal/Installfromgit.xml %%DATADIR%%/irt.pluginmap %%DATADIR%%/menu.pluginmap %%DATADIR%%/pages/rkward_addons.rkh @@ -681,11 +690,14 @@ share/org.kde.syntax-highlighting/syntax/rkward.xml %%DATADIR%%/po/pt_BR/LC_MESSAGES/rkward__item_response_theory.mo %%DATADIR%%/po/pt_BR/LC_MESSAGES/rkward__pages.mo %%DATADIR%%/po/pt_BR/LC_MESSAGES/rkward__plots.mo +%%DATADIR%%/po/sl/LC_MESSAGES/rkward__analysis.mo %%DATADIR%%/po/sl/LC_MESSAGES/rkward__data.mo %%DATADIR%%/po/sl/LC_MESSAGES/rkward__distributions.mo %%DATADIR%%/po/sl/LC_MESSAGES/rkward__embedded.mo %%DATADIR%%/po/sl/LC_MESSAGES/rkward__graphics_device.mo %%DATADIR%%/po/sl/LC_MESSAGES/rkward__import_export.mo +%%DATADIR%%/po/sl/LC_MESSAGES/rkward__item_response_theory.mo +%%DATADIR%%/po/sl/LC_MESSAGES/rkward__pages.mo %%DATADIR%%/po/sl/LC_MESSAGES/rkward__plots.mo %%DATADIR%%/po/sv/LC_MESSAGES/rkward__analysis.mo %%DATADIR%%/po/sv/LC_MESSAGES/rkward__data.mo