Attachment 250280 Details for Bug 278621 – graphics-giflib-Install-original-giflib-logo.gif.patch

[patch] graphics-giflib-Install-original-giflib-logo.gif.patch

0001-graphics-giflib-Install-original-giflib-logo.gif.patch (text/plain), 5.97 KB, created by Tijl Coosemans on 2024-04-28 11:52:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2024-04-28 11:52:39 UTC

Size: 5.97 KB

patch

obsolete

>From 06663a6e056a7cb5f6a0e7bf6f920646b251c700 Mon Sep 17 00:00:00 2001
>From: Tijl Coosemans <tijl@FreeBSD.org>
>Date: Sun, 28 Apr 2024 10:43:21 +0200
>Subject: [PATCH] graphics/giflib: Install original giflib-logo.gif
>
>Upstream uses ImageMagick to resize an image.  To avoid this dependency
>ports 5007109903fc added the resized image to the ports tree.  Remove
>this again and install the original image.  Resize it using HTML.
>
>Replace patch-Makefile with upstream commit 61f375.
>---
> graphics/giflib/Makefile                   |  11 +++--
> graphics/giflib/files/giflib-logo.gif      | Bin 1253 -> 0 bytes
> graphics/giflib/files/patch-Makefile       |  45 +++++++++++----------
> graphics/giflib/files/patch-tests_makefile |   2 +-
> 4 files changed, 33 insertions(+), 25 deletions(-)
> delete mode 100644 graphics/giflib/files/giflib-logo.gif
>
>diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
>index 0e46ed90404c..a8cc555725b5 100644
>--- a/graphics/giflib/Makefile
>+++ b/graphics/giflib/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	giflib
> PORTVERSION=	5.2.2
>+PORTREVISION=	1
> CATEGORIES=	graphics
> MASTER_SITES=	SF/${PORTNAME}
> 
>@@ -28,15 +29,19 @@ CONFLICTS_INSTALL=	giftool
> 
> OPTIONS_DEFINE=	DOCS
> 
>+post-patch:
>+# Missing giflib-logo.gif fixed upstream in commit d54b45.
>+	@${CP} ${WRKSRC}/pic/gifgrid.gif ${WRKSRC}/doc/giflib-logo.gif
>+	@${REINPLACE_CMD} \
>+		's/src="[./]*giflib-logo.gif"/& height="50" width="50"/' \
>+		${WRKSRC}/doc/index.html* ${WRKSRC}/doc/whatsinagif/*.html
>+
> do-install-DOCS-on:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
> 		"! ( -name Makefile -o -name *\.[17] -o -name *\.xml )"
> 	${MV} ${STAGEDIR}${DOCSDIR}/index.html.in ${STAGEDIR}${DOCSDIR}/index.html
> 
>-pre-build:
>-	${CP} ${FILESDIR}/giflib-logo.gif ${WRKSRC}/doc
>-
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
> 	${STRIP_CMD} --strip-unneeded ${STAGEDIR}${PREFIX}/lib/libgif.so.7.2.0
>diff --git a/graphics/giflib/files/giflib-logo.gif b/graphics/giflib/files/giflib-logo.gif
>deleted file mode 100644
>index 59310645e9867f7afbbc13ddc230f828f0a83986..0000000000000000000000000000000000000000
>GIT binary patch
>literal 0
>HcmV?d00001
>
>literal 1253
>zcmd6k{ZA7I0EX{+Eq8}kpa*efmVWTHI$4n-Rg`Ga$j4Mt3=t$^idmhInL(EfwxMCr
>zLJ0$5Iv@ywqkPl~Q3|LxVZEXh5VyO+))rx~A!D-Xz$p%Ju(H2mZ=O7Pe|(cSHa=!o
>zWV#fP0!siuu%TWIB0O2`n74uLL-25d?_=cqlNdz9paTZSH_V_AkamHBHWZ`~28A+c
>zltIEAGr}QJoc86|xEz{`Q@*Z_uLFP&+u)70Lu`WONkCXH&Le#Igg@U1VI&78IfxlY
>zNf4$%gaQ#7L}>;>F;Ew-ZUbQl19pJ$ILDX9eJPylGR@)I0AQWa*VgI@!eqE@G8#>{
>z4JLxPM^IKXWhJRWl6Em<F<U9p#h?q?GDK5$igr+xgQgv{%}LWv+xog|;Qu9}W#)fV
>zLN>hd2>`F<BUm8_7Gm1s5=~Jd#1E5(i9}&l0zr6XjkLZdygmry>2X}oYiYaI+^XL!
>zj_j03IwQM!B+@(GozkXuV~3&tI`78aAye<Ik#8*&X|vvZF#OOi1zT_cnD}XWs^#Yv
>zCcjHk^W^ugr}Kg?so>G$naNkPlP~ePKNg<>mQ||<_vRV6^*E5tuI?_5ymBNwCY!6x
>zbO?8kaB1a1&45JqUQc$DEL;4v`O<<;DX)em7e`~mr+Ps@W#1z->x%W1oZ~+l*V*<?
>z33~B-p7y3bQ5RSJwx8@$)944`XVu;cpfDM7yL)Pv+*0J^1dNP(i53nZ^=rqIH&cm$
>zgI@foA_TSd$9@?QfBtpc{@h}nPpG$XwM5ZhA+ESA|D2~9!iTH21{lJgi)S+4)F}I~
>z$d58?iRD?rncD{Dl2C<~e`Ixs>W6w2sXLSa?1Z8kLoyglol1OP8yero9KOKW&8nI%
>z`#y;=ZK>RH>%_!!wb0oR8;Yp8ZgkIRa!lFf?hyNIVmfm4vvdCh%G7iD`{<~1FI$|j
>zle7F}Y3w|d(kKL(;xk~O2j7dAGaX@_$gwWV3s7;*bTlm1I6$4~)9GlP_zT@H#o~M=
>z1KlgO`)REYk%OMFLTD~zOB_us=w9O#``xiOl==IWYx%>>=t_%O@@!VFuWS<;qVp2m
>zeO2sO#qkEO<fUSF=)<i)Cb$Q@u9(!0WaRKX-2xkJbvRRT`f%7)LvUFh;pEk+kHx+Z
>zq^91-s!v|44y@uu85-DWjFg~ErF8zcs(8f!)B6%?-`bp>5b<k$RC9pEL&K7BmHS?7
>z*QDjLMMe)6Gu3<N$K`Y7NM=dJF}AECD?de<-Uzy}{*GzgtC`RFDnzI-w<TddE7z~~
>zGz!~mCS>kGJ&Bon&R#6*QFU}ka<>Ce3zBu=n{8o-=I@+#9|OU~%!syb_+)7TYsNpR
>z-2|^~S=dosV7x(29^K@HHP?PJ*SmbM;6NH6Fe^e2iyWnYcCNUm&fT)FY|83?9DG7e
>vzEwKjJ{<V!0oE_EkI2#bk-wt9tJ8Fv0_#$~?(i=Y9(~~-BPfsyfj$2MT4my|
>
>diff --git a/graphics/giflib/files/patch-Makefile b/graphics/giflib/files/patch-Makefile
>index 4fc7a7f5c3df..ca317159b0fd 100644
>--- a/graphics/giflib/files/patch-Makefile
>+++ b/graphics/giflib/files/patch-Makefile
>@@ -1,33 +1,36 @@
> --- Makefile.orig	2024-02-19 01:01:50 UTC
> +++ Makefile
>-@@ -64,13 +64,14 @@ MANUAL_PAGES = \
>+@@ -63,15 +63,19 @@ LDLIBS=libgif.a -lm
>+ 
>  LDLIBS=libgif.a -lm
>  
>- MANUAL_PAGES = \
>--	doc/gif2rgb.xml \
>--	doc/gifbuild.xml \
>--	doc/gifclrmp.xml \
>--	doc/giffix.xml \
>+-MANUAL_PAGES = \
>++MANUAL_PAGES_1 = \
>+ 	doc/gif2rgb.xml \
>+ 	doc/gifbuild.xml \
>+ 	doc/gifclrmp.xml \
>+ 	doc/giffix.xml \
> -	doc/giflib.xml \
>--	doc/giftext.xml \
>--	doc/giftool.xml
>-+	doc/gif2rgb.1 \
>-+	doc/gifbuild.1 \
>-+	doc/gifclrmp.1 \
>-+	doc/giffix.1 \
>-+	doc/giftext.1 \
>-+	doc/giftool.1
>-+MAN7_PAGES= \
>-+	doc/giflib.7
>+ 	doc/giftext.xml \
>+ 	doc/giftool.xml
>  
>++MANUAL_PAGES_7 = \
>++	doc/giflib.xml
>++
>++MANUAL_PAGES = $(MANUAL_PAGES_1) $(MANUAL_PAGES_7)
>++
>  SOEXTENSION	= so
>  LIBGIFSO	= libgif.$(SOEXTENSION)
>-@@ -150,6 +151,8 @@ install-man:
>+ LIBGIFSOMAJOR	= libgif.$(SOEXTENSION).$(LIBMAJOR)
>+@@ -148,8 +152,9 @@ install-man:
>+ 	ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)"
>+ 	ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)"
>  install-man:
>- 	$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
>- 	$(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1"
>-+	$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man7"
>-+	$(INSTALL) -m 644 $(MAN7_PAGES) "$(DESTDIR)$(MANDIR)/man7"
>+-	$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
>+-	$(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1"
>++	$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7"
>++	$(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1"
>++	$(INSTALL) -m 644 $(MANUAL_PAGES_7:xml=7) "$(DESTDIR)$(MANDIR)/man7"
>  uninstall: uninstall-man uninstall-include uninstall-lib uninstall-bin
>  uninstall-bin:
>  	cd "$(DESTDIR)$(BINDIR)" && rm -f $(INSTALLABLE)
>diff --git a/graphics/giflib/files/patch-tests_makefile b/graphics/giflib/files/patch-tests_makefile
>index dbabec4d495a..bf070d391633 100644
>--- a/graphics/giflib/files/patch-tests_makefile
>+++ b/graphics/giflib/files/patch-tests_makefile
>@@ -1,6 +1,6 @@
> --- tests/makefile.orig	2019-03-28 17:05:25 UTC
> +++ tests/makefile
>-@@ -104,10 +106,10 @@ giffilter-regress:
>+@@ -104,10 +104,10 @@ giffix-rebuild:
>  
>  giffix-rebuild:
>  	@echo "Rebuilding giffix test."
>-- 
>2.44.0
>

Actions: View | Diff

Attachments on bug 278621: 250280