Tue Jun 16 13:54:25 2020 UTC ()
midori: Fix typing / and backspace in the URL bar.

Noticed by benny on twitter

PKGREVISION++


(nia)
diff -r1.129 -r1.130 pkgsrc/www/midori/Makefile
diff -r1.29 -r1.30 pkgsrc/www/midori/distinfo
diff -r0 -r1.1 pkgsrc/www/midori/patches/patch-core_browser.vala
cvs diff -r1.129 -r1.130 pkgsrc/www/midori/Makefile (expand / switch to unified diff)

--- pkgsrc/www/midori/Makefile 2020/06/02 08:24:57 1.129
+++ pkgsrc/www/midori/Makefile 2020/06/16 13:54:24 1.130
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.129 2020/06/02 08:24:57 adam Exp $ 1# $NetBSD: Makefile,v 1.130 2020/06/16 13:54:24 nia Exp $
2 2
3DISTNAME= midori-v9.0 3DISTNAME= midori-v9.0
4PKGNAME= ${DISTNAME:S/v//} 4PKGNAME= ${DISTNAME:S/v//}
5PKGREVISION= 7 5PKGREVISION= 8
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= ${MASTER_SITE_GITHUB:=midori-browser/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=midori-browser/}
8GITHUB_PROJECT= core 8GITHUB_PROJECT= core
9GITHUB_RELEASE= v${PKGVERSION_NOREV} 9GITHUB_RELEASE= v${PKGVERSION_NOREV}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://midori-browser.org/ 12HOMEPAGE= http://midori-browser.org/
13COMMENT= Lightweight web browser using WebKit 13COMMENT= Lightweight web browser using WebKit
14LICENSE= gnu-lgpl-v2.1 14LICENSE= gnu-lgpl-v2.1
15USE_GCC_RUNTIME= yes 15USE_GCC_RUNTIME= yes
16 16
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_TOOLS+= intltool msgfmt pkg-config 18USE_TOOLS+= intltool msgfmt pkg-config
cvs diff -r1.29 -r1.30 pkgsrc/www/midori/distinfo (expand / switch to unified diff)

--- pkgsrc/www/midori/distinfo 2019/08/02 11:27:21 1.29
+++ pkgsrc/www/midori/distinfo 2020/06/16 13:54:24 1.30
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.29 2019/08/02 11:27:21 leot Exp $ 1$NetBSD: distinfo,v 1.30 2020/06/16 13:54:24 nia Exp $
2 2
3SHA1 (midori-v9.0.tar.gz) = 12c3ec68a303a267959b586ef5cb08e90f318fee 3SHA1 (midori-v9.0.tar.gz) = 12c3ec68a303a267959b586ef5cb08e90f318fee
4RMD160 (midori-v9.0.tar.gz) = 3461c04d5cc16004c8a9e9d7f77b2d063eac2438 4RMD160 (midori-v9.0.tar.gz) = 3461c04d5cc16004c8a9e9d7f77b2d063eac2438
5SHA512 (midori-v9.0.tar.gz) = 0cc28643593f53c47b453838152dcbe35a9a287bff38bda830844eb8f321a4f48c99b21e16a9b07bebdd0abc936d88fd759c3222a36325aa667a28ae00148be3 5SHA512 (midori-v9.0.tar.gz) = 0cc28643593f53c47b453838152dcbe35a9a287bff38bda830844eb8f321a4f48c99b21e16a9b07bebdd0abc936d88fd759c3222a36325aa667a28ae00148be3
6Size (midori-v9.0.tar.gz) = 1902467 bytes 6Size (midori-v9.0.tar.gz) = 1902467 bytes
 7SHA1 (patch-core_browser.vala) = 99062555f74637a04c91ee24efcc21c2cc2bc357
File Added: pkgsrc/www/midori/patches/patch-core_browser.vala
$NetBSD: patch-core_browser.vala,v 1.1 2020/06/16 13:54:24 nia Exp $

Resolve some issues typing in the URL bar.

https://github.com/midori-browser/core/issues/364
https://github.com/midori-browser/core/pull/365

--- core/browser.vala.orig	2019-07-29 21:59:54.000000000 +0000
+++ core/browser.vala
@@ -121,13 +121,13 @@ namespace Midori {
                 application.set_accels_for_action ("win.tab-reopen", { "<Primary><Shift>t" });
                 application.set_accels_for_action ("win.fullscreen", { "F11" });
                 application.set_accels_for_action ("win.show-downloads", { "<Primary><Shift>j" });
-                application.set_accels_for_action ("win.find", { "<Primary>f", "slash" });
+                application.set_accels_for_action ("win.find", { "<Primary>f" });
                 application.set_accels_for_action ("win.view-source", { "<Primary>u", "<Primary><Alt>u" });
                 application.set_accels_for_action ("win.print", { "<Primary>p" });
                 application.set_accels_for_action ("win.caret-browsing", { "F7" });
                 application.set_accels_for_action ("win.show-inspector", { "<Primary><Shift>i" });
                 application.set_accels_for_action ("win.goto", { "<Primary>l", "F7" });
-                application.set_accels_for_action ("win.go-back", { "<Alt>Left", "BackSpace", "Back" });
+                application.set_accels_for_action ("win.go-back", { "<Alt>Left" });
                 application.set_accels_for_action ("win.go-forward", { "<Alt>Right", "<Shift>BackSpace" });
                 application.set_accels_for_action ("win.tab-reload", { "<Primary>r", "F5" });
                 application.set_accels_for_action ("win.tab-stop-loading", { "Escape" });
@@ -136,7 +136,7 @@ namespace Midori {
                 application.set_accels_for_action ("win.tab-next", { "<Primary>Tab" });
                 application.set_accels_for_action ("win.clear-private-data", { "<Primary><Shift>Delete" });
                 application.set_accels_for_action ("win.preferences", { "<Primary><Alt>p" });
-                application.set_accels_for_action ("win.show-help-overlay", { "<Primary>F1", "<Shift>question" });
+                application.set_accels_for_action ("win.show-help-overlay", { "<Primary>F1" });
 
                 for (var i = 0; i < 10; i++) {
                     application.set_accels_for_action ("win.tab-by-index(%d)".printf(i),