[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmfrog/files/, x11-plugins/wmfrog/
commit: c60da361eabe6bc3c1f213e295fa6bbe23492d3e Author: Bernard Cafarelli gentoo org> AuthorDate: Sun Mar 1 14:59:39 2020 + Commit: Bernard Cafarelli gentoo org> CommitDate: Sun Mar 1 15:12:42 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c60da361 x11-plugins/wmfrog: fix build with -fno-common Closes: https://bugs.gentoo.org/707710 Package-Manager: Portage-2.3.90, Repoman-2.3.20 Signed-off-by: Bernard Cafarelli gentoo.org> x11-plugins/wmfrog/files/wmfrog-0.3.1-gcc-10.patch | 36 ++ x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild | 3 +- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/x11-plugins/wmfrog/files/wmfrog-0.3.1-gcc-10.patch b/x11-plugins/wmfrog/files/wmfrog-0.3.1-gcc-10.patch new file mode 100644 index 000..9d25464c8ea --- /dev/null +++ b/x11-plugins/wmfrog/files/wmfrog-0.3.1-gcc-10.patch @@ -0,0 +1,36 @@ +diff -Naur Src.orig/wmFrog.c Src/wmFrog.c +--- Src.orig/wmFrog.c 2010-12-01 19:48:50.0 +0100 Src/wmFrog.c 2020-03-01 15:54:30.428083446 +0100 +@@ -77,6 +77,12 @@ + char* folder; + int needsUpdate = 1; + ++Display *display; ++Window Root; ++Window iconwin, win; ++int screen; ++int DisplayDepth; ++ + /* + * main + */ +diff -Naur Src.orig/xutils.h Src/xutils.h +--- Src.orig/xutils.h 2010-08-04 20:28:46.0 +0200 Src/xutils.h 2020-03-01 15:54:37.027084834 +0100 +@@ -18,11 +18,11 @@ + /* + * Global variable + */ +-Display *display; +-Window Root; +-Window iconwin, win; +-int screen; +-int DisplayDepth; ++extern Display*display; ++extern Window Root; ++extern Window iconwin, win; ++extern int screen; ++extern int DisplayDepth; + + + diff --git a/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild b/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild index b3b8ab1a8a4..fa1b1ed45fc 100644 --- a/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild +++ b/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,6 +21,7 @@ DEPEND="${RDEPEND} S="${WORKDIR}/Src" +PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch ) DOCS=( ../{CHANGES,HINTS} ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmfrog/files/, x11-plugins/wmfrog/
commit: 3bbe12d543637adc37c39faa6c53866db5222973 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Dec 23 18:00:20 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Dec 23 18:00:37 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bbe12d5 x11-plugins/wmfrog: Drop old (EAPI=2) Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 x11-plugins/wmfrog/Manifest| 1 - .../wmfrog/files/01-fix-segfault-0.2.0.patch | 54 --- .../wmfrog/files/02-buffer-overflow-0.2.0.patch| 60 -- x11-plugins/wmfrog/wmfrog-0.2.0-r1.ebuild | 36 - 4 files changed, 151 deletions(-) diff --git a/x11-plugins/wmfrog/Manifest b/x11-plugins/wmfrog/Manifest index 526a3f94c5e..e36da29c94e 100644 --- a/x11-plugins/wmfrog/Manifest +++ b/x11-plugins/wmfrog/Manifest @@ -1,2 +1 @@ -DIST wmfrog-0.2.0.tgz 59113 BLAKE2B 39241240ee0477e8d587e634be74184c50b34078be329bab1786a0223395e76e6284693096fc0050ee6a32308dbe0b1f8540ead21c1c2509d158a1ff4b94b0c4 SHA512 e704600d2a3ce4ff64e4c5393ec4b977356ed18545b937102c2a120f6407f1b879f050a1a7f324c8ea40e2360dfb8147bf24e9910483aebb24a3f8e2692537f4 DIST wmfrog-0.3.1.tgz 128499 BLAKE2B 5bde4ccf41fda8e1a7e4fe9d40727e0d86d65830cc749955f5b1c97949c543f8f7253ddc6fffa48fc606e23c2ff6b4c66e07c66807a43e02f68961dfbb20d683 SHA512 35cd7da8ec0173f4799119191cd28befaed0fd5ea09c0dd2e9789ce37e9a1a4a83a9fb4562051a8da9c1449eafc8299c86914cb6f0e5bc35bd051560442af7ee diff --git a/x11-plugins/wmfrog/files/01-fix-segfault-0.2.0.patch b/x11-plugins/wmfrog/files/01-fix-segfault-0.2.0.patch deleted file mode 100644 index 7e88f49058f..000 --- a/x11-plugins/wmfrog/files/01-fix-segfault-0.2.0.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 7b9ead8d480eb2be07db646e9c6383f3397beaea Mon Sep 17 00:00:00 2001 -From: Jim Ramsay -Date: Thu, 6 Aug 2009 12:22:26 -0400 -Subject: [PATCH] Fixed segfault if Weather or Clouds not present - -Though the variables 'weatherFound' and 'cloudsFound' were being set properly by -fscanf, their values were never actually checked. - -Furthermore, the strings (Weather, Clouds, tmp1 and tmp2) were not being -initialized to NULL as the code seems to have been expecting. - Src/wmFrog.c | 12 ++-- - 1 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/Src/wmFrog.c b/Src/wmFrog.c -index e2d82af..af4101a 100644 a/Src/wmFrog.c -+++ b/Src/wmFrog.c -@@ -68,10 +68,10 @@ intn, s, m, i, dt1, dt2, dt3; - XEventevent; - char command[1024], Line[512], FileName[10]; - FILE *fp; -- char* Weather; -- char* Clouds; -- char* tmp1; -- char* tmp2; -+ char* Weather = NULL; -+ char* Clouds = NULL; -+ char* tmp1 = NULL; -+ char* tmp2 = NULL; - int intensity=0; - char* precip; - char* desc; -@@ -238,7 +238,7 @@ FILE *fp; - keepgoing=1; - { - -- do{ -+ if (weatherFound) do{ - - - tmp1=mystrsep(,";"); -@@ -289,7 +289,7 @@ FILE *fp; - while(keepgoing); - } - -- do{ -+ if (cloudsFound) do{ - tmp1=mystrsep(,";"); - if(tmp1) - { --- -1.6.3.3 - diff --git a/x11-plugins/wmfrog/files/02-buffer-overflow-0.2.0.patch b/x11-plugins/wmfrog/files/02-buffer-overflow-0.2.0.patch deleted file mode 100644 index c4267585836..000 --- a/x11-plugins/wmfrog/files/02-buffer-overflow-0.2.0.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5cc2198aebf090b399bd8aaea0e1c8b054bbda58 Mon Sep 17 00:00:00 2001 -From: Jim Ramsay -Date: Thu, 6 Aug 2009 12:51:56 -0400 -Subject: [PATCH] Remove buffer overflows - -Replaced all 'sprintf' calls with 'snprintf' and fixed all buffers to reasonable -sizes. - Src/wmFrog.c | 11 +-- - 1 files changed, 5 insertions(+), 6 deletions(-) - -diff --git a/Src/wmFrog.c b/Src/wmFrog.c -index af4101a..74e8b56 100644 a/Src/wmFrog.c -+++ b/Src/wmFrog.c -@@ -66,7 +66,7 @@ char* folder; - int main(int argc, char *argv[]) { - int n, s, m, i, dt1, dt2, dt3; - XEventevent; --char command[1024], Line[512], FileName[10]; -+char command[1024], Line[512], FileName[128]; - FILE *fp; - char* Weather = NULL; - char* Clouds = NULL; -@@ -213,7 +213,7 @@ FILE *fp; - - dt2 = 0; - -- sprintf(FileName, "%s/%s", folder, StationID); -+ snprintf(FileName, 128, "%s/%s", folder, StationID); - fprintf(stderr,"%s\n\n",FileName); - if ((fp = fopen(FileName, "r")) != NULL){ - fscanf(fp, "Hour:%d", ); -@@ -571,7 +571,7 @@ UpToDate = 0; - /* -* Execute Perl script to grab the Latest METAR Report -*/ --
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmfrog/
commit: b5041755ad44b26f72523d07576fc5269ac7f705 Author: Mikle Kolyada gentoo org> AuthorDate: Thu Dec 13 20:48:10 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Dec 13 20:48:10 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5041755 x11-plugins/wmfrog: amd64 stable wrt bug #672120 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild b/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild index 845f04bd692..b3b8ab1a8a4 100644 --- a/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild +++ b/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc x86" +KEYWORDS="amd64 ~ppc ~sparc x86" RDEPEND="x11-libs/libXext x11-libs/libXpm
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmfrog/
commit: c327926c66a4cd9b2836c0f380eb8faf90432bd3 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Dec 7 02:23:22 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Dec 7 02:40:47 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c327926c x11-plugins/wmfrog: x86 stable (bug #672120) Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild b/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild index 2951a537833..845f04bd692 100644 --- a/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild +++ b/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ~ppc ~sparc x86" RDEPEND="x11-libs/libXext x11-libs/libXpm
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmfrog/
commit: b6e57d01ac01d5813121fe1963644e54ee2e40bb Author: Mikle Kolyada gentoo org> AuthorDate: Sat Sep 15 20:02:35 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Sep 15 20:02:35 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e57d01 x11-plugins/wmfrog: Drop old Package-Manager: Portage-2.3.40, Repoman-2.3.9 x11-plugins/wmfrog/wmfrog-0.3.1.ebuild | 36 -- 1 file changed, 36 deletions(-) diff --git a/x11-plugins/wmfrog/wmfrog-0.3.1.ebuild b/x11-plugins/wmfrog/wmfrog-0.3.1.ebuild deleted file mode 100644 index 74ad1e17968..000 --- a/x11-plugins/wmfrog/wmfrog-0.3.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -inherit toolchain-funcs - -DESCRIPTION="a weather application, it shows the weather in a graphical way" -HOMEPAGE="http://wiki.colar.net/wmfrog_dockapp; -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="" - -RDEPEND="x11-libs/libXext - x11-libs/libXpm - x11-libs/libX11" -DEPEND="${RDEPEND} - x11-base/xorg-proto" - -S=${WORKDIR}/Src - -src_prepare() { - emake clean || die -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" INCDIR="" \ - LIBDIR="" SYSTEM="${LDFLAGS}" || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ../{CHANGES,HINTS} || die -}
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmfrog/
commit: 8b3c624a17d4cceb69f3b99c074d8ebd8f70d0c5 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sun Jul 22 12:49:43 2018 + Commit: Bernard Cafarelli gentoo org> CommitDate: Thu Jul 26 20:30:52 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b3c624a x11-plugins/wmfrog: EAPI7, improve ebuild x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild | 34 +++ 1 file changed, 34 insertions(+) diff --git a/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild b/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild new file mode 100644 index 000..2951a537833 --- /dev/null +++ b/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="a weather application, it shows the weather in a graphical way" +HOMEPAGE="http://wiki.colar.net/wmfrog_dockapp; +SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +RDEPEND="x11-libs/libXext + x11-libs/libXpm + x11-libs/libX11" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +S="${WORKDIR}/Src" + +DOCS=( ../{CHANGES,HINTS} ) + +src_prepare() { + default + emake clean +} + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" INCDIR="" \ + LIBDIR="" SYSTEM="${LDFLAGS}" +}