Update to pqiv-2.10.1

This commit is contained in:
danj 2017-12-12 00:46:28 +00:00
parent 647483a899
commit b8360d5f6b
3 changed files with 4 additions and 32 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.14 2017/11/17 00:22:39 naddy Exp $
# $OpenBSD: Makefile,v 1.15 2017/12/12 00:46:28 danj Exp $
COMMENT= command line image viewer
GH_ACCOUNT= phillipberndt
GH_PROJECT= pqiv
GH_TAGNAME= 2.9
REVISION= 0
GH_TAGNAME= 2.10.1
CATEGORIES= graphics

View File

@ -1,2 +1,2 @@
SHA256 (pqiv-2.9.tar.gz) = 5XKYrnEjvWsBt1H27y16eFPnMaMnG1AJVoNEKkBtqZw=
SIZE (pqiv-2.9.tar.gz) = 133823
SHA256 (pqiv-2.10.1.tar.gz) = jyT/BywXIBcD9o8TnTHYLiOQAblhK+StCcMeSVNyRo0=
SIZE (pqiv-2.10.1.tar.gz) = 138129

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-lib_thumbnailcache_c,v 1.2 2017/08/12 13:30:16 danj Exp $
Our time_t is 64 bits
Merged upstream
https://github.com/phillipberndt/pqiv/commit/7e69a4bff314684db61a507bdb1e8877c58c0928
Index: lib/thumbnailcache.c
--- lib/thumbnailcache.c.orig
+++ lib/thumbnailcache.c
@@ -204,7 +204,7 @@ gboolean check_png_attributes(gchar *file_name, gchar
file_uri_match = strncmp(&data[sizeof("Thumb::URI")], file_uri, strlen(file_uri)) == 0;
}
else if(strcmp(data, "Thumb::MTime") == 0) {
- gchar *file_mtime_str = g_strdup_printf("%lu", file_mtime);
+ gchar *file_mtime_str = g_strdup_printf("%ju", (intmax_t)file_mtime);
file_mtime_match = strncmp(&data[sizeof("Thumb::MTime")], file_mtime_str, strlen(file_mtime_str)) == 0;
g_free(file_mtime_str);
}
@@ -555,7 +555,7 @@ gboolean store_thumbnail_to_cache(file_t *file, unsign
gboolean retval = TRUE;
int file_fd = g_open(thumbnail_file, O_CREAT | O_WRONLY, 0600);
if(file_fd >= 0) {
- gchar *string_mtime = g_strdup_printf("%lu", file_mtime);
+ gchar *string_mtime = g_strdup_printf("%ju", (intmax_t)file_mtime);
struct png_writer_info writer_info = { file_fd, 0, file_uri, string_mtime };
if(cairo_surface_write_to_png_stream(file->thumbnail, (cairo_write_func_t)png_writer, &writer_info) != CAIRO_STATUS_SUCCESS) {
g_unlink(thumbnail_file);