[cinepaint] Build for new Oyranos 0.1.10

Nicolas Chauvet kwizart at fedoraproject.org
Fri Aug 27 16:05:37 UTC 2010


commit 11314348c59c28474f66364f95fb726582b9be65
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Fri Aug 27 18:06:00 2010 +0200

    Build for new Oyranos 0.1.10

 .gitignore                           |    2 +
 cinepaint-0.22-ENOY.patch            |   13 +
 cinepaint-0.22-md5_rm_RSA.patch      |  644 ----------------------------------
 cinepaint-0.22-upd_pdf.patch         |  274 +++++++++++++++
 cinepaint-0.25-oyranos_cms.patch     |  103 ++++++
 cinepaint-0.25-oyranos_header.patch  |   41 +++
 cinepaint-0.25-oyranos_include.patch |   43 +++
 cinepaint.spec                       |   37 +-
 icc_examin-0.46-default.patch        |   30 --
 icc_examin-0.46-dso.patch            |   12 -
 icc_examin-0.46-overflow.patch       |   12 -
 sources                              |    2 +-
 12 files changed, 497 insertions(+), 716 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 060c81d..8256f7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 cinepaint-0.22-1.tar.gz
 icc_examin-0.46.tar.gz
+/cinepaint-0.22-1.tar.gz
+/icc_examin-0.47.tar.gz
diff --git a/cinepaint-0.22-ENOY.patch b/cinepaint-0.22-ENOY.patch
new file mode 100644
index 0000000..efbc8b6
--- /dev/null
+++ b/cinepaint-0.22-ENOY.patch
@@ -0,0 +1,13 @@
+diff -up cinepaint-0.22-1/plug-ins/pdf/pdf.cpp.enoy cinepaint-0.22-1/plug-ins/pdf/pdf.cpp
+--- cinepaint-0.22-1/plug-ins/pdf/pdf.cpp.enoy	2010-08-27 17:12:34.000000000 +0200
++++ cinepaint-0.22-1/plug-ins/pdf/pdf.cpp	2010-08-27 17:13:38.000000000 +0200
+@@ -377,7 +377,9 @@ load_image(const char* filename)
+     // set a default profile for cmyk
+ #ifdef OYRANOS_H
+ # if OYRANOS_API > 12
++#  if OYRANOS_API < 16
+     using namespace oyranos;
++#endif
+ 
+     if( vals.colourspace == PDF_CMYK )
+       profile_name = oyGetDefaultProfileName (oyEDITING_CMYK, myAllocFunc);
diff --git a/cinepaint-0.22-upd_pdf.patch b/cinepaint-0.22-upd_pdf.patch
new file mode 100644
index 0000000..68c5636
--- /dev/null
+++ b/cinepaint-0.22-upd_pdf.patch
@@ -0,0 +1,274 @@
+diff -up cinepaint-0.22-1/plug-ins/pdf/pdf.cpp.origin cinepaint-0.22-1/plug-ins/pdf/pdf.cpp
+--- cinepaint-0.22-1/plug-ins/pdf/pdf.cpp.origin	2010-08-27 16:15:41.000000000 +0200
++++ cinepaint-0.22-1/plug-ins/pdf/pdf.cpp	2010-08-27 16:22:27.000000000 +0200
+@@ -2,7 +2,7 @@
+  * load of Adobe PDF's;
+  *  plug-in for cinepaint.
+  *
+- * Copyright (C) 2005-2006 Kai-Uwe Behrmann <ku.b at gmx.de>
++ * Copyright (C) 2005-2008 Kai-Uwe Behrmann <ku.b at gmx.de>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -36,6 +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"
+@@ -51,6 +52,8 @@ extern "C" {
+ #endif
+ }
+ 
++#define WARN_S(text) cout <<__FILE__<<":"<<__LINE__<<" "<< text << endl;
++
+ // Declare some local functions:
+ 
+ void   query		(void);
+@@ -103,21 +106,21 @@ readFilePtrToMem_(FILE *fp, size_t *size
+         /* check again */
+         if (!s)
+         {
+-          printf("no file size %d \n", s);
++          WARN_S("no file size" << s);
+           *size = 0;
+           if (mem) free (mem);
+           mem = 0;
+         } else *size = s;
+       }
+     } else {
+-      printf( "no file provided\n" );
++      WARN_S( "no file provided" );
+     }
+   }
+ 
+   return mem;
+ }
+ 
+-#define GS_VERSION_COMMAND "export PATH=$PATH:/opt/local/bin/usr/local/bin; gs --version"
++#define GS_VERSION_COMMAND "export PATH=$PATH:/opt/local/bin:/usr/local/bin; gs --version"
+ 
+ void
+ query ()
+@@ -140,7 +143,7 @@ query ()
+   #ifndef WIN32
+   dependency_error = system(GS_VERSION_COMMAND);
+   if(dependency_error > 0x200)
+-    printf("The PDF interpreter Ghostscript is not installed.");
++    WARN_S("The PDF interpreter Ghostscript is not installed.");
+   #endif
+ 
+ 
+@@ -193,14 +196,19 @@ run (char    *name,		// I - Name of call
+       char *block = readFilePtrToMem_(fp, &size);
+       if(block && size)
+       {
+-        float v = atof(block);
++        float v = 0;
++
++#ifdef ENABLE_NLS
++        setlocale(LC_NUMERIC, "C");
++#endif
++        v = atof(block);
+         if(v > 8.4)
+         {
+           vals.gs_has_tiff32nc = 1;
+           fprintf( stderr, "gs v%.02f has tiff32nc\n", v);
+         } else
+           fprintf( stderr, "disabling tiff32nc for gs v%.02f\n", v);
+-      } else printf("popen failed with: %s\n", GS_VERSION_COMMAND);
++      } else WARN_S("popen failed with: " << GS_VERSION_COMMAND);
+       if(fp) pclose(fp);
+     }
+ 
+@@ -257,8 +265,6 @@ run (char    *name,		// I - Name of call
+   gimp_set_data ("load_pdf", &vals, sizeof(Vals));
+ }
+ 
+-#define WARN_S(text) cout <<__FILE__<<":"<<__LINE__<<" "<< text << endl;
+-
+ #include <errno.h>
+ #include <sys/stat.h>
+ int
+@@ -366,10 +372,52 @@ load_image(const char* filename)
+ 
+     DBG;
+ 
++  char * profile_name = 0;
++
++    // set a default profile for cmyk
++#ifdef OYRANOS_H
++# if OYRANOS_API > 12
++    using namespace oyranos;
++
++    if( vals.colourspace == PDF_CMYK )
++      profile_name = oyGetDefaultProfileName (oyEDITING_CMYK, myAllocFunc);
++    else
++      profile_name = oyGetDefaultProfileName (oyASSUMED_RGB, myAllocFunc);
++    if(!profile_name)
++      WARN_S( "no profile found" )
++    else
++      WARN_S( "profile found " << profile_name )
++# endif
++#endif 
++
++  {
++    char* prof_mem = 0;
++    size_t size = 0;
++#ifdef OYRANOS_H
++# if OYRANOS_API > 12
++    if(	!oyCheckProfile (profile_name, 0) )
++      prof_mem = (char*)oyGetProfileBlock( profile_name, &size, myAllocFunc );
++# endif
++#endif 
++
++    std::stringstream ss;
++
++    if( vals.interpreter == GHOSTSCRIPT )
++    if( vals.colourspace == PDF_CMYK )
++    {
++#ifdef OYRANOS_H
++      ss << "p=\"" << oyGetPathFromProfileName(profile_name, 0) << "/"
++         << profile_name <<"\"; ";
++      ss << "icc2ps -o \"$p\" -t 3 > " << vals.name << "_crd.ps; ";
++      ss<<"echo \"/Current /ColorRendering findresource setcolorrendering\" >> "
++         << vals.name << "_crd.ps; ";
++#endif
++    }
++
+     int interpreter_ok = -1;
+ 
+-    if( vals.ok ) {
+-      std::stringstream ss;
++    if( vals.ok )
++    {
+       if (strlen(vals.command))
+         ss << vals.command << " ";
+       else if( vals.interpreter == GHOSTSCRIPT )
+@@ -411,9 +459,17 @@ load_image(const char* filename)
+         if( vals.aa_text )
+           ss << "-dTextAlphaBits=4 -dAlignToPixels=1 -dNOPLATFONTS ";
+         ss << "-sOutputFile=" << vals.name << " ";
++#ifdef OYRANOS_H
++        if( vals.colourspace == PDF_CMYK )
++          ss << "-f " << vals.name << "_crd.ps ";
++#endif
+         ss << "'" << filename << "'";
+ 
+-        { const char* c = ss.str().c_str();
++        {
++          std::string str = ss.str();
++          const char* c = str.c_str();
++          fputs (c, stderr);
++          fputs ("  \n", stderr);
+           interpreter_ok = system (c);
+         }
+ 
+@@ -430,6 +486,8 @@ load_image(const char* filename)
+           ss << " ";
+         ss << " " << filename << " " << vals.name;
+ 
++        fputs (ss.str().c_str(), stderr);
++        fputs ("  \n", stderr);
+         interpreter_ok = system (ss.str().c_str());
+       }
+       DBG;
+@@ -437,54 +495,37 @@ load_image(const char* filename)
+       cout << ss.str() << endl;
+       #endif
+     } else
++    {
+       #ifdef DEBUG
+       cout << "vals.ok " << vals.ok << endl;
+       #endif
++    }
+ 
+ 
+-  DBG;
+-  if(interpreter_ok == 0) {
+-  return_vals = gimp_run_procedure ("gimp_file_load",
++    DBG;
++    if(interpreter_ok == 0) {
++    return_vals = gimp_run_procedure ("gimp_file_load",
+                                     &n_retvals,
+                                     GIMP_PDB_INT32, GIMP_RUN_INTERACTIVE,
+                                     GIMP_PDB_STRING, vals.name,
+                                     GIMP_PDB_STRING, vals.name,
+                                     GIMP_PDB_END);
+-  } else
+-    printf("Interpreter daneben.\n");
+-  if (n_retvals) {
+-    if (return_vals[0].data.d_status != GIMP_PDB_SUCCESS)
+-      image_ID = -1;
+-    else
+-      image_ID = return_vals[1].data.d_image;
+-    gimp_destroy_params (return_vals, n_retvals);
+-  }
+-
+-  //erase_file( vals.name );
+-
+-  char * profile_name = 0;
+-
+-    // set a default profile for cmyk
+-#ifdef OYRANOS_H
+-# if OYRANOS_API > 12
+-    using namespace oyranos;
+-
+-    if( vals.colourspace == PDF_CMYK )
+-      profile_name = oyGetDefaultProfileName (oyASSUMED_CMYK, myAllocFunc);
+-    else
+-      profile_name = oyGetDefaultProfileName (oyASSUMED_RGB, myAllocFunc);
+-# endif
+-#endif 
++    } else
++      fputs ("Interpreter failed.\n", stderr);
++    if (n_retvals) {
++      if (return_vals[0].data.d_status != GIMP_PDB_SUCCESS)
++        image_ID = -1;
++      else
++        image_ID = return_vals[1].data.d_image;
++      gimp_destroy_params (return_vals, n_retvals);
++    }
+ 
+-  if( vals.colourspace == PDF_CMYK ) {
+-    char* prof_mem = 0;
+-    size_t size = 0;
++    erase_file( vals.name );
++    ss.str("");
+ #ifdef OYRANOS_H
+-# if OYRANOS_API > 12
+-    if(	!oyCheckProfile (profile_name, "Cmyk") )
+-      prof_mem = (char*)oyGetProfileBlock( profile_name, &size, myAllocFunc );
+-# endif
+-#endif 
++    ss << vals.name << "_crd.ps";
++    erase_file( ss.str().c_str() );
++#endif
+ 
+     if( !prof_mem )
+     {
+@@ -499,6 +540,8 @@ load_image(const char* filename)
+       free ( prof_mem );
+       size = 0;
+     }
++
++    gimp_image_set_filename( image_ID, (char*)filename );
+   }
+ 
+   return image_ID;
+@@ -512,11 +555,10 @@ view_doc ()
+   snprintf(tmp, 1023, vals.filename);
+   snprintf(file, 1023, strrchr(tmp, '/'));
+   char *ptr = strrchr(tmp, '/');
+-  char* viewer = NULL;
++  const char* viewer = NULL;
+   *ptr = 0;
+   snprintf(dir, 1023, tmp);
+-  printf("%s:%d %s()\n",__FILE__,__LINE__,__func__);
+-  cout << dir << file << tmp << endl;
++  WARN_S( dir << file << tmp );
+ 
+   // change the path to the picture
+   ss << "(cd " << dir << "; ";
diff --git a/cinepaint-0.25-oyranos_cms.patch b/cinepaint-0.25-oyranos_cms.patch
new file mode 100644
index 0000000..7c04fd7
--- /dev/null
+++ b/cinepaint-0.25-oyranos_cms.patch
@@ -0,0 +1,103 @@
+--- app/cms.c	2008-12-02 11:36:18.000000000 +0100
++++ app/cms.c	2010-07-24 13:37:13.516509713 +0200
+@@ -763,11 +763,13 @@
+               min_len = 24,  /* formatting */
+               len, i;
+ 
++    return profile_info;
++
+     text = malloc(256);
+ 
+ 
+ #if LCMS_VERSION >= 113 /* formatting */
+-    if (cmsIsTag(hProfile, icSigCopyrightTag)) {
++    if (0 && cmsIsTag(hProfile, icSigCopyrightTag)) {
+         len = strlen (cmsTakeCopyright(hProfile)) /*rsr 16*/;
+         if (len > min_len)
+             min_len = len + 1;
+@@ -817,7 +819,7 @@
+     }
+ #endif
+ #if LCMS_VERSION >= 113
+-    if (cmsIsTag(hProfile, icSigCopyrightTag)) {
++    if (0 && cmsIsTag(hProfile, icSigCopyrightTag)) {
+       tmp = cmsTakeCopyright(hProfile);
+       if(tmp && strlen(tmp))
+       {
+@@ -2570,10 +2572,7 @@
+ {
+   if(gimage)
+   {
+-
+-    if( !gimage_get_cms_profile( gimage ) )
+-    {
+-      CMSProfileType type = ICC_IMAGE_PROFILE;
++    CMSProfileType type = ICC_IMAGE_PROFILE;
+ 
+ #ifdef HAVE_OY
+       char * p_name = NULL;
+@@ -2595,18 +2594,21 @@
+                break;
+         }
+ 
+-      switch(oyGetBehaviour( oyBEHAVIOUR_ACTION_UNTAGGED_ASSIGN ))
+-      {
+-        case oyNO:  /* do nothing, preserve numbers */
+-             break;
+-        case oyYES: /* assign assumed profile */
+-             cms_gimage_check_profile( gimage, type );
+-             break;
+-        case oyASK: /* call dialog */
+-             cms_open_assign_dialog( gimage );
+-             break;
+-      }
+ 
++    if( !gimage_get_cms_profile( gimage ) )
++    {
++      if ((cms_open_action == CMS_ASSIGN_DEFAULT) &&
++         (cms_default_image_profile_name != NULL)) 
++        { cms_gimage_check_profile(gimage, type);
++        }
++        else if (cms_open_action == CMS_ASSIGN_PROMPT)
++        { cms_open_assign_dialog(gimage);
++        }
++    }
++
++#endif
++
++#ifdef HAVE_OY
+       if ((p_name != NULL) && (gimage_get_cms_profile(gimage) != NULL))
+       {
+         CMSProfile *editing_profile = cms_get_profile_from_file( p_name );
+@@ -2621,19 +2623,8 @@
+                                    bpc ? cmsFLAGS_WHITEBLACKCOMPENSATION : 0 );
+ 	}
+       }
+-      if(p_name)
+-        free(p_name); p_name = NULL;
+-
+ #else        
+ 
+-      if ((cms_open_action == CMS_ASSIGN_DEFAULT) &&
+-         (cms_default_image_profile_name != NULL)) 
+-        { cms_gimage_check_profile(gimage, type);
+-        }
+-        else if (cms_open_action == CMS_ASSIGN_PROMPT)
+-        { cms_open_assign_dialog(gimage);
+-        }
+-
+       /* if a workspace profile is given and it's not equal the 
+          image profile, check whether to convert */
+       if ((cms_workspace_profile_name != NULL) && (gimage_get_cms_profile(gimage) != NULL))
+@@ -2651,7 +2642,8 @@
+ 
+ #endif
+ 
+-    }
++    if(p_name)
++      free(p_name); p_name = NULL;
+ 
+     if(!gimage_get_cms_proof_profile( gimage ))
+       cms_gimage_check_profile( gimage, ICC_PROOF_PROFILE );
+
+
diff --git a/cinepaint-0.25-oyranos_header.patch b/cinepaint-0.25-oyranos_header.patch
new file mode 100644
index 0000000..b3daf8d
--- /dev/null
+++ b/cinepaint-0.25-oyranos_header.patch
@@ -0,0 +1,41 @@
+diff -ur cinepaint-0.25.0/plug-ins/pdf/pdf.cpp ./plug-ins/pdf/pdf.cpp
+--- cinepaint-0.25.0/plug-ins/pdf/pdf.cpp	2008-10-10 07:33:07.000000000 +0200
++++ ./plug-ins/pdf/pdf.cpp	2008-12-30 13:12:27.000000000 +0100
+@@ -47,8 +47,16 @@
+ #include "lib/wire/libtile.h"
+ #include "plugin_pdb.h"
+ #include "libgimp/stdplugins-intl.h"
+-#ifdef HAVE_OY
++
++#if HAVE_OY
++# if OYRANOS_NVERSION > 107
++#include <oyranos.h>
++# else
+ #include <oyranos/oyranos.h>
++# endif
++# ifndef OYRANOS_VERSION
++# define OYRANOS_VERSION 0
++# endif
+ #endif
+ }
+ 
+diff -ur cinepaint-0.25.0/plug-ins/tiff/tiff.c ./plug-ins/tiff/tiff.c
+--- cinepaint-0.25.0/plug-ins/tiff/tiff.c	2007-05-11 14:58:30.000000000 +0200
++++ ./plug-ins/tiff/tiff.c	2008-12-30 13:12:16.000000000 +0100
+@@ -168,8 +168,15 @@
+ #include "info.h"
+ #include "gui.h"
+ 
+-#ifdef HAVE_OY
++#if HAVE_OY
++# if OYRANOS_NVERSION > 107
++#include <oyranos.h>
++# else
+ #include <oyranos/oyranos.h>
++# endif
++# ifndef OYRANOS_VERSION
++# define OYRANOS_VERSION 0
++# endif
+ #endif
+ 
+ /*** struct definitions ***/
diff --git a/cinepaint-0.25-oyranos_include.patch b/cinepaint-0.25-oyranos_include.patch
new file mode 100644
index 0000000..7814a12
--- /dev/null
+++ b/cinepaint-0.25-oyranos_include.patch
@@ -0,0 +1,43 @@
+--- app/cms.c	2010-07-26 08:54:44.024451199 +0200
++++ app/cms.c	2010-07-25 21:57:19.196512212 +0200
+@@ -37,15 +37,20 @@
+ #endif
+ 
+ #ifdef HAVE_OY
+-#include <oyranos/oyranos.h>
+ #ifndef OYRANOS_VERSION
+ #define OYRANOS_VERSION 0
+ #endif
+ #if OYRANOS_VERSION < 108
++#include <oyranos/oyranos.h>
+ #include <arpa/inet.h>  /* ntohl */
+ #include <oyranos/oyranos_monitor.h>
+ #else
+-#include <oyranos/oyranos_alpha.h>
++#include <oyranos.h>
++#if OYRANOS_VERSION < 110
++#include <oyranos_alpha.h>
++#else
++#include <alpha/oyranos_alpha.h>
++#endif
+ #endif
+ #endif
+ 
+--- app/main.c	2010-07-26 08:54:44.050451458 +0200
++++ app/main.c	2010-07-25 21:08:48.700385102 +0200
+@@ -54,9 +54,15 @@
+ #endif   /*  WAIT_ANY  */
+ 
+ #ifdef HAVE_OY
++# if OYRANOS_VERSION > 107
++#include <oyranos.h>
++#include <oyranos_config.h>
++#include <oyranos_version.h>
++# else
+ #include <oyranos/oyranos.h>
+ #include <oyranos/oyranos_config.h>
+ #include <oyranos/oyranos_version.h>
++# endif
+ char *oyranos_temp_path = NULL;
+ void *myAlloc(size_t n) { return calloc(sizeof(char), n); }
+ #endif
diff --git a/cinepaint.spec b/cinepaint.spec
index cbffd44..f32fc8c 100644
--- a/cinepaint.spec
+++ b/cinepaint.spec
@@ -6,7 +6,7 @@
 
 Name:           cinepaint
 Version:        %(echo %{cinever} |sed 's|-|.|')
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        CinePaint is a tool for manipulating images
 
 Group:          Applications/Multimedia
@@ -14,21 +14,22 @@ 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://downloads.sourceforge.net/oyranos/icc_examin-0.46.tar.gz
+Source1:        http://downloads.sourceforge.net/oyranos/icc_examin-0.47.tar.gz
 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
 Patch9:         cinepaint-0.22-1-underquoted.patch
 Patch10:        cinepaint-0.22-gcc44.patch
-Patch11:        icc_examin-0.46-default.patch
 Patch12:        cinepaint-0.22-oyranos19.patch
 Patch13:        cinepaint-0.22-1-dso.patch
-Patch14:        icc_examin-0.46-overflow.patch
-Patch15:        icc_examin-0.46-dso.patch
+Patch14:        cinepaint-0.22-upd_pdf.patch
+Patch15:        cinepaint-0.22-ENOY.patch
+Patch16:        cinepaint-0.25-oyranos_include.patch
+Patch17:        cinepaint-0.25-oyranos_cms.patch
+Patch18:        cinepaint-0.25-oyranos_header.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #ifnarch %{ix86} ppc
@@ -95,11 +96,11 @@ This package contains development files for %{name}.
 
 %prep
 %setup -q -n cinepaint-%{cinever}
+%setup -q -D -T -a 1 -n cinepaint-%{cinever}
 %patch1 -p1 -b .symbol
 %patch2 -p1 -b .rm_rpath
 %patch3 -p1 -b .req
 %patch4 -p1 -b .libdir
-%patch5 -p1 -b .rm_RSA
 %patch6 -p1 -b .multilib
 %patch8 -p1 -b .gcc43_cine
 #Fix #450325
@@ -107,20 +108,17 @@ This package contains development files for %{name}.
 #Fix to prevent a multilibs problem
 touch -r cinepaint.m4.underquoted cinepaint.m4
 %patch10 -p1 -b .gcc44
-
-%setup -q -D -T -a 1 -n cinepaint-%{cinever}
-pushd icc_examin-0.46
-%patch11 -p1 -b .icc_def
-%patch14 -p1 -b .overflow
-%patch15 -p1 -b .dso
-popd
-
 %patch12 -p1 -b .oy19
 %patch13 -p1 -b .dso
+%patch14 -p1 -b .upd
+%patch15 -p1 -b .enoy
+%patch16 -p0 -b .inc
+%patch17 -p0 -b .cms
+%patch18 -p0 -b .headers
 
 # Update bundled version of icc_examin
 rm -rf plug-ins/icc_examin/icc_examin
-cp -pR icc_examin-0.46 plug-ins/icc_examin/icc_examin
+cp -pR icc_examin-0.47 plug-ins/icc_examin/icc_examin
 
 #ifnarch %{ix86} ppc
 autoconf -f -i
@@ -132,10 +130,12 @@ done
 sed -i 's|\r||'  NEWS COPYING
 
 # prevent interp_md5 to be used
-rm plug-ins/script-fu/interp_md5.{h,c}
+#rm plug-ins/script-fu/interp_md5.{h,c}
 
 
 %build
+export CFLAGS="$RPM_OPT_FLAGS -DOYRANOS_NVERSION=110 -DOYRANOS_VERSION=110"
+export CXXFLAGS="$RPM_OPT_FLAGS -DOYRANOS_NVERSION=110 -DOYRANOS_VERSION=110"
 %configure \
   --disable-static \
   --enable-pygimp \
@@ -225,6 +225,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Fri Aug 27 2010 Nicolas Chauvet <kwizart at gmail.com> - 0.22.1-19
+- Build for oyranos 0.1.10
+
 * Sun Aug 22 2010 Nicolas Chauvet <kwizart at gmail.com> - 0.22.1-18
 - rebuilt for oyranos
 
diff --git a/sources b/sources
index 568dc91..ebcb71a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 f360587240db6b6d2f0bfd94c420c492  cinepaint-0.22-1.tar.gz
-01b8a19489601850192476a06393cf47  icc_examin-0.46.tar.gz
+cd451499601310d5e8aeb2c20847a12a  icc_examin-0.47.tar.gz


More information about the scm-commits mailing list