From owner-svn-ports-all@freebsd.org Sun Oct 7 12:00:20 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 223D710C060C; Sun, 7 Oct 2018 12:00:20 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CC036822A0; Sun, 7 Oct 2018 12:00:19 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C2AA813910; Sun, 7 Oct 2018 12:00:19 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w97C0JnT046187; Sun, 7 Oct 2018 12:00:19 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w97C0IpH046181; Sun, 7 Oct 2018 12:00:18 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201810071200.w97C0IpH046181@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sun, 7 Oct 2018 12:00:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r481442 - in head/graphics/qcomicbook: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/graphics/qcomicbook: . files X-SVN-Commit-Revision: 481442 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Oct 2018 12:00:20 -0000 Author: tcberner Date: Sun Oct 7 12:00:18 2018 New Revision: 481442 URL: https://svnweb.freebsd.org/changeset/ports/481442 Log: graphics/qcomicbook: update to 0.9.1 and switch to Qt5 - A future poppler update will remove poppler-qt4 (no longer supported) so switch this port to Qt5 as preparation. Added: head/graphics/qcomicbook/files/patch-help_CMakeLists.txt (contents, props changed) Modified: head/graphics/qcomicbook/Makefile head/graphics/qcomicbook/distinfo head/graphics/qcomicbook/files/patch-src__CMakeLists.txt head/graphics/qcomicbook/files/patch-src__FrameDetect__CompareFrames.h head/graphics/qcomicbook/pkg-plist Modified: head/graphics/qcomicbook/Makefile ============================================================================== --- head/graphics/qcomicbook/Makefile Sun Oct 7 11:38:56 2018 (r481441) +++ head/graphics/qcomicbook/Makefile Sun Oct 7 12:00:18 2018 (r481442) @@ -1,22 +1,22 @@ # Created by: Adam Weinberger # $FreeBSD$ -PORTNAME= qcomicbook -PORTVERSION= 0.9.0 -PORTREVISION= 12 +PORTNAME= QComicBook +PORTVERSION= 0.9.1 CATEGORIES= graphics -MASTER_SITES= http://qcomicbook.org/releases/ MAINTAINER= ports@FreeBSD.org COMMENT= Qt-based comic book archive viewer LICENSE= GPLv2 -LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 +LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 -USES= cmake:outsource compiler:c++11-lang pkgconfig qt:4 -USE_QT= corelib gui linguisttools_build moc_build qmake_build rcc_build \ - uic_build xml +USES= cmake compiler:c++11-lang pkgconfig qt:5 +USE_GITHUB= yes +GH_ACCOUNT= stolowski +USE_QT= core gui printsupport widgets x11extras\ + buildtools_build linguisttools_build qmake_build OPTIONS_DEFINE= 7ZIP ACE RAR @@ -28,15 +28,5 @@ ACE_RUN_DEPENDS= unace:archivers/unace RAR_DESC= Rar (.cbr) comic book archives support RAR_RUN_DEPENDS= unrar:archivers/unrar - -post-patch: -# fix man install directory - @${REINPLACE_CMD} -E \ - -e 's|share/man|man|' \ - ${WRKSRC}/help/CMakeLists.txt -# fix pixmap location - @${REINPLACE_CMD} -E \ - -e 's|(qcomicbook.png)|${PREFIX}/share/pixmaps/\1|' \ - ${WRKSRC}/data/qcomicbook.desktop .include Modified: head/graphics/qcomicbook/distinfo ============================================================================== --- head/graphics/qcomicbook/distinfo Sun Oct 7 11:38:56 2018 (r481441) +++ head/graphics/qcomicbook/distinfo Sun Oct 7 12:00:18 2018 (r481442) @@ -1,2 +1,3 @@ -SHA256 (qcomicbook-0.9.0.tar.gz) = 8e36f94d7b55798258b6df085324da150b0983020853eb270992157e9692abcb -SIZE (qcomicbook-0.9.0.tar.gz) = 738514 +TIMESTAMP = 1538907081 +SHA256 (stolowski-QComicBook-0.9.1_GH0.tar.gz) = 39bb6ba0e20569985c930b0e8bdb19ae9c5453f27e9f7c01c6d44f56fb204619 +SIZE (stolowski-QComicBook-0.9.1_GH0.tar.gz) = 739887 Added: head/graphics/qcomicbook/files/patch-help_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/qcomicbook/files/patch-help_CMakeLists.txt Sun Oct 7 12:00:18 2018 (r481442) @@ -0,0 +1,5 @@ +--- help/CMakeLists.txt.orig 2018-10-07 10:17:17 UTC ++++ help/CMakeLists.txt +@@ -1 +1 @@ +-INSTALL(FILES qcomicbook.1 DESTINATION share/man/man1) ++INSTALL(FILES qcomicbook.1 DESTINATION man/man1) Modified: head/graphics/qcomicbook/files/patch-src__CMakeLists.txt ============================================================================== --- head/graphics/qcomicbook/files/patch-src__CMakeLists.txt Sun Oct 7 11:38:56 2018 (r481441) +++ head/graphics/qcomicbook/files/patch-src__CMakeLists.txt Sun Oct 7 12:00:18 2018 (r481442) @@ -1,11 +1,11 @@ ---- src/CMakeLists.txt.orig 2011-07-08 07:18:50.000000000 -0300 -+++ src/CMakeLists.txt 2011-07-24 15:33:02.000000000 -0300 -@@ -116,6 +116,8 @@ - QT4_WRAP_UI(qcomicbook_ui_src ${qcomicbook_ui}) - ###QT4_ADD_TRANSLATION(qcomicbook_qm ../lang/pl_PL.ts) +--- src/CMakeLists.txt.orig 2016-11-22 17:45:10 UTC ++++ src/CMakeLists.txt +@@ -54,6 +54,8 @@ qt5_add_resources(qcomicbook_res ../data/qcomicbook.qr + qt5_wrap_cpp(qcomicbook_moc_src ${qcomicbook_moc_hdrs}) + qt5_wrap_ui(qcomicbook_ui_src ${qcomicbook_ui}) +link_directories(${POPPLER_LIBDIR}) + ADD_EXECUTABLE(qcomicbook ${qcomicbook_src} ${qcomicbook_moc_src} ${qcomicbook_ui_src} ${qcomicbook_res}) ADD_DEPENDENCIES(qcomicbook translations) - TARGET_LINK_LIBRARIES(qcomicbook ${QT_LIBRARIES}) + TARGET_LINK_LIBRARIES(qcomicbook Qt5::Widgets Qt5::PrintSupport Qt5::X11Extras) Modified: head/graphics/qcomicbook/files/patch-src__FrameDetect__CompareFrames.h ============================================================================== --- head/graphics/qcomicbook/files/patch-src__FrameDetect__CompareFrames.h Sun Oct 7 11:38:56 2018 (r481441) +++ head/graphics/qcomicbook/files/patch-src__FrameDetect__CompareFrames.h Sun Oct 7 12:00:18 2018 (r481442) @@ -1,5 +1,5 @@ ---- ./src/FrameDetect/CompareFrames.h.orig 2012-05-30 20:32:02.000000000 +0000 -+++ ./src/FrameDetect/CompareFrames.h 2014-05-13 08:15:11.199946861 +0000 +--- src/FrameDetect/CompareFrames.h.orig 2016-11-22 17:45:10 UTC ++++ src/FrameDetect/CompareFrames.h @@ -14,6 +14,7 @@ #define __COMPARE_FRAMES_H Modified: head/graphics/qcomicbook/pkg-plist ============================================================================== --- head/graphics/qcomicbook/pkg-plist Sun Oct 7 11:38:56 2018 (r481441) +++ head/graphics/qcomicbook/pkg-plist Sun Oct 7 12:00:18 2018 (r481442) @@ -2,18 +2,18 @@ bin/qcomicbook man/man1/qcomicbook.1.gz share/applications/qcomicbook.desktop share/pixmaps/qcomicbook.png -%%DATADIR%%/i18n/qcomicbook_cs_CZ.qm -%%DATADIR%%/i18n/qcomicbook_de_DE.qm -%%DATADIR%%/i18n/qcomicbook_en_EN.qm -%%DATADIR%%/i18n/qcomicbook_es_ES.qm -%%DATADIR%%/i18n/qcomicbook_fi_FI.qm -%%DATADIR%%/i18n/qcomicbook_fr_CA.qm -%%DATADIR%%/i18n/qcomicbook_fr_FR.qm -%%DATADIR%%/i18n/qcomicbook_it_IT.qm -%%DATADIR%%/i18n/qcomicbook_ko_KR.qm -%%DATADIR%%/i18n/qcomicbook_nl_NL.qm -%%DATADIR%%/i18n/qcomicbook_pl_PL.qm -%%DATADIR%%/i18n/qcomicbook_pt_BR.qm -%%DATADIR%%/i18n/qcomicbook_ru_RU.qm -%%DATADIR%%/i18n/qcomicbook_uk_UA.qm -%%DATADIR%%/i18n/qcomicbook_zh_CN.qm +share/qcomicbook/i18n/qcomicbook_cs_CZ.qm +share/qcomicbook/i18n/qcomicbook_de_DE.qm +share/qcomicbook/i18n/qcomicbook_en_EN.qm +share/qcomicbook/i18n/qcomicbook_es_ES.qm +share/qcomicbook/i18n/qcomicbook_fi_FI.qm +share/qcomicbook/i18n/qcomicbook_fr_CA.qm +share/qcomicbook/i18n/qcomicbook_fr_FR.qm +share/qcomicbook/i18n/qcomicbook_it_IT.qm +share/qcomicbook/i18n/qcomicbook_ko_KR.qm +share/qcomicbook/i18n/qcomicbook_nl_NL.qm +share/qcomicbook/i18n/qcomicbook_pl_PL.qm +share/qcomicbook/i18n/qcomicbook_pt_BR.qm +share/qcomicbook/i18n/qcomicbook_ru_RU.qm +share/qcomicbook/i18n/qcomicbook_uk_UA.qm +share/qcomicbook/i18n/qcomicbook_zh_CN.qm