extra/qt6-base to 6.6.2-3

This commit is contained in:
Kevin Mihelich 2024-02-16 14:03:27 +00:00
parent 676fd2d1b8
commit fa8dee0ea0
3 changed files with 44 additions and 11 deletions

View file

@ -1,7 +1,7 @@
pkgbase = qt6-base pkgbase = qt6-base
pkgdesc = A cross-platform application and UI framework pkgdesc = A cross-platform application and UI framework
pkgver = 6.6.1 pkgver = 6.6.2
pkgrel = 2 pkgrel = 3
url = https://www.qt.io url = https://www.qt.io
arch = x86_64 arch = x86_64
groups = qt6 groups = qt6
@ -75,14 +75,17 @@ pkgbase = qt6-base
optdepends = postgresql-libs: PostgreSQL driver optdepends = postgresql-libs: PostgreSQL driver
optdepends = qt6-wayland: to run Qt6 applications in a Wayland session optdepends = qt6-wayland: to run Qt6 applications in a Wayland session
optdepends = unixodbc: ODBC driver optdepends = unixodbc: ODBC driver
source = https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/qtbase-everywhere-src-6.6.1.tar.xz source = https://download.qt.io/official_releases/qt/6.6/6.6.2/submodules/qtbase-everywhere-src-6.6.2.tar.xz
source = qt6-base-cflags.patch source = qt6-base-cflags.patch
source = qt6-base-nostrip.patch source = qt6-base-nostrip.patch
sha256sums = 450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7 source = qt-6.6.2-revert-ABI-break.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fb92bb07
sha256sums = b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b
sha256sums = 5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 sha256sums = 5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78
sha256sums = 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094 sha256sums = 4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094
sha256sums = ff0de01b5afafab6d36f0a18ac1ab3ade2107ca75f03123da024a07d7eba2d97
pkgname = qt6-base pkgname = qt6-base
pkgdesc = A cross-platform application and UI framework
depends = brotli depends = brotli
depends = dbus depends = dbus
depends = double-conversion depends = double-conversion
@ -127,3 +130,9 @@ pkgname = qt6-base
depends = zlib depends = zlib
depends = zstd depends = zstd
depends = qt6-translations depends = qt6-translations
pkgname = qt6-xcb-private-headers
pkgdesc = Private headers for Qt6 Xcb
groups =
depends = qt6-base=6.6.2
optdepends =

View file

@ -0,0 +1,5 @@
[qt6-base]
source = 'git'
git = 'git://code.qt.io/qt/qtbase.git'
prefix = 'v'
exclude_regex = '.*(alpha|beta|rc).*'

View file

@ -6,8 +6,9 @@
# - disable ibase for now, FTBFS # - disable ibase for now, FTBFS
# - removed -DFEATURE_no_direct_extern_access=ON # - removed -DFEATURE_no_direct_extern_access=ON
pkgname=qt6-base pkgbase=qt6-base
_qtver=6.6.1 pkgname=(qt6-base qt6-xcb-private-headers)
_qtver=6.6.2
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=3 pkgrel=3
arch=(x86_64) arch=(x86_64)
@ -81,17 +82,20 @@ optdepends=('freetds: MS SQL driver'
'qt6-wayland: to run Qt6 applications in a Wayland session' 'qt6-wayland: to run Qt6 applications in a Wayland session'
'unixodbc: ODBC driver') 'unixodbc: ODBC driver')
groups=(qt6) 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 source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
qt6-base-cflags.patch qt6-base-cflags.patch
qt6-base-nostrip.patch) qt6-base-nostrip.patch
sha256sums=('450c5b4677b2fe40ed07954d7f0f40690068e80a94c9df86c2c905ccd59d02f7' qt-6.6.2-revert-ABI-break.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fb92bb07)
sha256sums=('b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b'
'5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78' '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
'4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094') '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094'
'ff0de01b5afafab6d36f0a18ac1ab3ade2107ca75f03123da024a07d7eba2d97')
prepare() { prepare() {
patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS 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 < 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() { build() {
@ -117,7 +121,8 @@ build() {
cmake --build build cmake --build build
} }
package() { package_qt6-base() {
pkgdesc='A cross-platform application and UI framework'
depends+=(qt6-translations) depends+=(qt6-translations)
DESTDIR="$pkgdir" cmake --install build DESTDIR="$pkgdir" cmake --install build
@ -130,3 +135,17 @@ package() {
ln -s $_line ln -s $_line
done < "$srcdir"/build/user_facing_tool_links.txt 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/
}