Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] libX11: remove merged patch
@ 2021-12-09 12:34 dkwo
  2021-12-09 12:43 ` [PR PATCH] [Merged]: " leahneukirchen
  0 siblings, 1 reply; 2+ messages in thread
From: dkwo @ 2021-12-09 12:34 UTC (permalink / raw)
  To: ml

[-- 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"

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: libX11: remove merged patch
  2021-12-09 12:34 [PR PATCH] libX11: remove merged patch dkwo
@ 2021-12-09 12:43 ` leahneukirchen
  0 siblings, 0 replies; 2+ messages in thread
From: leahneukirchen @ 2021-12-09 12:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

There's a merged pull request on the void-packages repository

libX11: remove merged patch
https://github.com/void-linux/void-packages/pull/34441

Description:
remove a patch that has been merged upstream


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-12-09 12:43 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-09 12:34 [PR PATCH] libX11: remove merged patch dkwo
2021-12-09 12:43 ` [PR PATCH] [Merged]: " leahneukirchen

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).