From bce7949c8032235e8f3bc49923c0c6aa109d3624 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Sun, 3 Nov 2019 17:47:56 -0600 Subject: [PATCH] workrave: update to 1.10.34 Add missing SONAME Fix musl build, thanks to q66 --- common/shlibs | 1 + .../patches/musl-nl_msg_cat_cntr.patch | 23 +++++++++++++++++++ srcpkgs/workrave/template | 16 +++++-------- 3 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 srcpkgs/workrave/patches/musl-nl_msg_cat_cntr.patch diff --git a/common/shlibs b/common/shlibs index 8983239618b..c21e8b24527 100644 --- a/common/shlibs +++ b/common/shlibs @@ -16,6 +16,7 @@ # PLEASE NOTE: when multiple packages provide the same SONAME, the first # one (order top->bottom) is preferred over the next ones. # +libworkrave-private-1.0.so.0 workrave-1.10.34_1 libc.so musl-1.1.21_1 libc.so.6 glibc-2.29_1 libm.so.6 glibc-2.29_1 diff --git a/srcpkgs/workrave/patches/musl-nl_msg_cat_cntr.patch b/srcpkgs/workrave/patches/musl-nl_msg_cat_cntr.patch new file mode 100644 index 00000000000..9f7cf197098 --- /dev/null +++ b/srcpkgs/workrave/patches/musl-nl_msg_cat_cntr.patch @@ -0,0 +1,23 @@ +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 f34f232ef22..a07d5358be9 100644 --- a/srcpkgs/workrave/template +++ b/srcpkgs/workrave/template @@ -1,30 +1,26 @@ # Template file for 'workrave' pkgname=workrave -version=1.10.22 -revision=2 +version=1.10.34 +revision=1 _realversion="${version//./_}" wrksrc="${pkgname}-${_realversion}" build_style=gnu-configure build_helper="gir" configure_args="--disable-static --disable-gnome --disable-gsettings $(vopt_enable pulseaudio pulse)" -hostmakedepends="automake autoconf-archive gettext-devel intltool pkg-config - python-cheetah libtool" -makedepends="gtkmm-devel libSM-devel libXtst-devel libXScrnSaver-devel +hostmakedepends="automake autoconf-archive gettext-devel intltool python3-Jinja2 +pkg-config python-cheetah 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" maintainer="Steve Prybylski " license="GPL-3.0-or-later" homepage="http://www.workrave.org/" distfiles="https://github.com/rcaelers/${pkgname}/archive/v${_realversion}.tar.gz" -checksum=969fb8a6cb14aed08b2294bd01dbb2c2485a4c9bf6936fa8a513867aed759f63 +checksum=31a090b48c67c5a2ccb73fb56633f182fcc6d7aca5ec6376146671c72fda1444 build_options="pulseaudio" -if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - nocross="Locale.cc: undefined reference to '_nl_msg_cat_cntr'" -fi - pre_configure() { NOCONFIGURE=1 ./autogen.sh }