[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmweather+/files/, x11-plugins/wmweather+/

2022-12-02 Thread Sam James
commit: f60d848d7c83cb2de9dc75e2819691cf40e2c2c4
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec  3 05:23:33 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec  3 06:06:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f60d848d

x11-plugins/wmweather+: fix build w/ clang 16

Closes: https://bugs.gentoo.org/870958
Signed-off-by: Sam James  gentoo.org>

 .../files/wmweather+-2.18-configure-clang16.patch  | 67 ++
 ...ther+-2.18.ebuild => wmweather+-2.18-r1.ebuild} |  5 +-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git 
a/x11-plugins/wmweather+/files/wmweather+-2.18-configure-clang16.patch 
b/x11-plugins/wmweather+/files/wmweather+-2.18-configure-clang16.patch
new file mode 100644
index ..68a4d3f33190
--- /dev/null
+++ b/x11-plugins/wmweather+/files/wmweather+-2.18-configure-clang16.patch
@@ -0,0 +1,67 @@
+https://sourceforge.net/p/wmweatherplus/bugs/21/
+https://bugs.gentoo.org/870958
+
+Port the configure script to C99 by avoiding calls to the undeclared
+exit function.  Future compilers are likely to reject implicit
+function declarations by default; this C features was removed from the
+language in 1999.
+
+--- a/m4/snprintf.m4
 b/m4/snprintf.m4
+@@ -24,7 +24,7 @@ int snprintf(char *str, size_t size, const char *format, 
...);
+ #endif
+ ]],
+ [[char foo[]="ABC"; snprintf(foo, 2, "%d", 12);
+-exit((foo[0]=='1' && foo[1]=='\0' && foo[2]=='C')?0:1);]])],
++return (foo[0]=='1' && foo[1]=='\0' && foo[2]=='C')?0:1;]])],
+ [x_cv_func_snprintf_size=yes],
+ [x_cv_func_snprintf_size=no],
+ [x_cv_func_snprintf_size=no])])
+@@ -52,7 +52,7 @@ AC_CACHE_CHECK([if snprintf return value is sane], 
x_cv_func_snprintf_retval,
+ int snprintf(char *str, size_t size, const char *format, ...);
+ #endif
+ ]],
+-[[char foo[10]; exit((snprintf(foo, 1, "%d", 9876)==4)?0:1);]])],
++[[char foo[10]; return (snprintf(foo, 1, "%d", 9876)==4)?0:1;]])],
+ [x_cv_func_snprintf_retval=yes],
+ [x_cv_func_snprintf_retval=no],
+ [x_cv_func_snprintf_retval=no])])
+@@ -79,7 +79,7 @@ AC_CACHE_CHECK([if snprintf(NULL, 0, ...) works], 
x_cv_func_snprintf_null_ok,
+ int snprintf(char *str, size_t size, const char *format, ...);
+ #endif
+ ]],
+-[int r=snprintf(NULL, 0, "%d", 100); exit((r==3 || r==-1)?0:1);])],
++[int r=snprintf(NULL, 0, "%d", 100); return (r==3 || r==-1)?0:1;])],
+ [x_cv_func_snprintf_null_ok=yes],
+ [x_cv_func_snprintf_null_ok=no],
+ [x_cv_func_snprintf_null_ok=no])])
+--- a/m4/vsnprintf.m4
 b/m4/vsnprintf.m4
