From ac8b7a6eb421033f8ebc337dfdd936ba8694c35e9cd60c8c6e157ff2aabb6af9 Mon Sep 17 00:00:00 2001 From: Scott Bradnick Date: Mon, 25 Jul 2022 14:37:06 +0000 Subject: [PATCH 1/4] Accepting request 991057 from home:sbradnick - Update to version 4.4+git20220721.c00134211: * place the verification token at a random address * remove ancient mmap token location code * #3582 limit audio info * always enable bundling - no need for env switch * the '_proxy' subcommand doesn't need to load compressors * skip lib validation warnings when running 'sdist' * #3582 limit client info exposed * doh: return the info * return a dict even when we hit an error * #3591 clamp negative values to display * #3591 also drop negative dimensions * #2303 honour env var and skip processing ssh agent paths * some clients don't have ssh-auth-sock specified.. don't error out * silence linter * only forward ssl socket options to the ssl wrap function * fix ssl breakage: convert attribute names to arguments - Update to version 4.4+git20220720.22e3ae211: * don't compress rgb pixels with anything but lz4 * rename method to prevent confusion * #2303 ssh agent forwarding * #3582 hide detailed version info - Update to version 4.4+git20220720.d0ae240e2: * #3582 skip opengl info * fixup estr logging method * #2303 make is_socket re-usable * #3483 pycuda also imports numpy * #3579 more f-strings OBS-URL: https://build.opensuse.org/request/show/991057 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xpra?expand=0&rev=107 --- _service | 9 +++ _servicedata | 2 +- xpra-4.4+git20220621.872c7f8d8.tar.gz | 3 - xpra-4.4+git20220721.c00134211.tar.gz | 3 + xpra.changes | 102 ++++++++++++++++++++++++++ xpra.obsinfo | 6 +- xpra.spec | 9 ++- 7 files changed, 126 insertions(+), 8 deletions(-) delete mode 100644 xpra-4.4+git20220621.872c7f8d8.tar.gz create mode 100644 xpra-4.4+git20220721.c00134211.tar.gz diff --git a/_service b/_service index 16266bb..d710452 100644 --- a/_service +++ b/_service @@ -6,6 +6,11 @@ https://github.com/Xpra-org/xpra git + + c001342 + @PARENT_TAG@+git%cd.%h + yes gz diff --git a/_servicedata b/_servicedata index 2971753..f6d95fa 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/Xpra-org/xpra - 872c7f8d861777f09cb765b945cc600e49a7f47d \ No newline at end of file + c0013421137962dcfdd9a9f97f4c7b4b456d05de \ No newline at end of file diff --git a/xpra-4.4+git20220621.872c7f8d8.tar.gz b/xpra-4.4+git20220621.872c7f8d8.tar.gz deleted file mode 100644 index fa65347..0000000 --- a/xpra-4.4+git20220621.872c7f8d8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52e3ff5cdc9674a01a0fecccf2b6a26b8ff75770139666725320be7f62948068 -size 52235769 diff --git a/xpra-4.4+git20220721.c00134211.tar.gz b/xpra-4.4+git20220721.c00134211.tar.gz new file mode 100644 index 0000000..9591c19 --- /dev/null +++ b/xpra-4.4+git20220721.c00134211.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:421acad26935530e6cb219eeb5fa91bd235d4ebd4f16d093f9f6275a0d85cbce +size 50052340 diff --git a/xpra.changes b/xpra.changes index e3b5367..1d840be 100644 --- a/xpra.changes +++ b/xpra.changes @@ -1,3 +1,105 @@ +------------------------------------------------------------------- +Fri Jul 22 20:22:17 UTC 2022 - scott.bradnick@suse.com + +- Update to version 4.4+git20220721.c00134211: + * place the verification token at a random address + * remove ancient mmap token location code + * #3582 limit audio info + * always enable bundling - no need for env switch + * the '_proxy' subcommand doesn't need to load compressors + * skip lib validation warnings when running 'sdist' + * #3582 limit client info exposed + * doh: return the info + * return a dict even when we hit an error + * #3591 clamp negative values to display + * #3591 also drop negative dimensions + * #2303 honour env var and skip processing ssh agent paths + * some clients don't have ssh-auth-sock specified.. don't error out + * silence linter + * only forward ssl socket options to the ssl wrap function + * fix ssl breakage: convert attribute names to arguments + +------------------------------------------------------------------- +Fri Jul 22 19:37:59 UTC 2022 - scott.bradnick@suse.com + +- Update to version 4.4+git20220720.22e3ae211: + * don't compress rgb pixels with anything but lz4 + * rename method to prevent confusion + * #2303 ssh agent forwarding + * #3582 hide detailed version info + +------------------------------------------------------------------- +Wed Jul 20 20:09:42 UTC 2022 - scott.bradnick@suse.com + +- Update to version 4.4+git20220720.d0ae240e2: + * #3582 skip opengl info + * fixup estr logging method + * #2303 make is_socket re-usable + * #3483 pycuda also imports numpy + * #3579 more f-strings + * oops: missing import + * #3582 mixins info, option to log capabilities + +------------------------------------------------------------------- +Tue Jul 19 19:01:06 UTC 2022 - scott.bradnick@suse.com + +- Update to version 4.4+git20220719.d301bf723: + * #3582 restrict client info exposed + * the system tray forwarding is challenging + * we are forced to use appindicator now + * simplify + * #3577 simplify + * #3577 reorder + * #3577 remove v4l2 legacy workarounds + * typo + * too many distros are missing pam pkgconfig files + * not all Linux distros have this header file + * another strangely misnamed package: libpam0g' + * fix misnamed package dependencies + * RHEL doesn't have a pam-devel package? + * distros have all moved pam to /usr/include/security/pam* + +------------------------------------------------------------------- +Mon Jul 18 22:29:08 UTC 2022 - scott.bradnick@suse.com + +- Update to version 4.4+git20220718.6b84ef9f6: + * skip all guessing using an env var + * #3386 fix typo + * procps-devel is not available on RHEL? + * pam pkgconfig refs had gone missing + * refer to Cython 'Extension' class directly + * oops: nvenc is not a package + * make it easier to change the number of cores used + * ignore 'address' warnings building nvenc + * use booleans for switches + * no longer used + * try the local cuda symlink before anything else + * this doesn't do anything + * make it easier to choose the number of threads + * #3577 remove legacy workarounds + * #3577 add switch for 'argb' codec + * #3577 group subsystems together + * #3577 group macos / win32 bundling workarounds together + * #3577 nvenc must use pkgconfig + * #3577 enable '-DDEBUG' globally + * #3577 convert pam module in pkg-config + * CUDA symlink on MS Windows: + * #3577 move nvenc tweaks to pkgconfig file + * ignore temporary build generated installer file + * #3390 evdi uses c++ + * #3577 use pkgconfig file for nvfbc flags + * #3577 simplify nvenc / nvjpeg using pkgconfig files on win32 + * #3584 typo + * fixup bccf36d62f6857094054cb3bd5cefd70b1fd5423: directories must start with a '/' + * #2753 RPM file list update + * #2753 add new packaging dependency + * #3582 limit the info available to remote hosts + * convert tray menu to use the new qrencode module + * #56 fix miscalculation of initial refresh rate + * #3583 update to the new python-cryptography API + * #3579 (almost) finish this one module + * #3483 only import numpy once, block if necessary + ------------------------------------------------------------------- Tue Jun 21 17:37:18 UTC 2022 - scott.bradnick@suse.com diff --git a/xpra.obsinfo b/xpra.obsinfo index b4566a0..d897bec 100644 --- a/xpra.obsinfo +++ b/xpra.obsinfo @@ -1,4 +1,4 @@ name: xpra -version: 4.4+git20220621.872c7f8d8 -mtime: 1655829759 -commit: 872c7f8d861777f09cb765b945cc600e49a7f47d +version: 4.4+git20220721.c00134211 +mtime: 1658437988 +commit: c0013421137962dcfdd9a9f97f4c7b4b456d05de diff --git a/xpra.spec b/xpra.spec index 26d3050..74d0e71 100644 --- a/xpra.spec +++ b/xpra.spec @@ -28,7 +28,7 @@ # ----- %global __requires_exclude ^typelib\\(GtkosxApplication\\)|typelib\\(GdkGLExt\\)|typelib\\(GtkGLExt\\).*$ Name: xpra -Version: 4.4+git20220621.872c7f8d8 +Version: 4.4+git20220721.c00134211 Release: 0 Summary: Remote display server for applications and desktops License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-3.0-or-later AND MIT @@ -69,6 +69,9 @@ BuildRequires: pkgconfig(libavformat) >= 58 BuildRequires: pkgconfig(libswscale) >= 5 BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libwebp) >= 0.4 +# TW can do this, 15.4 can't ... +#BuildRequires: pkgconfig(pam) +#BuildRequires: pkgconfig(pam_misc) BuildRequires: pkgconfig(py3cairo) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(vpx) >= 1.4.0 @@ -78,6 +81,8 @@ BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xres) BuildRequires: pkgconfig(xtst) +BuildRequires: procps-devel +BuildRequires: qrencode-devel Requires: dbus-1-x11 Requires: gstreamer-plugins-base Requires: gstreamer-plugins-good @@ -225,6 +230,7 @@ mkdir -p %{_rundir}/%{name} || exit 1 %dir %{_sysconfdir}/xpra %dir %{_sysconfdir}/xpra/conf.d %dir %{_sysconfdir}/xpra/content-categories +%dir %{_sysconfdir}/xpra/content-parent %dir %{_sysconfdir}/xpra/content-type %dir %{_sysconfdir}/xpra/http-headers %config(noreplace) %{_sysconfdir}/dbus-1/system.d/xpra.conf @@ -232,6 +238,7 @@ mkdir -p %{_rundir}/%{name} || exit 1 %config(noreplace) %{_sysconfdir}/xpra/*.conf %config(noreplace) %{_sysconfdir}/xpra/conf.d/*.conf %config(noreplace) %{_sysconfdir}/xpra/content-categories/*.conf +%config(noreplace) %{_sysconfdir}/xpra/content-parent/*.conf %config(noreplace) %{_sysconfdir}/xpra/content-type/*.conf %config(noreplace) %{_sysconfdir}/xpra/http-headers/*.txt %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/90-xpra-virtual.conf From 721d14f2e16c4cc7de0da141919d5309d843e9543c014d80d2b18113eaa2fa4e Mon Sep 17 00:00:00 2001 From: Scott Bradnick Date: Tue, 26 Jul 2022 02:17:24 +0000 Subject: [PATCH 2/4] Accepting request 991166 from home:sbradnick - A few changes related to local builds of Leap 15.4 referencing 150500 OBS-URL: https://build.opensuse.org/request/show/991166 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xpra?expand=0&rev=108 --- xpra-4.4+git20220721.c00134211.tar.gz | 4 ++-- xpra.changes | 5 +++++ xpra.spec | 18 ++++++++++++++++-- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/xpra-4.4+git20220721.c00134211.tar.gz b/xpra-4.4+git20220721.c00134211.tar.gz index 9591c19..c96446b 100644 --- a/xpra-4.4+git20220721.c00134211.tar.gz +++ b/xpra-4.4+git20220721.c00134211.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:421acad26935530e6cb219eeb5fa91bd235d4ebd4f16d093f9f6275a0d85cbce -size 50052340 +oid sha256:e25cc822fde17056f1df74fb37a645de05998312d3cfb05a0f06993a746e759a +size 50480925 diff --git a/xpra.changes b/xpra.changes index 1d840be..b259301 100644 --- a/xpra.changes +++ b/xpra.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 26 01:52:30 UTC 2022 - Scott Bradnick + +- A few changes related to local builds of Leap 15.4 referencing 150500 + ------------------------------------------------------------------- Fri Jul 22 20:22:17 UTC 2022 - scott.bradnick@suse.com diff --git a/xpra.spec b/xpra.spec index 74d0e71..cf82bfd 100644 --- a/xpra.spec +++ b/xpra.spec @@ -46,9 +46,14 @@ BuildRequires: fdupes BuildRequires: git-core BuildRequires: hicolor-icon-theme # Needed for proper OS detection by setup.py -%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150500 +### 20220725, smb: This line seems to goof up 15.4; 15.3 gets "openSUSE-release", 15.4 gets "dummy-release" this way +#%%if 0%%{?suse_version} >= 1550 || 0%%{?sle_version} >= 150500 +##### +%if 0%{?suse_version} >= 1550 +%define using_release "distribution-release" BuildRequires: distribution-release %else +%define using_release "openSUSE-release" BuildRequires: openSUSE-release %endif # --------- @@ -146,6 +151,12 @@ sed -e 's|__FILLUPDIR__|%{_fillupdir}|' \ %build +### DEBUGGING +echo "using_release: %using_release" +echo "sle_version: %sle_version" +echo "suse_version: %suse_version" +##### + export CFLAGS="%{optflags}" %if 0%{?suse_version} <= 1500 export CFLAGS="$CFLAGS -Wno-error=deprecated-declarations" @@ -192,7 +203,10 @@ rm -rf %{buildroot}%{_datadir}/xpra/cuda mkdir -pv %{buildroot}%{_sbindir} ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} -%if ( 0%{?sle_version} == 150300 || 0%{?sle_version} == 150400 ) && 0%{?is_opensuse} +# 150300 == OBS build of Leap 15.3 +# 150400 == OBS build of Leap 15.4 +# 150500 == local build of Leap 15.4 +%if ( 0%{?sle_version} == 150300 || 0%{?sle_version} == 150400 || 0%{?sle_version} == 150500 ) && 0%{?is_opensuse} mkdir -vp %{buildroot}%{_libexecdir}/%{name} mv -v %{buildroot}%{_prefix}/libexec/%{name}/* %{buildroot}%{_libexecdir}/%{name} %endif From accb81f225d50c23124e8315c06225d8fce7abbf2cc96c9491150b78a10931c9 Mon Sep 17 00:00:00 2001 From: Scott Bradnick Date: Sat, 6 Aug 2022 06:56:01 +0000 Subject: [PATCH 3/4] Accepting request 993433 from home:sbradnick - %{_libexecdir} issue was fixed upstream, cleaning up spec file * See https://github.com/Xpra-org/xpra/issues/3597 - Update to version 4.4+git20220726.a03b3f67e: * #3597 openSUSE Leap 15.4 still does not use libexec * always pop GDK errors * #3595 add man page entry * #3595 'exit-with-windows' option * fix removing monitor: logging was causing an error * layout may be 'None' * close the splash screen if it loses top level focus * #2630 these values aren't 'real' layout names, don't try to use them * #2630 modify shadow keymap when '--keyboard-layout=auto' * `xpra/x11/server_keyboard_config.py`: `'NoneType' object is not iterable` * #3594 fix vim typo * #3594 backwards compatibility fix * f-strings and more dense output * safer: don't delete recursively, delete with glob explicitly * when calling 'xpra clean' explicitly, we can remove session sub-directories * run 'late_cleanup' before trying to remove the session dir * don't try to parse 'resize-display' as a resolution if it is a boolean * remove spurious import added by IDE * distinguish directories from regular files * it is possible to run without the 'rgb' encoder * make it easier to build without any codecs * we can only use the 'native' mapping with existing x11 keycodes * simplify: remove unused argument * #3592 remove redundant 'xkbmap_' prefix * #3592 remove unstructured setxkbmap query data from server * #35822 start removing 'setxkbmap -query' and 'setxkbmap -print' OBS-URL: https://build.opensuse.org/request/show/993433 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xpra?expand=0&rev=109 --- _service | 9 ++-- _servicedata | 2 +- xpra-4.4+git20220721.c00134211.tar.gz | 3 -- xpra-4.4+git20220726.a03b3f67e.tar.gz | 3 ++ xpra.changes | 61 +++++++++++++++++++++++++++ xpra.obsinfo | 6 +-- xpra.spec | 14 ++---- 7 files changed, 75 insertions(+), 23 deletions(-) delete mode 100644 xpra-4.4+git20220721.c00134211.tar.gz create mode 100644 xpra-4.4+git20220726.a03b3f67e.tar.gz diff --git a/_service b/_service index d710452..de61875 100644 --- a/_service +++ b/_service @@ -1,15 +1,12 @@ - - https://github.com/Xpra-org/xpra git - c001342 - @PARENT_TAG@+git%cd.%h