[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/35: gnu: qtbase: Revert to gtk+ (3) instead of gtk (4).
From: |
guix-commits |
Subject: |
04/35: gnu: qtbase: Revert to gtk+ (3) instead of gtk (4). |
Date: |
Mon, 1 Aug 2022 00:12:11 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 4af9984a4e77d42cd063de590c164044599b4062
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Jul 25 20:57:09 2022 -0400
gnu: qtbase: Revert to gtk+ (3) instead of gtk (4).
This revert the upgrade from GTK 3 to 4 in
8d7fdbe261e32a63df8c47f06b1a43095b6084c7. Qt doesn't yet support GTK 4.
* gnu/packages/qt.scm (qtbase)[native-inputs]: Remove gtk.
[inputs]: Do not replace gtk+ by gtk.
---
gnu/packages/qt.scm | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 001e6286fe..9cb6ae5893 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -805,14 +805,12 @@ developers using C++ or QML, a CSS & JavaScript like
language.")
(("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)))))))))
(native-inputs
(modify-inputs (package-native-inputs qtbase-5)
- (prepend gtk ;for GTK theme support
- ninja
+ (prepend ninja
wayland-protocols
xvfb-run)))
(inputs
(modify-inputs (package-inputs qtbase-5)
(prepend bash-minimal coreutils-minimal libxcb md4c)
- (replace "gtk+" gtk) ;use latest gtk
(replace "postgresql" postgresql))) ;use latest postgresql
(native-search-paths
(list (search-path-specification
- 25/35: gnu: Add qttools, version 6.3.1., (continued)
- 25/35: gnu: Add qttools, version 6.3.1., guix-commits, 2022/08/01
- 27/35: gnu: Add qtnetworkauth, version 6.3.1., guix-commits, 2022/08/01
- 31/35: gnu: libjami: Enable test agent., guix-commits, 2022/08/01
- 09/35: gnu: Add qtshadertools., guix-commits, 2022/08/01
- 05/35: gnu: qtsvg: Rename variable to qtsvg-5., guix-commits, 2022/08/01
- 11/35: gnu: Add qtmultimedia, version 6.3.1., guix-commits, 2022/08/01
- 16/35: gnu: qtquickcontrols2: Define as obsoleted by qtdeclarative., guix-commits, 2022/08/01
- 24/35: gnu: qttools: Rename to qttools-5., guix-commits, 2022/08/01
- 26/35: gnu: qtnetworkauth: Rename to qtnetworkauth-5., guix-commits, 2022/08/01
- 32/35: gnu: Remove jami-libclient., guix-commits, 2022/08/01
- 04/35: gnu: qtbase: Revert to gtk+ (3) instead of gtk (4).,
guix-commits <=
- 18/35: gnu: Add qtwebsockets, version 6.3.1., guix-commits, 2022/08/01
- 15/35: gnu: qtquickcontrols2: Rename to qtquickcontrols2-5., guix-commits, 2022/08/01
- 14/35: gnu: qtquickcontrols: Rename to qtquickcontrols-5., guix-commits, 2022/08/01
- 13/35: gnu: Add qtdeclarative, version 6.3.1., guix-commits, 2022/08/01
- 12/35: gnu: qtdeclarative: Rename to qtdeclarative-5., guix-commits, 2022/08/01
- 23/35: gnu: Add qt5compat., guix-commits, 2022/08/01
- 33/35: gnu: Deprecate jami-gnome for jami., guix-commits, 2022/08/01
- 35/35: gnu: jami: Apply upstream patch that fixes a usability issue., guix-commits, 2022/08/01
- 28/35: gnu: Add qtpositioning., guix-commits, 2022/08/01
- 17/35: gnu: qtwebsockets: Rename to qtwebsockets-5., guix-commits, 2022/08/01