Wed Mar 12 03:36:36 UTC 2014

4 files changed, 33 insertions, 6 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'],
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index 5a2df28db..5b2df88cd 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -12,8 +12,8 @@ _pkgname=xbmc
 pkgname=xbmc-libre
 pkgver=12.3
 _codename=Frodo
-pkgrel=11
-pkgdesc="A software media player and entertainment hub for digital media, without unrar support"
+pkgrel=11.1
+pkgdesc="A software media player and entertainment hub for digital media, without nonfree addons and unrar support"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
 license=('GPL' 'custom')
@@ -60,6 +60,9 @@ prepare() {
   # fix lsb_release dependency
   sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
   sed -i -e 's:#include <libsmbclient.h>:#include <samba-4.0/libsmbclient.h>:' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp
+
+  # use addons.xml from Parabola server (without nonfree addons support)
+  sed -i -e 's|mirrors[.]xbmc[.]org/addons/frodo/addons.xml|repo.parabolagnulinux.org/other/xbmc-libre/addons/frodo/addons.xml|' addons/repository.xbmc.org/addon.xml
 }
 
 build() {