[wl-kmod] Fix gcc falls through warnings - reworked wl-kmod-017_fix_gcc_fallthrough_warning.patch
by Nicolas Viéville
commit 9fdb040fdcd7e4bd9f4612ed836c084a87612c63
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Wed Oct 6 17:32:17 2021 +0200
Fix gcc falls through warnings - reworked wl-kmod-017_fix_gcc_fallthrough_warning.patch
wl-kmod-017_fix_gcc_fallthrough_warning.patch | 2 +-
wl-kmod.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/wl-kmod-017_fix_gcc_fallthrough_warning.patch b/wl-kmod-017_fix_gcc_fallthrough_warning.patch
index 8bf91bd..e5f34b7 100644
--- a/wl-kmod-017_fix_gcc_fallthrough_warning.patch
+++ b/wl-kmod-017_fix_gcc_fallthrough_warning.patch
@@ -5,7 +5,7 @@ diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_
break;
case NL80211_AUTHTYPE_NETWORK_EAP:
WL_DBG(("network eap\n"));
-+ // fall through
++ __attribute__((__fallthrough__)); /* [[fallthrough]]; falls through */
default:
val = 2;
WL_ERR(("invalid auth type (%d)\n", sme->auth_type));
diff --git a/wl-kmod.spec b/wl-kmod.spec
index 85490e1..18dc0f1 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -10,7 +10,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 38%{?dist}
+Release: 39%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -287,6 +287,9 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Oct 03 2021 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-39
+- Fix gcc falls through warnings - reworked wl-kmod-017_fix_gcc_fallthrough_warning.patch
+
* Wed Aug 04 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 6.30.223.271-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
3 years
[amule] PR 298 from upstream to allow build with autoconf 2.71
by Sérgio M. Basto
commit 93b4fb410f5b652f1899c3130f222c3358da2fbd
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Oct 6 16:05:04 2021 +0100
PR 298 from upstream to allow build with autoconf 2.71
Force build and install cryptopp >= 8.6.0 to avoid crashs
gcc-c++ installs gcc by default
298.patch | 25 +++++++++++++++++++++++++
amule.spec | 16 +++++++++++-----
2 files changed, 36 insertions(+), 5 deletions(-)
---
diff --git a/298.patch b/298.patch
new file mode 100644
index 0000000..05c0073
--- /dev/null
+++ b/298.patch
@@ -0,0 +1,25 @@
+From 40810d2fba2c2092efca84ed7f2017fddbb70ebd Mon Sep 17 00:00:00 2001
+From: Pablo Barciela <scow(a)riseup.net>
+Date: Sun, 19 Sep 2021 13:55:07 +0200
+Subject: [PATCH] allow to build with autoconf 2.70 and later
+
+Closes https://github.com/amule-project/amule/issues/232
+---
+ configure.ac | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 93a918c03..9c57668c6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,10 +30,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+
+ AC_PREREQ(2.62)
+
+-# autoconf 2.70 introduced some incompatibilities that will make the build fail
+-# As a "workaround" reject 2.70 and above for now.
+-m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.70]), [-1],, [m4_fatal([autoconf ]m4_defn([AC_AUTOCONF_VERSION])[ is known to not work with aMule. Please use 2.69 instead.])])
+-
+ AC_CONFIG_SRCDIR([src/amule.cpp])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
diff --git a/amule.spec b/amule.spec
index d01a12b..78fc82a 100644
--- a/amule.spec
+++ b/amule.spec
@@ -1,15 +1,15 @@
Name: amule
Version: 2.3.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: File sharing client compatible with eDonkey
License: GPLv2+
Source0: https://github.com/amule-project/amule/archive/%{version}/%{name}-%{versi...
Source2: %{name}.appdata.xml
URL: http://amule.org
-BuildRequires: gcc
-BuildRequires: gcc-c++
+Patch1: 298.patch
# See http://wiki.amule.org/wiki/Requirements
+BuildRequires: gcc-c++
BuildRequires: wxGTK3-devel >= 0:2.8.7
BuildRequires: desktop-file-utils
BuildRequires: binutils-devel
@@ -21,7 +21,7 @@ BuildRequires: gettext-devel
BuildRequires: flex
BuildRequires: bison
BuildRequires: readline-devel
-BuildRequires: pkgconfig(cryptopp)
+BuildRequires: pkgconfig(cryptopp) >= 8.6.0
BuildRequires: pkgconfig(libupnp)
BuildRequires: pkgconfig(geoip)
BuildRequires: libappstream-glib
@@ -30,6 +30,7 @@ BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(ncurses)
Requires: %{name}-nogui
+Requires: cryptopp >= 8.6.0
%description
aMule is an easy to use multi-platform client for ED2K Peer-to-Peer
@@ -48,7 +49,7 @@ It is useful for servers which don't have Xorg.
%prep
-%autosetup
+%autosetup -p1
%build
# Downgrade to c++14 to avoid conflict with std::byte
@@ -160,6 +161,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
%changelog
+* Wed Oct 06 2021 Sérgio Basto <sergio(a)serjux.com> - 2.3.3-4
+- PR 298 from upstream to allow build with autoconf 2.71
+- Force build and install cryptopp >= 8.6.0 to avoid crashs
+- gcc-c++ installs gcc by default
+
* Tue Oct 05 2021 Sérgio Basto <sergio(a)serjux.com> - 2.3.3-3
- Rebuild for cryptopp update from 8.4.0 to 8.6.0
3 years
[nvidia-390xx-kmod] Add --with-kmod bcond for mockbuild tests of the module
by Henrik Nordström
commit 259c9549f4535daa56d7e5e2600eb2b1b1078090
Author: Henrik Nordström <henrik(a)hno.se>
Date: Wed Oct 6 11:46:41 2021 +0200
Add --with-kmod bcond for mockbuild tests of the module
rfpkg --release f36 mockbuild --with kmod
nvidia-390xx-kmod.spec | 6 ++++++
1 file changed, 6 insertions(+)
---
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index 09351de..8bec6a8 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -4,6 +4,12 @@
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
%if 0%{?fedora}
+%bcond_with kmod
+%endif
+
+%if %{with kmod}
+%global buildforkernels current
+%else
%global buildforkernels akmod
%global debug_package %{nil}
%endif
3 years
[pulseaudio-module-bluetooth-freeworld] fix sources
by Gergely Gombos
commit 3da1599ec5c053aeb78964271d13e465c3116965
Author: Gergely Gombos <gombosg(a)disroot.org>
Date: Wed Oct 6 10:17:56 2021 +0200
fix sources
sources | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/sources b/sources
index 4b959de..b98cf7c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (pulseaudio-15.0.tar.xz) = 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
+SHA512 (pulseaudio-modules-bt-1.4.tar.gz) = 390b6ad0931b464a546c6624bec38cc5b6da7084e4defe2045f4164b0c910a9dd6d4327466eb0e53fcfbc78c995cf2e3634a75b67ee2a14f38ed18e31b5d2bce
3 years