+@@ -37,7 +37,7 @@ int doit(char *str, size_t size, const char *format, ...){
+ }
+ ]],
+ [[char foo[]="ABC"; doit(foo, 2, "%d", 12);
+-exit((foo[0]=='1' && foo[1]=='\0' && foo[2]=='C')?0:1);]])],
++return (foo[0]=='1' && foo[1]=='\0' && foo[2]=='C')?0:1;]])],
+ [x_cv_func_vsnprintf_size=yes],
+ [x_cv_func_vsnprintf_size=no],
+ [x_cv_func_vsnprintf_size=no])])
+@@ -74,7 +74,7 @@ int doit(char *str, size_t size, const char *format, ...){
+ return r;
+ }
+ ]],
+-[[char foo[10]; exit((doit(foo, 1, "%d", 9876)==4)?0:1);]])],
++[[char foo[10]; return (doit(foo, 1, "%d", 9876)==4)?0:1;]])],
+ [x_cv_func_vsnprintf_retval=yes],
+ [x_cv_func_vsnprintf_retval=no],
+ [x_cv_func_vsnprintf_retval=no])])
+@@ -110,7 +110,7 @@ int doit(char *str, size_t size, const char *format, ...){
+ return r;
+ }
+ ]],
+-[int r=doit(NULL, 0, "%d", 100); exit((r==3 || r==-1)?0:1);])],
++[int r=doit(NULL, 0, "%d", 100); return (r==3 || r==-1)?0:1;])],
+ [x_cv_func_vsnprintf_null_ok=yes],
+ [x_cv_func_vsnprintf_null_ok=no],
+ [x_cv_func_vsnprintf_null_ok=no])])
+

