diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
| commit | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch) | |
| tree | 9f47ee47c31a0f13f9496879cd88a1042550aa81 /x11-plugins/wmtimer | |
| parent | 53cba99042fa967e2a93da9f8db806fe2d035543 (diff) | |
gentoo (leap year) resync : 29.02.2020
Diffstat (limited to 'x11-plugins/wmtimer')
| -rw-r--r-- | x11-plugins/wmtimer/Manifest | 3 | ||||
| -rw-r--r-- | x11-plugins/wmtimer/files/wmtimer-2.92-gcc-10.patch | 23 | ||||
| -rw-r--r-- | x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild | 11 |
3 files changed, 31 insertions, 6 deletions
diff --git a/x11-plugins/wmtimer/Manifest b/x11-plugins/wmtimer/Manifest index 69eb3c72d095..a16e46a0ba6e 100644 --- a/x11-plugins/wmtimer/Manifest +++ b/x11-plugins/wmtimer/Manifest @@ -1,5 +1,6 @@ AUX wmtimer-2.92-counter-fix.patch 717 BLAKE2B 44ca05c4f1343f802ee4444a39279e933f96972debc41a2e0d2d670bcbf12be3550b552f34e17a3c0f224913a4d7f605eb247fda0ea6b9b942506a8a603fe98f SHA512 c78820e8bca43649942c13c42ee944bab05e346e98ff405b49017cceb70241aa65f8a73dab2376194c399fabfb9ccd0a92fe5dae9dafd84d712f59a6be550076 +AUX wmtimer-2.92-gcc-10.patch 819 BLAKE2B 9b8a57e4ba07231a6ec038d84908aa0166ef466048765d1fea1df4213067a3809c0b9468e1ea210cda751d5a8da70e6b6c4462f2e4a3db1147f4adae52be10a7 SHA512 a45d94c38c87e5eb2b9d689bc87d8d8ea8a01ce5fd3dd6a3bd938b2dcc071fc57654961e7336f12f03115eabe15a4834053e80ab816336c7f893ff6fc9feb0ca AUX wmtimer-2.92-list.patch 3323 BLAKE2B ac61e7129f7883d3046ff0be7b23c817decc76deafc5eb1de8953afe0a0aa418a11f857f684f185c29cb72760d1f0619d045e2a294b185ce544db72a5d5e49fa SHA512 f7001d64ea1097a79b6b3b7d5b64cfd930d06567f8734b55868a04370480e469e5dffecec38ca421550235f2b0f84217efbd8ab278e0d44cacf37c723c626dd7 DIST wmtimer-2.92.tar.gz 22091 BLAKE2B 7e8f598708a70168233aa4545fc9978fab9ea6891a02f618f1bdafa08bbc3ed077183c19f467c70637b07fa501f40bd2409bdb3e60034888296895b9ff3f35f1 SHA512 d00e2eff92c89b1a848d2319f62b2f060f4ced1299440aa20ca4288b5bdd16f7cff625907f6587514a1618fec74e5be34fb6c923cec51a663cd9efc86c6f0a07 -EBUILD wmtimer-2.92-r2.ebuild 1098 BLAKE2B f4096fb28c96cfcc91e15e6048b747ed41183b0d332ac9176071ac10eb146eecca7493f3768982beae55540ffa837a5eda6cf303f95f42d11356d6ab2a315daf SHA512 4b5cc50f8524d952ae8e46fd5a4613532972c83fdfaac8898091d05830dc5b1e3033e1edf9e9575691456343a44e7b401aef9f64393184081da38ff96df59a73 +EBUILD wmtimer-2.92-r2.ebuild 1135 BLAKE2B 5b2ac05094859ba9c714566286704a1e2accf5d6f6b450589dd141234730fe37bbb3a2d4e6456f167dee60f335a604049bac5ee59fcef63db6a3029078c9638a SHA512 acca770306b20d869f81a17afd8cbaed50d3f2ca64522600af5312159d310b485c238bd5cca327fb3de1b456798a7bf31e07ed175a35153401b49f61c6bdd677 MISC metadata.xml 589 BLAKE2B 5f3e4fced150616eb5e681ac4c6abfa712740e422e992b6bef6f8df31ba92086c508a100f4011fa09db052ba2d2649542874b68cc03e176938cda9519a2d7098 SHA512 dc1b93fd82bf9427f16bc44056278b8869d216769de5784b137d73196e059166e083c355b444e5435c959af64c1085af159a704e48646dd23dc8c28afd4f671b diff --git a/x11-plugins/wmtimer/files/wmtimer-2.92-gcc-10.patch b/x11-plugins/wmtimer/files/wmtimer-2.92-gcc-10.patch new file mode 100644 index 000000000000..4332e8916640 --- /dev/null +++ b/x11-plugins/wmtimer/files/wmtimer-2.92-gcc-10.patch @@ -0,0 +1,23 @@ +diff -Naur wmtimer-2.92.orig/wmgeneral/wmgeneral.c wmtimer-2.92/wmgeneral/wmgeneral.c +--- wmtimer-2.92.orig/wmgeneral/wmgeneral.c 2004-01-29 03:38:58.000000000 +0100 ++++ wmtimer-2.92/wmgeneral/wmgeneral.c 2020-02-24 22:07:07.028810885 +0100 +@@ -67,6 +67,7 @@ + GC NormalGC; + XpmIcon wmgen; + Pixmap pixmask; ++Display *display; + + char *textColor = NULL; + XpmColorSymbol colorSymbols[3] = { {"Text", NULL, 0} }; +diff -Naur wmtimer-2.92.orig/wmgeneral/wmgeneral.h wmtimer-2.92/wmgeneral/wmgeneral.h +--- wmtimer-2.92.orig/wmgeneral/wmgeneral.h 2001-10-11 07:38:39.000000000 +0200 ++++ wmtimer-2.92/wmgeneral/wmgeneral.h 2020-02-24 22:06:49.756805063 +0100 +@@ -40,7 +40,7 @@ + /* Global variable */ + /*******************/ + +-Display *display; ++extern Display *display; + + /***********************/ + /* Function Prototypes */ diff --git a/x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild b/x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild index 361f2745af0f..bcf6d63c094c 100644 --- a/x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild +++ b/x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,14 +24,15 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${P}/${PN} src_prepare() { - sed -i -e "s:\$(CFLAGS)::" Makefile || die - sed -i -e "s:-g::g" Makefile || die - sed -i -e "s:-O2:\$(CFLAGS) ${CFLAGS}:" Makefile || die - sed -i -e "s:-o wmtimer:\$(LDFLAGS) -o wmtimer:" Makefile || die + sed -i -e "s|\$(CFLAGS)||" Makefile || die + sed -i -e "s|-g||g" Makefile || die + sed -i -e "s|-O2|\$(CFLAGS) ${CFLAGS}|" Makefile || die + sed -i -e "s|-o wmtimer|\$(LDFLAGS) -o wmtimer|" Makefile || die cd "${WORKDIR}"/${P} || die eapply "${FILESDIR}"/${P}-counter-fix.patch eapply "${FILESDIR}"/${P}-list.patch + eapply "${FILESDIR}"/${P}-gcc-10.patch eapply_user } |