summaryrefslogtreecommitdiff
path: root/x11-misc/xvkbd/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc/xvkbd/files')
-rw-r--r--x11-misc/xvkbd/files/xvkbd-3.6-last_altgr_mask.patch11
-rw-r--r--x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch25
-rw-r--r--x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch22
3 files changed, 0 insertions, 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 7fe70773acca..000000000000
--- 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 83879dd9fd02..000000000000
--- 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 1ca0db048566..000000000000
--- 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);