Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

workrave: update to 1.10.34 #16094

Merged
merged 1 commit into from Nov 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 23 additions & 0 deletions 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
}
16 changes: 6 additions & 10 deletions 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 <sa.prybylx@gmail.com>"
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
}