diff --git a/x11-plugins/wmweather+/wmweather+-2.18.ebuild 
b/x11-plugins/wmweather+/wmweather+-2.18-r1.ebuild
similarity index 87%
rename from x11-plugins/wmweather+/wmweather+-2.18.ebuild
rename to x11-plugins/wmweather+/wmweather+-2.18-r1.ebuild
index 3ff866178306..0c62154e0166 100644
--- a/x11-plugins/wmweather+/wmweather+-2.18.ebuild
+++ b/x11-plugins/wmweather+/wmweather+-2.18-r1.ebuild
@@ -21,7 +21,10 @@ DEPEND="dev-libs/libpcre
x11-wm/windowmaker"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-ar.patch )
+PATCHES=(
+   "${FILESDIR}"/${P}-ar.patch
+   "${FILESDIR}"/${P}-configure-clang16.patch
+)
 
 src_prepare() {
default



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmweather+/files/, x11-plugins/wmweather+/

2022-09-16 Thread Andreas Sturmlechner
commit: f7e5caf40c1db500d80745d24110c0eac776cb99
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Sep 16 17:41:48 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Sep 16 17:41:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e5caf4

x11-plugins/wmweather+: drop 2.17

Closes: https://bugs.gentoo.org/867160
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-plugins/wmweather+/Manifest|  1 -
 .../wmweather+/files/wmweather+-2.17-gcc-10.patch  | 23 --
 x11-plugins/wmweather+/wmweather+-2.17.ebuild  | 23 --
 3 files changed, 47 deletions(-)

diff --git a/x11-plugins/wmweather+/Manifest b/x11-plugins/wmweather+/Manifest
index 11e7543e7bc7..1204dbc1d818 100644
--- a/x11-plugins/wmweather+/Manifest
+++ b/x11-plugins/wmweather+/Manifest
@@ -1,2 +1 @@
-DIST wmweather+-2.17.tar.gz 212763 BLAKE2B 
e810ecaf6858bba0cb3bdb32517f5c1cbaa552ed071b1ce6dfca33b41ad75c5272616c9be78930f47ee3980d2ab8c51a29caaec627c5e608e9c2790d940cfe65
 SHA512 
45622513792698f1adf4a686506913146e2a24c9ff39fda1129132aae864528184aa122b525e00b079f416fd131c1369ff95e430c4c63877bdc166c982f841eb
 DIST wmweather+-2.18.tar.gz 206062 BLAKE2B 
14fe0b49b5541d5e093c958d1c12c4c28c3bae53f8539402a61800d1817bf22eae426d4733e08ae3f1e90057e7dd297a9412d62e5edd9fb973b0a9e799b3f792
 SHA512 
538325b1d2bd7dd3a89a006d88868e02a71318b6e49001033d0f543965fb21f91b265e116d3b929a096e99719c99241d520a7eb395ec55f721de0d01dcbedbc0

diff --git a/x11-plugins/wmweather+/files/wmweather+-2.17-gcc-10.patch 
b/x11-plugins/wmweather+/files/wmweather+-2.17-gcc-10.patch
deleted file mode 100644
index 1b26aa3936e5..
--- a/x11-plugins/wmweather+/files/wmweather+-2.17-gcc-10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur wmweather+-2.17.orig/wmgeneral/wmgeneral-x11.c 
wmweather+-2.17/wmgeneral/wmgeneral-x11.c
 wmweather+-2.17.orig/wmgeneral/wmgeneral-x11.c 2014-02-07 
20:17:44.0 +0100
-+++ wmweather+-2.17/wmgeneral/wmgeneral-x11.c  2020-02-24 22:11:47.226905019 
+0100
-@@ -94,6 +94,7 @@
- GC  NormalGC;
- GC  RedrawGC;
- XpmIcon wmgen;
-+Display   *display;
- 
-   /***/
-  /* Function Prototypes */
-diff -Naur wmweather+-2.17.orig/wmgeneral/wmgeneral-x11.h 
wmweather+-2.17/wmgeneral/wmgeneral-x11.h
 wmweather+-2.17.orig/wmgeneral/wmgeneral-x11.h 2014-02-07 
20:17:44.0 +0100
-+++ wmweather+-2.17/wmgeneral/wmgeneral-x11.h  2020-02-24 22:10:45.233884234 
+0100
-@@ -17,7 +17,7 @@
-  /* Global variable */
- /***/
- 
--Display   *display;
-+extern Display*display;
- 
-   /***/
-  /* Function Prototypes */

diff --git a/x11-plugins/wmweather+/wmweather+-2.17.ebuild 
b/x11-plugins/wmweather+/wmweather+-2.17.ebuild
deleted file mode 100644
index 94bc2487217f..
--- a/x11-plugins/wmweather+/wmweather+-2.17.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A dockapp for displaying data collected from METAR, AVN, ETA, and 
MRF forecasts"
-HOMEPAGE="https://www.sourceforge.net/projects/wmweatherplus/;
-SRC_URI="mirror://sourceforge/wmweatherplus/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~mips ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND="dev-libs/libpcre
-   >=net-misc/curl-7.17.1
-   x11-libs/libXpm
-   x11-libs/libXext
-   x11-libs/libX11
-   x11-wm/windowmaker"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmweather+/files/, x11-plugins/wmweather+/

2021-01-02 Thread Bernard Cafarelli
commit: 5c0943933f9e5a6875b801c2b9b3fd81585023c4
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Sat Jan  2 23:27:09 2021 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Sat Jan  2 23:32:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c094393

x11-plugins/wmweather+: do not call ar directly

Closes: https://bugs.gentoo.org/726248
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Bernard Cafarelli  gentoo.org>

 x11-plugins/wmweather+/files/wmweather+-2.18-ar.patch | 11 +++
 x11-plugins/wmweather+/wmweather+-2.18.ebuild | 10 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/x11-plugins/wmweather+/files/wmweather+-2.18-ar.patch 
b/x11-plugins/wmweather+/files/wmweather+-2.18-ar.patch
new file mode 100644
index 000..f87fdfa0ef0
--- /dev/null
+++ b/x11-plugins/wmweather+/files/wmweather+-2.18-ar.patch
@@ -0,0 +1,11 @@
+diff -Naur wmweather+-2.18.orig/configure.ac wmweather+-2.18/configure.ac
+--- wmweather+-2.18.orig/configure.ac  2020-04-24 20:31:43.0 +0200
 wmweather+-2.18/configure.ac   2021-01-03 00:25:30.443705781 +0100
+@@ -18,6 +18,7 @@
+ AC_SUBST(WMGENERAL_GUI)
+ 
+ # Checks for programs.
++AM_PROG_AR
+ AC_PROG_AWK
+ AC_PROG_CC
+ AC_PROG_CC_STDC

diff --git a/x11-plugins/wmweather+/wmweather+-2.18.ebuild 
b/x11-plugins/wmweather+/wmweather+-2.18.ebuild
index 01b450a84cc..7dffde689df 100644
--- a/x11-plugins/wmweather+/wmweather+-2.18.ebuild
+++ b/x11-plugins/wmweather+/wmweather+-2.18.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit autotools
 
 DESCRIPTION="A dockapp for displaying data collected from METAR, AVN, ETA, and 
MRF forecasts"
 HOMEPAGE="https://www.sourceforge.net/projects/wmweatherplus/;
@@ -19,3 +20,10 @@ DEPEND="dev-libs/libpcre
x11-libs/libX11
x11-wm/windowmaker"
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ar.patch )
+
+src_prepare() {
+   default
+   eautoreconf
+}



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmweather+/files/, x11-plugins/wmweather+/

