Attachment 215380 Details for Bug 247096 – v2

[patch] v2

bug247096.diff (text/plain), 11.12 KB, created by Jan Beich on 2020-06-08 22:19:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2020-06-08 22:19:15 UTC

Size: 11.12 KB

patch

obsolete

>From e281c84b4f88e98cb71cb149ebbe718ee866c790 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Mon, 8 Jun 2020 21:02:28 +0000
>Subject: [PATCH] graphics/gtk-update-icon-cache: update to 3.24.20
>
>PR:		247096
>Approved by:	?
>Exp-run by:	antoine
>---
> graphics/gtk-update-icon-cache/Makefile       |  53 +++-----
> graphics/gtk-update-icon-cache/distinfo       |   6 +-
> .../files/patch-gtk_updateiconcache.c         |  19 +++
> graphics/gtk-update-icon-cache/pkg-plist      | 118 ++++++++++++++++++
> 4 files changed, 154 insertions(+), 42 deletions(-)
> create mode 100644 graphics/gtk-update-icon-cache/files/patch-gtk_updateiconcache.c
> create mode 100644 graphics/gtk-update-icon-cache/pkg-plist
>
>diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile
>index 84fb0fad272b..053e90008df8 100644
>--- a/graphics/gtk-update-icon-cache/Makefile
>+++ b/graphics/gtk-update-icon-cache/Makefile
>@@ -2,11 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	gtk-update-icon-cache
>-PORTVERSION=	2.24.32
>+PORTVERSION=	3.24.20
> CATEGORIES=	graphics
>-MASTER_SITES=	GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
>-DISTNAME=	gtk+-${PORTVERSION}
>-DIST_SUBDIR=	gnome2
>+DIST_SUBDIR=	gnome
> 
> MAINTAINER=	gnome@FreeBSD.org
> COMMENT=	Gtk-update-icon-cache utility from the Gtk+ toolkit
>@@ -14,42 +12,19 @@ COMMENT=	Gtk-update-icon-cache utility from the Gtk+ toolkit
> LICENSE=	LGPL20
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-RUN_DEPENDS+=	update-mime-database:misc/shared-mime-info \
>-		${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
>+USES=		gettext gnome meson pkgconfig
>+USE_GNOME=	gdkpixbuf2
>+USE_GITLAB=	yes
>+GL_SITE=	https://gitlab.gnome.org
>+GL_ACCOUNT=	Community/gentoo
>+GL_COMMIT=	667cc0e1cdfd63a49703fe37228b0550e9f91f73
> 
>-PORTSCOUT=	ignore:1
>+OPTIONS_DEFINE=	MANPAGES
>+OPTIONS_DEFAULT=MANPAGES
>+OPTIONS_SUB=	yes
> 
>-USES=		gettext gmake gnome libtool localbase:ldflags pathfix perl5 \
>-		pkgconfig tar:xz xorg
>-USE_PERL5=	build
>-MAKE_JOBS_UNSAFE=	yes
>-USE_LDCONFIG=	yes
>-GNU_CONFIGURE=	yes
>-USE_GNOME=	atk pango gdkpixbuf2 introspection:build
>-USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
>-		xcomposite
>-PATCHDIR=	${.CURDIR}/../../x11-toolkits/gtk20/files
>-CONFIGURE_ARGS=	--enable-static --with-xinput=yes
>-BUILD_WRKSRC=	${WRKSRC}/gtk
>-ALL_TARGET=	${PORTNAME}
>-PLIST_FILES=	bin/gtk-update-icon-cache
>-#		man/man1/gtk-update-icon-cache.1.gz
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|-DGDK_PIXBUF_DISABLE_DEPRECATED||g' \
>-		${WRKSRC}/configure
>-
>-pre-configure:
>-# .if !exists() evaluates too early before cairo has a chance to be installed
>-	@if ! pkg-config --exists cairo-xlib; then \
>-		${ECHO_MSG} "${PKGNAME}: Needs cairo with X11 support enabled."; \
>-		${FALSE}; \
>-	fi
>-
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/gtk/gtk-update-icon-cache \
>-		${STAGEDIR}${PREFIX}/bin/
>-#	${INSTALL_MAN} ${WRKSRC}/docs/reference/gtk/gtk-update-icon-cache.1 \
>-#		${STAGEDIR}${PREFIX}/man/man1/
>+MANPAGES_BUILD_DEPENDS=	docbook-xsl>0:textproc/docbook-xsl \
>+			xsltproc:textproc/libxslt
>+MANPAGES_MESON_TRUE=	man-pages
> 
> .include <bsd.port.mk>
>diff --git a/graphics/gtk-update-icon-cache/distinfo b/graphics/gtk-update-icon-cache/distinfo
>index 3836f9023903..7269d39a8225 100644
>--- a/graphics/gtk-update-icon-cache/distinfo
>+++ b/graphics/gtk-update-icon-cache/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1522240464
>-SHA256 (gnome2/gtk+-2.24.32.tar.xz) = b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
>-SIZE (gnome2/gtk+-2.24.32.tar.xz) = 12620860
>+TIMESTAMP = 1580730312
>+SHA256 (gnome/Community/gentoo-gtk-update-icon-cache-667cc0e1cdfd63a49703fe37228b0550e9f91f73_GL0.tar.gz) = 405b7d5147c3fedddf53ef411d69c4575550abfdcae1bfffaa89f17cddb33732
>+SIZE (gnome/Community/gentoo-gtk-update-icon-cache-667cc0e1cdfd63a49703fe37228b0550e9f91f73_GL0.tar.gz) = 113939
>diff --git a/graphics/gtk-update-icon-cache/files/patch-gtk_updateiconcache.c b/graphics/gtk-update-icon-cache/files/patch-gtk_updateiconcache.c
>new file mode 100644
>index 000000000000..4b3764b950c5
>--- /dev/null
>+++ b/graphics/gtk-update-icon-cache/files/patch-gtk_updateiconcache.c
>@@ -0,0 +1,19 @@
>+------------------------------------------------------------------------
>+r207332 | marcus | 2008-02-16 16:36:43 +0000 (Sat, 16 Feb 2008) | 5 lines
>+
>+Restore the behavior of unlinking invalid icon cache files to prevent
>+leftovers.
>+
>+reported by:	pointyhat via pav
>+
>+--- gtk/updateiconcache.c.orig	2020-04-29 20:52:16 UTC
>++++ gtk/updateiconcache.c
>+@@ -1548,7 +1548,7 @@ opentmp:
>+   if (!validate_file (tmp_cache_path))
>+     {
>+       g_printerr (_("The generated cache was invalid.\n"));
>+-      /*g_unlink (tmp_cache_path);*/
>++      g_unlink (tmp_cache_path);
>+       exit (1);
>+     }
>+ 
>diff --git a/graphics/gtk-update-icon-cache/pkg-plist b/graphics/gtk-update-icon-cache/pkg-plist
>new file mode 100644
>index 000000000000..85b1fc19a3c2
>--- /dev/null
>+++ b/graphics/gtk-update-icon-cache/pkg-plist
>@@ -0,0 +1,118 @@
>+bin/gtk-update-icon-cache
>+%%MANPAGES%%man/man1/gtk-update-icon-cache.1.gz
>+share/locale/af/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/am/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/an/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ang/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ar/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/as/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ast/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/az/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/az_IR/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/be/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/be@latin/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/bg/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/bn/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/bn_IN/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/br/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/bs/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ca/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ca@valencia/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ckb/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/crh/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/cs/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/cy/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/da/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/de/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/dz/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/el/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/en/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/en@shaw/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/en_CA/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/en_GB/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/eo/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/es/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/et/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/eu/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/fa/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/fi/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/fr/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/fur/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ga/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/gd/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/gl/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/gu/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/he/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/hi/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/hr/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/hu/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/hy/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ia/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/id/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/io/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/is/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/it/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ja/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ka/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/kg/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/kk/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/km/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/kn/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ko/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ku/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ky/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/lg/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/li/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/lt/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/lv/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/mai/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/mi/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/mk/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ml/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/mn/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/mr/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ms/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/my/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/nb/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/nds/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ne/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/nl/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/nn/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/nso/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/oc/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/or/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/pa/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/pl/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ps/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/pt/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/pt_BR/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ro/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ru/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/rw/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/si/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/sk/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/sl/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/sq/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/sr/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/sr@ije/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/sr@latin/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/sv/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ta/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/te/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/tg/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/th/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/tk/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/tr/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/tt/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ug/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/uk/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/ur/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/uz/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/uz@cyrillic/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/vi/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/wa/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/xh/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/yi/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/zh_CN/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/zh_HK/LC_MESSAGES/gtk-update-icon-cache.mo
>+share/locale/zh_TW/LC_MESSAGES/gtk-update-icon-cache.mo

Actions: View | Diff

Attachments on bug 247096: 215375 | 215380