Faidon Liambotis pushed to branch master at Debian and Ubuntu MATE Packaging Team / pluma
Commits:
-
64d1f024
by Faidon Liambotis at 2024-09-05T18:29:50+03:00
-
25aed790
by Faidon Liambotis at 2024-09-05T18:30:46+03:00
3 changed files:
- debian/changelog
- + debian/patches/0001-filebrowser-fix-warning-Wincompatible-pointer-types.patch
- debian/patches/series
Changes:
| 1 | +pluma (1.26.1-2.1) unstable; urgency=medium
|
|
| 2 | + |
|
| 3 | + * Non-maintainer upload, with permission.
|
|
| 4 | + * Backport an upstream commit to fix a FTBFS with GCC 14. (Closes: #1075392)
|
|
| 5 | + |
|
| 6 | + -- Faidon Liambotis <paravoid@debian.org> Thu, 05 Sep 2024 18:29:59 +0300
|
|
| 7 | + |
|
| 1 | 8 | pluma (1.26.1-2) unstable; urgency=medium
|
| 2 | 9 | |
| 3 | 10 | * debian/pluma.install:
|
| 1 | +Description: Fix FTBFS with GCC 14
|
|
| 2 | +Origin: upstream, commit:6bd34181f2490f313a835ce59f82f696c42a2d0a
|
|
| 3 | +Bug-Debian: https://bugs.debian.org/1075392
|
|
| 4 | +Last-Update: 2024-09-05
|
|
| 5 | + |
|
| 6 | +--- a/plugins/filebrowser/pluma-file-bookmarks-store.c
|
|
| 7 | ++++ b/plugins/filebrowser/pluma-file-bookmarks-store.c
|
|
| 8 | +@@ -824,10 +824,8 @@ pluma_file_bookmarks_store_get_uri (PlumaFileBookmarksStore * model,
|
|
| 9 | + GtkTreeIter * iter)
|
|
| 10 | + {
|
|
| 11 | + GObject * obj;
|
|
| 12 | +- GFile * file = NULL;
|
|
| 13 | + guint flags;
|
|
| 14 | + gchar * ret = NULL;
|
|
| 15 | +- gboolean isfs;
|
|
| 16 | +
|
|
| 17 | + g_return_val_if_fail (PLUMA_IS_FILE_BOOKMARKS_STORE (model), NULL);
|
|
| 18 | + g_return_val_if_fail (iter != NULL, NULL);
|
|
| 19 | +@@ -839,26 +837,25 @@ pluma_file_bookmarks_store_get_uri (PlumaFileBookmarksStore * model,
|
|
| 20 | + &obj,
|
|
| 21 | + -1);
|
|
| 22 | +
|
|
| 23 | +- if (obj == NULL)
|
|
| 24 | +- return NULL;
|
|
| 25 | +-
|
|
| 26 | +- isfs = (flags & PLUMA_FILE_BOOKMARKS_STORE_IS_FS);
|
|
| 27 | +-
|
|
| 28 | +- if (isfs && (flags & PLUMA_FILE_BOOKMARKS_STORE_IS_MOUNT))
|
|
| 29 | +- {
|
|
| 30 | +- file = g_mount_get_root (G_MOUNT (obj));
|
|
| 31 | +- }
|
|
| 32 | +- else if (!isfs)
|
|
| 33 | ++ if (obj != NULL)
|
|
| 34 | + {
|
|
| 35 | +- file = g_object_ref (obj);
|
|
| 36 | +- }
|
|
| 37 | ++ if (flags & PLUMA_FILE_BOOKMARKS_STORE_IS_FS)
|
|
| 38 | ++ {
|
|
| 39 | ++ if (flags & PLUMA_FILE_BOOKMARKS_STORE_IS_MOUNT)
|
|
| 40 | ++ {
|
|
| 41 | ++ GFile * file;
|
|
| 42 | +
|
|
| 43 | +- g_object_unref (obj);
|
|
| 44 | ++ file = g_mount_get_root (G_MOUNT (obj));
|
|
| 45 | ++ ret = g_file_get_uri (file);
|
|
| 46 | ++ g_object_unref (file);
|
|
| 47 | ++ }
|
|
| 48 | ++ }
|
|
| 49 | ++ else
|
|
| 50 | ++ {
|
|
| 51 | ++ ret = g_file_get_uri (G_FILE (obj));
|
|
| 52 | ++ }
|
|
| 53 | +
|
|
| 54 | +- if (file)
|
|
| 55 | +- {
|
|
| 56 | +- ret = g_file_get_uri (file);
|
|
| 57 | +- g_object_unref (file);
|
|
| 58 | ++ g_object_unref (obj);
|
|
| 59 | + }
|
|
| 60 | +
|
|
| 61 | + return ret; |
| 1 | +0001-filebrowser-fix-warning-Wincompatible-pointer-types.patch
|
|
| 1 | 2 | 2001_fix-bin-sh-path-in-shebang.patch |