slade-git-3.2.0+23+g7bcd1153-1

3 files changed, 4 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a7f010645c7..f51ad91b5e74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = slade-git
 	pkgdesc = SLADE3 Doom editor (git version)
-	pkgver = 3.2.0_b4+35+gf7bd1432
+	pkgver = 3.2.0+23+g7bcd1153
 	pkgrel = 1
 	url = http://slade.mancubus.net/
 	arch = i686
@@ -25,9 +25,7 @@ pkgbase = slade-git
 	provides = slade
 	conflicts = slade
 	source = slade::git+https://github.com/sirjuddington/SLADE.git
-	source = 0001-compatibility-with-stable-wxWidgets.patch
 	sha256sums = SKIP
-	sha256sums = ababb76f64b4cfbdabd283ffb8e5d7900f270893161433e84a93f2655767d5d2
 
 pkgname = slade-git
 
diff --git a/0001-compatibility-with-stable-wxWidgets.patch b/0001-compatibility-with-stable-wxWidgets.patch
deleted file mode 100644
index 7b2508f80c07..000000000000
--- a/0001-compatibility-with-stable-wxWidgets.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From be61a443c87e97d7a1b8716428c7e3fedcc7a34c Mon Sep 17 00:00:00 2001
-From: Jan Cholasta <jan@cholasta.net>
-Date: Thu, 14 Apr 2022 14:15:13 +0200
-Subject: [PATCH] compatibility with stable wxWidgets
-
----
- src/Graphics/Icons.cpp | 2 ++
- src/UI/SAuiTabArt.cpp  | 5 ++++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/Graphics/Icons.cpp b/src/Graphics/Icons.cpp
-index 61d5475c..8c6e5c44 100644
---- a/src/Graphics/Icons.cpp
-+++ b/src/Graphics/Icons.cpp
-@@ -373,7 +373,9 @@ wxBitmap loadPNGIcon(const IconDef& icon, int size, Point2i padding)
- bool icons::loadIcons()
- {
- 	// Check for dark mode
-+#if wxCHECK_VERSION(3, 1, 0)
- 	ui_icons_dark = wxSystemSettings::GetAppearance().IsDark();
-+#endif
- 
- 	// Get slade.pk3
- 	auto* res_archive = app::archiveManager().programResourceArchive();
-diff --git a/src/UI/SAuiTabArt.cpp b/src/UI/SAuiTabArt.cpp
-index 15aad09e..1fa29b73 100644
---- a/src/UI/SAuiTabArt.cpp
-+++ b/src/UI/SAuiTabArt.cpp
-@@ -550,7 +550,10 @@ void SAuiDockArt::DrawCaption(wxDC& dc, wxWindow* window, const wxString& text,
- 	    }
- 
- 	    // Draw the icon centered vertically
--	    int xOffset = window->FromDIP(2);
-+	    int xOffset = 2;
-+#if wxCHECK_VERSION(3, 1, 0)
-+	    xOffset = window->FromDIP(xOffset);
-+#endif
- 	    dc.DrawBitmap(pane.icon,
- 	                  rect.x+xOffset, rect.y+(rect.height-pane.icon.GetHeight())/2,
- 	                  true);
--- 
-2.35.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 420be095ccfb..7f1fd5c1ff20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jan Cholasta <grubber at grubber cz>
 
 pkgname=slade-git
-pkgver=3.2.0_b4+35+gf7bd1432
+pkgver=3.2.0+23+g7bcd1153
 pkgrel=1
 pkgdesc='SLADE3 Doom editor (git version)'
 arch=('i686' 'x86_64')
@@ -25,10 +25,8 @@ makedepends=('cmake'
              'p7zip')
 provides=('slade')
 conflicts=('slade')
-source=('slade::git+https://github.com/sirjuddington/SLADE.git'
-        '0001-compatibility-with-stable-wxWidgets.patch')
-sha256sums=('SKIP'
-            'ababb76f64b4cfbdabd283ffb8e5d7900f270893161433e84a93f2655767d5d2')
+source=('slade::git+https://github.com/sirjuddington/SLADE.git')
+sha256sums=('SKIP')
 
 pkgver() {
     cd slade
@@ -36,12 +34,6 @@ pkgver() {
     git describe --long --tags | sed -r 's/-/+/g'
 }
 
-prepare() {
-    cd slade
-
-    patch -i "$srcdir"/0001-compatibility-with-stable-wxWidgets.patch -p 1
-}
-
 build() {
     cd slade