evince: update to 3.24.1.
This commit is contained in:
parent
e88510d0f2
commit
fb02e2ebdc
|
@ -1,79 +0,0 @@
|
|||
diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
|
||||
index 96ed26e..3af119a 100644
|
||||
--- backend/comics/comics-document.c
|
||||
+++ backend/comics/comics-document.c
|
||||
@@ -56,8 +56,7 @@ typedef enum
|
||||
RARLABS,
|
||||
GNAUNRAR,
|
||||
UNZIP,
|
||||
- P7ZIP,
|
||||
- TAR
|
||||
+ P7ZIP
|
||||
} ComicBookDecompressType;
|
||||
|
||||
typedef struct _ComicsDocumentClass ComicsDocumentClass;
|
||||
@@ -117,9 +116,6 @@ static const ComicBookDecompressCommand command_usage_def[] = {
|
||||
|
||||
/* 7zip */
|
||||
{NULL , "%s l -- %s" , "%s x -y %s -o%s", FALSE, OFFSET_7Z},
|
||||
-
|
||||
- /* tar */
|
||||
- {"%s -xOf" , "%s -tf %s" , NULL , FALSE, NO_OFFSET}
|
||||
};
|
||||
|
||||
static GSList* get_supported_image_extensions (void);
|
||||
@@ -364,13 +360,6 @@ comics_check_decompress_command (gchar *mime_type,
|
||||
comics_document->command_usage = GNAUNRAR;
|
||||
return TRUE;
|
||||
}
|
||||
- comics_document->selected_command =
|
||||
- g_find_program_in_path ("bsdtar");
|
||||
- if (comics_document->selected_command) {
|
||||
- comics_document->command_usage = TAR;
|
||||
- return TRUE;
|
||||
- }
|
||||
-
|
||||
} else if (g_content_type_is_a (mime_type, "application/x-cbz") ||
|
||||
g_content_type_is_a (mime_type, "application/zip")) {
|
||||
/* InfoZIP's unzip program */
|
||||
@@ -396,12 +385,6 @@ comics_check_decompress_command (gchar *mime_type,
|
||||
comics_document->command_usage = P7ZIP;
|
||||
return TRUE;
|
||||
}
|
||||
- comics_document->selected_command =
|
||||
- g_find_program_in_path ("bsdtar");
|
||||
- if (comics_document->selected_command) {
|
||||
- comics_document->command_usage = TAR;
|
||||
- return TRUE;
|
||||
- }
|
||||
|
||||
} else if (g_content_type_is_a (mime_type, "application/x-cb7") ||
|
||||
g_content_type_is_a (mime_type, "application/x-7z-compressed")) {
|
||||
@@ -425,27 +408,6 @@ comics_check_decompress_command (gchar *mime_type,
|
||||
comics_document->command_usage = P7ZIP;
|
||||
return TRUE;
|
||||
}
|
||||
- comics_document->selected_command =
|
||||
- g_find_program_in_path ("bsdtar");
|
||||
- if (comics_document->selected_command) {
|
||||
- comics_document->command_usage = TAR;
|
||||
- return TRUE;
|
||||
- }
|
||||
- } else if (g_content_type_is_a (mime_type, "application/x-cbt") ||
|
||||
- g_content_type_is_a (mime_type, "application/x-tar")) {
|
||||
- /* tar utility (Tape ARchive) */
|
||||
- comics_document->selected_command =
|
||||
- g_find_program_in_path ("tar");
|
||||
- if (comics_document->selected_command) {
|
||||
- comics_document->command_usage = TAR;
|
||||
- return TRUE;
|
||||
- }
|
||||
- comics_document->selected_command =
|
||||
- g_find_program_in_path ("bsdtar");
|
||||
- if (comics_document->selected_command) {
|
||||
- comics_document->command_usage = TAR;
|
||||
- return TRUE;
|
||||
- }
|
||||
} else {
|
||||
g_set_error (error,
|
||||
EV_DOCUMENT_ERROR,
|
|
@ -1,13 +1,13 @@
|
|||
# Template file for 'evince'
|
||||
pkgname=evince
|
||||
version=3.24.0
|
||||
revision=2
|
||||
version=3.24.1
|
||||
revision=1
|
||||
short_desc="GNOME Document viewer for multiple document formats"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="http://projects.gnome.org/evince/"
|
||||
license="GPL-2"
|
||||
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
|
||||
checksum=043895af7bbd6f1b57f9ab8778e78cf9c0af5dfcc347eaa94a17bf864c04dc8f
|
||||
checksum=9ca0c5213407b37be55fddb04a85d9301b692c4412c5920319d975403bff0f37
|
||||
|
||||
build_style=gnu-configure
|
||||
build_options="gir"
|
||||
|
@ -32,15 +32,6 @@ makedepends="tiff-devel libarchive-devel nautilus-devel
|
|||
adwaita-icon-theme"
|
||||
depends="desktop-file-utils hicolor-icon-theme"
|
||||
|
||||
pre_configure() {
|
||||
# Fix for CVE-2017-1000083.
|
||||
# Don't touch configure.ac because autoreconf will fail
|
||||
# for cross builds due to missing gobject introspection
|
||||
sed -i configure \
|
||||
-e '/COMICS_MIME_TYPES/ s|;application/x-cbt||' \
|
||||
-e '/COMICS_MIME_TYPES/ s|;application/x-ext-cbt||'
|
||||
}
|
||||
|
||||
libevince_package() {
|
||||
short_desc+=" - runtime libraries"
|
||||
pkg_install() {
|
||||
|
|
Loading…
Reference in New Issue