[arch-commits] Commit in epdfview/trunk (8 files)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Sun Feb 2 12:39:48 UTC 2014
Date: Sunday, February 2, 2014 @ 13:39:48
Author: bpiotrowski
Revision: 105182
upgpkg: epdfview 0.1.8-5
- give patches more meaningful names
- split prepare() function
- update maintainer information
Added:
epdfview/trunk/epdfview-0.1.8-glib2-headers.patch
(from rev 105181, epdfview/trunk/glib2_headers.patch)
epdfview/trunk/epdfview-0.1.8-modern-cups.patch
(from rev 105181, epdfview/trunk/printptr.patch)
epdfview/trunk/epdfview-0.1.8-swap-the-blue-and-red-channel.patch
(from rev 105181, epdfview/trunk/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch)
Modified:
epdfview/trunk/PKGBUILD
Deleted:
epdfview/trunk/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
epdfview/trunk/epdfview.desktop.patch
epdfview/trunk/glib2_headers.patch
epdfview/trunk/printptr.patch
-----------------------------------------------------------------+
0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch | 60 --------
PKGBUILD | 58 +++----
epdfview-0.1.8-glib2-headers.patch | 13 +
epdfview-0.1.8-modern-cups.patch | 74 ++++++++++
epdfview-0.1.8-swap-the-blue-and-red-channel.patch | 60 ++++++++
epdfview.desktop.patch | 11 -
glib2_headers.patch | 13 -
printptr.patch | 74 ----------
8 files changed, 176 insertions(+), 187 deletions(-)
Deleted: 0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
===================================================================
--- 0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch 2014-02-02 12:05:04 UTC (rev 105181)
+++ 0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch 2014-02-02 12:39:48 UTC (rev 105182)
@@ -1,60 +0,0 @@
-From d30496f52b85f82947bd07b9bd60f8482843ece8 Mon Sep 17 00:00:00 2001
-From: jordi <jordi at cb4bfb15-1111-0410-82e2-95233c8f1c7e>
-Date: Tue, 5 Jul 2011 09:23:38 +0000
-Subject: [PATCH 1/2] When using Poppler 0.17.0, I needed to swap the blue and
- red channels, otherwise the colors (other than black
- and white) looked wierd.
-
-git-svn-id: svn://svn.emma-soft.com/epdfview/trunk@367 cb4bfb15-1111-0410-82e2-95233c8f1c7e
----
- src/PDFDocument.cxx | 20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
-
-diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx
-index df5d75f..63b3513 100644
---- a/src/PDFDocument.cxx
-+++ b/src/PDFDocument.cxx
-@@ -20,6 +20,7 @@
- #include <time.h>
- #include <poppler.h>
- #include <unistd.h>
-+#include <algorithm>
- #include "epdfview.h"
-
- using namespace ePDFView;
-@@ -33,6 +34,24 @@ static PageLayout convertPageLayout (gint pageLayout);
- 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 +669,7 @@ PDFDocument::renderPage (gint pageNum)
- 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 (),
---
-1.7.7
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-02-02 12:05:04 UTC (rev 105181)
+++ PKGBUILD 2014-02-02 12:39:48 UTC (rev 105182)
@@ -1,50 +1,50 @@
# $Id$
-# Maintainer: schuay <jakob.gruber at gmail.com>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: schuay <jakob.gruber at gmail.com>
# Contributor: Tom K <tomk at runbox.com>
# Contributor: Thayer Williams <thayer at archlinux.org>
pkgname=epdfview
pkgver=0.1.8
-pkgrel=4
-pkgdesc="A free lightweight PDF document viewer."
-url="http://www.emma-soft.com/projects/epdfview/"
+pkgrel=5
+pkgdesc='Lightweight PDF document viewer'
+url='http://freecode.com/projects/epdfview'
arch=('i686' 'x86_64')
license=('GPL')
depends=('poppler-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'gtk2')
makedepends=('pkgconfig')
-install='epdfview.install'
-# The official site has been down, apparently for a couple of months.
-# source=("http://www.emma-soft.com/projects/${pkgname}/chrome/site/releases/${pkgname}-${pkgver}.tar.bz2"
-source=("ftp://ftp.slackware.com/.1/blfs/conglomeration/epdfview/${pkgname}-${pkgver}.tar.bz2"
- "${pkgname}.desktop.patch"
- "glib2_headers.patch"
- "0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch"
- "printptr.patch")
+install=epdfview.install
+source=(ftp://ftp.slackware.com/.1/blfs/conglomeration/epdfview/$pkgname-$pkgver.tar.bz2
+ epdfview-0.1.8-swap-the-blue-and-red-channel.patch
+ epdfview-0.1.8-glib2-headers.patch
+ epdfview-0.1.8-modern-cups.patch)
+md5sums=('e50285b01612169b2594fea375f53ae4'
+ '7f9ea101a41f5b4e999fd024f423d41f'
+ '2fffa9c7cd4c5f0744803591c2f162a3'
+ '5c2cf5612d2a7dfe6cf005b94aeb5ada')
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+ cd $pkgname-$pkgver
+ sed -i 's/icon_epdfview-48/epdfview/' data/epdfview.desktop
- patch -Np0 -i "${srcdir}/${pkgname}.desktop.patch"
- patch -Np1 -i "${srcdir}/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch"
- patch -Np1 -i "${srcdir}/glib2_headers.patch" # FS#30116
- patch -Np1 -i "${srcdir}/printptr.patch" # FS#32511
+ patch -p1 -i ../epdfview-0.1.8-swap-the-blue-and-red-channel.patch
+ patch -p1 -i ../epdfview-0.1.8-glib2-headers.patch # FS#30116
+ patch -p1 -i ../epdfview-0.1.8-modern-cups.patch # FS#32511
+}
+build() {
+ cd $pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
make
}
+
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
- make DESTDIR="${pkgdir}" install
-
for size in 24 32 48; do
- install -Dm644 data/icon_${pkgname}-${size}.png \
- "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname}.png"
+ install -Dm644 data/icon_$pkgname-$size.png \
+ "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps/$pkgname.png
done
}
-
-md5sums=('e50285b01612169b2594fea375f53ae4'
- 'fbf22bbabdbb7544db615ac5775d57e2'
- '2fffa9c7cd4c5f0744803591c2f162a3'
- '7f9ea101a41f5b4e999fd024f423d41f'
- '5c2cf5612d2a7dfe6cf005b94aeb5ada')
Copied: epdfview/trunk/epdfview-0.1.8-glib2-headers.patch (from rev 105181, epdfview/trunk/glib2_headers.patch)
===================================================================
--- epdfview-0.1.8-glib2-headers.patch (rev 0)
+++ epdfview-0.1.8-glib2-headers.patch 2014-02-02 12:39:48 UTC (rev 105182)
@@ -0,0 +1,13 @@
+diff --git a/src/gtk/StockIcons.h b/src/gtk/StockIcons.h
+index c142a7a..58fcf2e 100644
+--- a/src/gtk/StockIcons.h
++++ b/src/gtk/StockIcons.h
+@@ -18,7 +18,7 @@
+ #if !defined (__STOCK_ICONS_H__)
+ #define __STOCK_ICONS_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
Copied: epdfview/trunk/epdfview-0.1.8-modern-cups.patch (from rev 105181, epdfview/trunk/printptr.patch)
===================================================================
--- epdfview-0.1.8-modern-cups.patch (rev 0)
+++ epdfview-0.1.8-modern-cups.patch 2014-02-02 12:39:48 UTC (rev 105182)
@@ -0,0 +1,74 @@
+diff -Naur epdfview-0.1.8.orig/src/PrintPter.cxx epdfview-0.1.8/src/PrintPter.cxx
+--- epdfview-0.1.8.orig/src/PrintPter.cxx 2011-05-28 11:25:01.000000000 +0100
++++ epdfview-0.1.8/src/PrintPter.cxx 2012-08-22 20:11:46.362436859 +0100
+@@ -22,6 +22,40 @@
+ #include <locale.h>
+ #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);
+
Copied: epdfview/trunk/epdfview-0.1.8-swap-the-blue-and-red-channel.patch (from rev 105181, epdfview/trunk/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch)
===================================================================
--- epdfview-0.1.8-swap-the-blue-and-red-channel.patch (rev 0)
+++ epdfview-0.1.8-swap-the-blue-and-red-channel.patch 2014-02-02 12:39:48 UTC (rev 105182)
@@ -0,0 +1,60 @@
+From d30496f52b85f82947bd07b9bd60f8482843ece8 Mon Sep 17 00:00:00 2001
+From: jordi <jordi at cb4bfb15-1111-0410-82e2-95233c8f1c7e>
+Date: Tue, 5 Jul 2011 09:23:38 +0000
+Subject: [PATCH 1/2] When using Poppler 0.17.0, I needed to swap the blue and
+ red channels, otherwise the colors (other than black
+ and white) looked wierd.
+
+git-svn-id: svn://svn.emma-soft.com/epdfview/trunk@367 cb4bfb15-1111-0410-82e2-95233c8f1c7e
+---
+ src/PDFDocument.cxx | 20 ++++++++++++++++++++
+ 1 files changed, 20 insertions(+), 0 deletions(-)
+
+diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx
+index df5d75f..63b3513 100644
+--- a/src/PDFDocument.cxx
++++ b/src/PDFDocument.cxx
+@@ -20,6 +20,7 @@
+ #include <time.h>
+ #include <poppler.h>
+ #include <unistd.h>
++#include <algorithm>
+ #include "epdfview.h"
+
+ using namespace ePDFView;
+@@ -33,6 +34,24 @@ static PageLayout convertPageLayout (gint pageLayout);
+ 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 +669,7 @@ PDFDocument::renderPage (gint pageNum)
+ 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 (),
+--
+1.7.7
+
Deleted: epdfview.desktop.patch
===================================================================
--- epdfview.desktop.patch 2014-02-02 12:05:04 UTC (rev 105181)
+++ epdfview.desktop.patch 2014-02-02 12:39:48 UTC (rev 105182)
@@ -1,11 +0,0 @@
---- data/epdfview.desktop.bak 2009-04-05 16:55:56.000000000 -0700
-+++ data/epdfview.desktop 2009-04-05 16:56:33.000000000 -0700
-@@ -7,7 +7,7 @@
- GenericName=PDF Viewer
- GenericName[ca]=Visor PDF
- GenericName[es]=Visor PDF
--Icon=icon_epdfview-48
-+Icon=epdfview
- Name=ePDFViewer
- Name[ca]=ePDFViewer
- Name[es]=ePDFViewer
Deleted: glib2_headers.patch
===================================================================
--- glib2_headers.patch 2014-02-02 12:05:04 UTC (rev 105181)
+++ glib2_headers.patch 2014-02-02 12:39:48 UTC (rev 105182)
@@ -1,13 +0,0 @@
-diff --git a/src/gtk/StockIcons.h b/src/gtk/StockIcons.h
-index c142a7a..58fcf2e 100644
---- a/src/gtk/StockIcons.h
-+++ b/src/gtk/StockIcons.h
-@@ -18,7 +18,7 @@
- #if !defined (__STOCK_ICONS_H__)
- #define __STOCK_ICONS_H__
-
--#include <glib/gmacros.h>
-+#include <glib.h>
-
- G_BEGIN_DECLS
-
Deleted: printptr.patch
===================================================================
--- printptr.patch 2014-02-02 12:05:04 UTC (rev 105181)
+++ printptr.patch 2014-02-02 12:39:48 UTC (rev 105182)
@@ -1,74 +0,0 @@
-diff -Naur epdfview-0.1.8.orig/src/PrintPter.cxx epdfview-0.1.8/src/PrintPter.cxx
---- epdfview-0.1.8.orig/src/PrintPter.cxx 2011-05-28 11:25:01.000000000 +0100
-+++ epdfview-0.1.8/src/PrintPter.cxx 2012-08-22 20:11:46.362436859 +0100
-@@ -22,6 +22,40 @@
- #include <locale.h>
- #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);
-
More information about the arch-commits
mailing list