diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /app-misc/rover/files/rover-1.0.1-ncurses.patch | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'app-misc/rover/files/rover-1.0.1-ncurses.patch')
-rw-r--r-- | app-misc/rover/files/rover-1.0.1-ncurses.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/app-misc/rover/files/rover-1.0.1-ncurses.patch b/app-misc/rover/files/rover-1.0.1-ncurses.patch new file mode 100644 index 000000000000..52c64c76b29a --- /dev/null +++ b/app-misc/rover/files/rover-1.0.1-ncurses.patch @@ -0,0 +1,72 @@ +Upstream-PR: https://github.com/lecram/rover/pull/41 +From 9e1f635a4c31d1621141dce51bb620365c784a0e Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Sat, 7 May 2022 08:41:22 -0700 +Subject: [PATCH 1/2] build: Use pkgconfig to fix undefined references + +On gentoo the build also requires -ltinfow which is exposed +by the ncursesw.pc pkgconfig file. +--- + Makefile | 8 ++++++-- + rover.c | 2 ++ + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 291a7b3..bbf376b 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,14 +1,18 @@ +-LDLIBS := -lncursesw + PREFIX ?= /usr/local + BINDIR ?= $(PREFIX)/bin + DATAROOTDIR ?= $(PREFIX)/share + DATADIR ?= $(DATAROOTDIR) + MANDIR ?= $(DATADIR)/man + ++PKG_CONFIG ?= pkg-config ++ ++CFLAGS_NCURSESW := `$(PKG_CONFIG) --cflags ncursesw` ++LIBS_NCURSESW := `$(PKG_CONFIG) --libs ncursesw` ++ + all: rover + + rover: rover.c config.h +- $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS) ++ $(CC) $(CFLAGS) $(CFLAGS_NCURSESW) -o $@ $< $(LDFLAGS) $(LIBS_NCURSESW) + + install: rover + rm -f $(DESTDIR)$(BINDIR)/rover +diff --git a/rover.c b/rover.c +index eca6aeb..342aa48 100644 +--- a/rover.c ++++ b/rover.c +@@ -1,4 +1,6 @@ ++#ifndef _XOPEN_SOURCE + #define _XOPEN_SOURCE 700 ++#endif + #define _XOPEN_SOURCE_EXTENDED + #define _FILE_OFFSET_BITS 64 + + +From 7b5983d9d90d8ec0ff6e846a7fc7126cddc1d808 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Sat, 7 May 2022 08:49:07 -0700 +Subject: [PATCH 2/2] build: Add CFLAGS default + +--- + Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile b/Makefile +index bbf376b..c2890fe 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,6 +4,8 @@ DATAROOTDIR ?= $(PREFIX)/share + DATADIR ?= $(DATAROOTDIR) + MANDIR ?= $(DATADIR)/man + ++CFLAGS ?= -O2 ++ + PKG_CONFIG ?= pkg-config + + CFLAGS_NCURSESW := `$(PKG_CONFIG) --cflags ncursesw` |