2020-02-24 Thread Bernard Cafarelli
commit: 11f48eed3b67f62b2a1e2e4dd9b6c37e372ebbd7
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Mon Feb 24 21:16:38 2020 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Mon Feb 24 21:47:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11f48eed

x11-plugins/wmweather+: fix build with -fno-common

Closes: https://bugs.gentoo.org/707800
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli  gentoo.org>

 .../wmweather+/files/wmweather+-2.17-gcc-10.patch  | 23 ++
 x11-plugins/wmweather+/wmweather+-2.17.ebuild  |  4 +++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/x11-plugins/wmweather+/files/wmweather+-2.17-gcc-10.patch 
b/x11-plugins/wmweather+/files/wmweather+-2.17-gcc-10.patch
new file mode 100644
index 000..1b26aa3936e
--- /dev/null
+++ b/x11-plugins/wmweather+/files/wmweather+-2.17-gcc-10.patch
@@ -0,0 +1,23 @@
+diff -Naur wmweather+-2.17.orig/wmgeneral/wmgeneral-x11.c 
wmweather+-2.17/wmgeneral/wmgeneral-x11.c
+--- wmweather+-2.17.orig/wmgeneral/wmgeneral-x11.c 2014-02-07 
20:17:44.0 +0100
 wmweather+-2.17/wmgeneral/wmgeneral-x11.c  2020-02-24 22:11:47.226905019 
+0100
+@@ -94,6 +94,7 @@
+ GC  NormalGC;
+ GC  RedrawGC;
+ XpmIcon wmgen;
++Display   *display;
+ 
+   /***/
+  /* Function Prototypes */
+diff -Naur wmweather+-2.17.orig/wmgeneral/wmgeneral-x11.h 
wmweather+-2.17/wmgeneral/wmgeneral-x11.h
+--- wmweather+-2.17.orig/wmgeneral/wmgeneral-x11.h 2014-02-07 
20:17:44.0 +0100
 wmweather+-2.17/wmgeneral/wmgeneral-x11.h  2020-02-24 22:10:45.233884234 
+0100
+@@ -17,7 +17,7 @@
+  /* Global variable */
+ /***/
+ 
+-Display   *display;
++extern Display*display;
+ 
+   /***/
+  /* Function Prototypes */

diff --git a/x11-plugins/wmweather+/wmweather+-2.17.ebuild 
b/x11-plugins/wmweather+/wmweather+-2.17.ebuild
index 49e62aa1ecf..94bc2487217 100644
--- a/x11-plugins/wmweather+/wmweather+-2.17.ebuild
+++ b/x11-plugins/wmweather+/wmweather+-2.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,3 +19,5 @@ DEPEND="dev-libs/libpcre
x11-libs/libX11
x11-wm/windowmaker"
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )