Hello community,
here is the log from the commit of package gnome-web-photo for openSUSE:Factory
checked in at Fri Jun 4 15:07:07 CEST 2010.
--------
--- GNOME/gnome-web-photo/gnome-web-photo.changes 2010-01-15 20:33:55.000000000 +0100
+++ /mounts/work_src_done/STABLE/gnome-web-photo/gnome-web-photo.changes 2010-06-04 13:11:29.000000000 +0200
@@ -1,0 +2,15 @@
+Fri Jun 4 07:45:36 CEST 2010 - wr@rosenauer.org
+
+- Add gnome-web-photo-setup-before-domwindow.patch to fix
+ compatibility with XULRunner 1.9.2 (bnc#611541).
+
+-------------------------------------------------------------------
+Fri Jun 4 04:00:50 CEST 2010 - vuntz@opensuse.org
+
+- Add gnome-web-photo-xulrunner192.patch to port gnome-web-photo to
+ xulrunner192.
+- On 11.3 and later, use xulrunner192.
+- Add gnome-common BuildRequires and call to gnome-autogen.sh since
+ the patch changes some build files.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
gnome-web-photo-setup-before-domwindow.patch
gnome-web-photo-xulrunner192.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-web-photo.spec ++++++
--- /var/tmp/diff_new_pack.MapG5a/_old 2010-06-04 15:07:00.000000000 +0200
+++ /var/tmp/diff_new_pack.MapG5a/_new 2010-06-04 15:07:00.000000000 +0200
@@ -15,15 +15,29 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: gnome-web-photo
+%if 0%{suse_version} > 1120
+%define xulrunner_version 192
+%else
%if 0%{suse_version} > 1110
%define xulrunner_version 191
%else
%define xulrunner_version 190
%endif
+%endif
+Version: 0.9
+Release: 3
+License: GPLv2+
+Summary: GNOME Web Photographer
+Url: http://www.gnome.org
+Group: Productivity/Graphics/Viewers
+Source: %{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM gnome-web-photo-xulrunner192.patch vuntz@opensuse.org -- Port to xulrunner192
+Patch0: gnome-web-photo-xulrunner192.patch
+# PATCH-FIX-UPSTREAM gnome-web-photo-setup-before-domwindow.patch wolfgang@rosenauer.org -- Correct use of API
+Patch1: gnome-web-photo-setup-before-domwindow.patch
BuildRequires: gcc-c++
BuildRequires: gconf2-devel
BuildRequires: gtk2-devel
@@ -32,38 +46,32 @@
BuildRequires: libxml2-devel
BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel
BuildRequires: translation-update-upstream
-License: GPLv2+
-Group: Productivity/Graphics/Viewers
-Version: 0.9
-Release: 2
-Summary: GNOME Web Photographer
-Source: %{name}-%{version}.tar.bz2
-Url: http://www.gnome.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+# Only needed for patch0 gnome-web-photo-xulrunner192.patch
+BuildRequires: gnome-common
Requires: %{name}-lang = %{version}
Requires: mozilla-xulrunner%{xulrunner_version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq
%description
GNOME Web Photographer is a tool to generate full-size image files and
thumbnails from HTML files and web pages.
-
-
-Authors:
---------
- Christian Persch
-
%lang_package
%prep
%setup -q
translation-update-upstream
+%if 0%{suse_version} > 1120
+%patch0 -p1
+%endif
+%patch1 -p1
%build
# Ugly hack since gnome-web-photo is linking gfx stuff directly
XULRUNNER_DIR=$(pkg-config --variable=libdir libxul)
export LDFLAGS="-Wl,-rpath -Wl,${XULRUNNER_DIR}"
-#autoreconf -fi
+# remove gnome-common BuildRequires when removing this
+NOCONFIGURE=1 gnome-autogen.sh
%configure
%__make %{?jobs:-j%jobs}
@@ -73,7 +81,7 @@
%find_gconf_schemas
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%pre -f %{name}.schemas_pre
++++++ gnome-web-photo-setup-before-domwindow.patch ++++++
diff -uprN gnome-web-photo-0.9.orig/src/Listener.cpp gnome-web-photo-0.9/src/Listener.cpp
--- gnome-web-photo-0.9.orig/src/Listener.cpp 2010-06-04 06:53:37.000000000 +0200
+++ gnome-web-photo-0.9/src/Listener.cpp 2010-06-04 07:18:33.000000000 +0200
@@ -56,6 +56,15 @@ Listener::Attach ()
gtk_moz_embed_get_nsIWebBrowser (mEmbed, getter_AddRefs (browser));
NS_ENSURE_TRUE (browser, rv);
+ nsCOMPtr<nsIWebBrowserSetup> setup (do_QueryInterface (browser, &rv));
+ NS_ENSURE_SUCCESS (rv, rv);
+
+ rv = setup->SetProperty (nsIWebBrowserSetup::SETUP_ALLOW_META_REDIRECTS, PR_FALSE);
+ /* set this for now, since sizing doesn't work right with frames */
+ rv |= setup->SetProperty (nsIWebBrowserSetup::SETUP_ALLOW_SUBFRAMES , PR_FALSE);
+ rv |= setup->SetProperty (nsIWebBrowserSetup::SETUP_USE_GLOBAL_HISTORY , PR_FALSE);
+ NS_ENSURE_SUCCESS (rv, rv);
+
nsCOMPtr<nsIDOMWindow> domWin;
rv = browser->GetContentDOMWindow (getter_AddRefs (domWin));
NS_ENSURE_SUCCESS (rv, rv);
@@ -72,14 +81,6 @@ Listener::Attach ()
mAttached = PR_TRUE;
- nsCOMPtr<nsIWebBrowserSetup> setup (do_QueryInterface (browser, &rv));
- NS_ENSURE_SUCCESS (rv, rv);
-
- rv = setup->SetProperty (nsIWebBrowserSetup::SETUP_ALLOW_META_REDIRECTS, PR_FALSE);
- /* set this for now, since sizing doesn't work right with frames */
- rv |= setup->SetProperty (nsIWebBrowserSetup::SETUP_ALLOW_SUBFRAMES , PR_FALSE);
- rv |= setup->SetProperty (nsIWebBrowserSetup::SETUP_USE_GLOBAL_HISTORY , PR_FALSE);
-
return rv;
}
++++++ gnome-web-photo-xulrunner192.patch ++++++
diff -uprN gnome-web-photo-0.9.orig/m4/libxul.m4 gnome-web-photo-0.9/m4/libxul.m4
--- gnome-web-photo-0.9.orig/m4/libxul.m4 2010-06-04 06:53:37.000000000 +0200
+++ gnome-web-photo-0.9/m4/libxul.m4 2010-06-04 06:54:09.000000000 +0200
@@ -59,7 +59,7 @@ libxul_cv_sdkdir="$($PKG_CONFIG --variab
# I can figure this out, do it like this:
libxul_cv_libdir="$($PKG_CONFIG --variable=sdkdir $libxul_cv_libxul_pkg)/bin"
-libxul_cv_includes="$($PKG_CONFIG --cflags-only-I libxul-unstable libxul)"
+libxul_cv_includes="$($PKG_CONFIG --cflags-only-I libxul)"
AC_DEFINE([HAVE_LIBXUL],[1],[Define for libxul])
diff -uprN gnome-web-photo-0.9.orig/src/Writer.cpp gnome-web-photo-0.9/src/Writer.cpp
--- gnome-web-photo-0.9.orig/src/Writer.cpp 2010-06-04 06:53:37.000000000 +0200
+++ gnome-web-photo-0.9/src/Writer.cpp 2010-06-04 06:54:09.000000000 +0200
@@ -197,7 +197,7 @@ Writer::Write()
width = NSAppUnitsToIntPixels(cutout.width, p2a);
height = NSAppUnitsToIntPixels(cutout.height, p2a);
- rv = presShell->RenderDocument(cutout, PR_FALSE, PR_TRUE,
+ rv = presShell->RenderDocument(cutout, nsIPresShell::RENDER_IGNORE_VIEWPORT_SCROLLING,
NS_RGB(255, 255, 255), context);
if (NS_SUCCEEDED(rv)) {
imgContext->DrawSurface(surface, gfxSize(width, height));
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org