* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xvkbd/files/, x11-misc/xvkbd/
@ 2019-09-04 6:52 Jeroen Roovers
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers @ 2019-09-04 6:52 UTC (permalink / raw
To: gentoo-commits
commit: d4539ecb63cc1f42e68218043f308865fe595bdd
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 4 06:50:08 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Sep 4 06:52:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4539ecb
x11-misc/xvkbd: Version 4.0
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
x11-misc/xvkbd/Manifest | 1 +
x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch | 25 ++++++++++++++++
x11-misc/xvkbd/xvkbd-4.0.ebuild | 44 ++++++++++++++++++++++++++++
3 files changed, 70 insertions(+)
diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
index a11380f43ea..ed2f426379f 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -1,3 +1,4 @@
DIST xvkbd-3.7.tar.gz 81645 BLAKE2B 9133b3b8e176034f2c39deb3ad9b334f553c834ba3285aaed59ab2a6f531c0184879c7bfe8c702313c9b0d4089883603c2f8430160f3c2af243705e5328b4ed0 SHA512 19ac5e78c34889d80571bb9feea65582fa413cdce0ba2f949840a08e70c900d720ca789d90d1118aa9667d32183b0f1edb33b7b0029ef5abb1d6faf058134385
DIST xvkbd-3.8.tar.gz 88508 BLAKE2B bdaa3b31322ef2393298cb6987e4980536f3a6707df4016acc698a6713f25bff3e92cdecfcbf0c513af5cb8290e9b434fc61108095138c15cbbba9765ba856a1 SHA512 8a1ff96d90d1021bfd60ac6c251e62d68a65e86a1f1ee1fbdbf67344bdd07d7e1929a646e7e80f1da5f3e12e50c655e2be180c9ae4129fa7912f32aa5f40f5f5
DIST xvkbd-3.9.tar.gz 88440 BLAKE2B d024e97c3e134fd4270db07b1eb54c45380b74bdbffb3fbcf7778e839b51ad8a74a7a236e440215eaea38062ae321db866c5344ecb7eaf2ed9ce15d663cbde9a SHA512 f85d94f9b8012023eb4e901c1962ea39a491df2af67b617efb0817023eb93c460446ab9414fb20dcaee02e270cb9cb7b058a83ae96ffae73291b799f15a04b98
+DIST xvkbd-4.0.tar.gz 408256 BLAKE2B 12f18dc6af9636021a9a067528b9ee2387c43aec0d7a23e01e7e4979273ccfa1eae7752cd2814465da906eeada44a31ff70a3f00f030e87ff66db35e3f3c7f5a SHA512 17fe50b86974f21f1456c522cec107f42a8915fa4ffa60849e03d56a3eb8b600aba46becfde458799e30b073d435c60ee8b3b61d79f4c0d86575770cb4bfd951
diff --git a/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch b/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch
new file mode 100644
index 00000000000..83879dd9fd0
--- /dev/null
+++ b/x11-misc/xvkbd/files/xvkbd-4.0-destdir.patch
@@ -0,0 +1,25 @@
+--- 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/xvkbd-4.0.ebuild b/x11-misc/xvkbd/xvkbd-4.0.ebuild
new file mode 100644
index 00000000000..52f200bc9b2
--- /dev/null
+++ b/x11-misc/xvkbd/xvkbd-4.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="virtual keyboard for X window system"
+HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+RDEPEND="
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXaw3d
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-libs/libXtst
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ x11-base/xorg-proto
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.0-destdir.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_install() {
+ dodir /usr/share/X11/app-defaults
+
+ default
+
+ dodoc ChangeLog README
+ newman ${PN}.man ${PN}.1
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xvkbd/files/, x11-misc/xvkbd/
@ 2020-01-31 11:53 Jeroen Roovers
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers @ 2020-01-31 11:53 UTC (permalink / raw
To: gentoo-commits
commit: 35db8d18eeb785d6cf17b660ba1bacb1f6fad6b5
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 31 11:52:42 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jan 31 11:53:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35db8d18
x11-misc/xvkbd: Fix CFLAGS=-fno-common
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Closes: https://bugs.gentoo.org/show_bug.cgi?id=707430
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch | 22 ++++++++++++++++++++++
x11-misc/xvkbd/xvkbd-4.0.ebuild | 3 ++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch b/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch
new file mode 100644
index 00000000000..1ca0db04856
--- /dev/null
+++ b/x11-misc/xvkbd/files/xvkbd-4.0-fno-common.patch
@@ -0,0 +1,22 @@
+--- 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);
diff --git a/x11-misc/xvkbd/xvkbd-4.0.ebuild b/x11-misc/xvkbd/xvkbd-4.0.ebuild
index 90d49c1f04f..90be10d4030 100644
--- a/x11-misc/xvkbd/xvkbd-4.0.ebuild
+++ b/x11-misc/xvkbd/xvkbd-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -27,6 +27,7 @@ DEPEND="
"
PATCHES=(
"${FILESDIR}"/${PN}-4.0-destdir.patch
+ "${FILESDIR}"/${PN}-4.0-fno-common.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-31 11:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-04 6:52 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xvkbd/files/, x11-misc/xvkbd/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2020-01-31 11:53 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox