gentoo resync : 21.01.2020

7 files changed, 171 insertions, 1 deletions

diff --git a/media-gfx/gqview/Manifest b/media-gfx/gqview/Manifest
index 126381136c53..f4c8d9a4c53f 100644
--- a/media-gfx/gqview/Manifest
+++ b/media-gfx/gqview/Manifest
@@ -1,5 +1,10 @@
+AUX gqview-2.1.5-format-security.patch 1923 BLAKE2B 7cfae186700d681c451c9ccb6394045fee83935795088e9669fe19aa85baf90e47d9c386f18a01e58e60047cb0c9dea9f431f879597042f0c6e7a804be581471 SHA512 8d9d06abe67fc5e98bbd0570315326b66474c99456594871308ba40a84e899a38f86fda812f965d46988d4b72f05ae4a2c27126532dd0bf9f96ede968593b200
+AUX gqview-2.1.5-gcc-10.patch 253 BLAKE2B a6db8c12035b02a4a27395f96831f18efb37ef99bb47d6a6929c3b085ea61da6daae0bfc59c7566ecacb02de0d6585d89781f30bda709cf3eb23f1dd2b87572c SHA512 e25067a5dc6fe9a7c602e96b980b8273d92be3c56547e464c43cf8f7b5d9b2eab54231475218ac051d443076a9c56e751cc995749c5b461714f93958354aaa73
 AUX gqview-2.1.5-glibc.patch 1113 BLAKE2B a608841786df165a99b13d8413ee7b5e718fa222a07062505344f14e4506fee068b54ca8a1063a23453fa4871c323d0bf0ecc8339600b096ebea9b3021fa1ea9 SHA512 c2605aa15c6515fab27e494cc05fd41196bd36ce696831d10b078680836546e8cd1252837712cecc10d6dc2635819babb37b85820b12cc9bf060796d3bc63c67
+AUX gqview-2.1.5-helpdir.patch 823 BLAKE2B 40750550ba6aff8fbdd9af56182ec6b0129bc6039fe1e9e889753015cf68cebe666595b0da362ad5ac028aba174ed986ab790387e0a16d0ec19d710fedac1eba SHA512 82c428fd9dc26539b32e494dbe9012d989d801819edbe67487ea91af1c1d915bf782087199119263d71bb2f921c498139c9804c2db2688f3570cea0d9b7300e2
+AUX gqview-2.1.5-readmedir.patch 257 BLAKE2B 9db86f9542121dd8f0a0c3004b945adae8ae41ef3fe4b421320f8c10a6d97949341f2779aa466972d91eddf7f39c3cb6834fdae3085e1afeda51ec5c50253576 SHA512 816e95ce5999e930aa7488b66575469669842e9ee48bfc979f02a64e7ed9439af30ffee4c4c6e37c97a6a47e28bdbee9761f996b1946f1d9d4330e756a691745
 AUX gqview-2.1.5-windows.patch 561 BLAKE2B 142f068e495c2dcd090649f93b8f3a55ca894c76d31deed0403f99b0830750e133ffb1e6ad651454c6ef01e95c35571b3f30f3502a2eef2d3e01174a20251441 SHA512 f4382d81362efca9decd18f93ffcabc5eeb36251b67377d35a6de87eb0672b24e15d82610b64865415fa23f6e26090c557b7f1df8092cf34b38f7106dd7a33c3
 DIST gqview-2.1.5.tar.gz 1685061 BLAKE2B f47c0e5937ea87223c2110b148c5a52b912d6c65476e5f2d67377e544bb42cae919796d1714992cda6f0e7e7409a7bd0dd6689ac37d2da41254118b699327b9c SHA512 a9e184f9bfbcb789fa732f490b5b1883aaa4c153fb924e2995f36ddef2d170ad9d0695689221d7a0ccae587f5de07b34ca03fa407f774ed3505d0183bf44b555
 EBUILD gqview-2.1.5-r1.ebuild 969 BLAKE2B 6a2e18f895633b97c3f437a6eda7a0229d6ffcd8853a518198071e6401e23bd181d4a3d3ebb2f319bce2d4bbd2be0ed325d91e0a0d4e52055d3c55657e25fc34 SHA512 a2ad1697208f0f963886e6551ab455cfa002ab2461bac416ea7e53134d0d50e31c5bf7c4b4ef72655c485773b42842d11fc657897f1c8ebf07909cee23a4d1d0
