Arch Linux

Mortimer Houghton

Member

Registered: 2014-09-28

Posts: 85

Surf patch

Corrects version, manpage, and copyright date.  Manpage modification was the most extensive, added documentation for the frame flattening operation and indicator.  I'll forward this to the git maintainer when I have an opportunity.

https://goo.gl/0kjOF7 (surf-webkit2.patch)

diff -ura src.old/surf/config.mk src.new/surf/config.mk
--- src.old/surf/config.mk      2017-03-06 01:22:54.581016999 -0600
+++ src.new/surf/config.mk      2017-03-06 01:24:13.007683664 -0600
@@ -1,5 +1,5 @@
 # surf version
-VERSION = 0.6
+VERSION = 0.7

 # Customize below to fit your system

diff -ura src.old/surf/surf.1 src.new/surf/surf.1
--- src.old/surf/surf.1 2017-03-06 01:22:54.581016999 -0600
+++ src.new/surf/surf.1 2017-03-06 01:28:27.301016999 -0600
@@ -203,6 +203,9 @@
 .B Ctrl\-Shift\-c
 Toggle caret browsing. This will reload the page.
 .TP
+.B Ctrl\-Shift\-f
+Toggle frame flattening.  This will reload the page.
+.TP
 .B Ctrl\-Shift\-i
 Toggle auto-loading of images. This will reload the page.
 .TP
@@ -255,6 +258,9 @@
 plugins
 .TP
 .B m M
 styles
+.TP
+.B f F
+frame flattening
 .SH INDICATORS OF WEB PAGE
 The second part of the indicators specifies modes of the web page itself.
diff -ura src.old/surf/surf.c src.new/surf/surf.c
--- src.old/surf/surf.c 2017-03-06 01:22:54.581016999 -0600
+++ src.new/surf/surf.c 2017-03-06 01:24:30.847683666 -0600
@@ -1734,7 +1734,7 @@
                fulluseragent = EARGF(usage());
                break;
        case 'v':
-               die("surf-"VERSION", ©2009-2015 surf engineers, "
+               die("surf-"VERSION", ©2009-2016 surf engineers, "
                    "see LICENSE for details\n");
        case 'x':
                showxid = 1;

Add surf-webkit2.patch (md5sum=7c2c056fbbd9889e4ebb76fb1702383f') to your your PKGBUILD and a prepare operation prior to build:

prepare() {
  cd "${srcdir}/${pkgname}"
  patch -Np2 -i "${srcdir}/surf-webkit2.patch"
}

Also, add this line to your config.h:

	{ MODKEY|GDK_SHIFT_MASK, GDK_KEY_f,      toggle,     { .i = FrameFlattening } },

and modify the keybinding if you want to change it from ctrl-shift-f.

Edit: Bug report FS#53187 filed on missing line for ABS surf package config.h file.

Last edited by Mortimer Houghton (2017-03-06 23:46:45)

Mortimer Houghton

Member

Registered: 2014-09-28

Posts: 85

Re: Surf patch

I spoke with Quentin Rameau, the manpage should be updated along with the copyright.  It's unclear to me what will be happening with the version number, since he considers 0.7 to be from legacy webkit1 surf and not the newer webkit2 surf.

WorMzy

Forum Moderator

From: Scotland

Registered: 2010-06-16

Posts: 11,863

Website

Re: Surf patch

Why are you posting this here? If you're hoping to catch the eye of the community/surf package maintainer, you would be better off filing a bug report.

Note that it's 2017 now, so that copyright is still outdated.

---

Sakura:-
Mobo: MSI MAG X570S TORPEDO MAX // Processor: AMD Ryzen 9 5950X @4.9GHz // GFX: AMD Radeon RX 5700 XT // RAM: 32GB (4x 8GB) Corsair DDR4 (@ 3000MHz) // Storage: 1x 3TB HDD, 6x 1TB SSD, 2x 120GB SSD, 1x 275GB M2 SSD

Making lemonade from lemons since 2015.

Mortimer Houghton

Member

Registered: 2014-09-28

Posts: 85

Re: Surf patch

I'm posting it here because it effects an ABS package and the solution I posted modified that package.  I already mentioned that I spoke with Quentin Rameau, but when I first posted it, I didn't know I would be able to get in contact with him so quickly (I happened to run into him in IRC).  There was no documentation on the frame flattening operation, even though there was a keybinding (not included in the ABS config.h, but in the config.def.h that is downloaded), and an in browser indicator for the operation.  The copyright is the same from the master branch of surf.  If QR wants to change it to 2017, that's fine.  I just wanted the information to reflect the latest on git for surf.

Edit: Ah, you meant the community maintainer of the Arch package.  No, I hadn't even thought to notify them.  It is an upstream problem.  My patch was just a correction until this was resolved.  Plus, it hadn't occurred to me that someone would want to use Surf outside of an ABS installation (other then to temporarily try it out).

Last edited by Mortimer Houghton (2017-03-06 21:26:33)