rpms/gnome-web-photo/devel gnome-web-photo-0.6-xulfixbuild.patch, NONE, 1.1 gnome-web-photo.spec, 1.16, 1.17

[Jan Horak]

Author: xhorak

Update of /cvs/pkgs/rpms/gnome-web-photo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32099

Modified Files:
	gnome-web-photo.spec 
Added Files:
	gnome-web-photo-0.6-xulfixbuild.patch 
Log Message:
Fix to build against new gecko

gnome-web-photo-0.6-xulfixbuild.patch:

--- NEW FILE gnome-web-photo-0.6-xulfixbuild.patch ---
diff -upU8 gnome-web-photo-0.6/src/Writer.cpp.orig gnome-web-photo-0.6/src/Writer.cpp
--- gnome-web-photo-0.6/src/Writer.cpp.orig	2009-03-19 11:47:00.000000000 +0100
+++ gnome-web-photo-0.6/src/Writer.cpp	2009-03-19 13:30:40.000000000 +0100
@@ -37,16 +37,17 @@
 #include <nsIDocShell.h>
 #include <nsIDocumentViewer.h>
 #include <nsIMarkupDocumentViewer.h>
 #include <nsIInterfaceRequestorUtils.h>
 #include <nsIPresShell.h>
 #include <nsIDeviceContext.h>
 #include <nsIViewManager.h>
 #include <nsIScrollableView.h>
+#include <nsIDOMNSDocument.h>
 #include <gfxContext.h>
 #include <gfxPlatform.h>
 #include <nsRect.h>
 #include <gtkmozembed_internal.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #define MAX_WIDTH		1 << 12
 #define MAX_HEIGHT		1 << 20
@@ -90,17 +91,20 @@ Writer::Write()
   nsCOMPtr<nsIDOMDocument> domDoc;
   rv = domWin->GetDocument (getter_AddRefs (domDoc));
   NS_ENSURE_SUCCESS (rv, PR_FALSE);
 
   nsCOMPtr<nsIDocument> doc (do_QueryInterface (domDoc, &rv));
   NS_ENSURE_SUCCESS (rv, PR_FALSE);
 
   /* Get document information */
-  CopyUTF16toUTF8 (doc->GetDocumentTitle(), mTitle);
+  nsAutoString title;
+  nsCOMPtr<nsIDOMNSDocument> domNSDoc = do_QueryInterface(doc);
+  domNSDoc->GetTitle(title);
+  CopyUTF16toUTF8 (title, mTitle);
 
   nsIURI *uri = doc->GetDocumentURI();
   if (uri) {
     uri->GetSpec(mSpec);
   }
 
   doc->FlushPendingNotifications (Flush_Display);
 


Index: gnome-web-photo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-web-photo/devel/gnome-web-photo.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnome-web-photo.spec	24 Mar 2009 14:00:43 -0000	1.16
+++ gnome-web-photo.spec	24 Mar 2009 14:49:38 -0000	1.17
@@ -23,6 +23,7 @@
 BuildRequires: libtool gnome-common
 
 #Patch0: xulrunner191.patch
+Patch1: gnome-web-photo-0.6-xulfixbuild.patch
 
 %description
 gnome-web-photo contains a thumbnailer that will be used by GNOME applications,
@@ -32,6 +33,7 @@
 %setup -q
 
 #%patch0 -p1 -b .xulrunner191
+%patch1 -p1 -b .xulfixbuild
 
 %build
 autoreconf
@@ -81,6 +83,9 @@
 %{_datadir}/gnome-web-photo
 
 %changelog
+* Tue Mar 24 2009 Jan Horak <jhorak at redhat.com> - 0.6-2
+- Fix for rebuild against newer gecko
+
 * Tue Mar 17 2009 Matthias Clasen <mclasen at redhat.com> - 0.6-1
 - Update to 0.6