Attachment 215375 Details for Bug 247096 – v1

[patch] v1

bug247096.diff (text/plain), 3.60 KB, created by Jan Beich on 2020-06-08 21:25:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2020-06-08 21:25:45 UTC

Size: 3.60 KB

patch

obsolete

>From 69e242203f97c8fc996f6b61095707e57fefbebf 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:	?
>---
> graphics/gtk-update-icon-cache/Makefile | 52 +++++++++----------------
> graphics/gtk-update-icon-cache/distinfo |  6 +--
> 2 files changed, 21 insertions(+), 37 deletions(-)
>
>diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile
>index 84fb0fad272b..7dd3979fb684 100644
>--- a/graphics/gtk-update-icon-cache/Makefile
>+++ b/graphics/gtk-update-icon-cache/Makefile
>@@ -2,11 +2,11 @@
> # $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 +14,26 @@ 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
>-
>-PORTSCOUT=	ignore:1
>-
>-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
>+PORTSCOUT=	limit:1,even
>+
>+USES=		gettext-runtime gnome pkgconfig tar:xz
>+USE_GNOME=	gdkpixbuf2
>+PATCHDIR=	${.CURDIR}/../../x11-toolkits/gtk30/files
> BUILD_WRKSRC=	${WRKSRC}/gtk
>-ALL_TARGET=	${PORTNAME}
>-PLIST_FILES=	bin/gtk-update-icon-cache
>-#		man/man1/gtk-update-icon-cache.1.gz
>+CFLAGS+=	-DHAVE_UNISTD_H -DHAVE_FTW_H -DENABLE_NLS -DHAVE_BIND_TEXTDOMAIN_CODESET
>+CFLAGS+=	-DGETTEXT_PACKAGE='\"gtk30\"' -DGTK_LOCALEDIR='\"${PREFIX}/share/locale\"'
>+CFLAGS+=	`pkg-config --cflags --libs gdk-pixbuf-2.0`
>+MAKEFILE=	/dev/null
>+ALL_TARGET=	updateiconcache
>+PLIST_FILES=	bin/${PORTNAME}
> 
> 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
>+	@${REINPLACE_CMD} '/config\.h/d' \
>+		${WRKSRC}/gtk/gtkiconcachevalidator.c \
>+		${WRKSRC}/gtk/updateiconcache.c 
> 
> 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/
>+	${INSTALL_PROGRAM} ${WRKSRC}/gtk/updateiconcache \
>+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
> 
> .include <bsd.port.mk>
>diff --git a/graphics/gtk-update-icon-cache/distinfo b/graphics/gtk-update-icon-cache/distinfo
>index 3836f9023903..25d63a7cac27 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/gtk+-3.24.20.tar.xz) = 2dac69f716e8d04ba7a95091589e2baaec95dcace932cb15839163db479b1df3
>+SIZE (gnome/gtk+-3.24.20.tar.xz) = 22726768

Actions: View | Diff

Attachments on bug 247096: 215375 | 215380