| 1 |
commit: 40383904bf9e4b5c0ee8e55b9587112b7351e7cd |
| 2 |
Author: Matoro Mahri <matoro <AT> users <DOT> noreply <DOT> github <DOT> com> |
| 3 |
AuthorDate: Wed Nov 30 22:20:40 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 1 01:52:13 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40383904 |
| 7 |
|
| 8 |
media-libs/imlib2: backport BE build fix to 1.7.5 |
| 9 |
|
| 10 |
No revbump since this is build-only. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/877777 |
| 13 |
Signed-off-by: Matoro Mahri <matoro <AT> users.noreply.github.com> |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/28488 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
media-libs/imlib2/files/7d60151ba9.patch | 37 ++++++++++++++++++++++++++++++++ |
| 18 |
media-libs/imlib2/imlib2-1.7.5.ebuild | 1 + |
| 19 |
2 files changed, 38 insertions(+) |
| 20 |
|
| 21 |
diff --git a/media-libs/imlib2/files/7d60151ba9.patch b/media-libs/imlib2/files/7d60151ba9.patch |
| 22 |
new file mode 100644 |
| 23 |
index 000000000000..33709d83849f |
| 24 |
--- /dev/null |
| 25 |
+++ b/media-libs/imlib2/files/7d60151ba9.patch |
| 26 |
@@ -0,0 +1,37 @@ |
| 27 |
+https://bugs.gentoo.org/877777 |
| 28 |
+https://git.enlightenment.org/old/legacy-imlib2/commit/7d60151ba9696ef07be79af68d5c631a97c63906 |
| 29 |
+ |
| 30 |
+From 7d60151ba9696ef07be79af68d5c631a97c63906 Mon Sep 17 00:00:00 2001 |
| 31 |
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@×××××××××××××.net> |
| 32 |
+Date: Mon, 3 Jan 2022 10:56:03 +0100 |
| 33 |
+Subject: [PATCH] ICO loader: Fix compilation on big endian architectures |
| 34 |
+ |
| 35 |
+Commit ff79901a071a76ec73cc98c7ff15102c514afb7b refactors the |
| 36 |
+ico_read_idir function and removed the local nr variable. Unfortunately, |
| 37 |
+this variable is still used within an `#ifdef WORDS_BIGENDIAN` block on |
| 38 |
+big endian architectures as a for loop index variable. As such, the code |
| 39 |
+does presently not compile since the aforementioned commit. This patch |
| 40 |
+fixes this issue by re-introducing the variable conditionally on big |
| 41 |
+endian architectures. |
| 42 |
+ |
| 43 |
+Note: It would likely be cleaner to declare the nr variable as part of |
| 44 |
+the loop declaration, however, this C99 feature does not seem to be used |
| 45 |
+anywhere in the code base, hence I refrained from using it here. |
| 46 |
+--- |
| 47 |
+ src/modules/loaders/loader_ico.c | 3 +++ |
| 48 |
+ 1 file changed, 3 insertions(+) |
| 49 |
+ |
| 50 |
+diff --git a/src/modules/loaders/loader_ico.c b/src/modules/loaders/loader_ico.c |
| 51 |
+index e8cef41..66c3643 100644 |
| 52 |
+--- a/src/modules/loaders/loader_ico.c |
| 53 |
++++ b/src/modules/loaders/loader_ico.c |
| 54 |
+@@ -139,6 +139,9 @@ ico_read_icon(ico_t * ico, int ino) |
| 55 |
+ { |
| 56 |
+ ie_t *ie; |
| 57 |
+ unsigned int size; |
| 58 |
++#ifdef WORDS_BIGENDIAN |
| 59 |
++ unsigned int nr; |
| 60 |
++#endif |
| 61 |
+ |
| 62 |
+ ie = &ico->ie[ino]; |
| 63 |
+ |
| 64 |
|
| 65 |
diff --git a/media-libs/imlib2/imlib2-1.7.5.ebuild b/media-libs/imlib2/imlib2-1.7.5.ebuild |
| 66 |
index 8e11a1e78052..f7ae3856cd6a 100644 |
| 67 |
--- a/media-libs/imlib2/imlib2-1.7.5.ebuild |
| 68 |
+++ b/media-libs/imlib2/imlib2-1.7.5.ebuild |
| 69 |
@@ -37,6 +37,7 @@ RDEPEND=" |
| 70 |
DEPEND="${RDEPEND} |
| 71 |
X? ( x11-base/xorg-proto )" |
| 72 |
BDEPEND="virtual/pkgconfig" |
| 73 |
+PATCHES=( "${FILESDIR}/7d60151ba9.patch" ) |
| 74 |
|
| 75 |
multilib_src_configure() { |
| 76 |
local myeconfargs=( |
Archives