1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00

puzzles: update to latest revision

Convert to cmake, drop all the unneeded cruft from the recipe.

License-Update: additional contributors
(From OE-Core rev: adba510022781f139014d6174e46954c1f4774c0)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2021-05-05 17:18:07 +02:00
committed by Richard Purdie
parent 73b4bf301e
commit 537ffe0d95
2 changed files with 5 additions and 65 deletions
@@ -1,32 +0,0 @@
From 337799e40350b3db2441cc98f65ec36a74dfb356 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 21 Apr 2017 12:18:08 -0700
Subject: [PATCH] Use -Wno-error=format-overflow= if the compiler supports it
we need this warning to be suppressed with gcc7+
however older compilers dont support it so we need
a way to disble it only if compiler supports it
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 3a38c95..bb9035e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ fi
if test "x$GCC" = "xyes"; then
AC_MSG_CHECKING([for usable gcc warning flags])
gccwarningflags=
- for flag in -Wall -Werror -std=c89 -pedantic; do
+ for flag in -Wall -Werror -std=c89 -pedantic -Wno-error=format-overflow=; do
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS$gccwarningflags $flag $GTK_CFLAGS"
--
2.12.2
+5 -33
View File
@@ -2,17 +2,14 @@ SUMMARY = "Simon Tatham's Portable Puzzle Collection"
DESCRIPTION = "Collection of small computer programs which implement one-player puzzle games."
HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENCE;md5=6099f4981f9461d7f411091e69a7f07a"
LIC_FILES_CHKSUM = "file://LICENCE;md5=93c2525113e094a4a744cf14d4de07e2"
DEPENDS = "libxt"
# The libxt requires x11 in DISTRO_FEATURES
# gtk support includes a bunch of x11 headers
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
file://fix-compiling-failure-with-option-g-O.patch \
file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \
file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \
file://0001-pattern.c-Change-string-lenght-parameter-to-be-size_.patch \
file://fix-ki-uninitialized.patch \
file://0001-malloc-Check-for-excessive-values-to-malloc.patch \
@@ -20,27 +17,15 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
"
UPSTREAM_CHECK_COMMITS = "1"
SRCREV = "84cb4c6701e027090ff3fd955ce08065e20121b2"
SRCREV = "c0da615a933a6676e2c6b957368067ca1bc10abd"
PE = "2"
PV = "0.0+git${SRCPV}"
S = "${WORKDIR}/git"
inherit autotools features_check pkgconfig
inherit cmake features_check pkgconfig
PACKAGECONFIG ??= "gtk3"
PACKAGECONFIG[gtk2] = "--with-gtk=2,,gtk+,"
PACKAGECONFIG[gtk3] = "--with-gtk=3,,gtk+3,"
CFLAGS_append = " -Wno-deprecated-declarations"
ASNEEDED = ""
do_configure_prepend () {
cd ${S}
./mkfiles.pl
cd ${B}
}
DEPENDS += "gtk+3"
do_install_append () {
# net conflicts with Samba, so rename it
@@ -68,16 +53,3 @@ STOP
done
}
PACKAGES += "${PN}-extra"
FILES_${PN} = ""
FILES_${PN}-extra = "${prefix}/bin ${datadir}/applications"
python __anonymous () {
var = d.expand("FILES_${PN}")
data = d.getVar(var, False)
for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"):
data = data + " ${bindir}/%s" % name
data = data + " ${datadir}/applications/%s.desktop" % name
d.setVar(var, data)
}