mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-libs/libspnav: drop 0.2.3-r1, 1.0-r1
Bug: https://bugs.gentoo.org/940657 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -1,3 +1 @@
|
||||
DIST libspnav-0.2.3.tar.gz 11985 BLAKE2B 134a0c3f7c9a7ef7c4f68910e0266880958e2b74e253b75237b0fa8d3e482bcd1f42e715b85f0ffca3a62103530e854090818564d9c241bfc55de039cc4883ee SHA512 b2c452d979d455fc99bfdc172c8a2408a6e8dc40acc52964fa64f4d75a8ee77dda12e5e212c0c4e07a0a24d055f16f85bb6ce6287e24e6bd0665de457e37e6a7
|
||||
DIST libspnav-1.0.tar.gz 31578 BLAKE2B 535cdf588b4b1de8f37f9239a48df10e755d004fbe6b5f3771b00bb2f9a8b36e7db30297a8a99ac689d890c08c728303af3d71c60c299574bf02476aa5724b11 SHA512 ae36ea51dbca7d5ba31d82ffaa46bad2bd877f5f7c077d2e711747427f6d60a000ab0c827ae6523ba6a275dbad205eea8c20520fe2575a6fa6b554ea8b5e0eaa
|
||||
DIST libspnav-1.1.tar.gz 31574 BLAKE2B 3c15ead61a6eb61da6eb4d072f09b1eb410b441d622d18efe2b70754efcb5de3fd1d2e707fe162d62fb5246e1f8f1313d80ff8765edad6626760e1e2c7283191 SHA512 94770d9449dd02ade041d3589bcae7664fa990c4a4feca7b2b1e6542b65aa7073305595310b9e639f10716cf15aaad913e57496fb79bdd4dba5bf703ec8299ab
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
From 7b988445b29b2bffb0714ad419c9b6dd90baccd2 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Pipping <sebastian@pipping.org>
|
||||
Date: Sun, 7 Jul 2019 21:51:44 +0200
|
||||
Subject: [PATCH] Makefile.in: Ignore /usr/local/ + fix .so symlink creation
|
||||
|
||||
---
|
||||
Makefile.in | 9 ++++-----
|
||||
1 file changed, 4 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 7abe595..39714f8 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -5,8 +5,8 @@ hdr = spnav.h spnav_magellan.h spnav_config.h
|
||||
name = spnav
|
||||
lib_a = lib$(name).a
|
||||
|
||||
-incpaths = -I. -I/usr/local/include -I/usr/X11R6/include
|
||||
-libpaths = -L/usr/local/lib -L/usr/X11R6/lib
|
||||
+incpaths = -I.
|
||||
+libpaths =
|
||||
|
||||
CC = gcc
|
||||
AR = ar
|
||||
@@ -54,9 +54,8 @@ install: $(lib_a) $(lib_so)
|
||||
cp $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so)
|
||||
[ -n "$(soname)" ] && \
|
||||
rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) && \
|
||||
- ln -s $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) && \
|
||||
- ln -s $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) || \
|
||||
- true
|
||||
+ ln -s "$(lib_so)" $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) && \
|
||||
+ ln -s "$(lib_so)" $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink)
|
||||
for h in $(hdr); do cp -p $(srcdir)/$$h $(DESTDIR)$(PREFIX)/include/; done
|
||||
|
||||
.PHONY: uninstall
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
From 12cff951bb9ee24bab2f09793d3e3917b8649f36 Mon Sep 17 00:00:00 2001
|
||||
From: John Tsiombikas <nuclear@member.fsf.org>
|
||||
Date: Sat, 2 Apr 2022 01:17:41 +0300
|
||||
Subject: [PATCH] fix no-x11 build: some new functions were erroneously
|
||||
declared inside the USE_X11 conditional block.
|
||||
|
||||
---
|
||||
src/spnav.c | 17 +++++++++--------
|
||||
1 file changed, 9 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/src/spnav.c b/src/spnav.c
|
||||
index a444fb2..41fd559 100644
|
||||
--- a/src/spnav.c
|
||||
+++ b/src/spnav.c
|
||||
@@ -50,14 +50,6 @@ OF SUCH DAMAGE.
|
||||
static Window get_daemon_window(Display *dpy);
|
||||
static int catch_badwin(Display *dpy, XErrorEvent *err);
|
||||
|
||||
-static int read_event(int s, spnav_event *event);
|
||||
-static int proc_event(int *data, spnav_event *event);
|
||||
-
|
||||
-static void flush_resp(void);
|
||||
-static int wait_resp(void *buf, int sz, int timeout_ms);
|
||||
-static int request(int req, struct reqresp *rr, int timeout_ms);
|
||||
-static int request_str(int req, char *buf, int bufsz, int timeout_ms);
|
||||
-
|
||||
|
||||
static Display *dpy;
|
||||
static Window app_win;
|
||||
@@ -73,6 +65,15 @@ enum {
|
||||
#define IS_OPEN (sock != -1)
|
||||
#endif
|
||||
|
||||
+static int read_event(int s, spnav_event *event);
|
||||
+static int proc_event(int *data, spnav_event *event);
|
||||
+
|
||||
+static void flush_resp(void);
|
||||
+static int wait_resp(void *buf, int sz, int timeout_ms);
|
||||
+static int request(int req, struct reqresp *rr, int timeout_ms);
|
||||
+static int request_str(int req, char *buf, int bufsz, int timeout_ms);
|
||||
+
|
||||
+
|
||||
struct event_node {
|
||||
spnav_event event;
|
||||
struct event_node *next;
|
||||
@@ -1,52 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
MY_PN='spacenav'
|
||||
DESCRIPTION="libspnav is a replacement for the magellan library with a cleaner API"
|
||||
HOMEPAGE="http://spacenav.sourceforge.net/"
|
||||
SRC_URI="https://downloads.sourceforge.net/project/${MY_PN}/${MY_PN}%20library%20%28SDK%29/${PN}%20${PV}/${P}.tar.gz"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86"
|
||||
IUSE="static-libs X"
|
||||
|
||||
CDEPEND="X? ( x11-libs/libX11 )"
|
||||
RDEPEND="app-misc/spacenavd[X?]
|
||||
${CDEPEND}"
|
||||
DEPEND="${CDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
eapply "${FILESDIR}"/${P}-makefile.patch
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local args=(
|
||||
--disable-opt
|
||||
--disable-debug
|
||||
$(use_enable X x11)
|
||||
)
|
||||
econf "${args[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake AR="$(tc-getAR)" CC="$(tc-getCC)"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local args=(
|
||||
DESTDIR="${D}"
|
||||
libdir="$(get_libdir)"
|
||||
)
|
||||
emake "${args[@]}" install
|
||||
|
||||
# The custom configure script does not support --disable-static
|
||||
# and conditionally patching $(lib_a) out of Makefile.in does not
|
||||
# seem like a very maintainable option, hence we delete the .a file
|
||||
# after "make install", instead.
|
||||
use static-libs || find "${D}" -type f -name \*.a -delete
|
||||
}
|
||||
@@ -1,60 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
MY_PN='spacenav'
|
||||
DESCRIPTION="libspnav is a replacement for the magellan library with a cleaner API"
|
||||
HOMEPAGE="http://spacenav.sourceforge.net/"
|
||||
SRC_URI="https://github.com/FreeSpacenav/libspnav/releases/download/v${PV}/libspnav-${PV}.tar.gz"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
|
||||
IUSE="static-libs X"
|
||||
|
||||
CDEPEND="X? ( x11-libs/libX11 )"
|
||||
RDEPEND="app-misc/spacenavd[X?]
|
||||
${CDEPEND}"
|
||||
DEPEND="${CDEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-no-xorg-compile.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local args=(
|
||||
--disable-opt
|
||||
--disable-debug
|
||||
$(use_enable X x11)
|
||||
)
|
||||
econf "${args[@]}"
|
||||
|
||||
# https://bugs.gentoo.org/838349
|
||||
sed "/^Libs:/ s,/lib,/$(get_libdir)," -i spnav.pc || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local args=(
|
||||
AR="$(tc-getAR)"
|
||||
CC="$(tc-getCC)"
|
||||
incpaths=-I.
|
||||
libpaths=
|
||||
)
|
||||
emake "${args[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local args=(
|
||||
DESTDIR="${D}"
|
||||
libdir="$(get_libdir)"
|
||||
)
|
||||
emake "${args[@]}" install
|
||||
|
||||
# The custom configure script does not support --disable-static
|
||||
# and conditionally patching $(lib_a) out of Makefile.in does not
|
||||
# seem like a very maintainable option, hence we delete the .a file
|
||||
# after "make install", instead.
|
||||
use static-libs || find "${D}" -type f -name \*.a -delete
|
||||
}
|
||||
Reference in New Issue
Block a user