* [gentoo-commits] repo/gentoo:master commit in: net-wireless/wavemon/files/
@ 2020-12-26 21:13 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-12-26 21:13 UTC (permalink / raw
To: gentoo-commits
commit: 595f0b0765697a14453e71b07014d7436915894b
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Dec 24 08:58:03 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 21:13:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=595f0b07
net-wireless/wavemon: remove unused patch
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18805
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../wavemon/files/wavemon-0.6.7-dont-override-CFLAGS.patch | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/net-wireless/wavemon/files/wavemon-0.6.7-dont-override-CFLAGS.patch b/net-wireless/wavemon/files/wavemon-0.6.7-dont-override-CFLAGS.patch
deleted file mode 100644
index df98db7cd59..00000000000
--- a/net-wireless/wavemon/files/wavemon-0.6.7-dont-override-CFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -9,8 +9,6 @@
- AC_DEFINE_UNQUOTED([BUILD_DATE], ["`/bin/date`"],
- [date wavemon was last configured and built])
-
--CFLAGS="-O2 -Wall"
--
- # wavemon is only supported on Linux, warn user about futile compilations
- AC_CANONICAL_HOST
- case "$host_os" in
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/wavemon/files/
@ 2021-03-26 18:32 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2021-03-26 18:32 UTC (permalink / raw
To: gentoo-commits
commit: 93849fe1098a5dccc7a32cbd5ecbd79397460afc
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Mar 26 16:11:24 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 18:32:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93849fe1
net-wireless/wavemon: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/20131
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/wavemon-0.7.6-ncurses-tinfo.patch | 19 ---------
.../wavemon/files/wavemon-0.8.0-build.patch | 33 ---------------
.../wavemon/files/wavemon-0.9.1-build.patch | 48 ----------------------
3 files changed, 100 deletions(-)
diff --git a/net-wireless/wavemon/files/wavemon-0.7.6-ncurses-tinfo.patch b/net-wireless/wavemon/files/wavemon-0.7.6-ncurses-tinfo.patch
deleted file mode 100644
index e8d0af99587..00000000000
--- a/net-wireless/wavemon/files/wavemon-0.7.6-ncurses-tinfo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -21,6 +21,7 @@
- AC_PROG_CC
- AC_PROG_CPP
- AC_PROG_INSTALL
-+PKG_PROG_PKG_CONFIG
-
- # Checks for header files.
- AC_HEADER_STDC
-@@ -52,7 +53,7 @@
-
- # Tests involving libraries
- AC_CHECK_LIB([m], [pow], [], [AC_MSG_ERROR(math library not found)])
--AC_CHECK_LIB([ncurses], [waddstr], [], [AC_MSG_ERROR(ncurses library not found)])
-+PKG_CHECK_MODULES([ncurses], [ncurses], [LIBS="$LIBS $ncurses_LIBS"], AC_MSG_ERROR([ncurses is required but was not found]))
- AC_CHECK_LIB([pthread], [pthread_create], [CFLAGS="$CFLAGS -pthread"],
- [AC_MSG_ERROR(pthread library not found)])
- AC_CHECK_LIB([cap], [cap_get_flag])
diff --git a/net-wireless/wavemon/files/wavemon-0.8.0-build.patch b/net-wireless/wavemon/files/wavemon-0.8.0-build.patch
deleted file mode 100644
index 373b27e3e25..00000000000
--- a/net-wireless/wavemon/files/wavemon-0.8.0-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -15,8 +15,6 @@
- AC_DEFINE_UNQUOTED([BUILD_DATE], ["`/bin/date`"],
- [date wavemon was last configured and built])
-
--CFLAGS="-O2 -Wall"
--
- # wavemon is only supported on Linux, warn user about futile compilations
- AC_CANONICAL_HOST
- case "$host_os" in
-diff -uarN a/Makefile.in b/Makefile.in
---- a/Makefile.in 2017-07-14 21:35:18.154423280 +0300
-+++ b/Makefile.in 2017-07-14 21:35:34.613402738 +0300
-@@ -9,7 +9,7 @@
- install-suid-root: exec_perms = 4755
-
- CC ?= @CC@
--CFLAGS ?= @CFLAGS@ @LIBNL3_CFLAGS@
-+CFLAGS = @CFLAGS@ @LIBNL3_CFLAGS@
- CPPFLAGS ?= @CPPFLAGS@
- LDFLAGS ?= @LDFLAGS@
- DEFS ?= @DEFS@
-@@ -25,8 +25,7 @@
- DOCS = README.md NEWS THANKS AUTHORS COPYING ChangeLog
-
- %.o: %.c $(HEADERS)
-- @echo ' CC ' $<
-- @$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $<
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $<
-
- all: @PACKAGE_NAME@
- @PACKAGE_NAME@: $(MAIN) $(OBJS)
diff --git a/net-wireless/wavemon/files/wavemon-0.9.1-build.patch b/net-wireless/wavemon/files/wavemon-0.9.1-build.patch
deleted file mode 100644
index 2a63694e10f..00000000000
--- a/net-wireless/wavemon/files/wavemon-0.9.1-build.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/configure.ac 2020-05-17 14:27:27.982637232 +0200
-+++ b/configure.ac 2020-05-17 14:29:33.157206097 +0200
-@@ -8,8 +8,6 @@
- AC_CONFIG_AUX_DIR([config])
- AC_CONFIG_FILES([Makefile])
-
--CFLAGS="-O2 -Wall"
--
- # wavemon is only supported on Linux, warn user about futile compilations
- AC_CANONICAL_HOST
- case "$host_os" in
-@@ -22,12 +20,15 @@
- AC_PROG_CPP
- AC_PROG_INSTALL
-
-+PKG_PROG_PKG_CONFIG()
-+
- # Checks for header files.
- AC_HEADER_STDC
- AC_HEADER_TIME
- AC_CHECK_HEADERS([ncurses.h fcntl.h netdb.h sys/ioctl.h sys/time.h unistd.h\
- net/if_arp.h netinet/ether.h net/ethernet.h pthread.h],
- [], [AC_MSG_ERROR($ac_header not found)])
-+PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",)
-
- # linux/if.h needs 'struct sockaddr'
- # linux/wireless.h in turn depends on linux/if.h
---- a/Makefile.in 2017-07-14 21:35:18.154423280 +0300
-+++ b/Makefile.in 2017-07-14 21:35:34.613402738 +0300
-@@ -9,7 +9,7 @@
- install-suid-root: exec_perms = 4755
-
- CC ?= @CC@
--CFLAGS ?= @CFLAGS@ @LIBNL3_CFLAGS@
-+CFLAGS = @CFLAGS@ @LIBNL3_CFLAGS@
- CPPFLAGS ?= @CPPFLAGS@
- LDFLAGS ?= @LDFLAGS@
- DEFS ?= @DEFS@
-@@ -25,8 +25,7 @@
- DOCS = README.md NEWS THANKS AUTHORS COPYING ChangeLog
-
- %.o: %.c $(HEADERS)
-- @echo ' CC ' $<
-- @$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $<
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $<
-
- all: @PACKAGE_NAME@
- @PACKAGE_NAME@: $(MAIN) $(OBJS)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/wavemon/files/
@ 2021-06-03 7:01 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2021-06-03 7:01 UTC (permalink / raw
To: gentoo-commits
commit: cd2fe787cf93eaa7e82564b901993447273e8367
Author: Matthew White <mehw.is.me <AT> inventati <DOT> org>
AuthorDate: Mon May 10 00:05:49 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jun 3 07:01:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd2fe787
net-wireless/wavemon-0.9.3: fix ncurses(w) libs
Fixes a segmentation fault due to linking with libncursesw and
libtinfo, rather than libtinfow.
See also https://github.com/uoaerg/wavemon/issues/88 about the
segmentation fault error.
If libncursesw is available uses ncursesw_LIBS, otherwise uses
ncurses_LIBS if libncurses remains the only option.
Closes: https://bugs.gentoo.org/785562
Signed-off-by: Matteo Bianco <mehw.is.me <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/20749
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-wireless/wavemon/files/wavemon-0.9.3-build.patch | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/net-wireless/wavemon/files/wavemon-0.9.3-build.patch b/net-wireless/wavemon/files/wavemon-0.9.3-build.patch
index 74b09271a0f..7cc054efefa 100644
--- a/net-wireless/wavemon/files/wavemon-0.9.3-build.patch
+++ b/net-wireless/wavemon/files/wavemon-0.9.3-build.patch
@@ -1,5 +1,5 @@
--- a/configure.ac 2020-12-26 17:44:01.616731241 +0100
-+++ b/configure.ac 2020-12-26 17:45:02.447292151 +0100
++++ b/configure.ac 2021-05-09 21:57:37.000000000 +0000
@@ -8,8 +8,6 @@
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_FILES([Makefile])
@@ -18,14 +18,17 @@
# Checks for header files.
AC_HEADER_STDC
AC_HEADER_TIME
-@@ -29,6 +31,7 @@
- net/if_arp.h netinet/ether.h net/ethernet.h pthread.h],
- [], [AC_MSG_ERROR($ac_header not found)])
- AC_CHECK_HEADERS([ncursesw/curses.h])
-+PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",)
+@@ -54,8 +54,8 @@
+ # Tests involving libraries
+ AC_CHECK_LIB([m], [pow], [], [AC_MSG_ERROR(math library not found)])
+ AC_CHECK_LIB([ncursesw], [waddstr],
+- [],
+- [AC_CHECK_LIB([ncurses], [waddstr], [], [AC_MSG_ERROR(ncurses library not found)])])
++ [PKG_CHECK_MODULES([ncursesw], [ncursesw], [LIBS="$LIBS $ncursesw_LIBS"], [])],
++ [AC_CHECK_LIB([ncurses], [waddstr], [PKG_CHECK_MODULES([ncurses], [ncurses], [LIBS="$LIBS $ncurses_LIBS"], [])], [AC_MSG_ERROR(ncurses library not found)])])
+ AC_CHECK_LIB([pthread], [pthread_create], [CFLAGS="$CFLAGS -pthread"],
+ [AC_MSG_ERROR(pthread library not found)])
- # linux/if.h needs 'struct sockaddr'
- # linux/wireless.h in turn depends on linux/if.h
--- a/Makefile.in 2017-07-14 21:35:18.154423280 +0300
+++ b/Makefile.in 2017-07-14 21:35:34.613402738 +0300
@@ -9,7 +9,7 @@
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-03 7:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-26 21:13 [gentoo-commits] repo/gentoo:master commit in: net-wireless/wavemon/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-03-26 18:32 Conrad Kostecki
2021-06-03 7:01 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox