commit: 399c62230e19ec2033d055be8e1f14efb1ad9146 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Mon Jan 25 09:26:15 2021 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Mon Jan 25 15:01:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=399c6223
x11-misc/xvkbd: remove unused patch(es) Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/19206 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> .../xvkbd/files/xvkbd-3.6-last_altgr_mask.patch | 11 ---------- x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch | 25 ---------------------- x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch | 22 ------------------- 3 files changed, 58 deletions(-) diff --git a/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch b/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch deleted file mode 100644 index 7fe70773acc..00000000000 --- a/x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/xvkbd.c -+++ b/xvkbd.c -@@ -681,7 +681,7 @@ - } - } - -- last_altgr_mask = (altgr_mask | last_altgr_mask); -+ last_altgr_mask = altgr_mask; - alt_mask = 0; - meta_mask = 0; - altgr_mask = 0; diff --git a/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch b/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch deleted file mode 100644 index 83879dd9fd0..00000000000 --- a/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,5 +1,4 @@ --appdefaultdir=$(shell pkg-config --variable=appdefaultdir xt) --datarootdir=$(shell pkg-config --variable=datarootdir xt) -+appdefaultdir = $(shell $(PKG_CONFIG) --variable=appdefaultdir xt) - - SUBDIRS = . - bin_PROGRAMS = xvkbd -@@ -17,11 +16,12 @@ - [ which ad2c > /dev/null ] || ad2c XVkbd-common.ad > XVkbd-common.h - - install-data-hook: -+ [ -d $(DESTDIR)/$(appdefaultdir)/xvkbd/ ] || mkdir $(DESTDIR)/$(appdefaultdir)/xvkbd/ - for file in *.ad; do \ -- $(INSTALL_DATA) $$file $(appdefaultdir)/$${file%.ad}; \ -+ $(INSTALL_DATA) $$file $(DESTDIR)/$(appdefaultdir)/$${file%.ad}; \ - done -- [ -d $(datarootdir)/xvkbd/ ] || mkdir $(datarootdir)/xvkbd/ -- $(INSTALL_DATA) words.english $(datarootdir)/xvkbd/words.english -+ [ -d $(DESTDIR)/$(datarootdir)/xvkbd/ ] || mkdir $(DESTDIR)/$(datarootdir)/xvkbd/ -+ $(INSTALL_DATA) words.english $(DESTDIR)/$(datarootdir)/xvkbd/words.english - - EXTRA_DIST = XVkbd-common.h *.ad *.xbm xvkbd.man README ChangeLog Imakefile words.english - diff --git a/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch b/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch deleted file mode 100644 index 1ca0db04856..00000000000 --- a/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/resources.h -+++ b/resources.h -@@ -19,7 +19,7 @@ - # define PROGRAM_NAME "xvkbd" - #endif - --struct appres_struct { -+extern struct appres_struct { - String description; - String show_manual_command; - ---- a/xvkbd.c -+++ b/xvkbd.c -@@ -500,6 +500,8 @@ - - static Pixmap xvkbd_pixmap = None; - -+struct appres_struct appres; -+ - static int AddKeysym(KeySym keysym, Boolean top); /* forward */ - static void MakeKeyboard(Boolean remake); - static void MakeKeypad(Widget form, Widget from_vert, Widget from_horiz);
