Date: Monday, January 23, 2017 @ 08:26:17 Author: felixonmars Revision: 208484
archrelease: copy trunk to community-any Added: python-xcffib/repos/community-any/PKGBUILD (from rev 208483, python-xcffib/trunk/PKGBUILD) python-xcffib/repos/community-any/optparse-applicative-0.13.patch (from rev 208483, python-xcffib/trunk/optparse-applicative-0.13.patch) Deleted: python-xcffib/repos/community-any/PKGBUILD python-xcffib/repos/community-any/optparse-applicative-0.13.patch ---------------------------------+ PKGBUILD | 122 ++++++++++++++++++-------------------- optparse-applicative-0.13.patch | 78 ++++++++++++------------ 2 files changed, 97 insertions(+), 103 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-01-23 08:25:24 UTC (rev 208483) +++ PKGBUILD 2017-01-23 08:26:17 UTC (rev 208484) @@ -1,64 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Roger Duran <rogerdu...@gmail.com> - -pkgbase=python-xcffib -pkgname=(python-xcffib python2-xcffib) -pkgver=0.4.2 -pkgrel=2 -pkgdesc="Python3 drop in replacement for xpyb, an XCB python binding" -arch=('any') -url="https://pypi.python.org/pypi/xcffib" -license=('Apache') -makedepends=('python-setuptools' 'python2-setuptools' 'python-cffi' 'python2-cffi' 'python-six' - 'python2-six' 'libxcb' 'git' 'ghc' 'haskell-xcb-types' 'haskell-language-python' - 'haskell-filemanip' 'haskell-split' 'haskell-semigroups' 'haskell-mtl' - 'haskell-attoparsec' 'haskell-hunit' 'cabal-install' 'haskell-test-framework' - 'haskell-test-framework-hunit' 'haskell-optparse-applicative') -checkdepends=('flake8' 'python2-flake8' 'parallel' 'python-nose' 'python2-nose' 'xorg-server-xvfb' - 'xorg-xeyes') -source=("git+https://github.com/tych0/xcffib.git#tag=v$pkgver" - optparse-applicative-0.13.patch) -md5sums=('SKIP' - '606b45b06776eee76d3ee84a658952eb') - -prepare() { - (cd xcffib; patch -p1 -i ../optparse-applicative-0.13.patch) - - cp -a xcffib{,-py2} - - sed -e 's/python /python2 /' \ - -e 's/nosetests /nosetests2 /' \ - -e 's/flake8 /flake8-python2 /' \ - -i xcffib-py2/Makefile -} - -build() { - cd "$srcdir/xcffib" - make xcffib - - cd "$srcdir/xcffib-py2" - make xcffib -} - -check() { - cd "$srcdir/xcffib" - make check - - cd "$srcdir/xcffib-py2" - make check -} - -package_python-xcffib() { - depends=('python-six' 'python-cffi' 'libxcb') - - cd "$srcdir/xcffib" - python setup.py install --root="$pkgdir/" --optimize=1 -} - -package_python2-xcffib() { - depends=('python2-six' 'python2-cffi' 'libxcb') - - cd "$srcdir/xcffib-py2" - python2 setup.py install --root="$pkgdir/" --optimize=1 -} Copied: python-xcffib/repos/community-any/PKGBUILD (from rev 208483, python-xcffib/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-01-23 08:26:17 UTC (rev 208484) @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Roger Duran <rogerdu...@gmail.com> + +pkgbase=python-xcffib +pkgname=(python-xcffib python2-xcffib) +pkgver=0.5.0 +pkgrel=1 +pkgdesc="Python3 drop in replacement for xpyb, an XCB python binding" +arch=('any') +url="https://pypi.python.org/pypi/xcffib" +license=('Apache') +makedepends=('python-setuptools' 'python2-setuptools' 'python-cffi' 'python2-cffi' 'python-six' + 'python2-six' 'libxcb' 'git' 'haskell-xcffib') +checkdepends=('python-nose' 'python2-nose' 'xorg-server-xvfb' 'xorg-xeyes') +source=("git+https://github.com/tych0/xcffib.git#tag=v$pkgver") +md5sums=('SKIP') + +prepare() { + # Somehow broken, we do it ourselves + sed -i '/ffi_build.py/d' xcffib/Makefile + + cp -a xcffib{,-py2} +} + +build() { + cd "$srcdir/xcffib" + make xcffib GEN=xcffibgen CABAL=true + python xcffib/ffi_build.py + python setup.py build + + cd "$srcdir/xcffib-py2" + make xcffib GEN=xcffibgen CABAL=true + python2 xcffib/ffi_build.py + python2 setup.py build +} + +check() { + cd "$srcdir/xcffib" + nosetests3 + + cd "$srcdir/xcffib-py2" + nosetests2 +} + +package_python-xcffib() { + depends=('python-six' 'python-cffi' 'libxcb') + + cd "$srcdir/xcffib" + python setup.py install --root="$pkgdir/" --optimize=1 +} + +package_python2-xcffib() { + depends=('python2-six' 'python2-cffi' 'libxcb') + + cd "$srcdir/xcffib-py2" + python2 setup.py install --root="$pkgdir/" --optimize=1 +} Deleted: optparse-applicative-0.13.patch =================================================================== --- optparse-applicative-0.13.patch 2017-01-23 08:25:24 UTC (rev 208483) +++ optparse-applicative-0.13.patch 2017-01-23 08:26:17 UTC (rev 208484) @@ -1,39 +0,0 @@ -From e0bd193a756235e3186b2b7464ee61025ff3e344 Mon Sep 17 00:00:00 2001 -From: Tycho Andersen <ty...@tycho.ws> -Date: Sun, 18 Sep 2016 19:30:32 -0600 -Subject: [PATCH] fix build with latest verison of optparse-applicative - -Apparently it stopped exporting <>, so let's import that by hand. - -Signed-off-by: Tycho Andersen <ty...@tycho.ws> ---- - generator/xcffibgen.hs | 1 + - xcffib.cabal | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/generator/xcffibgen.hs b/generator/xcffibgen.hs -index 52d89a5..bbad4de 100644 ---- a/generator/xcffibgen.hs -+++ b/generator/xcffibgen.hs -@@ -16,6 +16,7 @@ - module Main where - - -+import Data.Semigroup - import Data.XCB.Types - import Data.XCB.Python.Parse - -diff --git a/xcffib.cabal b/xcffib.cabal -index 711cae3..8ee3222 100644 ---- a/xcffib.cabal -+++ b/xcffib.cabal -@@ -54,7 +54,8 @@ executable xcffibgen - containers, - mtl >= 2.1, - attoparsec, -- bytestring -+ bytestring, -+ semigroups - ghc-options: -Wall - - test-suite PyHelpersTests Copied: python-xcffib/repos/community-any/optparse-applicative-0.13.patch (from rev 208483, python-xcffib/trunk/optparse-applicative-0.13.patch) =================================================================== --- optparse-applicative-0.13.patch (rev 0) +++ optparse-applicative-0.13.patch 2017-01-23 08:26:17 UTC (rev 208484) @@ -0,0 +1,39 @@ +From e0bd193a756235e3186b2b7464ee61025ff3e344 Mon Sep 17 00:00:00 2001 +From: Tycho Andersen <ty...@tycho.ws> +Date: Sun, 18 Sep 2016 19:30:32 -0600 +Subject: [PATCH] fix build with latest verison of optparse-applicative + +Apparently it stopped exporting <>, so let's import that by hand. + +Signed-off-by: Tycho Andersen <ty...@tycho.ws> +--- + generator/xcffibgen.hs | 1 + + xcffib.cabal | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/generator/xcffibgen.hs b/generator/xcffibgen.hs +index 52d89a5..bbad4de 100644 +--- a/generator/xcffibgen.hs ++++ b/generator/xcffibgen.hs +@@ -16,6 +16,7 @@ + module Main where + + ++import Data.Semigroup + import Data.XCB.Types + import Data.XCB.Python.Parse + +diff --git a/xcffib.cabal b/xcffib.cabal +index 711cae3..8ee3222 100644 +--- a/xcffib.cabal ++++ b/xcffib.cabal +@@ -54,7 +54,8 @@ executable xcffibgen + containers, + mtl >= 2.1, + attoparsec, +- bytestring ++ bytestring, ++ semigroups + ghc-options: -Wall + + test-suite PyHelpersTests