svn commit: r437348 - in head: . deskutils deskutils/kchmviewer deskutils/kchmviewer-kde4 deskutils/kchmviewer/files
Tobias C. Berner
tcberner at FreeBSD.org
Fri Mar 31 11:18:04 UTC 2017
Author: tcberner
Date: Fri Mar 31 11:18:02 2017
New Revision: 437348
URL: https://svnweb.freebsd.org/changeset/ports/437348
Log:
Update deskutils/kchmviewer to 7.7 and take maintainership.
Reviewed by: mat, rakuco
Approved by: rakuco (mentor), mat (mentor)
Differential Revision: https://reviews.freebsd.org/D10190
Added:
head/deskutils/kchmviewer/
- copied from r437347, head/deskutils/kchmviewer-kde4/
head/deskutils/kchmviewer/files/patch-src_src.pro (contents, props changed)
Deleted:
head/deskutils/kchmviewer-kde4/
head/deskutils/kchmviewer/files/patch-packages__CMakeLists.txt
head/deskutils/kchmviewer/files/patch-src__CMakeLists.txt
Modified:
head/MOVED
head/deskutils/Makefile
head/deskutils/kchmviewer/Makefile
head/deskutils/kchmviewer/distinfo
head/deskutils/kchmviewer/pkg-plist
Modified: head/MOVED
==============================================================================
--- head/MOVED Fri Mar 31 10:33:37 2017 (r437347)
+++ head/MOVED Fri Mar 31 11:18:02 2017 (r437348)
@@ -4469,7 +4469,6 @@ deskutils/katapult||2013-07-26|Has expir
deskutils/kbirthday||2013-07-26|Has expired: Depends on Qt 3.x
deskutils/kblticker||2013-07-26|Has expired: Depends on Qt 3.x
deskutils/kchm||2013-07-26|Has expired: Depends on Qt 3.x
-deskutils/kchmviewer||2013-07-26|Has expired: Depends on Qt 3.x
deskutils/kdepim3||2013-07-26|Has expired: Depends on Qt 3.x
deskutils/kdissert||2013-07-26|Has expired: Depends on Qt 3.x
deskutils/kickpim||2013-07-26|Has expired: Depends on Qt 3.x
@@ -9169,3 +9168,4 @@ www/rubygem-jquery-rails4|www/rubygem-jq
devel/libytnef|converters/ytnef|2017-03-29|Merged into converters/ytnef
databases/py-sqlalchemy08|databases/py-sqlalchemy10|2017-03-29|Has expired: Upstream has declared this version EoL: please migrate to databases/py-sqlalchemy10
devel/py3-meson||2017-03-30|Removed
+deskutils/kchmviewer-kde4|deskutils/kchmviewer|2017-03-31|Renamed to drop the -kde4 suffix
Modified: head/deskutils/Makefile
==============================================================================
--- head/deskutils/Makefile Fri Mar 31 10:33:37 2017 (r437347)
+++ head/deskutils/Makefile Fri Mar 31 11:18:02 2017 (r437348)
@@ -123,7 +123,7 @@
SUBDIR += jjclient
SUBDIR += jlj
SUBDIR += kcharselect
- SUBDIR += kchmviewer-kde4
+ SUBDIR += kchmviewer
SUBDIR += kdeconnect
SUBDIR += kdepim4
SUBDIR += kdepim4-runtime
Modified: head/deskutils/kchmviewer/Makefile
==============================================================================
--- head/deskutils/kchmviewer-kde4/Makefile Fri Mar 31 10:33:37 2017 (r437347)
+++ head/deskutils/kchmviewer/Makefile Fri Mar 31 11:18:02 2017 (r437348)
@@ -2,30 +2,19 @@
# $FreeBSD$
PORTNAME= kchmviewer
-PORTVERSION= 7.2
-DISTVERSIONSUFFIX= .1
-PORTREVISION= 1
+PORTVERSION= 7.7
CATEGORIES= deskutils kde
MASTER_SITES= SF
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= kde at FreeBSD.org
COMMENT= KDE viewer for CHM files
LIB_DEPENDS= libchm.so:misc/chmlib \
libzip.so:archivers/libzip
-USES= cmake:outsource gettext-tools kde:4
-USE_KDE= kdelibs automoc4
-USE_QT4= webkit qmake_build moc_build rcc_build uic_build
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
-
-post-patch:
- ${REINPLACE_CMD} 's,/usr/bin/kate,${KDE_PREFIX}/bin/kate,' \
- ${WRKSRC}/src/config.cpp
-
-post-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
- ${INSTALL_DATA} ${WRKSRC}/packages/kchmviewer.png ${STAGEDIR}${PREFIX}/share/pixmaps
+USES= dos2unix qmake:outsource
+USE_QT5= core dbus gui network printsupport webkit widgets xml \
+ buildtools_build qmake_build
+USE_XORG= x11
.include <bsd.port.mk>
Modified: head/deskutils/kchmviewer/distinfo
==============================================================================
--- head/deskutils/kchmviewer-kde4/distinfo Fri Mar 31 10:33:37 2017 (r437347)
+++ head/deskutils/kchmviewer/distinfo Fri Mar 31 11:18:02 2017 (r437348)
@@ -1,2 +1,3 @@
-SHA256 (kchmviewer-7.2.1.tar.gz) = 91c5a74b26956e76400a02285d534d1eebbb51ee478dcaaab7beff7aa870772a
-SIZE (kchmviewer-7.2.1.tar.gz) = 342665
+TIMESTAMP = 1490818978
+SHA256 (kchmviewer-7.7.tar.gz) = 27cbac45c786b1718550a87e6f86010e161302b426c6396ff2a3091b913b17dd
+SIZE (kchmviewer-7.7.tar.gz) = 345952
Added: head/deskutils/kchmviewer/files/patch-src_src.pro
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/deskutils/kchmviewer/files/patch-src_src.pro Fri Mar 31 11:18:02 2017 (r437348)
@@ -0,0 +1,65 @@
+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 2017-03-29 21:21:13 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
+ 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
+ HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h
+ }
++
++# Define installation target for the binary
++target.path = $$PREFIX/bin
++# ... and for the icon
++icons.files = ../packages/kchmviewer.png
++icons.path = $$PREFIX/share/pixmaps
++# ... and the desktop file
++desktop.files = ../packages/kchmviewer.desktop
++desktop.path = $$PREFIX/share/applications
++
++INSTALLS += desktop icons target
Modified: head/deskutils/kchmviewer/pkg-plist
==============================================================================
--- head/deskutils/kchmviewer-kde4/pkg-plist Fri Mar 31 10:33:37 2017 (r437347)
+++ head/deskutils/kchmviewer/pkg-plist Fri Mar 31 11:18:02 2017 (r437348)
@@ -1,15 +1,3 @@
bin/kchmviewer
-share/applications/kde4/kchmviewer.desktop
-share/locale/cs/LC_MESSAGES/kchmviewer.mo
-share/locale/fr/LC_MESSAGES/kchmviewer.mo
-share/locale/hu/LC_MESSAGES/kchmviewer.mo
-share/locale/it/LC_MESSAGES/kchmviewer.mo
-share/locale/nl/LC_MESSAGES/kchmviewer.mo
-share/locale/pt_BR/LC_MESSAGES/kchmviewer.mo
-share/locale/ru/LC_MESSAGES/kchmviewer.mo
-share/locale/sv/LC_MESSAGES/kchmviewer.mo
-share/locale/tr/LC_MESSAGES/kchmviewer.mo
-share/locale/uk/LC_MESSAGES/kchmviewer.mo
-share/locale/zh_CN/LC_MESSAGES/kchmviewer.mo
-share/locale/zh_TW/LC_MESSAGES/kchmviewer.mo
+share/applications/kchmviewer.desktop
share/pixmaps/kchmviewer.png
More information about the svn-ports-head
mailing list