rpms/showimg/devel showimg-0.9.5-gcc44.patch, NONE, 1.1 showimg.spec, 1.26, 1.27

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/showimg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31972/devel

Modified Files:
	showimg.spec 
Added Files:
	showimg-0.9.5-gcc44.patch 
Log Message:
- Fix FTBFS: added showimg-0.9.5-gcc44.patch.                                       



showimg-0.9.5-gcc44.patch:

--- NEW FILE showimg-0.9.5-gcc44.patch ---
--- ./showimg/kexi/kexidb/queryschema.h.orig	2009-04-19 15:07:28.000000000 +0200
+++ ./showimg/kexi/kexidb/queryschema.h	2009-04-19 15:07:34.000000000 +0200
@@ -492,7 +492,7 @@
  There can be one asterisk of 2nd type defined for given single query.
 */
 
-class KEXI_DB_EXPORT QueryAsterisk : protected Field
+class KEXI_DB_EXPORT QueryAsterisk : public Field
 {
 	public:
 		/*! Constructs query asterisk definition object.
--- ./showimg/showimg/misc/exif.cpp.orig	2009-04-19 17:43:33.000000000 +0200
+++ ./showimg/showimg/misc/exif.cpp	2009-04-19 17:46:02.000000000 +0200
@@ -409,7 +409,7 @@
     // If the filename contains substring "&i", then substitute the
     // filename for that.  This gives flexibility in terms of processing
     // multiple files at a time.
-    char * Subst;
+    const char * Subst;
     Subst = strstr(NamePattern, "&i");
     if (Subst){
         strncpy(OutFileName, NamePattern, Subst-NamePattern);


Index: showimg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- showimg.spec	26 Feb 2009 00:54:39 -0000	1.26
+++ showimg.spec	19 Apr 2009 17:31:14 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -8,6 +8,8 @@
 URL:            http://www.jalix.org/projects/showimg
 Source0:        http://www.jalix.org/projects/showimg/download/0.9.5/showimg-0.9.5.tar.bz2
 Patch0:         showimg-0.9.5-gcc43.patch
+Patch1:			showimg-0.9.5-gcc44.patch
+# Both patches have been sent to author (rgroult [AT]Â jalix [DOT]Â org) on 2009/04/19
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -50,6 +52,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .gcc43
+%patch1 -b .gcc44
 #perl -pi -e 's/KDE_DOCS=AUTO/KDE_DOCS=showimg/g' doc/??/Makefile.am
 
 
@@ -66,7 +69,7 @@
            --with-showimgdb
 #           --enable-final \
 
-make %{?_smp_mflags}
+make -k %{?_smp_mflags}
 
 
 %install
@@ -122,6 +125,9 @@
 
 
 %changelog
+* Sun Apr 19 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.9.5-22
+- Fix FTBFS: added showimg-0.9.5-gcc44.patch.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.5-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild