[arch-commits] Commit in mcomix/repos/community-any (5 files)
Jakob Gruber
schuay at nymeria.archlinux.org
Mon Mar 10 18:30:49 UTC 2014
Date: Monday, March 10, 2014 @ 19:30:49
Author: schuay
Revision: 106935
archrelease: copy trunk to community-any
Added:
mcomix/repos/community-any/PKGBUILD
(from rev 106934, mcomix/trunk/PKGBUILD)
mcomix/repos/community-any/mcomix.install
(from rev 106934, mcomix/trunk/mcomix.install)
mcomix/repos/community-any/zoom.patch
(from rev 106934, mcomix/trunk/zoom.patch)
Deleted:
mcomix/repos/community-any/PKGBUILD
mcomix/repos/community-any/mcomix.install
----------------+
PKGBUILD | 102 +++++++++++++++++++++++++++++--------------------------
mcomix.install | 61 ++++++++++++++++----------------
zoom.patch | 17 +++++++++
3 files changed, 102 insertions(+), 78 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-03-10 18:30:38 UTC (rev 106934)
+++ PKGBUILD 2014-03-10 18:30:49 UTC (rev 106935)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: schuay <jakob.gruber at gmail.com>
-# Contributor: Ray Powell <ray_al at xphoniexx.net>
-
-pkgname=mcomix
-pkgver=1.00
-pkgrel=5
-pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books"
-arch=('any')
-url="http://sourceforge.net/projects/mcomix/"
-license=('GPL')
-depends=('pygtk' 'python2-pillow' 'xdg-utils' 'python2' \
- 'desktop-file-utils' 'hicolor-icon-theme' 'python2-setuptools')
-makedepends=('gettext' 'intltool')
-optdepends=('unrar: for rar compressed comics')
-conflicts=('comix')
-replaces=('comix')
-install='mcomix.install'
-source=("http://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2")
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # https://www.archlinux.org/todo/replace-pil-with-pillow/
- sed -i 's/import Image/from PIL import Image/' mime/comicthumb
-
- # python2 fix
- for file in $(grep -Rl "/usr/bin/env python" .);
- do
- sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
- done
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- export PYTHONPATH=${pkgdir}/usr/lib/python2.7/site-packages/
- mkdir -p $PYTHONPATH
-
- python2 setup.py install --prefix=/usr --optimize=1 \
- --single-version-externally-managed --root=${pkgdir}
-
- install -Dm755 mime/comicthumb ${pkgdir}/usr/bin/comicthumb
- install -Dm644 mime/comicthumb.1.gz ${pkgdir}/usr/share/man/man1/comicthumb.1.gz
- install -Dm644 mime/comicbook.schemas ${pkgdir}/usr/share/gconf/schemas/mcomix.schemas
-}
-
-md5sums=('3a916dd9da17043ab59ccd17e26eb932')
Copied: mcomix/repos/community-any/PKGBUILD (from rev 106934, mcomix/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-03-10 18:30:49 UTC (rev 106935)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: schuay <jakob.gruber at gmail.com>
+# Contributor: Ray Powell <ray_al at xphoniexx.net>
+
+pkgname=mcomix
+pkgver=1.00
+pkgrel=6
+pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books"
+arch=('any')
+url="http://sourceforge.net/projects/mcomix/"
+license=('GPL')
+depends=('pygtk' 'python2-pillow' 'xdg-utils' 'python2' \
+ 'desktop-file-utils' 'hicolor-icon-theme' 'python2-setuptools')
+makedepends=('gettext' 'intltool')
+optdepends=('unrar: for rar compressed comics')
+conflicts=('comix')
+replaces=('comix')
+install='mcomix.install'
+source=("http://downloads.sourceforge.net/project/mcomix/MComix-${pkgver}/mcomix-${pkgver}.tar.bz2"
+ 'zoom.patch')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ # https://www.archlinux.org/todo/replace-pil-with-pillow/
+ sed -i 's/import Image/from PIL import Image/' mime/comicthumb
+
+ # python2 fix
+ for file in $(grep -Rl "/usr/bin/env python" .);
+ 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() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ export PYTHONPATH=${pkgdir}/usr/lib/python2.7/site-packages/
+ mkdir -p $PYTHONPATH
+
+ python2 setup.py install --prefix=/usr --optimize=1 \
+ --single-version-externally-managed --root=${pkgdir}
+
+ install -Dm755 mime/comicthumb ${pkgdir}/usr/bin/comicthumb
+ install -Dm644 mime/comicthumb.1.gz ${pkgdir}/usr/share/man/man1/comicthumb.1.gz
+ install -Dm644 mime/comicbook.schemas ${pkgdir}/usr/share/gconf/schemas/mcomix.schemas
+}
+
+md5sums=('3a916dd9da17043ab59ccd17e26eb932'
+ 'c80705bf6f132bfba20dcb84b79c9cb7')
Deleted: mcomix.install
===================================================================
--- mcomix.install 2014-03-10 18:30:38 UTC (rev 106934)
+++ mcomix.install 2014-03-10 18:30:49 UTC (rev 106935)
@@ -1,30 +0,0 @@
-pkgname=mcomix
-
-post_install() {
- if [ -f usr/sbin/gconfpkg ]; then
- usr/sbin/gconfpkg --install ${pkgname} &> /dev/null
- fi
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
- update-mime-database usr/share/mime &> /dev/null
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- if [ -f usr/sbin/gconfpkg ]; then
- usr/sbin/gconfpkg --uninstall ${pkgname} &> /dev/null
- fi
-}
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
- update-mime-database usr/share/mime &> /dev/null
-}
Copied: mcomix/repos/community-any/mcomix.install (from rev 106934, mcomix/trunk/mcomix.install)
===================================================================
--- mcomix.install (rev 0)
+++ mcomix.install 2014-03-10 18:30:49 UTC (rev 106935)
@@ -0,0 +1,31 @@
+pkgname=mcomix
+
+post_install() {
+ if [ -f usr/sbin/gconfpkg ]; then
+ usr/sbin/gconfpkg --install ${pkgname} &> /dev/null
+ fi
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ echo 'In case of any issues with zoom keybindings, delete ~/.config/mcomix/keybindings.conf.'
+ post_install $1
+}
+
+pre_remove() {
+ if [ -f usr/sbin/gconfpkg ]; then
+ usr/sbin/gconfpkg --uninstall ${pkgname} &> /dev/null
+ fi
+}
+
+post_remove() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+ update-mime-database usr/share/mime &> /dev/null
+}
Copied: mcomix/repos/community-any/zoom.patch (from rev 106934, mcomix/trunk/zoom.patch)
===================================================================
--- zoom.patch (rev 0)
+++ zoom.patch 2014-03-10 18:30:49 UTC (rev 106935)
@@ -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'],
More information about the arch-commits
mailing list