[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/ufraw/FC-6 ufraw-0.11-cmserrorhandler.patch, NONE, 1.1 ufraw-0.11-exiv2.patch, NONE, 1.1 ufraw.spec, 1.12, 1.13



Author: nphilipp

Update of /cvs/pkgs/rpms/ufraw/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2762

Modified Files:
	ufraw.spec 
Added Files:
	ufraw-0.11-cmserrorhandler.patch ufraw-0.11-exiv2.patch 
Log Message:
prevent crash in CMS error handler (#239147)
exiv2 patch (#237846)
eventually put GConf2, shared-mime-info requirements into -common subpackage (#235583)
Resolves: #239147, #237846, #235583


ufraw-0.11-cmserrorhandler.patch:

--- NEW FILE ufraw-0.11-cmserrorhandler.patch ---
--- ufraw-0.11/ufraw_developer.c.cmserrorhandler	2007-02-08 22:31:50.000000000 +0100
+++ ufraw-0.11/ufraw_developer.c	2007-05-24 16:33:21.000000000 +0200
@@ -21,6 +21,17 @@
 #include "nikon_curve.h"
 #include "ufraw.h"
 
+int lcms_message(int ErrorCode, const char *ErrorText)
+{
+    /* Possible ErrorCode:
+     * LCMS_ERRC_WARNING        0x1000
+     * LCMS_ERRC_RECOVERABLE    0x2000
+     * LCMS_ERRC_ABORTED        0x3000 */
+    (void)ErrorCode;
+    ufraw_message(UFRAW_ERROR, "%s", ErrorText);
+    return 1; /* Tell lcms that we handled the error */
+}
+
 developer_data *developer_init()
 {
     int i;
@@ -44,7 +55,7 @@
     d->intent = -1;
     d->updateTransform = TRUE;
     d->colorTransform = NULL;
-    cmsSetErrorHandler((void *)ufraw_message);
+    cmsSetErrorHandler(lcms_message);
     return d;
 }
 

ufraw-0.11-exiv2.patch:

--- NEW FILE ufraw-0.11-exiv2.patch ---
--- ufraw-0.11/configure.ac.exiv2	2007-03-06 15:02:40.000000000 -0600
+++ ufraw-0.11/configure.ac	2007-04-26 08:13:12.000000000 -0500
@@ -185,12 +185,17 @@
 AC_MSG_RESULT($with_exiv2)
 have_exiv2=no
 if test $with_exiv2 = yes; then
+PKG_CHECK_MODULES(EXIV2, exiv2,
+ [ have_exiv2=yes
+   AC_DEFINE(HAVE_EXIV2, 1, have exiv2)],
+ [ 
   AC_CHECK_PROGS(EXIV2_CONFIG, exiv2-config, , $PATH)
   if test -n "$EXIV2_CONFIG"; then
     have_exiv2=yes
     AC_DEFINE(HAVE_EXIV2, 1, have exiv2)
     EXIV2_LIBS=`$EXIV2_CONFIG --libs`
   fi
+ ])
 fi
 
 UFRAW_CFLAGS="$UFRAW_CFLAGS $EXIF_CFLAGS $GIMP_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $LCMS_CFLAGS"
--- ufraw-0.11/ufraw_exiv2.cc.exiv2	2007-02-08 15:28:41.000000000 -0600
+++ ufraw-0.11/ufraw_exiv2.cc	2007-04-26 08:15:51.000000000 -0500
@@ -201,7 +201,8 @@
 }
 catch (Exiv2::AnyError& e) {
     std::cerr.rdbuf(savecerr);
-    ufraw_message(UFRAW_SET_WARNING, "%s\n", e.what().c_str());
+    std::string s(e.what());
+    ufraw_message(UFRAW_SET_WARNING, "%s\n", s.c_str());
     return UFRAW_ERROR;
 }
 


Index: ufraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/FC-6/ufraw.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ufraw.spec	12 Mar 2007 13:29:20 -0000	1.12
+++ ufraw.spec	24 May 2007 14:46:53 -0000	1.13
@@ -14,7 +14,7 @@
 Summary: Tool to retrieve raw image data from digital cameras
 Name: ufraw
 Version: 0.11
-Release: 3%{?dist}
+Release: 8%{?dist}
 Group: Applications/Multimedia
 License: GPL
 URL: http://ufraw.sourceforge.net
@@ -24,25 +24,30 @@
 BuildRequires: gtk2-devel >= 2.6.0
 BuildRequires: lcms-devel
 BuildRequires: libexif-devel >= 0.6.13
-BuildRequires: exiv2-devel >= 0.10
+BuildRequires: exiv2-devel
 BuildRequires: libtiff-devel 
 BuildRequires: libjpeg-devel
 BuildRequires: pkgconfig
 BuildRequires: perl
 BuildRequires: gettext
-Requires(post): GConf2
-Requires(preun): GConf2
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
-Requires(post): shared-mime-info
-Requires(postun): shared-mime-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 %if %splitpackage
 Requires: ufraw-common = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: ufraw < 0.10
 Conflicts: ufraw < 0.10
+%else
+Requires(post): GConf2
+Requires(preun): GConf2
+Requires(post): shared-mime-info
+Requires(postun): shared-mime-info
 %endif
 
+BuildRequires: automake libtool
+Patch1: ufraw-0.11-exiv2.patch
+Patch2: ufraw-0.11-cmserrorhandler.patch
+
 %description
 UFRaw is a tool for opening raw format images of digital cameras.
 
@@ -52,6 +57,10 @@
 Group: Applications/Multimedia
 Obsoletes: ufraw < 0.10
 Conflicts: ufraw < 0.10
+Requires(post): GConf2
+Requires(preun): GConf2
+Requires(post): shared-mime-info
+Requires(postun): shared-mime-info
 
 %description common
 The ufraw-common files includes common files for UFRaw, e.g. language support.
@@ -77,6 +86,10 @@
 EOF
 %setup -q
 
+%patch1 -p1 -b .exiv2
+%patch2 -p1 -b .cmserrorhandler
+./autogen.sh
+
 %build
 %configure --with-exiv2 --with-libexif --enable-mime --enable-extras
 make schemasdir=%{_sysconfdir}/gconf/schemas
@@ -96,7 +109,7 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/ufraw.schemas >& /dev/null
 update-mime-database >& /dev/null || :
-%if ! %splitpackage
+%if %splitpackage
 %post
 %endif
 update-desktop-database >& /dev/null || :
@@ -107,7 +120,7 @@
 
 %postun %{?spkg:common}
 update-mime-database >& /dev/null || :
-%if ! %splitpackage
+%if %splitpackage
 %postun
 %endif
 update-desktop-database >& /dev/null || :
@@ -135,6 +148,22 @@
 %{gimpplugindir}/ufraw-gimp
 
 %changelog
+* Thu May 24 2007 Nils Philippsen <nphilipp redhat com> - 0.11-8
+- use correct patch
+
+* Thu May 24 2007 Nils Philippsen <nphilipp redhat com> - 0.11-7
+- prevent crash in CMS error handler (#239147)
+
+* Wed Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject> - 0.11-6
+- exiv2 patch (#237846)
+
+* Wed Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject> - 0.11-5
+- respin for exiv2-0.14
+
+* Tue Apr 24 2007 Nils Philippsen <nphilipp redhat com> - 0.11-4
+- eventually put GConf2, shared-mime-info requirements into -common subpackage
+  (#235583)
+
 * Mon Mar 12 2007 Nils Philippsen <nphilipp redhat com> - 0.11-3
 - split pkg from fc6/rhel5 on to avoid upgrading mess
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]