pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
conkeror: add history patch from upstream
Module Name: pkgsrc-wip
Committed By: Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By: yhardy
Date: Sun Aug 27 21:00:04 2017 +0200
Changeset: cd75ad17b6c08aa40f996d66bd6ecda0b3750b85
Modified Files:
conkeror/Makefile
conkeror/distinfo
Added Files:
conkeror/patches/patch-modules_history.js
Log Message:
conkeror: add history patch from upstream
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cd75ad17b6c08aa40f996d66bd6ecda0b3750b85
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
conkeror/Makefile | 2 +-
conkeror/distinfo | 1 +
conkeror/patches/patch-modules_history.js | 30 ++++++++++++++++++++++++++++++
3 files changed, 32 insertions(+), 1 deletion(-)
diffs:
diff --git a/conkeror/Makefile b/conkeror/Makefile
index bf23abae04..4441743d9e 100644
--- a/conkeror/Makefile
+++ b/conkeror/Makefile
@@ -2,7 +2,7 @@
PKGNAME= conkeror-1.0.3
DISTNAME= 11121bed996ce84e3536c3c8266cdf3164e02b5a
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= www
MASTER_SITES= http://repo.or.cz/conkeror.git/snapshot/
DIST_SUBDIR= conkeror
diff --git a/conkeror/distinfo b/conkeror/distinfo
index 9eaf9a72fb..d8412353d1 100644
--- a/conkeror/distinfo
+++ b/conkeror/distinfo
@@ -8,6 +8,7 @@ SHA1 (patch-application.ini) = ed51742eff6309256cb6bb5f4b401d8791a6914a
SHA1 (patch-conkeror.in) = 0fcf39a72c30a7061f1bd91d465e84cc84129078
SHA1 (patch-favicon) = 71a07c9e6bb9a4d32531e15b976c782e7016fe83
SHA1 (patch-modules_download-manager.js) = 8125b1369ecd942b12d6e3fcceec7552586082d1
+SHA1 (patch-modules_history.js) = 097d55d924a09a2f75539098de476948323234f4
SHA1 (patch-modules_keywords.js) = 639a51fb8e0cbefc360d34972d1bb38613ff22b6
SHA1 (patch-modules_page-modes_key-kill.js) = 73e0ee87bf6e7e8e0338626ea2ef04da4e0dea24
SHA1 (patch-modules_permission-manager.js) = 8d90c8fa3734c7ea410718e7aca1e4854e1f1211
diff --git a/conkeror/patches/patch-modules_history.js b/conkeror/patches/patch-modules_history.js
new file mode 100644
index 0000000000..9aafddf1ec
--- /dev/null
+++ b/conkeror/patches/patch-modules_history.js
@@ -0,0 +1,30 @@
+$NetBSD$
+
+From: Scott Jaderholm <jaderholm%gmail.com@localhost>
+Date: Sun, 16 Jul 2017 22:58:36 +0000 (-0700)
+Subject: history.js: Fix clear-history for FF >= 45
+X-Git-Url: http://repo.or.cz/conkeror.git/commitdiff_plain/796aa322418197b3c0df4b748f54fb0c2d3726cc
+
+history.js: Fix clear-history for FF >= 45
+
+Method removeAllPages was replaced by clear.
+---
+
+diff --git a/modules/history.js b/modules/history.js
+index e7d2dac..dd4960a 100644
+--- modules/history.js
++++ modules/history.js
+@@ -110,7 +110,12 @@ interactive("clear-form-history",
+
+ function clear_history () {
+ var PlacesUtils = Cu.import("resource://gre/modules/PlacesUtils.jsm").PlacesUtils;
+- PlacesUtils.history.removeAllPages();
++ var xulrunner_version = get_mozilla_version();
++ if (version_compare(xulrunner_version, "45.0") < 0) {
++ PlacesUtils.history.removeAllPages();
++ } else {
++ PlacesUtils.history.clear();
++ }
+ }
+ interactive("clear-history",
+ "Permanently delete all location history.",
Home |
Main Index |
Thread Index |
Old Index