From nobody Tue Jul 02 17:09:08 2024 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 4WD8X45H4Mz5NmsT; Tue, 02 Jul 2024 17:09:08 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WD8X43rXfz4KC3; Tue, 2 Jul 2024 17:09:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719940148; 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=wbhAuIszHIiUotjKm+N+qXtkb5andP8xLqA+u2U+7oA=; b=V59CguEPKOrRzIko5hQR6VqmtD4QpxqFgiOQHbLI+ktER7wHV0z7KDs6Z5vUeNjVQvPGO1 cihu9hQD+D6pb35QZhPOq715QXFZYTo3tWIEi6Y/Ez3eXR6aMGyPT2TAHaAXZH3BYLbt3L rdAiRIUyuMuDXwto5rIAhrSeEonP6Yznvz4o8m3+pAlgTUBPoSqUFx9NV379+Auv1JcCKk iS6YWx8476erX3bCafI30MUYOOPGaKRgXEdVemb6zXvOjPIxDmbIsHu3IJ176XZJj3HzdJ 2227XP197KQJDAylNevTh+IuaFJsYoQjP0+OYBBzL/V8+tte3N7tS1suZG7CIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719940148; a=rsa-sha256; cv=none; b=rAs7R5+oatSw/WU4xbRsh66Pfa80wq0mx8vdPf8B4f+U5/EICD/yhFIkTsTcYYOBYiMUPW SDI+SvdPaGMLNxMhLTwisO98B3wAy8GVGemoDKNiHwBVaNkHP9t9MuJRwkTtN6KK68yDi0 pSz3WpDZSO3gVCUnae/+W2oTdXcIc9xY2tqOYxnYrh1Mk4EgqKykvRStluHz4VT0DXlEI2 /yDqfuWpU60pjtKC48Zm1/r/QWLchI0nEzReQ8tinYeQN8M6+aZA/KmbxquPv0C0wVVnwh O5AhVNouACE2syBZ9HUCRNW0rN8YtRLjKbPwrI9JQ5Shvh5xWaQ2tmAbTmSovQ== 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=1719940148; 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=wbhAuIszHIiUotjKm+N+qXtkb5andP8xLqA+u2U+7oA=; b=Ot3N4hg3lGyRbS6TgSgZrbcyncp1QZMVrWncmHbHBBkKUoZOmqOIAbOYJpa9Twi12Rt9xT Pi+6Dr80umvLQEyysMMjf7rI9ilLc+mcfwZXEbMQllGmpjb3XJRgN+EK3k1gPFLkzrHDMY oFpP1diK29gHPIbm3FuiPjGSTytCIza5vIRuNWAPn73Id5Ys+D1M5JnjTvdTd/9paO3crn zm8qa0iLnvq3eC2gfnBBvmZ9e2nxI5++lDuoP/s5Ll1PPyBYFYfhoDB4nevo/+grIJcWdQ DvdG7XPwo/2g8FzTvtGcJ4slLdAhGfpb1miw5/kaGANEegI3fTbWwwBduo2++w== 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 4WD8X432wxzwXR; Tue, 2 Jul 2024 17:09:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 462H98U1095675; Tue, 2 Jul 2024 17:09:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 462H98di095672; Tue, 2 Jul 2024 17:09:08 GMT (envelope-from git) Date: Tue, 2 Jul 2024 17:09:08 GMT Message-Id: <202407021709.462H98di095672@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: d3d64e7bedc1 - main - graphics/epdfview: Update to 0.2.0 and set maintainer 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3d64e7bedc1c66e88862c7c5a1c5976bbd93009 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=d3d64e7bedc1c66e88862c7c5a1c5976bbd93009 commit d3d64e7bedc1c66e88862c7c5a1c5976bbd93009 Author: mew14930xvi AuthorDate: 2024-06-30 17:04:55 +0000 Commit: Fernando ApesteguĂ­a CommitDate: 2024-07-02 17:08:44 +0000 graphics/epdfview: Update to 0.2.0 and set maintainer ChangeLog: https://github.com/Flow-It/epdfview_old/blob/modernize/NEWS Submitter already maintainer of several ports. PR: 279972 Reported by: mew14930xvi@inbox.lv --- graphics/epdfview/Makefile | 50 +++++++----------- graphics/epdfview/distinfo | 5 +- graphics/epdfview/files/patch-PDFDocument.cxx | 42 --------------- graphics/epdfview/files/patch-cups | 74 --------------------------- graphics/epdfview/pkg-plist | 31 +++++------ 5 files changed, 37 insertions(+), 165 deletions(-) diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile index 2a679caf7b62..0ccda1ec1651 100644 --- a/graphics/epdfview/Makefile +++ b/graphics/epdfview/Makefile @@ -1,47 +1,33 @@ PORTNAME= epdfview -PORTVERSION= 0.1.8 -PORTREVISION= 66 +DISTVERSION= 0.2.0 CATEGORIES= graphics print gnome -MASTER_SITES= FRUGALWARE/xapps-extra/${PORTNAME} \ - ftp://ftp.slackware.com/.1/blfs/conglomeration/${PORTNAME}/ \ - http://anduin.linuxfromscratch.org/sources/BLFS/conglomeration/${PORTNAME}/ \ - http://pkgs.fedoraproject.org/repo/pkgs/${PORTNAME}/${DISTNAME}${EXTRACT_SUFX}/e50285b01612169b2594fea375f53ae4/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mew14930xvi@inbox.lv COMMENT= Lightweight PDF document viewer -WWW= http://www.emma-soft.com/projects/epdfview/ +WWW= https://github.com/Flow-It/epdfview_old LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= cppunit-config:devel/cppunit LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib -USES= compiler:c++11-lang desktop-file-utils gmake gnome iconv \ - pkgconfig tar:bzip2 -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -USE_GNOME= gtk20 intlhack -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +USES= compiler:c++11-lang desktop-file-utils gnome iconv meson \ + pkgconfig -OPTIONS_DEFINE= CUPS NLS -OPTIONS_DEFAULT=CUPS NLS -OPTIONS_SUB= yes +USE_GITHUB= yes +GH_ACCOUNT= Flow-It +GH_PROJECT= epdfview_old +GH_TAGNAME= 6f907bd -CUPS_CONFIGURE_WITH= cups -CUPS_LIB_DEPENDS= libcups.so:print/cups - -NLS_USES= gettext -NLS_CPPFLAGS= -I${LOCALBASE}/include -NLS_LDFLAGS= -L${LOCALBASE}/lib -NLS_CONFIGURE_ENABLE= nls +USE_GNOME= glib20 gtk30 -post-patch: - @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ - ${WRKSRC}/src/gtk/StockIcons.h +OPTIONS_DEFINE= CUPS NLS +OPTIONS_DEFAULT= CUPS NLS +OPTIONS_SUB= yes -post-install: - ${REINPLACE_CMD} -e 's,Icon.*,Icon=${DATADIR}/pixmaps/icon_epdfview-48.png,' ${WRKSRC}/data/${PORTNAME}.desktop - ${INSTALL_DATA} ${WRKSRC}/data/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/ +CUPS_LIB_DEPENDS= libcups.so:print/cups +CUPS_MESON_TRUE= enable-printing +NLS_USES= gettext +NLS_MESON_TRUE= enable-nls .include diff --git a/graphics/epdfview/distinfo b/graphics/epdfview/distinfo index c5ba83d9eda7..557d29b8ea8c 100644 --- a/graphics/epdfview/distinfo +++ b/graphics/epdfview/distinfo @@ -1,2 +1,3 @@ -SHA256 (epdfview-0.1.8.tar.bz2) = 948648ae7c9d7b3b408d738bd4f48d87375b1196cae1129d6b846a8de0f2f8f0 -SIZE (epdfview-0.1.8.tar.bz2) = 466270 +TIMESTAMP = 1719192661 +SHA256 (Flow-It-epdfview_old-0.2.0-6f907bd_GH0.tar.gz) = 9a8b6ecee19e204383ffe1039a38c85078212eb2c0eaca302473981803b638eb +SIZE (Flow-It-epdfview_old-0.2.0-6f907bd_GH0.tar.gz) = 232227 diff --git a/graphics/epdfview/files/patch-PDFDocument.cxx b/graphics/epdfview/files/patch-PDFDocument.cxx deleted file mode 100644 index d361172ea365..000000000000 --- a/graphics/epdfview/files/patch-PDFDocument.cxx +++ /dev/null @@ -1,42 +0,0 @@ ---- src/PDFDocument.cxx.orig 2011-05-28 18:25:01.000000000 +0800 -+++ src/PDFDocument.cxx 2011-11-03 13:42:30.000000000 +0800 -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include "epdfview.h" - - using namespace ePDFView; -@@ -33,6 +34,23 @@ - static PageMode convertPageMode (gint pageMode); - static gchar *getAbsoluteFileName (const gchar *fileName); - -+namespace -+{ -+ void -+ convert_bgra_to_rgba (guint8 *data, int width, int height) -+ { -+ using std::swap; -+ -+ for (int y = 0; y < height; y++) -+ { -+ for (int x = 0; x < width; x++) -+ { -+ swap(data[0], data[2]); -+ data += 4; -+ } -+ } -+ } -+} - /// - /// @brief Constructs a new PDFDocument object. - /// -@@ -650,6 +668,7 @@ - poppler_page_render (page, context); - cairo_destroy(context); - cairo_surface_destroy (surface); -+ convert_bgra_to_rgba(renderedPage->getData (), width, height); - #else // !HAVE_POPPLER_0_17_0 - // Create the pixbuf from the data and render to it. - GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data (renderedPage->getData (), diff --git a/graphics/epdfview/files/patch-cups b/graphics/epdfview/files/patch-cups deleted file mode 100644 index 9095c48c0b62..000000000000 --- a/graphics/epdfview/files/patch-cups +++ /dev/null @@ -1,74 +0,0 @@ -diff -Naur epdfview-0.1.8.orig/src/PrintPter.cxx epdfview-0.1.8/src/PrintPter.cxx ---- src/PrintPter.cxx 2011-05-28 11:25:01.000000000 +0100 -+++ src/PrintPter.cxx 2012-08-22 20:11:46.362436859 +0100 -@@ -22,6 +22,40 @@ - #include - #include "epdfview.h" - -+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) -+#define HAVE_CUPS_1_6 1 -+#endif -+ -+#ifndef HAVE_CUPS_1_6 -+inline int ippGetInteger (ipp_attribute_t *attr, int element) -+{ -+ return (attr->values[element].integer); -+} -+ -+inline const char * ippGetString (ipp_attribute_t *attr, -+ int element, -+ const char **language /*UNUSED*/) -+{ -+ return (attr->values[element].string.text); -+} -+ -+inline int ippSetOperation (ipp_t *ipp, ipp_op_t op) -+{ -+ if (!ipp) -+ return (0); -+ ipp->request.op.operation_id = op; -+ return (1); -+} -+ -+inline int ippSetRequestId (ipp_t *ipp, int request_id) -+{ -+ if (!ipp) -+ return (0); -+ ipp->request.any.request_id = request_id; -+ return (1); -+} -+#endif -+ - using namespace ePDFView; - - // Structures -@@ -380,8 +414,8 @@ - - ipp_t *request = ippNew (); - -- request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES; -- request->request.op.request_id = 1; -+ ippSetOperation(request, IPP_GET_PRINTER_ATTRIBUTES); -+ ippSetRequestId(request, 1); - - ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, - "attributes-charset", NULL, "utf-8"); -@@ -403,7 +437,7 @@ - ippFindAttribute (answer, "printer-state", IPP_TAG_ZERO); - if ( NULL != state ) - { -- switch (state->values[0].integer) -+ switch (ippGetInteger (state, 0)) - { - case IPP_PRINTER_IDLE: - attributes->state = g_strdup (_("Idle")); -@@ -425,7 +459,7 @@ - ippFindAttribute (answer, "printer-location", IPP_TAG_ZERO); - if ( NULL != location ) - { -- attributes->location = g_strdup (location->values[0].string.text); -+ attributes->location = g_strdup (ippGetString (location, 0, NULL)); - } - - ippDelete (answer); - diff --git a/graphics/epdfview/pkg-plist b/graphics/epdfview/pkg-plist index df403c742cbf..ae6874711408 100644 --- a/graphics/epdfview/pkg-plist +++ b/graphics/epdfview/pkg-plist @@ -1,5 +1,16 @@ bin/epdfview -share/man/man1/epdfview.1.gz +share/applications/epdfview.desktop +%%DATADIR%%/pixmaps/stock_find_next_24.png +%%DATADIR%%/pixmaps/stock_find_previous_24.png +%%DATADIR%%/pixmaps/stock_rotate-270.png +%%DATADIR%%/pixmaps/stock_rotate-90.png +%%DATADIR%%/pixmaps/stock_zoom-page-width.png +%%DATADIR%%/ui/epdfview-ui.xml +%%CUPS%%%%DATADIR%%/ui/epdfview-ui-print.xml +share/icons/hicolor/24x24/apps/epdfview.png +share/icons/hicolor/32x32/apps/epdfview.png +share/icons/hicolor/48x48/apps/epdfview.png +share/icons/hicolor/scalable/apps/epdfview.svg %%NLS%%share/locale/ar/LC_MESSAGES/epdfview.mo %%NLS%%share/locale/ca/LC_MESSAGES/epdfview.mo %%NLS%%share/locale/cs/LC_MESSAGES/epdfview.mo @@ -9,27 +20,17 @@ share/man/man1/epdfview.1.gz %%NLS%%share/locale/eu/LC_MESSAGES/epdfview.mo %%NLS%%share/locale/fr/LC_MESSAGES/epdfview.mo %%NLS%%share/locale/gl/LC_MESSAGES/epdfview.mo -%%NLS%%share/locale/he_IL/LC_MESSAGES/epdfview.mo +%%NLS%%share/locale/he/LC_MESSAGES/epdfview.mo %%NLS%%share/locale/hu/LC_MESSAGES/epdfview.mo %%NLS%%share/locale/it/LC_MESSAGES/epdfview.mo %%NLS%%share/locale/ja/LC_MESSAGES/epdfview.mo -%%NLS%%share/locale/nl_NL/LC_MESSAGES/epdfview.mo +%%NLS%%share/locale/nl/LC_MESSAGES/epdfview.mo %%NLS%%share/locale/pl/LC_MESSAGES/epdfview.mo +%%NLS%%share/locale/pt/LC_MESSAGES/epdfview.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/epdfview.mo -%%NLS%%share/locale/pt_PT/LC_MESSAGES/epdfview.mo %%NLS%%share/locale/ru/LC_MESSAGES/epdfview.mo %%NLS%%share/locale/sv/LC_MESSAGES/epdfview.mo %%NLS%%share/locale/vi/LC_MESSAGES/epdfview.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/epdfview.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/epdfview.mo -share/applications/epdfview.desktop -%%DATADIR%%/pixmaps/icon_epdfview-24.png -%%DATADIR%%/pixmaps/icon_epdfview-32.png -%%DATADIR%%/pixmaps/icon_epdfview-48.png -%%DATADIR%%/pixmaps/stock_find_next_24.png -%%DATADIR%%/pixmaps/stock_find_previous_24.png -%%DATADIR%%/pixmaps/stock_rotate-90.png -%%DATADIR%%/pixmaps/stock_rotate-270.png -%%DATADIR%%/pixmaps/stock_zoom-page-width.png -%%DATADIR%%/ui/epdfview-ui-print.xml -%%DATADIR%%/ui/epdfview-ui.xml +share/man/man1/epdfview.1.gz