[arch-commits] Commit in cinepaint/repos/extra-i686 (8 files)

Eric Bélanger eric at archlinux.org
Mon Nov 28 11:25:06 UTC 2011


    Date: Monday, November 28, 2011 @ 06:25:06
  Author: eric
Revision: 143684

archrelease: copy trunk to extra-i686

Added:
  cinepaint/repos/extra-i686/LICENSE
    (from rev 143683, cinepaint/trunk/LICENSE)
  cinepaint/repos/extra-i686/PKGBUILD
    (from rev 143683, cinepaint/trunk/PKGBUILD)
  cinepaint/repos/extra-i686/cinepaint-0.22-gcc44.patch
    (from rev 143683, cinepaint/trunk/cinepaint-0.22-gcc44.patch)
  cinepaint/repos/extra-i686/cinepaint.install
    (from rev 143683, cinepaint/trunk/cinepaint.install)
Deleted:
  cinepaint/repos/extra-i686/LICENSE
  cinepaint/repos/extra-i686/PKGBUILD
  cinepaint/repos/extra-i686/cinepaint-0.22-gcc44.patch
  cinepaint/repos/extra-i686/cinepaint.install

----------------------------+
 LICENSE                    |   50 ++++++++++++-------------
 PKGBUILD                   |   84 ++++++++++++++++++++++---------------------
 cinepaint-0.22-gcc44.patch |   44 +++++++++++-----------
 cinepaint.install          |   22 +++++------
 4 files changed, 102 insertions(+), 98 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2011-11-28 11:24:41 UTC (rev 143683)
+++ LICENSE	2011-11-28 11:25:06 UTC (rev 143684)
@@ -1,25 +0,0 @@
-Copyright (c) 2005, Kai-Uwe Behrmann
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met: 
-    * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer. 
-    * Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.ntributors may be used to endorse or promote
-    products derived from this software without specific prior written
-    permission. 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 

Copied: cinepaint/repos/extra-i686/LICENSE (from rev 143683, cinepaint/trunk/LICENSE)
===================================================================
--- LICENSE	                        (rev 0)
+++ LICENSE	2011-11-28 11:25:06 UTC (rev 143684)
@@ -0,0 +1,25 @@
+Copyright (c) 2005, Kai-Uwe Behrmann
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met: 
+    * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer. 
+    * Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.ntributors may be used to endorse or promote
+    products derived from this software without specific prior written
+    permission. 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-28 11:24:41 UTC (rev 143683)
+++ PKGBUILD	2011-11-28 11:25:06 UTC (rev 143684)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: tobias [tobias.archlinux.org]
-# Contributor: tobias [tobias.justdreams.de]
-
-pkgname=cinepaint
-pkgver=0.25.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')
-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')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/cinepaint-0.22-gcc44.patch"
-  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
-
-  ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \
-    --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  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"
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: cinepaint/repos/extra-i686/PKGBUILD (from rev 143683, cinepaint/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2011-11-28 11:25:06 UTC (rev 143684)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: tobias [tobias.archlinux.org]
+# Contributor: tobias [tobias.justdreams.de]
+
+pkgname=cinepaint
+pkgver=0.25.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')
+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')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/cinepaint-0.22-gcc44.patch"
+  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
+
+  aclocal -I aclocal
+  autoconf
+  ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \
+    --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2
+  sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \
+    plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  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"
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Deleted: cinepaint-0.22-gcc44.patch
===================================================================
--- cinepaint-0.22-gcc44.patch	2011-11-28 11:24:41 UTC (rev 143683)
+++ cinepaint-0.22-gcc44.patch	2011-11-28 11:25:06 UTC (rev 143684)
@@ -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)
-

Copied: cinepaint/repos/extra-i686/cinepaint-0.22-gcc44.patch (from rev 143683, cinepaint/trunk/cinepaint-0.22-gcc44.patch)
===================================================================
--- cinepaint-0.22-gcc44.patch	                        (rev 0)
+++ cinepaint-0.22-gcc44.patch	2011-11-28 11:25:06 UTC (rev 143684)
@@ -0,0 +1,22 @@
+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)
+

Deleted: cinepaint.install
===================================================================
--- cinepaint.install	2011-11-28 11:24:41 UTC (rev 143683)
+++ cinepaint.install	2011-11-28 11:25:06 UTC (rev 143684)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-}

Copied: cinepaint/repos/extra-i686/cinepaint.install (from rev 143683, cinepaint/trunk/cinepaint.install)
===================================================================
--- cinepaint.install	                        (rev 0)
+++ cinepaint.install	2011-11-28 11:25:06 UTC (rev 143684)
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q
+}




More information about the arch-commits mailing list