wok-next rev 13212

Up cinepaint (1.3)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Aug 08 08:26:22 2012 +0200 (2012-08-08)
parents 4d8ac8a31cab
children 3de1f0f3086f
files cinepaint/receipt cinepaint/stuff/cinepaint-0.22-gcc44.patch cinepaint/stuff/cinepaint-0.22.1-ambiguousawake.patch cinepaint/stuff/cinepaint-0.22.1-gcc43.patch cinepaint/stuff/cinepaint-0.22.1-multiple_parameters_named.patch
line diff
     1.1 --- a/cinepaint/receipt	Tue Aug 07 17:35:57 2012 +0200
     1.2 +++ b/cinepaint/receipt	Wed Aug 08 08:26:22 2012 +0200
     1.3 @@ -1,33 +1,26 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="cinepaint"
     1.7 -VERSION="0.22-1"
     1.8 +VERSION="1.3"
     1.9  CATEGORY="graphics"
    1.10  SHORT_DESC="For painting and retouching bitmap frames of films."
    1.11  MAINTAINER="slaxemulator@gmail.com"
    1.12 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.13 +TARBALL="$PACKAGE-$VERSION.tgz"
    1.14  WEB_SITE="http://www.cinepaint.org"
    1.15  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    1.16  
    1.17  DEPENDS="desktop-file-utils gtk+ lcms tiff jpeg fltk ftgl xorg-libXmu xorg-libXpm \
    1.18  gutenprint zlib mesa jbigkit openexr"
    1.19  BUILD_DEPENDS="python coreutils-file-summarize coreutils-file-special gettext \
    1.20 - xorg-xextproto util-linux-uuid-dev lcms-dev openexr-dev fltk-dev mesa-dev \
    1.21 - ilmbase-dev xorg-libXpm-dev gtk+-dev libpng-dev"
    1.22 +xorg-xextproto util-linux-uuid-dev lcms-dev openexr-dev fltk-dev mesa-dev \
    1.23 +ilmbase-dev xorg-libXpm-dev gtk+-dev libpng-dev bash automake autoconf libtool \
    1.24 +python-dev"
    1.25  
    1.26  # Rules to configure and make the package.
    1.27  compile_rules()
    1.28  {
    1.29  	cd $src
    1.30 -	patch -Np1 -i $stuff/cinepaint-0.22.1-gcc43.patch
    1.31 -	patch -Np1 -i $stuff/cinepaint-0.22-gcc44.patch
    1.32 -	patch -Np1 -i $stuff/cinepaint-0.22.1-multiple_parameters_named.patch
    1.33 -	patch -Np0 -i $stuff/cinepaint-0.22.1-ambiguousawake.patch
    1.34 -find plug-ins/print -type f -exec \
    1.35 -    sed -i "s:gutenprintui/gutenprintui:gutenprintui2/gutenprintui:" {} \;
    1.36 -	grep -rl Fl/Fl * | xargs sed -i 's|Fl/Fl|FL/Fl|'
    1.37 -	# Fix insecure rpath
    1.38 -	sed '/-rpath/d' -i plug-ins/icc_examin/icc_examin/configure
    1.39 +	sh ./autogen.sh
    1.40  	./configure \
    1.41  		--prefix=/usr \
    1.42  		--enable-gtk2 \
    1.43 @@ -40,12 +33,12 @@
    1.44  genpkg_rules()
    1.45  {
    1.46  	mkdir -p $fs/usr/share $fs/usr/lib
    1.47 -	cp -a $_pkg/usr/bin $fs/usr
    1.48 -	cp -a $_pkg/usr/lib/cinepaint $fs/usr/lib
    1.49 -	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    1.50 -	cp -a $_pkg/usr/share/cinepaint $fs/usr/share
    1.51 -	cp -a $_pkg/usr/share/pixmaps $fs/usr/share
    1.52 -	cp -a $_pkg/usr/share/applications $fs/usr/share
    1.53 -	cp -a $_pkg/usr/share/fonts $fs/usr/share
    1.54 +	cp -a $install/usr/bin $fs/usr
    1.55 +	cp -a $install/usr/lib/cinepaint $fs/usr/lib
    1.56 +	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.57 +	cp -a $install/usr/share/cinepaint $fs/usr/share
    1.58 +	cp -a $install/usr/share/pixmaps $fs/usr/share
    1.59 +	cp -a $install/usr/share/applications $fs/usr/share
    1.60 +	cp -a $install/usr/share/fonts $fs/usr/share
    1.61  }
    1.62  
     2.1 --- a/cinepaint/stuff/cinepaint-0.22-gcc44.patch	Tue Aug 07 17:35:57 2012 +0200
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,22 +0,0 @@
     2.4 -diff -Nru cinepaint-0.22-1.orig/plug-ins/collect/collect.cpp cinepaint-0.22-1/plug-ins/collect/collect.cpp
     2.5 ---- cinepaint-0.22-1.orig/plug-ins/collect/collect.cpp	2007-03-30 11:11:33.000000000 +0200
     2.6 -+++ cinepaint-0.22-1/plug-ins/collect/collect.cpp	2009-05-21 14:54:45.000000000 +0200
     2.7 -@@ -301,7 +301,7 @@
     2.8 -             return -1;
     2.9 - 
    2.10 -           // renaming the layer to the original filename
    2.11 --          gimp_layer_set_name (layers[0], strrchr(fc->value(1),'/')+1);
    2.12 -+          gimp_layer_set_name (layers[0], strrchr((char *)fc->value(1),'/')+1);
    2.13 -           GPrecisionType image_base_prec = gimp_drawable_precision (layers[0]);
    2.14 -           int base_gray = gimp_drawable_gray (layers[0]);
    2.15 - 
    2.16 -@@ -341,7 +341,7 @@
    2.17 -                     #endif
    2.18 -                     gimp_image_add_layer (image_ID, layers[0], 0); DBG
    2.19 -                     // set layer name to filename
    2.20 --                    gimp_layer_set_name(layers[0], strrchr(fc->value(i),'/')+1);
    2.21 -+                    gimp_layer_set_name(layers[0], strrchr((char *)fc->value(i),'/')+1);
    2.22 - 
    2.23 -                     // searching max dimensions
    2.24 -                     if (gimp_image_width(load_image_ID) > max_w)
    2.25 -
     3.1 --- a/cinepaint/stuff/cinepaint-0.22.1-ambiguousawake.patch	Tue Aug 07 17:35:57 2012 +0200
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,11 +0,0 @@
     3.4 ---- plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp.orig	2008-09-03 02:07:08.000000000 +0200
     3.5 -+++ plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp	2008-09-03 02:08:02.000000000 +0200
     3.6 -@@ -226,7 +226,7 @@
     3.7 - 
     3.8 -   int  awake(void)
     3.9 -   {
    3.10 --    Fl::awake(0);
    3.11 -+    Fl::awake((void *)0);
    3.12 -     return 0;
    3.13 -   }
    3.14 -   int  leerWait(void) { return 0; }
     4.1 --- a/cinepaint/stuff/cinepaint-0.22.1-gcc43.patch	Tue Aug 07 17:35:57 2012 +0200
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,73 +0,0 @@
     4.4 -Index: cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp
     4.5 -===================================================================
     4.6 ---- cinepaint-0.22-1.orig/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp
     4.7 -+++ cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp
     4.8 -@@ -34,6 +34,7 @@
     4.9 - 
    4.10 - 
    4.11 - #include <fstream>
    4.12 -+#include <cstring>
    4.13 - #include "TNT/tnt_misc.hpp"     // proof_least_square_fit()
    4.14 - #include "TNT/tnt_stopwatch.hpp"
    4.15 - #include "TNT/jama_qr.hpp"      // JAMA::QR
    4.16 -Index: cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp
    4.17 -===================================================================
    4.18 ---- cinepaint-0.22-1.orig/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp
    4.19 -+++ cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp
    4.20 -@@ -26,6 +26,7 @@
    4.21 - */
    4.22 - #include <iostream>
    4.23 - #include <cmath>                    // pow()
    4.24 -+#include <cstring>
    4.25 - 
    4.26 - #include "br_types.hpp"             // ImageID
    4.27 - #include "br_enums.hpp"             // DataType, ReportWhat
    4.28 -Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp
    4.29 -===================================================================
    4.30 ---- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp
    4.31 -+++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp
    4.32 -@@ -29,6 +29,7 @@
    4.33 - 
    4.34 - #include "icc_utils.h"
    4.35 - #include "icc_fenster.h"
    4.36 -+#include <cstdlib>
    4.37 - 
    4.38 - using namespace icc_examin_ns;
    4.39 - 
    4.40 -Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_speicher.h
    4.41 -===================================================================
    4.42 ---- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/icc_speicher.h
    4.43 -+++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_speicher.h
    4.44 -@@ -33,6 +33,8 @@
    4.45 - 
    4.46 - #include "icc_utils.h"
    4.47 - #include <string>
    4.48 -+#include <cstdlib>
    4.49 -+#include <cstring>
    4.50 - 
    4.51 - #define DBG_SPEICHER_START   if(icc_debug >= 3) DBG_PROG_START
    4.52 - #define DBG_SPEICHER_ENDE    if(icc_debug >= 3) DBG_PROG_ENDE
    4.53 -Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/threads.cpp
    4.54 -===================================================================
    4.55 ---- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/threads.cpp
    4.56 -+++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/threads.cpp
    4.57 -@@ -42,6 +42,7 @@
    4.58 - #include <iostream>
    4.59 - #  if HAVE_PTHREAD_H
    4.60 - // Use POSIX threading...
    4.61 -+#include <climits>
    4.62 - 
    4.63 - int fl_create_thread(Fl_Thread& t, void *(*f) (void *), void* p)
    4.64 - {
    4.65 -Index: cinepaint-0.22-1/plug-ins/pdf/pdf.cpp
    4.66 -===================================================================
    4.67 ---- cinepaint-0.22-1.orig/plug-ins/pdf/pdf.cpp
    4.68 -+++ cinepaint-0.22-1/plug-ins/pdf/pdf.cpp
    4.69 -@@ -39,6 +39,7 @@
    4.70 - 
    4.71 - #include "pdf.h"
    4.72 - #include "pdf_dialog.h"
    4.73 -+#include <cstring>
    4.74 - 
    4.75 - extern "C" {
    4.76 - #include <gtk/gtk.h>
     5.1 --- a/cinepaint/stuff/cinepaint-0.22.1-multiple_parameters_named.patch	Tue Aug 07 17:35:57 2012 +0200
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,42 +0,0 @@
     5.4 ---- ./plug-ins/icc_examin/icc_examin/icc_oyranos.h.orig	2008-06-27 19:28:52.000000000 +0200
     5.5 -+++ ./plug-ins/icc_examin/icc_examin/icc_oyranos.h	2008-06-27 19:31:34.000000000 +0200
     5.6 -@@ -142,9 +142,6 @@
     5.7 - 
     5.8 -     // colour transformations
     5.9 -     ColourTransformKey erzeugeTrafo (
    5.10 --                                  const char* eingangs_profil__geraet,
    5.11 --                                  int         byte,
    5.12 --                                  int         kanaele,
    5.13 -                                   const char* ausgangs_profil__geraet,
    5.14 -                                   int         byte,
    5.15 -                                   int         kanaele,
    5.16 -@@ -152,9 +149,6 @@
    5.17 -                                   const char* cmm, // 4 bytes 'lcms' 'APPL'
    5.18 -                                   int         cmm_optionen); // BPC, precission
    5.19 -     ColourTransformKey erzeugeTrafo (
    5.20 --                                  const char* eingangs_profil__geraet,
    5.21 --                                  int         byte,
    5.22 --                                  int         kanaele,
    5.23 -                                   const char* ausgangs_profil__geraet,
    5.24 -                                   int         byte,
    5.25 -                                   int         kanaele,
    5.26 -@@ -163,9 +157,6 @@
    5.27 -                                   int         cmm_optionen,
    5.28 -                                   std::list<const char*> &profile );
    5.29 -     ColourTransformKey erzeugeTrafo (
    5.30 --                                  const char* eingangs_profil__geraet,
    5.31 --                                  int         byte,
    5.32 --                                  int         kanaele,
    5.33 -                                   const char* ausgangs_profil__geraet,
    5.34 -                                   int         byte,
    5.35 -                                   int         kanaele,
    5.36 -@@ -181,9 +172,6 @@
    5.37 -     std::string cmm;
    5.38 -   private:
    5.39 -     ColourTransformKey erzeugeSchluessel_ (
    5.40 --                                  const char* eingangs_profil__geraet,
    5.41 --                                  int         byte,
    5.42 --                                  int         kanaele,
    5.43 -                                   const char* ausgangs_profil__geraet,
    5.44 -                                   int         byte,
    5.45 -                                   int         kanaele,