From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- games-util/slade/Manifest | 5 +- games-util/slade/files/slade-3.2.0-wx3.0.patch | 66 ---------------------- games-util/slade/slade-3.2.0.ebuild | 78 -------------------------- games-util/slade/slade-3.2.1.ebuild | 77 +++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 147 deletions(-) delete mode 100644 games-util/slade/files/slade-3.2.0-wx3.0.patch delete mode 100644 games-util/slade/slade-3.2.0.ebuild create mode 100644 games-util/slade/slade-3.2.1.ebuild (limited to 'games-util/slade') diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest index 2a03d834aa1e..424125262e95 100644 --- a/games-util/slade/Manifest +++ b/games-util/slade/Manifest @@ -1,6 +1,5 @@ AUX slade-3.2.0-bundled-libs.patch 2238 BLAKE2B 06395fcbe6dbcd7e3e2e8651fa4386e9b244c2a8b1501195692e0f1f8c7fb5ab6ab1cf9487536599ccc5f1af0d396f2d7bd3ccee13fc7b5bdfe9c86d407629c6 SHA512 a905785b11686a54ec89ad3b2be8911fba6b8a52e2f1fee6ae21651e6f822ce3fc8d2615a55c339c2d7f2feb521bf2f8ff38e07330d8520e4319b0d1828f7b52 -AUX slade-3.2.0-wx3.0.patch 2195 BLAKE2B deda8df72b59972edf7faa8a6eff7932060daa9049d95d29caca9a07c84c6bf3103da1be0af89dbd02a1da709d8cf5f7529b10da0ca39c4d7924dfe0c5968d8e SHA512 30c016d285b08b604538979656c12bc25fc1d3de02f9b6f876fddc0ddd3ae315094973d5d642e35f9eead5afe3df67355240fb2e13e2ba1c395e85c003dc2fe6 AUX slade-3.2.0_beta2-fluidsynth-driver.patch 790 BLAKE2B ea84ff6515b4b80cbce021624c27dbd4c067758b7e5861402d42628ddee85385a260396163838b1504e2196c3b275977ad5ddde3d684e49de600270d7990a1c0 SHA512 3de05beafc060891d674d388cbb07107ead138ef2a89812dfffabfc8c9de2beb939290b1064b75e14d3cc42621c8ee66ced06eacdcb2afd376a9539fa74c54c8 -DIST slade-3.2.0.tar.gz 6464839 BLAKE2B 8e13f153c64526784bd5fa3d03520942d9dbc1b0b0d1e4d0650fb91ed63a7f860655f5d580b4c0a04a52aa98f617b1f4448f47cd1e55c1b3f78fc552b8101654 SHA512 916be3b9556e76ca815514bb472335af80a72bfb8ecd0ae4287db2c0d6ad092a8ada1b335762f8589d300b1fd81adbdede3e6c315cfdc1d49b1624294b405b92 -EBUILD slade-3.2.0.ebuild 1653 BLAKE2B 98be9416dd2f9a256b606defec8a11acaf8ca3f4f51cbd6cd129420cfeabcbcacf89d300307df091a3aefb2b6fcf45163068171171e64a5649c8276c6adc3526 SHA512 bbc8495ffbd1aaf525b2160640f45150a8ee3accd00a8eb7a340394d686d2e911c43a5d89a212356fc450eb905b2346f87ae329ebe9370f503af123253cdbf25 +DIST slade-3.2.1.tar.gz 6471666 BLAKE2B 17a4f2ec23699a56d4fd970605d7141d3f4593f7ced6fff205c87d9ecddc7b90e6da2991aeea32bd008e24cdfee95b7c16946f78b2701c94e51266afd78863d6 SHA512 b7d5a91c759c5a68af63aa9a8412452a5b2986e70f7189ca92ee99ce4953ef47381be907c8ce1166e479f24679904bf5f0e0b1a5da846fe7873c5b97f4315449 +EBUILD slade-3.2.1.ebuild 1614 BLAKE2B 2350932c2517f32c00a3bf08ef915661fbb1736492e3fd0e61a36f552e78cd8f63c02830b00e0cacf64b5840b88dad816d16141743bce47bbeb72315416155ae SHA512 f770c1c3c20be8f52799382a492aa6aa770f84a220ea399e8a99035f2918c7ceab32cb36de3c09e424d7e4f9fbc6d2777e84c43f6aa5e8731c64b85b393360b9 MISC metadata.xml 457 BLAKE2B 241e53a5b4e6b85472c19b5431bae365eb740632cc71c9c2df1fb1f6c7f4875e8cb6d7ce17cddef12377a306c7abd8787a9f8e4cdd21b2b892d639ef68e8c077 SHA512 ae81e2d7faa90358dfd5f6511650de78fae50b7356609e7c54b635515e2fd9fb1348e9f34931e1cd82a3ad37206e47a64a02969c7762f38e62c32ffb5512b769 diff --git a/games-util/slade/files/slade-3.2.0-wx3.0.patch b/games-util/slade/files/slade-3.2.0-wx3.0.patch deleted file mode 100644 index 2e519b45181b..000000000000 --- a/games-util/slade/files/slade-3.2.0-wx3.0.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 45537095187cb5b985713e7558a230651b599589 Mon Sep 17 00:00:00 2001 -From: Simon Judd -Date: Thu, 14 Apr 2022 21:52:16 -0700 -Subject: [PATCH] Keep up wx3.0 compatibility - -I'd like to drop it ideally, but for now it'll stay - -Fix #1336 ---- - src/Graphics/Icons.cpp | 15 +++++++++++++++ - src/UI/SAuiTabArt.cpp | 5 ++++- - 2 files changed, 19 insertions(+), 1 deletion(-) - -diff --git a/src/Graphics/Icons.cpp b/src/Graphics/Icons.cpp -index 61d5475c..67147f7e 100644 ---- a/src/Graphics/Icons.cpp -+++ b/src/Graphics/Icons.cpp -@@ -373,7 +373,22 @@ wxBitmap loadPNGIcon(const IconDef& icon, int size, Point2i padding) - bool icons::loadIcons() - { - // Check for dark mode -+#if wxMAJOR_VERSION >= 3 && wxMINOR_VERSION >= 1 - ui_icons_dark = wxSystemSettings::GetAppearance().IsDark(); -+#else -+ auto fg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); -+ auto fg_r = fg.Red(); -+ auto fg_g = fg.Green(); -+ auto fg_b = fg.Blue(); -+ auto bg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); -+ auto bg_r = bg.Red(); -+ auto bg_g = bg.Green(); -+ auto bg_b = bg.Blue(); -+ wxColour::MakeGrey(&fg_r, &fg_g, &fg_b); -+ wxColour::MakeGrey(&bg_r, &bg_g, &bg_b); -+ log::info("DARK MODE CHECK: FG {} BG {}", fg_r, bg_r); -+ ui_icons_dark = fg_r > bg_r; -+#endif - - // Get slade.pk3 - auto* res_archive = app::archiveManager().programResourceArchive(); -diff --git a/src/UI/SAuiTabArt.cpp b/src/UI/SAuiTabArt.cpp -index 15aad09e..240de8b9 100644 ---- a/src/UI/SAuiTabArt.cpp -+++ b/src/UI/SAuiTabArt.cpp -@@ -542,6 +542,7 @@ void SAuiDockArt::DrawCaption(wxDC& dc, wxWindow* window, const wxString& text, - int caption_offset = 0; - if (pane.icon.IsOk()) - { -+#if wxMAJOR_VERSION >= 3 && wxMINOR_VERSION >= 1 - // Ensure the icon fits into the title bar. - wxSize iconSize = pane.icon.GetSize(); - if (iconSize.y > rect.height) -@@ -554,7 +555,9 @@ void SAuiDockArt::DrawCaption(wxDC& dc, wxWindow* window, const wxString& text, - dc.DrawBitmap(pane.icon, - rect.x+xOffset, rect.y+(rect.height-pane.icon.GetHeight())/2, - true); -- -+#else -+ DrawIcon(dc, rect, pane); -+#endif - caption_offset += pane.icon.GetWidth() + px3; - } - --- -2.34.1 - diff --git a/games-util/slade/slade-3.2.0.ebuild b/games-util/slade/slade-3.2.0.ebuild deleted file mode 100644 index 76979d24ed46..000000000000 --- a/games-util/slade/slade-3.2.0.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..3} ) -WX_GTK_VER="3.0-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-bundled-libs.patch - "${FILESDIR}"/${PN}-3.2.0_beta2-fluidsynth-driver.patch - "${FILESDIR}"/${PN}-3.2.0-wx3.0.patch -) - -src_prepare() { - cmake_src_prepare - - # Delete bundled libraries just in case. - rm -r thirdparty/dumb/ || 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_FLUIDSYNTH=$(usex fluidsynth OFF ON) - -DNO_WEBVIEW=$(usex webkit OFF ON) - -DUSE_SFML_RENDERWINDOW=ON - -DWX_GTK3=ON - ) - - setup-wxwidgets - cmake_src_configure -} diff --git a/games-util/slade/slade-3.2.1.ebuild b/games-util/slade/slade-3.2.1.ebuild new file mode 100644 index 000000000000..e68c8e1e1a4e --- /dev/null +++ b/games-util/slade/slade-3.2.1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..3} ) +WX_GTK_VER="3.0-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-bundled-libs.patch + "${FILESDIR}"/${PN}-3.2.0_beta2-fluidsynth-driver.patch +) + +src_prepare() { + cmake_src_prepare + + # Delete bundled libraries just in case. + rm -r thirdparty/dumb/ || 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_FLUIDSYNTH=$(usex fluidsynth OFF ON) + -DNO_WEBVIEW=$(usex webkit OFF ON) + -DUSE_SFML_RENDERWINDOW=ON + -DWX_GTK3=ON + ) + + setup-wxwidgets + cmake_src_configure +} -- cgit v1.2.3