Dear all, On Sun, 28 Oct 2018 19:44:35 +0100, Tristan Miller <psychon...@nothingisreal.com> wrote: > I have a similar problem on openSUSE Tumbleweed, both with the > openSUSE's own official X2Go packages and the X2Go packages from > <https://wiki.x2go.org/doku.php/wiki:repositories:suse>. I do have > libssh4-0.7.2 installed, as well as x2goclient-4.1.2.2, but Tumbleweed > wants me to upgrade to libssh4-0.8.3. Upgrading libssh4 would mean > uninstalling x2goclient, whereas not upgrading libssh4 makes it > impossible to install lots of other upgrades that I need. > > I suspect that whoever is maintaining the x2goclient RPMs needs to > change the build requirements to libssh4-0.8.3. Hopefully this > requires changes only to the spec file, not the source code.
I believe I've discovered the solution. Applying the attached patch to the RPM spec file, and including the attached patch to the x2goclient source, allows the RPM to be built and installed on openSUSE Tumbleweed. Further details, for those who aren't au fait with development tools: 1. Grab the latest SRPM of x2goclient from <http://packages.x2go.org/opensuse/tumbleweed/heuler/SRPM/x2goclient/> 2. Install it: $ sudo rpm --install x2goclient-*.heuler.src.rpm 3. Link the source code from your local rpmbuild directory: $ mkdir -p ~/rpmbuild/SOURCES $ cd ~/rpmbuild/SOURCES $ ln -s /usr/src/packages/SOURCES/x2goclient-*.tar.gz . $ ln -s /usr/src/packages/SOURCES/x2goclient-rpmlintrc 4. Place the attached x2goclient-libssh.patch in ~/rpmbuild/SOURCES. 5. Patch the spec file using the attached x2goclient.spec.patch file: $ mkdir -p ~/rpmbuild/SPECS $ patch -o ~/rpmbuild/SPECS/x2goclient.spec \ /usr/src/packages/SPECS/x2goclient.spec x2goclient.spec.patch 6. Build the x2goclient RPM: $ cd ~/rpmbuild/SPECS $ rpmbuild -bb x2goclient.spec 7. Install the RPM: $ sudo zypper in ~/rpmbuild/RPMS/*/x2goclient*.heuler.*.rpm The above assumes that you have the necessary development tools installed and the necessary x2goclient dependencies. I've tried submitting these patches along with a bug report to X2Go's arcane bug reporting system but I have no idea if I've done so properly or if it's even gone through. Regards, Tristan -- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- Tristan Miller Free Software developer, ferret herder, logologist https://logological.org/ =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
--- x2goclient-4.1.2.2/x2goclient.pro 2018-09-05 15:02:43.000000000 +0200
+++ x2goclient-4.1.2.2.new/x2goclient.pro 2018-10-28 20:08:50.893643887 +0100
@@ -132,7 +132,7 @@
src/compat.cpp \
src/pulsemanager.cpp
-LIBS += -lssh -lssh_threads
+LIBS += -lssh
win32:LIBS += -lAdvAPI32 -lshell32 -lUser32
RC_FILE = res/x2goclient.rc
--- /usr/src/packages/SPECS/x2goclient.spec 2018-09-05 15:02:44.000000000 +0200 +++ x2goclient.spec 2018-10-28 20:30:41.606190285 +0100 @@ -14,6 +14,7 @@ URL: https://www.x2go.org Source0: https://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz Source1: x2goclient-rpmlintrc +Patch0: x2goclient-libssh.patch BuildRequires: cups-devel BuildRequires: desktop-file-utils @@ -45,10 +46,15 @@ %if "%{?_vendor}" == "suse" BuildRequires: fdupes update-desktop-files +%if 0%{?suse_version} >= 1500 +BuildRequires: libssh-devel >= 0.8.0 +BuildRequires: pkgconfig(x11) pkgconfig(xpm) pkgconfig(xproto) +%else %if 0%{?suse_version} >= 1130 BuildRequires: pkgconfig(libssh) >= 0.6.3 BuildRequires: pkgconfig(x11) pkgconfig(xpm) pkgconfig(xproto) %endif +%endif %if 0%{?suse_version} && 0%{?suse_version} < 1130 BuildRequires: libssh-devel >= 0.6.3 BuildRequires: xorg-x11-libXpm-devel xorg-x11-proto-devel @@ -110,7 +116,9 @@ sed -i -e '/^QMAKE_BINARY=/s@qmake-qt4@%{_bindir}/qmake@' Makefile sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@%{_bindir}/lrelease@' Makefile %endif - +%if 0%{?suse_version} > 1500 +%patch0 -p1 +%endif %build export PATH=%{_qt4_bindir}:$PATH
pgpJ6fm81ZiLP.pgp
Description: OpenPGP digital signature
_______________________________________________ x2go-user mailing list x2go-user@lists.x2go.org https://lists.x2go.org/listinfo/x2go-user
