View | Details | Raw Unified | Return to bug 243490 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 243490