Replaced Meson with CMake build, added auitabart patch

4 files changed, 52 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 883efd7af595..14805de21a21 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,22 @@
 pkgbase = wxformbuilder
 	pkgdesc = RAD tool for wxWidgets GUI design
 	pkgver = 3.10.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/wxFormBuilder/wxFormBuilder
 	arch = i686
 	arch = x86_64
 	arch = aarch64
 	license = GPL2
-	makedepends = ninja
-	makedepends = meson
-	depends = wxgtk3
+	makedepends = cmake
+	depends = wxwidgets-gtk3
+	depends = boost
 	provides = wxformbuilder
 	conflicts = wxformbuilder
 	conflicts = wxformbuilder-svn
 	conflicts = wxformbuilder-git
 	source = https://github.com/wxFormBuilder/wxFormBuilder/releases/download/v3.10.1/wxFormBuilder-3.10.1-source-full.tar.gz
-	source = nativefile.ini
+	source = auitabart.patch
 	sha512sums = de8d51b8907529fd882bcd1908fbce49381f0e75bfb0ea00b319d856d835769739e03b829b9ede5d1439513fba1e42bbc247e51cde54f89dc50efa1b0bc43a4c
-	sha512sums = c44a263897bc22e46bbe8d106cb0e4ee4c331fec0d271b4140055c59a891360c251fa7f33ce7b83fa8a3515c954c6cbf9b06eddaff2e3b671709d652fd603836
+	sha512sums = ecf3df7d10852ea5137713ea5568cb42601e3bd2047d9a020288617cc503d42027de414bbd739d16e695354e2822361a6510d2a14f93b88ec4d433dc680fc16f
 
 pkgname = wxformbuilder
diff --git a/PKGBUILD b/PKGBUILD
index 45867c8998b9..3a5c8ed43d5e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,32 +4,33 @@
 _prjname=wxFormBuilder
 pkgname=wxformbuilder
 pkgver=3.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="RAD tool for wxWidgets GUI design"
 arch=('i686' 'x86_64' 'aarch64')
 url="https://github.com/wxFormBuilder/wxFormBuilder"
 license=('GPL2')
 provides=('wxformbuilder')
 conflicts=('wxformbuilder' 'wxformbuilder-svn' 'wxformbuilder-git')
-depends=('wxgtk3')
-makedepends=('ninja' 'meson')
+depends=('wxwidgets-gtk3' 'boost')
+makedepends=('cmake')
 source=(
   "https://github.com/wxFormBuilder/wxFormBuilder/releases/download/v3.10.1/wxFormBuilder-3.10.1-source-full.tar.gz"
-  "nativefile.ini"
+  "auitabart.patch"
 )
 sha512sums=(
   "de8d51b8907529fd882bcd1908fbce49381f0e75bfb0ea00b319d856d835769739e03b829b9ede5d1439513fba1e42bbc247e51cde54f89dc50efa1b0bc43a4c"
-  "c44a263897bc22e46bbe8d106cb0e4ee4c331fec0d271b4140055c59a891360c251fa7f33ce7b83fa8a3515c954c6cbf9b06eddaff2e3b671709d652fd603836"
+  "ecf3df7d10852ea5137713ea5568cb42601e3bd2047d9a020288617cc503d42027de414bbd739d16e695354e2822361a6510d2a14f93b88ec4d433dc680fc16f"
 )
+prepare() {
+    cd "${_prjname}-${pkgver}"
+    patch --forward --strip=1 --input="${srcdir}/auitabart.patch"
+}
 build() {
   cd "${_prjname}-${pkgver}"
-  meson _build --native-file "${srcdir}/nativefile.ini" --prefix /usr
-  ninja -C _build
+  cmake -S . -B _build --install-prefix /usr -DCMAKE_BUILD_TYPE=Release
+  cmake --build _build --config Release
 }
 package() {
   cd "${_prjname}-${pkgver}"
-  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"
+  DESTDIR="${pkgdir}" cmake --install _build --config Release
 }
diff --git a/auitabart.patch b/auitabart.patch
new file mode 100644
index 000000000000..aa5f8732a459
--- /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 471c6dd6b163..000000000000
--- a/nativefile.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[binaries]
-wx-config = 'wx-config-gtk3'