Switch to using 3.2.3 backports branch
And pull in new fixes that make things even better
This commit is contained in:
parent
0a26f9ec21
commit
d7b1b03830
28
.SRCINFO
28
.SRCINFO
|
|
@ -1,9 +1,11 @@
|
|||
pkgbase = wxwidgets-wayland-perf
|
||||
pkgver = 3.2.2.1
|
||||
pkgver = 3.2.2.r189.gacea4afa5e01
|
||||
pkgrel = 1
|
||||
epoch = 1
|
||||
url = https://wxwidgets.org
|
||||
arch = x86_64
|
||||
license = custom:wxWindows
|
||||
makedepends = git
|
||||
makedepends = cmake
|
||||
makedepends = gst-plugins-base
|
||||
makedepends = glu
|
||||
|
|
@ -12,18 +14,18 @@ pkgbase = wxwidgets-wayland-perf
|
|||
makedepends = qt5-base
|
||||
makedepends = sdl2
|
||||
makedepends = libmspack
|
||||
source = https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.2.1/wxWidgets-3.2.2.1.tar.bz2
|
||||
source = https://github.com/wxWidgets/wxWidgets/commit/ed510012.patch
|
||||
source = https://github.com/wxWidgets/wxWidgets/commit/fca2f535732229269dedfea67899134d64ccd9a9.patch
|
||||
source = https://github.com/wxWidgets/wxWidgets/commit/194a7be33fa471a768e1b012b18b0554d4935b26.patch
|
||||
source = https://github.com/wxWidgets/wxWidgets/commit/f2214fff6026b44bede0ea979f286453f967fed0.patch
|
||||
source = https://github.com/wxWidgets/wxWidgets/commit/54d44fcb536625b7ba71b81ff8ad6d1cb56db6ba.patch
|
||||
sha256sums = dffcb6be71296fff4b7f8840eb1b510178f57aa2eb236b20da41182009242c02
|
||||
sha256sums = 0f714caa562269ba40ea55e1ef2f1c800d0669f01c3862f47db183eb2db91567
|
||||
sha256sums = be4367bd47e3d4210c51b82b4a2ef544b5cfc4c921b1c34731d6b7eb8092193f
|
||||
sha256sums = 41650006b7d00ffd0991a8279356122b112e7e3fdf0e2a398fbd493cf9d470e7
|
||||
sha256sums = c658311849a7b4b43669e68678796c3c6b9d1d3c27be9baf04e8511a7de0c9bd
|
||||
sha256sums = 1eb62bf7e5a02a65d8a30f2f0a4701b223ba78097c148589a7fbc48b3ad58fd9
|
||||
source = git+https://github.com/wxWidgets/wxWidgets.git#commit=acea4afa5e0176949353516a8f0ebb3db05bed82
|
||||
source = git+https://github.com/wxWidgets/Catch.git
|
||||
source = git+https://github.com/wxWidgets/pcre.git
|
||||
source = git+https://github.com/wxWidgets/nanosvg.git
|
||||
source = https://patch-diff.githubusercontent.com/raw/wxWidgets/wxWidgets/pull/23898.patch
|
||||
source = https://patch-diff.githubusercontent.com/raw/wxWidgets/wxWidgets/pull/23900.patch
|
||||
sha256sums = SKIP
|
||||
sha256sums = SKIP
|
||||
sha256sums = SKIP
|
||||
sha256sums = SKIP
|
||||
sha256sums = dfac1456b4f6f4b8e955c2cfbc6aff61f7ad6b101d2906f69f7a6f1873298d48
|
||||
sha256sums = 14ae7c30c8aef45a96255cdb171692e474df5bc5fa295c6f1c7b8c2a00a71edb
|
||||
|
||||
pkgname = wxwidgets-gtk3-wayland-perf
|
||||
pkgdesc = GTK+3 implementation of wxWidgets API for GUI
|
||||
|
|
|
|||
81
PKGBUILD
81
PKGBUILD
|
|
@ -1,39 +1,60 @@
|
|||
# Maintainer: Antonio Rojas <arojas@archlinux.org>
|
||||
# Maintainer: Arti Zirk <arti@zirk.me>
|
||||
# Contributor: Antonio Rojas <arojas@archlinux.org>
|
||||
# Contributor: Eric Bélanger <eric@archlinux.org>
|
||||
|
||||
# includes patches from https://github.com/wxWidgets/wxWidgets/pull/23554
|
||||
# This package pulls bunch of in flux wxWidgets patches together as noted in
|
||||
# https://gitlab.com/kicad/code/kicad/-/issues/7207#note_1578155328
|
||||
# Also borrwoed some things from AUR wxgtk-git package
|
||||
|
||||
pkgbase=wxwidgets-wayland-perf
|
||||
pkgname=(wxwidgets-gtk3-wayland-perf wxwidgets-qt5-wayland-perf wxwidgets-common-wayland-perf)
|
||||
pkgver=3.2.2.1
|
||||
pkgver=3.2.2.r189.gacea4afa5e01
|
||||
pkgrel=1
|
||||
epoch=1
|
||||
arch=(x86_64)
|
||||
url='https://wxwidgets.org'
|
||||
license=(custom:wxWindows)
|
||||
makedepends=(cmake gst-plugins-base glu webkit2gtk libnotify qt5-base sdl2 libmspack)
|
||||
source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
|
||||
https://github.com/wxWidgets/wxWidgets/commit/ed510012.patch
|
||||
https://github.com/wxWidgets/wxWidgets/commit/fca2f535732229269dedfea67899134d64ccd9a9.patch
|
||||
https://github.com/wxWidgets/wxWidgets/commit/194a7be33fa471a768e1b012b18b0554d4935b26.patch
|
||||
https://github.com/wxWidgets/wxWidgets/commit/f2214fff6026b44bede0ea979f286453f967fed0.patch
|
||||
https://github.com/wxWidgets/wxWidgets/commit/54d44fcb536625b7ba71b81ff8ad6d1cb56db6ba.patch)
|
||||
sha256sums=('dffcb6be71296fff4b7f8840eb1b510178f57aa2eb236b20da41182009242c02'
|
||||
'0f714caa562269ba40ea55e1ef2f1c800d0669f01c3862f47db183eb2db91567'
|
||||
'be4367bd47e3d4210c51b82b4a2ef544b5cfc4c921b1c34731d6b7eb8092193f'
|
||||
'41650006b7d00ffd0991a8279356122b112e7e3fdf0e2a398fbd493cf9d470e7'
|
||||
'c658311849a7b4b43669e68678796c3c6b9d1d3c27be9baf04e8511a7de0c9bd'
|
||||
'1eb62bf7e5a02a65d8a30f2f0a4701b223ba78097c148589a7fbc48b3ad58fd9')
|
||||
makedepends=(git cmake gst-plugins-base glu webkit2gtk libnotify qt5-base sdl2 libmspack)
|
||||
# head of PR Final bunch of proposed backports for 3.2.3 #23891
|
||||
# https://github.com/wxWidgets/wxWidgets/pull/23891
|
||||
source=("git+https://github.com/wxWidgets/wxWidgets.git#commit=acea4afa5e0176949353516a8f0ebb3db05bed82"
|
||||
"git+https://github.com/wxWidgets/Catch.git"
|
||||
"git+https://github.com/wxWidgets/pcre.git"
|
||||
"git+https://github.com/wxWidgets/nanosvg.git"
|
||||
"https://patch-diff.githubusercontent.com/raw/wxWidgets/wxWidgets/pull/23898.patch"
|
||||
"https://patch-diff.githubusercontent.com/raw/wxWidgets/wxWidgets/pull/23900.patch")
|
||||
sha256sums=('SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'dfac1456b4f6f4b8e955c2cfbc6aff61f7ad6b101d2906f69f7a6f1873298d48'
|
||||
'14ae7c30c8aef45a96255cdb171692e474df5bc5fa295c6f1c7b8c2a00a71edb')
|
||||
|
||||
|
||||
pkgver() {
|
||||
cd wxWidgets
|
||||
git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
|
||||
}
|
||||
|
||||
prepare() {
|
||||
patch -d wxWidgets-$pkgver -p1 < ed510012.patch # Fix undefined symbols in Qt build
|
||||
patch -d wxWidgets-$pkgver -p1 -F3 < fca2f535732229269dedfea67899134d64ccd9a9.patch # Don't use wxGLCanvasEGL::m_readyToDraw for X11 windows
|
||||
patch -d wxWidgets-$pkgver -p1 < 194a7be33fa471a768e1b012b18b0554d4935b26.patch # Improve wxGLCanvasEGL refresh logic under Wayland
|
||||
patch -d wxWidgets-$pkgver -p1 < f2214fff6026b44bede0ea979f286453f967fed0.patch # Don't draw on hidden X11 EGL windows
|
||||
patch -d wxWidgets-$pkgver -p1 < 54d44fcb536625b7ba71b81ff8ad6d1cb56db6ba.patch # Add some tracing to wxGLCanvasEGL code
|
||||
cd wxWidgets
|
||||
git config submodule.3rdparty/catch.url "${srcdir}/Catch"
|
||||
git -c protocol.file.allow=always submodule update --init 3rdparty/catch
|
||||
|
||||
git config submodule.3rdparty/pcre.url "${srcdir}/pcre"
|
||||
git -c protocol.file.allow=always submodule update --init 3rdparty/pcre
|
||||
|
||||
git config submodule.3rdparty/nanosvg.url "${srcdir}/nanosvg"
|
||||
git -c protocol.file.allow=always submodule update --init 3rdparty/nanosvg
|
||||
|
||||
git apply "${srcdir}/23898.patch"
|
||||
git apply "${srcdir}/23900.patch"
|
||||
|
||||
./autogen.sh
|
||||
}
|
||||
|
||||
build() {
|
||||
cmake -B build-gtk3 -S wxWidgets-$pkgver \
|
||||
cmake -B build-gtk3 -S wxWidgets \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_BUILD_TYPE=None \
|
||||
-DwxBUILD_TOOLKIT=gtk3 \
|
||||
|
|
@ -50,7 +71,7 @@ build() {
|
|||
-DwxUSE_GTKPRINT=ON
|
||||
cmake --build build-gtk3
|
||||
|
||||
cmake -B build-qt5 -S wxWidgets-$pkgver \
|
||||
cmake -B build-qt5 -S wxWidgets \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_BUILD_TYPE=None \
|
||||
-DwxBUILD_TOOLKIT=qt \
|
||||
|
|
@ -67,7 +88,7 @@ build() {
|
|||
cmake --build build-qt5
|
||||
|
||||
# Run configure to generate the Makefile, cmake doesn't install translations
|
||||
cd wxWidgets-$pkgver
|
||||
cd wxWidgets
|
||||
./configure --prefix=/usr
|
||||
}
|
||||
|
||||
|
|
@ -79,11 +100,11 @@ package_wxwidgets-common-wayland-perf() {
|
|||
|
||||
DESTDIR="$pkgdir" cmake --install build-gtk3
|
||||
rm -r "$pkgdir"/usr/{bin/wx-config,lib/{cmake,wx,libwx_gtk*}}
|
||||
install -Dm644 wxWidgets-$pkgver/wxwin.m4 -t "$pkgdir"/usr/share/aclocal
|
||||
install -Dm644 wxWidgets/wxwin.m4 -t "$pkgdir"/usr/share/aclocal
|
||||
# Install translations
|
||||
make DESTDIR="$pkgdir" -C wxWidgets-$pkgver locale_install
|
||||
make DESTDIR="$pkgdir" -C wxWidgets locale_install
|
||||
|
||||
install -Dm644 wxWidgets-$pkgver/docs/licence.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
|
||||
install -Dm644 wxWidgets/docs/licence.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
|
||||
}
|
||||
|
||||
package_wxwidgets-gtk3-wayland-perf() {
|
||||
|
|
@ -95,8 +116,8 @@ package_wxwidgets-gtk3-wayland-perf() {
|
|||
|
||||
DESTDIR="$pkgdir" cmake --install build-gtk3
|
||||
rm -r "$pkgdir"/usr/{include,lib/libwx_base*,bin/wxrc*}
|
||||
|
||||
install -Dm644 wxWidgets-$pkgver/docs/licence.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
|
||||
|
||||
install -Dm644 wxWidgets/docs/licence.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
|
||||
}
|
||||
|
||||
package_wxwidgets-qt5-wayland-perf() {
|
||||
|
|
@ -114,5 +135,5 @@ package_wxwidgets-qt5-wayland-perf() {
|
|||
mv $_f $(dirname $_f)/$(basename $_f | sed -e 's/wxWidgets/wxWidgetsQt/')
|
||||
done
|
||||
|
||||
install -Dm644 wxWidgets-$pkgver/docs/licence.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
|
||||
install -Dm644 wxWidgets/docs/licence.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue