Date: Saturday, August 9, 2014 @ 11:47:06 Author: bgyorgy Revision: 117064
upgpkg: ocrfeeder 0.8-1 Update to version 0.8 Modified: ocrfeeder/trunk/PKGBUILD Deleted: ocrfeeder/trunk/ocrfeeder-pillow.patch ------------------------+ PKGBUILD | 27 ++++++++--------- ocrfeeder-pillow.patch | 72 ----------------------------------------------- 2 files changed, 13 insertions(+), 86 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-08-09 07:13:02 UTC (rev 117063) +++ PKGBUILD 2014-08-09 09:47:06 UTC (rev 117064) @@ -2,39 +2,38 @@ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=ocrfeeder -pkgver=0.7.11 -pkgrel=4 +pkgver=0.8 +pkgrel=1 pkgdesc="GTK+ document layout analysis and optical character recognition application" arch=('any') url="https://wiki.gnome.org/Apps/OCRFeeder" license=('GPL') -depends=('python2-pyenchant' 'pygoocanvas' 'python2-gtkspell' 'python2-pillow' \ - 'python2-lxml' 'python2-reportlab' 'ghostscript' 'unpaper' 'sane' 'iso-codes' \ - 'desktop-file-utils') -makedepends=('intltool' 'gnome-doc-utils') +depends=('python2-pyenchant' 'python2-gobject' 'python2-lxml' 'python2-pillow' + 'python2-reportlab' 'gtk3' 'goocanvas' 'gtkspell3' 'ghostscript' 'unpaper' 'sane' + 'iso-codes' 'desktop-file-utils') +makedepends=('intltool' 'gnome-doc-utils' 'python2-gobject2') optdepends=('tesseract: character recognition' 'ocrad: character recognition' 'gocr: character recognition' 'cuneiform: character recognition') install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - ocrfeeder-pillow.patch) -sha256sums=('4508f4a0e2fdab521ab4a6d0265058a21fda80622483b169fd041189938ea6d5' - '54dbe61ae384d4f5ed48e9fae0d5d1fc65787916208c87f44862aa1a3eb31e80') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) +sha256sums=('bb2e415e1e7ce9c7d819423b6b6a311f9d476eca54e7b183070ba6cd124265a1') prepare() { cd "$srcdir/$pkgname-$pkgver" - # Pillow port - patch -Np1 -i "$srcdir/ocrfeeder-pillow.patch" - # Python2 fix sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/ocrfeeder*.in src/ocrfeeder/odf/*.py + + # Fix build (X display is not available in chroot) + sed -i 's/PYTHON_GI_MODULES=.*/PYTHON_GI_MODULES=/' configure{.ac,} } build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-maintainer-mode \ PYTHON=python2 make } @@ -41,7 +40,7 @@ package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install mkdir -p "$pkgdir/usr/share/pixmaps" ln -s ../ocrfeeder/icons/ocrfeeder.svg "$pkgdir/usr/share/pixmaps/ocrfeeder.svg" } Deleted: ocrfeeder-pillow.patch =================================================================== --- ocrfeeder-pillow.patch 2014-08-09 07:13:02 UTC (rev 117063) +++ ocrfeeder-pillow.patch 2014-08-09 09:47:06 UTC (rev 117064) @@ -1,72 +0,0 @@ -diff -Naur ocrfeeder-0.7.11.orig/src/ocrfeeder/feeder/imageManipulation.py ocrfeeder-0.7.11/src/ocrfeeder/feeder/imageManipulation.py ---- ocrfeeder-0.7.11.orig/src/ocrfeeder/feeder/imageManipulation.py 2012-10-02 20:00:33.000000000 +0200 -+++ ocrfeeder-0.7.11/src/ocrfeeder/feeder/imageManipulation.py 2013-09-15 15:28:11.779102147 +0200 -@@ -21,7 +21,7 @@ - from ocrfeeder.util.lib import debug - - import gettext --import Image, ImageDraw -+from PIL import Image, ImageDraw - import os.path - from ocrfeeder.util import graphics - import sys -diff -Naur ocrfeeder-0.7.11.orig/src/ocrfeeder/feeder/layoutAnalysis.py ocrfeeder-0.7.11/src/ocrfeeder/feeder/layoutAnalysis.py ---- ocrfeeder-0.7.11.orig/src/ocrfeeder/feeder/layoutAnalysis.py 2013-02-08 08:57:12.000000000 +0100 -+++ ocrfeeder-0.7.11/src/ocrfeeder/feeder/layoutAnalysis.py 2013-09-15 15:28:11.779102147 +0200 -@@ -23,7 +23,7 @@ - from ocrfeeder.util.constants import OCRFEEDER_DEBUG, DTP - from ocrfeeder.studio.dataHolder import DataBox - from imageManipulation import ImageProcessor --import Image -+from PIL import Image - import re - import math - -diff -Naur ocrfeeder-0.7.11.orig/src/ocrfeeder/studio/dataHolder.py ocrfeeder-0.7.11/src/ocrfeeder/studio/dataHolder.py ---- ocrfeeder-0.7.11.orig/src/ocrfeeder/studio/dataHolder.py 2013-02-08 08:57:12.000000000 +0100 -+++ ocrfeeder-0.7.11/src/ocrfeeder/studio/dataHolder.py 2013-09-15 15:27:20.787882011 +0200 -@@ -20,7 +20,7 @@ - - import os.path - from ocrfeeder.util import graphics --import Image -+from PIL import Image - import gobject - from ocrfeeder.util.graphics import getImagePrintSize, getImageResolution - from ocrfeeder.util import TEXT_TYPE, IMAGE_TYPE, ALIGN_LEFT, lib -diff -Naur ocrfeeder-0.7.11.orig/src/ocrfeeder/studio/widgetPresenter.py ocrfeeder-0.7.11/src/ocrfeeder/studio/widgetPresenter.py ---- ocrfeeder-0.7.11.orig/src/ocrfeeder/studio/widgetPresenter.py 2013-02-08 08:57:12.000000000 +0100 -+++ ocrfeeder-0.7.11/src/ocrfeeder/studio/widgetPresenter.py 2013-09-15 15:28:11.775768733 +0200 -@@ -26,7 +26,7 @@ - from ocrfeeder.util.constants import * - from ocrfeeder.util.graphics import convertPixbufToImage - from enchant.checker import SpellChecker --import Image -+from PIL import Image - import gettext - import gobject - import goocanvas -diff -Naur ocrfeeder-0.7.11.orig/src/ocrfeeder/util/graphics.py ocrfeeder-0.7.11/src/ocrfeeder/util/graphics.py ---- ocrfeeder-0.7.11.orig/src/ocrfeeder/util/graphics.py 2012-10-02 20:00:33.000000000 +0200 -+++ ocrfeeder-0.7.11/src/ocrfeeder/util/graphics.py 2013-09-15 15:28:11.775768733 +0200 -@@ -19,7 +19,7 @@ - ########################################################################### - - from lib import debug --import Image -+from PIL import Image - import gtk - import math - -diff -Naur ocrfeeder-0.7.11.orig/src/ocrfeeder/util/lib.py ocrfeeder-0.7.11/src/ocrfeeder/util/lib.py ---- ocrfeeder-0.7.11.orig/src/ocrfeeder/util/lib.py 2013-02-08 08:57:12.000000000 +0100 -+++ ocrfeeder-0.7.11/src/ocrfeeder/util/lib.py 2013-09-15 15:28:11.775768733 +0200 -@@ -20,7 +20,7 @@ - - import os - import mimetypes --import Image -+from PIL import Image - import tempfile - import gtk - import math