From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 11789158090 for ; Fri, 13 May 2022 20:13:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53FBDE08FE; Fri, 13 May 2022 20:12:59 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3DFB8E08FE for ; Fri, 13 May 2022 20:12:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6DBA8341AD8 for ; Fri, 13 May 2022 20:12:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B614746D for ; Fri, 13 May 2022 20:12:55 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1652472762.ff966cb209c335d24b84891d174c2f0dcaa5e863.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-puzzle/nudoku/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch X-VCS-Directories: games-puzzle/nudoku/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ff966cb209c335d24b84891d174c2f0dcaa5e863 X-VCS-Branch: master Date: Fri, 13 May 2022 20:12:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 108c0636-f1c2-410a-b85f-6f996eec1870 X-Archives-Hash: 9d6e8bc088d91875b8180db5c7ad865d commit: ff966cb209c335d24b84891d174c2f0dcaa5e863 Author: Philipp Rösner protonmail com> AuthorDate: Mon May 9 20:32:40 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri May 13 20:12:42 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff966cb2 games-puzzle/nudoku: fix pkgconf On some systems the Autotools could not find the path to pkgconf in configure.ac due to a missing call to PKG_PROG_PKG_CONFIG. Closes: https://bugs.gentoo.org/764497 Signed-off-by: Philipp Rösner protonmail.com> Signed-off-by: Sam James gentoo.org> .../nudoku/files/nudoku-2.1.0-ncurses-link.patch | 42 ++++++++++++---------- 1 file changed, 23 insertions(+), 19 deletions(-) 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 index 396dbccddccf..0a4b2a13a0c4 100644 --- a/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch +++ b/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch @@ -2,36 +2,40 @@ Ensure we link against the correct ncurses libraries. https://bugs.gentoo.org/764470 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -1,11 +1,7 @@ - #AM_CFLAGS = --pedantic -Wall +@@ -2,9 +2,9 @@ #-DDEBUG --if HAVE_WIDE_NCURSES + if HAVE_WIDE_NCURSES -nudoku_LDADD = -lncursesw --else ++nudoku_LDADD = ${ncursesw_LIBS} + else -nudoku_LDADD = -lncurses --endif +nudoku_LDADD = ${ncurses_LIBS} + endif bin_PROGRAMS = nudoku nudoku_SOURCES = main.c sudoku.c sudoku.h - + --- a/configure.ac +++ b/configure.ac -@@ -34,15 +34,7 @@ the cairo development libraries, or compile without support (--disable-cairo) +@@ -6,6 +6,9 @@ AC_INIT([nudoku], [2.1.0], [jubalh@iodoru.org]) + AC_CONFIG_SRCDIR([src/main.c]) + AM_INIT_AUTOMAKE([foreign]) ++# Check for pkg-config ++PKG_PROG_PKG_CONFIG() ++ + # Checks for programs. + AC_PROG_CC + # Use C99. +@@ -35,9 +38,9 @@ the cairo development libraries, or compile without support (--disable-cairo) fi --have_wide_ncurses=no + have_wide_ncurses=no -AC_CHECK_LIB(ncursesw, initscr, [have_wide_ncurses=yes]) --if test $have_wide_ncurses = no; then ++PKG_CHECK_MODULES([ncursesw], [ncursesw], [have_wide_ncurses=yes], []) + if test $have_wide_ncurses = no; then - AC_CHECK_LIB(ncurses, initscr, [], [ -- echo "nudoku requires ncurses" -- exit 1 -- ]) --fi --AM_CONDITIONAL([HAVE_WIDE_NCURSES], [test $have_wide_ncurses = yes]) -+PKG_CHECK_MODULES([ncurses], [ncurses]) - - # Checks for header files. - AC_CHECK_HEADERS([stdlib.h string.h unistd.h]) - ++ PKG_CHECK_MODULES([ncurses], [ncurses], [], [ + echo "nudoku requires ncurses" + exit 1 + ])