Merge pull request #80 from clara-avnet/fix-compilation-of-lxqt-archiver-on-dunfell

The rebase was not tested - right? Will send a follow up fix.

Thanks
This commit is contained in:
Andreas Müller
2020-08-17 19:12:35 +02:00
committed by GitHub
2 changed files with 27 additions and 1 deletions

View File

@@ -0,0 +1,25 @@
From bec07e42d3446d3a60e7e77586d854fefa093160 Mon Sep 17 00:00:00 2001
From: Clara Scherer <clara.scherer@avnet.eu>
Date: Thu, 13 Aug 2020 08:13:46 +0200
Subject: [PATCH] fix compilation error
---
src/core/fr-archive.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/fr-archive.c b/src/core/fr-archive.c
index 75f2309..da089bc 100644
--- a/src/core/fr-archive.c
+++ b/src/core/fr-archive.c
@@ -1244,7 +1244,7 @@ copy_remote_file (FrArchive *archive,
if (! g_file_query_exists (archive->file, archive->priv->cancellable)) {
GError *error;
- error = g_error_new (G_IO_ERROR, G_IO_ERROR_NOT_FOUND, _("Archive not found"));
+ error = g_error_new_literal (G_IO_ERROR, G_IO_ERROR_NOT_FOUND, _("Archive not found"));
fr_archive_copy_done (archive, FR_ACTION_LOADING_ARCHIVE, error);
g_error_free (error);
--
2.20.1

View File

@@ -11,7 +11,8 @@ DEPENDS += " \
qtx11extras \
json-glib \
libfm-qt \
"
SRC_URI += "file://0001-fix-compilation-error.patch"
SRCREV = "b6d1ac2cd834edefdb8a754d114da2a89b9323fa"
PV = "0.2.0"