workrave: link against libintl on musl.

Use LDFLAGS instead of configure.ac patch.
Use python3-cheetah3 instead of python-cheetah.
This commit is contained in:
Érico Rolim 2020-08-03 21:56:09 -03:00 committed by Đoàn Trần Công Danh
parent b3c580af58
commit f30695a41c
3 changed files with 7 additions and 36 deletions

View file

@ -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

View file

@ -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
}

View file

@ -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
}