From bc6126914fe21bd0a13da201b7948d318022863a Mon Sep 17 00:00:00 2001 From: joborun Date: Fri, 16 Feb 2024 01:58:06 +0200 Subject: [PATCH] upg gnumeric goffice mesa python-textrual qt6-base tmux --- gnumeric/PKGBUILD | 8 +-- gnumeric/PKGBUILD-arch | 4 +- gnumeric/deps | 4 +- goffice/PKGBUILD | 13 +++-- goffice/PKGBUILD-arch | 4 +- goffice/deps | 2 + mesa/PKGBUILD | 26 ++++----- mesa/PKGBUILD-arch | 6 +- mesa/chepoch.sh | 20 +++---- python-textual/PKGBUILD | 7 +-- python-textual/PKGBUILD-arch | 4 +- qt6-base/PKGBUILD | 38 +++++++++---- qt6-base/PKGBUILD-arch | 33 ++++++++--- qt6-base/deps | 1 + qt6-base/qt-6.6.2-revert-ABI-break.patch | 72 ++++++++++++++++++++++++ tmux/PKGBUILD | 7 +-- tmux/PKGBUILD-arch | 4 +- tmux/deps | 1 - 18 files changed, 181 insertions(+), 73 deletions(-) create mode 100644 qt6-base/qt-6.6.2-revert-ABI-break.patch diff --git a/gnumeric/PKGBUILD b/gnumeric/PKGBUILD index a511cef..b1d2590 100644 --- a/gnumeric/PKGBUILD +++ b/gnumeric/PKGBUILD @@ -6,14 +6,12 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=gnumeric -pkgver=1.12.56 +pkgver=1.12.57 pkgrel=01 pkgdesc="A GNOME-less spreadsheet program" url="http://www.gnumeric.org/" depends=('goffice') makedepends=('intltool' 'itstool' 'yelp-tools') -#_commit=858ea03fa5efd3beccc82e8dc269f35b76133d94 ## 1.12.53 -#_commit=142370a40d490201f6e0eac273d760ad43715ddb ## 1.12.54 #_commit=aea59b387be8bd5dc509ba75820cd9377e1e34a7 ## 1.12.55 conflicts=('gnumeric-minimal') provides=('gnumeric') @@ -54,8 +52,8 @@ arch=(x86_64) license=('GPL') -sha256sums=(36efb8c99fc6446ea5bfbaa08d6aa9686505dcc992f4daa11831172c9de2cd7c # gnumeric-GNUMERIC_1_12_56.tar.bz2 +sha256sums=(1c8fda4a5b023b81393f32173c4a7b623ec437b4e1ea3e8b9bacef2df8b5e8ac # gnumeric-GNUMERIC_1_12_57.tar.bz2 bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53) # revert-warnings.patch -## 5d5bbc7ac7cd4dd18b71d9d63c7ce63df2fb876bd7d1d3e9b05467fbcbd3e2b7 gnumeric-1.12.56-01-x86_64.pkg.tar.lz +## 61069b6c355c6b12f52b1c1b5c548582a904f4611520d9e89347d5d49e1cb887 gnumeric-1.12.57-01-x86_64.pkg.tar.lz diff --git a/gnumeric/PKGBUILD-arch b/gnumeric/PKGBUILD-arch index 98a7bec..97fa033 100644 --- a/gnumeric/PKGBUILD-arch +++ b/gnumeric/PKGBUILD-arch @@ -2,7 +2,7 @@ # Contributor: Kritoke pkgname=gnumeric -pkgver=1.12.56 +pkgver=1.12.57 pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('x86_64') @@ -17,7 +17,7 @@ optdepends=('python-gobject: for python plugin support' 'yelp: for viewing the help manual') source=(https://download.gnome.org/sources/gnumeric/1.12/gnumeric-$pkgver.tar.xz revert-warnings.patch) -sha256sums=('51a38f35ac5b0f71defa8b9e20bf2e08563798f1cb33379a9a17726fb1e3e1b2' +sha256sums=('aff50b1b62340c24fccf453d5fad3e7fb73f4bc4b34f7e34b6c3d2d9af6a1e4f' 'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53') prepare() { diff --git a/gnumeric/deps b/gnumeric/deps index 91afddd..e210069 100644 --- a/gnumeric/deps +++ b/gnumeric/deps @@ -8,6 +8,6 @@ gettext bison goffice at-spi2-core - - libglvnd + + diff --git a/goffice/PKGBUILD b/goffice/PKGBUILD index 6e49132..f0efa34 100644 --- a/goffice/PKGBUILD +++ b/goffice/PKGBUILD @@ -6,14 +6,15 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=goffice -pkgver=0.10.56 +pkgver=0.10.57 pkgrel=01 pkgdesc="A GLib/GTK+ set of document-centric objects and charting library" url="https://git.gnome.org/browse/goffice" depends=(librsvg gtk3 libgsf libspectre libxslt lasem) makedepends=(intltool gtk-doc gobject-introspection autoconf-archive git) -_commit=8b67bd413d7da2fca489ff1cd4be3269559a2b00 # tags/GOFFICE_0_10_56 +_commit=b00e60ef42100764e4fbf329cd36194389ed8dbb # tags/GOFFICE_0_10_57 source=("git+https://gitlab.gnome.org/GNOME/goffice.git#commit=$_commit") +#source=(https://download.gnome.org/sources/goffice/0.10/goffice-$pkgver.tar.xz) #pkgver() { # cd $pkgname @@ -45,6 +46,8 @@ arch=(x86_64) license=(GPL) -sha256sums=('SKIP') - -## d81314da3d699edd981fd0430f72ef99e9b19c65fb897a9be166b72a6e7cab0c goffice-0.10.56-01-x86_64.pkg.tar.lz +#sha256sums=(66bfd7e31d2f6756d5a62c3670383cbba02b3cb4c1042950192a801b72a3c9ab) # goffice-0.10.57.tar.xz +sha256sums=(SKIP) + +## 666c39a9c00f7c8ab40dd7ef64388bee99a9e33f6c302d6d35d3431a66009b0b goffice-0.10.57-01-x86_64.pkg.tar.lz + diff --git a/goffice/PKGBUILD-arch b/goffice/PKGBUILD-arch index e8f3b86..b8d5aad 100644 --- a/goffice/PKGBUILD-arch +++ b/goffice/PKGBUILD-arch @@ -2,7 +2,7 @@ # Contributor: Aaron Griffin pkgname=goffice -pkgver=0.10.56 +pkgver=0.10.57 pkgrel=1 pkgdesc="A GLib/GTK+ set of document-centric objects and charting library" url="https://git.gnome.org/browse/goffice" @@ -11,7 +11,7 @@ license=(GPL) depends=(librsvg gtk3 libgsf libspectre libxslt lasem) makedepends=(intltool gtk-doc gobject-introspection) source=(https://download.gnome.org/sources/goffice/0.10/goffice-$pkgver.tar.xz) -sha256sums=('b8640a2fee0c0a57784b2a5b92944a2932c789db1039ddf5a269ad634796e7e2') +sha256sums=('66bfd7e31d2f6756d5a62c3670383cbba02b3cb4c1042950192a801b72a3c9ab') build() { cd $pkgname-$pkgver diff --git a/goffice/deps b/goffice/deps index c808c09..2663a7a 100644 --- a/goffice/deps +++ b/goffice/deps @@ -12,5 +12,7 @@ git automake gettext at-spi2-core +libglvnd +graphite diff --git a/mesa/PKGBUILD b/mesa/PKGBUILD index f117fcc..38e04bb 100644 --- a/mesa/PKGBUILD +++ b/mesa/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=mesa pkgname=('vulkan-mesa-layers' 'opencl-clover-mesa' 'opencl-rusticl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'vulkan-virtio' 'libva-mesa-driver' 'mesa-vdpau' 'mesa') -pkgver=24.0.0 +pkgver=24.0.1 pkgrel=01 epoch=1 pkgdesc="An open-source implementation of the OpenGL specification w/o systemd or zstd" @@ -302,18 +302,18 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom -sha256sums=(dc7e8c077bc5884df95478263b34bdebb7e88e600689cb56fb07be2b8c304c36 # mesa-23.4.0.tar.xz - bbd0c63b5cf7bffec74fe5763292e659e9957a3f94599af0c4cd23cd948fb821 # mesa-24.0.0.tar.xz.sig +sha256sums=(f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613 # mesa-24.0.1.tar.xz + e2bfe7507058ab0737293a335d29f9e9478cc2b5715c741b2b6a57e511a6cf4f # mesa-24.0.1.tar.xz.sig 7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537) # LICENSE -## b66bc23b6d7277465c72cdf0bdf81e91e175f3c78baec07d39707a4990ef82b9 libva-mesa-driver-1_24.0.0-01-x86_64.pkg.tar.lz -## 297b842471dbd7748b615f4057ae61edfd05ca7bff7dec7527ea86b70dff3dc8 mesa-1_24.0.0-01-x86_64.pkg.tar.lz -## 8260b6ae523b53df20200db423576d3e7bdc3c0e1e7ccff7cc3e3f7723511ed7 mesa-vdpau-1_24.0.0-01-x86_64.pkg.tar.lz -## bdb06c6b6e8e40912422a88c867d39be6b284aa98a0d93641b4c966e62fb2a85 opencl-clover-mesa-1_24.0.0-01-x86_64.pkg.tar.lz -## ec2949b256af6fcc826f474d03c74d61f3d9f69f4345c8a6d0122ca1370d61f3 opencl-rusticl-mesa-1_24.0.0-01-x86_64.pkg.tar.lz -## 0fc5320dca04f2f3411d1723b7a43c5043120f40f4176679b058a91153cab28e vulkan-intel-1_24.0.0-01-x86_64.pkg.tar.lz -## fe81b385ce13005e43468bbf6ff68014e9a2cc8f53fed1e5bd7093edcf18e165 vulkan-mesa-layers-1_24.0.0-01-x86_64.pkg.tar.lz -## 914d85a68c06192e83d9350a6892a5dbf84487d5d752a72d813f10b1d4a6a7f9 vulkan-radeon-1_24.0.0-01-x86_64.pkg.tar.lz -## edc8b4227cc8396a8156f536122ee5bf96c64538412e34de36025995b5304aa4 vulkan-swrast-1_24.0.0-01-x86_64.pkg.tar.lz -## 91b2e49566d6e4a46f66ffc28d7eba9dea948d84c15a45471f07df3e3add8a57 vulkan-virtio-1_24.0.0-01-x86_64.pkg.tar.lz +## e9b054fd447ee2ddc19eceeb61f840102de9dcc8a01a32eb65e372584ce6c054 libva-mesa-driver-1_24.0.1-01-x86_64.pkg.tar.lz +## 5a760d21e86e9a39640491cc5eeb8d4f9b53bd793254da63a29dca7b64704c6a mesa-1_24.0.1-01-x86_64.pkg.tar.lz +## 73e276eab503eb433b8377f5e2349810b5555502d6e325779d43da5f5b47ba37 mesa-vdpau-1_24.0.1-01-x86_64.pkg.tar.lz +## f36f5189391222ed67248ca8b64fccf1b86cf3c2c98d5331adeafeeaf0ca726e opencl-clover-mesa-1_24.0.1-01-x86_64.pkg.tar.lz +## 38b3a6fef4e8cefa26037acca24f981dfead23f1475278168286f5cfed8aeb87 opencl-rusticl-mesa-1_24.0.1-01-x86_64.pkg.tar.lz +## 29b5afe1025056ca2805fe5434209354223015d604e87fbf1c848c2b232008bc vulkan-intel-1_24.0.1-01-x86_64.pkg.tar.lz +## 6ac2fc78bef94b872df94df0de5135f8e02b200337050c014e9a76ab09d98777 vulkan-mesa-layers-1_24.0.1-01-x86_64.pkg.tar.lz +## 7d278be99786e5110ca8b2bf08086f2715d18e8d68c496551b56646e805e5b2b vulkan-radeon-1_24.0.1-01-x86_64.pkg.tar.lz +## 79f651b6c2d3593a6a2f55dbfaec308143b9e051eb99f2a4e9f70ff2348e1a91 vulkan-swrast-1_24.0.1-01-x86_64.pkg.tar.lz +## 79ad932d61ffdb3cefd9c1b2d528cab77d1e0424acacc9be0da5fc10231cffd8 vulkan-virtio-1_24.0.1-01-x86_64.pkg.tar.lz diff --git a/mesa/PKGBUILD-arch b/mesa/PKGBUILD-arch index a536e20..6bab1da 100644 --- a/mesa/PKGBUILD-arch +++ b/mesa/PKGBUILD-arch @@ -16,7 +16,7 @@ pkgname=( 'mesa-vdpau' 'mesa' ) -pkgver=24.0.0 +pkgver=24.0.1 pkgrel=1 epoch=1 pkgdesc="An open-source implementation of the OpenGL specification" @@ -75,10 +75,10 @@ source=( https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} LICENSE ) -sha256sums=('dc7e8c077bc5884df95478263b34bdebb7e88e600689cb56fb07be2b8c304c36' +sha256sums=('f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613' 'SKIP' '7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537') -b2sums=('e15b14e921a6d1c8d1b183b8f7302d13aa81401d9485742846b8b70e2353825bcf0a0e1ee1849831eb43e5836a108cb3cf68bfe0d9183a78684dbd2fac637ab7' +b2sums=('05eb98f2fec0d15e63e8da2ca2e563d0b6fb7e29d639e66fc69074b7550939160e6f29121b80f2c64083625f2b13aa728221443b1f5adf2dd0fd92056ed9dc40' 'SKIP' '1ecf007b82260710a7bf5048f47dd5d600c168824c02c595af654632326536a6527fbe0738670ee7b921dd85a70425108e0f471ba85a8e1ca47d294ad74b4adb') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov diff --git a/mesa/chepoch.sh b/mesa/chepoch.sh index 818f3fd..d899f1d 100644 --- a/mesa/chepoch.sh +++ b/mesa/chepoch.sh @@ -1,10 +1,10 @@ -mv vulkan-mesa-layers-1:24.0.0-01-x86_64.pkg.tar.lz vulkan-mesa-layers-1_24.0.0-01-x86_64.pkg.tar.lz -mv opencl-clover-mesa-1:24.0.0-01-x86_64.pkg.tar.lz opencl-clover-mesa-1_24.0.0-01-x86_64.pkg.tar.lz -mv opencl-rusticl-mesa-1:24.0.0-01-x86_64.pkg.tar.lz opencl-rusticl-mesa-1_24.0.0-01-x86_64.pkg.tar.lz -mv vulkan-intel-1:24.0.0-01-x86_64.pkg.tar.lz vulkan-intel-1_24.0.0-01-x86_64.pkg.tar.lz -mv vulkan-radeon-1:24.0.0-01-x86_64.pkg.tar.lz vulkan-radeon-1_24.0.0-01-x86_64.pkg.tar.lz -mv vulkan-swrast-1:24.0.0-01-x86_64.pkg.tar.lz vulkan-swrast-1_24.0.0-01-x86_64.pkg.tar.lz -mv vulkan-virtio-1:24.0.0-01-x86_64.pkg.tar.lz vulkan-virtio-1_24.0.0-01-x86_64.pkg.tar.lz -mv libva-mesa-driver-1:24.0.0-01-x86_64.pkg.tar.lz libva-mesa-driver-1_24.0.0-01-x86_64.pkg.tar.lz -mv mesa-vdpau-1:24.0.0-01-x86_64.pkg.tar.lz mesa-vdpau-1_24.0.0-01-x86_64.pkg.tar.lz -mv mesa-1:24.0.0-01-x86_64.pkg.tar.lz mesa-1_24.0.0-01-x86_64.pkg.tar.lz +mv vulkan-mesa-layers-1:24.0.1-01-x86_64.pkg.tar.lz vulkan-mesa-layers-1_24.0.1-01-x86_64.pkg.tar.lz +mv opencl-clover-mesa-1:24.0.1-01-x86_64.pkg.tar.lz opencl-clover-mesa-1_24.0.1-01-x86_64.pkg.tar.lz +mv opencl-rusticl-mesa-1:24.0.1-01-x86_64.pkg.tar.lz opencl-rusticl-mesa-1_24.0.1-01-x86_64.pkg.tar.lz +mv vulkan-intel-1:24.0.1-01-x86_64.pkg.tar.lz vulkan-intel-1_24.0.1-01-x86_64.pkg.tar.lz +mv vulkan-radeon-1:24.0.1-01-x86_64.pkg.tar.lz vulkan-radeon-1_24.0.1-01-x86_64.pkg.tar.lz +mv vulkan-swrast-1:24.0.1-01-x86_64.pkg.tar.lz vulkan-swrast-1_24.0.1-01-x86_64.pkg.tar.lz +mv vulkan-virtio-1:24.0.1-01-x86_64.pkg.tar.lz vulkan-virtio-1_24.0.1-01-x86_64.pkg.tar.lz +mv libva-mesa-driver-1:24.0.1-01-x86_64.pkg.tar.lz libva-mesa-driver-1_24.0.1-01-x86_64.pkg.tar.lz +mv mesa-vdpau-1:24.0.1-01-x86_64.pkg.tar.lz mesa-vdpau-1_24.0.1-01-x86_64.pkg.tar.lz +mv mesa-1:24.0.1-01-x86_64.pkg.tar.lz mesa-1_24.0.1-01-x86_64.pkg.tar.lz diff --git a/python-textual/PKGBUILD b/python-textual/PKGBUILD index 000a523..c64c945 100644 --- a/python-textual/PKGBUILD +++ b/python-textual/PKGBUILD @@ -7,7 +7,7 @@ _base=textual pkgname=python-${_base} -pkgver=0.50.0 +pkgver=0.50.1 pkgrel=01 pkgdesc="Modern Text User Interface framework" url="https://github.com/Textualize/${_base}" @@ -55,7 +55,6 @@ arch=(x86_64) license=(MIT) -sha256sums=(b1a6599cbec9538917b3d591e5a15af2c2b39543f2436c9a3f8c279f09701595) # textual-0.50.0.tar.gz - -## 26d943201bb21bdbb032828fcc9493f88622deb7583c827da3edf0afb831e29c python-textual-0.50.0-01-x86_64.pkg.tar.lz +sha256sums=(ffe98bd8cdeeeb8e39a16a35a7dd825d7e6b64b1060c6cffe9048866b7f144a9) # textual-0.50.1.tar.gz +## d98fc6d6651ae061faa9752b735ed470e1e9e544bffe76b0940677d311e7a1ce python-textual-0.50.1-01-x86_64.pkg.tar.lz diff --git a/python-textual/PKGBUILD-arch b/python-textual/PKGBUILD-arch index 9b2d842..5a47f01 100644 --- a/python-textual/PKGBUILD-arch +++ b/python-textual/PKGBUILD-arch @@ -4,7 +4,7 @@ _base=textual pkgname=python-${_base} -pkgver=0.50.0 +pkgver=0.50.1 pkgrel=1 pkgdesc="Modern Text User Interface framework" arch=(any) @@ -17,7 +17,7 @@ optdepends=('python-tree-sitter: for syntax highlighting support' 'python-tree-sitter-languages: for custom languages support' 'python-textual-dev: tools for developers') source=(${_base}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz) -sha512sums=('18c5118c83dcc35af869b808273e797ba1465b2d61d11f8b5ae6c26d410f706eef970a93a5b77e2b7a0958bb9aa1c0e33f386678586257ac14e8a506fcdfa6d5') +sha512sums=('baa22b82efdcdf543183e1e61c2c9abce2511b010bbbe27b4411bb361858e3c4df68c8bd0e56268aac5342cf6428dd3d96c44c8b2471be7ac3fc3c17632b1f8b') build() { cd ${_base}-${pkgver} diff --git a/qt6-base/PKGBUILD b/qt6-base/PKGBUILD index 5a36dc2..4a24e82 100644 --- a/qt6-base/PKGBUILD +++ b/qt6-base/PKGBUILD @@ -5,8 +5,9 @@ # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- -pkgname=qt6-base -_qtver=6.6.1 +pkgbase=qt6-base +pkgname=(qt6-base qt6-xcb-private-headers) +_qtver=6.6.2 pkgver=${_qtver/-/} pkgrel=03 url='https://www.qt.io' @@ -33,16 +34,16 @@ optdepends=('freetds: MS SQL driver' 'unixodbc: ODBC driver') groups=(qt6) #options=(debug) # uncomment this to have qt6-base-debug produced -_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" +_pkgfn=${pkgbase/6-/}-everywhere-src-$_qtver source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz qt6-base-cflags.patch - qt6-base-nostrip.patch) + qt6-base-nostrip.patch + qt-6.6.2-revert-ABI-break.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fb92bb07) 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 -# patch -d $_pkgfn -p1 < libxkbcommon-1.6.patch # Fix build with libxkbcommon 1.6 -# patch -d $_pkgfn -p1 < qt6-base-fix-a11y.patch # Fix accessibility on Wayland + patch -d $_pkgfn -Rp1 < qt-6.6.2-revert-ABI-break.patch # Revert ABI break in 6.6.2 } build() { @@ -73,7 +74,8 @@ build() { cmake --build build } -package() { +package_qt6-base() { + pkgdesc='A cross-platform application and UI framework w/o systemd' depends+=(qt6-translations) DESTDIR="$pkgdir" cmake --install build @@ -87,15 +89,31 @@ package() { done < "$srcdir"/build/user_facing_tool_links.txt } +package_qt6-xcb-private-headers() { + pkgdesc='Private headers for Qt6 Xcb w/o systemd' + + depends=("qt6-base=$pkgver") + optdepends=() + groups=() + + cd $_pkgfn + install -d -m755 "$pkgdir"/usr/include/qt6xcb-private/{gl_integrations,nativepainting} + cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qt6xcb-private/ + cp -r src/plugins/platforms/xcb/gl_integrations/*.h "$pkgdir"/usr/include/qt6xcb-private/gl_integrations/ + cp -r src/plugins/platforms/xcb/nativepainting/*.h "$pkgdir"/usr/include/qt6xcb-private/nativepainting/ +} + #---- arch license gpg-key & sha256sums ---- arch=(x86_64) license=(GPL3 LGPL3 FDL custom) -sha256sums=(450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7 # qtbase-everywhere-src-6.6.1.tar.xz +sha256sums=(b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b # qtbase-everywhere-src-6.6.2.tar.xz 5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qt6-base-cflags.patch - 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094) # qt6-base-nostrip.patch + 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094 # qt6-base-nostrip.patch + ff0de01b5afafab6d36f0a18ac1ab3ade2107ca75f03123da024a07d7eba2d97) # qt-6.6.2-revert-ABI-break.patch -## e3a866fb28d7dd8fe7ffd42eb3482b6873b91f7fa332656988dd401216313742 qt6-base-6.6.1-03-x86_64.pkg.tar.lz +## 872254bd492324afa0e118656a18be52645ee876998a96b4270c50c6293414a1 qt6-base-6.6.2-03-x86_64.pkg.tar.lz +## ce011d8ce0de77220a56ae50d1256396c6d76683c670f9913dcfabaa252616ee qt6-xcb-private-headers-6.6.2-03-x86_64.pkg.tar.lz diff --git a/qt6-base/PKGBUILD-arch b/qt6-base/PKGBUILD-arch index 9ea1e19..76a3992 100644 --- a/qt6-base/PKGBUILD-arch +++ b/qt6-base/PKGBUILD-arch @@ -2,8 +2,9 @@ # Maintainer: Felix Yan # Contributor: Andrea Scarpino -pkgname=qt6-base -_qtver=6.6.1 +pkgbase=qt6-base +pkgname=(qt6-base qt6-xcb-private-headers) +_qtver=6.6.2 pkgver=${_qtver/-/} pkgrel=3 arch=(x86_64) @@ -77,17 +78,20 @@ optdepends=('freetds: MS SQL driver' 'qt6-wayland: to run Qt6 applications in a Wayland session' 'unixodbc: ODBC driver') groups=(qt6) -_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver +_pkgfn=${pkgbase/6-/}-everywhere-src-$_qtver source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz qt6-base-cflags.patch - qt6-base-nostrip.patch) -sha256sums=('450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7' + qt6-base-nostrip.patch + qt-6.6.2-revert-ABI-break.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fb92bb07) +sha256sums=('b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b' '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78' - '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094') + '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094' + 'ff0de01b5afafab6d36f0a18ac1ab3ade2107ca75f03123da024a07d7eba2d97') 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 + patch -d $_pkgfn -Rp1 < qt-6.6.2-revert-ABI-break.patch # Revert ABI break in 6.6.2 } build() { @@ -114,7 +118,8 @@ build() { cmake --build build } -package() { +package_qt6-base() { + pkgdesc='A cross-platform application and UI framework' depends+=(qt6-translations) DESTDIR="$pkgdir" cmake --install build @@ -127,3 +132,17 @@ package() { ln -s $_line done < "$srcdir"/build/user_facing_tool_links.txt } + +package_qt6-xcb-private-headers() { + pkgdesc='Private headers for Qt6 Xcb' + + depends=("qt6-base=$pkgver") + optdepends=() + groups=() + + cd $_pkgfn + install -d -m755 "$pkgdir"/usr/include/qt6xcb-private/{gl_integrations,nativepainting} + cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qt6xcb-private/ + cp -r src/plugins/platforms/xcb/gl_integrations/*.h "$pkgdir"/usr/include/qt6xcb-private/gl_integrations/ + cp -r src/plugins/platforms/xcb/nativepainting/*.h "$pkgdir"/usr/include/qt6xcb-private/nativepainting/ +} diff --git a/qt6-base/deps b/qt6-base/deps index ff8197f..b1344f1 100644 --- a/qt6-base/deps +++ b/qt6-base/deps @@ -34,5 +34,6 @@ xmlstarlet cmake jsoncpp at-spi2-core +graphite diff --git a/qt6-base/qt-6.6.2-revert-ABI-break.patch b/qt6-base/qt-6.6.2-revert-ABI-break.patch new file mode 100644 index 0000000..073ca22 --- /dev/null +++ b/qt6-base/qt-6.6.2-revert-ABI-break.patch @@ -0,0 +1,72 @@ +From fb92bb073e6e1dd327b9ee94bb1e5726e96396bf Mon Sep 17 00:00:00 2001 +From: Axel Spoerl +Date: Thu, 25 Jan 2024 17:27:45 +0100 +Subject: API Review Widgets: Remove QDockWidget debug operators + +Adding specific debug operators for QDockWidget has introduced new +symbols in 6.6.1. Remove them again, we maintain forward binary +compatibility within a patch cycle. + +[ChangeLog][QtWidgets][QDockWidget] Removed debug streaming operator +incorrectly introduced as a new symbol in Qt 6.6.1. + +Task-number: QTBUG-119952 +Pick-to: 6.6.2 +Change-Id: I1d5b96b442dc910d1782dbede6119708d8336991 +Reviewed-by: Volker Hilsheimer +--- + src/widgets/widgets/qdockwidget.cpp | 21 --------------------- + src/widgets/widgets/qdockwidget.h | 5 ----- + 2 files changed, 26 deletions(-) + +diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp +index da8882d13c..7792bea118 100644 +--- a/src/widgets/widgets/qdockwidget.cpp ++++ b/src/widgets/widgets/qdockwidget.cpp +@@ -1836,27 +1836,6 @@ QWidget *QDockWidget::titleBarWidget() const + return layout->widgetForRole(QDockWidgetLayout::TitleBar); + } + +-#ifndef QT_NO_DEBUG_STREAM +-QDebug operator<<(QDebug dbg, const QDockWidget *dockWidget) +-{ +- QDebugStateSaver saver(dbg); +- dbg.nospace(); +- return dockWidget ? dbg << *dockWidget : dbg << "QDockWidget(0x0)"; +-} +- +-QDebug operator<<(QDebug dbg, const QDockWidget &dockWidget) +-{ +- QDebugStateSaver saver(dbg); +- dbg.nospace(); +- dbg << "QDockWidget(" << static_cast(&dockWidget); +- dbg << "->(ObjectName=" << dockWidget.objectName(); +- dbg << "; floating=" << dockWidget.isFloating(); +- dbg << "; features=" << dockWidget.features(); +- dbg << ";))"; +- return dbg; +-} +-#endif // QT_NO_DEBUG_STREAM +- + QT_END_NAMESPACE + + #include "qdockwidget.moc" +diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h +index 211b703e03..92b7663acd 100644 +--- a/src/widgets/widgets/qdockwidget.h ++++ b/src/widgets/widgets/qdockwidget.h +@@ -64,11 +64,6 @@ public: + inline bool isAreaAllowed(Qt::DockWidgetArea area) const + { return (allowedAreas() & area) == area; } + +-#ifndef QT_NO_DEBUG_STREAM +- friend Q_WIDGETS_EXPORT QDebug operator<<(QDebug dbg, const QDockWidget &dockWidget); +- friend Q_WIDGETS_EXPORT QDebug operator<<(QDebug dbg, const QDockWidget *dockWidget); +-#endif +- + #ifndef QT_NO_ACTION + QAction *toggleViewAction() const; + #endif +-- +cgit v1.2.3 + diff --git a/tmux/PKGBUILD b/tmux/PKGBUILD index 44395ba..af4f135 100644 --- a/tmux/PKGBUILD +++ b/tmux/PKGBUILD @@ -7,11 +7,10 @@ pkgname=tmux pkgver=3.4 -pkgrel=02 +pkgrel=03 pkgdesc='A terminal multiplexer w/o systemd' url='https://github.com/tmux/tmux/wiki' depends=('libevent' 'libevent_core-2.1.so' - 'libsixel' 'libutempter' 'ncurses' 'libncursesw.so') source=("https://github.com/tmux/tmux/releases/download/${pkgver/_/}/tmux-${pkgver/_/}.tar.gz") @@ -31,7 +30,6 @@ build() { ./configure \ --prefix=/usr \ --enable-utempter \ - --enable-sixel \ --disable-systemd make } @@ -51,4 +49,5 @@ license=('BSD') sha256sums=(551ab8dea0bf505c0ad6b7bb35ef567cdde0ccb84357df142c254f35a23e19aa) # tmux-3.4.tar.gz -## 487f378d182fd9c03bccedd9db8319a3c8b152b9ffcdcd50d3fb5288cb3f2288 tmux-3.4-02-x86_64.pkg.tar.lz +## 3f1c55c27bd2e3349e49793033889f940cd0a43c3179f2633dfa2bde2279de00 tmux-3.4-03-x86_64.pkg.tar.lz + diff --git a/tmux/PKGBUILD-arch b/tmux/PKGBUILD-arch index e7d65f5..c172d1f 100644 --- a/tmux/PKGBUILD-arch +++ b/tmux/PKGBUILD-arch @@ -3,13 +3,12 @@ pkgname=tmux pkgver=3.4 -pkgrel=2 +pkgrel=3 pkgdesc='Terminal multiplexer' url='https://github.com/tmux/tmux/wiki' arch=('x86_64') license=('BSD') depends=('libevent' 'libevent_core-2.1.so' - 'libsixel' 'libutempter' 'ncurses' 'libncursesw.so' 'systemd-libs' 'libsystemd.so') @@ -22,7 +21,6 @@ build() { ./configure \ --prefix=/usr \ - --enable-sixel \ --enable-systemd \ --enable-utempter make diff --git a/tmux/deps b/tmux/deps index 4d33b0a..f53af8e 100644 --- a/tmux/deps +++ b/tmux/deps @@ -1,4 +1,3 @@ -libsixel bison