merged x11 repository into main

ref #255

3 files changed, 84 insertions, 0 deletions

diff --git a/main/epdfview/APKBUILD b/main/epdfview/APKBUILD
new file mode 100644
index 000000000..fdd6e4186
--- /dev/null
+++ b/main/epdfview/APKBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=epdfview
+pkgver=0.1.7
+pkgrel=1
+pkgdesc="A free lightweight PDF document viewer."
+url="http://www.emma-soft.com/projects/epdfview/"
+license="GPL"
+#depends="poppler-glib>=0.10.0 heimdal>=1.2.1-1 libcups>=1.3.7-2 gnutls>=2.4.1 
+depends="desktop-file-utils hicolor-icon-theme"
+makedepends="poppler-gtk-dev"
+source="http://www.emma-soft.com/projects/$pkgname/chrome/site/releases/$pkgname-$pkgver.tar.bz2
+	$pkgname.desktop.patch
+	fix-scrolling.patch"
+
+build ()
+{
+	cd ""$srcdir"/$pkgname-$pkgver"
+	patch -Np0 -i ../epdfview.desktop.patch || return 1
+	patch -Np0 -i ../fix-scrolling.patch || return 1
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		|| return 1
+	make || return 1
+	make -j1 DESTDIR="$pkgdir" install || return 1
+	for i in 24 32 48; do
+		install -d "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps \
+			|| return 1
+	done
+	install -m644 data/icon_epdfview-24.png \
+		"$pkgdir"/usr/share/icons/hicolor/24x24/apps/epdfview.png
+	install -m644 data/icon_epdfview-32.png \
+		"$pkgdir"/usr/share/icons/hicolor/32x32/apps/epdfview.png
+	install -m644 data/icon_epdfview-48.png \
+		"$pkgdir"/usr/share/icons/hicolor/48x48/apps/epdfview.png
+}
+
+md5sums="1919bb19c16ef0a97d48b0a8303d3c7b  epdfview-0.1.7.tar.bz2
+fbf22bbabdbb7544db615ac5775d57e2  epdfview.desktop.patch
+7a1574e0a8d0bcde316050629fb7bedd  fix-scrolling.patch"
diff --git a/main/epdfview/epdfview.desktop.patch b/main/epdfview/epdfview.desktop.patch
new file mode 100644
index 000000000..d86fc3088
--- /dev/null
+++ b/main/epdfview/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/main/epdfview/fix-scrolling.patch b/main/epdfview/fix-scrolling.patch
new file mode 100644
index 000000000..828bf1258
--- /dev/null
+++ b/main/epdfview/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;
+ }
+