From nobody Wed Sep 13 09:39:01 2023 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 4RlwPx6FT7z4sxZj; Wed, 13 Sep 2023 09:39:01 +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 4RlwPx5pLxz4QQ8; Wed, 13 Sep 2023 09:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694597941; 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=j8/DwvVAR9qGe0b2p4IWg75Y8DtoJwRs5U1rS/WoSWU=; b=ez9J5hRxWhNiCc74bSaCbCftaglxbewlHBI7dN/etUJzQXXtDWJ1jJaXfh4eidjkCg7yD8 GywZxaHDDOK5ee39GGJF9S1LKosTALaOPZ21xe2z9lybOywOgsXYuec9Zj6WfzQddhXgrn LyQVqJrL1OXy3Qycq9TyVC9TGE2Ydx9IyaMPngIm8hoJrCdg1SF4iAVSU9GFmqumdJcPxO 1Q+c6u+W/9UN5toNQTIoCRvHygguRI8VooNNv/cQK3YLzEyrpHcUrR+B7EdYuZohW9q/OW vy1+ImgJA8f4sM8ewF8oqft0d1ZcHKWnSyGSrxT0ULZ8ybxWotnQA2YGf0VhXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694597941; a=rsa-sha256; cv=none; b=O/copExI4swJ1tVHyihWGuUYMIZxNhGxrKiYYdUyRCuJFrhENatLZOdzBJgDSq7Yp6t2cJ AP01Yv+dnzlk1qmYoS2y321Y0DoSY1V/l1fL2LtY8KNSxiC4ame5bpYfKbmeZ6msSZwFp7 jY/uEObsKiX1kOhlQGYtMiIgiOu6Q+zQOV60XGMaYNWXca3HUcAVLkOtxaJ0s3rHW51uX7 dxilFXmph32F9BxZbLmAVLWmyZDh+/0lTqKHLTU3+VaRNaa+iN7xBeQ50ObrMEunR3Gj4Z Ua+Cb10wNRjkGBnP+vtteo+sX8tvMexRNH0k2UYgFuVMEfIduYiE4E+bK0XpvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694597941; 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=j8/DwvVAR9qGe0b2p4IWg75Y8DtoJwRs5U1rS/WoSWU=; b=WO2sTOxuvzvJXhQj9+wozDB6P1+7TP29wQ3Yt+cuUMemML/smXLw9Mj4C7miQxPP+bRZrS gyCduAlXAcAxxb2WFJbjcvOZiFal3B9u58hB/BiZQX1iai7jZHLaXwmPZuUTu1fYWo7zec L9jj7dJvqc2rMmlyMDLWqkC0a/kfWpAWuYwY8vpcvvHZ0enCq65ckBY6QdmC05KV4zHWcU aWSxcVnNrFkU4A2I4ITQkX5EZqcbDbVkGLOFrapnV6UnupbgZcS0NSaJccQV26Jl1PT9u1 ywCW6vYsdB6ff4xl3V8xbwcLHJWSw7rEoY7ZwdkiUfFqgyyVfwE2Dq99BYVQxg== 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 4RlwPx4vCmz18TR; Wed, 13 Sep 2023 09:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38D9d1wH049715; Wed, 13 Sep 2023 09:39:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38D9d1Ke049712; Wed, 13 Sep 2023 09:39:01 GMT (envelope-from git) Date: Wed, 13 Sep 2023 09:39:01 GMT Message-Id: <202309130939.38D9d1Ke049712@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 04fe5aaed04e - main - deskutils/kchmviewer: update to the latest git commit 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04fe5aaed04e31171c53149ae4d54229e85748af Auto-Submitted: auto-generated The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=04fe5aaed04e31171c53149ae4d54229e85748af commit 04fe5aaed04e31171c53149ae4d54229e85748af Author: Tobias C. Berner AuthorDate: 2023-09-13 06:36:28 +0000 Commit: Tobias C. Berner CommitDate: 2023-09-13 09:37:17 +0000 deskutils/kchmviewer: update to the latest git commit - switch to WebEngine instead of the to-be-removed WebKit. --- deskutils/kchmviewer/Makefile | 8 +++-- deskutils/kchmviewer/distinfo | 6 ++-- deskutils/kchmviewer/files/patch-src_src.pro | 50 +++------------------------- 3 files changed, 13 insertions(+), 51 deletions(-) diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile index 30cd38bc47c1..15a4b6d25fd8 100644 --- a/deskutils/kchmviewer/Makefile +++ b/deskutils/kchmviewer/Makefile @@ -1,7 +1,7 @@ PORTNAME= kchmviewer DISTVERSIONPREFIX= RELEASE_ -DISTVERSION= 8_0 -PORTREVISION= 3 +DISTVERSION= 8_0-9 +DISTVERSIONSUFFIX= -g869ecdf CATEGORIES= deskutils kde MAINTAINER= kde@FreeBSD.org @@ -14,12 +14,14 @@ LIB_DEPENDS= libchm.so:misc/chmlib \ USES= compiler:c++11-lang desktop-file-utils dos2unix gl \ qmake:outsource qt:5 xorg USE_GL= gl -USE_QT= core dbus gui network printsupport webkit widgets xml \ +USE_QT= core dbus declarative gui location network printsupport \ + webchannel webengine widgets xml \ buildtools:build qmake:build USE_XORG= x11 USE_GITHUB= yes GH_ACCOUNT= gyunaev +GH_TAGNAME= 869ecdf6861dbc75db1a37de5844d3e40c2b267b DOS2UNIX_GLOB= *.cpp *.h *.pro *.ui diff --git a/deskutils/kchmviewer/distinfo b/deskutils/kchmviewer/distinfo index bedc94f654c6..9bd42371a73f 100644 --- a/deskutils/kchmviewer/distinfo +++ b/deskutils/kchmviewer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1622919457 -SHA256 (gyunaev-kchmviewer-RELEASE_8_0_GH0.tar.gz) = 0eec144b2c09c8b6be98b795f84767098c893bdad7b5a3d11fc5faafead5f9b2 -SIZE (gyunaev-kchmviewer-RELEASE_8_0_GH0.tar.gz) = 311899 +TIMESTAMP = 1694586209 +SHA256 (gyunaev-kchmviewer-RELEASE_8_0-9-g869ecdf-869ecdf6861dbc75db1a37de5844d3e40c2b267b_GH0.tar.gz) = cfd832c7f5ed3784da932d6cc5c24787511d1bb3034237fe9fda5467f493c9da +SIZE (gyunaev-kchmviewer-RELEASE_8_0-9-g869ecdf-869ecdf6861dbc75db1a37de5844d3e40c2b267b_GH0.tar.gz) = 312574 diff --git a/deskutils/kchmviewer/files/patch-src_src.pro b/deskutils/kchmviewer/files/patch-src_src.pro index fc3acdb7f399..13f2babac5af 100644 --- a/deskutils/kchmviewer/files/patch-src_src.pro +++ b/deskutils/kchmviewer/files/patch-src_src.pro @@ -1,58 +1,18 @@ -This patch contains the following (by hunks) - 1) also link against libX11 on FreeBSD - 2) this is obtained from arch, to fix underlinking - and - remove the wrong Qt5 version check - 4) create installation targets - ---- src/src.pro.orig 2021-06-05 18:58:14 UTC +--- src/src.pro.orig 2023-09-13 06:27:01 UTC +++ src/src.pro -@@ -67,7 +67,7 @@ QT += webkit \ - webkitwidgets \ - printsupport +@@ -61,7 +61,7 @@ QT += xml network widgets printsupport + + QT += xml network widgets printsupport -linux-g++*:{ +unix:{ LIBS += -lX11 } -@@ -108,26 +108,16 @@ unix:!macx: { - HEADERS += dbus_interface.h - SOURCES += dbus_interface.cpp - CONFIG += dbus -- LIBS += ../lib/libebook/libebook.a -+ LIBS += ../lib/libebook/libebook.a -lchm -lzip - POST_TARGETDEPS += ../lib/libebook/libebook.a - } - - greaterThan(QT_MAJOR_VERSION, 4) { - # Qt 5 -- greaterThan(QT_MINOR_VERSION, 5) { -- # Qt 5.6+ --# error("You use Qt5.6+ - QWebEngine is not yet suitable for kchmviewer and is not supported") -- QT += webengine webenginewidgets -- DEFINES += USE_WEBENGINE -- SOURCES += viewwindow_webengine.cpp dataprovider_qwebengine.cpp -- HEADERS += dataprovider_qwebengine.h viewwindow_webengine.h -- } else { -- # Qt 5.0-5.5 -- QT += webkit webkitwidgets -- DEFINES += USE_WEBKIT -- SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp -- HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h -- } -+ QT += webkit webkitwidgets -+ DEFINES += USE_WEBKIT -+ SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp -+ HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h - } else { - message("Qt4 is not supported anymore, please do not report any errors") - QT += webkit webkitwidgets -@@ -135,3 +125,14 @@ greaterThan(QT_MAJOR_VERSION, 4) { +@@ -130,3 +130,13 @@ greaterThan(QT_MAJOR_VERSION, 4) { SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h } -+ +# Define installation target for the binary +target.path = $$PREFIX/bin +# ... and for the icon