| 1 |
commit: 1ed286d1a7256205061253ffe58df0fc2a48f8ae |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 4 03:58:50 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 4 03:58:50 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed286d1 |
| 7 |
|
| 8 |
media-gfx/sane-backends: fix tests w/ gcc 12 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/840137 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/sane-backends-1.1.1-gcc12-tests.patch | 78 ++++++++++++++++++++++ |
| 14 |
.../sane-backends/sane-backends-1.1.1-r4.ebuild | 1 + |
| 15 |
2 files changed, 79 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..25a1e4db265e |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-gfx/sane-backends/files/sane-backends-1.1.1-gcc12-tests.patch |
| 22 |
@@ -0,0 +1,78 @@ |
| 23 |
+https://bugs.gentoo.org/840137 |
| 24 |
+https://gitlab.com/sane-project/backends/-/commit/6b99447f5b12758ff015b5c360a6dcbcf9b0a72d |
| 25 |
+https://gitlab.com/sane-project/backends/-/issues/597 |
| 26 |
+https://gitlab.com/sane-project/backends/-/issues/557 |
| 27 |
+ |
| 28 |
+From edfc90450ee06149537fadb3095ba4b215c5c4fa Mon Sep 17 00:00:00 2001 |
| 29 |
+From: Ralph Little <skelband@×××××.com> |
| 30 |
+Date: Sun, 2 Oct 2022 18:14:25 -0700 |
| 31 |
+Subject: [PATCH] genesys: corrections to include file order. |
| 32 |
+ |
| 33 |
+minigtest.h has items that require the definitions in tests_printers.h. |
| 34 |
+Pre-GCC-12, this didn't seem to matter but GCC12 seems to have a |
| 35 |
+problem with this and requires the template definitions to have already |
| 36 |
+appeared. |
| 37 |
+--- a/testsuite/backend/genesys/minigtest.cpp |
| 38 |
++++ b/testsuite/backend/genesys/minigtest.cpp |
| 39 |
+@@ -18,10 +18,10 @@ |
| 40 |
+ along with this program. If not, see <https://www.gnu.org/licenses/>. |
| 41 |
+ */ |
| 42 |
+ |
| 43 |
+-#include "minigtest.h" |
| 44 |
+- |
| 45 |
+ #define DEBUG_DECLARE_ONLY |
| 46 |
+ |
| 47 |
++#include "minigtest.h" |
| 48 |
++ |
| 49 |
+ size_t s_num_successes = 0; |
| 50 |
+ size_t s_num_failures = 0; |
| 51 |
+ |
| 52 |
+--- a/testsuite/backend/genesys/tests_image.cpp |
| 53 |
++++ b/testsuite/backend/genesys/tests_image.cpp |
| 54 |
+@@ -21,8 +21,8 @@ |
| 55 |
+ #define DEBUG_DECLARE_ONLY |
| 56 |
+ |
| 57 |
+ #include "tests.h" |
| 58 |
+-#include "minigtest.h" |
| 59 |
+ #include "tests_printers.h" |
| 60 |
++#include "minigtest.h" |
| 61 |
+ |
| 62 |
+ #include "../../../backend/genesys/image.h" |
| 63 |
+ #include "../../../backend/genesys/image_pipeline.h" |
| 64 |
+--- a/testsuite/backend/genesys/tests_image_pipeline.cpp |
| 65 |
++++ b/testsuite/backend/genesys/tests_image_pipeline.cpp |
| 66 |
+@@ -21,8 +21,8 @@ |
| 67 |
+ #define DEBUG_DECLARE_ONLY |
| 68 |
+ |
| 69 |
+ #include "tests.h" |
| 70 |
+-#include "minigtest.h" |
| 71 |
+ #include "tests_printers.h" |
| 72 |
++#include "minigtest.h" |
| 73 |
+ |
| 74 |
+ #include "../../../backend/genesys/image_pipeline.h" |
| 75 |
+ |
| 76 |
+--- a/testsuite/backend/genesys/tests_motor.cpp |
| 77 |
++++ b/testsuite/backend/genesys/tests_motor.cpp |
| 78 |
+@@ -21,8 +21,8 @@ |
| 79 |
+ #define DEBUG_DECLARE_ONLY |
| 80 |
+ |
| 81 |
+ #include "tests.h" |
| 82 |
+-#include "minigtest.h" |
| 83 |
+ #include "tests_printers.h" |
| 84 |
++#include "minigtest.h" |
| 85 |
+ |
| 86 |
+ #include "../../../backend/genesys/low.h" |
| 87 |
+ #include "../../../backend/genesys/enums.h" |
| 88 |
+--- a/testsuite/backend/genesys/tests_utilities.cpp |
| 89 |
++++ b/testsuite/backend/genesys/tests_utilities.cpp |
| 90 |
+@@ -21,8 +21,8 @@ |
| 91 |
+ #define DEBUG_DECLARE_ONLY |
| 92 |
+ |
| 93 |
+ #include "tests.h" |
| 94 |
+-#include "minigtest.h" |
| 95 |
+ #include "tests_printers.h" |
| 96 |
++#include "minigtest.h" |
| 97 |
+ |
| 98 |
+ #include "../../../backend/genesys/utilities.h" |
| 99 |
+ |
| 100 |
+GitLab |
| 101 |
|
| 102 |
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 |
| 103 |
index 6bff44a1f891..e34fadb86e95 100644 |
| 104 |
--- a/media-gfx/sane-backends/sane-backends-1.1.1-r4.ebuild |
| 105 |
+++ b/media-gfx/sane-backends/sane-backends-1.1.1-r4.ebuild |
| 106 |
@@ -182,6 +182,7 @@ PATCHES=( |
| 107 |
"${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch |
| 108 |
# https://gitlab.com/sane-project/backends/-/merge_requests/688 |
| 109 |
"${FILESDIR}"/${PN}-1.1.1-genesys-gl845-crash.patch |
| 110 |
+ "${FILESDIR}"/${P}-gcc12-tests.patch |
| 111 |
) |
| 112 |
|
| 113 |
MULTILIB_CHOST_TOOLS=( |
Archives