summaryrefslogtreecommitdiff
path: root/x11-plugins/asclock
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-01-08 11:28:34 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-01-08 11:28:34 +0000
commit24fd814c326e282c4321965c31f341dad77e270d (patch)
tree033d63b33c21a3209964ab56005bb9bdd523630d /x11-plugins/asclock
parent129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)
gentoo resync : 08.01.2021
Diffstat (limited to 'x11-plugins/asclock')
-rw-r--r--x11-plugins/asclock/Manifest3
-rw-r--r--x11-plugins/asclock/asclock-2.0.12-r3.ebuild17
-rw-r--r--x11-plugins/asclock/files/asclock-2.0.12-fno-common.patch21
3 files changed, 33 insertions, 8 deletions
diff --git a/x11-plugins/asclock/Manifest b/x11-plugins/asclock/Manifest
index c74e43d82e5d..e2d69bc3fcb9 100644
--- a/x11-plugins/asclock/Manifest
+++ b/x11-plugins/asclock/Manifest
@@ -1,4 +1,5 @@
+AUX asclock-2.0.12-fno-common.patch 421 BLAKE2B 65befa6f59c55e7fcc4bef4f7370d48bee7d3ba1c219396eb9b767302f7b69284d5e64e0bf392cc981de06fb8b2fe629b346699fbe3081b777582538314fb2c2 SHA512 1244ed512b76c55ad9c37cd9a50321878e2d7ebe02f8958dc6548b2aaece8bf2b4abf93783bb2e6dc9947fea81b0a792fd8e2f9763eeffe85474b49b0dc6c50e
AUX asclock-gcc41.patch 1528 BLAKE2B ec7f3e2361f06bd995128234fc60ceb9e3998054912f78a954eb05a04f376d231a59eb6e9d583940694f01388f81b0f0c2e33a098a2032d5e3917e629421ab57 SHA512 73d5edb1c3b1a287c9f00ad35491994f5d51bf0d5df2d81c3d428da0ed53eb4a73c0da1fe979d7479df103164e440b8a3472e18306c9fc5f85fd313d29f34b0d
DIST asclock-2.0.12.tar.gz 111858 BLAKE2B acc5e25c268f013c30e7c35e5f162246839b6ffdd049e041e47bd9eee5a9fd6f62b27bb5f8eec157a2b19f6a930f9084531d3c1a7e9cd19cdfdd4ba33005f952 SHA512 408c0cbd7d8c19e8cda450ed1e3e0857dd908768557221b5707bda4eaa56170899bb3ecbe1d9f487ad7cbe7ebe36019cfe7a19f58dae2b918fb1179d67a8bb0e
-EBUILD asclock-2.0.12-r3.ebuild 1493 BLAKE2B ab1352ae8a55301cad73f8e99742cd650110b3661ffceead965ad6bf3f0356262ec63000c9d3946afd71c3876092934aa9149b6d807faceb77b1fb8fce4708d2 SHA512 9cba90a2e51022f2c6a6981a6017650887fa20e530f5fe673854b6687bf35d4eda23ed36cb6dc89615fef0849494b9f99719cdff6cfab9f3602f89c2e4dd408f
+EBUILD asclock-2.0.12-r3.ebuild 1515 BLAKE2B f232f19e4b2cabc6766bf6e531fb97066a539f63f9c1f548933cdf940f14e607dc9c6a11de52a0f9566c4b1e1564a67c4a207f12109e10190b6d5f0c88fa82db SHA512 b8d55247c2f51b2c4608fa3fff8cd00f2e0826b3d879921bab640d3899c94ded609642d97e5c1da54c343f0624cea49b6d1d25ee2e59cbcc18d9c27e263c5b25
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/asclock/asclock-2.0.12-r3.ebuild b/x11-plugins/asclock/asclock-2.0.12-r3.ebuild
index 96b5e7d11f71..ef27e399a5fe 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 000000000000..39adebdf912b
--- /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;
+