pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
conkeror: Add three patches from upstream
Module Name: pkgsrc-wip
Committed By: Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By: yhardy
Date: Sat Sep 17 21:09:09 2016 +0200
Changeset: e89a3e26ea297348050ab8d073ae9f8447fc37b9
Modified Files:
conkeror/Makefile
conkeror/distinfo
Added Files:
conkeror/patches/patch-application.ini
conkeror/patches/patch-modules_download-manager.js
conkeror/patches/patch-modules_permission-manager.js
Log Message:
conkeror: Add three patches from upstream
* 2016-06-28 Use new nsIPermission api
* 2016-06-28 Fix bug preventing completion of downloads
* 2016-06-28 Fix Goanna version number
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e89a3e26ea297348050ab8d073ae9f8447fc37b9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
conkeror/Makefile | 4 ++
conkeror/distinfo | 3 +
conkeror/patches/patch-application.ini | 27 ++++++++
conkeror/patches/patch-modules_download-manager.js | 58 ++++++++++++++++
.../patches/patch-modules_permission-manager.js | 77 ++++++++++++++++++++++
5 files changed, 169 insertions(+)
diffs:
diff --git a/conkeror/Makefile b/conkeror/Makefile
index 168f58c..ca07f7b 100644
--- a/conkeror/Makefile
+++ b/conkeror/Makefile
@@ -2,6 +2,7 @@
PKGNAME= conkeror-1.0.3
DISTNAME= 11121bed996ce84e3536c3c8266cdf3164e02b5a
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://repo.or.cz/conkeror.git/snapshot/
DIST_SUBDIR= conkeror
@@ -21,5 +22,8 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/man1
INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= share/applications
+post-patch:
+ ${RM} ${WRKSRC}/modules/*.orig
+
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/conkeror/distinfo b/conkeror/distinfo
index ed9a0d6..c085567 100644
--- a/conkeror/distinfo
+++ b/conkeror/distinfo
@@ -4,3 +4,6 @@ SHA1 (conkeror/11121bed996ce84e3536c3c8266cdf3164e02b5a.tar.gz) = 4c60e0b7ed6949
RMD160 (conkeror/11121bed996ce84e3536c3c8266cdf3164e02b5a.tar.gz) = 7186d7af0e5955353f6051d73b58adb40558b327
SHA512 (conkeror/11121bed996ce84e3536c3c8266cdf3164e02b5a.tar.gz) = 1ae2144b86acbdce6c3b85cfb9d89f205964cf1091effe2c1bd417cfb5d27002236bc8c9ec5f2aaa7806c8f12696e77ae65f557cc6fe9d1e594fe4a2f324bc13
Size (conkeror/11121bed996ce84e3536c3c8266cdf3164e02b5a.tar.gz) = 315860 bytes
+SHA1 (patch-application.ini) = ed51742eff6309256cb6bb5f4b401d8791a6914a
+SHA1 (patch-modules_download-manager.js) = 8125b1369ecd942b12d6e3fcceec7552586082d1
+SHA1 (patch-modules_permission-manager.js) = 8d90c8fa3734c7ea410718e7aca1e4854e1f1211
diff --git a/conkeror/patches/patch-application.ini b/conkeror/patches/patch-application.ini
new file mode 100644
index 0000000..78160fe
--- /dev/null
+++ b/conkeror/patches/patch-application.ini
@@ -0,0 +1,27 @@
+$NetBSD$
+
+From 745311e9564654c99d4dcfad60fca8646a273130 Mon Sep 17 00:00:00 2001
+From: Scott Jaderholm
+Date: Mon, 27 Jun 2016 22:31:38 -0700
+Subject: [PATCH 1/1] application.ini: Fix Goanna version number
+
+---
+ application.ini | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/application.ini b/application.ini
+index 2b96b31..7257ace 100644
+--- application.ini
++++ application.ini
+@@ -10,7 +10,7 @@ MinVersion=2.0
+ MaxVersion=*
+
+ [Goanna]
+-MinVersion=1.9.1
++MinVersion=2.0
+ MaxVersion=*
+
+ [XRE]
+--
+2.7.4.GIT
+
diff --git a/conkeror/patches/patch-modules_download-manager.js b/conkeror/patches/patch-modules_download-manager.js
new file mode 100644
index 0000000..9e5917a
--- /dev/null
+++ b/conkeror/patches/patch-modules_download-manager.js
@@ -0,0 +1,58 @@
+$NetBSD$
+
+From ec37576ae232914d64ba7601bf3f88f2127a293c Mon Sep 17 00:00:00 2001
+From: Dimitris Papavasiliou
+Date: Fri, 9 Jan 2015 16:10:25 +0200
+Subject: [PATCH] modules/download-manager.js: Fix bug preventing completion of
+ downloads.
+
+---
+ modules/download-manager.js | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/modules/download-manager.js b/modules/download-manager.js
+index ecd032b..f66d736 100644
+--- modules/download-manager.js
++++ modules/download-manager.js
+@@ -1052,24 +1052,24 @@ function download_completer (completions) {
+ };
+ }
+ all_word_completer.call(this, forward_keywords(arguments),
+- $completions = completions);
++ $completions = completions,
++ $get_string = function (x) {
++ if (use_downloads_jsm)
++ return x.target.path;
++ else
++ return x.displayName;
++ },
++ $get_description = function (x) {
++ if (use_downloads_jsm)
++ return x.source.url;
++ else
++ return x.source.spec
++ });
+ }
+ download_completer.prototype = {
+ constructor: download_completer,
+ __proto__: all_word_completer.prototype,
+- toString: function () "#<download_completer>",
+- get_string: function (x) {
+- if (use_downloads_jsm)
+- return x.target.path;
+- else
+- return x.displayName;
+- },
+- get_description: function (x) {
+- if (use_downloads_jsm)
+- return x.source.url;
+- else
+- return x.source.spec
+- }
++ toString: function () "#<download_completer>"
+ };
+
+ minibuffer.prototype.read_download = function () {
+--
+2.7.4.GIT
+
diff --git a/conkeror/patches/patch-modules_permission-manager.js b/conkeror/patches/patch-modules_permission-manager.js
new file mode 100644
index 0000000..dd836b1
--- /dev/null
+++ b/conkeror/patches/patch-modules_permission-manager.js
@@ -0,0 +1,77 @@
+$NetBSD$
+
+From dc67cae174477498b2f2c7f5d0bc63971a210df2 Mon Sep 17 00:00:00 2001
+From: Matt Lundin
+Date: Mon, 27 Jun 2016 21:37:38 -0500
+Subject: [PATCH] Use new nsIPermission api
+
+* modules/permission-manager.js: Use new api for Mozilla/Firefox
+ versions 42 and up. The new api uses protocol://domain instead of a
+ simple domain (e.g., https://google.com instead of google.com).
+---
+ modules/permission-manager.js | 29 +++++++++++++++++++++++------
+ 1 file changed, 23 insertions(+), 6 deletions(-)
+
+diff --git a/modules/permission-manager.js b/modules/permission-manager.js
+index b2d54e1..803b329 100644
+--- modules/permission-manager.js
++++ modules/permission-manager.js
+@@ -96,7 +96,11 @@ interactive("permission-manager", "View or edit the host-specific "
+ let max_type_len = 0;
+ while (e.hasMoreElements()) {
+ let p = e.getNext().QueryInterface(Ci.nsIPermission);
+- let host = p.host;
++ let host;
++ if (version_compare(get_mozilla_version(), "42.0") >= 0)
++ host = p.principal.origin;
++ else
++ host = p.host;
+ let type = p.type;
+ let cap = p.capability;
+ if (max_host_len < host.length)
+@@ -128,9 +132,13 @@ interactive("permission-manager", "View or edit the host-specific "
+ file_buf += "\n";
+ }
+
++ let example = (version_compare(get_mozilla_version(), "42.0") >= 0) ?
++ "https://google.com"; : "google.com";
++ let url_type = (version_compare(get_mozilla_version(), "42.0") >= 0) ?
++ "protocol://domain" : "domain";
+ file_buf += "\n" +
+- "# entry syntax (one per line): <domain> <type> <permission>\n\n" +
+- "# example: google.com popup allow\n\n" +
++ "# entry syntax (one per line): <" + url_type + "> <type> <permission>\n\n" +
++ "# example: " + example + " popup allow\n\n" +
+
+ word_wrap("The <domain> must be a valid domain name. Depending on the <type>, only exact " +
+ "matches may be used, or alternatively it may match any sub-domain if a more " +
+@@ -243,14 +251,23 @@ interactive("permission-manager", "View or edit the host-specific "
+ }
+ delete existing_perms[""+[host,type]];
+ }
+- if (add)
+- permission_manager.add(make_uri("http://"; + host), type, cap);
++ if (add) {
++ if (version_compare(get_mozilla_version(), "42.0") >= 0) {
++ permission_manager.add(make_uri(host), type, cap);
++ } else {
++ permission_manager.add(make_uri("http://"; + host), type, cap);
++ }
++ }
+ }
+ let num_removed = 0;
+ for (let [k,v] in Iterator(existing_perms)) {
+ let [host,type] = k.split(",",2);
+ ++num_removed;
+- permission_manager.remove(host,type);
++ if (version_compare(get_mozilla_version(), "42.0") >= 0) {
++ permission_manager.remove(make_uri(host),type);
++ } else {
++ permission_manager.remove(host,type);
++ }
+ }
+ let msg;
+ if (num_added == 0 && num_changed == 0 && num_removed == 0)
+--
+2.7.4.GIT
+
Home |
Main Index |
Thread Index |
Old Index