[arch-commits] Commit in cinepaint/trunk (4 files)

Allan McRae allan at archlinux.org
Tue Oct 21 21:47:38 EDT 2008


    Date: Tuesday, October 21, 2008 @ 21:47:38
  Author: allan
Revision: 16677

upgpkg: cinepaint 0.22.1-2

Added:
  cinepaint/trunk/cinepaint-0.22.1-ambiguousawake.patch
  cinepaint/trunk/cinepaint-0.22.1-gcc43.patch
  cinepaint/trunk/cinepaint-0.22.1-multiple_parameters_named.patch
Modified:
  cinepaint/trunk/PKGBUILD

--------------------------------------------------+
 PKGBUILD                                         |   19 ++++-
 cinepaint-0.22.1-ambiguousawake.patch            |   11 +++
 cinepaint-0.22.1-gcc43.patch                     |   73 +++++++++++++++++++++
 cinepaint-0.22.1-multiple_parameters_named.patch |   42 ++++++++++++
 4 files changed, 140 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-10-22 01:39:11 UTC (rev 16676)
+++ PKGBUILD	2008-10-22 01:47:38 UTC (rev 16677)
@@ -5,28 +5,37 @@
 pkgname=cinepaint
 _srcver=0.22-1
 pkgver=`echo $_srcver | sed 's:-:.:g'`
-pkgrel=1
+pkgrel=2
 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.10.11' 'openexr>=1.4' 'lcms>=1.16' 'libxmu>=1.0.3' \
          'libxpm>=3.5.6' 'fltk>=1.1.7')
-makedepends=('python>=2.5' 'gutenprint>=5.0')
+makedepends=('python>=2.6' 'gutenprint>=5.0')
 options=('!libtool')
 install=$pkgname.install
-source=(http://dl.sourceforge.net/sourceforge/$pkgname/$pkgname-${_srcver}.tar.gz)
-md5sums=('f360587240db6b6d2f0bfd94c420c492')
+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)
+md5sums=('f360587240db6b6d2f0bfd94c420c492'
+         'f05e17a16d0018e5301aff0e1fa597b0'
+         '0876510a5ce3d581ebdde7e18199c09f'
+         '4586aa153a0d3cac36120afc1f95a880')
 
 build() {
   cd $startdir/src/$pkgname-$_srcver
  # FIXES
+  patch -Np1 -i $srcdir/cinepaint-0.22.1-gcc43.patch
+  patch -Np1 -i $srcdir/cinepaint-0.22.1-multiple_parameters_named.patch
+  patch -Np0 -i $srcdir/cinepaint-0.22.1-ambiguousawake.patch
   find plug-ins/print -type f -exec \
     sed -i "s:gutenprintui/gutenprintui:gutenprintui2/gutenprintui:" {} \;
  # build
   ./configure --prefix=/usr \
     --enable-gtk2 --enable-pygimp \
-    --with-python=/usr/bin/python2.5
+    --with-python=/usr/bin/python2.6
  # FIXES
   sed -i 's/^\(X_LIBS.*\)$/\1 -lpthread/' plug-ins/openexr/Makefile
   make || return 1

Added: cinepaint-0.22.1-ambiguousawake.patch
===================================================================
--- cinepaint-0.22.1-ambiguousawake.patch	                        (rev 0)
+++ cinepaint-0.22.1-ambiguousawake.patch	2008-10-22 01:47:38 UTC (rev 16677)
@@ -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; }

Added: cinepaint-0.22.1-gcc43.patch
===================================================================
--- cinepaint-0.22.1-gcc43.patch	                        (rev 0)
+++ cinepaint-0.22.1-gcc43.patch	2008-10-22 01:47:38 UTC (rev 16677)
@@ -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>

Added: cinepaint-0.22.1-multiple_parameters_named.patch
===================================================================
--- cinepaint-0.22.1-multiple_parameters_named.patch	                        (rev 0)
+++ cinepaint-0.22.1-multiple_parameters_named.patch	2008-10-22 01:47:38 UTC (rev 16677)
@@ -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,




More information about the arch-commits mailing list