git: 28a16ea3b67b - main - x11/xpra: Update to 4.2

Gleb Popov arrowd at FreeBSD.org
Sat May 29 12:00:16 UTC 2021


The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=28a16ea3b67b0ae9faa0cc4d773bf5c08c826a89

commit 28a16ea3b67b0ae9faa0cc4d773bf5c08c826a89
Author:     Gleb Popov <arrowd at FreeBSD.org>
AuthorDate: 2021-05-29 11:59:22 +0000
Commit:     Gleb Popov <arrowd at FreeBSD.org>
CommitDate: 2021-05-29 11:59:56 +0000

    x11/xpra: Update to 4.2
    
    Reported by:    portscout!
---
 x11/xpra/Makefile             |  2 +-
 x11/xpra/distinfo             |  6 +++---
 x11/xpra/files/patch-setup.py | 20 --------------------
 x11/xpra/pkg-plist            | 18 +++++++++++++++---
 4 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index 505cc321eeab..6bdf09d76cf0 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xpra
-PORTVERSION=	4.1.3
+PORTVERSION=	4.2
 CATEGORIES=	x11
 MASTER_SITES=	http://xpra.org/src/
 
diff --git a/x11/xpra/distinfo b/x11/xpra/distinfo
index c69974bb1f29..3adcfd85f028 100644
--- a/x11/xpra/distinfo
+++ b/x11/xpra/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619893590
-SHA256 (xpra-4.1.3.tar.gz) = 4deb263d199f5b2f88aaac68345774e285ff6f6af21ab7993de876af8b0bf094
-SIZE (xpra-4.1.3.tar.gz) = 3850971
+TIMESTAMP = 1622280098
+SHA256 (xpra-4.2.tar.gz) = 2a4430e0525e1f81b98d9e0674fdda5d9df3c6ee0600b6e2388e8f38a256e9f9
+SIZE (xpra-4.2.tar.gz) = 4057304
diff --git a/x11/xpra/files/patch-setup.py b/x11/xpra/files/patch-setup.py
deleted file mode 100644
index e3e3583f98b8..000000000000
--- a/x11/xpra/files/patch-setup.py
+++ /dev/null
@@ -1,20 +0,0 @@
---- setup.py.orig	2021-03-07 14:32:43 UTC
-+++ setup.py
-@@ -1012,7 +1012,7 @@ if 'clean' in sys.argv or 'sdist' in sys.argv:
-     clean()
- 
- def add_build_info(*args):
--    cmd = ["python3", "./fs/bin/add_build_info.py"]+list(args)
-+    cmd = [sys.executable, "./fs/bin/add_build_info.py"]+list(args)
-     r = subprocess.Popen(cmd).wait(30)
-     assert r==0, "'%s' returned %s" % (" ".join(cmd), r)
- 
-@@ -1531,7 +1531,7 @@ else:
-         add_data_files("%s/man1" % man_path,  man_pages)
-         add_data_files("share/applications",  glob.glob("fs/share/applications/*.desktop"))
-         add_data_files("share/mime/packages", ["fs/share/mime/packages/application-x-xpraconfig.xml"])
--        add_data_files("share/icons",         glob.glob("fs/share/icons/*.png"))
-+        add_data_files("share/pixmaps",         glob.glob("fs/share/icons/*.png"))
-         add_data_files("share/metainfo",      ["fs/share/metainfo/xpra.appdata.xml"])
- 
-     #here, we override build and install so we can
diff --git a/x11/xpra/pkg-plist b/x11/xpra/pkg-plist
index 45bcc17fe93a..05a2fc1cfb4c 100644
--- a/x11/xpra/pkg-plist
+++ b/x11/xpra/pkg-plist
@@ -425,6 +425,8 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/codecs/__pycache__/codec_checks.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/__pycache__/codec_constants.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/__pycache__/codec_constants.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/__pycache__/icon_util.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/__pycache__/icon_util.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/__pycache__/image_wrapper.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/__pycache__/image_wrapper.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/__pycache__/loader.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -477,6 +479,7 @@ libexec/xpra/xdg-open
 %%X265%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%X265%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%X265%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/encoder%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/xpra/codecs/icon_util.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/loader.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/__init__.py
@@ -541,6 +544,8 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/__pycache__/gui.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/__pycache__/keymap.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/__pycache__/keymap.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/gtk_common/__pycache__/start_gui.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/gtk_common/__pycache__/start_gui.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/about.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/auth_dialog.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/cursor_names.py
@@ -557,6 +562,7 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk_view_keyboard.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gui.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/keymap.py
+%%PYTHON_SITELIBDIR%%/xpra/gtk_common/start_gui.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk3/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk3/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk3/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
@@ -593,6 +599,8 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/file_transfer.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/header.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/header.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/http_handler.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/http_handler.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/mmap_pipe.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/mmap_pipe.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/net_util.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -635,6 +643,7 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/net/fake_jitter.py
 %%PYTHON_SITELIBDIR%%/xpra/net/file_transfer.py
 %%PYTHON_SITELIBDIR%%/xpra/net/header.py
+%%PYTHON_SITELIBDIR%%/xpra/net/http_handler.py
 %%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__init__.py
 %%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
@@ -840,10 +849,10 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/server/__pycache__/control_command.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/__pycache__/gtk_server_base.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/__pycache__/gtk_server_base.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/__pycache__/http_handler.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/__pycache__/http_handler.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/__pycache__/keyboard_config_base.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/__pycache__/keyboard_config_base.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/__pycache__/menu_provider.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/__pycache__/menu_provider.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/__pycache__/picture_encode.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/__pycache__/picture_encode.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/__pycache__/server_base.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -961,8 +970,8 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_source.py
 %%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_start.py
 %%PYTHON_SITELIBDIR%%/xpra/server/gtk_server_base.py
-%%PYTHON_SITELIBDIR%%/xpra/server/http_handler.py
 %%PYTHON_SITELIBDIR%%/xpra/server/keyboard_config_base.py
+%%PYTHON_SITELIBDIR%%/xpra/server/menu_provider.py
 %%PYTHON_SITELIBDIR%%/xpra/server/mixins/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/server/mixins/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/mixins/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
@@ -1391,7 +1400,9 @@ share/pixmaps/xpra.png
 %%DATADIR%%/icons/close.png
 %%DATADIR%%/icons/compressed.png
 %%DATADIR%%/icons/connect.png
+%%DATADIR%%/icons/device.png
 %%DATADIR%%/icons/disconnected.png
+%%DATADIR%%/icons/display.png
 %%DATADIR%%/icons/download.png
 %%DATADIR%%/icons/empty.png
 %%DATADIR%%/icons/encoding.png
@@ -1414,6 +1425,7 @@ share/pixmaps/xpra.png
 %%DATADIR%%/icons/mdns.png
 %%DATADIR%%/icons/microphone.png
 %%DATADIR%%/icons/minimize.png
+%%DATADIR%%/icons/noicon.png
 %%DATADIR%%/icons/open.png
 %%DATADIR%%/icons/openbox.png
 %%DATADIR%%/icons/openbsd.png


More information about the dev-commits-ports-all mailing list