From: dkwo <dkwo@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] libX11: remove merged patch
Date: Thu, 09 Dec 2021 13:34:46 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34441@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 348 bytes --]
There is a new pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages lx11
https://github.com/void-linux/void-packages/pull/34441
libX11: remove merged patch
remove a patch that has been merged upstream
A patch file from https://github.com/void-linux/void-packages/pull/34441.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lx11-34441.patch --]
[-- Type: text/x-diff, Size: 2642 bytes --]
From a15f344010169fdfafd5f202762089ae43a5d25e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Dec 2021 13:32:57 +0100
Subject: [PATCH] libX11: remove merged patch
---
.../handle_new_xorgproto_symbols.patch | 42 -------------------
srcpkgs/libX11/template | 2 +-
2 files changed, 1 insertion(+), 43 deletions(-)
delete mode 100644 srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
diff --git a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch b/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
deleted file mode 100644
index 630d748009e5..000000000000
--- a/srcpkgs/libX11/patches/handle_new_xorgproto_symbols.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 27 Jul 2021 11:46:19 +1000
-Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
-
-These keys are all defined through a macro in the form:
- #define XF86XK_BrightnessAuto _EVDEVK(0x0F4)
-
-The _EVDEVK macro is simply an offset of 0x10081000.
-Let's parse these lines correctly so those keysyms end up in our
-hashtables.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/util/makekeys.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index e847ef4c..4896cc53 100644
---- a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
- return 1;
- }
-
-+ /* See if we can parse one of the _EVDEVK symbols */
-+ i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
-+ if (i == 2 && (tmp = strstr(key, "XK_"))) {
-+ memcpy(prefix, key, (size_t)(tmp - key));
-+ prefix[tmp - key] = '\0';
-+ tmp += 3;
-+ memmove(key, tmp, strlen(tmp) + 1);
-+
-+ *val += 0x10081000;
-+ return 1;
-+ }
-+
- /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
- * immediately: if the target is in the form XF86XK_foo, we need to
- * canonicalise this to XF86foo before we do the lookup. */
---
-GitLab
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 7ea1c53fff92..75680e242a5e 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
# Template file for 'libX11'
pkgname=libX11
version=1.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
--enable-static --enable-malloc0returnsnull"
next reply other threads:[~2021-12-09 12:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-09 12:34 dkwo [this message]
2021-12-09 12:43 ` [PR PATCH] [Merged]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34441@inbox.vuxu.org \
--to=dkwo@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).