From 90c88731bd036e5698b281fbc0a5f3aa4c9983ac Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Jun 2020 11:38:31 +0100 Subject: gentoo resync : 29.06.2020 --- media-sound/gtick/Manifest | 8 +-- media-sound/gtick/files/gtick-0.5.4-desktop.patch | 32 ----------- .../gtick/files/gtick-0.5.4-fno-common.patch | 27 --------- media-sound/gtick/files/gtick-0.5.5-desktop.patch | 30 ++++++++++ media-sound/gtick/gtick-0.5.4-r1.ebuild | 65 ---------------------- media-sound/gtick/gtick-0.5.4.ebuild | 41 -------------- media-sound/gtick/gtick-0.5.5.ebuild | 62 +++++++++++++++++++++ 7 files changed, 95 insertions(+), 170 deletions(-) delete mode 100644 media-sound/gtick/files/gtick-0.5.4-desktop.patch delete mode 100644 media-sound/gtick/files/gtick-0.5.4-fno-common.patch create mode 100644 media-sound/gtick/files/gtick-0.5.5-desktop.patch delete mode 100644 media-sound/gtick/gtick-0.5.4-r1.ebuild delete mode 100644 media-sound/gtick/gtick-0.5.4.ebuild create mode 100644 media-sound/gtick/gtick-0.5.5.ebuild (limited to 'media-sound/gtick') diff --git a/media-sound/gtick/Manifest b/media-sound/gtick/Manifest index 5e323e7cee19..655a5c368ded 100644 --- a/media-sound/gtick/Manifest +++ b/media-sound/gtick/Manifest @@ -1,6 +1,4 @@ -AUX gtick-0.5.4-desktop.patch 832 BLAKE2B 5eec851966ed2287b6d4d13629114b91d09b80ab52743a6537a1bd3b88c36fdd96b837a4f3725d85edac5957ffa546dcb56c3f00140e7dbfefbf01b020521bdc SHA512 4f26a64ea2ea327a9ceeba2b133c92bf8529f8dcdcf66eebf3110f976d147001990ffe29acafaee9e6cf38d36dbdd0e7484a9905a04f6f14b5cd389634100df1 -AUX gtick-0.5.4-fno-common.patch 624 BLAKE2B b3131096edc3262ad15ef27e57d1552ab80b933c64f191eacfe2275d3bff6e77c053a67f2d3678d98d5d1ee20b923b255fcb3913ddcfeb56a7b3fc1e5568647a SHA512 315f18be8f9467711da530afc98e63f4e416fc466a9fedbd2a5e84e3774a3f7ffd4b74d6bbbebaba2370109bb8b584f54823ba46faf70128aec97ec56cf16ee8 -DIST gtick-0.5.4.tar.gz 641902 BLAKE2B f1832f46b559908ae0c40bd0f6a08e145a0ba58a6cf2f8e7235b4f3f0b9141ea514cf52c51cef24d745ce360423daab855c42b5f6719664be65bf5f254650c1d SHA512 28ea6f38952c376f1f684e7b598d1032063f7fdf3454cdb86735cb835079312c0d1c30dfeade7272f5399296f2a2ede5b81524036a9ac0d91e0878865fab446e -EBUILD gtick-0.5.4-r1.ebuild 1131 BLAKE2B cb9af368744efe8b59d5bf91751898189062d5999481c07e88dc4515023d895a6d94ef35fdc5e7064952afaceef4466a49a52a1e0c3442bf6464688c2b10856c SHA512 3cdefd4a5705ebda0cc2cffeaa0b8375796207df09a469564e8b22e55e6a55e74ec28922d23a780411a64eb3c26ae9bded3d33a6a27800374585af86590efff6 -EBUILD gtick-0.5.4.ebuild 816 BLAKE2B 57c114edb48af45d23246129c0ad0c78d21c637fa9e3a647eaeebb9676303f45ce894ed96d7a1afb0cedad38ece9c3651995a5131574c90cb84831da6881e086 SHA512 774b3518bfcf3f2e18fae37f2bb85b6785b035ed20bc3315a9ef52cdeb13f4716ee472f85b0ed46f05f29b47551ecdcdf227f292758b5cf411f077161520bbe6 +AUX gtick-0.5.5-desktop.patch 776 BLAKE2B 945b1eaff7d480e092d93b1cce83653aaa474e36172df20233f5e09cfc07ede22260cff87664ae767a39ab05e7c83b7bc401b8cf5a85539fdcd9338a78556ce4 SHA512 d61fc78e86e4bfd47e23987236108ca36bd19df90363c2bd625f4668e9a325ce082c423d90fdf0600900d391e6da21d719c620203c5052b54d9eb5f20c9d948b +DIST gtick-0.5.5.tar.gz 659596 BLAKE2B 74e40cd20bf24ef8a9cb9f6abf49d885bb5e660a6b4faa40fa18a10153edad1e522ca555c802e9b5364abbc94f79989e4dfdfd2d19a038f4c6f63895a287dc12 SHA512 8f308c312f6cc59bb8b786af09b1498c76adc1b2692369886e85fa97524b417bf3a5e075ba20061f009b36cb4fe12cd455befe7e466d8215620640229ebbdb87 +EBUILD gtick-0.5.5.ebuild 1059 BLAKE2B bb414004dc67ae6fb55f93ff74ee7ddaebaa664fd41b728ae6c581195bd2691447199d8f628ec78e57af7d1ebdda667fdc554720b9ad1d2b19dc09a65f3b4a7c SHA512 0bffaf48f5fb97b45eaeffb06a62edff89a6cc5af8db6b3c444daff34cbc2a040c8d3786915927685c601cc5661b951b743cce89ef81843e22ba8228091e99fc MISC metadata.xml 478 BLAKE2B 5dda5dcbc5d1ca329e38762dc8d6d95a0f2710f97cce2fb4937ac01955c64031a1957900ff2cea5a61a0646436f900b735b3126df7acf9bcf7be48611e7fc0c0 SHA512 7e474d535527343cd3c97b3da68da7f8e98ce5db90e9f868004bfa5d0eb30d99432e56a3d789045e54f66d2932c47a56418896fc9be2771fa9b305be2be4b004 diff --git a/media-sound/gtick/files/gtick-0.5.4-desktop.patch b/media-sound/gtick/files/gtick-0.5.4-desktop.patch deleted file mode 100644 index 7aa0995b0394..000000000000 --- a/media-sound/gtick/files/gtick-0.5.4-desktop.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 deleted file mode 100644 index 37747cef1b88..000000000000 --- a/media-sound/gtick/files/gtick-0.5.4-fno-common.patch +++ /dev/null @@ -1,27 +0,0 @@ -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/files/gtick-0.5.5-desktop.patch b/media-sound/gtick/files/gtick-0.5.5-desktop.patch new file mode 100644 index 000000000000..d1492316dc58 --- /dev/null +++ b/media-sound/gtick/files/gtick-0.5.5-desktop.patch @@ -0,0 +1,30 @@ +From 17d3d5060160169706a9a0847aa15c068484fe5e Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy +Date: Thu, 19 Mar 2020 21:17:22 +0300 +Subject: [PATCH] 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.26.2 + diff --git a/media-sound/gtick/gtick-0.5.4-r1.ebuild b/media-sound/gtick/gtick-0.5.4-r1.ebuild deleted file mode 100644 index ca520476a379..000000000000 --- a/media-sound/gtick/gtick-0.5.4-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# 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 deleted file mode 100644 index f589cbb19346..000000000000 --- a/media-sound/gtick/gtick-0.5.4.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# 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" -} diff --git a/media-sound/gtick/gtick-0.5.5.ebuild b/media-sound/gtick/gtick-0.5.5.ebuild new file mode 100644 index 000000000000..f3a3e28b5666 --- /dev/null +++ b/media-sound/gtick/gtick-0.5.5.ebuild @@ -0,0 +1,62 @@ +# 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="virtual/pkgconfig + nls? ( sys-devel/gettext )" + +RESTRICT="test" + +PATCHES=( + "${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 +} -- cgit v1.2.3