From ee9766a6018bd4e91a6350270d22cd688d60a13b Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sep 15 2022 01:41:57 +0000 Subject: update to v3.6.0 --- diff --git a/.gitignore b/.gitignore index 218d9a7..5e2b416 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /desktop-3.5.2.tar.gz /desktop-3.5.3.tar.gz /desktop-3.5.4.tar.gz +/desktop-3.6.0.tar.gz diff --git a/nextcloud-client.spec b/nextcloud-client.spec index f7e19c2..0387017 100644 --- a/nextcloud-client.spec +++ b/nextcloud-client.spec @@ -4,7 +4,7 @@ %endif Name: nextcloud-client -Version: 3.5.4 +Version: 3.6.0 Release: %autorelease Summary: The Nextcloud Client diff --git a/sources b/sources index b709b4b..3e71690 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (desktop-3.5.4.tar.gz) = 7b8afe19acad7f7ca96184b0f925e0eb324605a11bc468ef5662e5a879cada16483b9185e12336471ca2a9debf2e00671d8245bdbae2f7be01af756b57225bae +SHA512 (desktop-3.6.0.tar.gz) = efaca6669b2da039b20026cbdc9cf4d3f1023b3c33e03c0ef6f2d0e1f1c20fd65fab80155356ec27562f93e450915a32bc2af96c4ac3b47355ec738bcd71ff61 diff --git a/xcb_3.5.4.patch b/xcb_3.5.4.patch deleted file mode 100644 index 06faa9e..0000000 --- a/xcb_3.5.4.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ruN desktop-3.4.1-orig/src/gui/main.cpp desktop-3.4.1/src/gui/main.cpp ---- desktop-3.4.1-orig/src/gui/main.cpp 2021-12-17 07:52:51.000000000 -0800 -+++ desktop-3.4.1/src/gui/main.cpp 2022-01-15 14:02:39.460156432 -0800 -@@ -56,8 +56,24 @@ - .arg(Theme::instance()->appNameGUI())); - } - -+#ifdef Q_OS_LINUX -+void wayland_hacks() -+{ -+ QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP").toLower(); -+ QByteArray sessionDesktop = qgetenv("XDG_SESSION_DESKTOP").toLower(); -+ QByteArray sessionType = qgetenv("XDG_SESSION_TYPE").toLower(); -+ if (sessionType.contains("wayland") && (currentDesktop.contains("gnome") || sessionDesktop.contains("gnome"))) -+ { -+ qputenv("QT_QPA_PLATFORM", "xcb"); -+ } -+} -+#endif -+ - int main(int argc, char **argv) - { -+#ifdef Q_OS_LIUX -+ wayland_hacks(); -+#endif - #ifdef Q_OS_WIN - SetDllDirectory(L""); - #endif diff --git a/xcb_3.6.0.patch b/xcb_3.6.0.patch new file mode 100644 index 0000000..ea34583 --- /dev/null +++ b/xcb_3.6.0.patch @@ -0,0 +1,30 @@ +--- desktop-3.6.0-orig/src/gui/main.cpp 2022-09-14 20:07:40.359852434 -0500 ++++ desktop-3.6.0/src/gui/main.cpp 2022-09-14 20:07:20.869331548 -0500 +@@ -56,8 +56,27 @@ + .arg(Theme::instance()->appNameGUI())); + } + ++#ifdef Q_OS_LINUX ++void wayland_hacks() ++{ ++ QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP").toLower(); ++ QByteArray sessionDesktop = qgetenv("XDG_SESSION_DESKTOP").toLower(); ++ QByteArray sessionType = qgetenv("XDG_SESSION_TYPE").toLower(); ++ if (sessionType.contains("wayland") && (currentDesktop.contains("gnome") || sessionDesktop.contains("gnome"))) ++ { ++ qputenv("QT_QPA_PLATFORM", "xcb"); ++ } ++} ++#endif ++ ++ + int main(int argc, char **argv) + { ++ ++#ifdef Q_OS_LIUX ++ wayland_hacks(); ++#endif ++ + qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-gpu --no-sandbox"); + QCoreApplication::setAttribute(Qt::AA_UseOpenGLES); +