From 7967c79891a3d523a160dfb559cd571e1768c666 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 15 Sep 2012 07:39:06 +0200
Subject: office/apvlv: Updated for version 0.1.4.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 office/apvlv/apvlv.SlackBuild    |  7 +------
 office/apvlv/apvlv.info          |  6 +++---
 office/apvlv/poppler-0.15.1.diff | 19 -------------------
 3 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 office/apvlv/poppler-0.15.1.diff

(limited to 'office')

diff --git a/office/apvlv/apvlv.SlackBuild b/office/apvlv/apvlv.SlackBuild
index 14790d2dae..6c6835fb1e 100644
--- a/office/apvlv/apvlv.SlackBuild
+++ b/office/apvlv/apvlv.SlackBuild
@@ -25,7 +25,7 @@
 
 
 PRGNAM=apvlv
-VERSION=${VERSION:-0.1.2}
+VERSION=${VERSION:-0.1.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,11 +71,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# patch for newer poppler version, won't build without
-# from: http://code.google.com/p/apvlv/issues/detail?id=110
-# and adapted for 0.1.2
-patch -p1 < ${CWD}/poppler-0.15.1.diff
-
 mkdir -p build
 cd build
   cmake .. \
diff --git a/office/apvlv/apvlv.info b/office/apvlv/apvlv.info
index ad908d7f2a..da882def19 100644
--- a/office/apvlv/apvlv.info
+++ b/office/apvlv/apvlv.info
@@ -1,8 +1,8 @@
 PRGNAM="apvlv"
-VERSION="0.1.2"
+VERSION="0.1.4"
 HOMEPAGE="http://naihe2010.github.com/apvlv/"
-DOWNLOAD="https://github.com/downloads/naihe2010/apvlv/apvlv-0.1.2-Source.tar.gz"
-MD5SUM="381d83aa9c253fac5e0be165fca39222"
+DOWNLOAD="https://github.com/downloads/naihe2010/apvlv/apvlv-0.1.4-Source.tar.gz"
+MD5SUM="bcd3e96350a2378662e2f2d0fa02d342"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/apvlv/poppler-0.15.1.diff b/office/apvlv/poppler-0.15.1.diff
deleted file mode 100644
index 2c16ae5931..0000000000
--- a/office/apvlv/poppler-0.15.1.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/ApvlvFile.cpp	2011-07-07 16:26:45.257995568 +0200
-+++ b/src/ApvlvFile.cpp	2011-07-07 16:29:46.654995527 +0200
-@@ -302,9 +302,14 @@
- 
- 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);
-+#if POPPLER_CHECK_VERSION(0, 15, 1)
-+  PopplerRectangle rect = { x1, y2, x2, y1 };
-+  *out = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect);
-+#else
-+  PopplerRectangle rect = { x1, y1, x2, y2 };
-+   *out = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect);
-+#endif
-   if (*out != NULL)
-     {
-       return true;
-- 
cgit v1.2.3