[arch-commits] Commit in python-xcffib/trunk (2 files)

[Felix Yan]

    Date: Sunday, December 25, 2016 @ 15:42:10
  Author: felixonmars
Revision: 201866

Add some fixes. Still fails and waiting for an upstream patch.

Added:
  python-xcffib/trunk/optparse-applicative-0.13.patch
Modified:
  python-xcffib/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   23 ++++++++++++----------
 optparse-applicative-0.13.patch |   39 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-25 15:42:04 UTC (rev 201865)
+++ PKGBUILD	2016-12-25 15:42:10 UTC (rev 201866)
@@ -10,18 +10,21 @@
 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-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")
-md5sums=('SKIP')
+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 /' \

Added: optparse-applicative-0.13.patch
===================================================================
--- optparse-applicative-0.13.patch	                        (rev 0)
+++ optparse-applicative-0.13.patch	2016-12-25 15:42:10 UTC (rev 201866)
@@ -0,0 +1,39 @@
+From e0bd193a756235e3186b2b7464ee61025ff3e344 Mon Sep 17 00:00:00 2001
+From: Tycho Andersen <tycho at 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 <tycho at 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