1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00

deskutils/kchmviewer: update to the latest git commit

- switch to WebEngine instead of the to-be-removed WebKit.
This commit is contained in:
Tobias C. Berner 2023-09-13 08:36:28 +02:00
parent 1894580ab7
commit 04fe5aaed0
3 changed files with 13 additions and 51 deletions

View File

@ -1,7 +1,7 @@
PORTNAME= kchmviewer PORTNAME= kchmviewer
DISTVERSIONPREFIX= RELEASE_ DISTVERSIONPREFIX= RELEASE_
DISTVERSION= 8_0 DISTVERSION= 8_0-9
PORTREVISION= 3 DISTVERSIONSUFFIX= -g869ecdf
CATEGORIES= deskutils kde CATEGORIES= deskutils kde
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
@ -14,12 +14,14 @@ LIB_DEPENDS= libchm.so:misc/chmlib \
USES= compiler:c++11-lang desktop-file-utils dos2unix gl \ USES= compiler:c++11-lang desktop-file-utils dos2unix gl \
qmake:outsource qt:5 xorg qmake:outsource qt:5 xorg
USE_GL= gl 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 buildtools:build qmake:build
USE_XORG= x11 USE_XORG= x11
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= gyunaev GH_ACCOUNT= gyunaev
GH_TAGNAME= 869ecdf6861dbc75db1a37de5844d3e40c2b267b
DOS2UNIX_GLOB= *.cpp *.h *.pro *.ui DOS2UNIX_GLOB= *.cpp *.h *.pro *.ui

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1622919457 TIMESTAMP = 1694586209
SHA256 (gyunaev-kchmviewer-RELEASE_8_0_GH0.tar.gz) = 0eec144b2c09c8b6be98b795f84767098c893bdad7b5a3d11fc5faafead5f9b2 SHA256 (gyunaev-kchmviewer-RELEASE_8_0-9-g869ecdf-869ecdf6861dbc75db1a37de5844d3e40c2b267b_GH0.tar.gz) = cfd832c7f5ed3784da932d6cc5c24787511d1bb3034237fe9fda5467f493c9da
SIZE (gyunaev-kchmviewer-RELEASE_8_0_GH0.tar.gz) = 311899 SIZE (gyunaev-kchmviewer-RELEASE_8_0-9-g869ecdf-869ecdf6861dbc75db1a37de5844d3e40c2b267b_GH0.tar.gz) = 312574

View File

@ -1,58 +1,18 @@
This patch contains the following (by hunks) --- src/src.pro.orig 2023-09-13 06:27:01 UTC
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 +++ src/src.pro
@@ -67,7 +67,7 @@ QT += webkit \ @@ -61,7 +61,7 @@ QT += xml network widgets printsupport
webkitwidgets \
printsupport QT += xml network widgets printsupport
-linux-g++*:{ -linux-g++*:{
+unix:{ +unix:{
LIBS += -lX11 LIBS += -lX11
} }
@@ -108,26 +108,16 @@ unix:!macx: { @@ -130,3 +130,13 @@ greaterThan(QT_MAJOR_VERSION, 4) {
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) {
SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp
HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h
} }
+
+# Define installation target for the binary +# Define installation target for the binary
+target.path = $$PREFIX/bin +target.path = $$PREFIX/bin
+# ... and for the icon +# ... and for the icon