[pkgsrc/trunk]: pkgsrc/sysutils/gnome-commander -adapt to poppler API change ...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b2177396c28e
branches:  trunk
changeset: 565120:b2177396c28e
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Sep 16 10:59:55 2009 +0000

description:
-adapt to poppler API change in 0.12
-update to 1.2.8.1
 changes: minor fixes

diffstat:

 sysutils/gnome-commander/Makefile         |   5 ++---
 sysutils/gnome-commander/distinfo         |   9 +++++----
 sysutils/gnome-commander/options.mk       |   4 +++-
 sysutils/gnome-commander/patches/patch-ab |  13 +++++++++++++
 4 files changed, 23 insertions(+), 8 deletions(-)

diffs (64 lines):

diff -r f178f94a4ac5 -r b2177396c28e sysutils/gnome-commander/Makefile
--- a/sysutils/gnome-commander/Makefile Wed Sep 16 10:16:58 2009 +0000
+++ b/sysutils/gnome-commander/Makefile Wed Sep 16 10:59:55 2009 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:58:18 sno Exp $
+# $NetBSD: Makefile,v 1.4 2009/09/16 10:59:55 drochner Exp $
 #
 
-DISTNAME=              gnome-commander-1.2.8
-PKGREVISION=           1
+DISTNAME=              gnome-commander-1.2.8.1
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-commander/1.2/}
 EXTRACT_SUFX=          .tar.bz2
diff -r f178f94a4ac5 -r b2177396c28e sysutils/gnome-commander/distinfo
--- a/sysutils/gnome-commander/distinfo Wed Sep 16 10:16:58 2009 +0000
+++ b/sysutils/gnome-commander/distinfo Wed Sep 16 10:59:55 2009 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/07/23 15:29:22 drochner Exp $
+$NetBSD: distinfo,v 1.2 2009/09/16 10:59:55 drochner Exp $
 
-SHA1 (gnome-commander-1.2.8.tar.bz2) = 587e9dc6055af3d6266dcf7517580d87fe80e83d
-RMD160 (gnome-commander-1.2.8.tar.bz2) = f4e0ce01d8dbdf1a7231d4242ff34682d20718b3
-Size (gnome-commander-1.2.8.tar.bz2) = 3447639 bytes
+SHA1 (gnome-commander-1.2.8.1.tar.bz2) = d17abf0e49fa99c6bb1ce9a1b88564715dfef343
+RMD160 (gnome-commander-1.2.8.1.tar.bz2) = 7cf2763b6f2083f9e0e73c2af5817b58c57a1efa
+Size (gnome-commander-1.2.8.1.tar.bz2) = 3436627 bytes
 SHA1 (patch-aa) = c0e8aa8c3b71d5fcd92253115d3beca4e9ab573b
+SHA1 (patch-ab) = a6f08a67258d5e27add373bcae30d4596526c75b
diff -r f178f94a4ac5 -r b2177396c28e sysutils/gnome-commander/options.mk
--- a/sysutils/gnome-commander/options.mk       Wed Sep 16 10:16:58 2009 +0000
+++ b/sysutils/gnome-commander/options.mk       Wed Sep 16 10:59:55 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2009/07/23 15:29:23 drochner Exp $
+# $NetBSD: options.mk,v 1.2 2009/09/16 10:59:55 drochner Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gnome-commander
@@ -29,6 +29,8 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mpdf)
+# API change: getPDFVersion() -> getPDF{Major,Minor}Version()
+BUILDLINK_API_DEPENDS.poppler+= poppler>=0.12.0
 .include "../../print/poppler/buildlink3.mk"
 .include "../../print/poppler-includes/buildlink3.mk"
 .endif
diff -r f178f94a4ac5 -r b2177396c28e sysutils/gnome-commander/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/gnome-commander/patches/patch-ab Wed Sep 16 10:59:55 2009 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2009/09/16 10:59:55 drochner Exp $
+
+--- src/tags/gnome-cmd-tags-poppler.cc.orig    2009-09-16 12:33:24.000000000 +0200
++++ src/tags/gnome-cmd-tags-poppler.cc
+@@ -320,7 +320,7 @@ void gcmd_tags_poppler_load_metadata(Gno
+ 
+     f->metadata->mark_as_accessed(TAG_DOC);
+ 
+-    f->metadata->addf(TAG_PDF_VERSION, "%.1f", doc.getPDFVersion());
++    f->metadata->addf(TAG_PDF_VERSION, "%u.%u", doc.getPDFMajorVersion(), doc.getPDFMinorVersion());
+     f->metadata->addf(TAG_DOC_PAGECOUNT, "%i", doc.getNumPages());
+     f->metadata->addf(TAG_PDF_OPTIMIZED, "%u", doc.isLinearized());
+