diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-05-04 19:43:49 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-05-04 19:44:56 -0300 |
| commit | 80e9be5eab0b3b937102956a77949f2f597718fa (patch) | |
| tree | eb564cb8779a8130cd3d8369cf70c08c7afc2835 /libre | |
| parent | 1bc703b2b3137385ea6be7578026a1340377866f (diff) | |
| download | abslibre-80e9be5eab0b3b937102956a77949f2f597718fa.tar.gz abslibre-80e9be5eab0b3b937102956a77949f2f597718fa.tar.bz2 abslibre-80e9be5eab0b3b937102956a77949f2f597718fa.zip | |
abiword-3.0.1-7.parabola1: fix gi-overrides installation, install for both py2 and py3 - FS#49136 -> https://bugs.archlinux.org/task/49136
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/abiword/PKGBUILD | 16 | ||||
| -rw-r--r-- | libre/abiword/python-override.patch | 31 |
2 files changed, 42 insertions, 5 deletions
diff --git a/libre/abiword/PKGBUILD b/libre/abiword/PKGBUILD index 4f0a915f0..0fea897f6 100644 --- a/libre/abiword/PKGBUILD +++ b/libre/abiword/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 266625 2016-04-29 13:05:20Z jgc $ +# $Id: PKGBUILD 266866 2016-05-04 13:05:46Z jgc $ # Maintainer (Arch): Jan de Groot <jgc@archlinux.org> # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org> # Contributor (Arch): Maël Lavault <moimael@neuf.fr> @@ -6,7 +6,7 @@ pkgname=abiword pkgver=3.0.1 -pkgrel=6.parabola1 +pkgrel=7.parabola1 pkgdesc='Fully-featured word processor, without Google search engine and nonfree fonts support' arch=('i686' 'x86_64') license=('GPL') @@ -14,7 +14,7 @@ url='http://www.abisource.com' depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils' 'redland' 'libical' 'gtk-update-icon-cache' 'loudmouth' 'libwpg' 'libwps' 'libwmf' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf' 'psiconv') -makedepends=('pkgconfig' 'asio' 'boost' 'gobject-introspection' 'python2' 'libwpd' 'libwps') +makedepends=('pkgconfig' 'asio' 'boost' 'gobject-introspection' 'libwpd' 'libwps' 'python2-gobject' 'python-gobject') conflicts=('abiword-plugins' 'abiword-libre') replaces=('abiword-plugins' 'abiword-libre') options=('!makeflags') @@ -27,6 +27,7 @@ source=(http://abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver. aiksaurus-plugin.m4 command-plugin.m4 gnutls-3.4.0.patch + python-override.patch liberation-fonts.patch) sha256sums=('e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6' '77b52a3722096cec3bfbe4fff3802f51b6c9e0ff7aaa30028c29825fd4e6a65f' @@ -37,6 +38,7 @@ sha256sums=('e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6' '5f80a2f94f9929cdba9809c5e1a87cd5d537a2518bb879bfb9eab51a71c8dac1' '2f26826e9d59d80dacd0dae4aceb815804eaa75954e47507a0897794f33e45be' 'b393e26c19f92901f64d2bae54c86708ea7dd0b647572088a8ac0cd2eec89100' + 'dba1e3265cd42589f17b41fea1a39c8aa4b83c7203b9d5944b578d0ff9c858be' '8a0b6e444e937924743f95c747cbe395a30fb8677a010e60c973b9039e258079') prepare() { @@ -56,8 +58,8 @@ prepare() { # Fix libwpd 0.4 detection patch -Np1 -i ../abiword-3.0.1-libwps-0.4.patch - # python2 fix - sed -i 's/python -c/python2 -c/' src/gi-overrides/Makefile.{am,in} + # Fix python override code to work with Python 3.x + patch -Np1 -i ../python-override.patch # Replace nonfree fonts support to liberation fonts patch -Np1 -i ../liberation-fonts.patch @@ -95,4 +97,8 @@ build() { package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install + + cd src/gi-overrides + sed -i 's/python -c/python2 -c/' Makefile + make DESTDIR="$pkgdir" PYTHON=python2 install } diff --git a/libre/abiword/python-override.patch b/libre/abiword/python-override.patch new file mode 100644 index 000000000..4cb58ad39 --- /dev/null +++ b/libre/abiword/python-override.patch @@ -0,0 +1,31 @@ +From 51787d61993cb3981c18e4cf174fc229734fba1e Mon Sep 17 00:00:00 2001 +From: Jean Brefort <jean.brefort@normalesup.org> +Date: Sun, 6 Dec 2015 11:04:10 +0000 +Subject: [PATCH] Update python override code. Fixes #13745 and #13746, thanks + to David Gutteridge. + +git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/trunk@35171 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6 +--- + src/gi-overrides/Abi.py | 2 ++ + src/gi-overrides/Makefile.am | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/gi-overrides/Abi.py b/src/gi-overrides/Abi.py +index 666fd61..e3b61b9 100644 +--- a/src/gi-overrides/Abi.py ++++ b/src/gi-overrides/Abi.py +@@ -1,4 +1,6 @@ + import sys ++import gi ++gi.require_version('Gtk', '3.0') + from gi.repository import Gtk + from ..overrides import override + from ..importer import modules +diff --git a/src/gi-overrides/Makefile.am b/src/gi-overrides/Makefile.am +index 7fe3913..60f306d 100644 +--- a/src/gi-overrides/Makefile.am ++++ b/src/gi-overrides/Makefile.am +@@ -1,2 +1,2 @@ +-overridesdir = `python -c "import gi; print gi._overridesdir"` ++overridesdir = `python -c "import gi; print(gi._overridesdir)"` + overrides_PYTHON = Abi.py |