From b84dd78167247d07f728719f93555a6648798341 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 20 Nov 2023 09:55:31 -0500 Subject: [PATCH] wxFormBuilder: update to 4.0.0. --- .../patches/cmake-dep-versions.patch | 11 +++++++ .../patches/cmake-no-update-mime.patch | 17 ++++++++++ srcpkgs/wxFormBuilder/patches/wx-3.2.patch | 32 ------------------- srcpkgs/wxFormBuilder/template | 28 ++++------------ 4 files changed, 34 insertions(+), 54 deletions(-) create mode 100644 srcpkgs/wxFormBuilder/patches/cmake-dep-versions.patch create mode 100644 srcpkgs/wxFormBuilder/patches/cmake-no-update-mime.patch delete mode 100644 srcpkgs/wxFormBuilder/patches/wx-3.2.patch diff --git a/srcpkgs/wxFormBuilder/patches/cmake-dep-versions.patch b/srcpkgs/wxFormBuilder/patches/cmake-dep-versions.patch new file mode 100644 index 00000000000..6947d6068b7 --- /dev/null +++ b/srcpkgs/wxFormBuilder/patches/cmake-dep-versions.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -72,7 +72,7 @@ + stash_variable(BUILD_SHARED_LIBS VALUE ON) + set(wxWidgets_USE_STATIC OFF) + if(NOT WXFB_WXWIDGETS_ENABLE_30) +- set(wxWidgetsVersion 3.1.2) ++ set(wxWidgetsVersion 3.2) + else() + set(wxWidgetsVersion 3.0) + endif() diff --git a/srcpkgs/wxFormBuilder/patches/cmake-no-update-mime.patch b/srcpkgs/wxFormBuilder/patches/cmake-no-update-mime.patch new file mode 100644 index 00000000000..9a7077dcb68 --- /dev/null +++ b/srcpkgs/wxFormBuilder/patches/cmake-no-update-mime.patch @@ -0,0 +1,17 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -280,14 +280,6 @@ + DIRECTORY "${PROJECT_SOURCE_DIR}/data/platform/linux/share/" + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} + ) +- install( +- CODE +- " +- find_program(update-mime-database_cmd NAMES update-mime-database REQUIRED) +- mark_as_advanced(update-mime-database_cmd) +- execute_process(COMMAND \"\${update-mime-database_cmd}\" \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/mime\") +- " +- ) + endif() + + if(WIN32) diff --git a/srcpkgs/wxFormBuilder/patches/wx-3.2.patch b/srcpkgs/wxFormBuilder/patches/wx-3.2.patch deleted file mode 100644 index 16f66bc03ff..00000000000 --- a/srcpkgs/wxFormBuilder/patches/wx-3.2.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8042f487aed39c287bb308e09fa3ea38bd9dfef4 Mon Sep 17 00:00:00 2001 -From: Steffen Olszewski -Date: Sat, 12 Feb 2022 00:49:28 +0100 -Subject: [PATCH] Fix compilation of AuiTabArt for wxWidgets 3.1.6 - -Use wxBitmapBundle for that version. ---- - src/rad/auitabart.h | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/rad/auitabart.h b/src/rad/auitabart.h -index 130dbd882..d8a1c2279 100644 ---- a/src/rad/auitabart.h -+++ b/src/rad/auitabart.h -@@ -5,11 +5,12 @@ - - 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); - } - }; - diff --git a/srcpkgs/wxFormBuilder/template b/srcpkgs/wxFormBuilder/template index 820fe746207..4021562fae9 100644 --- a/srcpkgs/wxFormBuilder/template +++ b/srcpkgs/wxFormBuilder/template @@ -1,35 +1,19 @@ # Template file for 'wxFormBuilder' pkgname=wxFormBuilder -version=3.10.1 +version=4.0.0 revision=1 -build_style=meson +build_style=cmake +configure_args="-DCMAKE_BUILD_TYPE=Release" hostmakedepends="pkg-config" -makedepends="wxWidgets-devel" +makedepends="wxWidgets-devel boost-devel gst-plugins-bad1-devel" short_desc="GUI builder for wxWidgets" maintainer="Andrew J. Hesford " license="GPL-2.0-or-later" homepage="https://github.com/wxFormBuilder/wxFormBuilder" changelog="https://raw.githubusercontent.com/wxFormBuilder/wxFormBuilder/master/Changelog.txt" distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}-source-full.tar.gz" -checksum=1b1bdef794eb16cdbfbddc3d7b840b4d2346c4f0bc558833270b743d64325169 +checksum=3bf1a29e5be88a05244afc5fd6f5ab90abf893810bee0cb4f0be861f0ff516ad if [ -n "${CROSS_BUILD}" ]; then - configure_args+=" --cross-file=meson-wx.cross" + configure_args+=" -DwxWidgets_wxrc_EXECUTABLE=${XBPS_CROSS_BASE}/usr/bin/wxrc-3.2" fi - -pre_configure() { - [ -z "${CROSS_BUILD}" ] && return 0 - - cat > "${XBPS_WRAPPERDIR}/wx-config" <<-EOF - #!/bin/sh - "${XBPS_CROSS_BASE}/usr/bin/wx-config-gtk3" \ - --prefix="${XBPS_CROSS_BASE}" "\$@" - EOF - - chmod 0755 "${XBPS_WRAPPERDIR}/wx-config" - - cat > meson-wx.cross <<-EOF - [binaries] - wx-config = '${XBPS_WRAPPERDIR}/wx-config' - EOF -}