From 3b5d37568309d1f45eaf3d07fdc69b84a924dac8 Mon Sep 17 00:00:00 2001 From: CRy386i Date: Sat, 31 May 2025 16:24:53 +0300 Subject: [PATCH] Add new version libqt6pas and remove old SLADE3 in overlay --- dev-libs/libqt6pas/Manifest | 1 + dev-libs/libqt6pas/libqt6pas-6.2.8.ebuild | 31 +++++++ games-util/slade/Manifest | 1 - .../slade-3.2.0_beta2-fluidsynth-driver.patch | 27 ------- .../slade/files/slade-3.2.2-wayland.patch | 25 ------ games-util/slade/metadata.xml | 14 ---- games-util/slade/slade-3.2.6.ebuild | 80 ------------------- 7 files changed, 32 insertions(+), 147 deletions(-) create mode 100644 dev-libs/libqt6pas/libqt6pas-6.2.8.ebuild delete mode 100644 games-util/slade/Manifest delete mode 100644 games-util/slade/files/slade-3.2.0_beta2-fluidsynth-driver.patch delete mode 100644 games-util/slade/files/slade-3.2.2-wayland.patch delete mode 100644 games-util/slade/metadata.xml delete mode 100644 games-util/slade/slade-3.2.6.ebuild diff --git a/dev-libs/libqt6pas/Manifest b/dev-libs/libqt6pas/Manifest index 5449074..0f0c478 100644 --- a/dev-libs/libqt6pas/Manifest +++ b/dev-libs/libqt6pas/Manifest @@ -1 +1,2 @@ DIST libqt6pas-6.2.7.tar.gz 87513233 BLAKE2B 26e8492194541453230832591445b97827e65b61531078cb4bd1c9f549bcd0aa531fef036f701de885e96f9e56476b0dd1c9465e2388ea43080ba418acbd097e SHA512 85cb3548fab017f2fd97f5fb141d59a0d0ec1412a161f98fea726ad5d6ed32ee2eb6ef6573e058d4df7dfcc067256e842acf994b73c9a50ebfb064657db33881 +DIST libqt6pas-6.2.8.tar.gz 87567292 BLAKE2B 3c58af99366bc42d1374b597b6eda5d6b2c8af5376bdaa86df53757b29914bbb545c8d11dbbc7ebb55e4638cacbd4c1801c4cd651034a8c9a50efc24a78b64ee SHA512 f33308cf130854b63fbcf6eee8824b454276dd71f8ce5c3cffbac5d42ded396ee3859a59ebfa3385c21a27553b0997ae2d334e6c8f6ce6edaf5474047eef79e4 diff --git a/dev-libs/libqt6pas/libqt6pas-6.2.8.ebuild b/dev-libs/libqt6pas/libqt6pas-6.2.8.ebuild new file mode 100644 index 0000000..156917a --- /dev/null +++ b/dev-libs/libqt6pas/libqt6pas-6.2.8.ebuild @@ -0,0 +1,31 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils + +MY_P="lazarus-3.8-0" + +DESCRIPTION="Free Pascal Qt6 bindings library updated by lazarus IDE." +HOMEPAGE="https://gitlab.com/freepascal.org/lazarus/lazarus" +SRC_URI="https://downloads.sourceforge.net/lazarus/${MY_P}.tar.gz -> ${P}.tar.gz" + +KEYWORDS="~amd64 ~x86" + +LICENSE="LGPL-3" +SLOT="0/2.2" + +DEPEND=" + >=dev-qt/qtbase-6.8:6[X,gui,network,widgets,cups] + >=dev-qt/qtsvg-6.8:6" + +S="${WORKDIR}/lazarus/lcl/interfaces/qt6/cbindings" + +src_configure() { + eqmake6 Qt6Pas.pro +} + +src_install() { + emake INSTALL_ROOT="${D}" install +} diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest deleted file mode 100644 index ed29c35..0000000 --- a/games-util/slade/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST slade-3.2.6.tar.gz 7027328 BLAKE2B ba0db4926f5706166ec2439cbb539a9d5330e2d3ea3dbd8e29b586cf57a23b7b254823d84b7ba79b604a86ed0e5753b4e7c4fcf825ba7d3217c52824f36c5be4 SHA512 d09631b24c83769482480c24dfc1f6992ae293bdfe4c8661d967d6ac0fcbba6f0e1bf58c58afc84a82fb5f900d9e0e99413800a42edc353a4f7f1f52781db54f diff --git a/games-util/slade/files/slade-3.2.0_beta2-fluidsynth-driver.patch b/games-util/slade/files/slade-3.2.0_beta2-fluidsynth-driver.patch deleted file mode 100644 index bd828d8..0000000 --- a/games-util/slade/files/slade-3.2.0_beta2-fluidsynth-driver.patch +++ /dev/null @@ -1,27 +0,0 @@ -From dc0057d1200f9bb6b67f1b1a2094b7e402d1d370 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -Date: Sat, 20 Feb 2021 12:28:48 +0000 -Subject: [PATCH] Don't force FluidSynth to use ALSA on Linux - ---- - src/Audio/MIDIPlayer.cpp | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/Audio/MIDIPlayer.cpp b/src/Audio/MIDIPlayer.cpp -index bb001339..f33ffe67 100644 ---- a/src/Audio/MIDIPlayer.cpp -+++ b/src/Audio/MIDIPlayer.cpp -@@ -344,10 +344,6 @@ public: - fs_initialised_ = false; - file_ = ""; - -- // Set fluidsynth driver to alsa in linux (no idea why it defaults to jack) -- if (app::platform() == app::Platform::Linux && fs_driver.value.empty()) -- fs_driver = "alsa"; -- - // Init soundfont path - if (fs_soundfont_path.value.empty()) - { --- -2.30.0 - diff --git a/games-util/slade/files/slade-3.2.2-wayland.patch b/games-util/slade/files/slade-3.2.2-wayland.patch deleted file mode 100644 index 4207ceb..0000000 --- a/games-util/slade/files/slade-3.2.2-wayland.patch +++ /dev/null @@ -1,25 +0,0 @@ -SFML's render window only supports X11 under Linux, so SLADE crashes if GDK -chooses the Wayland backend. This patch tells GDK to prefer the X11 backend. -SLADE 3.3.0 will apparently not use the render window. - -diff --git a/src/Application/SLADEWxApp.cpp b/src/Application/SLADEWxApp.cpp -index 3dadf241..de01e340 100644 ---- a/src/Application/SLADEWxApp.cpp -+++ b/src/Application/SLADEWxApp.cpp -@@ -52,6 +52,16 @@ - using namespace slade; - - -+#ifdef __WXGTK__ -+#include -+ -+struct PreferX11 { -+ PreferX11() { gdk_set_allowed_backends("x11,*"); } -+}; -+static PreferX11 preferx11; -+#endif -+ -+ - // ----------------------------------------------------------------------------- - // - // Variables diff --git a/games-util/slade/metadata.xml b/games-util/slade/metadata.xml deleted file mode 100644 index 106fdf8..0000000 --- a/games-util/slade/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - - sirjuddington/SLADE - - - Enable MIDI software synthesis using media-sound/fluidsynth - - diff --git a/games-util/slade/slade-3.2.6.ebuild b/games-util/slade/slade-3.2.6.ebuild deleted file mode 100644 index 48395e6..0000000 --- a/games-util/slade/slade-3.2.6.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..3} ) -WX_GTK_VER="3.2-gtk3" - -inherit cmake lua-single wxwidgets - -MY_PV="${PV/beta/b}" -DESCRIPTION="Modern editor for Doom-engine based games and source ports" -HOMEPAGE="https://slade.mancubus.net/" -SRC_URI="https://github.com/sirjuddington/${PN^^}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2 MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="fluidsynth timidity webkit" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -DEPEND=" - ${LUA_DEPS} - app-arch/bzip2:= - dev-libs/libfmt:= - >=media-libs/dumb-2:= - media-libs/freeimage[jpeg,png,tiff] - media-libs/glew:0= - media-libs/libsfml:= - media-sound/mpg123 - net-misc/curl - sys-libs/zlib - x11-libs/wxGTK:${WX_GTK_VER}[opengl,webkit?,X] - fluidsynth? ( media-sound/fluidsynth:= ) -" - -RDEPEND=" - ${DEPEND} - timidity? ( media-sound/timidity++ ) -" - -BDEPEND=" - app-arch/p7zip - virtual/pkgconfig -" - -S="${WORKDIR}/${PN^^}-${MY_PV}" - -PATCHES=( - "${FILESDIR}"/${PN}-3.2.0_beta2-fluidsynth-driver.patch - "${FILESDIR}"/${PN}-3.2.2-wayland.patch -) - -src_prepare() { - cmake_src_prepare - - # Delete bundled libraries just in case. - rm -r thirdparty/dumb/ thirdparty/fmt/ || die - -} - -src_configure() { - local luav=$(lua_get_version) - - local mycmakeargs=( - -DLua_FIND_VERSION_MAJOR=$(ver_cut 1 "${luav}") - -DLua_FIND_VERSION_MINOR=$(ver_cut 2 "${luav}") - -DLua_FIND_VERSION_COUNT=2 - -DLua_FIND_VERSION_EXACT=ON - -DNO_COTIRE=ON - -DNO_FLUIDSYNTH=$(usex fluidsynth OFF ON) - -DNO_WEBVIEW=$(usex webkit OFF ON) - -DUSE_SFML_RENDERWINDOW=ON - -DUSE_SYSTEM_DUMB=ON - -DUSE_SYSTEM_FMT=ON - -DWX_GTK3=ON - ) - - setup-wxwidgets - cmake_src_configure -}