r17534 - in /desktop/unstable/epiphany-browser/debian: changelog patches/22_nsNavHistory_hacks.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Nov 14 00:05:37 UTC 2008
Author: joss
Date: Fri Nov 14 00:05:27 2008
New Revision: 17534
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17534
Log:
* The “high hopes” release.
* 22_nsNavHistory_hacks.patch: new patch. Backport hacks from 2.24 to
prevent nsNavHistory from doing anything. Hopefully closes: #494058.
Added:
desktop/unstable/epiphany-browser/debian/patches/22_nsNavHistory_hacks.patch
Modified:
desktop/unstable/epiphany-browser/debian/changelog
desktop/unstable/epiphany-browser/debian/patches/series
Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=17534&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog (original)
+++ desktop/unstable/epiphany-browser/debian/changelog Fri Nov 14 00:05:27 2008
@@ -1,3 +1,11 @@
+epiphany-browser (2.22.3-8) unstable; urgency=low
+
+ * The “high hopes†release.
+ * 22_nsNavHistory_hacks.patch: new patch. Backport hacks from 2.24 to
+ prevent nsNavHistory from doing anything. Hopefully closes: #494058.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 14 Nov 2008 01:02:08 +0100
+
epiphany-browser (2.22.3-7) unstable; urgency=low
[ Josselin Mouette ]
Added: desktop/unstable/epiphany-browser/debian/patches/22_nsNavHistory_hacks.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/22_nsNavHistory_hacks.patch?rev=17534&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/22_nsNavHistory_hacks.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/22_nsNavHistory_hacks.patch Fri Nov 14 00:05:27 2008
@@ -1,0 +1,129 @@
+Index: epiphany-2.22.3/data/default-prefs-common.js
+===================================================================
+--- epiphany-2.22.3.orig/data/default-prefs-common.js 2008-11-14 01:01:22.795490070 +0100
++++ epiphany-2.22.3/data/default-prefs-common.js 2008-11-14 01:02:00.530985573 +0100
+@@ -171,6 +171,31 @@ pref("dom.disable_window_flip", true);
+ // set to true for parity with gtk entries
+ pref("bidi.edit.delete_immediately", true);
+
++// FUCK YOU, nsNavHistory
++pref("places.frecency.updateIdleTime", 0);
++pref("places.frecency.numVisits", 0);
++pref("places.frecency.numCalcOnIdle", 0);
++pref("places.frecency.numCalcOnMigrate", 0);
++pref("places.frecency.firstBucketCutoff", 0);
++pref("places.frecency.secondBucketCutoff", 0);
++pref("places.frecency.thirdBucketCutoff", 0);
++pref("places.frecency.fourthBucketCutoff", 0);
++pref("places.frecency.firstBucketWeight", 0);
++pref("places.frecency.secondBucketWeight", 0);
++pref("places.frecency.thirdBucketWeight", 0);
++pref("places.frecency.fourthBucketWeight", 0);
++pref("places.frecency.defaultBucketWeight", 0);
++pref("places.frecency.embedVisitBonus", 0);
++pref("places.frecency.linkVisitBonus", 0);
++pref("places.frecency.typedVisitBonus", 0);
++pref("places.frecency.bookmarkVisitBonus", 0);
++pref("places.frecency.downloadVisitBonus", 0);
++pref("places.frecency.permRedirectVisitBonus", 0);
++pref("places.frecency.tempRedirectVisitBonus", 0);
++pref("places.frecency.defaultVisitBonus", 0);
++pref("places.frecency.unvisitedBookmarkBonus", 0);
++pref("places.frecency.unvisitedTypedBonus", 0);
++
+ // enable weak SSL ciphers, as Epiphany warns about them anyway
+ pref("security.ssl3.rsa_rc4_40_md5", true);
+ pref("security.ssl3.rsa_rc2_40_md5", true);
+Index: epiphany-2.22.3/embed/mozilla/GlobalHistory.h
+===================================================================
+--- epiphany-2.22.3.orig/embed/mozilla/GlobalHistory.h 2008-11-14 01:03:51.722988047 +0100
++++ epiphany-2.22.3/embed/mozilla/GlobalHistory.h 2008-11-14 01:03:55.698987931 +0100
+@@ -23,6 +23,7 @@
+ #define EPHY_GLOBAL_HISTORY_H
+
+ #ifdef HAVE_GECKO_1_9
++#include <nsToolkitCompsCID.h>
+ #include <nsIDownloadHistory.h>
+ #endif
+ #ifdef HAVE_NSIGLOBALHISTORY3_H
+@@ -40,12 +41,17 @@
+
+ #define EPHY_GLOBALHISTORY_CLASSNAME "Epiphany Global History Implementation"
+
++#ifdef HAVE_GECKO_1_9
++/* Just in case anyone gets the service by CID */
++#define EPHY_GLOBALHISTORY_CID NS_NAVHISTORYSERVICE_CID
++#else
+ #define EPHY_GLOBALHISTORY_CID \
+ { 0xbe0c42c1, \
+ 0x39d4, \
+ 0x4271, \
+ { 0xb7, 0x9e, 0xf7, 0xaa, 0x49, 0xeb, 0x6a, 0x15} \
+ }
++#endif
+
+ #ifdef HAVE_NSIGLOBALHISTORY3_H
+ class MozGlobalHistory: public nsIGlobalHistory3
+Index: epiphany-2.22.3/embed/mozilla/MozRegisterComponents.cpp
+===================================================================
+--- epiphany-2.22.3.orig/embed/mozilla/MozRegisterComponents.cpp 2008-11-14 01:04:15.571490720 +0100
++++ epiphany-2.22.3/embed/mozilla/MozRegisterComponents.cpp 2008-11-14 01:04:36.890986495 +0100
+@@ -45,6 +45,7 @@
+ #ifdef HAVE_GECKO_1_9
+ #include <nsIClassInfoImpl.h>
+ #include <nsXULAppAPI.h>
++#include <nsToolkitCompsCID.h>
+ #endif
+
+ #ifdef HAVE_MOZILLA_PSM
+@@ -216,6 +217,50 @@ static const nsModuleComponentInfo sAppC
+ MozGlobalHistoryConstructor
+ },
+ #ifdef HAVE_GECKO_1_9
++ /* Somehow, somewhere, nsNavHistory is getting instantiated.
++ * Try to prevent this by registering for all the contracts it does
++ * implement, even those we don't implement. GetService/QI will
++ * simply fail then.
++ */
++ {
++ EPHY_GLOBALHISTORY_CLASSNAME,
++ EPHY_GLOBALHISTORY_CID,
++ NS_NAVHISTORYSERVICE_CONTRACTID,
++ MozGlobalHistoryConstructor
++ },
++ {
++ EPHY_GLOBALHISTORY_CLASSNAME,
++ EPHY_GLOBALHISTORY_CID,
++ "@mozilla.org/autocomplete/search;1?name=history",
++ MozGlobalHistoryConstructor
++ },
++ {
++ EPHY_GLOBALHISTORY_CLASSNAME,
++ EPHY_GLOBALHISTORY_CID,
++ NS_ANNOTATIONSERVICE_CONTRACTID,
++ MozGlobalHistoryConstructor
++ },
++ {
++ EPHY_GLOBALHISTORY_CLASSNAME,
++ EPHY_GLOBALHISTORY_CID,
++ NS_GLOBALHISTORY2_CONTRACTID,
++ MozGlobalHistoryConstructor
++ },
++ {
++ EPHY_GLOBALHISTORY_CLASSNAME,
++ EPHY_GLOBALHISTORY_CID,
++ NS_NAVBOOKMARKSSERVICE_CONTRACTID,
++ MozGlobalHistoryConstructor
++ },
++ {
++ EPHY_GLOBALHISTORY_CLASSNAME,
++ EPHY_GLOBALHISTORY_CID,
++ "@mozilla.org/embeddor.implemented/bookmark-charset-resolver;1",
++ MozGlobalHistoryConstructor
++ },
++
++#endif
++#ifdef HAVE_GECKO_1_9
+ {
+ EPHY_GLOBALHISTORY_CLASSNAME,
+ EPHY_GLOBALHISTORY_CID,
Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=17534&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series Fri Nov 14 00:05:27 2008
@@ -21,4 +21,5 @@
19_passwords_crash.patch
20_print_garbage.patch
21_chrome_certmanager.patch
+22_nsNavHistory_hacks.patch
99_autoreconf.patch
More information about the pkg-gnome-commits
mailing list