* [gentoo-commits] repo/gentoo:master commit in: app-i18n/xvnkb/, app-i18n/xvnkb/files/
@ 2021-10-19 14:42 Akinori Hattori
0 siblings, 0 replies; 2+ messages in thread
From: Akinori Hattori @ 2021-10-19 14:42 UTC (permalink / raw
To: gentoo-commits
commit: dbdaa50c313235fbdba49845c3b0b3c92637d93f
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 19 14:37:34 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Oct 19 14:42:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbdaa50c
app-i18n/xvnkb: do not call cc directly
Closes: https://bugs.gentoo.org/729274
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
app-i18n/xvnkb/files/xvnkb-cc.patch | 10 ++++++++++
app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild | 5 ++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/app-i18n/xvnkb/files/xvnkb-cc.patch b/app-i18n/xvnkb/files/xvnkb-cc.patch
new file mode 100644
index 00000000000..1104998f788
--- /dev/null
+++ b/app-i18n/xvnkb/files/xvnkb-cc.patch
@@ -0,0 +1,10 @@
+--- a/tools/Makefile.common
++++ b/tools/Makefile.common
+@@ -49,6 +49,6 @@
+ Makefile.dep:
+ @echo
+ @echo -n Create $@ ...
+- @gcc -I$(XLIB_INC) -MM *.c > $@
++ @$(CC) -I$(XLIB_INC) -MM *.c > $@
+ @echo " done"
+ @echo
diff --git a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
index 837f22f8d6f..5281e302442 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
@@ -20,7 +20,10 @@ DEPEND="${RDEPEND}
x11-base/xorg-proto"
BDEPEND="xft? ( virtual/pkgconfig )"
-PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-cc.patch
+ "${FILESDIR}"/${P}-ldflags.patch
+)
src_prepare() {
default
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/xvnkb/, app-i18n/xvnkb/files/
@ 2021-10-19 14:42 Akinori Hattori
0 siblings, 0 replies; 2+ messages in thread
From: Akinori Hattori @ 2021-10-19 14:42 UTC (permalink / raw
To: gentoo-commits
commit: 987d5b923141f62ea0a65234a9a1faa6febb33d0
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 19 14:41:15 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Oct 19 14:42:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=987d5b92
app-i18n/xvnkb: new upstream release
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
app-i18n/xvnkb/Manifest | 1 +
app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch | 30 ++++++++++++
app-i18n/xvnkb/xvnkb-0.2.11.ebuild | 63 +++++++++++++++++++++++++
3 files changed, 94 insertions(+)
diff --git a/app-i18n/xvnkb/Manifest b/app-i18n/xvnkb/Manifest
index 595ce7a35ab..c6e7264d80b 100644
--- a/app-i18n/xvnkb/Manifest
+++ b/app-i18n/xvnkb/Manifest
@@ -1 +1,2 @@
+DIST xvnkb-0.2.11.tar.bz2 76397 BLAKE2B 8ebe4c389f5174b74af32fb001ef5f94d388b16a7c1ca0f409faffc6d63a4543d4daf7dc3609a8e7066324280eaf2d980e4a4e379ae478010269b808effb61cd SHA512 10d24ec159a89dd5fa68540bb8a92ae4d925f11039e7a7b77ed273862e4eb28ccd66d53ca1d0304f2a6d38182eddd304362d2bfd8c6804a2e7bfb354b20e5e83
DIST xvnkb-0.2.9a.tar.bz2 76429 BLAKE2B 33205bfe8dcc2fd68eaffb507dfb2db55cc1a71d33765f807b3804091a29f8c34ca8dcaf65a3f3978da921534d054096fb22abded3c4829d5ca256d3e51fff34 SHA512 3dbf4adb65f321d721fc74e05e92d2d1460e63c49e8a1ab2e10ab9f015e1a57bd3e641645d1283f1d0c5592eb7b342bf210d9fcab9ba441b6416c2f8fd1af6da
diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch b/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch
new file mode 100644
index 00000000000..8cae65fda77
--- /dev/null
+++ b/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch
@@ -0,0 +1,30 @@
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -19,10 +19,10 @@
+ $(CC) -fpic $(CFLAGS) $(FPTR) $(VK_OPT) -DVERSION=\"$(VERSION)\" -Wall -I$(XLIB_INC) -c $<
+
+ $(CORE): $(CORE_OBJS)
+- $(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) -lX11
++ $(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) $(LDFLAGS) -lX11
+
+ $(GUI): $(GUI_OBJS)
+- $(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
++ $(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
+
+ main: $(CORE) $(GUI)
+ @echo >/dev/null
+--- a/tools/Makefile.common
++++ b/tools/Makefile.common
+@@ -16,10 +16,10 @@
+ $(CC) $(CFLAGS) $(DEFS) -Wall -I$(XLIB_INC) -c $<
+
+ xvnkb_ctrl: $(CONTROL_OBJS)
+- $(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS)
++ $(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS) $(LDFLAGS)
+
+ xvnkb_setup: $(SETUP_OBJS)
+- $(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
++ $(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
+
+ main-tools: $(TOOLS)
+
diff --git a/app-i18n/xvnkb/xvnkb-0.2.11.ebuild b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
new file mode 100644
index 00000000000..66a1c6ccd41
--- /dev/null
+++ b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Vietnamese input keyboard for X"
+HOMEPAGE="http://xvnkb.sourceforge.net/"
+SRC_URI="http://${PN}.sourceforge.net/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="spell xft"
+
+RDEPEND="x11-libs/libX11:=
+ xft? ( x11-libs/libXft:= )"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+BDEPEND="xft? ( virtual/pkgconfig )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-cc.patch
+ "${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_prepare() {
+ default
+ tc-export CC
+}
+
+src_configure() {
+ # *not* autotools
+ ./configure \
+ $(usex spell '' '--no-spellcheck') \
+ $(usex xft '' '--no-xft') \
+ --use-extstroke \
+ || die "./configure failed"
+}
+
+src_install() {
+ dobin ${PN}
+ dobin tools/${PN}_ctrl
+
+ dolib.so ${PN}.so.${PV}
+ dosym ${PN}.so.${PV} /usr/$(get_libdir)/${PN}.so
+
+ einstalldocs
+ dodoc -r doc/. scripts contrib
+}
+
+pkg_postinst() {
+ elog "Remember to"
+ elog "$ export LANG=en_US.UTF-8"
+ elog "(or any other UTF-8 locale) and"
+ elog "$ export LD_PRELOAD=/usr/$(get_libdir)/${PN}.so"
+ elog "before starting X Window"
+ elog "More documents are in ${EROOT}/usr/share/doc/${PF}"
+
+ ewarn "Programs with suid/sgid will have LD_PRELOAD cleared"
+ ewarn "You have to unset suid/sgid to use with ${PN}"
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-19 14:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-19 14:42 [gentoo-commits] repo/gentoo:master commit in: app-i18n/xvnkb/, app-i18n/xvnkb/files/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2021-10-19 14:42 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox