Tue Apr 5 14:26:38 UTC 2011

6 files changed, 214 insertions, 0 deletions

diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD
new file mode 100644
index 000000000..c60484af5
--- /dev/null
+++ b/extra/cinepaint/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id: PKGBUILD 89858 2010-09-04 14:16:02Z remy $
+# Maintainer: tobias [tobias.archlinux.org]
+# Contributor: tobias [tobias.justdreams.de]
+
+pkgname=cinepaint
+_srcver=0.22-1
+pkgver=${_srcver/-/.}
+pkgrel=7
+pkgdesc="sophisticated graphics manipulation programm supporting >8bit pictures"
+arch=(i686 x86_64)
+license=('LGPL' 'GPL' 'MIT-OSI')
+url=(http://cinepaint.org.sourceforge.net/)
+depends=('gtk2>=2.18.6' 'openexr>=1.6.1' 'lcms>=1.18' 'libxmu>=1.0.4' 'libxpm>=3.5.7' 'fltk>=1.1.9' 'desktop-file-utils' 'ftgl>=2.1.3rc5' 'libjpeg>=8')
+makedepends=('python2' 'gutenprint>=5.2.3')
+optdepends=('python2' 'gutenprint')
+options=('!libtool')
+install=cinepaint.install
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${_srcver}.tar.gz
+        cinepaint-0.22.1-gcc43.patch
+        cinepaint-0.22.1-multiple_parameters_named.patch
+        cinepaint-0.22.1-ambiguousawake.patch
+	cinepaint-0.22-gcc44.patch)
+md5sums=('f360587240db6b6d2f0bfd94c420c492' 'f05e17a16d0018e5301aff0e1fa597b0'\
+         '0876510a5ce3d581ebdde7e18199c09f' '4586aa153a0d3cac36120afc1f95a880'\
+         '368e820c27f525e3569d43388f1c119a')
+
+build() {
+  cd "${srcdir}/${pkgname}-${_srcver}"
+ # FIXES
+  patch -Np1 -i "${srcdir}/cinepaint-0.22.1-gcc43.patch" || return 1
+  patch -Np1 -i "${srcdir}/cinepaint-0.22-gcc44.patch" || return 1
+  patch -Np1 -i "${srcdir}/cinepaint-0.22.1-multiple_parameters_named.patch" || return 1
+  patch -Np0 -i "${srcdir}/cinepaint-0.22.1-ambiguousawake.patch" || return 1
+  find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
+  find plug-ins/print -type f -exec \
+    sed -i "s:gutenprintui/gutenprintui:gutenprintui2/gutenprintui:" {} \;
+  # Fix insecure rpath
+  sed '/-rpath/d' -i plug-ins/icc_examin/icc_examin/configure
+
+ # build
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+    --enable-gtk2 --enable-pygimp \
+    --with-python=/usr/bin/python2
+ # FIXES
+  sed -i 's/^\(X_LIBS.*\)$/\1 -lpthread/' plug-ins/openexr/Makefile
+  make
+}
+package() {
+  cd "${srcdir}/${pkgname}-${_srcver}"
+  make DESTDIR="${pkgdir}" install || return 1
+  install -m755 -d "${pkgdir}/usr/share/applications"
+  install -m755 -d "${pkgdir}/usr/share/pixmaps"
+  install -m644 cinepaint.desktop "${pkgdir}/usr/share/applications/" || return 1
+  install -m644 cinepaint.png "${pkgdir}/usr/share/pixmaps/" || return 1
+}
diff --git a/extra/cinepaint/cinepaint-0.22-gcc44.patch b/extra/cinepaint/cinepaint-0.22-gcc44.patch
new file mode 100644
index 000000000..340057834
--- /dev/null
+++ b/extra/cinepaint/cinepaint-0.22-gcc44.patch
@@ -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)
+
diff --git a/extra/cinepaint/cinepaint-0.22.1-ambiguousawake.patch b/extra/cinepaint/cinepaint-0.22.1-ambiguousawake.patch
new file mode 100644
index 000000000..f1d09fa27
--- /dev/null
+++ b/extra/cinepaint/cinepaint-0.22.1-ambiguousawake.patch
@@ -0,0 +1,11 @@
+--- plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp.orig	2008-09-03 02:07:08.000000000 +0200
++++ plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp	2008-09-03 02:08:02.000000000 +0200
+@@ -226,7 +226,7 @@
+ 
+   int  awake(void)
+   {
+-    Fl::awake(0);
++    Fl::awake((void *)0);
+     return 0;
+   }
+   int  leerWait(void) { return 0; }
diff --git a/extra/cinepaint/cinepaint-0.22.1-gcc43.patch b/extra/cinepaint/cinepaint-0.22.1-gcc43.patch
new file mode 100644
index 000000000..64ba76099
--- /dev/null
+++ b/extra/cinepaint/cinepaint-0.22.1-gcc43.patch
@@ -0,0 +1,73 @@
+Index: cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp
+===================================================================
+--- cinepaint-0.22-1.orig/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp
++++ cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp
+@@ -34,6 +34,7 @@
+ 
+ 
+ #include <fstream>
++#include <cstring>
+ #include "TNT/tnt_misc.hpp"     // proof_least_square_fit()
+ #include "TNT/tnt_stopwatch.hpp"
+ #include "TNT/jama_qr.hpp"      // JAMA::QR
+Index: cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp
+===================================================================
+--- cinepaint-0.22-1.orig/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp
++++ cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp
+@@ -26,6 +26,7 @@
+ */
+ #include <iostream>
+ #include <cmath>                    // pow()
++#include <cstring>
+ 
+ #include "br_types.hpp"             // ImageID
+ #include "br_enums.hpp"             // DataType, ReportWhat
+Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp
+===================================================================
+--- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp
++++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp
+@@ -29,6 +29,7 @@
+ 
+ #include "icc_utils.h"
+ #include "icc_fenster.h"
++#include <cstdlib>
+ 
+ using namespace icc_examin_ns;
+ 
+Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_speicher.h
+===================================================================
+--- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/icc_speicher.h
++++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_speicher.h
+@@ -33,6 +33,8 @@
+ 
+ #include "icc_utils.h"
+ #include <string>
++#include <cstdlib>
++#include <cstring>
+ 
+ #define DBG_SPEICHER_START   if(icc_debug >= 3) DBG_PROG_START
+ #define DBG_SPEICHER_ENDE    if(icc_debug >= 3) DBG_PROG_ENDE
+Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/threads.cpp
+===================================================================
+--- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/threads.cpp
++++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/threads.cpp
+@@ -42,6 +42,7 @@
+ #include <iostream>
+ #  if HAVE_PTHREAD_H
+ // Use POSIX threading...
++#include <climits>
+ 
+ int fl_create_thread(Fl_Thread& t, void *(*f) (void *), void* p)
+ {
+Index: cinepaint-0.22-1/plug-ins/pdf/pdf.cpp
+===================================================================
+--- cinepaint-0.22-1.orig/plug-ins/pdf/pdf.cpp
++++ cinepaint-0.22-1/plug-ins/pdf/pdf.cpp
+@@ -39,6 +39,7 @@
+ 
+ #include "pdf.h"
+ #include "pdf_dialog.h"
++#include <cstring>
+ 
+ extern "C" {
+ #include <gtk/gtk.h>
diff --git a/extra/cinepaint/cinepaint-0.22.1-multiple_parameters_named.patch b/extra/cinepaint/cinepaint-0.22.1-multiple_parameters_named.patch
new file mode 100644
index 000000000..e030593c2
--- /dev/null
+++ b/extra/cinepaint/cinepaint-0.22.1-multiple_parameters_named.patch
@@ -0,0 +1,42 @@
+--- ./plug-ins/icc_examin/icc_examin/icc_oyranos.h.orig	2008-06-27 19:28:52.000000000 +0200
++++ ./plug-ins/icc_examin/icc_examin/icc_oyranos.h	2008-06-27 19:31:34.000000000 +0200
+@@ -142,9 +142,6 @@
+ 
+     // colour transformations
+     ColourTransformKey erzeugeTrafo (
+-                                  const char* eingangs_profil__geraet,
+-                                  int         byte,
+-                                  int         kanaele,
+                                   const char* ausgangs_profil__geraet,
+                                   int         byte,
+                                   int         kanaele,
+@@ -152,9 +149,6 @@
+                                   const char* cmm, // 4 bytes 'lcms' 'APPL'
+                                   int         cmm_optionen); // BPC, precission
+     ColourTransformKey erzeugeTrafo (
+-                                  const char* eingangs_profil__geraet,
+-                                  int         byte,
+-                                  int         kanaele,
+                                   const char* ausgangs_profil__geraet,
+                                   int         byte,
+                                   int         kanaele,
+@@ -163,9 +157,6 @@
+                                   int         cmm_optionen,
+                                   std::list<const char*> &profile );
+     ColourTransformKey erzeugeTrafo (
+-                                  const char* eingangs_profil__geraet,
+-                                  int         byte,
+-                                  int         kanaele,
+                                   const char* ausgangs_profil__geraet,
+                                   int         byte,
+                                   int         kanaele,
+@@ -181,9 +172,6 @@
+     std::string cmm;
+   private:
+     ColourTransformKey erzeugeSchluessel_ (
+-                                  const char* eingangs_profil__geraet,
+-                                  int         byte,
+-                                  int         kanaele,
+                                   const char* ausgangs_profil__geraet,
+                                   int         byte,
+                                   int         kanaele,
diff --git a/extra/cinepaint/cinepaint.install b/extra/cinepaint/cinepaint.install
new file mode 100644
index 000000000..5e5cfef4d
--- /dev/null
+++ b/extra/cinepaint/cinepaint.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q
+}