From f30695a41cdb14611db43438f73932e86ea2d81c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Mon, 3 Aug 2020 21:56:09 -0300 Subject: [PATCH] workrave: link against libintl on musl. Use LDFLAGS instead of configure.ac patch. Use python3-cheetah3 instead of python-cheetah. --- srcpkgs/workrave/patches/configure_ac.patch | 11 --------- .../patches/musl-nl_msg_cat_cntr.patch | 23 ------------------- srcpkgs/workrave/template | 9 ++++++-- 3 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 srcpkgs/workrave/patches/configure_ac.patch delete mode 100644 srcpkgs/workrave/patches/musl-nl_msg_cat_cntr.patch diff --git a/srcpkgs/workrave/patches/configure_ac.patch b/srcpkgs/workrave/patches/configure_ac.patch deleted file mode 100644 index 641b1b07615..00000000000 --- a/srcpkgs/workrave/patches/configure_ac.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./configure.ac.orig 2015-11-02 15:12:56.227947986 -0500 -+++ ./configure.ac 2015-11-02 15:13:00.392948034 -0500 -@@ -323,6 +323,8 @@ - - AM_CONDITIONAL(HAVE_DSOUND, test "x$have_dsound" = "xyes") - -+AC_CHECK_LIB(intl, gettext) -+ - dnl - dnl OSX specific checks - dnl diff --git a/srcpkgs/workrave/patches/musl-nl_msg_cat_cntr.patch b/srcpkgs/workrave/patches/musl-nl_msg_cat_cntr.patch deleted file mode 100644 index 9f7cf197098..00000000000 --- a/srcpkgs/workrave/patches/musl-nl_msg_cat_cntr.patch +++ /dev/null @@ -1,23 +0,0 @@ -Avoid glibc-specific libintl symbol on musl. - ---- common/src/Locale.cc -+++ common/src/Locale.cc -@@ -34,7 +34,9 @@ - - #include "locale.inc" - -+#if defined(__GLIBC__) - extern "C" int _nl_msg_cat_cntr; -+#endif - - Locale::LanguageMap Locale::languages_native_locale; - -@@ -102,7 +104,7 @@ Locale::set_locale(const std::string &code) - g_unsetenv("LANG"); - } - --#ifndef PLATFORM_OS_WIN32_NATIVE -+#if defined(__GLIBC__) - ++_nl_msg_cat_cntr; - #endif - } diff --git a/srcpkgs/workrave/template b/srcpkgs/workrave/template index a07d5358be9..733e6d13f79 100644 --- a/srcpkgs/workrave/template +++ b/srcpkgs/workrave/template @@ -1,7 +1,7 @@ # Template file for 'workrave' pkgname=workrave version=1.10.34 -revision=1 +revision=2 _realversion="${version//./_}" wrksrc="${pkgname}-${_realversion}" build_style=gnu-configure @@ -9,7 +9,7 @@ build_helper="gir" configure_args="--disable-static --disable-gnome --disable-gsettings $(vopt_enable pulseaudio pulse)" hostmakedepends="automake autoconf-archive gettext-devel intltool python3-Jinja2 -pkg-config python-cheetah libtool" +pkg-config python3-cheetah3 libtool" makedepends="boost-devel gtkmm-devel libSM-devel libXtst-devel libXScrnSaver-devel $(vopt_if pulseaudio pulseaudio-devel)" short_desc="Program that assists in the recovery and prevention of RSI" @@ -21,6 +21,11 @@ checksum=31a090b48c67c5a2ccb73fb56633f182fcc6d7aca5ec6376146671c72fda1444 build_options="pulseaudio" +if [ "$XBPS_TARGET_LIBC" = musl ]; then + makedepends+=" gettext-devel" + LDFLAGS="-lintl" +fi + pre_configure() { NOCONFIGURE=1 ./autogen.sh }