[arch-commits] Commit in epdfview/repos (22 files)
Kyle Keen
kkeen at archlinux.org
Tue May 12 02:43:30 UTC 2015
Date: Tuesday, May 12, 2015 @ 04:43:30
Author: kkeen
Revision: 133277
archrelease: copy trunk to community-i686, community-x86_64
Added:
epdfview/repos/community-i686/PKGBUILD
(from rev 133276, epdfview/trunk/PKGBUILD)
epdfview/repos/community-i686/epdfview-0.1.8-glib2-headers.patch
(from rev 133276, epdfview/trunk/epdfview-0.1.8-glib2-headers.patch)
epdfview/repos/community-i686/epdfview-0.1.8-modern-cups.patch
(from rev 133276, epdfview/trunk/epdfview-0.1.8-modern-cups.patch)
epdfview/repos/community-i686/epdfview-0.1.8-pictures.patch
(from rev 133276, epdfview/trunk/epdfview-0.1.8-pictures.patch)
epdfview/repos/community-i686/epdfview-0.1.8-swap-the-blue-and-red-channel.patch
(from rev 133276, epdfview/trunk/epdfview-0.1.8-swap-the-blue-and-red-channel.patch)
epdfview/repos/community-i686/epdfview.install
(from rev 133276, epdfview/trunk/epdfview.install)
epdfview/repos/community-x86_64/PKGBUILD
(from rev 133276, epdfview/trunk/PKGBUILD)
epdfview/repos/community-x86_64/epdfview-0.1.8-glib2-headers.patch
(from rev 133276, epdfview/trunk/epdfview-0.1.8-glib2-headers.patch)
epdfview/repos/community-x86_64/epdfview-0.1.8-modern-cups.patch
(from rev 133276, epdfview/trunk/epdfview-0.1.8-modern-cups.patch)
epdfview/repos/community-x86_64/epdfview-0.1.8-pictures.patch
(from rev 133276, epdfview/trunk/epdfview-0.1.8-pictures.patch)
epdfview/repos/community-x86_64/epdfview-0.1.8-swap-the-blue-and-red-channel.patch
(from rev 133276, epdfview/trunk/epdfview-0.1.8-swap-the-blue-and-red-channel.patch)
epdfview/repos/community-x86_64/epdfview.install
(from rev 133276, epdfview/trunk/epdfview.install)
Deleted:
epdfview/repos/community-i686/PKGBUILD
epdfview/repos/community-i686/epdfview-0.1.8-glib2-headers.patch
epdfview/repos/community-i686/epdfview-0.1.8-modern-cups.patch
epdfview/repos/community-i686/epdfview-0.1.8-swap-the-blue-and-red-channel.patch
epdfview/repos/community-i686/epdfview.install
epdfview/repos/community-x86_64/PKGBUILD
epdfview/repos/community-x86_64/epdfview-0.1.8-glib2-headers.patch
epdfview/repos/community-x86_64/epdfview-0.1.8-modern-cups.patch
epdfview/repos/community-x86_64/epdfview-0.1.8-swap-the-blue-and-red-channel.patch
epdfview/repos/community-x86_64/epdfview.install
---------------------------------------------------------------------+
/PKGBUILD | 106 +++++++
/epdfview-0.1.8-glib2-headers.patch | 26 +
/epdfview-0.1.8-modern-cups.patch | 148 ++++++++++
/epdfview-0.1.8-swap-the-blue-and-red-channel.patch | 120 ++++++++
/epdfview.install | 24 +
community-i686/PKGBUILD | 50 ---
community-i686/epdfview-0.1.8-glib2-headers.patch | 13
community-i686/epdfview-0.1.8-modern-cups.patch | 74 -----
community-i686/epdfview-0.1.8-pictures.patch | 13
community-i686/epdfview-0.1.8-swap-the-blue-and-red-channel.patch | 60 ----
community-i686/epdfview.install | 12
community-x86_64/PKGBUILD | 50 ---
community-x86_64/epdfview-0.1.8-glib2-headers.patch | 13
community-x86_64/epdfview-0.1.8-modern-cups.patch | 74 -----
community-x86_64/epdfview-0.1.8-pictures.patch | 13
community-x86_64/epdfview-0.1.8-swap-the-blue-and-red-channel.patch | 60 ----
community-x86_64/epdfview.install | 12
17 files changed, 450 insertions(+), 418 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-05-12 02:42:33 UTC (rev 133276)
+++ community-i686/PKGBUILD 2015-05-12 02:43:30 UTC (rev 133277)
@@ -1,50 +0,0 @@
-# $Id$
-# 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=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
-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')
-
-prepare() {
- cd $pkgname-$pkgver
- sed -i 's/icon_epdfview-48/epdfview/' data/epdfview.desktop
-
- 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 $pkgname-$pkgver
- 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
- done
-}
Copied: epdfview/repos/community-i686/PKGBUILD (from rev 133276, epdfview/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-05-12 02:43:30 UTC (rev 133277)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# 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=6
+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
+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
+ epdfview-0.1.8-pictures.patch)
+md5sums=('e50285b01612169b2594fea375f53ae4'
+ '7f9ea101a41f5b4e999fd024f423d41f'
+ '2fffa9c7cd4c5f0744803591c2f162a3'
+ '5c2cf5612d2a7dfe6cf005b94aeb5ada'
+ '60064c976f273d86d6254c71b583cf4d')
+
+prepare() {
+ cd $pkgname-$pkgver
+ sed -i 's/icon_epdfview-48/epdfview/' data/epdfview.desktop
+
+ 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
+ patch -p1 -i ../epdfview-0.1.8-pictures.patch # FS#44936
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ 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
+ done
+}
Deleted: community-i686/epdfview-0.1.8-glib2-headers.patch
===================================================================
--- community-i686/epdfview-0.1.8-glib2-headers.patch 2015-05-12 02:42:33 UTC (rev 133276)
+++ community-i686/epdfview-0.1.8-glib2-headers.patch 2015-05-12 02:43:30 UTC (rev 133277)
@@ -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
-
Copied: epdfview/repos/community-i686/epdfview-0.1.8-glib2-headers.patch (from rev 133276, epdfview/trunk/epdfview-0.1.8-glib2-headers.patch)
===================================================================
--- community-i686/epdfview-0.1.8-glib2-headers.patch (rev 0)
+++ community-i686/epdfview-0.1.8-glib2-headers.patch 2015-05-12 02:43:30 UTC (rev 133277)
@@ -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
+
Deleted: community-i686/epdfview-0.1.8-modern-cups.patch
===================================================================
--- community-i686/epdfview-0.1.8-modern-cups.patch 2015-05-12 02:42:33 UTC (rev 133276)
+++ community-i686/epdfview-0.1.8-modern-cups.patch 2015-05-12 02:43:30 UTC (rev 133277)
@@ -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);
-
Copied: epdfview/repos/community-i686/epdfview-0.1.8-modern-cups.patch (from rev 133276, epdfview/trunk/epdfview-0.1.8-modern-cups.patch)
===================================================================
--- community-i686/epdfview-0.1.8-modern-cups.patch (rev 0)
+++ community-i686/epdfview-0.1.8-modern-cups.patch 2015-05-12 02:43:30 UTC (rev 133277)
@@ -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/repos/community-i686/epdfview-0.1.8-pictures.patch (from rev 133276, epdfview/trunk/epdfview-0.1.8-pictures.patch)
===================================================================
--- community-i686/epdfview-0.1.8-pictures.patch (rev 0)
+++ community-i686/epdfview-0.1.8-pictures.patch 2015-05-12 02:43:30 UTC (rev 133277)
@@ -0,0 +1,13 @@
+diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx
+index df5d75f..782f806 100644
+--- a/src/PDFDocument.cxx
++++ b/src/PDFDocument.cxx
+@@ -616,7 +616,7 @@ PDFDocument::renderPage (gint pageNum)
+ #if defined (HAVE_POPPLER_0_17_0)
+ cairo_surface_t *surface = cairo_image_surface_create_for_data (
+ renderedPage->getData (),
+- CAIRO_FORMAT_RGB24, width, height,
++ CAIRO_FORMAT_ARGB32, width, height,
+ renderedPage->getRowStride ());
+ cairo_t *context = cairo_create (surface);
+ cairo_save(context);
Deleted: community-i686/epdfview-0.1.8-swap-the-blue-and-red-channel.patch
===================================================================
--- community-i686/epdfview-0.1.8-swap-the-blue-and-red-channel.patch 2015-05-12 02:42:33 UTC (rev 133276)
+++ community-i686/epdfview-0.1.8-swap-the-blue-and-red-channel.patch 2015-05-12 02:43:30 UTC (rev 133277)
@@ -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
-
Copied: epdfview/repos/community-i686/epdfview-0.1.8-swap-the-blue-and-red-channel.patch (from rev 133276, epdfview/trunk/epdfview-0.1.8-swap-the-blue-and-red-channel.patch)
===================================================================
--- community-i686/epdfview-0.1.8-swap-the-blue-and-red-channel.patch (rev 0)
+++ community-i686/epdfview-0.1.8-swap-the-blue-and-red-channel.patch 2015-05-12 02:43:30 UTC (rev 133277)
@@ -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: community-i686/epdfview.install
===================================================================
--- community-i686/epdfview.install 2015-05-12 02:42:33 UTC (rev 133276)
+++ community-i686/epdfview.install 2015-05-12 02:43:30 UTC (rev 133277)
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: epdfview/repos/community-i686/epdfview.install (from rev 133276, epdfview/trunk/epdfview.install)
===================================================================
--- community-i686/epdfview.install (rev 0)
+++ community-i686/epdfview.install 2015-05-12 02:43:30 UTC (rev 133277)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-05-12 02:42:33 UTC (rev 133276)
+++ community-x86_64/PKGBUILD 2015-05-12 02:43:30 UTC (rev 133277)
@@ -1,50 +0,0 @@
-# $Id$
-# 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=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
-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')
-
-prepare() {
- cd $pkgname-$pkgver
- sed -i 's/icon_epdfview-48/epdfview/' data/epdfview.desktop
-
- 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 $pkgname-$pkgver
- 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
- done
-}
Copied: epdfview/repos/community-x86_64/PKGBUILD (from rev 133276, epdfview/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-05-12 02:43:30 UTC (rev 133277)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# 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=6
+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
+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
+ epdfview-0.1.8-pictures.patch)
+md5sums=('e50285b01612169b2594fea375f53ae4'
+ '7f9ea101a41f5b4e999fd024f423d41f'
+ '2fffa9c7cd4c5f0744803591c2f162a3'
+ '5c2cf5612d2a7dfe6cf005b94aeb5ada'
+ '60064c976f273d86d6254c71b583cf4d')
+
+prepare() {
+ cd $pkgname-$pkgver
+ sed -i 's/icon_epdfview-48/epdfview/' data/epdfview.desktop
+
+ 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
+ patch -p1 -i ../epdfview-0.1.8-pictures.patch # FS#44936
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ 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
+ done
+}
Deleted: community-x86_64/epdfview-0.1.8-glib2-headers.patch
===================================================================
--- community-x86_64/epdfview-0.1.8-glib2-headers.patch 2015-05-12 02:42:33 UTC (rev 133276)
+++ community-x86_64/epdfview-0.1.8-glib2-headers.patch 2015-05-12 02:43:30 UTC (rev 133277)
@@ -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
-
Copied: epdfview/repos/community-x86_64/epdfview-0.1.8-glib2-headers.patch (from rev 133276, epdfview/trunk/epdfview-0.1.8-glib2-headers.patch)
===================================================================
--- community-x86_64/epdfview-0.1.8-glib2-headers.patch (rev 0)
+++ community-x86_64/epdfview-0.1.8-glib2-headers.patch 2015-05-12 02:43:30 UTC (rev 133277)
@@ -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
+
Deleted: community-x86_64/epdfview-0.1.8-modern-cups.patch
===================================================================
--- community-x86_64/epdfview-0.1.8-modern-cups.patch 2015-05-12 02:42:33 UTC (rev 133276)
+++ community-x86_64/epdfview-0.1.8-modern-cups.patch 2015-05-12 02:43:30 UTC (rev 133277)
@@ -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);
-
Copied: epdfview/repos/community-x86_64/epdfview-0.1.8-modern-cups.patch (from rev 133276, epdfview/trunk/epdfview-0.1.8-modern-cups.patch)
===================================================================
--- community-x86_64/epdfview-0.1.8-modern-cups.patch (rev 0)
+++ community-x86_64/epdfview-0.1.8-modern-cups.patch 2015-05-12 02:43:30 UTC (rev 133277)
@@ -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/repos/community-x86_64/epdfview-0.1.8-pictures.patch (from rev 133276, epdfview/trunk/epdfview-0.1.8-pictures.patch)
===================================================================
--- community-x86_64/epdfview-0.1.8-pictures.patch (rev 0)
+++ community-x86_64/epdfview-0.1.8-pictures.patch 2015-05-12 02:43:30 UTC (rev 133277)
@@ -0,0 +1,13 @@
+diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx
+index df5d75f..782f806 100644
+--- a/src/PDFDocument.cxx
++++ b/src/PDFDocument.cxx
+@@ -616,7 +616,7 @@ PDFDocument::renderPage (gint pageNum)
+ #if defined (HAVE_POPPLER_0_17_0)
+ cairo_surface_t *surface = cairo_image_surface_create_for_data (
+ renderedPage->getData (),
+- CAIRO_FORMAT_RGB24, width, height,
++ CAIRO_FORMAT_ARGB32, width, height,
+ renderedPage->getRowStride ());
+ cairo_t *context = cairo_create (surface);
+ cairo_save(context);
Deleted: community-x86_64/epdfview-0.1.8-swap-the-blue-and-red-channel.patch
===================================================================
--- community-x86_64/epdfview-0.1.8-swap-the-blue-and-red-channel.patch 2015-05-12 02:42:33 UTC (rev 133276)
+++ community-x86_64/epdfview-0.1.8-swap-the-blue-and-red-channel.patch 2015-05-12 02:43:30 UTC (rev 133277)
@@ -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
-
Copied: epdfview/repos/community-x86_64/epdfview-0.1.8-swap-the-blue-and-red-channel.patch (from rev 133276, epdfview/trunk/epdfview-0.1.8-swap-the-blue-and-red-channel.patch)
===================================================================
--- community-x86_64/epdfview-0.1.8-swap-the-blue-and-red-channel.patch (rev 0)
+++ community-x86_64/epdfview-0.1.8-swap-the-blue-and-red-channel.patch 2015-05-12 02:43:30 UTC (rev 133277)
@@ -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: community-x86_64/epdfview.install
===================================================================
--- community-x86_64/epdfview.install 2015-05-12 02:42:33 UTC (rev 133276)
+++ community-x86_64/epdfview.install 2015-05-12 02:43:30 UTC (rev 133277)
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: epdfview/repos/community-x86_64/epdfview.install (from rev 133276, epdfview/trunk/epdfview.install)
===================================================================
--- community-x86_64/epdfview.install (rev 0)
+++ community-x86_64/epdfview.install 2015-05-12 02:43:30 UTC (rev 133277)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list