From bdb37d16edaae3f153a61cd1925019979be2b34a Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Tue, 21 Jan 2025 15:06:49 +0300 Subject: [PATCH] dev-util/wxformbuilder: add 4.2.1 Thanks to Bill Binder for the patch. Closes: https://bugs.gentoo.org/903035 Signed-off-by: Alexander Golubev --- dev-util/wxformbuilder/Manifest | 1 + .../files/wxformbuilder-4.2.1-fix-build.patch | 47 +++++++++++++++++++ .../wxformbuilder/wxformbuilder-4.2.1.ebuild | 31 ++++++++++++ 3 files changed, 79 insertions(+) create mode 100644 dev-util/wxformbuilder/files/wxformbuilder-4.2.1-fix-build.patch create mode 100644 dev-util/wxformbuilder/wxformbuilder-4.2.1.ebuild diff --git a/dev-util/wxformbuilder/Manifest b/dev-util/wxformbuilder/Manifest index b93717dae7..8d3c679790 100644 --- a/dev-util/wxformbuilder/Manifest +++ b/dev-util/wxformbuilder/Manifest @@ -1,2 +1,3 @@ DIST wxformbuilder-1fa5400695f68ee22718f4a4a28b2fb63f275145.tar.gz 1136549 BLAKE2B f007a7198cfe50c3b66055ec5937b7b5776ca83e9bdd2b0d3620bd9a65f58d112f15e9bbf2b5b672f499cde1e3bb0620d3073f34909930c9a0fa042491d76154 SHA512 d15e4d25d9ecedebc3c05f14cb09a29ced53648167aa50a89519bfdce88a874d6c0a01a78eeaeac0523649f951cd56b1dfbe59cb816a5532226f59b15eba2058 +DIST wxformbuilder-4.2.1.tar.gz 1204336 BLAKE2B 0d3e32d2b312c539f6efd6a6b213173b976d311a6e91824814f1f397d30e6d5fa3ffa5da41679af1759ba41325b5d6d2dfdd2ff0e4b8c3e449a31aaafc43d3eb SHA512 8f3c7a29111dd08379534df33e78f9f2791a93352b69b24ab4671f810332b784c8c68f6537fcc563278d911d26a73218e50e57ae1a6f64cb3e1d84ed0405584b DIST wxformbuilder-ticpp-6f45ec628cbf34784bb3b3132c0d00aac8e491c6.tar.gz 85795 BLAKE2B 5c8d83dd50a5d3cfd4f679692a32e7c3b60d6118ac79b40bf4da21552a26beeb7a74b46d822d79ac4a7cbdbab69017ef194e80da795f1e0550fee6d1ed9a442f SHA512 2f16d6b4b96ebf02bd03d5fa5e12566b3e34ae674397a8b38e136a17cdcafc4fc87fd48efc3bf5592b4f61eaaf20e6d9f437df2a07ad4a12e0abf5f2084d63c1 diff --git a/dev-util/wxformbuilder/files/wxformbuilder-4.2.1-fix-build.patch b/dev-util/wxformbuilder/files/wxformbuilder-4.2.1-fix-build.patch new file mode 100644 index 0000000000..70c264f816 --- /dev/null +++ b/dev-util/wxformbuilder/files/wxformbuilder-4.2.1-fix-build.patch @@ -0,0 +1,47 @@ +The patch provided by Bill Binder on Gentoo bugzilla[1]; it: +- Removes bundled tinyxml2 +- Removes mimedb actions from build + +[1]: https://bugs.gentoo.org/903035 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 43ba5ede..5a6d1c3f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,6 +31,8 @@ option(WXFB_ENABLE_EXTRA_CHECKS "Enable additional static code analysis." OFF) + # TODO: Currently generator languages cannot be configured + set(WXFB_GENERATOR_LANGUAGES cpp python lua php CACHE INTERNAL "") + ++find_package(TINYXML2 REQUIRED) ++ + # Adjust paths to match wxStandardPaths implementation, use own cache variables to share across CMake scopes + include(GNUInstallDirs) + if(WIN32) +@@ -103,9 +105,6 @@ add_subdirectory(plugins) + add_subdirectory(sdk) + add_subdirectory(third_party/md5) + add_subdirectory(third_party/stack_trace) +-stash_variable(BUILD_SHARED_LIBS ${WXFB_TINYXML2_SHARED}) +-add_subdirectory(third_party/tinyxml2 EXCLUDE_FROM_ALL) +-restore_variable(BUILD_SHARED_LIBS) + + if(NOT WXFB_BUILD_PLUGIN_HOST) + wxfb_configure_postbuild() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index dfd612d2..d13907b3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -280,14 +280,6 @@ if(NOT WIN32 AND NOT APPLE) + 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/dev-util/wxformbuilder/wxformbuilder-4.2.1.ebuild b/dev-util/wxformbuilder/wxformbuilder-4.2.1.ebuild new file mode 100644 index 0000000000..729bf48e4b --- /dev/null +++ b/dev-util/wxformbuilder/wxformbuilder-4.2.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_BUILD_TYPE="Release" +WX_GTK_VER="3.2-gtk3" + +inherit cmake wxwidgets xdg + +MY_PN="wxFormBuilder" +DESCRIPTION="A wxWidgets GUI Builder" +HOMEPAGE="https://github.com/wxFormBuilder/wxFormBuilder" +SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +RESTRICT="mirror" + +RDEPEND=" + dev-libs/tinyxml2 + x11-libs/wxGTK:${WX_GTK_VER}[X,gstreamer] +" +DEPEND="${RDEPEND} + >=dev-libs/boost-1.71 +" + +PATCHES=( "${FILESDIR}/${P}-fix-build.patch" )