From dd4b3fed1c9a65770cfc7a001e2598aa0c45c312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Thu, 2 Jul 2020 17:14:52 -0300 Subject: [PATCH] volumeicon: add libnotify patch. Changes to the configure.ac file required new build time dependencies as well. Closes: #23367 --- srcpkgs/volumeicon/patches/notify.patch | 22 ++++++++++++++++++++++ srcpkgs/volumeicon/template | 21 ++++++++++++++++++--- 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/volumeicon/patches/notify.patch diff --git a/srcpkgs/volumeicon/patches/notify.patch b/srcpkgs/volumeicon/patches/notify.patch new file mode 100644 index 0000000000..dbcf7f4d70 --- /dev/null +++ b/srcpkgs/volumeicon/patches/notify.patch @@ -0,0 +1,22 @@ +From 78a9c23775ebe12d3f3be93c0798144a6e732d90 Mon Sep 17 00:00:00 2001 +From: John Lindgren +Date: Wed, 30 Dec 2015 20:50:46 -0500 +Subject: [PATCH] Add missing space in NOTIFY_CFLAGS. + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git configure.ac configure.ac +index 6ad78d5..c8b72bd 100644 +--- configure.ac ++++ configure.ac +@@ -86,7 +86,7 @@ fi + if test "x${notify}" = xyes; then + # Check for libnotify + PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.5.0]) +-NOTIFY_CFLAGS+="-DCOMPILEWITH_NOTIFY" ++NOTIFY_CFLAGS+=" -DCOMPILEWITH_NOTIFY" + AC_SUBST(NOTIFY_CFLAGS) + AC_SUBST(NOTIFY_LIBS) + fi diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template index 95a0e78794..bd79cabe1f 100644 --- a/srcpkgs/volumeicon/template +++ b/srcpkgs/volumeicon/template @@ -1,14 +1,29 @@ # Template file for 'volumeicon' pkgname=volumeicon version=0.5.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-notify" -hostmakedepends="pkg-config intltool" +hostmakedepends="pkg-config intltool automake glib-devel gettext-devel" makedepends="alsa-lib-devel libnotify-devel gtk+3-devel" short_desc="Lightweight volume control that sits in your systray" maintainer="Orphaned " -license="GPL-3" +license="GPL-3.0-only, ISC, MIT" homepage="http://softwarebakery.com/maato/volumeicon.html" distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz" checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0 + +post_patch() { + sed -ne '/Copyright/,/IN THE SOFTWARE/s/ [*] *//p' src/bind.c >LICENSE.MIT + sed -ne '/Copyright/,/OF THIS SOFTWARE/s/ [*] *//p' \ + src/alsa_volume_mapping.c >LICENSE.ISC +} + +pre_configure() { + autoreconf -fi +} + +post_install() { + vlicense LICENSE.MIT + vlicense LICENSE.ISC +}