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 /games-puzzle/nudoku | |
| parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) | |
gentoo resync : 29.12.2022
Diffstat (limited to 'games-puzzle/nudoku')
| -rw-r--r-- | games-puzzle/nudoku/Manifest | 4 | ||||
| -rw-r--r-- | games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch | 42 | ||||
| -rw-r--r-- | games-puzzle/nudoku/nudoku-2.1.0.ebuild | 4 |
3 files changed, 27 insertions, 23 deletions
diff --git a/games-puzzle/nudoku/Manifest b/games-puzzle/nudoku/Manifest index 29ab5f578f1f..44e4c3a7142d 100644 --- a/games-puzzle/nudoku/Manifest +++ b/games-puzzle/nudoku/Manifest @@ -1,4 +1,4 @@ -AUX nudoku-2.1.0-ncurses-link.patch 927 BLAKE2B 6a1a5c40a5d3730684eefcc5298eb6ce676c1b5df380d6d9c6453aec9a2066d89ad876a39f95678d27e00281776a3d7e81cb4b9b2719c7f82e1f2f4fd357a3bc SHA512 a93051295845a7abd7a61b74c7f718f8c59f1b7bbb70015ec3db72d1b6bb08370ab63428611ccea1d9396321e54447d8117dedb3c411e4912e801efbc1921746 +AUX nudoku-2.1.0-ncurses-link.patch 1077 BLAKE2B b03e0cd67bb2bdbab2849252802dd792757c099dab7e9b3279f9feb4811b8b129a4c6d99490af325533779d02a2fa5f50e4f1a3e67b8003888e02aa2c47018e6 SHA512 0911ea872374654f43f246ea2208f06b02ec951945038851236b82122eb0a318cf5e9ffe9ad86dbdf84bd431a2907f744c0452aa406d13da807ae2da21f928eb DIST nudoku-2.1.0.tar.gz 31592 BLAKE2B 997ae3931fec3b6605858a35cdf6bc88296138c01a9138d229ed43a5262fdd5d15eb8a96dfdcf02e8eb6f7f416b84e4752edbb57319be50bfdae6c952217446b SHA512 dde16d1dccc1cae8d156f57fccf8b112f3fee7d23b912b5cd7ecc092ecbf04a8e85f469e53fa02e6bd2d0b9498e4a65a219e1aad8091f82638dceab32f320670 -EBUILD nudoku-2.1.0.ebuild 655 BLAKE2B d774320d88895741c67dfaa1440f8f62d0068d712f34b287ae346d9e9e5067d1cb31cccfdc31fc184216064c4892f972589b92daab45944b7c9daf8f5d23b389 SHA512 f8981d38845de5ab71abfd730372362624ea406297fefeaf3ec50d2540541f0fd443543af998ff25dd83082fc343d3f4531db88b6bd9ec098d03f67ef46372b4 +EBUILD nudoku-2.1.0.ebuild 655 BLAKE2B acba6e03ef4550908645e602cef6800ab9401f01b50384abe0de27fcd8a3bf588ace499a7251cd77fdfc60aa2fdc0db0cbdae2abc1465ce1ed6f3e35cf5d2ef4 SHA512 4b1204f009d730a995dd56ac67d66ae671015774a621d22e9d90ef2ae7e59c33f74e4187813e83474e6611662206a7a68c49d76306d2003c145054449f829414 MISC metadata.xml 246 BLAKE2B 13476e9638cd0b163431a008d3b268808c2b76cb238a19eadd499e04596da9ff8b094b1a76df40573d521a15932ae38b0fb47981d56185c4f4c0fee0144f3070 SHA512 de8d47c8ac61355ec681aa700c724f6613be1a234189c2c9979a9fa23f387f30875eb667ffd373e22187846c4861df2b46ac0e0d47ea2b3d779da514b49093a5 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 + ]) diff --git a/games-puzzle/nudoku/nudoku-2.1.0.ebuild b/games-puzzle/nudoku/nudoku-2.1.0.ebuild index 4ba0f1598188..9bd564dfc76a 100644 --- a/games-puzzle/nudoku/nudoku-2.1.0.ebuild +++ b/games-puzzle/nudoku/nudoku-2.1.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools |