Merge pull request 'kwin-fourier 6.6.4->6.6.5 + qt6-base-fourier 6.11.0->6.11.1 (track upstream extra)' (#12) from claude-noether/marfrit-packages:noether/kwin-qt6-baseline-bump into main

Reviewed-on: #12

arch/kwin-fourier/PKGBUILD

@@ -2,7 +2,7 @@
 # Upstream maintainers: Felix Yan, Antonio Rojas
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 #
-# kwin-fourier — KWin 6.6.4 with the V4L2-stateless implicit-sync
+# kwin-fourier — KWin 6.6.5 with the V4L2-stateless implicit-sync
 # transaction wait bypass. Hypothesis: KWin's
 # `Transaction::watchDmaBuf` calls DMA_BUF_IOCTL_EXPORT_SYNC_FILE on
 # every plane of every imported dmabuf and parks the transaction on a
@@ -21,9 +21,9 @@
 # ../chromium-fourier/KWIN_PIVOT.md for the full diagnosis thread.
 
 pkgname=kwin-fourier
-pkgver=6.6.4
+pkgver=6.6.5
 _dirver=$(echo $pkgver | cut -d. -f1-3)
-pkgrel=3
+pkgrel=1
 _upname=kwin
 epoch=1
 arch=(aarch64 x86_64)
@@ -103,7 +103,7 @@ conflicts=(kwin)
 replaces=(kwin)
 source=(https://download.kde.org/stable/plasma/$_dirver/$_upname-$pkgver.tar.xz{,.sig}
         0001-transaction-bypass-watchDmaBuf-fence-wait.patch)
-sha256sums=('3f9439760580a977d018daf4b35b62e5a1700def7b21c8dfbfc789d21378d7ad'
+sha256sums=('6c187ce7a5506090b438ef900103836fa0537674dde8b31e5b497ef321643cb4'
             'SKIP'
             'SKIP')
 validpgpkeys=('E0A3EB202F8E57528E13E72FD7574483BB57B18D'  # Jonathan Esk-Riddell <jr@jriddell.org>

arch/qt6-base-fourier/PKGBUILD

@@ -21,14 +21,14 @@
 # pkgbase stays as qt6-base so $_pkgfn (= ${pkgbase/6-/} = "qtbase")
 # resolves correctly. The "-fourier" suffix lives only in the
 # directory name and the commit history; epoch=1 gives our local
-# build strict precedence over upstream pkgrel=2 until upstream lands
+# build strict precedence over upstream pkgrel=N until upstream lands
 # the GL_R8/ES3 fix and we can drop the epoch.
 pkgbase=qt6-base
 pkgname=(qt6-base-fourier
          qt6-xcb-private-headers-fourier)
-_pkgver=6.11.0
+_pkgver=6.11.1
 pkgver=${_pkgver/-/}
-pkgrel=3
+pkgrel=1
 epoch=1
 arch=(aarch64 x86_64)
 url='https://www.qt.io'
@@ -42,7 +42,6 @@ depends=(brotli
          double-conversion
          fontconfig
          freetype2
-         gcc-libs
          glib2
          glibc
          harfbuzz
@@ -51,6 +50,7 @@ depends=(brotli
          libb2
          libcups
          libdrm
+         libgcc
          libgl
          libice
          libinput
@@ -58,6 +58,7 @@ depends=(brotli
          libpng
          libproxy
          libsm
+         libstdc++
          liburing
          libx11
          libxcb
@@ -115,7 +116,7 @@ source=(git+https://code.qt.io/qt/$_pkgfn#tag=v$_pkgver
         0001-qopengltextureglyphcache-pick-GL_R8-on-ES3.patch
         0002-qrhigles2-RED_OR_ALPHA8-pick-GL_R8-on-ES3.patch
         0003-qopengltextureuploader-pick-GL_R8-on-ES3.patch)
-sha256sums=('2223c075e95d86f8dbf6395b025a74d996c418f094453c903290e3c2663fbed2'
+sha256sums=('2eafe504fae873d20f206b5661e2e10506879455cb2d370f42c5bb72ccf7a8a1'
             '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
             '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094'
             'SKIP'
@@ -126,9 +127,8 @@ prepare() {
   patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS
   patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake
 
-  # cherry-pick needs git author identity; git-cli refuses without it.
-  git -C $_pkgfn -c user.email=fourier@build -c user.name='qt6-base-fourier build' \
-      cherry-pick -n 8b54513cdcf62047376a5d27d784ad68a8f235bf # Fix qdbus crashes
+  # 8b54513cdcf6 (qdbus crash fix) cherry-pick removed: landed upstream
+  # in 6.11.1. Re-add if qdbus regressions re-surface.
 
   # qt6-base-fourier — three small runtime-checks that pick GL_R8 over
   # GL_ALPHA when the live GL context is ES 3 or newer. See the
@@ -165,7 +165,7 @@ build() {
     -DFEATURE_system_sqlite=ON \
     -DFEATURE_system_xcb_xinput=ON \
     -DFEATURE_no_direct_extern_access=$_no_direct_extern_access \
-    -DFEATURE_sql_ibase=OFF \
+    -DFEATURE_mimetype_database=OFF \
     -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
     -DCMAKE_MESSAGE_LOG_LEVEL=STATUS
   cmake --build build