From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C5C9A15800A for ; Sat, 19 Aug 2023 22:32:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C15E82BC021; Sat, 19 Aug 2023 22:32:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A965D2BC021 for ; Sat, 19 Aug 2023 22:32:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D48D33411C9 for ; Sat, 19 Aug 2023 22:32:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D31651037 for ; Sat, 19 Aug 2023 22:32:18 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1692484316.13f43b73752f9cc8630655794307f7b7f77f97c5.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/r8168/files/, net-misc/r8168/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/r8168/files/r8168-8.051.02-6.4.10-fix.patch net-misc/r8168/r8168-8.051.02.ebuild X-VCS-Directories: net-misc/r8168/ net-misc/r8168/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 13f43b73752f9cc8630655794307f7b7f77f97c5 X-VCS-Branch: master Date: Sat, 19 Aug 2023 22:32:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ec65b823-0eb3-4850-ac6b-92bdac99ec50 X-Archives-Hash: 92b1764a57fc12db1e702abace3e81f3 commit: 13f43b73752f9cc8630655794307f7b7f77f97c5 Author: Karlson2k (Evgeny Grin) narod ru> AuthorDate: Tue Aug 15 14:34:57 2023 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat Aug 19 22:31:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13f43b73 net-misc/r8168: fixed build with kernel 6.4.10+ Bug: https://bugs.gentoo.org/912242 Signed-off-by: Karlson2k (Evgeny Grin) narod.ru> Closes: https://github.com/gentoo/gentoo/pull/32323 Signed-off-by: Conrad Kostecki gentoo.org> net-misc/r8168/files/r8168-8.051.02-6.4.10-fix.patch | 17 +++++++++++++++++ net-misc/r8168/r8168-8.051.02.ebuild | 1 + 2 files changed, 18 insertions(+) diff --git a/net-misc/r8168/files/r8168-8.051.02-6.4.10-fix.patch b/net-misc/r8168/files/r8168-8.051.02-6.4.10-fix.patch new file mode 100644 index 000000000000..f10b86447971 --- /dev/null +++ b/net-misc/r8168/files/r8168-8.051.02-6.4.10-fix.patch @@ -0,0 +1,17 @@ +Fixed build with kernels 6.4.10+ +Gentoo Bug: https://bugs.gentoo.org/912242 +See also: https://github.com/mtorromeo/r8168/issues/54 + +--- +--- a/src/r8168_n.c 2023-08-13 03:33:06.977422132 +0400 ++++ b/src/r8168_n.c 2023-08-13 03:38:39.767005101 +0400 +@@ -81,6 +81,10 @@ + #include + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,4,10) ++#include ++#endif ++ + #include + #include diff --git a/net-misc/r8168/r8168-8.051.02.ebuild b/net-misc/r8168/r8168-8.051.02.ebuild index 1b19ce47db5e..8f0c5b529c63 100644 --- a/net-misc/r8168/r8168-8.051.02.ebuild +++ b/net-misc/r8168/r8168-8.051.02.ebuild @@ -26,6 +26,7 @@ WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel dr PATCHES=( "${FILESDIR}/${PN}-8.051.02-6.1-fix.patch" + "${FILESDIR}/${P}-6.4.10-fix.patch" # bug 912242 ) pkg_setup() {