summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Bloch2017-08-29 22:25:47 +0200
committerLeonid Bloch2017-08-29 22:25:47 +0200
commitdf5a76eef0b32b90b16f056a2bdebb7a51fcf820 (patch)
tree5f85ff0f320d7e4a1274f312500e5722e5fd24dd
parent419681b12388ba9870d32c77d114167d55fbfc4c (diff)
downloadaur-df5a76eef0b32b90b16f056a2bdebb7a51fcf820.tar.gz
Version update
Signed-off-by: Leonid Bloch <leonid.bloch@esrf.fr>
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD13
-rw-r--r--pyqt4_qstring_fix.patch17
3 files changed, 8 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f60ddc6803b..109aee74eb4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = python-fabio
pkgdesc = I/O library for images produced by 2D X-ray detectors.
- pkgver = 0.4.0
- pkgrel = 2
+ pkgver = 0.5.0
+ pkgrel = 1
url = http://www.silx.org
arch = any
license = MIT
@@ -12,10 +12,8 @@ pkgbase = python-fabio
depends = python-pillow
depends = python-lxml
optdepends = python-pyqt4: for the fabio_viewer program
- source = https://github.com/silx-kit/fabio/archive/v0.4.0.tar.gz
- source = pyqt4_qstring_fix.patch
- sha256sums = ae1f2f979f801524558cac81ec8988d1eadce65b540cdeb46166162ae4788956
- sha256sums = e10b98cce6465ac055b1b5744417b8ceb2d081ada3b9621f73651d0c2ad4f42b
+ source = https://github.com/silx-kit/fabio/archive/v0.5.0.tar.gz
+ sha256sums = 597bbd3c551687e98d84fe89b9fa87eca2a726fbbed56e841168119efd95baf9
pkgname = python-fabio
diff --git a/PKGBUILD b/PKGBUILD
index 1e598a894c0..12a0ed6f55d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Package maintainer: Leonid B <leonid dot bloch at esrf dot fr>
# Upstream contact: silx at esrf dot fr
pkgname=python-fabio
-pkgver=0.4.0
-pkgrel=2
+pkgver=0.5.0
+pkgrel=1
pkgdesc="I/O library for images produced by 2D X-ray detectors."
arch=('any')
url="http://www.silx.org"
@@ -10,13 +10,8 @@ license=('MIT' 'LGPL' 'Apache')
depends=('python-numpy' 'python-pillow' 'python-lxml')
optdepends=('python-pyqt4: for the fabio_viewer program')
makedepends=('cython')
-source=("https://github.com/silx-kit/${pkgname#*-}/archive/v${pkgver}.tar.gz" "pyqt4_qstring_fix.patch")
-sha256sums=('ae1f2f979f801524558cac81ec8988d1eadce65b540cdeb46166162ae4788956'
- 'e10b98cce6465ac055b1b5744417b8ceb2d081ada3b9621f73651d0c2ad4f42b')
-
-prepare() {
- patch -Np1 -i "pyqt4_qstring_fix.patch"
-}
+source=("https://github.com/silx-kit/${pkgname#*-}/archive/v${pkgver}.tar.gz")
+sha256sums=('597bbd3c551687e98d84fe89b9fa87eca2a726fbbed56e841168119efd95baf9')
build() {
cd "${pkgname#*-}-${pkgver}"
diff --git a/pyqt4_qstring_fix.patch b/pyqt4_qstring_fix.patch
deleted file mode 100644
index bd04bb47cf4..00000000000
--- a/pyqt4_qstring_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ura src/fabio-0.4.0/scripts/fabio_viewer src_new/fabio-0.4.0/scripts/fabio_viewer
---- src/fabio-0.4.0/scripts/fabio_viewer 2016-07-15 05:00:21.000000000 -0400
-+++ src_new/fabio-0.4.0/scripts/fabio_viewer 2017-04-03 22:30:59.606912706 -0400
-@@ -22,7 +22,12 @@
- import os
- import time
-
--from PyQt4.QtCore import QDir, Qt, QRect, QString, QCoreApplication
-+from PyQt4.QtCore import QDir, Qt, QRect, QCoreApplication
-+try:
-+ from PyQt4.QtCore import QString
-+except ImportError:
-+ QString = str
-+
- from PyQt4.QtGui import QLabel, QVBoxLayout, QWidget, QSplitter, QListWidget, \
- QComboBox, QApplication, QStyleFactory, QHBoxLayout, \
- QTabWidget, QPlainTextEdit, QPushButton, QGroupBox, \