pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
vimb3-git: Remove all patches
Module Name: pkgsrc-wip
Committed By: Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By: leot
Date: Fri Oct 12 09:34:18 2018 +0200
Changeset: bc8aa87679a52b5a343721b716bec59160bf50a8
Modified Files:
vimb3-git/distinfo
Removed Files:
vimb3-git/patches/patch-src_ext-proxy.c
vimb3-git/patches/patch-src_webextension_ext-main.c
Log Message:
vimb3-git: Remove all patches
The patches were just a workaround for:
<https://github.com/fanglingsu/vimb/issues/438>
The root cause of the problem was a missing define in devel/glib2.
In GCredentials logic for NetBSD the
G_CREDENTIALS_SOCKET_GET_CREDENTIALS_SUPPORTED macro was not defined.
With vimb3-git the following happened:
| % env G_DBUS_DEBUG=all /usr/pkg/bin/vimb3
| GDBus-debug:Auth: CLIENT: initiating
| GDBus-debug:Auth: SERVER: initiating
| GDBus-debug:Auth: CLIENT: sent credentials 'GCredentials:netbsd-unpcbid:pid=12917,uid=1000,gid=100'
| GDBus-debug:Auth: CLIENT: writing 'AUTH\r\n'
| GDBus-debug:Auth: CLIENT: WaitingForReject
| GDBus-debug:Auth: SERVER: didn't receive any credentials
| GDBus-debug:Auth: SERVER: WaitingForAuth
| GDBus-debug:Auth: SERVER: WaitingForAuth, read 'AUTH'
| [...]
...so despite the client was sending the credentials the server was not able to
receive it.
After applying:
<https://www.NetBSD.org/~leot/pkgsrc-patches/glib2-2.56.2-gcreds.patch>
vimb3-git works without any patches and with `G_DBUS_DEBUG=all' we can now see:
| % env G_DBUS_DEBUG=all /usr/pkg/bin/vimb3
| [...]
| GDBus-debug:Auth: CLIENT: sent credentials 'GCredentials:netbsd-unpcbid:pid=4079,uid=1000,gid=100'
| GDBus-debug:Auth: CLIENT: writing 'AUTH\r\n'
| GDBus-debug:Auth: CLIENT: WaitingForReject
| GDBus-debug:Auth: SERVER: received credentials 'GCredentials:netbsd-unpcbid:pid=4079,uid=1000,gid=100'
| [...]
(The devel/glib2 patch is still not committed but I have shared it with
<prlw1> and asked for a review so hopefully a fix will be committed soon on
pkgsrc!)
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bc8aa87679a52b5a343721b716bec59160bf50a8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
vimb3-git/distinfo | 2 --
vimb3-git/patches/patch-src_ext-proxy.c | 17 -----------------
vimb3-git/patches/patch-src_webextension_ext-main.c | 17 -----------------
3 files changed, 36 deletions(-)
diffs:
diff --git a/vimb3-git/distinfo b/vimb3-git/distinfo
index 18eaf04c9a..afc76512f4 100644
--- a/vimb3-git/distinfo
+++ b/vimb3-git/distinfo
@@ -1,4 +1,2 @@
$NetBSD$
-SHA1 (patch-src_ext-proxy.c) = 108eea1fa1ec4972e729ab68f20557e740161a82
-SHA1 (patch-src_webextension_ext-main.c) = 91a83a97eb7abd4a385f6e665886f87544c9200d
diff --git a/vimb3-git/patches/patch-src_ext-proxy.c b/vimb3-git/patches/patch-src_ext-proxy.c
deleted file mode 100644
index 7655026b7c..0000000000
--- a/vimb3-git/patches/patch-src_ext-proxy.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Workaround for:
-
- <https://github.com/fanglingsu/vimb/issues/438>
-
---- src/ext-proxy.c.orig 2018-10-11 14:57:40.747987085 +0000
-+++ src/ext-proxy.c
-@@ -95,7 +95,7 @@ out:
- static gboolean on_authorize_authenticated_peer(GDBusAuthObserver *observer,
- GIOStream *stream, GCredentials *credentials, gpointer data)
- {
-- gboolean authorized = FALSE;
-+ gboolean authorized = TRUE;
-
- if (credentials) {
- GCredentials *own_credentials;
diff --git a/vimb3-git/patches/patch-src_webextension_ext-main.c b/vimb3-git/patches/patch-src_webextension_ext-main.c
deleted file mode 100644
index a6bd4ec84b..0000000000
--- a/vimb3-git/patches/patch-src_webextension_ext-main.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Workaround for:
-
- <https://github.com/fanglingsu/vimb/issues/438>
-
---- src/webextension/ext-main.c.orig 2018-10-11 14:57:40.749928061 +0000
-+++ src/webextension/ext-main.c
-@@ -136,7 +136,7 @@ void webkit_web_extension_initialize_wit
- static gboolean on_authorize_authenticated_peer(GDBusAuthObserver *observer,
- GIOStream *stream, GCredentials *credentials, gpointer extension)
- {
-- gboolean authorized = FALSE;
-+ gboolean authorized = TRUE;
- if (credentials) {
- GCredentials *own_credentials;
-
Home |
Main Index |
Thread Index |
Old Index