[arch-commits] Commit in mirage/repos (10 files)
Evangelos Foutras
foutrelis at archlinux.org
Thu Oct 9 16:54:08 UTC 2014
Date: Thursday, October 9, 2014 @ 18:54:08
Author: foutrelis
Revision: 224155
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
mirage/repos/extra-i686/PKGBUILD
(from rev 224154, mirage/trunk/PKGBUILD)
mirage/repos/extra-i686/mirage-0.9.5.2-glib241-init-workaround.patch
(from rev 224154, mirage/trunk/mirage-0.9.5.2-glib241-init-workaround.patch)
mirage/repos/extra-i686/mirage.install
(from rev 224154, mirage/trunk/mirage.install)
mirage/repos/extra-x86_64/PKGBUILD
(from rev 224154, mirage/trunk/PKGBUILD)
mirage/repos/extra-x86_64/mirage-0.9.5.2-glib241-init-workaround.patch
(from rev 224154, mirage/trunk/mirage-0.9.5.2-glib241-init-workaround.patch)
mirage/repos/extra-x86_64/mirage.install
(from rev 224154, mirage/trunk/mirage.install)
Deleted:
mirage/repos/extra-i686/PKGBUILD
mirage/repos/extra-i686/mirage.install
mirage/repos/extra-x86_64/PKGBUILD
mirage/repos/extra-x86_64/mirage.install
-----------------------------------------------------------+
/PKGBUILD | 68 ++++++++++++
/mirage.install | 22 +++
extra-i686/PKGBUILD | 24 ----
extra-i686/mirage-0.9.5.2-glib241-init-workaround.patch | 13 ++
extra-i686/mirage.install | 11 -
extra-x86_64/PKGBUILD | 24 ----
extra-x86_64/mirage-0.9.5.2-glib241-init-workaround.patch | 13 ++
extra-x86_64/mirage.install | 11 -
8 files changed, 116 insertions(+), 70 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-10-09 16:53:47 UTC (rev 224154)
+++ extra-i686/PKGBUILD 2014-10-09 16:54:08 UTC (rev 224155)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru at archlinux.org>
-# Contributor: James Rayner <james at archlinux.org>
-# Contributor: Scott Horowitz <stonecrest at gmail.com>
-pkgname=mirage
-pkgver=0.9.5.2
-pkgrel=2
-pkgdesc="A simple GTK+ Image Viewer"
-url="http://mirageiv.berlios.de"
-license=("GPL")
-depends=('pygtk' 'desktop-file-utils')
-arch=('i686' 'x86_64')
-md5sums=('92191a4496b0a50486ed7299baf6729f')
-source=("http://pkgs.fedoraproject.org/repo/pkgs/mirage/mirage-$pkgver.tar.bz2/$md5sums/mirage-$pkgver.tar.bz2")
-install=$pkgname.install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- python2 setup.py build
-}
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- python2 setup.py install --root="${pkgdir}"
-}
Copied: mirage/repos/extra-i686/PKGBUILD (from rev 224154, mirage/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-10-09 16:54:08 UTC (rev 224155)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru at archlinux.org>
+# Contributor: James Rayner <james at archlinux.org>
+# Contributor: Scott Horowitz <stonecrest at gmail.com>
+pkgname=mirage
+pkgver=0.9.5.2
+pkgrel=3
+pkgdesc="A simple GTK+ Image Viewer"
+url="https://sourceforge.net/projects/mirageiv.berlios/"
+license=("GPL")
+depends=('pygtk' 'desktop-file-utils')
+arch=('i686' 'x86_64')
+md5sums=('92191a4496b0a50486ed7299baf6729f'
+ '1315594c262c23079e46d0b6a9896bfd')
+source=(http://downloads.sourceforge.net/project/mirageiv.berlios/${pkgname}-${pkgver}.tar.bz2
+ mirage-0.9.5.2-glib241-init-workaround.patch)
+install=$pkgname.install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # Don't call gtk.gdk.threads_init() on GLib >= 2.41 (patch from Fedora)
+ # https://bugs.archlinux.org/task/42189
+ patch -Np1 -i ../mirage-0.9.5.2-glib241-init-workaround.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ python2 setup.py build
+}
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ python2 setup.py install --root="${pkgdir}"
+}
Copied: mirage/repos/extra-i686/mirage-0.9.5.2-glib241-init-workaround.patch (from rev 224154, mirage/trunk/mirage-0.9.5.2-glib241-init-workaround.patch)
===================================================================
--- extra-i686/mirage-0.9.5.2-glib241-init-workaround.patch (rev 0)
+++ extra-i686/mirage-0.9.5.2-glib241-init-workaround.patch 2014-10-09 16:54:08 UTC (rev 224155)
@@ -0,0 +1,13 @@
+--- mirage-0.9.5.2/mirage.py.glib241 2014-08-12 17:55:57.000000000 +0900
++++ mirage-0.9.5.2/mirage.py 2014-08-12 17:52:18.000000000 +0900
+@@ -71,7 +71,9 @@
+
+ def __init__(self):
+
+- gtk.gdk.threads_init()
++ import glib
++ if glib.glib_version < (2, 41, 0):
++ gtk.gdk.threads_init()
+
+ # FIX THIS! Does not work on windows and what happens if mo-files exists
+ # in both dirs?
Deleted: extra-i686/mirage.install
===================================================================
--- extra-i686/mirage.install 2014-10-09 16:53:47 UTC (rev 224154)
+++ extra-i686/mirage.install 2014-10-09 16:54:08 UTC (rev 224155)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- update-desktop-database -q
-}
-
-post_remove() {
- update-desktop-database -q
-}
Copied: mirage/repos/extra-i686/mirage.install (from rev 224154, mirage/trunk/mirage.install)
===================================================================
--- extra-i686/mirage.install (rev 0)
+++ extra-i686/mirage.install 2014-10-09 16:54:08 UTC (rev 224155)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ update-desktop-database -q
+}
+
+post_remove() {
+ update-desktop-database -q
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-10-09 16:53:47 UTC (rev 224154)
+++ extra-x86_64/PKGBUILD 2014-10-09 16:54:08 UTC (rev 224155)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru at archlinux.org>
-# Contributor: James Rayner <james at archlinux.org>
-# Contributor: Scott Horowitz <stonecrest at gmail.com>
-pkgname=mirage
-pkgver=0.9.5.2
-pkgrel=2
-pkgdesc="A simple GTK+ Image Viewer"
-url="http://mirageiv.berlios.de"
-license=("GPL")
-depends=('pygtk' 'desktop-file-utils')
-arch=('i686' 'x86_64')
-md5sums=('92191a4496b0a50486ed7299baf6729f')
-source=("http://pkgs.fedoraproject.org/repo/pkgs/mirage/mirage-$pkgver.tar.bz2/$md5sums/mirage-$pkgver.tar.bz2")
-install=$pkgname.install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- python2 setup.py build
-}
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- python2 setup.py install --root="${pkgdir}"
-}
Copied: mirage/repos/extra-x86_64/PKGBUILD (from rev 224154, mirage/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-10-09 16:54:08 UTC (rev 224155)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru at archlinux.org>
+# Contributor: James Rayner <james at archlinux.org>
+# Contributor: Scott Horowitz <stonecrest at gmail.com>
+pkgname=mirage
+pkgver=0.9.5.2
+pkgrel=3
+pkgdesc="A simple GTK+ Image Viewer"
+url="https://sourceforge.net/projects/mirageiv.berlios/"
+license=("GPL")
+depends=('pygtk' 'desktop-file-utils')
+arch=('i686' 'x86_64')
+md5sums=('92191a4496b0a50486ed7299baf6729f'
+ '1315594c262c23079e46d0b6a9896bfd')
+source=(http://downloads.sourceforge.net/project/mirageiv.berlios/${pkgname}-${pkgver}.tar.bz2
+ mirage-0.9.5.2-glib241-init-workaround.patch)
+install=$pkgname.install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # Don't call gtk.gdk.threads_init() on GLib >= 2.41 (patch from Fedora)
+ # https://bugs.archlinux.org/task/42189
+ patch -Np1 -i ../mirage-0.9.5.2-glib241-init-workaround.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ python2 setup.py build
+}
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ python2 setup.py install --root="${pkgdir}"
+}
Copied: mirage/repos/extra-x86_64/mirage-0.9.5.2-glib241-init-workaround.patch (from rev 224154, mirage/trunk/mirage-0.9.5.2-glib241-init-workaround.patch)
===================================================================
--- extra-x86_64/mirage-0.9.5.2-glib241-init-workaround.patch (rev 0)
+++ extra-x86_64/mirage-0.9.5.2-glib241-init-workaround.patch 2014-10-09 16:54:08 UTC (rev 224155)
@@ -0,0 +1,13 @@
+--- mirage-0.9.5.2/mirage.py.glib241 2014-08-12 17:55:57.000000000 +0900
++++ mirage-0.9.5.2/mirage.py 2014-08-12 17:52:18.000000000 +0900
+@@ -71,7 +71,9 @@
+
+ def __init__(self):
+
+- gtk.gdk.threads_init()
++ import glib
++ if glib.glib_version < (2, 41, 0):
++ gtk.gdk.threads_init()
+
+ # FIX THIS! Does not work on windows and what happens if mo-files exists
+ # in both dirs?
Deleted: extra-x86_64/mirage.install
===================================================================
--- extra-x86_64/mirage.install 2014-10-09 16:53:47 UTC (rev 224154)
+++ extra-x86_64/mirage.install 2014-10-09 16:54:08 UTC (rev 224155)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- update-desktop-database -q
-}
-
-post_remove() {
- update-desktop-database -q
-}
Copied: mirage/repos/extra-x86_64/mirage.install (from rev 224154, mirage/trunk/mirage.install)
===================================================================
--- extra-x86_64/mirage.install (rev 0)
+++ extra-x86_64/mirage.install 2014-10-09 16:54:08 UTC (rev 224155)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ update-desktop-database -q
+}
+
+post_remove() {
+ update-desktop-database -q
+}
More information about the arch-commits
mailing list