This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch build-3.5.99.26 in repository nx-libs. commit be0ce022619c0bb6b5a55c1a2cc50243b3b0e738 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Feb 23 12:19:14 2023 +0100 nx-libs.spec: fix nxdialog hashbang selection, especially on *SuSE. --- nx-libs.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/nx-libs.spec b/nx-libs.spec index 8fe59f810..d08cd3f48 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -474,8 +474,20 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans rm %{buildroot}%{_libdir}/*.la # Fix python scripts -%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8 || 0%{?py_ver} == 3 -sed -i '1 s/python/python3/' %{buildroot}%{_bindir}/nxdialog +%if 0%{?suse_version} +%if 0%{?suse_version} >= 1500 +sed -i -e '1c\ +%{_bindir}/python3' '%{buildroot}%{_bindir}/nxdialog' +%else +sed -i -e '1c\ +%{_bindir}/python2' '%{buildroot}%{_bindir}/nxdialog' +%endif +%else +%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8 +pathfix.py -pni "%{__python3} %{py3_shbang_opts}" '%{buildroot}%{_bindir}/nxdialog' +%else +pathfix.py -pni "%{__python2} %{py2_shbang_opts}" '%{buildroot}%{_bindir}/nxdialog' +%endif %endif %if 0%{?fdupes:1} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch build-3.5.99.26 in repository nx-libs. commit b5c1d5fced6f0109bdd5cd9416afe77644256071 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Feb 23 13:17:55 2023 +0100 debian/rules: fix version detection on testing and unstable. --- debian/rules | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/debian/rules b/debian/rules index 3ca425f76..dac7c6e41 100755 --- a/debian/rules +++ b/debian/rules @@ -20,6 +20,26 @@ VENDOR_DEBIAN := $(shell { dpkg-vendor --is 'Debian' && echo 'yes'; } || { dpkg- ifeq ($(VENDOR_DEBIAN),yes) RELEASE_VER := $(shell /usr/bin/lsb_release -r | cut -d ':' -f'2' | sed -e 's/\s*//g' | cut -d '.' -f'1') + + # Newer Debian versions might report "n/a" for testing and unstable. + ifeq ($(RELEASE_VER),n/a) + # On these platforms, the best way to determine the system version is by + # going through "apt-cache policy". + # Note that this should only be the case for either testing or unstable. + # Other systems should have a proper version number. + # This is also why we can just drop any suites/archive names (this is + # what a= means) containing a dash character (e.g., "stable-updates") + # and only pick the first match. + RELEASE_VER := $(shell /usr/bin/apt-cache policy | grep -E 'o=(De|Rasp)bian,' | grep -E 'l=(De|Rasp)bian,' | grep -F 'c=main,' | grep -Eo 'a=[^, ]*' | sed -e 's/^a=//' | grep -v -- '-' | head -n '1') + + # Do error checking. + ifneq ($(RELEASE_VER),testing) + ifneq ($(RELEASE_VER),unstable) + $(error Release version could not be determined, sorry. Extracted value: $(RELEASE_VER)) + endif + endif + endif + # Let's fake testing's and unstable's "release version"... ifeq ($(RELEASE_VER),testing) RELEASE_VER := 999 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch build-3.5.99.26 in repository nx-libs. commit fa7628310f7ad16778e641a8d3cd342dfd7f9c9a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Sep 11 20:45:16 2021 +0000 debian/rules: Define -DUseTIRPC=1 for nx-X11 build on Debian and Ubuntu versions that already have libtirpc. --- debian/rules | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 9bfee93fd..3ca425f76 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,44 @@ export LIBDIR = "/usr/lib/$(DEB_HOST_MULTIARCH)" export LIBEXECDIR = "$(LIBDIR)/nx/bin" export INCLUDEDIR = "/usr/include/$(DEB_HOST_MULTIARCH)" +VENDOR_DEBIAN := 0 +RELEASE_VER := 0 + +# detect VENDOR_* variables and RELEASE_VER{,_MAJOR,_MINOR} +VENDOR_DEBIAN := $(shell { dpkg-vendor --is 'Debian' && echo 'yes'; } || { dpkg-vendor --is 'Raspbian' && echo 'yes'; }) + +ifeq ($(VENDOR_DEBIAN),yes) + RELEASE_VER := $(shell /usr/bin/lsb_release -r | cut -d ':' -f'2' | sed -e 's/\s*//g' | cut -d '.' -f'1') + # Let's fake testing's and unstable's "release version"... + ifeq ($(RELEASE_VER),testing) + RELEASE_VER := 999 + endif + ifeq ($(RELEASE_VER),unstable) + RELEASE_VER := 9999 + endif +else + VENDOR_UBUNTU := $(shell dpkg-vendor --is 'Ubuntu' && echo 'yes') + + ifeq ($(VENDOR_UBUNTU),yes) + RELEASE_VER_MAJOR := $(shell lsb_release -r | cut -d ':' -f '2' | sed -e 's/\s*//g' | cut -d '.' -f '1') + RELEASE_VER_MINOR := $(shell lsb_release -r | cut -d ':' -f '2' | sed -e 's/\s*//g' | cut -d '.' -f '2') + endif +endif + +# detect when to use libtirpc and when glibc still provides rpc/rpc.h +IMAKE_EXTRA_DEFINES := "" +ifeq ($(VENDOR_DEBIAN),yes) + ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER) >= 10 )) && echo '"'"'yes'"'"),yes) + IMAKE_EXTRA_DEFINES+="-DUseTIRPC=1" + endif +else + ifeq ($(VENDOR_UBUNTU),yes) + ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MAJOR) >= 18 )) && echo '"'"'yes'"'"),yes) + IMAKE_EXTRA_DEFINES+="-DUseTIRPC=1" + endif + endif +endif + %: CONFIGURE="./configure --disable-silent-rules \ --prefix=/usr \ @@ -59,8 +97,8 @@ override_dh_auto_install: override_dh_auto_build: debian/compat.sh - PREFIX='/usr' dh_auto_build --no-parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))' || \ - PREFIX='/usr' dh_auto_build -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))' + PREFIX='/usr' dh_auto_build --no-parallel -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))' IMAKE_DEFINES="$(IMAKE_EXTRA_DEFINES)" || \ + PREFIX='/usr' dh_auto_build -- CDEBUGFLAGS="$(CPPFLAGS) $(CFLAGS)" LOCAL_LDFLAGS="$(LDFLAGS)" SHLIBGLOBALSFLAGS='$(filter-out -pie,$(LDFLAGS))' IMAKE_DEFINES="$(IMAKE_EXTRA_DEFINES)" override_dh_strip: dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git