From c603edbde8d7a1895b6f9ef37b6e504ecc5fd72e Mon Sep 17 00:00:00 2001
From: Phillip Berndt <phillip.berndt@googlemail.com>
Date: Sat, 25 Feb 2017 20:00:15 +0100
Subject: [PATCH] Bump pqiv version to 2.8

---
 GNUmakefile     | 8 ++++++--
 README.markdown | 2 +-
 pqiv.1          | 4 ++--
 pqiv.c          | 6 +++---
 pqiv.h          | 2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index d24287e..f5cacba 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -71,15 +71,19 @@ endif
 ifeq ($(GTK_VERSION), 0)
 	ifeq ($(shell $(PKG_CONFIG) --errors-to-stdout --print-errors "$(LIBS_GTK3)"), )
 		LIBS=$(LIBS_GTK3)
+		GDK_LIB=gdk-3.0
 	else
 		LIBS=$(LIBS_GTK2)
+		GDK_LIB=gdk-2.0
 	endif
 endif
 ifeq ($(GTK_VERSION), 2)
 	LIBS=$(LIBS_GTK2)
+	GDK_LIB=gdk-2.0
 endif
 ifeq ($(GTK_VERSION), 3)
 	LIBS=$(LIBS_GTK3)
+	GDK_LIB=gdk-3.0
 endif
 LIBS+=$(LIBS_GENERAL)
 
@@ -92,7 +96,7 @@ else
 endif
 
 # We need X11 to workaround a bug, see http://stackoverflow.com/questions/18647475
-ifeq ($(filter x11, $(shell pkg-config --print-requires-private gdk-2.0)), x11)
+ifeq ($(filter x11, $(shell pkg-config --errors-to-stdout --print-requires-private $(GDK_LIB))), x11)
 	LIBS+=x11
 endif
 
@@ -203,7 +207,7 @@ pqiv.desktop: $(HEADERS)
 		echo "[Desktop Entry]"; \
 		echo "Version=1.0"; \
 		echo "Type=Application"; \
-		echo "Comment=Simple image viewer"; \
+		echo "Comment=Powerful quick image viewer"; \
 		echo "Name=pqiv"; \
 		echo "NoDisplay=true"; \
 		echo "Icon=emblem-photos"; \
diff --git a/README.markdown b/README.markdown
index 19fc4fc..537c436 100644
--- a/README.markdown
+++ b/README.markdown
@@ -128,7 +128,7 @@ Known bugs
 Changelog
 ---------
 
-pqiv 2.8 (WIP)
+pqiv 2.8
  * Added option --allow-empty-window: Show pqiv even if no images can be loaded
  * Explicitly allow to load all files from a directory multiple times
  * Allow to use --libdir option in configure to override .so-files location
diff --git a/pqiv.1 b/pqiv.1
index 60c501d..d531f0c 100644
--- a/pqiv.1
+++ b/pqiv.1
@@ -1,7 +1,7 @@
 .\" vim:filetype=groff
-.TH pqiv 1 "January 2017" "2.7"
+.TH pqiv 1 "February 2017" "2.8"
 .SH NAME
-pqiv \- quick image viewer
+pqiv \- powerful quick image viewer
 .\"
 .SH SYNOPSIS
 \fBpqiv\fR [options] [filename(s)...]
diff --git a/pqiv.c b/pqiv.c
index e4a2674..98acc6f 100644
--- a/pqiv.c
+++ b/pqiv.c
@@ -977,7 +977,7 @@ void parse_configuration_file() {/*{{{*/
 }/*}}}*/
 void parse_command_line() {/*{{{*/
 	GOptionContext *parser = g_option_context_new("FILES");
-	g_option_context_set_summary(parser, "A minimalist image viewer\npqiv version " PQIV_VERSION PQIV_VERSION_DEBUG " by Phillip Berndt");
+	g_option_context_set_summary(parser, "Powerful quick image viewer\npqiv version " PQIV_VERSION PQIV_VERSION_DEBUG " by Phillip Berndt");
 	g_option_context_set_help_enabled(parser, TRUE);
 	g_option_context_set_ignore_unknown_options(parser, FALSE);
 	g_option_context_add_main_entries(parser, options, NULL);
@@ -1888,8 +1888,8 @@ GInputStream *image_loader_stream_file(file_t *file, GError **error_pointer) {/*
 			data = g_memory_input_stream_new_from_bytes(bytes_source);
 		#else
 			gsize size = 0;
-			gpointer *data = g_memdup(g_bytes_get_data(bytes_source, &size), size);
-			data = g_memory_input_stream_new_from_data(data, size, g_free);
+			gpointer *mem_data = g_memdup(g_bytes_get_data(bytes_source, &size), size);
+			data = g_memory_input_stream_new_from_data(mem_data, size, g_free);
 		#endif
 
 		g_bytes_unref(bytes_source);
diff --git a/pqiv.h b/pqiv.h
index 8caf9d7..35babde 100644
--- a/pqiv.h
+++ b/pqiv.h
@@ -29,7 +29,7 @@
 #include "lib/bostree.h"
 
 #ifndef PQIV_VERSION
-#define PQIV_VERSION "2.7.4"
+#define PQIV_VERSION "2.8"
 #endif
 
 #define FILE_FLAGS_ANIMATION      (guint)(1)