-MISC metadata.xml 335 BLAKE2B e3189669599190c19dd3c3c2a4d78738929a45ce0cc8cf6bd5416929fd912ec213504c4518b77a5b677f0250ea1a345ad4a99f218c871deb910ae442299e7186 SHA512 215bd29dfc21273c0baaa99c68d373ed8166b40dcc02a19c283935061564036b7f23dba2ea2036556e3fa93689caf679bd535d4bc84517f0b804a55371c010b7
+EBUILD gqview-2.1.5-r2.ebuild 1180 BLAKE2B db15f09b99c6e6c2e4ec13b0b177f97377033d99b2540a9e5b663c5658b8b6cb3a4299bc08efbe406e5fac5424c7887d9f7eef984b47878a7a023393b223dbfb SHA512 66e738c61485b8048e53b26da3a13bef78656e216166f4f0e040f073a0361ac9a1885bd333f64d9102f52eb55ea8a9a6ef20e226571b0fdb7197f3219e42351c
+MISC metadata.xml 447 BLAKE2B 632ee924036fc4dde09ca3a05043ccd38e4fbc9583ee9498c1fdf87f6d91ac944b1c600f9da68d33a498c137d4133c2a53f8d03677c50f228ef30e5c108a42d3 SHA512 f6a5af4d1e5effb6e9cf58edb237be34d69bd9927ae8f2f9fefe88303bd2936e6f58f09367977bf9c9c814d299465e0acf949c045df9177bcae15598fbd6534f
diff --git a/media-gfx/gqview/files/gqview-2.1.5-format-security.patch b/media-gfx/gqview/files/gqview-2.1.5-format-security.patch
new file mode 100644
index 000000000000..baf88993a1f3
--- /dev/null
+++ b/media-gfx/gqview/files/gqview-2.1.5-format-security.patch
@@ -0,0 +1,56 @@
+Don't pass external input as format string. Detected by -Werror=format-security.
+
+https://bugs.gentoo.org/530630
+--- a/src/print.c
++++ b/src/print.c
+@@ -1220,7 +1220,7 @@ static void print_job_ps_page_image_pixel(FILE *f, guchar *pix)
+ 		}
+ 	text[6] = '\0';
+ 
+-	fprintf(f, text);
++	fprintf(f, "%s", text);
+ }                                                                                                                         
+ static gint print_job_ps_page_image(PrintWindow *pw, GdkPixbuf *pixbuf,
+ 				    gdouble x, gdouble y, gdouble w, gdouble h,
+@@ -1345,7 +1345,7 @@ static const gchar *ps_text_to_hex_array(FILE *f, const gchar *text, gdouble x,
+ 		text[1] = hex_digits[*p & 0xf];
+ 		text[2] = '\0';
+ 
+-		fprintf(f, text);
++		fprintf(f, "%s", text);
+ 
+ 		p++;
+ 		}
+--- a/src/ui_fileops.c
++++ b/src/ui_fileops.c
+@@ -44,7 +44,7 @@ void print_term(const gchar *text_utf8)
+ 	gchar *text_l;
+ 
+ 	text_l = g_locale_from_utf8(text_utf8, -1, NULL, NULL, NULL);
+-	printf((text_l) ? text_l : text_utf8);
++	printf("%s", (text_l) ? text_l : text_utf8);
+ 	g_free(text_l);
+ }
+ 
+--- a/src/view_file_icon.c
++++ b/src/view_file_icon.c
+@@ -614,7 +614,7 @@ static void vficon_dnd_get(GtkWidget *widget, GdkDragContext *context,
+ 	uri_text = uri_text_from_list(list, &total, (info == TARGET_TEXT_PLAIN));
+ 	path_list_free(list);
+ 
+-	if (debug) printf(uri_text);
++	if (debug) printf("%s", uri_text);
+ 
+ 	gtk_selection_data_set(selection_data, selection_data->target,
+ 			       8, (guchar *)uri_text, total);
+--- a/src/view_file_list.c
++++ b/src/view_file_list.c
+@@ -136,7 +136,7 @@ static void vflist_dnd_get(GtkWidget *widget, GdkDragContext *context,
+ 	uri_text = uri_text_from_list(list, &total, (info == TARGET_TEXT_PLAIN));
+ 	path_list_free(list);
+ 
+-	if (debug) printf(uri_text);
++	if (debug) printf("%s", uri_text);
+ 
+ 	gtk_selection_data_set(selection_data, selection_data->target,
+ 			       8, (guchar *)uri_text, total);
diff --git a/media-gfx/gqview/files/gqview-2.1.5-gcc-10.patch b/media-gfx/gqview/files/gqview-2.1.5-gcc-10.patch
new file mode 100644
index 000000000000..567237ce7b38
--- /dev/null
+++ b/media-gfx/gqview/files/gqview-2.1.5-gcc-10.patch
@@ -0,0 +1,9 @@
+--- a/src/bar_exif.h
++++ b/src/bar_exif.h
+@@ -26,4 +26,4 @@ gint bar_exif_is_advanced(GtkWidget *bar);
+ 
+-const gchar **bar_exif_key_list;
+-const gint bar_exif_key_count;
++extern const gchar **bar_exif_key_list;
++extern const gint bar_exif_key_count;
+ 
diff --git a/media-gfx/gqview/files/gqview-2.1.5-helpdir.patch b/media-gfx/gqview/files/gqview-2.1.5-helpdir.patch
new file mode 100644
index 000000000000..e72ea05a213b
--- /dev/null
+++ b/media-gfx/gqview/files/gqview-2.1.5-helpdir.patch
@@ -0,0 +1,23 @@
+--- a/configure.in
++++ b/configure.in
+@@ -19,8 +19,8 @@ fi
+ 
+ AM_PATH_GTK_2_0(2.4.0,,AC_MSG_ERROR(GTK+ >= 2.4.0 not installed.))
+ 
+-AC_DEFINE_UNQUOTED(GQVIEW_HELPDIR, "$prefix/share/doc/gqview-$VERSION", [Location of documentation files])
+-AC_DEFINE_UNQUOTED(GQVIEW_HTMLDIR, "$prefix/share/doc/gqview-$VERSION/html", [Location of html documentation])
++AC_DEFINE_UNQUOTED(GQVIEW_HELPDIR, "$docdir", [Location of documentation files])
++AC_DEFINE_UNQUOTED(GQVIEW_HTMLDIR, "$docdir/html", [Location of html documentation])
+ 
+ dnl checks for functions
+ AC_CHECK_FUNCS(strverscmp)
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in.
+ 
+-helpdir = $(datadir)/doc/gqview-$(VERSION)/html
++helpdir = $(docdir)/html
+ help_DATA = \
+ 	gnu_fdl.txt	\
+ 	gqview_faq.html	\
diff --git a/media-gfx/gqview/files/gqview-2.1.5-readmedir.patch b/media-gfx/gqview/files/gqview-2.1.5-readmedir.patch
new file mode 100644
index 000000000000..22d244b8c91f
--- /dev/null
+++ b/media-gfx/gqview/files/gqview-2.1.5-readmedir.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,7 +5,7 @@ DIST_SUBDIRS = src po doc
+ 
+ man_MANS = gqview.1
+ 
+-readmedir = $(datadir)/doc/gqview-$(VERSION)
++readmedir = $(docdir)
+ readme_DATA = README COPYING ChangeLog TODO
+ 
+ desktopdir = $(datadir)/applications
diff --git a/media-gfx/gqview/gqview-2.1.5-r2.ebuild b/media-gfx/gqview/gqview-2.1.5-r2.ebuild
new file mode 100644
index 000000000000..f64729a5a87a
--- /dev/null
+++ b/media-gfx/gqview/gqview-2.1.5-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools xdg-utils
+
+DESCRIPTION="A GTK-based image browser"
+HOMEPAGE="http://gqview.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gqview/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.4:2
+	virtual/libintl"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-windows.patch
+	"${FILESDIR}"/${P}-glibc.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
+	"${FILESDIR}"/${P}-helpdir.patch
+	"${FILESDIR}"/${P}-readmedir.patch
+	"${FILESDIR}"/${P}-format-security.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^Encoding/d' \
+		-e '/^Icon/s/\.png//' \
+		-e '/^Categories/s/Application;//' \
+		gqview.desktop || die
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--without-lcms
+}
+
+src_install() {
+	default
+	# bug #30111
+	docompress -x /usr/share/doc/${PF}/README
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/gqview/metadata.xml b/media-gfx/gqview/metadata.xml
index 7a971df73744..c5c6c04060e1 100644
--- a/media-gfx/gqview/metadata.xml
+++ b/media-gfx/gqview/metadata.xml
@@ -5,6 +5,10 @@
 		<email>graphics@gentoo.org</email>
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gqview</remote-id>
 	</upstream>