diff options
| author |   Sam James <sam@gentoo.org> | 2022-11-04 03:58:50 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-11-04 03:58:50 +0000 |
| commit | 1ed286d1a7256205061253ffe58df0fc2a48f8ae (patch) | |
| tree | bc9077122b85eb1bc1a969481116abb63c3ca7ae | |
| parent | app-editors/gvim: fix configure w/ clang 16 (diff) | |
| download | gentoo-1ed286d1.tar.gz gentoo-1ed286d1.tar.bz2 gentoo-1ed286d1.zip | |
media-gfx/sane-backends: fix tests w/ gcc 12
Closes: https://bugs.gentoo.org/840137
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | media-gfx/sane-backends/files/sane-backends-1.1.1-gcc12-tests.patch | 78 | ||||
| -rw-r--r-- | media-gfx/sane-backends/sane-backends-1.1.1-r4.ebuild | 1 |
2 files changed, 79 insertions, 0 deletions
diff --git a/media-gfx/sane-backends/files/sane-backends-1.1.1-gcc12-tests.patch b/media-gfx/sane-backends/files/sane-backends-1.1.1-gcc12-tests.patch new file mode 100644 index 000000000000..25a1e4db265e --- /dev/null +++ b/media-gfx/sane-backends/files/sane-backends-1.1.1-gcc12-tests.patch @@ -0,0 +1,78 @@ +https://bugs.gentoo.org/840137 +https://gitlab.com/sane-project/backends/-/commit/6b99447f5b12758ff015b5c360a6dcbcf9b0a72d +https://gitlab.com/sane-project/backends/-/issues/597 +https://gitlab.com/sane-project/backends/-/issues/557 + +From edfc90450ee06149537fadb3095ba4b215c5c4fa Mon Sep 17 00:00:00 2001 +From: Ralph Little <skelband@gmail.com> +Date: Sun, 2 Oct 2022 18:14:25 -0700 +Subject: [PATCH] genesys: corrections to include file order. + +minigtest.h has items that require the definitions in tests_printers.h. +Pre-GCC-12, this didn't seem to matter but GCC12 seems to have a +problem with this and requires the template definitions to have already +appeared. +--- a/testsuite/backend/genesys/minigtest.cpp ++++ b/testsuite/backend/genesys/minigtest.cpp +@@ -18,10 +18,10 @@ + along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +-#include "minigtest.h" +- + #define DEBUG_DECLARE_ONLY + ++#include "minigtest.h" ++ + size_t s_num_successes = 0; + size_t s_num_failures = 0; + +--- a/testsuite/backend/genesys/tests_image.cpp ++++ b/testsuite/backend/genesys/tests_image.cpp +@@ -21,8 +21,8 @@ + #define DEBUG_DECLARE_ONLY + + #include "tests.h" +-#include "minigtest.h" + #include "tests_printers.h" ++#include "minigtest.h" + + #include "../../../backend/genesys/image.h" + #include "../../../backend/genesys/image_pipeline.h" +--- a/testsuite/backend/genesys/tests_image_pipeline.cpp ++++ b/testsuite/backend/genesys/tests_image_pipeline.cpp +@@ -21,8 +21,8 @@ + #define DEBUG_DECLARE_ONLY + + #include "tests.h" +-#include "minigtest.h" + #include "tests_printers.h" ++#include "minigtest.h" + + #include "../../../backend/genesys/image_pipeline.h" + +--- a/testsuite/backend/genesys/tests_motor.cpp ++++ b/testsuite/backend/genesys/tests_motor.cpp +@@ -21,8 +21,8 @@ + #define DEBUG_DECLARE_ONLY + + #include "tests.h" +-#include "minigtest.h" + #include "tests_printers.h" ++#include "minigtest.h" + + #include "../../../backend/genesys/low.h" + #include "../../../backend/genesys/enums.h" +--- a/testsuite/backend/genesys/tests_utilities.cpp ++++ b/testsuite/backend/genesys/tests_utilities.cpp +@@ -21,8 +21,8 @@ + #define DEBUG_DECLARE_ONLY + + #include "tests.h" +-#include "minigtest.h" + #include "tests_printers.h" ++#include "minigtest.h" + + #include "../../../backend/genesys/utilities.h" + +GitLab diff --git a/media-gfx/sane-backends/sane-backends-1.1.1-r4.ebuild b/media-gfx/sane-backends/sane-backends-1.1.1-r4.ebuild index 6bff44a1f891..e34fadb86e95 100644 --- a/media-gfx/sane-backends/sane-backends-1.1.1-r4.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.1.1-r4.ebuild @@ -182,6 +182,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch # https://gitlab.com/sane-project/backends/-/merge_requests/688 "${FILESDIR}"/${PN}-1.1.1-genesys-gl845-crash.patch + "${FILESDIR}"/${P}-gcc12-tests.patch ) MULTILIB_CHOST_TOOLS=( |