From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- media-sound/alsamixergui/Manifest | 8 +++--- .../alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild | 31 ++++++++++++---------- .../files/alsamixergui-0.9.0.1.2-fltk-1.1.patch | 4 +-- .../files/alsamixergui-0.9.0.1.2-gcc34.patch | 4 +-- .../alsamixergui/files/segfault-on-exit.patch | 4 +-- 5 files changed, 27 insertions(+), 24 deletions(-) (limited to 'media-sound/alsamixergui') diff --git a/media-sound/alsamixergui/Manifest b/media-sound/alsamixergui/Manifest index 4134ac331295..8237d0a11c1a 100644 --- a/media-sound/alsamixergui/Manifest +++ b/media-sound/alsamixergui/Manifest @@ -1,6 +1,6 @@ -AUX alsamixergui-0.9.0.1.2-fltk-1.1.patch 477 BLAKE2B f26aef512ee8831f44cb43e5c8fb769fe3e358906e5ef8cc98e8e7a761f73d32dd82f27c1feaf45c41eab040a52b9132e48ff9d662352996e2eed32b156fdb15 SHA512 da74646008a039aa5278f40ca7e06d387dbb8c5fcaa4d53e7b8431e73c9465336efb36e33d8b16d204638c52686bf1356ce9892645497cad6c2353a8471b647e -AUX alsamixergui-0.9.0.1.2-gcc34.patch 334 BLAKE2B 7688ea14cfd7c85eacb71a07a78fd3288658b39f5cb1c2e92623cb384f85d1063ec4997e4fd0cc2f317e08884f34ea80801a8fb076c1a4974e72e31196e6e04f SHA512 4f5bd6d25433a3795aeee16969e8850bb27c408510fd14f9fca8c2757b6153345c0a57caaff0a655603cd93adb5f76bb5a5b79c1f9fc06f1bb6bde90fd10acf0 -AUX segfault-on-exit.patch 321 BLAKE2B deb48a1ab001debc9e2cffcbd625a153d5f1371800f72919f977740693bcedc3e94c64e59194a82b1269e141f18ed1a0b8accfcc2ff116703d8dd274dab0e4e2 SHA512 b9c806b78f246a65727bf75325ba08fd1a76fc6dc696afbdf4c81f972b6793c52eac404129829782e4b81edc19d9024a4795720a0d8f76cce61325bc063470cd +AUX alsamixergui-0.9.0.1.2-fltk-1.1.patch 481 BLAKE2B f95c1efd41761972fb0d40fd19d6f23e02a277f58ddf52b314137697425de3cd8dabee13c4749895ea393f8ad9d336b9a14692dcd29885588c57699a84944333 SHA512 c4d7ecb6f332b27fc89d2d4693cdeb583374cf2700f523b568f04d0b7d4658cd73dc8e7594fd21dcddd001405fdbde5e69a8548f412131bba9d22a887e4da644 +AUX alsamixergui-0.9.0.1.2-gcc34.patch 338 BLAKE2B 72d991c5ec3c88c0d96031f1feecefbbba365283295bfcd9484b1fb4faa51d3e743e3a63d19c8a143a0ee4a72f38de365f8f983cb1abdea4487cc527d57e5061 SHA512 5fe717ef8dd9fe3e339b1b96ac255950bc93a4e850aba1dbb546cb02e3c2c9cd4a7e2f93dbfb46002da0e90ed3fee89ac7f2024eb2bb8689a50e7cf124f33c19 +AUX segfault-on-exit.patch 325 BLAKE2B 591d498aa051a2f4405a9d068c84218c38caa9ae237db602a1bda6ce57d99e8ca3d9102ca307c3aaaccd3e2cdd93db74585fa8fc01a59d92d78fc517fee2aa38 SHA512 de0795e1220283822c658204b734d45775d4e1c11582920159eb4016a481c15e4a6c1f4b5f39b451c154a7459f8958506127c75403ac2731ea695ea0a28ed56f DIST alsamixergui-0.9.0rc1-2.tar.gz 70255 BLAKE2B 6caac083ce8edbd701fdc6f24bf19e1097dc260d92c4dfeb20f4b5cabba606882d3a94542e01567ef403708c29d0ca7933228b51926f4587d935042466c597af SHA512 c1eac24c87e3d3dd8a582312a24e4f517d084845a3a0cd0a7253e3386685d72a691fe138853002b0277361d397271fbc9f445fd5ad0f5d604e5ad022a408d6b7 -EBUILD alsamixergui-0.9.0.1.2-r4.ebuild 914 BLAKE2B 64ec279141f50aabe9d389427d2803433d1d09b85fae80d2c55c55d1f2997d5b1acef5830b5455291dc45a64d481a8b61d14cf665ca2f534f66e80dcb9ea1370 SHA512 03495c2c26840d0db6bcb48f7659170bc948a7d2b915fd20171f7e37a79dc233e61d22e38959040396c3f569f56f8de99e0f5e231d2df7c17ebdb6a181b13f44 +EBUILD alsamixergui-0.9.0.1.2-r4.ebuild 917 BLAKE2B 04108ec26ba767b60221f6f865c8fc18d8928e202f332d2bda935e675f45ffc891aac9bc5f08e3685dd0553c264a583b94b0be39d786cb06e559dfc22a8d72ed SHA512 e4e0f4d43a2b483464076a8682021defdd50e06319ccc35979703f5706a4b84e024005f5e6d635ab69a560a8d5ef6c53395d38dc6b216f1d6f75ca1a1e7cab56 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 diff --git a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild index 2a3d2ac79e91..bca2f9d1f995 100644 --- a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild +++ b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 -inherit autotools eutils flag-o-matic +EAPI=7 + +inherit autotools desktop flag-o-matic MY_P=${PN}-0.9.0rc1-2 @@ -15,32 +16,34 @@ SLOT="0" KEYWORDS="amd64 arm ppc ppc64 sparc x86" IUSE="" -RDEPEND="media-libs/alsa-lib +RDEPEND=" + media-libs/alsa-lib:= media-sound/alsa-utils x11-libs/fltk:1" DEPEND="${RDEPEND}" -S=${WORKDIR}/${MY_P} - -DOCS=( AUTHORS ChangeLog README ) +S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${P}-gcc34.patch + "${FILESDIR}"/segfault-on-exit.patch + "${FILESDIR}"/${P}-fltk-1.1.patch +) src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gcc34.patch \ - "${FILESDIR}"/segfault-on-exit.patch \ - "${FILESDIR}"/${P}-fltk-1.1.patch - + default + mv configure.{in,ac} || die eautoreconf } src_configure() { - append-ldflags "-L$(dirname $(fltk-config --libs))" - append-flags "-I$(fltk-config --includedir)" + append-libs "-L$(dirname $(fltk-config --libs))" + append-cppflags "-I$(fltk-config --includedir)" econf } src_install() { default + newicon src/images/alsalogo.xpm ${PN}.xpm make_desktop_entry ${PN} "Alsa Mixer GUI" } diff --git a/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch index a7c121dbc9d1..8c6501419859 100644 --- a/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch +++ b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch @@ -1,5 +1,5 @@ ---- configure.in -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -11,11 +11,11 @@ AC_PROG_LN_S diff --git a/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch index 6f37970aa568..a17452cbbe49 100644 --- a/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch +++ b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch @@ -1,5 +1,5 @@ ---- src/alsamixer.cxx -+++ src/alsamixer.cxx +--- a/src/alsamixer.cxx ++++ b/src/alsamixer.cxx @@ -654,7 +654,7 @@ if (joined) { #ifdef ALSAMIXER_GUI diff --git a/media-sound/alsamixergui/files/segfault-on-exit.patch b/media-sound/alsamixergui/files/segfault-on-exit.patch index 6dc2feb8cc58..f2106d088416 100644 --- a/media-sound/alsamixergui/files/segfault-on-exit.patch +++ b/media-sound/alsamixergui/files/segfault-on-exit.patch @@ -1,5 +1,5 @@ ---- src/alsamixer.cxx -+++ src/alsamixer.cxx +--- a/src/alsamixer.cxx ++++ b/src/alsamixer.cxx @@ -1869,7 +1869,7 @@ if (procWindow) delete procWindow; if (mainWindow) delete mainWindow; -- cgit v1.2.3