From edc793f983b598eabc55c48cd350c586e0f94780 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 23 May 2017 09:19:29 +0200 Subject: [PATCH] gnome-recipes: update to 1.4.4. --- srcpkgs/gnome-recipes/patches/fix-musl.patch | 22 ++++++++++++++++++++ srcpkgs/gnome-recipes/template | 10 +++------ 2 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/gnome-recipes/patches/fix-musl.patch diff --git a/srcpkgs/gnome-recipes/patches/fix-musl.patch b/srcpkgs/gnome-recipes/patches/fix-musl.patch new file mode 100644 index 00000000000..7757999c3ae --- /dev/null +++ b/srcpkgs/gnome-recipes/patches/fix-musl.patch @@ -0,0 +1,22 @@ +diff --git a/src/gr-recipe-formatter.c b/src/gr-recipe-formatter.c +index 0299562..4b6ed47 100644 +--- src/gr-recipe-formatter.c ++++ src/gr-recipe-formatter.c +@@ -48,6 +48,7 @@ get_temperature_unit (void) + GSettings *settings = gr_settings_get (); + unit = g_settings_get_enum (settings, "temperature-unit"); + if (unit == GR_TEMPERATURE_UNIT_LOCALE) { ++#ifdef __GLIBC__ + const gchar *fmt; + + fmt = nl_langinfo (_NL_MEASUREMENT_MEASUREMENT); +@@ -55,6 +56,9 @@ get_temperature_unit (void) + unit = GR_TEMPERATURE_UNIT_FAHRENHEIT; + else + unit = GR_TEMPERATURE_UNIT_CELSIUS; ++#else ++ unit = GR_TEMPERATURE_UNIT_CELSIUS; ++#endif + } + + return unit; diff --git a/srcpkgs/gnome-recipes/template b/srcpkgs/gnome-recipes/template index bdf5268e36e..14a727fa35b 100644 --- a/srcpkgs/gnome-recipes/template +++ b/srcpkgs/gnome-recipes/template @@ -1,6 +1,6 @@ # Template file for 'gnome-recipes' pkgname=gnome-recipes -version=1.4.2 +version=1.4.4 revision=1 _libgd_hash=97a852cdf3d37776f9c98f730d7dcbbe995bdeb7 hostmakedepends="glib intltool itstool pkg-config meson git" @@ -10,18 +10,14 @@ short_desc="GNOME puzzle game where you locate mines in the ocean" maintainer="Enno Boland " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Recipes" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz - https://github.com/GNOME/libgd/archive/$_libgd_hash.tar.gz" -checksum="960a705eb15c22ef0ffb7c2cb59fc153a25c2d0624c16a00dda544e5526fe5a5 - 02c9ec9192a0f732390292a21f4d123b7595957301608288125ae79451cf4b40" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=b8e3bcee39b85437a68039ddb35f6f54cfb3ed7ab2a6320bb74dad4846f186e6 nocross=https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/2155/steps/shell_3/logs/stdio do_configure() { # meson_post_install.py updates icon cache, desktop database etc. # nothing that we need. It fails in this setup, so make it a nop ln -sf /bin/true meson_post_install.py - rm -r subprojects/libgd - ln -sr ../libgd-$_libgd_hash subprojects/libgd meson --prefix=/usr --buildtype=plain build }