diff --git a/x11/xpra-html5/Makefile b/x11/xpra-html5/Makefile index 14aaeb0dcdec..0d44042de739 100644 --- a/x11/xpra-html5/Makefile +++ b/x11/xpra-html5/Makefile @@ -1,50 +1,50 @@ PORTNAME= xpra-html5 -PORTVERSION= 10.1 +PORTVERSION= 11.0 DISTVERSIONPREFIX= v CATEGORIES= x11 MAINTAINER= arrowd@FreeBSD.org COMMENT= Browser-based client for x11/xpra WWW= https://xpra.org/ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= brotli:archivers/brotli USES= python:build OPTIONS_DEFAULT= YUICOMPRESSOR OPTIONS_RADIO= MINIFIER OPTIONS_RADIO_MINIFIER= HJSMIN YUICOMPRESSOR MINIFIER_DESC= JavaScript sources minification YUICOMPRESSOR_DESC= Minify JavaScript with yuicompressor (Java) HJSMIN_DESC= Minify JavaScript with hjsmin (Haskell) YUICOMPRESSOR_BUILD_DEPENDS= yuicompressor:www/yuicompressor YUICOMPRESSOR_VARS= minifier=yuicompressor HJSMIN_BUILD_DEPENDS= hjsmin:www/hs-hjsmin HJSMIN_VARS= minifier=hjsmin USE_PYTHON= noflavors USE_GITHUB= yes GH_ACCOUNT= Xpra-org NO_ARCH= yes NO_BUILD= yes ETCDIR= ${PREFIX}/etc/xpra/html5-client .include .if !${PORT_OPTIONS:MYUICOMPRESSOR} && !${PORT_OPTIONS:MHJSMIN} MINIFIER= copy .endif do-install: cd ${WRKSRC} && ${PYTHON_CMD} setup.py install ${STAGEDIR} ${PREFIX}/share/xpra/www ${ETCDIR} ${MINIFIER} .include diff --git a/x11/xpra-html5/distinfo b/x11/xpra-html5/distinfo index b55d9af525ec..894a9a5d97a1 100644 --- a/x11/xpra-html5/distinfo +++ b/x11/xpra-html5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1702808196 -SHA256 (Xpra-org-xpra-html5-v10.1_GH0.tar.gz) = cea097b38ad57d5119be729f1378c5bad7b99e99c035e792241d383975154368 -SIZE (Xpra-org-xpra-html5-v10.1_GH0.tar.gz) = 2354055 +TIMESTAMP = 1707565309 +SHA256 (Xpra-org-xpra-html5-v11.0_GH0.tar.gz) = f306707377702f47898fec308f6c0dd18b1b7f96f8ef19d35e2ad44c08c3c215 +SIZE (Xpra-org-xpra-html5-v11.0_GH0.tar.gz) = 2354981 diff --git a/x11/xpra-html5/files/patch-setup.py b/x11/xpra-html5/files/patch-setup.py new file mode 100644 index 000000000000..d2284ad56905 --- /dev/null +++ b/x11/xpra-html5/files/patch-setup.py @@ -0,0 +1,20 @@ +--- setup.py.orig 2024-01-31 12:10:11 UTC ++++ setup.py +@@ -50,7 +50,7 @@ def get_output_line(cmd: str) -> str: + out, _ = proc.communicate() + if proc.returncode != 0: + print(f"Error: {cmd} returned {proc.returncode}") +- return None ++ return "" + return out.splitlines()[0] + + +@@ -316,7 +316,7 @@ def install_html5(root="/", install_dir="/usr/share/xp + jar = yuicompressor.get_jar_filename() + java_cmd = os.environ.get("JAVA", "java") + minify_cmd = [java_cmd, "-jar", jar] +- except OSError: ++ except: + minify_cmd = ["yuicompressor"] + minify_cmd += [ + fsrc,