commit: c59873c1b8fa28e8f40ecaa4d9a730c085a25b58 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Sat Jan 2 20:16:33 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Jan 2 20:16:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c59873c1
x11-plugins/asclock: Port to EAPI 7 Closes: https://bugs.gentoo.org/708044 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> x11-plugins/asclock/asclock-2.0.12-r3.ebuild | 17 ++++++++++------- .../asclock/files/asclock-2.0.12-fno-common.patch | 21 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/x11-plugins/asclock/asclock-2.0.12-r3.ebuild b/x11-plugins/asclock/asclock-2.0.12-r3.ebuild index 96b5e7d11f7..ef27e399a5f 100644 --- a/x11-plugins/asclock/asclock-2.0.12-r3.ebuild +++ b/x11-plugins/asclock/asclock-2.0.12-r3.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs -IUSE="" DESCRIPTION="Clock applet for AfterStep" -SRC_URI="http://www.tigr.net/afterstep/download/asclock/${P}.tar.gz"; HOMEPAGE="http://tigr.net/afterstep/applets/"; +SRC_URI="http://www.tigr.net/afterstep/download/asclock/${P}.tar.gz"; + LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" @@ -16,7 +16,10 @@ KEYWORDS="amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" DEPEND="x11-libs/libXpm" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-gcc41.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-gcc41.patch + "${FILESDIR}"/${P}-fno-common.patch +) src_prepare() { default @@ -59,7 +62,7 @@ src_install() { insinto ${themesdir} doins -r themes/* dodoc README README.THEMES TODO - cd "${D}"/${themesdir} || die - rm -f Freeamp/Makefile{,.*} || die + cd "${ED}"/${themesdir} || die + rm Freeamp/Makefile{,.*} || die ln -s classic default_theme || die } diff --git a/x11-plugins/asclock/files/asclock-2.0.12-fno-common.patch b/x11-plugins/asclock/files/asclock-2.0.12-fno-common.patch new file mode 100644 index 00000000000..39adebdf912 --- /dev/null +++ b/x11-plugins/asclock/files/asclock-2.0.12-fno-common.patch @@ -0,0 +1,21 @@ +--- a/config.c ++++ b/config.c +@@ -1,6 +1,7 @@ + #include "asclock.h" + + extern char *Geometry; ++extern int itdocks; + + /* load the variables from a predefined theme ****************************************/ + +--- a/symbols.c ++++ b/symbols.c +@@ -62,7 +62,7 @@ symbol config_symbols[] = { + { "beats_elem_height",&beats_elem_height}, + { NULL, NULL} }; + +-int itdocks; ++extern int itdocks; + int itblinks; + int showampm; +
