diff --git a/.gitignore b/.gitignore index 876ecee..80b5575 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /x2goclient-4.1.1.0.tar.gz /x2goclient-4.1.1.1.tar.gz /x2goclient-4.1.2.1.tar.gz +/x2goclient-4.1.2.2.tar.gz diff --git a/sources b/sources index 65976c9..28e6ce9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (x2goclient-4.1.2.1.tar.gz) = 0dc4ef0b154c582e62d8e1c5fd0284510fd8c7ddac1d8f49638ca68244ac24f9220c9089e93a105cfa8978d1e2af9a4379deeb934d58741f51ee473ab041d369 +SHA512 (x2goclient-4.1.2.2.tar.gz) = 85e6db6a34629512be64376883c205d8bf0696c4697cf216970b57a91ffe68dcf7f38bfda0d396c104602f6991b596c5fb0934e75fa4a93f7d0e41c2b3f5ac4d diff --git a/x2goclient-libssh.patch b/x2goclient-libssh.patch deleted file mode 100644 index f6c4fb6..0000000 --- a/x2goclient-libssh.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -up x2goclient-4.1.2.1/x2goclient.pro.libssh x2goclient-4.1.2.1/x2goclient.pro ---- x2goclient-4.1.2.1/x2goclient.pro.libssh 2019-08-16 11:13:48.195725042 -0600 -+++ x2goclient-4.1.2.1/x2goclient.pro 2019-08-16 11:23:43.504320111 -0600 -@@ -6,6 +6,7 @@ include (x2goclientconfig.pri) - - CONFIG += $$(X2GO_CLIENT_TARGET) - CONFIG += $$(X2GO_LINUX_STATIC) -+CONFIG += link_pkgconfig - #CONFIG += console - - VERSION = "$$cat($${PWD}/VERSION)" -@@ -132,7 +133,39 @@ SOURCES += src/sharewidget.cpp \ - src/compat.cpp \ - src/pulsemanager.cpp - --LIBS += -lssh -lssh_threads -+unix { -+ isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config -+ -+ !x2go_linux_static { -+ PKGCONFIG += libssh -+ -+ # Failure to find libssh_threads is non-fatal, since newer libssh versions -+ # don't ship a separate library any longer. -+ # We can't just check for version 0.8.0, though, since some distros -+ # (looking at you, Ubuntu Bionic/18.04) ship a pre-release version of 0.8.0 -+ # which is actually still based upon 0.7.x and still has libssh_threads... -+ system("$$PKG_CONFIG --exists 'libssh_threads'"):PKGCONFIG += libssh_threads -+ } -+ else { -+ # No pkgconfig stuff, because... for some reason we wanted to call the -+ # library libssh_static. This doesn't sound like a standard name a Linux -+ # distro would ship, but at the same time I doubt anyone is building this -+ # package statically anyway. And even if they do, they shouldn't. -+ # It's also unclear how libssh_threads is called in this scheme. -+ LIBS += -lssh_static -+ } -+} -+else:win32 { -+ # pkgconfig is... tricky on Windows. -+ # We'll hardcode stuff here. Make sure that it's consistent with the -+ # libraries we use on Windows. -+ LIBS += -lssh -lssh_threads -+} -+else { -+ # For backwards-compatibility. -+ LIBS += -lssh -lssh_threads -+} -+ - win32:LIBS += -lAdvAPI32 -lshell32 -lUser32 - - RC_FILE = res/x2goclient.rc -@@ -181,21 +215,15 @@ exists(res/txt/changelog) { - RESOURCES += res/changelog.qrc - } - --linux-g++ { -- message("building $$TARGET with ldap and cups") -- LIBS += -lldap -lcups -lX11 -lXpm -- DEFINES += __linux__ --} --linux-g++-64 { -- message("building $$TARGET with ldap and cups") -+linux|linux-* { -+ message("building $$TARGET via $$QMAKESPEC with ldap and cups") - LIBS += -lldap -lcups -lX11 -lXpm - DEFINES += __linux__ - } - x2go_linux_static { - message("linking all libs statically") - DEFINES += __linux__ -- LIBS -= -lssh -- LIBS += -lssh_static -lssl -lXpm -+ LIBS += -lssl -lXpm - QMAKE_LFLAGS = -Bstatic $$QMAKE_LFLAGS - } - diff --git a/x2goclient-optflags.patch b/x2goclient-optflags.patch index 852f6f1..1e72be6 100644 --- a/x2goclient-optflags.patch +++ b/x2goclient-optflags.patch @@ -1,12 +1,12 @@ -diff -up x2goclient-4.1.2.1/Makefile.optflags x2goclient-4.1.2.1/Makefile ---- x2goclient-4.1.2.1/Makefile.optflags 2018-07-18 17:03:52.666697233 -0600 -+++ x2goclient-4.1.2.1/Makefile 2018-07-18 17:09:01.015980833 -0600 -@@ -67,7 +67,7 @@ build: build_man +diff -up x2goclient-4.1.2.2/Makefile.optflags x2goclient-4.1.2.2/Makefile +--- x2goclient-4.1.2.2/Makefile.optflags 2020-02-13 20:59:14.722337773 -0700 ++++ x2goclient-4.1.2.2/Makefile 2020-02-13 21:00:58.499404703 -0700 +@@ -68,7 +68,7 @@ build: build_man build_client: $(LRELEASE_BINARY) x2goclient.pro -- mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" $(QMAKE_OPTS) ../x2goclient.pro -+ mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${RPM_OPT_FLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${RPM_OPT_FLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${RPM_LD_FLAGS} ${LDFLAGS}" $(QMAKE_OPTS) ../x2goclient.pro +- mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" QMAKE_LIBS="${LIBS}" $(QMAKE_OPTS) ../x2goclient.pro ++ mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${RPM_OPT_FLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${RPM_OPT_FLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${RPM_LD_FLAGS} ${LDFLAGS}" QMAKE_LIBS="${LIBS}" $(QMAKE_OPTS) ../x2goclient.pro cd $(CLIENT_DIR) && $(MAKE) build_man: diff --git a/x2goclient-qt5.11.patch b/x2goclient-qt5.11.patch deleted file mode 100644 index ab26e49..0000000 --- a/x2goclient-qt5.11.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit ce14cfda34175b6456a8cc7d1e336dce2b0b0682 -Author: Mihai Moldovan -Date: Thu Jul 5 08:52:18 2018 +0200 - - src/printwidget.cpp: add QButtonGroup include, fixes compile errors with Qt 5.11+. - -diff --git a/src/printwidget.cpp b/src/printwidget.cpp -index 58a8af7..131d340 100644 ---- a/src/printwidget.cpp -+++ b/src/printwidget.cpp -@@ -23,6 +23,7 @@ - #include "x2gosettings.h" - #include "x2gologdebug.h" - #include -+#include - #ifdef Q_OS_WIN - #include "wapi.h" - #endif diff --git a/x2goclient.spec b/x2goclient.spec index 93bf4bb..7b38537 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -1,6 +1,6 @@ Name: x2goclient -Version: 4.1.2.1 -Release: 6%{?dist} +Version: 4.1.2.2 +Release: 1%{?dist} Summary: X2Go Client application License: GPLv2+ @@ -9,13 +9,9 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}. # Drop clumsy attempt at Kerberos delegation # http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=731 Patch0: x2goclient-krb5.patch -# Upstream fix to build with Qt 5.11 -Patch1: x2goclient-qt5.11.patch # ensure RPM_LD_FLAGS/RPM_OPT_FLAGS are used # https://bugzilla.redhat.com/show_bug.cgi?id=1306463 Patch2: x2goclient-optflags.patch -# Fix build with newer libssh without libssh_threads -Patch3: x2goclient-libssh.patch # Select X11 backend on wayland # https://bugzilla.redhat.com/show_bug.cgi?id=1756430 # https://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=1414 @@ -69,9 +65,7 @@ You can use it to connect to running sessions and start new sessions. %prep %setup -q %patch0 -p1 -b .krb5 -%patch1 -p1 -b .qt5.11 %patch2 -p1 -b .optflags -%patch3 -p1 -b .libssh %patch4 -p1 -b .wayland # Fix up install issues sed -i -e 's/-o root -g root//' Makefile @@ -111,6 +105,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d %changelog +* Fri Feb 14 2020 Orion Poplawski - 4.1.2.2-1 +- Update to 4.1.2.2 + * Fri Jan 31 2020 Fedora Release Engineering - 4.1.2.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild