From 67d3cf20a2983fb6812345c3cc8a6982398b72d9 Mon Sep 17 00:00:00 2001 From: Joonas Niilola Date: Thu, 25 Jun 2020 11:25:38 +0300 Subject: Revert "media-sound/gtick: Remove old" This reverts commit 6981d268656f1566ef00c53f445b889be996cba3. - per maintainer request. Signed-off-by: Joonas Niilola --- media-sound/gtick/Manifest | 1 + media-sound/gtick/files/gtick-0.5.4-desktop.patch | 32 +++++++++++ .../gtick/files/gtick-0.5.4-fno-common.patch | 27 +++++++++ media-sound/gtick/gtick-0.5.4-r1.ebuild | 65 ++++++++++++++++++++++ media-sound/gtick/gtick-0.5.4.ebuild | 41 ++++++++++++++ 5 files changed, 166 insertions(+) create mode 100644 media-sound/gtick/files/gtick-0.5.4-desktop.patch create mode 100644 media-sound/gtick/files/gtick-0.5.4-fno-common.patch create mode 100644 media-sound/gtick/gtick-0.5.4-r1.ebuild create mode 100644 media-sound/gtick/gtick-0.5.4.ebuild (limited to 'media-sound') diff --git a/media-sound/gtick/Manifest b/media-sound/gtick/Manifest index a717bbc82de6..c932678881c0 100644 --- a/media-sound/gtick/Manifest +++ b/media-sound/gtick/Manifest @@ -1 +1,2 @@ +DIST gtick-0.5.4.tar.gz 641902 BLAKE2B f1832f46b559908ae0c40bd0f6a08e145a0ba58a6cf2f8e7235b4f3f0b9141ea514cf52c51cef24d745ce360423daab855c42b5f6719664be65bf5f254650c1d SHA512 28ea6f38952c376f1f684e7b598d1032063f7fdf3454cdb86735cb835079312c0d1c30dfeade7272f5399296f2a2ede5b81524036a9ac0d91e0878865fab446e DIST gtick-0.5.5.tar.gz 659596 BLAKE2B 74e40cd20bf24ef8a9cb9f6abf49d885bb5e660a6b4faa40fa18a10153edad1e522ca555c802e9b5364abbc94f79989e4dfdfd2d19a038f4c6f63895a287dc12 SHA512 8f308c312f6cc59bb8b786af09b1498c76adc1b2692369886e85fa97524b417bf3a5e075ba20061f009b36cb4fe12cd455befe7e466d8215620640229ebbdb87 diff --git a/media-sound/gtick/files/gtick-0.5.4-desktop.patch b/media-sound/gtick/files/gtick-0.5.4-desktop.patch new file mode 100644 index 000000000000..7aa0995b0394 --- /dev/null +++ b/media-sound/gtick/files/gtick-0.5.4-desktop.patch @@ -0,0 +1,32 @@ +Downstream patch. No upstream activity since 2014. + +From b07f665d712fdbebfd506ef6301fc9ac71660e96 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy +Date: Thu, 19 Mar 2020 21:17:22 +0300 +Subject: [PATCH 2/2] Fix desktop file + +--- + gtick.desktop | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/gtick.desktop b/gtick.desktop +index 05cf5ed..a31dee3 100644 +--- a/gtick.desktop ++++ b/gtick.desktop +@@ -5,9 +5,10 @@ Name=GTick + Comment=a GTK-based metronome + Comment[pt]=Um metrônomo baseado em GTK + Comment[pt-br]=Um metrônomo baseado em GTK +-Exec=/usr/bin/gtick +-Icon=/usr/share/icons/hicolor/64x64/apps/gtick.xpm ++Exec=gtick ++Icon=gtick + Terminal=false + Type=Application + Categories=GTK;AudioVideo;Audio; +-GenericName[pt_BR]= ++GenericName=Graphical Metronome ++StartupNotify=true +-- +2.24.1 + diff --git a/media-sound/gtick/files/gtick-0.5.4-fno-common.patch b/media-sound/gtick/files/gtick-0.5.4-fno-common.patch new file mode 100644 index 000000000000..37747cef1b88 --- /dev/null +++ b/media-sound/gtick/files/gtick-0.5.4-fno-common.patch @@ -0,0 +1,27 @@ +Downstream patch. No upstream activity since 2014. + +From 23f5585ba3dcf276cd3f71c25f710e68823f97e9 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy +Date: Tue, 17 Mar 2020 17:14:50 +0300 +Subject: [PATCH 1/2] Fix building with -fno-common + +--- + src/optionlexer.l | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/optionlexer.l b/src/optionlexer.l +index df79dd5..97ed29d 100644 +--- a/src/optionlexer.l ++++ b/src/optionlexer.l +@@ -40,7 +40,7 @@ + #include "optionlexer.h" + + char* option_filename; +-YYLTYPE option_lloc; ++#define YYLTYPE option_lloc; + + void option_locate(); + %} +-- +2.24.1 + diff --git a/media-sound/gtick/gtick-0.5.4-r1.ebuild b/media-sound/gtick/gtick-0.5.4-r1.ebuild new file mode 100644 index 000000000000..ca520476a379 --- /dev/null +++ b/media-sound/gtick/gtick-0.5.4-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop xdg-utils + +DESCRIPTION="Metronome application supporting different meters and speeds ranging" +HOMEPAGE="https://www.antcom.de/gtick" +SRC_URI="https://www.antcom.de/gtick/download/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="nls sndfile" + +RDEPEND="media-sound/pulseaudio + x11-libs/gtk+:2 + sndfile? ( media-libs/libsndfile )" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/bison + sys-devel/flex + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-desktop.patch +) + +src_prepare() { + default + + sed -i 's:^\(appdatadir = .*/\)appdata:\1metainfo:' \ + Makefile.in || die +} + +src_configure() { + local myeconfargs=( + $(use_enable nls) + $(use_with sndfile) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + local res + + default + + for res in 32 48 64; do + newicon -s ${res} src/icon${res}x${res}.xpm gtick.xpm + done +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/media-sound/gtick/gtick-0.5.4.ebuild b/media-sound/gtick/gtick-0.5.4.ebuild new file mode 100644 index 000000000000..f589cbb19346 --- /dev/null +++ b/media-sound/gtick/gtick-0.5.4.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop + +DESCRIPTION="Metronome application supporting different meters and speeds ranging" +HOMEPAGE="https://www.antcom.de/gtick" +SRC_URI="https://www.antcom.de/gtick/download/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~ppc ~sparc x86" +IUSE="nls sndfile" + +RDEPEND="x11-libs/gtk+:2 + media-sound/pulseaudio + sndfile? ( media-libs/libsndfile )" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext ) + virtual/pkgconfig" + +RESTRICT="test" + +src_prepare() { + default + sed -i "/GenericName/d" ${PN}.desktop || die +} + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_with sndfile) +} + +src_install() { + default + newicon src/icon48x48.xpm ${PN}.xpm + make_desktop_entry ${PN} "GTick" +} -- cgit v1.2.3-65-gdbad