From owner-dev-commits-ports-all@freebsd.org Sat Jun 5 19:13:59 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 40087648BFD; Sat, 5 Jun 2021 19:13:59 +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 4Fy8SR1Pgcz3ptt; Sat, 5 Jun 2021 19:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 18A84159EF; Sat, 5 Jun 2021 19:13:59 +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 155JDwV7022010; Sat, 5 Jun 2021 19:13:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 155JDwKc022009; Sat, 5 Jun 2021 19:13:58 GMT (envelope-from git) Date: Sat, 5 Jun 2021 19:13:58 GMT Message-Id: <202106051913.155JDwKc022009@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: fb74546451eb - main - deskutils/kchmviewer: Update to 8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb74546451eba9751a5f8129a2b15cd1ba0f4008 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jun 2021 19:13:59 -0000 The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb74546451eba9751a5f8129a2b15cd1ba0f4008 commit fb74546451eba9751a5f8129a2b15cd1ba0f4008 Author: Max Brazhnikov AuthorDate: 2021-06-05 19:07:27 +0000 Commit: Max Brazhnikov CommitDate: 2021-06-05 19:12:51 +0000 deskutils/kchmviewer: Update to 8.0 - Switch to GitHub --- deskutils/kchmviewer/Makefile | 8 +++++--- deskutils/kchmviewer/distinfo | 6 +++--- deskutils/kchmviewer/files/patch-src_src.pro | 10 +++++----- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile index 5b8b4d7a7b0b..123ddad2378d 100644 --- a/deskutils/kchmviewer/Makefile +++ b/deskutils/kchmviewer/Makefile @@ -1,10 +1,8 @@ # Created by: Markus Brueffer PORTNAME= kchmviewer -PORTVERSION= 7.7 -PORTREVISION= 4 +PORTVERSION= 8.0 CATEGORIES= deskutils kde -MASTER_SITES= SF MAINTAINER= kde@FreeBSD.org COMMENT= KDE viewer for CHM files @@ -17,6 +15,10 @@ USE_QT= core dbus gui network printsupport webkit widgets xml \ buildtools_build qmake_build USE_XORG= x11 +USE_GITHUB= yes +GH_ACCOUNT= gyunaev +GH_TAGNAME= RELEASE_8_0 + DOS2UNIX_GLOB= *.cpp *.h *.pro *.ui .include diff --git a/deskutils/kchmviewer/distinfo b/deskutils/kchmviewer/distinfo index e3a6ccad7695..c48d6ee3ae26 100644 --- a/deskutils/kchmviewer/distinfo +++ b/deskutils/kchmviewer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1490818978 -SHA256 (kchmviewer-7.7.tar.gz) = 27cbac45c786b1718550a87e6f86010e161302b426c6396ff2a3091b913b17dd -SIZE (kchmviewer-7.7.tar.gz) = 345952 +TIMESTAMP = 1622919457 +SHA256 (gyunaev-kchmviewer-8.0-RELEASE_8_0_GH0.tar.gz) = 0eec144b2c09c8b6be98b795f84767098c893bdad7b5a3d11fc5faafead5f9b2 +SIZE (gyunaev-kchmviewer-8.0-RELEASE_8_0_GH0.tar.gz) = 311899 diff --git a/deskutils/kchmviewer/files/patch-src_src.pro b/deskutils/kchmviewer/files/patch-src_src.pro index 168d09062aaa..fc3acdb7f399 100644 --- a/deskutils/kchmviewer/files/patch-src_src.pro +++ b/deskutils/kchmviewer/files/patch-src_src.pro @@ -5,17 +5,17 @@ This patch contains the following (by hunks) remove the wrong Qt5 version check 4) create installation targets ---- src/src.pro.orig 2017-03-29 21:21:13 UTC +--- src/src.pro.orig 2021-06-05 18:58:14 UTC +++ src/src.pro @@ -67,7 +67,7 @@ QT += webkit \ webkitwidgets \ printsupport - + -linux-g++*:{ +unix:{ LIBS += -lX11 } - + @@ -108,26 +108,16 @@ unix:!macx: { HEADERS += dbus_interface.h SOURCES += dbus_interface.cpp @@ -24,12 +24,12 @@ This patch contains the following (by hunks) + 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") +-# 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