[arch-commits] Commit in cinepaint/trunk (PKGBUILD cinepaint-0.22-gcc44.patch)

[Eric Bélanger]

    Date: Wednesday, November 30, 2011 @ 01:22:55
  Author: eric
Revision: 143846

upgpkg: cinepaint 1.0-1

Upstream update, Add libxxf86vm depends, Remove old patch

Modified:
  cinepaint/trunk/PKGBUILD
Deleted:
  cinepaint/trunk/cinepaint-0.22-gcc44.patch

----------------------------+
 PKGBUILD                   |   22 ++++++++++------------
 cinepaint-0.22-gcc44.patch |   22 ----------------------
 2 files changed, 10 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-30 01:41:45 UTC (rev 143845)
+++ PKGBUILD	2011-11-30 06:22:55 UTC (rev 143846)
@@ -3,26 +3,24 @@
 # Contributor: tobias [tobias.justdreams.de]
 
 pkgname=cinepaint
-pkgver=0.25.0
+pkgver=1.0
 pkgrel=1
 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
 arch=('i686' 'x86_64')
 license=('LGPL' 'GPL' 'MIT')
 url="http://www.cinepaint.org"
-depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'desktop-file-utils')
+depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm')
 makedepends=('python2' 'gutenprint')
 optdepends=('python2: for python plug-ins' 'gutenprint: for print plug-ins')
 options=('!libtool')
 install=cinepaint.install
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
-        LICENSE cinepaint-0.22-gcc44.patch)
-md5sums=('6ac099e3bc543e2460dfbffa7411d477'
-         '169085743f667c250ea2e4022efecf5f'
-         '368e820c27f525e3569d43388f1c119a')
+source=(http://sourceforge.net/projects/cinepaint/files/CinePaint/${pkgname}-${pkgver}.tgz
+        LICENSE)
+md5sums=('7dfdb005d246578392ac9bd500534804'
+         '169085743f667c250ea2e4022efecf5f')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/cinepaint-0.22-gcc44.patch"
+  cd "${srcdir}/${pkgname}"
   find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
   sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in
 
@@ -36,9 +34,9 @@
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}"
   make DESTDIR="${pkgdir}" install
-  sed -i -e "s|-I$srcdir/cinepaint-$pkgver||" -e "s|-I$srcdir/cinepaint-$pkgver/lib||" -e "/libcinepaint.la/d" \
-    -e "s|$srcdir/cinepaint-$pkgver/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool"
+  sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" -e "/libcinepaint.la/d" \
+    -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool"
   install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Deleted: cinepaint-0.22-gcc44.patch
===================================================================
--- cinepaint-0.22-gcc44.patch	2011-11-30 01:41:45 UTC (rev 143845)
+++ cinepaint-0.22-gcc44.patch	2011-11-30 06:22:55 UTC (rev 143846)
@@ -1,22 +0,0 @@
-diff -Nru cinepaint-0.22-1.orig/plug-ins/collect/collect.cpp cinepaint-0.22-1/plug-ins/collect/collect.cpp
---- cinepaint-0.22-1.orig/plug-ins/collect/collect.cpp	2007-03-30 11:11:33.000000000 +0200
-+++ cinepaint-0.22-1/plug-ins/collect/collect.cpp	2009-05-21 14:54:45.000000000 +0200
-@@ -301,7 +301,7 @@
-             return -1;
- 
-           // renaming the layer to the original filename
--          gimp_layer_set_name (layers[0], strrchr(fc->value(1),'/')+1);
-+          gimp_layer_set_name (layers[0], strrchr((char *)fc->value(1),'/')+1);
-           GPrecisionType image_base_prec = gimp_drawable_precision (layers[0]);
-           int base_gray = gimp_drawable_gray (layers[0]);
- 
-@@ -341,7 +341,7 @@
-                     #endif
-                     gimp_image_add_layer (image_ID, layers[0], 0); DBG
-                     // set layer name to filename
--                    gimp_layer_set_name(layers[0], strrchr(fc->value(i),'/')+1);
-+                    gimp_layer_set_name(layers[0], strrchr((char *)fc->value(i),'/')+1);
- 
-                     // searching max dimensions
-                     if (gimp_image_width(load_image_ID) > max_w)
-