Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/KXL/files/, dev-games/KXL/
Date: Mon, 26 Sep 2022 12:11:01
Message-Id: 1664156769.679bec0e2c20c8acc540503db3bc6e9b156dc2c0.sam@gentoo
1 commit: 679bec0e2c20c8acc540503db3bc6e9b156dc2c0
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 26 01:46:09 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 26 01:46:09 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=679bec0e
7
8 dev-games/KXL: add 1.1.7_p17 (switch to Debian patches)
9
10 Indeed, most of our patches game from Debian (albeit without references ;))
11 so this is far simpler.
12
13 Dates back a long time!
14 ```
15 +*KXL-1.1.7-r1 (13 May 2007)
16 +
17 + 13 May 2007; Tupone Alfredo <tupone <AT> gentoo.org>
18 + +files/KXL-1.1.7-amd64.patch, +KXL-1.1.7-r1.ebuild:
19 + Fixing bug #148332 by Pacho Ramos
20 + Patch are from debian. It regards 64bit, sound and autorepeat
21 ```
22
23 Bug: https://bugs.gentoo.org/148332
24 Closes: https://bugs.gentoo.org/870415
25 Signed-off-by: Sam James <sam <AT> gentoo.org>
26
27 dev-games/KXL/KXL-1.1.7_p17.ebuild | 48 ++++++++++++++++++++++
28 dev-games/KXL/Manifest | 1 +
29 .../KXL-1.1.7-implicit-function-declarations.patch | 19 +++++++++
30 3 files changed, 68 insertions(+)
31
32 diff --git a/dev-games/KXL/KXL-1.1.7_p17.ebuild b/dev-games/KXL/KXL-1.1.7_p17.ebuild
33 new file mode 100644
34 index 000000000000..33e072b293c6
35 --- /dev/null
36 +++ b/dev-games/KXL/KXL-1.1.7_p17.ebuild
37 @@ -0,0 +1,48 @@
38 +# Copyright 1999-2022 Gentoo Authors
39 +# Distributed under the terms of the GNU General Public License v2
40 +
41 +EAPI=8
42 +
43 +inherit autotools
44 +
45 +MY_PV=$(ver_cut 1-3)
46 +DESCRIPTION="Development Library for making games for X"
47 +HOMEPAGE="http://kxl.orz.hm/"
48 +# http://kxl.hn.org/download/${P}.tar.gz
49 +SRC_URI="mirror://debian/pool/main/k/kxl/kxl_${MY_PV}.orig.tar.gz -> ${PN}-${MY_PV}.tar.gz"
50 +SRC_URI+=" mirror://debian/pool/main/k/kxl/kxl_${MY_PV}-$(ver_cut 5).debian.tar.xz"
51 +S="${WORKDIR}"/${PN}-${MY_PV}
52 +
53 +LICENSE="GPL-2"
54 +SLOT="0"
55 +KEYWORDS="~amd64 ~x86"
56 +
57 +DEPEND="x11-libs/libX11"
58 +RDEPEND="${DEPEND}"
59 +
60 +PATCHES=(
61 + "${FILESDIR}"/${PN}-${MY_PV}-as-needed.patch
62 + "${FILESDIR}"/${PN}-${MY_PV}-ldflags.patch
63 + "${FILESDIR}"/${PN}-${MY_PV}-implicit-function-declarations.patch
64 +)
65 +
66 +src_prepare() {
67 + drop_debian_patch() {
68 + rm "${WORKDIR}"/debian/patches/$1 || die
69 + sed -i -e "/^${1}/d" "${WORKDIR}"/debian/patches/series || die
70 + }
71 +
72 + drop_debian_patch 000_soname_xlibs.diff
73 +
74 + eapply $(awk '{print $1}' "${WORKDIR}"/debian/patches/series | sed -e "s:^:${WORKDIR}/debian/patches/:")
75 +
76 + default
77 +
78 + eautoreconf
79 +}
80 +
81 +src_install() {
82 + default
83 +
84 + find "${ED}" -name '*.la' -delete || die
85 +}
86
87 diff --git a/dev-games/KXL/Manifest b/dev-games/KXL/Manifest
88 index c7348333e321..45f968e799ca 100644
89 --- a/dev-games/KXL/Manifest
90 +++ b/dev-games/KXL/Manifest
91 @@ -1 +1,2 @@
92 DIST KXL-1.1.7.tar.gz 192070 BLAKE2B 7f5256afaffe94cd5f6551d8f53b43e2d9512cf94dfaebb123205b55d83d4645e226bbed62bf5f0da909104d4e33d1da60c7e08c0ee527087a4793c79c117df2 SHA512 f3a9051b0e8916745725a2809097df07c59f8811f336574def7e479c992175d0bd49661817f9da35d122d291aff0bde5d4c27e5b17a3f09878e71b2c7a709adb
93 +DIST kxl_1.1.7-17.debian.tar.xz 178364 BLAKE2B 067f73a23b3bfd3c2fbdeb6c032d56444a3db68190a1a23cbe88f39767cea4ad1f16c641d24d12cccd6f3c480134105e85384d2f34b9bc0f4487d71faa975fc2 SHA512 ac2b8e919dcf3e1449df393aad9daf282b9954da6c2f43ff4cbb7bc073fd9ad660413ea09ea8cac480593fd2ea63ec2d176b338fa8f8a24b128636d5e3376495
94
95 diff --git a/dev-games/KXL/files/KXL-1.1.7-implicit-function-declarations.patch b/dev-games/KXL/files/KXL-1.1.7-implicit-function-declarations.patch
96 new file mode 100644
97 index 000000000000..ac1d0e530a4c
98 --- /dev/null
99 +++ b/dev-games/KXL/files/KXL-1.1.7-implicit-function-declarations.patch
100 @@ -0,0 +1,19 @@
101 +--- a/src/KXLjoystick.c
102 ++++ b/src/KXLjoystick.c
103 +@@ -1,5 +1,6 @@
104 + #include <stdio.h>
105 + #include <sys/ioctl.h>
106 ++#include <unistd.h>
107 + #include <fcntl.h>
108 + #include "KXL.h"
109 +
110 +--- a/src/KXLsound.c
111 ++++ b/src/KXLsound.c
112 +@@ -7,6 +7,7 @@
113 + #include <sys/ioctl.h>
114 + #include <sys/time.h>
115 + #include <sys/soundcard.h>
116 ++#include <unistd.h>
117 + #include "KXL.h"
118 +
119 + #define MIN(a, b) (((a) < (b)) ? (a) : (b))