Pullup ticket #6244 - requested by nia

www/midori: bugfix

Revisions pulled up:
- www/midori/Makefile                                           1.130
- www/midori/distinfo                                           1.30
- www/midori/patches/patch-core_browser.vala                    1.1

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Tue Jun 16 13:54:25 UTC 2020

   Modified Files:
   	pkgsrc/www/midori: Makefile distinfo
   Added Files:
   	pkgsrc/www/midori/patches: patch-core_browser.vala

   Log Message:
   midori: Fix typing / and backspace in the URL bar.

   Noticed by benny on twitter

   PKGREVISION++
This commit is contained in:
bsiegert 2020-06-26 09:35:34 +00:00
parent 7c740eae1b
commit 8832d32664
3 changed files with 38 additions and 3 deletions

View File

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.127 2020/03/11 09:53:54 wiz Exp $
# $NetBSD: Makefile,v 1.127.2.1 2020/06/26 09:35:34 bsiegert Exp $
DISTNAME= midori-v9.0
PKGNAME= ${DISTNAME:S/v//}
PKGREVISION= 5
PKGREVISION= 8
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GITHUB:=midori-browser/}
GITHUB_PROJECT= core

View File

@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.29 2019/08/02 11:27:21 leot Exp $
$NetBSD: distinfo,v 1.29.4.1 2020/06/26 09:35:34 bsiegert Exp $
SHA1 (midori-v9.0.tar.gz) = 12c3ec68a303a267959b586ef5cb08e90f318fee
RMD160 (midori-v9.0.tar.gz) = 3461c04d5cc16004c8a9e9d7f77b2d063eac2438
SHA512 (midori-v9.0.tar.gz) = 0cc28643593f53c47b453838152dcbe35a9a287bff38bda830844eb8f321a4f48c99b21e16a9b07bebdd0abc936d88fd759c3222a36325aa667a28ae00148be3
Size (midori-v9.0.tar.gz) = 1902467 bytes
SHA1 (patch-core_browser.vala) = 99062555f74637a04c91ee24efcc21c2cc2bc357

View File

@ -0,0 +1,34 @@
$NetBSD: patch-core_browser.vala,v 1.1.2.2 2020/06/26 09:35:34 bsiegert 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),