summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsL1pKn072023-05-10 00:56:17 +0200
committersL1pKn072023-05-10 00:56:17 +0200
commitec35f60d4f803c4f0c399bf1e714d1e7c2a88e5f (patch)
treecde741203d03f1d1cfe6dfb75a14eb10d8700aae
parentc5e3d288084f0eff6d03084def1e8c7feb6a24cd (diff)
downloadaur-ec35f60d4f803c4f0c399bf1e714d1e7c2a88e5f.tar.gz
bump
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD27
2 files changed, 19 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 518445075fd6..0197e7b4a9d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = wxwidgets-light
pkgdesc = wxWidgets suite for Base, Qt5 and GTK3 toolkits (GNOME/GStreamer free!)
pkgver = 3.2.2.1
- pkgrel = 2
+ pkgrel = 3
url = http://wxwidgets.org
arch = x86_64
license = custom:wxWindows
diff --git a/PKGBUILD b/PKGBUILD
index 7b0f26ae802d..a89700f61c03 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('wxwidgets-common-light'
'wxwidgets-qt5-light'
)
pkgver=3.2.2.1
-pkgrel=2
+pkgrel=3
pkgdesc="wxWidgets suite for Base, Qt5 and GTK3 toolkits (GNOME/GStreamer free!)"
arch=('x86_64')
url='http://wxwidgets.org'
@@ -162,11 +162,14 @@ pkgdesc="wxWidgets Qt5 Toolkit (GNOME/GStreamer free!)"
rm -fr "${pkgdir}/usr/bin/"wxrc{,-3*}
rm -fr "${pkgdir}/usr/include"
rm -fr "${pkgdir}/usr/lib/"*base*
- rm -fr "${pkgdir}/usr/lib/cmake"
+ mv "${pkgdir}/usr/lib/cmake/wxWidgets"{,Qt}
+ for _f in "${pkgdir}/usr/lib/cmake/wxWidgetsQt/"*; do
+ mv $_f $(dirname $_f)/$(basename $_f | sed -e 's/wxWidgets/wxWidgetsQt/')
+ done
rm -fr "${pkgdir}/usr/share/bakefile"
rm -fr "${pkgdir}/usr/share/"{aclocal,locale}
- install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxwidgets-qt5-light/LICENSE"
+ install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
package_wxwidgets-gtk3-light() {
@@ -197,12 +200,15 @@ package_wxwidgets-gtk3-light() {
rm -fr "${pkgdir}/usr/bin/"wxrc{,-3*}
rm -fr "${pkgdir}/usr/include"
rm -fr "${pkgdir}/usr/lib/"*base*
- rm -fr "${pkgdir}/usr/lib/cmake"
+ mv "${pkgdir}/usr/lib/cmake/wxWidgets"{,GTK}
+ for _f in "${pkgdir}/usr/lib/cmake/wxWidgetsGTK/"*; do
+ mv $_f $(dirname $_f)/$(basename $_f | sed -e 's/wxWidgets/wxWidgetsGTK/')
+ done
rm -fr "${pkgdir}/usr/share/bakefile"
rm -fr "${pkgdir}/usr/share/"{aclocal,locale}
- install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxwidgets-gtk3-light/LICENSE"
+ install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
package_wxwidgets-gtk4-light() {
@@ -227,18 +233,21 @@ package_wxwidgets-gtk4-light() {
'wxgtk4'
)
- make -C build-gtk3 DESTDIR="${pkgdir}" install
+ make -C build-gtk4 DESTDIR="${pkgdir}" install
ln -s wx-config "${pkgdir}/usr/bin/wx-config-gtk4"
- rm -fr "${pkgdir}/usr/bin/"wxrc{,-3*}
+ rm -fr "${pkgdir}/usr/bin/"wxrc{,-4*}
rm -fr "${pkgdir}/usr/include"
rm -fr "${pkgdir}/usr/lib/"*base*
- rm -fr "${pkgdir}/usr/lib/cmake"
+ mv "${pkgdir}/usr/lib/cmake/wxWidgets"{,GTK4}
+ for _f in "${pkgdir}/usr/lib/cmake/wxWidgetsGTK4/"*; do
+ mv $_f $(dirname $_f)/$(basename $_f | sed -e 's/wxWidgets/wxWidgetsGTK4/')
+ done
rm -fr "${pkgdir}/usr/share/bakefile"
rm -fr "${pkgdir}/usr/share/"{aclocal,locale}
- install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxwidgets-gtk4-light/LICENSE"
+ install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
package_wxwidgets-common-light() {