rpms/cinepaint/devel cinepaint-0.22-gcc43_cine.patch, NONE, 1.1 icc_examin-0.44-gcc43.patch, NONE, 1.1 cinepaint-0.22-multilib.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 cinepaint.spec, 1.8, 1.9

Chauvet (kwizart) fedora-extras-commits at redhat.com
Fri Mar 7 21:40:10 UTC 2008


Author: kwizart

Update of /cvs/pkgs/rpms/cinepaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14466

Modified Files:
	.cvsignore sources cinepaint.spec 
Added Files:
	cinepaint-0.22-gcc43_cine.patch icc_examin-0.44-gcc43.patch 
	cinepaint-0.22-multilib.patch 
Log Message:
- Add BR Oyranos 0.1.7
- Update icc_examin to 0.44
- Fix cinepaint and icc_examin for gcc43


cinepaint-0.22-gcc43_cine.patch:

--- NEW FILE cinepaint-0.22-gcc43_cine.patch ---
diff -up cinepaint-0.22-1/plug-ins/pdf/pdf.cpp.gcc43_cine cinepaint-0.22-1/plug-ins/pdf/pdf.cpp
--- cinepaint-0.22-1/plug-ins/pdf/pdf.cpp.gcc43_cine	2008-02-27 20:21:42.000000000 +0100
+++ cinepaint-0.22-1/plug-ins/pdf/pdf.cpp	2008-02-27 20:23:24.000000000 +0100
@@ -36,7 +36,7 @@
 #define PLUG_IN_AUTHOR        "Kai-Uwe Behrmann <ku.b at gmx.de>"
 #define PLUG_IN_COPYRIGHT     "Copyright 2005-2006 Kai-Uwe Behrmann"
 
-
+#include <cstring>              // strlen strcmp strrchr
 #include "pdf.h"
 #include "pdf_dialog.h"
 
diff -up cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp.gcc43_cine cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp
--- cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp.gcc43_cine	2008-02-27 19:56:20.000000000 +0100
+++ cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp	2008-02-27 19:57:42.000000000 +0100
@@ -26,6 +26,7 @@
 */
 #include <iostream>
 #include <cmath>                    // pow()
+#include <cstring>                  // strlen strcpy
 
 #include "br_types.hpp"             // ImageID
 #include "br_enums.hpp"             // DataType, ReportWhat
diff -up cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp.gcc43_cine cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp
--- cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp.gcc43_cine	2008-02-27 20:02:53.000000000 +0100
+++ cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp	2008-02-27 20:03:15.000000000 +0100
@@ -34,6 +34,7 @@
 
 
 #include <fstream>
+#include <cstring>              // strlen
 #include "TNT/tnt_misc.hpp"     // proof_least_square_fit()
 #include "TNT/tnt_stopwatch.hpp"
 #include "TNT/jama_qr.hpp"      // JAMA::QR

icc_examin-0.44-gcc43.patch:

--- NEW FILE icc_examin-0.44-gcc43.patch ---
diff -up icc_examin-0.44/icc_oyranos.h.gcc43 icc_examin-0.44/icc_oyranos.h
--- icc_examin-0.44/icc_oyranos.h.gcc43	2007-04-24 19:20:59.000000000 +0200
+++ icc_examin-0.44/icc_oyranos.h	2008-02-25 13:44:16.000000000 +0100
@@ -37,6 +37,8 @@
 #include <string>
 #include <list>
 #include <map>
+#include <cstring>
+
 class Oyranos;
 class Speicher;
 class ICCprofile;
@@ -146,8 +148,8 @@ class Oyranos
                                   int         byte,
                                   int         kanaele,
                                   const char* ausgangs_profil__geraet,
-                                  int         byte,
-                                  int         kanaele,
+                                  int         byte2,
+                                  int         kanaele2,
                                   int         farb_intent,
                                   const char* cmm, // 4 bytes 'lcms' 'APPL'
                                   int         cmm_optionen); // BPC, precission
@@ -156,8 +158,8 @@ class Oyranos
                                   int         byte,
                                   int         kanaele,
                                   const char* ausgangs_profil__geraet,
-                                  int         byte,
-                                  int         kanaele,
+                                  int         byte2,
+                                  int         kanaele2,
                                   int         farb_intent,
                                   const char* cmm, // 4 bytes 'lcms' 'APPL'
                                   int         cmm_optionen,
@@ -167,8 +169,8 @@ class Oyranos
                                   int         byte,
                                   int         kanaele,
                                   const char* ausgangs_profil__geraet,
