From 728f6e408ec0587f123b136bc98ec357b7593239 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 30 Mar 2013 09:45:27 +0100 Subject: [PATCH] - added oyranos patch (fixes build with oyranos 0.9.4) - release 1 --- cinepaint-oyranos.patch | 107 ++++++++++++++++++++++++++++++++++++++++ cinepaint.spec | 6 ++- 2 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 cinepaint-oyranos.patch diff --git a/cinepaint-oyranos.patch b/cinepaint-oyranos.patch new file mode 100644 index 0000000..02e01e4 --- /dev/null +++ b/cinepaint-oyranos.patch @@ -0,0 +1,107 @@ +--- cinepaint/plug-ins/icc_examin/icc_examin/configure.sh.orig 2008-10-24 21:05:23.000000000 +0200 ++++ cinepaint/plug-ins/icc_examin/icc_examin/configure.sh 2013-03-29 21:35:26.036257910 +0100 +@@ -171,7 +171,7 @@ + # test -n "$ECHO" && $ECHO "Oyranos `pkg-config --modversion oyranos` detected" + echo "#define HAVE_OY 1" >> $CONF_H + echo "OY = 1" >> $CONF +- echo "OYRANOS_H = `oyranos-config --cflags`" >> $CONF ++ echo "OYRANOS_H = `oyranos-config --cflags` `oyranos-config --cflags`/alpha" >> $CONF + # echo "OYRANOS_H = `pkg-config --cflags oyranos_monitor`" >> $CONF + if [ -f /usr/X11R6/include/X11/extensions/xf86vmode.h ]; then + pkg-config --exists oyranos_monitor +--- cinepaint/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.h.orig 2008-08-22 20:11:18.000000000 +0200 ++++ cinepaint/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.h 2013-03-29 21:50:48.619572400 +0100 +@@ -39,7 +39,7 @@ + #endif + #if OYRANOS_VERSION > 107 + # include +-# include ++# include + #endif + #endif + #include "icc_icc.h" +--- cinepaint/plug-ins/icc_examin/icc_examin/icc_oyranos.cpp.orig 2008-10-24 22:15:51.000000000 +0200 ++++ cinepaint/plug-ins/icc_examin/icc_examin/icc_oyranos.cpp 2013-03-29 21:57:46.776229932 +0100 +@@ -161,7 +161,7 @@ + Speicher *v_block = &lab_; + if( !v_block->size() ) + { DBG_PROG_V( v_block->size() ) +- char* profil_name = oyGetDefaultProfileName( oyranos::oyASSUMED_LAB, myAllocFunc ); ++ char* profil_name = oyGetDefaultProfileName( oyASSUMED_LAB, myAllocFunc ); + if(profil_name) + DBG_PROG_V( (int*)profil_name << profil_name ); + if( profil_name && +@@ -472,7 +472,7 @@ + Speicher *v_block = &rgb_; + if( !v_block->size() ) + { DBG_PROG_V( v_block->size() ) +- const char* profil_name = oyGetDefaultProfileName( oyranos::oyASSUMED_RGB, myAllocFunc ); ++ const char* profil_name = oyGetDefaultProfileName( oyASSUMED_RGB, myAllocFunc ); + if(profil_name) + DBG_PROG_V( (intptr_t)profil_name << profil_name ); + if( profil_name && +@@ -523,7 +523,7 @@ + Speicher *v_block = &cmyk_; + if( !v_block->size() ) + { DBG_PROG_V( v_block->size() ) +- char* profil_name = oyGetDefaultProfileName( oyranos::oyASSUMED_CMYK, myAllocFunc ); ++ char* profil_name = oyGetDefaultProfileName( oyASSUMED_CMYK, myAllocFunc ); + if(profil_name) {DBG_PROG_V( profil_name ); + } else { DBG_PROG_V( (intptr_t)profil_name );} + +@@ -565,7 +565,7 @@ + Speicher *v_block = &proof_; + char* profil_name = NULL; + +- profil_name = oyGetDefaultProfileName( oyranos::oyPROFILE_PROOF, myAllocFunc); ++ profil_name = oyGetDefaultProfileName( oyPROFILE_PROOF, myAllocFunc); + + if( !v_block->size() ) + { DBG_PROG_V( v_block->size() ) +@@ -717,9 +717,11 @@ + + int screen = oyGetScreenFromPosition( display_name, x,y ); + char *new_display_name = changeScreenName_( display_name, screen ); ++ char *dummy_geom, *dummy_port; ++ oyBlob_s *dummy_edit; + //int fehler = + oyGetMonitorInfo( new_display_name, +- &manufacturer, &model, &serial, ++ &manufacturer, &model, &serial, &dummy_geom, &dummy_port, &dummy_edit, + myAllocFunc ); + + if( manufacturer && strlen( manufacturer ) ) +--- cinepaint/plug-ins/pdf/pdf.cpp.orig 2008-10-10 07:44:15.000000000 +0200 ++++ cinepaint/plug-ins/pdf/pdf.cpp 2013-03-29 22:08:45.282882724 +0100 +@@ -47,10 +47,10 @@ + #include "lib/wire/libtile.h" + #include "plugin_pdb.h" + #include "libgimp/stdplugins-intl.h" ++} + #ifdef HAVE_OY + #include + #endif +-} + + #define WARN_S(text) cout <<__FILE__<<":"<<__LINE__<<" "<< text << endl; + +@@ -377,7 +377,6 @@ + // 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); +--- cinepaint/app/cms.c.orig 2009-01-01 00:14:53.000000000 +0100 ++++ cinepaint/app/cms.c 2013-03-29 22:37:04.432847455 +0100 +@@ -45,7 +45,8 @@ + #include /* ntohl */ + #include + #else +-#include ++#include ++#include + #endif + #endif + diff --git a/cinepaint.spec b/cinepaint.spec index 35d8cc6..0141072 100644 --- a/cinepaint.spec +++ b/cinepaint.spec @@ -7,7 +7,7 @@ Summary: CinePaint - a motion picture editing tool Summary(pl.UTF-8): CinePaint - narzędzie do obróbki filmów Name: cinepaint Version: 1.3 -Release: 0.1 +Release: 1 License: GPL v2+ (with LGPL v2.1+ and MIT parts) Group: X11/Applications/Graphics Source0: http://downloads.sourceforge.net/cinepaint/%{name}-%{version}.tgz @@ -18,6 +18,7 @@ Patch2: %{name}-libpng.patch Patch3: %{name}-link.patch Patch4: %{name}-paths.patch Patch5: %{name}-libdir.patch +Patch6: %{name}-oyranos.patch URL: http://www.cinepaint.org/ BuildRequires: OpenEXR-devel >= 1.0.0 BuildRequires: autoconf @@ -29,7 +30,7 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel >= 1.0.0 BuildRequires: libtiff-devel BuildRequires: libtool -#BuildRequires: oyranos-devel +BuildRequires: oyranos-devel BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: rpmbuild(macros) >= 1.219 @@ -119,6 +120,7 @@ Wtyczka do drukowania dla CinePainta. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 # dead symlinks %{__rm} config.guess config.sub py-compile -- 2.44.0