From 471f7edf4ea2949e6563c71fb167e17043d5fc25 Mon Sep 17 00:00:00 2001 From: gryf Date: Sun, 30 May 2021 12:45:25 +0200 Subject: [PATCH] Added last portage snapshot of gqview --- media-gfx/gqview/Manifest | 9 +++ .../files/gqview-2.1.5-format-security.patch | 56 +++++++++++++++++ .../gqview/files/gqview-2.1.5-gcc-10.patch | 9 +++ .../gqview/files/gqview-2.1.5-glibc.patch | 39 ++++++++++++ .../gqview/files/gqview-2.1.5-helpdir.patch | 23 +++++++ .../gqview/files/gqview-2.1.5-readmedir.patch | 11 ++++ .../gqview/files/gqview-2.1.5-windows.patch | 16 +++++ media-gfx/gqview/gqview-2.1.5-r2.ebuild | 60 +++++++++++++++++++ 8 files changed, 223 insertions(+) create mode 100644 media-gfx/gqview/Manifest create mode 100644 media-gfx/gqview/files/gqview-2.1.5-format-security.patch create mode 100644 media-gfx/gqview/files/gqview-2.1.5-gcc-10.patch create mode 100644 media-gfx/gqview/files/gqview-2.1.5-glibc.patch create mode 100644 media-gfx/gqview/files/gqview-2.1.5-helpdir.patch create mode 100644 media-gfx/gqview/files/gqview-2.1.5-readmedir.patch create mode 100644 media-gfx/gqview/files/gqview-2.1.5-windows.patch create mode 100644 media-gfx/gqview/gqview-2.1.5-r2.ebuild diff --git a/media-gfx/gqview/Manifest b/media-gfx/gqview/Manifest new file mode 100644 index 0000000..ee36949 --- /dev/null +++ b/media-gfx/gqview/Manifest @@ -0,0 +1,9 @@ +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-r2.ebuild 1126 BLAKE2B 2ed44ec0096fe5c38b3b1106b4cd678c36e2465a67bf60b0902c8cbed95c09da2183194e319c4f87bb9dde1ea8b0919d174a41c17b6ffd01d501bec0ef3664f7 SHA512 bab3680014f333becf847f42645793f794a7561b7db6c3d03810e577d9b39f98e41e25e957d8ea27206efee12b9022a103cc798ab78afddc2716343aa5e956fb +MISC metadata.xml 327 BLAKE2B ea87b42c500a8abef98a4b3db6f2ee8e328e19d1567f1ef005d6eb13350738028b14e24a32e5f937a72535104145a9a7356d29522070a41258a0a336b96f5330 SHA512 11072de25c4a5e21242befac6ad979c98da602b717a75b3d956c8a575fa1976d06fc4623501873bafdb4a7c5481e02ef108720c9cf3576ac70cd2079729bb366 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 0000000..baf8899 --- /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 0000000..567237c --- /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-glibc.patch b/media-gfx/gqview/files/gqview-2.1.5-glibc.patch new file mode 100644 index 0000000..9570807 --- /dev/null +++ b/media-gfx/gqview/files/gqview-2.1.5-glibc.patch @@ -0,0 +1,39 @@ +diff --git a/Makefile.in b/Makefile.in +index 38f6b25..4d7ad2c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -123,6 +123,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + INSTOBJEXT = @INSTOBJEXT@ + INTLLIBS = @INTLLIBS@ + LCMS_LIBS = @LCMS_LIBS@ ++LIBM = @LIBM@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +diff --git a/configure.in b/configure.in +index 9335493..2299b4a 100644 +--- a/configure.in ++++ b/configure.in +@@ -52,6 +52,9 @@ fi + AC_SUBST(LCMS_LIBS) + AM_CONDITIONAL(HAVE_LCMS, test "$have_lcms" = "yes") + ++AC_CHECK_LIB(m, ceil, LIBM="-lm") ++AC_SUBST(LIBM) ++ + ALL_LINGUAS="ar be bg ca cs da de eo es et eu fi fr hu id it ja ko nl no pl pt_BR ro ru sk sl sv th tr uk vi zh_CN.GB2312 zh_TW" + GETTEXT_PACKAGE=$PACKAGE + AC_SUBST(GETTEXT_PACKAGE) +diff --git a/src/Makefile.am b/src/Makefile.am +index 7ce4702..5005877 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -166,7 +166,7 @@ gqview_SOURCES = \ + view_file_icon.c \ + view_file_icon.h + +-gqview_LDADD = $(GTK_LIBS) $(INTLLIBS) $(LCMS_LIBS) ++gqview_LDADD = $(GTK_LIBS) $(INTLLIBS) $(LCMS_LIBS) $(LIBM) + + EXTRA_DIST = \ + $(extra_SLIK) 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 0000000..e72ea05 --- /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 0000000..22d244b --- /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/files/gqview-2.1.5-windows.patch b/media-gfx/gqview/files/gqview-2.1.5-windows.patch new file mode 100644 index 0000000..207f3c0 --- /dev/null +++ b/media-gfx/gqview/files/gqview-2.1.5-windows.patch @@ -0,0 +1,16 @@ +--- old/src/main.c 2006-11-01 17:28:37.000000000 +0000 ++++ new/src/main.c 2008-06-21 23:31:06.000000000 +0000 +@@ -1054,11 +1054,8 @@ + if (layout_valid(&lw)) + { + main_window_maximized = window_maximized(lw->window); +- if (!main_window_maximized) +- { +- layout_geometry_get(NULL, &main_window_x, &main_window_y, +- &main_window_w, &main_window_h); +- } ++ layout_geometry_get(NULL, &main_window_x, &main_window_y, ++ &main_window_w, &main_window_h); + } + + layout_geometry_get_dividers(NULL, &window_hdivider_pos, &window_vdivider_pos); 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 0000000..8cbd809 --- /dev/null +++ b/media-gfx/gqview/gqview-2.1.5-r2.ebuild @@ -0,0 +1,60 @@ +# 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 --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 +}