Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / atril
Commits:
-
b8057bdd
by Mike Gabriel at 2025-01-06T15:32:33+01:00
-
506b9410
by Mike Gabriel at 2025-01-06T15:38:18+01:00
4 changed files:
- debian/changelog
- + debian/patches/0001_fix-incompat-pointer-type.patch
- + debian/patches/0002_simplify-array-iteration.patch
- debian/patches/series
Changes:
| 1 | +atril (1.26.2-4) unstable; urgency=medium
|
|
| 2 | + |
|
| 3 | + * debian/patches:
|
|
| 4 | + + Add 0001_fix-incompat-pointer-type.patch and 0002_simplify-array-
|
|
| 5 | + iteration.patch. Fix FTBFS against GCC-14. (Closes: #1074828).
|
|
| 6 | + |
|
| 7 | + -- Mike Gabriel <sunweaver@debian.org> Mon, 06 Jan 2025 15:32:43 +0100
|
|
| 8 | + |
|
| 1 | 9 | atril (1.26.2-3) unstable; urgency=medium
|
| 2 | 10 | |
| 3 | 11 | * debian/control:
|
| 1 | +From 511f294716bee2d1250cc7c27b10468a49c89ed1 Mon Sep 17 00:00:00 2001
|
|
| 2 | +From: raveit65 <mate@raveit.de>
|
|
| 3 | +Date: Tue, 30 Jan 2024 20:58:49 +0100
|
|
| 4 | +Subject: [PATCH] fix a incompatible pointer type warning for gcc14
|
|
| 5 | + |
|
| 6 | +---
|
|
| 7 | + backend/epub/epub-document.c | 4 ++--
|
|
| 8 | + 1 file changed, 2 insertions(+), 2 deletions(-)
|
|
| 9 | + |
|
| 10 | +diff --git a/backend/epub/epub-document.c b/backend/epub/epub-document.c
|
|
| 11 | +index 38ab4c83f..01875baa5 100644
|
|
| 12 | +--- a/backend/epub/epub-document.c
|
|
| 13 | ++++ b/backend/epub/epub-document.c
|
|
| 14 | +@@ -632,7 +632,7 @@ check_mime_type(const gchar* uri,GError** error)
|
|
| 15 | + const gchar* mimetypes[] = {"application/epub+zip", "application/x-booki+zip", NULL};
|
|
| 16 | + guint i;
|
|
| 17 | +
|
|
| 18 | +- for (i = 0; i < g_strv_length (mimetypes); i++) {
|
|
| 19 | ++ for (i = 0; i < g_strv_length ((gchar**) mimetypes); i++) {
|
|
| 20 | + if (strcmp(mimeFromFile, mimetypes[i]) == 0)
|
|
| 21 | + return TRUE;
|
|
| 22 | + }
|
|
| 23 | +@@ -643,7 +643,7 @@ check_mime_type(const gchar* uri,GError** error)
|
|
| 24 | + mimeFromFile = ev_file_get_mime_type (uri, TRUE, &err);
|
|
| 25 | + if (mimeFromFile)
|
|
| 26 | + {
|
|
| 27 | +- for (i = 0; i < g_strv_length (mimetypes); i++) {
|
|
| 28 | ++ for (i = 0; i < g_strv_length ((gchar**) mimetypes); i++) {
|
|
| 29 | + if (g_strcmp0(mimeFromFile, mimetypes[i]) == 0)
|
|
| 30 | + return TRUE;
|
|
| 31 | + } |
| 1 | +From eb81daccb499bce03494630af052b0ca420e4b78 Mon Sep 17 00:00:00 2001
|
|
| 2 | +From: raveit65 <mate@raveit.de>
|
|
| 3 | +Date: Wed, 31 Jan 2024 11:44:49 +0100
|
|
| 4 | +Subject: [PATCH] Update backend/epub/epub-document.c
|
|
| 5 | + |
|
| 6 | +Co-authored-by: Colomban Wendling <cwendling@hypra.fr>
|
|
| 7 | +---
|
|
| 8 | + backend/epub/epub-document.c | 2 +-
|
|
| 9 | + 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
| 10 | + |
|
| 11 | +diff --git a/backend/epub/epub-document.c b/backend/epub/epub-document.c
|
|
| 12 | +index 01875baa5..18f59f807 100644
|
|
| 13 | +--- a/backend/epub/epub-document.c
|
|
| 14 | ++++ b/backend/epub/epub-document.c
|
|
| 15 | +@@ -632,7 +632,7 @@ check_mime_type(const gchar* uri,GError** error)
|
|
| 16 | + const gchar* mimetypes[] = {"application/epub+zip", "application/x-booki+zip", NULL};
|
|
| 17 | + guint i;
|
|
| 18 | +
|
|
| 19 | +- for (i = 0; i < g_strv_length ((gchar**) mimetypes); i++) {
|
|
| 20 | ++ for (i = 0; mimetypes[i]; i++) {
|
|
| 21 | + if (strcmp(mimeFromFile, mimetypes[i]) == 0)
|
|
| 22 | + return TRUE;
|
|
| 23 | + } |
| 1 | 1 | 1002-avoid-crash-on-certain-epub-files.patch
|
| 2 | +0001_fix-incompat-pointer-type.patch
|
|
| 3 | +0002_simplify-array-iteration.patch |