-                                  int         byte,
-                                  int         kanaele,
+                                  int         byte2,
+                                  int         kanaele2,
                                   int         farb_intent,
                                   const char* cmm, // 4 bytes 'lcms' 'APPL'
                                   int         cmm_optionen,
@@ -185,8 +187,8 @@ class Oyranos
                                   int         byte,
                                   int         kanaele,
                                   const char* ausgangs_profil__geraet,
-                                  int         byte,
-                                  int         kanaele,
+                                  int         byte2,
+                                  int         kanaele2,
                                   int         farb_intent,
                                   int         cmm_optionen,
                                   const char* simulations_profil,
diff -up icc_examin-0.44/icc_speicher.h.gcc43 icc_examin-0.44/icc_speicher.h
--- icc_examin-0.44/icc_speicher.h.gcc43	2007-04-25 16:36:35.000000000 +0200
+++ icc_examin-0.44/icc_speicher.h	2008-02-25 13:44:16.000000000 +0100
@@ -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
diff -up icc_examin-0.44/icc_oyranos_extern.cpp.gcc43 icc_examin-0.44/icc_oyranos_extern.cpp
--- icc_examin-0.44/icc_oyranos_extern.cpp.gcc43	2008-02-25 13:50:04.000000000 +0100
+++ icc_examin-0.44/icc_oyranos_extern.cpp	2008-02-25 13:51:52.000000000 +0100
@@ -29,6 +29,7 @@
 
 #include "icc_utils.h"
 #include "icc_fenster.h"
+#include <cstdlib>
 
 using namespace icc_examin_ns;
 

cinepaint-0.22-multilib.patch:

--- NEW FILE cinepaint-0.22-multilib.patch ---
diff -up cinepaint-0.22-1/cinepainttool.in.multilib cinepaint-0.22-1/cinepainttool.in
--- cinepaint-0.22-1/cinepainttool.in.multilib	2008-03-07 21:48:32.000000000 +0100
+++ cinepaint-0.22-1/cinepainttool.in	2008-03-07 21:52:08.000000000 +0100
@@ -4,7 +4,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
 datarootdir=@datarootdir@
-plug_in_dir=@programplugindir@
+plug_in_dir=`pkg-config --variable programplugindir cinepaint-gtk`
 programdotdir=@programdotdir@
 programdatadir=@programdatadir@
 datadir=@datadir@
@@ -71,8 +71,8 @@ if test $# -eq 0; then
 fi
 
 if test x${GTK_CONFIG+set} != xset ; then
-  gtk_cflags="@GTK_CFLAGS@ -I$include_dir"
-  gtk_libs='@GTK_LIBS@'
+  gtk_cflags="`pkg-config --cflags gtk+-2.0` -I$include_dir"
+  gtk_libs="`pkg-config --libs gtk+-2.0`"
 else
   gtk_cflags=`$GTK_CONFIG --cflags`
   gtk_libs=`$GTK_CONFIG --libs`
@@ -89,7 +89,7 @@ else
 fi
 
 if test x${CFLAGS+set} != xset ; then
-  cflags='@CFLAGS@'
+  cflags="$CFLAGS"
 else
   cflags="$CFLAGS"
 fi
@@ -165,9 +165,9 @@ while test $# -gt 0; do
       ;;
     --libs | --libs-nocinepaintui)
       my_gtk_libs=
-      libdirs=-L at libdir@
+      libdirs="-L`pkg-config --variable libdir cinepaint-gtk`"
       for i in $gtk_libs ; do
-        if test $i != -L at libdir@ ; then
+        if test $i != -L$(pkg-config --variable libdir cinepaint-gtk) ; then
           if test -z "$my_gtk_libs" ; then
             my_gtk_libs="$i"
           else


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cinepaint/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Jul 2007 10:17:09 -0000	1.2
+++ .cvsignore	7 Mar 2008 21:39:36 -0000	1.3
@@ -1 +1,2 @@
 cinepaint-0.22-1.tar.gz
+icc_examin-0.44.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cinepaint/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jul 2007 10:17:09 -0000	1.2
+++ sources	7 Mar 2008 21:39:36 -0000	1.3
@@ -1 +1,2 @@
 f360587240db6b6d2f0bfd94c420c492  cinepaint-0.22-1.tar.gz
+81e9bba15a777d53fbeb03acd65f7338  icc_examin-0.44.tar.gz


Index: cinepaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cinepaint/devel/cinepaint.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cinepaint.spec	19 Feb 2008 10:29:51 -0000	1.8
+++ cinepaint.spec	7 Mar 2008 21:39:36 -0000	1.9
@@ -13,22 +13,27 @@
 License:        GPLv2+ and LGPLv2+ and MIT
 URL:            http://www.cinepaint.org/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{cinever}.tar.gz
