Dear maintainer,
I've prepared an NMU for galeon (versioned as 2.0.7-1.1) and
uploaded it to unstable.
Please note that the change to EventContext::GetTargetCoords makes the
build successful but I couldn't trigger the code when running galeon, so
I don't know if it works properly.
Cheers,
Mike
diff -u galeon-2.0.7/debian/rules galeon-2.0.7/debian/rules
--- galeon-2.0.7/debian/rules
+++ galeon-2.0.7/debian/rules
@@ -29,0 +30,2 @@
+binary-predeb/galeon::
+ dh_xulrunner -pgaleon
diff -u galeon-2.0.7/debian/control galeon-2.0.7/debian/control
--- galeon-2.0.7/debian/control
+++ galeon-2.0.7/debian/control
@@ -18,7 +18,7 @@
libgnome-desktop-dev (>= 2.10),
libgtk2.0-dev,
liborbit2-dev,
- xulrunner-dev (>= 1.9~) | xulrunner-1.9-dev,
+ xulrunner-dev (>= 1.9.1.3-2),
libnspr4-dev,
iso-codes,
intltool,
@@ -36,7 +36,6 @@
${shlibs:Depends},
procps,
galeon-common,
- xulrunner (>= 1.9~) | xulrunner-1.9
Recommends: gnome-icon-theme (>= 1.1.3-1),
yelp,
scrollkeeper,
diff -u galeon-2.0.7/debian/changelog galeon-2.0.7/debian/changelog
--- galeon-2.0.7/debian/changelog
+++ galeon-2.0.7/debian/changelog
@@ -1,3 +1,17 @@
+galeon (2.0.7-1.1) unstable; urgency=low
+
+ * Non-maintainer upload for transition to xulrunner 1.9.1.
+ (Closes: #548673)
+ * debian/rules: Use dh_xulrunner
+ * debian/control:
+ - Build-depend on a xulrunner-dev that provides dh_xulrunner.
+ - Let dh_xulrunner fill shlibs:Depends with the proper xulrunner
+ dependency.
+ * debian/patches/80_GRE_version.patch: Tighten the GREVersionRange.
+ * debian/patches/81_xulrunner-1.9.1.patch: Adapt some code to the 1.9.1 API.
+
+ -- Mike Hommey <[email protected]> Sat, 10 Oct 2009 18:29:36 +0200
+
galeon (2.0.7-1) unstable; urgency=low
[ Fabio Bonelli ]
only in patch2:
unchanged:
--- galeon-2.0.7.orig/debian/patches/80_GRE_version.patch
+++ galeon-2.0.7/debian/patches/80_GRE_version.patch
@@ -0,0 +1,14 @@
+diff -ruN galeon-2.0.7/mozilla/mozilla-embed-shell.cpp galeon-2.0.7.new/mozilla/mozilla-embed-shell.cpp
+--- galeon-2.0.7/mozilla/mozilla-embed-shell.cpp
++++ galeon-2.0.7.new/mozilla/mozilla-embed-shell.cpp
+@@ -331,8 +331,8 @@
+ nsresult rv;
+ #ifdef XPCOM_GLUE
+ static const GREVersionRange greVersion = {
+- "1.9a", PR_TRUE,
+- "1.9.*", PR_TRUE
++ "1.9.1", PR_TRUE,
++ "1.9.2", PR_FALSE
+ };
+ char xpcomLocation[4096];
+ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
only in patch2:
unchanged:
--- galeon-2.0.7.orig/debian/patches/81_xulrunner-1.9.1.patch
+++ galeon-2.0.7/debian/patches/81_xulrunner-1.9.1.patch
@@ -0,0 +1,48 @@
+diff -ruN galeon-2.0.7/mozilla/EventContext.cpp galeon-2.0.7.new/mozilla/EventContext.cpp
+--- galeon-2.0.7/mozilla/EventContext.cpp
++++ galeon-2.0.7.new/mozilla/EventContext.cpp
+@@ -36,6 +36,7 @@
+ #include <nsIURI.h>
+ #include <nsIDOMNSEvent.h>
+ #include <nsIDOMNSHTMLElement.h>
++#include <nsIDOMNSElement.h>
+ #include <nsIDOMCharacterData.h>
+ #include <nsIDOMHTMLButtonElement.h>
+ #include <nsIDOMHTMLLabelElement.h>
+@@ -518,19 +519,21 @@
+ nsresult EventContext::GetTargetCoords (nsIDOMEventTarget *aTarget, PRInt32 *aX, PRInt32 *aY)
+ {
+ /* Calculate the node coordinates relative to the widget origin */
+- nsCOMPtr<nsIDOMNSHTMLElement> elem = do_QueryInterface(aTarget);
++ nsCOMPtr<nsIDOMNSHTMLElement> htmlelem = do_QueryInterface(aTarget);
++ nsCOMPtr<nsIDOMNSElement> elem = do_QueryInterface(aTarget);
+
+ PRInt32 x = 0, y = 0;
+ while (elem)
+ {
+ PRInt32 val;
+- elem->GetOffsetTop(&val); y += val;
++ htmlelem->GetOffsetTop(&val); y += val;
+ elem->GetScrollTop(&val); y -= val;
+- elem->GetOffsetLeft(&val); x += val;
++ htmlelem->GetOffsetLeft(&val); x += val;
+ elem->GetScrollLeft(&val); x -= val;
+
+ nsCOMPtr<nsIDOMElement> parent;
+- elem->GetOffsetParent(getter_AddRefs(parent));
++ htmlelem->GetOffsetParent(getter_AddRefs(parent));
++ htmlelem = do_QueryInterface(parent);
+ elem = do_QueryInterface(parent);
+ }
+ *aX = x;
+diff -ruN galeon-2.0.7/mozilla/MozRegisterComponents.cpp galeon-2.0.7.new/mozilla/MozRegisterComponents.cpp
+--- galeon-2.0.7/mozilla/MozRegisterComponents.cpp
++++ galeon-2.0.7.new/mozilla/MozRegisterComponents.cpp
+@@ -62,6 +62,7 @@
+ #include <nsServiceManagerUtils.h>
+ #include <nsDocShellCID.h>
+ #include <nsXPCOMCID.h>
++#include <nsXPCOMCIDInternal.h>
+
+ #include <glib.h>
+
