| 1 |
commit: ff966cb209c335d24b84891d174c2f0dcaa5e863 |
| 2 |
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com> |
| 3 |
AuthorDate: Mon May 9 20:32:40 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 13 20:12:42 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff966cb2 |
| 7 |
|
| 8 |
games-puzzle/nudoku: fix pkgconf |
| 9 |
|
| 10 |
On some systems the Autotools could not find the path to pkgconf in |
| 11 |
configure.ac due to a missing call to PKG_PROG_PKG_CONFIG. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/764497 |
| 14 |
Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com> |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
.../nudoku/files/nudoku-2.1.0-ncurses-link.patch | 42 ++++++++++++---------- |
| 18 |
1 file changed, 23 insertions(+), 19 deletions(-) |
| 19 |
|
| 20 |
diff --git a/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch b/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch |
| 21 |
index 396dbccddccf..0a4b2a13a0c4 100644 |
| 22 |
--- a/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch |
| 23 |
+++ b/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch |
| 24 |
@@ -2,36 +2,40 @@ Ensure we link against the correct ncurses libraries. |
| 25 |
https://bugs.gentoo.org/764470 |
| 26 |
--- a/src/Makefile.am |
| 27 |
+++ b/src/Makefile.am |
| 28 |
-@@ -1,11 +1,7 @@ |
| 29 |
- #AM_CFLAGS = --pedantic -Wall |
| 30 |
+@@ -2,9 +2,9 @@ |
| 31 |
#-DDEBUG |
| 32 |
|
| 33 |
--if HAVE_WIDE_NCURSES |
| 34 |
+ if HAVE_WIDE_NCURSES |
| 35 |
-nudoku_LDADD = -lncursesw |
| 36 |
--else |
| 37 |
++nudoku_LDADD = ${ncursesw_LIBS} |
| 38 |
+ else |
| 39 |
-nudoku_LDADD = -lncurses |
| 40 |
--endif |
| 41 |
+nudoku_LDADD = ${ncurses_LIBS} |
| 42 |
+ endif |
| 43 |
bin_PROGRAMS = nudoku |
| 44 |
nudoku_SOURCES = main.c sudoku.c sudoku.h |
| 45 |
- |
| 46 |
+ |
| 47 |
--- a/configure.ac |
| 48 |
+++ b/configure.ac |
| 49 |
-@@ -34,15 +34,7 @@ the cairo development libraries, or compile without support (--disable-cairo) |
| 50 |
+@@ -6,6 +6,9 @@ AC_INIT([nudoku], [2.1.0], [jubalh@××××××.org]) |
| 51 |
+ AC_CONFIG_SRCDIR([src/main.c]) |
| 52 |
+ AM_INIT_AUTOMAKE([foreign]) |
| 53 |
|
| 54 |
++# Check for pkg-config |
| 55 |
++PKG_PROG_PKG_CONFIG() |
| 56 |
++ |
| 57 |
+ # Checks for programs. |
| 58 |
+ AC_PROG_CC |
| 59 |
+ # Use C99. |
| 60 |
+@@ -35,9 +38,9 @@ the cairo development libraries, or compile without support (--disable-cairo) |
| 61 |
fi |
| 62 |
|
| 63 |
--have_wide_ncurses=no |
| 64 |
+ have_wide_ncurses=no |
| 65 |
-AC_CHECK_LIB(ncursesw, initscr, [have_wide_ncurses=yes]) |
| 66 |
--if test $have_wide_ncurses = no; then |
| 67 |
++PKG_CHECK_MODULES([ncursesw], [ncursesw], [have_wide_ncurses=yes], []) |
| 68 |
+ if test $have_wide_ncurses = no; then |
| 69 |
- AC_CHECK_LIB(ncurses, initscr, [], [ |
| 70 |
-- echo "nudoku requires ncurses" |
| 71 |
-- exit 1 |
| 72 |
-- ]) |
| 73 |
--fi |
| 74 |
--AM_CONDITIONAL([HAVE_WIDE_NCURSES], [test $have_wide_ncurses = yes]) |
| 75 |
-+PKG_CHECK_MODULES([ncurses], [ncurses]) |
| 76 |
- |
| 77 |
- # Checks for header files. |
| 78 |
- AC_CHECK_HEADERS([stdlib.h string.h unistd.h]) |
| 79 |
- |
| 80 |
++ PKG_CHECK_MODULES([ncurses], [ncurses], [], [ |
| 81 |
+ echo "nudoku requires ncurses" |
| 82 |
+ exit 1 |
| 83 |
+ ]) |
Archives