rpms/chmsee/devel chmsee-1.0.0-gcc-43.patch, NONE, 1.1 chmsee.spec, 1.19, 1.20

[Yuan Yijun (bbbush)]

Author: bbbush

Update of /cvs/extras/rpms/chmsee/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10532

Modified Files:
	chmsee.spec 
Added Files:
	chmsee-1.0.0-gcc-43.patch 
Log Message:
try build for gcc-43 fix

chmsee-1.0.0-gcc-43.patch:

--- NEW FILE chmsee-1.0.0-gcc-43.patch ---
diff -up chmsee-1.0.0/src/gecko_utils.cpp.orig chmsee-1.0.0/src/gecko_utils.cpp
--- chmsee-1.0.0/src/gecko_utils.cpp.orig	2008-01-05 20:00:50.000000000 +0800
+++ chmsee-1.0.0/src/gecko_utils.cpp	2008-01-05 20:01:20.000000000 +0800
@@ -42,7 +42,7 @@
 #include <stdlib.h>
 
 #include <gtkmozembed.h>
-#include <gtkmozembed_internal.h>
+//#include <gtkmozembed_internal.h> // try not to break build on gcc-43
 
 #include <nsCOMPtr.h>
 #include <nsMemory.h>


Index: chmsee.spec
===================================================================
RCS file: /cvs/extras/rpms/chmsee/devel/chmsee.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- chmsee.spec	5 Dec 2007 09:42:03 -0000	1.19
+++ chmsee.spec	5 Jan 2008 12:05:26 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		chmsee
 Version:	1.0.0
-Release:	1.34%{?dist}
+Release:	1.35%{?dist}
 Summary(zh_CN):	CHM 文件阅读工具, 基于 Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -10,6 +10,7 @@
 # this file comes from gnochm package
 Source1:	gnochm-chmfile.png
 Patch1:		chmsee-1.0.0-desktop-icon.patch
+Patch2:		chmsee-1.0.0-gcc-43.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	intltool >= 0.34 pkgconfig >= 0.9 gettext 
@@ -55,6 +56,7 @@
 %prep
 %setup -q 
 %patch1 -p1 -b .desktop-mimetype
+%patch2 -p1 -b .gcc-43
 
 %build
 %configure --disable-static 
@@ -106,6 +108,9 @@
 %{_datadir}/icons/hicolor/*/apps/chmsee.png
 
 %changelog
+* Sat Jan 05 2008 bbbush <bbbush.yuan at gmail.com> - 1.0.0-1.35
+- try build for gcc-43 fix
+
 * Wed Dec 05 2007 bbbush <bbbush.yuan at gmail.com> - 1.0.0-1.34
 - rebuild for new openssl (so.7)
 
@@ -117,11 +122,4 @@
 - fix xpcom initialize and shutdown according to
   http://benjamin.smedbergs.us/blog/2005-12-23/whats-coming-for-gtkmozembed/
 
-* Sat Nov 10 2007 bbbush <bbbush.yuan at gmail.com> - 1.0.0-1.29
-- should be BuildRequires: gecko-devel
-- but since /usr/lib/gecko-libs-1.8.1.9 is still not there, this build will not work
-
-* Sat Nov 10 2007 bbbush <bbbush.yuan at gmail.com> - 1.0.0-1.28
-- try build for gecko-libs-1.8.1.9
-