+# http://www.behrmann.name/index.php?option=com_content&task=view&id=33&Itemid=69
+Source1:        http://kwizart.fedorapeople.org/SOURCES/icc_examin-0.44.tar.gz
 Patch0:         cinepaint-0.22-0-icc_helfer_fltk.patch
 Patch1:         cinepaint-0.22-0-nonweak-symbol.patch
 Patch2:         cinepaint-0.22-0-rm_rpath.patch
 Patch3:         cinepaint-0.22-0-pc_req.patch
 Patch4:         cinepaint-0.22-0-libdir.patch
 Patch5:         cinepaint-0.22-md5_rm_RSA.patch
+Patch6:         cinepaint-0.22-multilib.patch
+Patch8:         cinepaint-0.22-gcc43_cine.patch
+Patch11:        icc_examin-0.44-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%ifnarch %{ix86} ppc
+#ifnarch %{ix86} ppc
 BuildRequires:  autoconf
-%endif
+#endif
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-utils
 BuildRequires:  flex
 BuildRequires:  fltk-devel
-BuildRequires:  ftgl-devel 
+BuildRequires:  ftgl-devel
 BuildRequires:  gettext
 BuildRequires:  gtk2-devel >= 2.10.8
 BuildRequires:  gutenprint-devel >= 5.0.0
@@ -40,11 +45,11 @@
 BuildRequires:  libXpm-devel
 BuildRequires:  libXxf86vm-devel
 BuildRequires:  OpenEXR-devel >= 1.6.0
-#BuildRequires:  oyranos-devel
+BuildRequires:  oyranos-devel
 
 Requires:       freefont
 Requires:       pygtk2
-#Requires:       oyranos
+Requires:       oyranos
 Requires:       %{name}-libs = %{version}-%{release}
 
 Requires(post): desktop-file-utils
@@ -88,10 +93,25 @@
 %patch3 -p1 -b .req
 %patch4 -p1 -b .libdir
 %patch5 -p1 -b .rm_RSA
+%patch6 -p1 -b .multilib
+%patch8 -p1 -b .gcc43_cine
+
+%setup -q -D -T -a 1 -n cinepaint-%{cinever}
+pushd icc_examin-0.44
+%patch11 -p1 -b .gcc43
+popd
+
+rm -rf plug-ins/icc_examin/icc_examin
+# Fix default path FreeSans.ttf
+sed -i -e 's|/usr/X11R6/lib/X11/fonts/truetype/FreeSans.ttf|%{_datadir}/fonts/freefont/FreeSans.ttf|' \
+ icc_examin-0.44/icc_gl.cpp
+sed -i -e 's|fonts/FreeSans.ttf|fonts/freefont/FreeSans.ttf|' icc_examin-0.44/icc_gl.cpp
+
+cp -pR icc_examin-0.44 plug-ins/icc_examin/icc_examin
 
-%ifnarch %{ix86} ppc
+#ifnarch %{ix86} ppc
 autoconf
-%endif
+#endif
 
 for i in AUTHORS COPYING LICENSE README ;do
   install -p -m 0644 libhalf/$i $i.libhalf
@@ -140,6 +160,9 @@
   --mode 644                                         \
 ${RPM_BUILD_ROOT}%{_datadir}/applications/cinepaint.desktop
 
+# Fix multilib cinepaint-devel
+touch -r ChangeLog ${RPM_BUILD_ROOT}%{_bindir}/cinepainttool
+
 
 %find_lang %{name}
 %find_lang cinepaint-script-fu
@@ -166,8 +189,8 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
-%exclude %{_bindir}/cinepainttool
-%{_bindir}/*
+%{_bindir}/cinepaint
+%{_bindir}/cinepaint-remote
 %{_mandir}/man1/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
@@ -195,8 +218,12 @@
 
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.22.1-6
-- Autorebuild for GCC 4.3
+* Fri Mar  7 2008 kwizart < kwizart at gmail.com > - 0.22.1-7
+- Add BR Oyranos 0.1.7
+
+* Wed Feb 15 2008 kwizart < kwizart at gmail.com > - 0.22.1-6
+- Update icc_examin to 0.44
+- Fix cinepaint and icc_examin for gcc43
 
 * Mon Oct 15 2007 kwizart < kwizart at gmail.com > - 0.22.1-5
 - Rebuild to new OpenEXR




More information about the fedora-extras-commits mailing list