|
 |
67de2c |
--- evince-3.28.2/backend/comics/ev-archive.c
|
|
|
67de2c |
+++ evince-3.28.2/backend/comics/ev-archive.c
|
|
|
67de2c |
@@ -55,7 +55,7 @@ ev_archive_finalize (GObject *object)
|
|
|
67de2c |
case EV_ARCHIVE_TYPE_ZIP:
|
|
|
67de2c |
case EV_ARCHIVE_TYPE_7Z:
|
|
|
67de2c |
case EV_ARCHIVE_TYPE_TAR:
|
|
|
67de2c |
- g_clear_pointer (&archive->libar, archive_free);
|
|
|
67de2c |
+ g_clear_pointer (&archive->libar, archive_read_free);
|
|
|
67de2c |
break;
|
|
|
67de2c |
default:
|
|
|
67de2c |
break;
|
|
|
67de2c |
@@ -278,7 +278,7 @@ ev_archive_get_entry_is_encrypted (EvArc
|
|
|
67de2c |
case EV_ARCHIVE_TYPE_7Z:
|
|
|
67de2c |
case EV_ARCHIVE_TYPE_TAR:
|
|
|
67de2c |
g_return_val_if_fail (archive->libar_entry != NULL, -1);
|
|
|
67de2c |
- return archive_entry_is_encrypted (archive->libar_entry);
|
|
|
67de2c |
+ return FALSE;
|
|
|
67de2c |
}
|
|
|
67de2c |
|
|
|
67de2c |
return FALSE;
|
|
|
67de2c |
@@ -336,7 +343,7 @@ ev_archive_reset (EvArchive *archive)
|
|
|
67de2c |
case EV_ARCHIVE_TYPE_ZIP:
|
|
|
67de2c |
case EV_ARCHIVE_TYPE_7Z:
|
|
|
67de2c |
case EV_ARCHIVE_TYPE_TAR:
|
|
|
67de2c |
- g_clear_pointer (&archive->libar, archive_free);
|
|
|
67de2c |
+ g_clear_pointer (&archive->libar, archive_read_free);
|
|
|
67de2c |
libarchive_set_archive_type (archive, archive->type);
|
|
|
67de2c |
break;
|
|
|
67de2c |
default:
|
|
|
67de2c |
--- evince-3.28.2/configure.ac
|
|
|
67de2c |
+++ evince-3.28.2/configure.ac
|
|
|
67de2c |
@@ -698,7 +698,7 @@ AC_ARG_ENABLE(comics,
|
|
|
67de2c |
[enable_comics=yes])
|
|
|
67de2c |
|
|
|
67de2c |
if test "x$enable_comics" = "xyes"; then
|
|
|
67de2c |
- LIBARCHIVE_REQUIRED=3.2.0
|
|
|
67de2c |
+ LIBARCHIVE_REQUIRED=3.1.2
|
|
|
67de2c |
PKG_CHECK_MODULES(LIBARCHIVE, libarchive >= $LIBARCHIVE_REQUIRED,enable_comics=yes,enable_comics=no)
|
|
|
67de2c |
|
|
|
67de2c |
if test "x$enable_comics" = "xyes"; then
|