summaryrefslogtreecommitdiff
path: root/libre/mcomix-libre
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2014-03-15 06:54:11 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2014-03-15 06:54:11 -0300
commit57cf5c66d9925260929ed385a10d09bc8bd87fc3 (patch)
tree4e01a8926211868c5efe45027f8bdc19cb85c331 /libre/mcomix-libre
parent2b813b90d639d9072233cd039f3d9b92d4070cfb (diff)
parentb483ba7f74a833c79fe2d449b06099cc163c9e8a (diff)
downloadabslibre-57cf5c66d9925260929ed385a10d09bc8bd87fc3.tar.gz
abslibre-57cf5c66d9925260929ed385a10d09bc8bd87fc3.tar.bz2
abslibre-57cf5c66d9925260929ed385a10d09bc8bd87fc3.zip
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/mcomix-libre')
-rw-r--r--libre/mcomix-libre/PKGBUILD14
-rw-r--r--libre/mcomix-libre/mcomix.install1
-rw-r--r--libre/mcomix-libre/zoom.patch17
3 files changed, 28 insertions, 4 deletions
diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD
index 78104354f..97c3bde0f 100644
--- a/libre/mcomix-libre/PKGBUILD
+++ b/libre/mcomix-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97188 2013-09-15 08:42:21Z schuay $
+# $Id: PKGBUILD 106934 2014-03-10 18:30:38Z schuay $
# Maintainer: schuay <jakob.gruber@gmail.com>
# Contributor: Ray Powell <ray_al@xphoniexx.net>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -6,7 +6,7 @@
_pkgname=mcomix
pkgname=mcomix-libre
pkgver=1.00
-pkgrel=5.1
+pkgrel=6
pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, without nonfree unrar recommendation"
arch=('any')
url="http://sourceforge.net/projects/mcomix/"
@@ -18,7 +18,8 @@ conflicts=('mcomix' 'comix')
replaces=('mcomix' 'comix')
provides=("mcomix=${pkgver}")
install='mcomix.install'
-source=("http://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2")
+source=("http://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2"
+ 'zoom.patch')
build() {
cd ${srcdir}/${_pkgname}-${pkgver}
@@ -31,6 +32,10 @@ build() {
do
sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
done
+
+ # Fix zoom in, zoom out keyboard shortcuts:
+ # https://sourceforge.net/p/mcomix/bugs/62/
+ patch -Np1 < ${srcdir}/zoom.patch
}
package() {
@@ -47,4 +52,5 @@ package() {
install -Dm644 mime/comicbook.schemas ${pkgdir}/usr/share/gconf/schemas/mcomix.schemas
}
-md5sums=('3a916dd9da17043ab59ccd17e26eb932')
+md5sums=('3a916dd9da17043ab59ccd17e26eb932'
+ 'c80705bf6f132bfba20dcb84b79c9cb7')
diff --git a/libre/mcomix-libre/mcomix.install b/libre/mcomix-libre/mcomix.install
index c33c1d5a1..82047a202 100644
--- a/libre/mcomix-libre/mcomix.install
+++ b/libre/mcomix-libre/mcomix.install
@@ -14,6 +14,7 @@ pre_upgrade() {
}
post_upgrade() {
+ echo 'In case of any issues with zoom keybindings, delete ~/.config/mcomix/keybindings.conf.'
post_install $1
}
diff --git a/libre/mcomix-libre/zoom.patch b/libre/mcomix-libre/zoom.patch
new file mode 100644
index 000000000..26dc3ba6f
--- /dev/null
+++ b/libre/mcomix-libre/zoom.patch
@@ -0,0 +1,17 @@
+diff --git a/mcomix-1.00/mcomix/event.py b/mcomix-1.00-mod/mcomix/event.py
+index bc8cf79..bf80ec2 100644
+--- a/mcomix/event.py
++++ b/mcomix/event.py
+@@ -117,8 +117,11 @@ class EventHandler:
+
+ # Zooming commands for manual zoom mode
+ manager.register('zoom in',
+- ['equal'],
++ ['plus', 'KP_Add', 'equal'],
+ self._window.actiongroup.get_action('zoom_in').activate)
++ manager.register('zoom out',
++ ['minus', 'KP_Subtract'],
++ self._window.actiongroup.get_action('zoom_out').activate)
+ # Zoom out is already defined as GTK menu hotkey
+ manager.register('zoom original',
+ ['KP_0'],