Attachment 211592 Details for Bug 243490 – Patch to update sysutils/bamf

[patch] Patch to update sysutils/bamf

bamf.diff (text/plain), 4.95 KB, created by Olivier Duchateau on 2020-02-12 16:27:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Duchateau

Created: 2020-02-12 16:27:06 UTC

Size: 4.95 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(rÃ©vision 525917)
>+++ Makefile	(copie de travail)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	bamf
>-PORTVERSION=	0.5.3
>-PORTREVISION=	2
>+PORTVERSION=	0.5.4
> CATEGORIES=	sysutils
> MASTER_SITES=	https://launchpadlibrarian.net/280921055/ \
> 	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
>@@ -15,14 +14,12 @@
> LICENSE_FILE=	${WRKSRC}/COPYING.LGPL
> 
> BUILD_DEPENDS=	vapigen:lang/vala \
>-	${PYTHON_PKGNAMEPREFIX}libxml2>=2.8.0:textproc/py-libxml2@${PY_FLAVOR} \
>-	${PYTHON_PKGNAMEPREFIX}libxslt>=1.1.28:textproc/py-libxslt@${PY_FLAVOR}
>+	${PYTHON_PKGNAMEPREFIX}lxml>=4.4.2:devel/py-lxml@${PY_FLAVOR}
> LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop \
>-	libdbus-glib-1.so:devel/dbus-glib \
> 	libstartup-notification-1.so:x11/startup-notification
> 
> USES=		gettext-runtime gmake gnome libtool pathfix pkgconfig \
>-		python:2.7 xorg
>+		python:3.5+,build xorg
> GNU_CONFIGURE=	yes
> USE_GNOME=	gtk30 glib20 introspection:build libwnck3 cairo gdkpixbuf2
> USE_XORG=	x11
>@@ -30,11 +27,14 @@
> 
> CONFIGURE_ARGS+=--disable-headless-tests \
> 	--disable-gtktest \
>+	--disable-gcov \
> 	--disable-gtk-doc-html \
>-	--without-html-dir
>+	--without-html-dir \
>+	--enable-export-actions-menu=no \
>+	--enable-introspection=yes
> 
> post-patch:
>-	${FIND} ${WRKSRC} -type f -name 'Makefile.in' \
>-		| ${XARGS} ${REINPLACE_CMD} -e 's| -Wl,-Bsymbolic-functions||'
>+	${REINPLACE_CMD} -e 's| -Wl,-Bsymbolic-functions||' \
>+		${WRKSRC}/src/Makefile.in
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(rÃ©vision 525917)
>+++ distinfo	(copie de travail)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1472504601
>-SHA256 (bamf-0.5.3.tar.gz) = 340d7b5a463afcd33135ae73a7e4cf6a93a4daaf6f72b70abc09dc66d18a3b14
>-SIZE (bamf-0.5.3.tar.gz) = 633666
>+TIMESTAMP = 1579354448
>+SHA256 (bamf-0.5.4.tar.gz) = 5bb87a5bf46ab1fc9a229a851c0ee4f610d943716a7c83d318f6a8f50d76beb3
>+SIZE (bamf-0.5.4.tar.gz) = 638756
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(rÃ©vision 525917)
>+++ files/patch-configure	(copie de travail)
>@@ -1,11 +1,24 @@
>---- configure.orig	2016-08-25 15:18:48 UTC
>+--- configure.orig	2018-11-07 22:39:51 UTC
> +++ configure
>-@@ -15233,7 +15233,7 @@ rm -f core conftest.err conftest.$ac_obj
>+@@ -14653,10 +14653,10 @@ fi
>+ 
>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtester2xunit dependencies" >&5
>+ $as_echo_n "checking for gtester2xunit dependencies... " >&6; }
>+-if !($PYTHON -c "import libxslt, libxml2" 2> /dev/null); then
>++if !($PYTHON -c "import lxml" 2> /dev/null); then
>+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>+ $as_echo "no" >&6; }
>+-  as_fn_error $? "You need to install python-libxslt1 and python-libxml2" "$LINENO" 5;
>++  as_fn_error $? "You need to install python-lxml" "$LINENO" 5;
>+ fi
>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
>+ $as_echo "yes" >&6; }
>+@@ -15374,7 +15374,7 @@ rm -f core conftest.err conftest.$ac_objext \
>    rm -f conf.gtktest
>  
>  
>--CFLAGS="$CFLAGS -Wall -Werror -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration -lm"
>-+CFLAGS="$CFLAGS -Wall -Wformat-security -Winit-self -Wimplicit-function-declaration"
>+-CFLAGS="$CFLAGS -Wall -Werror -Wno-error=deprecated-declarations -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration -lm"
>++CFLAGS="$CFLAGS -Wall -Winit-self -Warray-bounds -Wimplicit-function-declaration"
>  
>  
>  
>Index: files/patch-tests_gtester2xunit.py
>===================================================================
>--- files/patch-tests_gtester2xunit.py	(nonexistent)
>+++ files/patch-tests_gtester2xunit.py	(copie de travail)
>@@ -0,0 +1,27 @@
>+--- tests/gtester2xunit.py.orig	2018-11-07 22:39:11 UTC
>++++ tests/gtester2xunit.py
>+@@ -1,18 +1,17 @@
>+ #! /usr/bin/python
>+ from argparse import ArgumentParser
>+-import libxslt
>+-import libxml2
>+ import sys
>+ import os
>++from lxml import etree
>+ 
>+ XSL_TRANSFORM='/usr/share/gtester2xunit/gtester.xsl'
>+ 
>+ def transform_file(input_filename, output_filename, xsl_file):
>+-    gtester = libxml2.parseFile(xsl_file)
>+-    style = libxslt.parseStylesheetDoc(gtester)
>+-    doc = libxml2.parseFile(input_filename)
>+-    result = style.applyStylesheet(doc, None)
>+-    result.saveFormatFile(filename=output_filename, format=True)
>++    gtester = etree.parse(xsl_file)
>++    style = etree.XSLT(gtester)
>++    doc = etree.parse(input_filename)
>++    result = style(doc)
>++    result.write(filename=output_filename, format=True)
>+ 
>+ 
>+ def get_output_filename(input_filename):
>
>Property changes on: files/patch-tests_gtester2xunit.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 243490: 210930 | 211592