From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 11 20:20:05 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3961F1065670 for ; Tue, 11 Oct 2011 20:20:05 +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 136438FC21 for ; Tue, 11 Oct 2011 20:20:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p9BKK49Y011732 for ; Tue, 11 Oct 2011 20:20:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p9BKK4gT011731; Tue, 11 Oct 2011 20:20:04 GMT (envelope-from gnats) Resent-Date: Tue, 11 Oct 2011 20:20:04 GMT Resent-Message-Id: <201110112020.p9BKK4gT011731@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 [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C57A51065670 for ; Tue, 11 Oct 2011 20:15:39 +0000 (UTC) (envelope-from xors@mne.ru) Received: from external.cgp.agava.net (external.cgp.agava.net [89.108.65.69]) by mx1.freebsd.org (Postfix) with ESMTP id 5FB518FC19 for ; Tue, 11 Oct 2011 20:15:38 +0000 (UTC) Received: from cgp.agava.net (cgp.agava.net [89.108.66.11]) by external.cgp.agava.net (Postfix) with ESMTP id 68A03B0604A for ; Tue, 11 Oct 2011 20:14:31 +0000 (UTC) Received: from [95.25.23.131] (account xors@mne.ru HELO xors.pg.org) by cgp.agava.net (CommuniGate Pro SMTP 4.2.9) with ESMTP-TLS id 632619793 for FreeBSD-gnats-submit@freebsd.org; Wed, 12 Oct 2011 00:15:44 +0400 Received: by xors.pg.org (Postfix, from userid 1001) id 9E39F11A89; Wed, 12 Oct 2011 00:14:30 +0400 (MSD) Message-Id: <20111011201430.9E39F11A89@xors.pg.org> Date: Wed, 12 Oct 2011 00:14:30 +0400 (MSD) From: Maxim Samsonov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/161500: [UPDATE]: graphics/apvlv Update to new release, 0.1.2 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: Tue, 11 Oct 2011 20:20:05 -0000 >Number: 161500 >Category: ports >Synopsis: [UPDATE]: graphics/apvlv Update to new release, 0.1.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Oct 11 20:20:04 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Maxim Samsonov >Release: FreeBSD 8.2-STABLE i386 >Organization: >Environment: >Description: - Update to 0.1.2 Changes: https://raw.github.com/naihe2010/apvlv/v0.1.2/NEWS >How-To-Repeat: >Fix: --- graphics-apvlv.patch begins here --- diff --git a/graphics/apvlv/Makefile b/graphics/apvlv/Makefile --- a/graphics/apvlv/Makefile +++ b/graphics/apvlv/Makefile @@ -2,24 +2,40 @@ # Date created: 03 May 2010 # Whom: Ju Pengfei # -# $FreeBSD: ports/graphics/apvlv/Makefile,v 1.5 2011/09/21 16:48:41 tabthorpe Exp $ +# $FreeBSD:$ # PORTNAME= apvlv -PORTVERSION= 0.0.9.8 -PORTREVISION= 2 +PORTVERSION= 0.1.2 CATEGORIES= graphics -MASTER_SITES= GOOGLE_CODE +DISTNAME= ${PORTNAME}-${PORTVERSION}-Source +MASTER_SITES= http://github.com/downloads/naihe2010/apvlv/ MAINTAINER= ports@FreeBSD.org -COMMENT= Apvlv is a PDF Viewer Under Linux and its behaviour like Vim +COMMENT= Apvlv is a PDF/DJVU Viewer and its behaviour like Vim + +LICENSE= GPLv2 LIB_DEPENDS= poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk -GNU_CONFIGURE= yes -USE_GMAKE= yes -CONFIGURE_ARGS= --with-sysconfdir=${PREFIX}/etc +USE_CMAKE= yes +MAKE_JOBS_SAFE= yes +CMAKE_ARGS+= -DSYSCONFDIR=${PREFIX}/etc \ + -DMANDIR=${MANPREFIX}/man \ + -DDOCDIR=${DOCSDIR} \ + -DAPVLV_WITH_UMD=OFF MAN1= apvlv.1 +OPTIONS= DJVU "Enable DJVU support" off + +.include + +.if defined(WITHOUT_DJVU) +CMAKE_ARGS+= -DAPVLV_WITH_DJVU=OFF +.else +CMAKE_ARGS+= -DAPVLV_WITH_DJVU=ON +LIB_DEPENDS+= djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11 +.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.0.9.8.tar.gz) = adb2ac18e3e75c51b2a5e378d67837b0c15b87e1e3aad05f3501565c4671f902 -SIZE (apvlv-0.0.9.8.tar.gz) = 219536 +SHA256 (apvlv-0.1.2-Source.tar.gz) = 65f010287dd98644d25997f95054bc95abc22fd8d5e2d7bc3b3b59978fbb470a +SIZE (apvlv-0.1.2-Source.tar.gz) = 331595 diff --git a/graphics/apvlv/files/patch-src_ApvlvDir.cpp b/graphics/apvlv/files/patch-src_ApvlvDir.cpp new file mode 100644 --- /dev/null +++ b/graphics/apvlv/files/patch-src_ApvlvDir.cpp @@ -0,0 +1,11 @@ +--- 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 --- a/graphics/apvlv/files/patch-src_ApvlvFile.cpp +++ b/graphics/apvlv/files/patch-src_ApvlvFile.cpp @@ -1,14 +1,14 @@ ---- src/ApvlvFile.cpp.orig 2011-08-12 10:22:23.000000000 +0200 -+++ src/ApvlvFile.cpp 2011-08-12 10:24:26.000000000 +0200 -@@ -273,9 +273,9 @@ ApvlvPDF::ApvlvPDF (const char *filename +--- 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; + 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/pkg-descr b/graphics/apvlv/pkg-descr --- a/graphics/apvlv/pkg-descr +++ b/graphics/apvlv/pkg-descr @@ -1,3 +1,3 @@ -Apvlv is a PDF Viewer and its behaviour like Vim. +Apvlv is a PDF/DJVU Viewer and its behaviour like Vim. -WWW: http://code.google.com/p/apvlv/ +WWW: http://naihe2010.github.com/apvlv/ diff --git a/graphics/apvlv/pkg-plist b/graphics/apvlv/pkg-plist --- a/graphics/apvlv/pkg-plist +++ b/graphics/apvlv/pkg-plist @@ -1,9 +1,10 @@ bin/apvlv etc/apvlvrc -%%DOCSDIR%%/apvlvrc.example -%%DOCSDIR%%/reg.png -%%DOCSDIR%%/dir.png -%%DOCSDIR%%/pdf.png %%DOCSDIR%%/Startup.pdf %%DOCSDIR%%/Startup.tex +%%DOCSDIR%%/apvlvrc.example +%%DOCSDIR%%/icons/dir.png +%%DOCSDIR%%/icons/pdf.png +%%DOCSDIR%%/icons/reg.png +@dirrm %%DOCSDIR%%/icons @dirrm %%DOCSDIR%% --- graphics-apvlv.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: