From 1b7ec4b18a40ee53e9991cbc65a59d7a1d645944 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 22 Dec 2009 00:00:40 +0100
Subject: [PATCH] epdfview: fix some issues with the icon and scrolling,
 bumprev.

Patches from Arch Linux.

--HG--
extra : convert_revision : cc04222669fc067f213865ea0e587f86d0fd6e9d
---
 .../epdfview/patches/epdfview.desktop.patch   | 11 +++++++
 srcpkgs/epdfview/patches/fix-scrolling.patch  | 33 +++++++++++++++++++
 srcpkgs/epdfview/template                     | 29 ++++++++++++----
 3 files changed, 66 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/epdfview/patches/epdfview.desktop.patch
 create mode 100644 srcpkgs/epdfview/patches/fix-scrolling.patch

diff --git a/srcpkgs/epdfview/patches/epdfview.desktop.patch b/srcpkgs/epdfview/patches/epdfview.desktop.patch
new file mode 100644
index 00000000000..d86fc308830
--- /dev/null
+++ b/srcpkgs/epdfview/patches/epdfview.desktop.patch
@@ -0,0 +1,11 @@
+--- 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
diff --git a/srcpkgs/epdfview/patches/fix-scrolling.patch b/srcpkgs/epdfview/patches/fix-scrolling.patch
new file mode 100644
index 00000000000..828bf12587c
--- /dev/null
+++ b/srcpkgs/epdfview/patches/fix-scrolling.patch
@@ -0,0 +1,33 @@
+--- ./src/gtk/MainView.cxx.old	2009-02-28 22:00:55.000000000 +0100
++++ ./src/gtk/MainView.cxx	2009-03-20 03:12:10.000000000 +0100
+@@ -77,7 +77,7 @@
+ static void main_window_zoom_out_cb (GtkWidget *, gpointer);
+ static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
+ static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer);
+-static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
++static gboolean main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
+ 
+ #if defined (HAVE_CUPS)
+ static void main_window_print_cb (GtkWidget *, gpointer);
+@@ -1479,18 +1479,19 @@
+     pter->setPageMode (mode);
+ }
+ 
+-void 
++gboolean
+ main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data)
+ {
+     g_assert ( NULL != data && "The data parameter is NULL.");
+ 
+     MainPter *pter = (MainPter *)data;
+     // Only zoom when the CTRL-Button is down...
+-    if ( !(event->state & GDK_CONTROL_MASK) ) return;
++    if ( !(event->state & GDK_CONTROL_MASK) ) return FALSE;
+     if ( event->direction == GDK_SCROLL_UP ) {
+         pter->zoomInActivated ();
+     } else if ( event->direction == GDK_SCROLL_DOWN ) {
+         pter->zoomOutActivated ();
+     }
++    return TRUE;
+ }
+ 
diff --git a/srcpkgs/epdfview/template b/srcpkgs/epdfview/template
index 3dcf10bb93c..d3cf335ecd7 100644
--- a/srcpkgs/epdfview/template
+++ b/srcpkgs/epdfview/template
@@ -1,9 +1,8 @@
 # Template build file for 'epdfview'.
 pkgname=epdfview
 version=0.1.7
-revision=2
-distfiles="
-http://trac.emma-soft.com/epdfview/chrome/site/releases/$pkgname-$version.tar.bz2"
+revision=3
+distfiles="http://trac.emma-soft.com/$pkgname/chrome/site/releases/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Lightweight PDF viewer using Poppler and GTK+"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -15,10 +14,26 @@ long_desc="
  The aim of ePDFView is to make a simple PDF document viewer, in the lines
  of Evince but without using the Gnome libraries."
 
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+
 Add_dependency build pkg-config
-Add_dependency full glibc
-Add_dependency full gtk+
-Add_dependency full desktop-file-utils
-Add_dependency build poppler
+Add_dependency build poppler-glib-devel
+Add_dependency build gtk+-devel
+Add_dependency run glibc
+Add_dependency run gtk+
 Add_dependency run poppler-glib
 Add_dependency run libstdc++
+Add_dependency run hicolor-icon-theme
+
+post_install()
+{
+	install -Dm644 ${wrksrc}/data/icon_epdfview-24.png \
+		"${DESTDIR}/usr/share/icons/hicolor/24x24/apps/epdfview.png" \
+		|| return 1
+	install -Dm644 ${wrksrc}/data/icon_epdfview-32.png \
+		"${DESTDIR}/usr/share/icons/hicolor/32x32/apps/epdfview.png" \
+		|| return 1
+	install -Dm644 ${wrksrc}/data/icon_epdfview-48.png \
+		"${DESTDIR}/usr/share/icons/hicolor/48x48/apps/epdfview.png" \
+		|| return 1
+}