Felix Yan pushed to branch main at Arch Linux / Packaging / Packages / 
qt6-wayland


Commits:
e308841f by Felix Yan at 2024-11-22T01:26:18+08:00
upgpkg: 6.8.0-2: cherry-pick upstream fixes for DDE

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,14 +1,14 @@
 pkgbase = qt6-wayland
        pkgdesc = Provides APIs for Wayland
        pkgver = 6.8.0
-       pkgrel = 1
+       pkgrel = 2
        url = https://www.qt.io
        arch = x86_64
        groups = qt6
-       license = GPL3
-       license = LGPL3
-       license = FDL
-       license = custom
+       license = GPL-3.0-only
+       license = LGPL-3.0-only
+       license = LicenseRef-Qt-Commercial
+       license = Qt-GPL-exception-1.0
        makedepends = cmake
        makedepends = git
        makedepends = ninja


=====================================
PKGBUILD
=====================================
@@ -5,7 +5,7 @@
 pkgname=qt6-wayland
 _pkgver=6.8.0
 pkgver=6.8.0
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url='https://www.qt.io'
 license=(GPL-3.0-only
@@ -29,6 +29,13 @@ _pkgfn=${pkgname/6-/}
 source=(git+https://code.qt.io/qt/$_pkgfn#tag=v$_pkgver)
 sha256sums=('09927060c5595c33176d7a9828b427a0934484c0741d910437a49c6cad5165d4')
 
+prepare() {
+  cd $_pkgfn
+  # Cherry picks for DDE
+  git cherry-pick -n 67f121cc4c3865aa3a93cf563caa1d9da3c92695
+  git cherry-pick -n 070414dd4155e13583e5e8b16bed1a5b68d32910
+}
+
 build() {
   cmake -B build -S $_pkgfn -G Ninja \
     -DCMAKE_MESSAGE_LOG_LEVEL=STATUS



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-wayland/-/commit/e308841f3ea2b3703fa42a0126c5d6e653c49f3c

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-wayland/-/commit/e308841f3ea2b3703fa42a0126c5d6e653c49f3c
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to