summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD36
-rw-r--r--auitabart.patch34
-rw-r--r--nativefile.ini2
5 files changed, 58 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 647d75615b6..14805de21a2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,22 @@
pkgbase = wxformbuilder
pkgdesc = RAD tool for wxWidgets GUI design
- pkgver = 3.9.0
+ pkgver = 3.10.1
pkgrel = 2
url = https://github.com/wxFormBuilder/wxFormBuilder
arch = i686
arch = x86_64
arch = aarch64
license = GPL2
- makedepends = git
- makedepends = ninja
- makedepends = meson
- depends = wxgtk3
+ makedepends = cmake
+ depends = wxwidgets-gtk3
+ depends = boost
provides = wxformbuilder
conflicts = wxformbuilder
conflicts = wxformbuilder-svn
conflicts = wxformbuilder-git
- source = git://github.com/wxFormBuilder/wxFormBuilder.git#tag=v3.9.0
- source = nativefile.ini
- sha512sums = SKIP
- sha512sums = c44a263897bc22e46bbe8d106cb0e4ee4c331fec0d271b4140055c59a891360c251fa7f33ce7b83fa8a3515c954c6cbf9b06eddaff2e3b671709d652fd603836
+ source = https://github.com/wxFormBuilder/wxFormBuilder/releases/download/v3.10.1/wxFormBuilder-3.10.1-source-full.tar.gz
+ source = auitabart.patch
+ sha512sums = de8d51b8907529fd882bcd1908fbce49381f0e75bfb0ea00b319d856d835769739e03b829b9ede5d1439513fba1e42bbc247e51cde54f89dc50efa1b0bc43a4c
+ sha512sums = ecf3df7d10852ea5137713ea5568cb42601e3bd2047d9a020288617cc503d42027de414bbd739d16e695354e2822361a6510d2a14f93b88ec4d433dc680fc16f
pkgname = wxformbuilder
-
diff --git a/.gitignore b/.gitignore
index ca29db2e47b..1146186ad8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/src
/wxFormBuilder
*.pkg.tar*
+*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index f3dee85ecde..3a5c8ed43d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,9 @@
# Maintainer: redtide <redtid3 at gmail dot com>
# Maintainer: Antonio O. <antonio.mx.9605 at gmail dot com>
-# TODO: replace git checkout with a tarball when available, see
-# https://github.com/wxFormBuilder/wxFormBuilder/issues/676
-
-_gitname=wxFormBuilder
+_prjname=wxFormBuilder
pkgname=wxformbuilder
-pkgver=3.9.0
+pkgver=3.10.1
pkgrel=2
pkgdesc="RAD tool for wxWidgets GUI design"
arch=('i686' 'x86_64' 'aarch64')
@@ -14,29 +11,26 @@ url="https://github.com/wxFormBuilder/wxFormBuilder"
license=('GPL2')
provides=('wxformbuilder')
conflicts=('wxformbuilder' 'wxformbuilder-svn' 'wxformbuilder-git')
-depends=('wxgtk3')
-makedepends=('git' 'ninja' 'meson')
+depends=('wxwidgets-gtk3' 'boost')
+makedepends=('cmake')
source=(
- "git://github.com/wxFormBuilder/wxFormBuilder.git#tag=v3.9.0"
- "nativefile.ini"
+ "https://github.com/wxFormBuilder/wxFormBuilder/releases/download/v3.10.1/wxFormBuilder-3.10.1-source-full.tar.gz"
+ "auitabart.patch"
)
sha512sums=(
- "SKIP"
- "c44a263897bc22e46bbe8d106cb0e4ee4c331fec0d271b4140055c59a891360c251fa7f33ce7b83fa8a3515c954c6cbf9b06eddaff2e3b671709d652fd603836"
+ "de8d51b8907529fd882bcd1908fbce49381f0e75bfb0ea00b319d856d835769739e03b829b9ede5d1439513fba1e42bbc247e51cde54f89dc50efa1b0bc43a4c"
+ "ecf3df7d10852ea5137713ea5568cb42601e3bd2047d9a020288617cc503d42027de414bbd739d16e695354e2822361a6510d2a14f93b88ec4d433dc680fc16f"
)
prepare() {
- cd "${srcdir}/${_gitname}"
- git submodule update --init
+ cd "${_prjname}-${pkgver}"
+ patch --forward --strip=1 --input="${srcdir}/auitabart.patch"
}
build() {
- cd "${srcdir}/${_gitname}"
- meson _build --native-file "${srcdir}/nativefile.ini" --prefix /usr
- ninja -C _build
+ cd "${_prjname}-${pkgver}"
+ cmake -S . -B _build --install-prefix /usr -DCMAKE_BUILD_TYPE=Release
+ cmake --build _build --config Release
}
package() {
- cd "${srcdir}/${_gitname}"
- DESTDIR="${pkgdir}" ninja -C _build install
- mkdir -p "${pkgdir}/usr/share/mime/packages/"
- cp -r "install/linux/data/gnome/usr/share" "${pkgdir}/usr"
- install -m644 "install/linux/debian/wxformbuilder.sharedmimeinfo" "${pkgdir}/usr/share/mime/packages/wxformbuilder.xml"
+ cd "${_prjname}-${pkgver}"
+ DESTDIR="${pkgdir}" cmake --install _build --config Release
}
diff --git a/auitabart.patch b/auitabart.patch
new file mode 100644
index 00000000000..aa5f8732a45
--- /dev/null
+++ b/auitabart.patch
@@ -0,0 +1,34 @@
+diff --unified --recursive --text a/src/rad/auitabart.h b/src/rad/auitabart.h
+--- a/src/rad/auitabart.h 2021-10-22 18:19:37.000000000 +0200
++++ b/src/rad/auitabart.h 2022-08-13 11:32:26.550275012 +0200
+@@ -3,14 +3,22 @@
+
+ #include <wx/aui/auibook.h>
+
+-class AuiTabArt : public wxAuiGenericTabArt {
++class AuiTabArt : public wxAuiGenericTabArt
++{
+ public:
+- wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption, const wxBitmap& bitmap,
+- bool active, int close_button_state, int* x_extent) override {
+- return wxAuiGenericTabArt::GetTabSize(dc, wnd, caption, bitmap, active, close_button_state,
+- x_extent) +
+- wxSize(0, 2);
+- }
+-};
++#if wxCHECK_VERSION(3, 1, 6)
++ wxSize GetTabSize(
++ wxDC& dc, wxWindow* wnd, const wxString& caption, const wxBitmapBundle& bitmap, bool active,
++ int close_button_state, int* x_extent) override{
++#else
++ wxSize GetTabSize(
++ wxDC& dc, wxWindow* wnd, const wxString& caption, const wxBitmap& bitmap, bool active, int close_button_state,
++ int* x_extent) override
++ {
++#endif
++ return wxAuiGenericTabArt::GetTabSize(dc, wnd, caption, bitmap, active, close_button_state, x_extent) +
++ wxSize(0, 2);
++}
++};
+
+ #endif // __AUITABART_H__
diff --git a/nativefile.ini b/nativefile.ini
deleted file mode 100644
index 471c6dd6b16..00000000000
--- a/nativefile.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[binaries]
-wx-config = 'wx-config-gtk3'