From 69b6c719517c047eaa2197517f9e65ed2c21560d Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Sun, 23 Jun 2024 15:35:14 -0400 Subject: [PATCH] update vim-plug and easyeffects --- home/config/zsh/zprofile | 2 +- modules/freya/packages/audio.scm | 11 +++-- ...yleplugins-fix-build-against-Qt-5.15.patch | 44 +++++++++++++++++++ ...qt5-styleplugins-fix-gtk2-background.patch | 25 +++++++++++ modules/freya/packages/qt.scm | 28 ++++++++++++ modules/freya/packages/vim.scm | 4 +- 6 files changed, 108 insertions(+), 6 deletions(-) create mode 100644 modules/freya/packages/patches/qt5-styleplugins-fix-build-against-Qt-5.15.patch create mode 100644 modules/freya/packages/patches/qt5-styleplugins-fix-gtk2-background.patch create mode 100644 modules/freya/packages/qt.scm diff --git a/home/config/zsh/zprofile b/home/config/zsh/zprofile index 89ec646..a39a880 100644 --- a/home/config/zsh/zprofile +++ b/home/config/zsh/zprofile @@ -12,7 +12,7 @@ export SDL_VIDEODRIVER=wayland export CLUTTER_BACKEND=wayland export ELM_DISPLAY=wl export QT_AUTO_SCREEN_SCALE_FACTOR=1 -export QT_QPA_PLATFORM=wayland;xcb +export QT_QPA_PLATFORM="wayland;xcb" export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 # xdg diff --git a/modules/freya/packages/audio.scm b/modules/freya/packages/audio.scm index beae55e..832d960 100644 --- a/modules/freya/packages/audio.scm +++ b/modules/freya/packages/audio.scm @@ -14,6 +14,7 @@ #:use-module (gnu packages tbb) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) + #:use-module (gnu packages gcc) #:use-module (gnu packages pretty-print) #:use-module (gnu packages algebra) #:use-module (gnu packages cpp) @@ -26,7 +27,7 @@ (define-public easyeffects (package (name "easyeffects") - (version "7.0.1") + (version "7.1.7") (arguments (list #:modules @@ -42,7 +43,8 @@ `(,gtk+ "bin") pkg-config cmake - appstream-glib)) + appstream-glib + gcc-13)) (inputs (list zita-convolver rnnoise tbb @@ -62,6 +64,9 @@ libportal gsl speex + ladspa + soundtouch + gcc-13 `(,util-linux "lib"))) (source (origin (method url-fetch) @@ -69,7 +74,7 @@ ".tar.gz")) (sha256 (base32 - "05j52fy51zjai7n0j23chydfgkfq9n82h2ih806z3b47zhk2h2j2")))) + "0akk2syckqhn13y7zhgpk2f7pyk09cjv9qcrx2pfba09pzw1z2f3")))) (build-system meson-build-system) (synopsis "Limiter, compressor, convolver, equalizer and auto volume and many other plugins for PipeWire applications") (description "This package provides @code{easyeffects}, which is an audio application for use atop of @code{pipewire} diff --git a/modules/freya/packages/patches/qt5-styleplugins-fix-build-against-Qt-5.15.patch b/modules/freya/packages/patches/qt5-styleplugins-fix-build-against-Qt-5.15.patch new file mode 100644 index 0000000..7eb7441 --- /dev/null +++ b/modules/freya/packages/patches/qt5-styleplugins-fix-build-against-Qt-5.15.patch @@ -0,0 +1,44 @@ +From 335dbece103e2cbf6c7cf819ab6672c2956b17b3 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Thu, 28 May 2020 12:35:42 +0200 +Subject: [PATCH] fix build against Qt 5.15 + +With 0a93db4d82c051164923a10e4382b12de9049b45 ("Unify application +palette handling between QGuiApplication and QApplication") +QApplicationPrivate::setSystemPalette is no longer used and necessary. +--- + src/plugins/styles/gtk2/qgtkstyle.cpp | 2 ++ + src/plugins/styles/gtk2/qgtkstyle_p.cpp | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp +index 36169c9..2544593 100644 +--- a/src/plugins/styles/gtk2/qgtkstyle.cpp ++++ b/src/plugins/styles/gtk2/qgtkstyle.cpp +@@ -440,7 +440,9 @@ void QGtkStyle::polish(QApplication *app) + // not supported as these should be entirely determined by + // current Gtk settings + if (app->desktopSettingsAware() && d->isThemeAvailable()) { ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + QApplicationPrivate::setSystemPalette(standardPalette()); ++#endif + QApplicationPrivate::setSystemFont(d->getThemeFont()); + d->applyCustomPaletteHash(); + if (!d->isKDE4Session()) +diff --git a/src/plugins/styles/gtk2/qgtkstyle_p.cpp b/src/plugins/styles/gtk2/qgtkstyle_p.cpp +index e57b3d8..e71beb0 100644 +--- a/src/plugins/styles/gtk2/qgtkstyle_p.cpp ++++ b/src/plugins/styles/gtk2/qgtkstyle_p.cpp +@@ -508,7 +508,9 @@ void QGtkStyleUpdateScheduler::updateTheme() + if (oldTheme != QGtkStylePrivate::getThemeName()) { + oldTheme = QGtkStylePrivate::getThemeName(); + QPalette newPalette = qApp->style()->standardPalette(); ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + QApplicationPrivate::setSystemPalette(newPalette); ++#endif + QApplication::setPalette(newPalette); + if (!QGtkStylePrivate::instances.isEmpty()) { + QGtkStylePrivate::instances.last()->initGtkWidgets(); +-- +2.26.2 + diff --git a/modules/freya/packages/patches/qt5-styleplugins-fix-gtk2-background.patch b/modules/freya/packages/patches/qt5-styleplugins-fix-gtk2-background.patch new file mode 100644 index 0000000..888ec0b --- /dev/null +++ b/modules/freya/packages/patches/qt5-styleplugins-fix-gtk2-background.patch @@ -0,0 +1,25 @@ +From 20b0985a77df913585628d49a3b541fb957ae366 Mon Sep 17 00:00:00 2001 +From: gamezelda +Date: Thu, 4 Jun 2020 00:06:50 +0200 +Subject: [PATCH] fix setting background palette + +--- + src/plugins/styles/gtk2/qgtkstyle.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp +index 2544593..6138bd2 100644 +--- a/src/plugins/styles/gtk2/qgtkstyle.cpp ++++ b/src/plugins/styles/gtk2/qgtkstyle.cpp +@@ -442,6 +442,8 @@ void QGtkStyle::polish(QApplication *app) + if (app->desktopSettingsAware() && d->isThemeAvailable()) { + #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + QApplicationPrivate::setSystemPalette(standardPalette()); ++#else ++ QApplication::setPalette(standardPalette()); + #endif + QApplicationPrivate::setSystemFont(d->getThemeFont()); + d->applyCustomPaletteHash(); +-- +2.27.0 + diff --git a/modules/freya/packages/qt.scm b/modules/freya/packages/qt.scm new file mode 100644 index 0000000..2971432 --- /dev/null +++ b/modules/freya/packages/qt.scm @@ -0,0 +1,28 @@ +(define-module (freya packages qt) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) + #:use-module (gnu packages node)) + +;(define-public qt5-styleplugins +; (let ((commit "7bd6205398b2d89b3ac083b2f6f00b197f40057a") +; (revision "1")) +; (package +; (name "qt5-styleplugins") +; (version (git-version "5.0.0" revision commit)) +; (source (origin +; (method git-fetch) +; (uri (git-reference +; (url "https://github.com/qt/qtstyleplugins") +; (commit commit))) +; (patches (list +; (local-file "patches/qt5-styleplugins-fix-gtk2-background.patch") +; (local-file "patches/qt5-styleplugins-fixbuild-against-QT-5.15.patch"))) +; (file-name (git-file-name name version)) +; (sha256 +; (base32 +; "0gy0g0kxb3q1wjqrypnvmrxcb4ld3advikchygpwpfp4s9v0mmvd")))) +; (build-system meson-build-system) + diff --git a/modules/freya/packages/vim.scm b/modules/freya/packages/vim.scm index a11630a..6c94147 100644 --- a/modules/freya/packages/vim.scm +++ b/modules/freya/packages/vim.scm @@ -19,7 +19,7 @@ (define-public vim-plug (package (name "vim-plug") - (version "0.11.0") + (version "0.13.0") (source (origin (method git-fetch) @@ -28,7 +28,7 @@ (commit version))) (sha256 (base32 - "0bfgadn31n516x0m0kr88jk9x79rl6zllnwij759wpazmw1p0xg8")) + "048kk5ar6i5k4nrq0pma6ww7yg64h6aa8d0blgxpq7kfqkwwglfj")) (file-name (git-file-name name version)))) (build-system trivial-build-system) (arguments