rpms/gtkmozembedmm/devel gtkmozembedmm-1.4.2.cvs20060817-xulrunner.patch, 1.1, 1.2 gtkmozembedmm.spec, 1.22, 1.23

[Haïkel Guémar (hguemar)]

Author: hguemar

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

Modified Files:
	gtkmozembedmm-1.4.2.cvs20060817-xulrunner.patch 
	gtkmozembedmm.spec 
Log Message:
Fixed build against GCC 4.3 and Gecko 1.9


gtkmozembedmm-1.4.2.cvs20060817-xulrunner.patch:

Index: gtkmozembedmm-1.4.2.cvs20060817-xulrunner.patch
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm-1.4.2.cvs20060817-xulrunner.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtkmozembedmm-1.4.2.cvs20060817-xulrunner.patch	27 Nov 2007 11:33:44 -0000	1.1
+++ gtkmozembedmm-1.4.2.cvs20060817-xulrunner.patch	13 Apr 2008 08:06:18 -0000	1.2
@@ -1,41 +1,57 @@
 diff -up gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/webcontrol.hg.old gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/webcontrol.hg
---- gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/webcontrol.hg.old	2004-09-27 23:39:54.000000000 +0200
-+++ gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/webcontrol.hg	2007-11-27 12:18:32.000000000 +0100
+--- gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/webcontrol.hg.old	2008-04-12 08:06:43.000000000 +0200
++++ gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/webcontrol.hg	2008-04-12 08:07:53.000000000 +0200
 @@ -69,6 +69,7 @@ namespace Mozilla
      _WRAP_METHOD(static void push_startup(), gtk_moz_embed_push_startup)
      _WRAP_METHOD(static void pop_startup(), gtk_moz_embed_pop_startup)
      _WRAP_METHOD(static void set_comp_path(const Glib::ustring& path), gtk_moz_embed_set_comp_path)
-+    _WRAP_METHOD(static void set_path(const Glib::ustring& path), gtk_moz_embed_set_path)
++    _WRAP_METHOD(static void set_path(const Glib::ustring& path), gtk_moz_embed_set_path)	
      _WRAP_METHOD(static void set_profile_path(const Glib::ustring& dir, const Glib::ustring& name), 
  		   gtk_moz_embed_set_profile_path)
      _WRAP_METHOD(void load_url(const Glib::ustring& url), gtk_moz_embed_load_url)
 diff -up gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/gtkmozembed_docs.xml.old gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/gtkmozembed_docs.xml
---- gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/gtkmozembed_docs.xml.old	2004-08-04 22:33:05.000000000 +0200
-+++ gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/gtkmozembed_docs.xml	2007-11-27 12:21:11.000000000 +0100
-@@ -2,8 +2,16 @@
+--- gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/gtkmozembed_docs.xml.old	2008-04-12 08:09:04.000000000 +0200
++++ gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/gtkmozembed_docs.xml	2008-04-12 08:27:54.000000000 +0200
+@@ -2,7 +2,26 @@
  <function name="gtk_moz_embed_set_comp_path">
  <description>
  This function must be called before the first widget is created
 -or XPCOM is initialized.  It allows you to set the path to the
--mozilla components.
-+or XPCOM is initialized by gecko-libs 1.8.  It allows you to set 
-+the path to the mozilla components.
++or XPCOM is initialized by Gecko 1.8.  It allows you to set the path to the
++mozilla components.
 +</description>
 +
-+<root>
++<parameters>
++<parameter name="path">
++<parameter_description>
++Path to Mozilla components
++</parameter_description>
++</parameter>
++</parameters>
++
++<return>
++</return>
++</function>
++
 +<function name="gtk_moz_embed_set_path">
 +<description>
 +This function must be called before the first widget is created
-+or XPCOM is initialized by gecko-libs 1.9.  It allows you to set 
-+the path to the mozilla components.
++or XPCOM is initialized by Gecko 1.9.  It allows you to set the path to the
+ mozilla components.
  </description>
  
- <parameters>
+@@ -181,4 +200,4 @@ This function gets the current chome mas
+ <return>
+ </return>
+ </function>
+-</root>
+\ No newline at end of file
++</root>
 diff -up gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/gtkmozembed_methods.defs.old gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/gtkmozembed_methods.defs
---- gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/gtkmozembed_methods.defs.old	2004-08-04 22:33:12.000000000 +0200
-+++ gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/gtkmozembed_methods.defs	2007-11-27 12:16:12.000000000 +0100
-@@ -21,6 +21,14 @@
-   (return-type "none")
+--- gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/gtkmozembed_methods.defs.old2008-04-12 08:30:28.000000000 +0200
++++ gtkmozembedmm-1.4.2.cvs20060817/gtkmozembed/src/gtkmozembed_methods.defs	2008-04-12 08:29:06.000000000 +0200
+@@ -29,6 +29,14 @@
+   )
  )
  
 +(define-function gtk_moz_embed_set_path
@@ -46,6 +62,6 @@
 +  )
 +)
 +
- (define-function gtk_moz_embed_set_comp_path
-   (c-name "gtk_moz_embed_set_comp_path")
+ (define-function gtk_moz_embed_set_profile_path
+   (c-name "gtk_moz_embed_set_profile_path")
    (return-type "none")


Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gtkmozembedmm.spec	19 Feb 2008 04:53:46 -0000	1.22
+++ gtkmozembedmm.spec	13 Apr 2008 08:06:18 -0000	1.23
@@ -1,7 +1,7 @@
 %define gecko_ver 1.9
 Name:           gtkmozembedmm
 Version:        1.4.2.cvs20060817
-Release:        18%{?dist}
+Release:        19%{?dist}
 
 Summary:        C++ wrapper for GtkMozembed
 
@@ -11,6 +11,7 @@
 Source0:        gtkmozembedmm-%{version}.tar.bz2
 # script to generate tarball from cvs
 Source1:        gtkmozembedmm-cvs.sh
+Patch0:        	gtkmozembedmm-1.4.2.cvs20060817-m4.patch
 Patch1:        	gtkmozembedmm-1.4.2.cvs20060817-xulrunner.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,8 +21,8 @@
 BuildRequires:  libgnomemm26 >= 2.12.0
 BuildRequires:  libgnomeuimm26-devel >= 2.12.0
 # Use mozilla-devel up to FC5, and gecko-devel for FC6+
-BuildRequires: gecko-devel = %{gecko_ver}
-Requires: gecko-libs = %{gecko_ver}
+BuildRequires:  gecko-devel = %{gecko_ver}
+Requires:       gecko-libs = %{gecko_ver}
 BuildRequires:  automake >= 1.10
 BuildRequires:  libtool
 Requires(post):   /sbin/ldconfig
@@ -39,7 +40,7 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
-BuildRequires: gecko-devel = %{gecko_ver}
+BuildRequires:  gecko-devel = %{gecko_ver}
 
 
 %description devel
@@ -49,6 +50,7 @@
 
 %prep
 %setup -q -n gtkmozembedmm-%{version}
+%patch0 -p1
 %patch1 -p1 -b .xl
 # dirty workaround to regenerate autotools scripts
 # TODO
@@ -56,7 +58,6 @@
 mv autogen.tmp autogen.sh
 chmod +x autogen.sh
 sh autogen.sh
-%{__sed} -i 's/mozilla-gtkmozembed/xulrunner-gtkmozembed/' configure configure.ac
 %ifarch x86_64 ppc64
 # correct a path issue that prevent gtkmozembedmm to build on x86_64
 %{__sed} -i 's/lib\/glibmm-2.4/lib64\/glibmm-2.4/' configure
@@ -105,6 +106,12 @@
 
 
 %changelog
+* Apr 11 2007 Haïkel Guémar <karlthered at gmail.com> - 1.4.2.cvs20060817-19
+- remove now useless sed one-liner.
+- fixed gtkmozembedmm-1.4.2.cvs20060817-xulrunner.patch
+- added gtkmozembedmm-1.4.2.cvs20060817-m4.patch
+
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.4.2.cvs20060817-18
 - Autorebuild for GCC 4.3