From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 5 15:30:12 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7C0EA106564A for ; Fri, 5 Oct 2012 15:30:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 420828FC16 for ; Fri, 5 Oct 2012 15:30:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q95FUCRg069824 for ; Fri, 5 Oct 2012 15:30:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q95FUCH1069823; Fri, 5 Oct 2012 15:30:12 GMT (envelope-from gnats) Resent-Date: Fri, 5 Oct 2012 15:30:12 GMT Resent-Message-Id: <201210051530.q95FUCH1069823@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Maxim Samsonov Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 63C4B1065670 for ; Fri, 5 Oct 2012 15:24:23 +0000 (UTC) (envelope-from xors@imap.cc) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by mx1.freebsd.org (Postfix) with ESMTP id 246318FC08 for ; Fri, 5 Oct 2012 15:24:22 +0000 (UTC) Received: from compute5.internal (compute5.nyi.mail.srv.osa [10.202.2.45]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id AF72220817; Fri, 5 Oct 2012 11:24:16 -0400 (EDT) Received: from frontend2.nyi.mail.srv.osa ([10.202.2.161]) by compute5.internal (MEProxy); Fri, 05 Oct 2012 11:24:16 -0400 Received: from atom.pg.org (unknown [37.110.147.39]) by mail.messagingengine.com (Postfix) with ESMTPA id 1951748255B for ; Fri, 5 Oct 2012 11:24:16 -0400 (EDT) Received: from pg.org (xors.pg.org [192.168.1.1]) by atom.pg.org (Postfix) with ESMTP id A9D7ACF012 for ; Fri, 5 Oct 2012 19:24:14 +0400 (MSK) Received: from xors.pg.org (localhost [127.0.0.1]) by pg.org (8.14.5/8.14.5) with ESMTP id q95FOEPD001573 for ; Fri, 5 Oct 2012 19:24:14 +0400 (MSK) (envelope-from xors@xors.pg.org) Received: (from xors@localhost) by xors.pg.org (8.14.5/8.14.5/Submit) id q95FOEjb001572; Fri, 5 Oct 2012 19:24:14 +0400 (MSK) (envelope-from xors) Message-Id: <201210051524.q95FOEjb001572@xors.pg.org> Date: Fri, 5 Oct 2012 19:24:14 +0400 (MSK) From: Maxim Samsonov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/172360: [MAINTAINER-UPDATE]: graphics/apvlv Update to new release, 0.1.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Maxim Samsonov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Oct 2012 15:30:12 -0000 >Number: 172360 >Category: ports >Synopsis: [MAINTAINER-UPDATE]: graphics/apvlv Update to new release, 0.1.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Oct 05 15:30:11 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Maxim Samsonov >Release: FreeBSD 8.3-STABLE i386 >Organization: >Environment: >Description: - Update to 0.1.4 - Convert to new options framework - Update maintainer's e-mail address >How-To-Repeat: >Fix: --- graphics_apvlv-update.patch begins here --- diff --git a/graphics/apvlv/Makefile b/graphics/apvlv/Makefile --- a/graphics/apvlv/Makefile +++ b/graphics/apvlv/Makefile @@ -6,13 +6,12 @@ # PORTNAME= apvlv -PORTVERSION= 0.1.2 -PORTREVISION= 2 +PORTVERSION= 0.1.4 CATEGORIES= graphics MASTER_SITES= http://cloud.github.com/downloads/naihe2010/apvlv/ DISTNAME= ${PORTNAME}-${PORTVERSION}-Source -MAINTAINER= xors@imap.cc +MAINTAINER= xors@mailup.net COMMENT= Apvlv is a PDF/DJVU Viewer and its behaviour like Vim LICENSE= GPLv2 @@ -25,19 +24,30 @@ CMAKE_ARGS+= -DSYSCONFDIR=${PREFIX}/etc \ -DMANDIR=${MANPREFIX}/man \ -DDOCDIR=${DOCSDIR} \ - -DAPVLV_WITH_UMD=OFF + -DAPVLV_WITH_UMD=OFF \ + -DAPVLV_WITH_TXT=ON MAN1= apvlv.1 -OPTIONS= DJVU "Enable DJVU support" off +OPTIONS_DEFINE= DJVU WEBKIT + +DJVU_DESC= Build with DjVu support +WEBKIT_DESC= Build with WebKit support .include -.if defined(WITHOUT_DJVU) -CMAKE_ARGS+= -DAPVLV_WITH_DJVU=OFF -.else +.if ${PORT_OPTIONS:MDJVU} CMAKE_ARGS+= -DAPVLV_WITH_DJVU=ON LIB_DEPENDS+= djvulibre:${PORTSDIR}/graphics/djvulibre +.else +CMAKE_ARGS+= -DAPVLV_WITH_DJVU=OFF +.endif + +.if ${PORT_OPTIONS:MWEBKIT} +CMAKE_ARGS+= -DAPVLV_WITH_HTML=ON +LIB_DEPENDS+= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 +.else +CMAKE_ARGS+= -DAPVLV_WITH_HTML=OFF .endif .include diff --git a/graphics/apvlv/distinfo b/graphics/apvlv/distinfo --- a/graphics/apvlv/distinfo +++ b/graphics/apvlv/distinfo @@ -1,2 +1,2 @@ -SHA256 (apvlv-0.1.2-Source.tar.gz) = 65f010287dd98644d25997f95054bc95abc22fd8d5e2d7bc3b3b59978fbb470a -SIZE (apvlv-0.1.2-Source.tar.gz) = 331595 +SHA256 (apvlv-0.1.4-Source.tar.gz) = f803de89aed82fea08f9386a6d6ddec999d0c96bb68c85e4cd527803838d17cd +SIZE (apvlv-0.1.4-Source.tar.gz) = 337182 diff --git a/graphics/apvlv/files/patch-poppler-0.18 b/graphics/apvlv/files/patch-poppler-0.18 deleted file mode 100644 --- a/graphics/apvlv/files/patch-poppler-0.18 +++ /dev/null @@ -1,151 +0,0 @@ -http://bugs.gentoo.org/385057 -http://projects.archlinux.org/svntogit/community.git/tree/trunk/poppler-gdk.patch?h=packages/apvlv - ---- src/ApvlvFile.cpp -+++ src/ApvlvFile.cpp -@@ -29,6 +29,10 @@ - #include "ApvlvUtil.hpp" - #include "ApvlvView.hpp" - -+#ifndef POPPLER_WITH_GDK -+#include "poppler-gdk.h" -+#endif -+ - #ifdef HAVE_LIBUMD - #define LIBUMD_ENABLE_GTK - #include ---- src/poppler-gdk.h -+++ src/poppler-gdk.h -@@ -0,0 +1,132 @@ -+#include -+ -+static void -+copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, -+ GdkPixbuf *pixbuf) -+{ -+ int cairo_width, cairo_height, cairo_rowstride; -+ unsigned char *pixbuf_data, *dst, *cairo_data; -+ int pixbuf_rowstride, pixbuf_n_channels; -+ unsigned int *src; -+ int x, y; -+ -+ cairo_width = cairo_image_surface_get_width (surface); -+ cairo_height = cairo_image_surface_get_height (surface); -+ cairo_rowstride = cairo_image_surface_get_stride (surface); -+ cairo_data = cairo_image_surface_get_data (surface); -+ -+ pixbuf_data = gdk_pixbuf_get_pixels (pixbuf); -+ pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf); -+ pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf); -+ -+ if (cairo_width > gdk_pixbuf_get_width (pixbuf)) -+ cairo_width = gdk_pixbuf_get_width (pixbuf); -+ if (cairo_height > gdk_pixbuf_get_height (pixbuf)) -+ cairo_height = gdk_pixbuf_get_height (pixbuf); -+ for (y = 0; y < cairo_height; y++) -+ { -+ src = (unsigned int *) (cairo_data + y * cairo_rowstride); -+ dst = pixbuf_data + y * pixbuf_rowstride; -+ for (x = 0; x < cairo_width; x++) -+ { -+ dst[0] = (*src >> 16) & 0xff; -+ dst[1] = (*src >> 8) & 0xff; -+ dst[2] = (*src >> 0) & 0xff; -+ if (pixbuf_n_channels == 4) -+ dst[3] = (*src >> 24) & 0xff; -+ dst += pixbuf_n_channels; -+ src++; -+ } -+ } -+} -+ -+static void -+_poppler_page_render_to_pixbuf (PopplerPage *page, -+ int src_x, int src_y, -+ int src_width, int src_height, -+ double scale, -+ int rotation, -+ GBool printing, -+ GdkPixbuf *pixbuf) -+{ -+ cairo_t *cr; -+ cairo_surface_t *surface; -+ -+ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, -+ src_width, src_height); -+ cr = cairo_create (surface); -+ cairo_save (cr); -+ switch (rotation) { -+ case 90: -+ cairo_translate (cr, src_x + src_width, -src_y); -+ break; -+ case 180: -+ cairo_translate (cr, src_x + src_width, src_y + src_height); -+ break; -+ case 270: -+ cairo_translate (cr, -src_x, src_y + src_height); -+ break; -+ default: -+ cairo_translate (cr, -src_x, -src_y); -+ } -+ -+ if (scale != 1.0) -+ cairo_scale (cr, scale, scale); -+ -+ if (rotation != 0) -+ cairo_rotate (cr, rotation * G_PI / 180.0); -+ -+ if (printing) -+ poppler_page_render_for_printing (page, cr); -+ else -+ poppler_page_render (page, cr); -+ cairo_restore (cr); -+ -+ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); -+ cairo_set_source_rgb (cr, 1., 1., 1.); -+ cairo_paint (cr); -+ -+ cairo_destroy (cr); -+ -+ copy_cairo_surface_to_pixbuf (surface, pixbuf); -+ cairo_surface_destroy (surface); -+} -+ -+/** -+ * poppler_page_render_to_pixbuf: -+ * @page: the page to render from -+ * @src_x: x coordinate of upper left corner -+ * @src_y: y coordinate of upper left corner -+ * @src_width: width of rectangle to render -+ * @src_height: height of rectangle to render -+ * @scale: scale specified as pixels per point -+ * @rotation: rotate the document by the specified degree -+ * @pixbuf: pixbuf to render into -+ * -+ * First scale the document to match the specified pixels per point, -+ * then render the rectangle given by the upper left corner at -+ * (src_x, src_y) and src_width and src_height. -+ * This function is for rendering a page that will be displayed. -+ * If you want to render a page that will be printed use -+ * poppler_page_render_to_pixbuf_for_printing() instead -+ * -+ * Deprecated: 0.16 -+ **/ -+void -+poppler_page_render_to_pixbuf (PopplerPage *page, -+ int src_x, int src_y, -+ int src_width, int src_height, -+ double scale, -+ int rotation, -+ GdkPixbuf *pixbuf) -+{ -+ g_return_if_fail (POPPLER_IS_PAGE (page)); -+ g_return_if_fail (scale > 0.0); -+ g_return_if_fail (pixbuf != NULL); -+ -+ _poppler_page_render_to_pixbuf (page, src_x, src_y, -+ src_width, src_height, -+ scale, rotation, -+ gFalse, -+ pixbuf); -+} diff --git a/graphics/apvlv/files/patch-src_ApvlvDir.cpp b/graphics/apvlv/files/patch-src_ApvlvDir.cpp deleted file mode 100644 --- a/graphics/apvlv/files/patch-src_ApvlvDir.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ApvlvDir.cpp.orig 2011-06-24 11:30:12.000000000 +0400 -+++ src/ApvlvDir.cpp 2011-10-11 22:07:59.000000000 +0400 -@@ -49,7 +49,7 @@ - realname = NULL; - - GtkTreeIter nitr[1]; -- gtk_tree_store_append (dir->mStore, itr, ir); -+ gtk_tree_store_append (dir->mStore, nitr, ir); - *itr = *nitr; - - GdkPixbuf *pix = gdk_pixbuf_new_from_file_at_size (iconreg.c_str (), 40, diff --git a/graphics/apvlv/files/patch-src_ApvlvFile.cpp b/graphics/apvlv/files/patch-src_ApvlvFile.cpp deleted file mode 100644 --- a/graphics/apvlv/files/patch-src_ApvlvFile.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- src/ApvlvFile.cpp.orig 2011-06-24 11:30:12.000000000 +0400 -+++ src/ApvlvFile.cpp 2011-10-10 01:01:26.000000000 +0400 -@@ -302,9 +302,9 @@ - - bool ApvlvPDF::pagetext (int pn, int x1, int y1, int x2, int y2, char **out) - { -- PopplerRectangle rect = { x1, y1, x2, y2 }; - PopplerPage *page = poppler_document_get_page (mDoc, pn); -- *out = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect); -+ PopplerRectangle rect = { x1, y2, x2, y1 }; -+ *out = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect); - if (*out != NULL) - { - return true; diff --git a/graphics/apvlv/files/patch-src_CMakeLists.txt b/graphics/apvlv/files/patch-src_CMakeLists.txt new file mode 100644 --- /dev/null +++ b/graphics/apvlv/files/patch-src_CMakeLists.txt @@ -0,0 +1,43 @@ +--- src/CMakeLists.txt.orig 2012-06-13 07:44:28.000000000 +0400 ++++ src/CMakeLists.txt 2012-10-05 01:07:49.000000000 +0400 +@@ -17,17 +17,14 @@ + PKG_CHECK_MODULES (GTK2 gtk+-2.0 REQUIRED) + PKG_CHECK_MODULES (GLIB2 glib-2.0 REQUIRED) + PKG_CHECK_MODULES (GTHREAD2 gthread-2.0 REQUIRED) +-PKG_CHECK_MODULES (WEBKIT1 webkit-1.0 QUIET) + INCLUDE_DIRECTORIES (${FREETYPE2_INCLUDE_DIRS} + ${GTK2_INCLUDE_DIRS} + ${GLIB2_INCLUDE_DIRS} +- ${GTHREAD2_INCLUDE_DIRS} +- ${WEBKIT1_INCLUDE_DIRS}) ++ ${GTHREAD2_INCLUDE_DIRS}) + LINK_DIRECTORIES (${FREETYPE2_LIBRARY_DIRS} + ${GTK2_LIBRARY_DIRS} + ${GLIB2_LIBRARY_DIRS} +- ${GTHREAD2_LIBRARY_DIRS} +- ${WEBKIT1_LIBRARY_DIRS}) ++ ${GTHREAD2_LIBRARY_DIRS}) + + IF (WIN32) + SET (POPPLER_DIR ${CMAKE_HOME_DIRECTORY}/win32/poppler-src) +@@ -128,6 +125,12 @@ + IF (APVLV_WITH_HTML) + ADD_DEFINITIONS (-DAPVLV_WITH_HTML) + ++ PKG_CHECK_MODULES (WEBKIT1 webkit-1.0 REQUIRED) ++ INCLUDE_DIRECTORIES (${WEBKIT1_INCLUDE_DIRS}) ++ LINK_DIRECTORIES (${WEBKIT1_LIBRARY_DIRS}) ++ SET (APVLV_REQ_LIBRARIES ${WEBKIT1_LIBRARIES} ++ ${APVLV_REQ_LIBRARIES}) ++ + SET (HEADERS ${HEADERS} ApvlvHtm.h) + SET (SOURCES ${SOURCES} ApvlvHtm.cc) + ENDIF (APVLV_WITH_HTML) +@@ -138,7 +141,6 @@ + ${GTK2_LIBRARIES} + ${GLIB2_LIBRARIES} + ${GTHREAD2_LIBRARIES} +- ${WEBKIT1_LIBRARIES} + ${APVLV_REQ_LIBRARIES}) + + IF (WIN32) --- graphics_apvlv-update.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: