Accepting request 734562 from home:alois:branches:X11:Utilities

Update to version 3.0 OBS-URL: https://build.opensuse.org/request/show/734562 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xpra?expand=0&rev=23
2019-10-02 11:45:08 +00:00 · 2019-10-02 11:45:08 +00:00 · 8022d6db82
commit 8022d6db82
parent 7169cad664
5 changed files with 98 additions and 34 deletions
--- a/xpra-2.5.3.tar.xz
+++ b/xpra-2.5.3.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:daaf3de7ec6e21be216316c56ec3d42e787d4b0137e9c91855032424242d43fb
-size 2489488
--- a/xpra-3.0.tar.xz
+++ b/xpra-3.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3822b59d248e9b76d65c61ee4cef65e2ca8e5165aaa1d6f3e03a95a2a800d5b3
+size 2733536
--- a/xpra-paths.patch
+++ b/xpra-paths.patch
@ -1,8 +1,8 @@
-Index: xpra-2.5/setup.py
+Index: xpra-3.0-rc3/setup.py
 ===================================================================
--- xpra-2.5.orig/setup.py
-+++ xpra-2.5/setup.py
-@@ -1556,7 +1556,7 @@ else:
+--- xpra-3.0-rc3.orig/setup.py
+++ xpra-3.0-rc3/setup.py
+@@ -1501,7 +1501,7 @@ else:
         add_data_files("%s/man1" % man_path,  ["man/xpra.1", "man/xpra_launcher.1"])
         add_data_files("share/applications",  glob.glob("xdg/*.desktop"))
         add_data_files("share/mime/packages", ["xdg/application-x-xpraconfig.xml"])
@ -11,7 +11,7 @@ Index: xpra-2.5/setup.py
         add_data_files("share/appdata",       ["xdg/xpra.appdata.xml"])
 
     #here, we override build and install so we can
-@@ -1629,7 +1629,7 @@ else:
+@@ -1574,7 +1574,7 @@ else:
             if pam_ENABLED:
                 copytodir("etc/pam.d/xpra", "/etc/pam.d")
 
@ -20,7 +20,7 @@ Index: xpra-2.5/setup.py
             if service_ENABLED:
                 #Linux init service:
                 if os.path.exists("/bin/systemctl"):
-@@ -1640,7 +1640,9 @@ else:
+@@ -1585,7 +1585,9 @@ else:
                 else:
                     copytodir("service/xpra", "/etc/init.d")
                 if os.path.exists("/etc/sysconfig"):
@ -31,8 +31,8 @@ Index: xpra-2.5/setup.py
                 elif os.path.exists("/etc/default"):
                     copytodir("etc/sysconfig/xpra", "/etc/default")
             if sd_listen_ENABLED:
-@@ -1757,7 +1759,6 @@ if scripts_ENABLED:
-     scripts += ["scripts/xpra", "scripts/xpra_launcher"]
+@@ -1703,7 +1705,6 @@ if scripts_ENABLED:
+ toggle_modules(WIN32, "xpra/scripts/win32_proxy_service")
 
 if data_ENABLED:
 -    add_data_files(share_xpra,                      ["README", "COPYING"])
--- a/xpra.changes
+++ b/xpra.changes
@ -1,3 +1,66 @@
+-------------------------------------------------------------------
+Wed Oct  2 06:12:07 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 3.0
+  * Python 3 port complete, now the default: #1571, #2195
+  * much nicer HTML5 client user interface: #2269
+  * Window handling:
+    + smoother window resizing: #478 (OpenGL)
+    + honouring gravity: #2217
+    + lock them in readonly mode: #2137
+  * xpra top subcommand: #2348
+  * faster startup:
+    + #2347 faster client startup
+    + #2341 faster server startup
+  * OpenGL:
+    + more reliable driver probing: #2204
+    + cursor paint support: #1497
+    + transparency on MacOS: #1794
+  * Encoding:
+    + lossless window scrolling: #1320
+    + scrolling acceleration for non-OpenGL backends: #2295
+    + harden image parsing: #2279
+    + workaround slow video encoder initialization (ie: NVENC)
+      using replacement frames: #2048
+    + avoid loading codecs we don't need: #2344
+    + skip some CUDA devices, speedup enumeration: #2415
+  * Clipboard:
+    + new native clipboard implementations for all platforms:
+      #812
+    + HTML5 asynchronous clipboard: #1844
+    + HTML5 support for copying images: #2312 (with watermarking)
+    + brotli compression for text data: #2289
+  * Authentication:
+    + modular client authentication handlers: #1796
+    + mysql authentication module: #2287
+    + generic SQL authentication module: #2288
+  * Network:
+    + client listen mode: #1022
+    + retry to connect until it succeeds or times out: #2346
+    + mdns TXT attributes updated at runtime: #2187
+    + zeroconf fixes: #2317
+    + drop pybonjour: #2297
+    + paramiko honours IdentityFile: #2282, handles SIGINT
+      better: #2378
+    + proxy server fixes for ssl and ssh sockets: #2399, remove
+      spurious options: #2193
+    + proxy ping and timeouts: #2408
+    + proxy dynamic authentication: #2261
+  * Automated Testing:
+    + test HTML5 client: #2231
+    + many new mixin tests: #1773 (and bugs found)
+  * start-new-commands is now enabled by default: #2278, and the
+    UI allows free text: #2221
+  * basic support for native GTK wayland client: #2243
+  * forward custom X11 properties: #2311
+  * xpra launcher visual feedback during connection: #1421,
+    sharing option: #2115
+  * "Window" menu on MacOS: #1808
+
+- Refreshed xpra-paths.patch
+
+- Switched build to python 3
+
 -------------------------------------------------------------------
 Sat Jul 27 13:08:50 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>

--- a/xpra.spec
+++ b/xpra.spec
@ -23,7 +23,7 @@
 %endif
 %global __requires_exclude ^typelib\\(GtkosxApplication\\)|typelib\\(GdkGLExt\\)|typelib\\(GtkGLExt\\).*$
 Name:           xpra
-Version:        2.5.3
+Version:        3.0
 Release:        0
 Summary:        Remote display server for applications and desktops
 License:        GPL-2.0-or-later AND BSD-3-Clause AND LGPL-3.0-or-later AND MIT
@ -42,9 +42,9 @@ BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  pam-devel
 BuildRequires:  pkgconfig
-BuildRequires:  python-Cython >= 0.20.0
-BuildRequires:  python-gobject-devel
-BuildRequires:  python2-devel
+BuildRequires:  python3-Cython >= 0.20.0
+BuildRequires:  python3-devel
+BuildRequires:  python3-gobject-devel
 BuildRequires:  systemd
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(gtk+-3.0)
@ -53,7 +53,7 @@ BuildRequires:  pkgconfig(libavformat) >= 57
 BuildRequires:  pkgconfig(libswscale) >= 4
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libwebp) >= 0.4
-BuildRequires:  pkgconfig(pycairo)
+BuildRequires:  pkgconfig(py3cairo)
 BuildRequires:  pkgconfig(pygtk-2.0)
 %if 0%{?suse_version} >= 1500
 BuildRequires:  pkgconfig(vpx) >= 1.4.0
@ -63,26 +63,27 @@ BuildRequires:  pkgconfig(xdamage)
 BuildRequires:  pkgconfig(xkbfile)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xtst)
-Requires:       dbus-1-python
 Requires:       dbus-1-x11
 Requires:       gstreamer-plugins-base
 Requires:       gstreamer-plugins-good
 Requires:       pulseaudio
 Requires:       pulseaudio-utils
-Requires:       python2-Pillow
-Requires:       python2-gst
-Requires:       python2-lz4
-Requires:       python2-numpy
-Requires:       python2-opencv
-Requires:       python2-pycups
-Requires:       python2-rencode
+Requires:       python3-Pillow
+Requires:       python3-dbus-python
+Requires:       python3-gobject-Gdk
+Requires:       python3-gst
+Requires:       python3-lz4
+Requires:       python3-numpy
+Requires:       python3-opencv
+Requires:       python3-pycups
+Requires:       python3-rencode
 Requires:       shared-mime-info
 Requires:       xf86-video-dummy
 Requires:       xorg-x11-xauth
 Requires(post): %fillup_prereq
-Recommends:     python2-dnspython
-Recommends:     python2-opencv
-Recommends:     python2-paramiko
+Recommends:     python3-dnspython
+Recommends:     python3-opencv
+Recommends:     python3-paramiko
 %{?systemd_requires}

 %description
@ -102,7 +103,7 @@ Summary:        HTML5 server and client support for xpra
 Group:          Productivity/Networking/Other
 Requires:       %{name} = %{version}
 # websockify is required to allow xpra to listen for an html5 client
-Requires:       python2-websockify
+Requires:       python3-websockify
 Provides:       bundled(js-aurora)
 Provides:       bundled(js-bencode)
 Provides:       bundled(js-broadway)
@ -123,7 +124,7 @@ connections, and also the xpra html5 client.
 # fix shebangs
 find -name '*.py' \
     -exec sed -i '1{\@^#!/usr/bin/env python@d}' {} +
-sed -i "1 s|^#!/usr/bin/env python\b|#!%__python2|" cups/xpraforwarder
+sed -i "1 s|^#!/usr/bin/env python\b|#!%__python3|" cups/xpraforwarder
 # fix python-bytecode-inconsistent-mtime warning
 find . -name '*.py' -exec touch -mat 1707141200 {} +
 install -m0644 %{SOURCE1} -t xdg
@ -132,10 +133,10 @@ sed -e 's|__FILLUPDIR__|%{_fillupdir}|' \
    -e 's|__UNITDIR__|%{_unitdir}|' \
    -i setup.py
 # fix shebang
-sed -i 's|^#!.*|#!%__python2|' scripts/auth_dialog scripts/xdg-open
+sed -i 's|^#!.*|#!%__python3|' scripts/auth_dialog scripts/xdg-open

 %build
-python2 setup.py build \
+python3 setup.py build \
    --verbose \
 %if 0%{?suse_version} > 1500
    --with-enc_ffmpeg \
@ -158,7 +159,7 @@ python2 setup.py build \
    --with-service

 %install
-python2 setup.py install \
+python3 setup.py install \
    --skip-build \
    --root %{buildroot} \
    --prefix /usr \
@ -226,8 +227,8 @@ mkdir -p %{_rundir}/%{name} || exit 1
 %{_libexecdir}/xpra/gvfs-open
 %{_libexecdir}/xpra/xdg-open
 %{_sbindir}/rc%{name}
-%{python_sitearch}/xpra
-%{python_sitearch}/%{name}-%{version}-py%{python_version}.egg-info
+%{python3_sitearch}/xpra
+%{python3_sitearch}/%{name}-%{version}-py%{python3_version}.egg-info
 %{_datadir}/appdata/xpra.appdata.xml
 %{_datadir}/applications/xpra-gui.desktop
 %{_datadir}/applications/xpra-launcher.desktop