Update according to fedora rawhide

3 files changed, 32 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2a715eb11840..a696cbe1a521 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,29 @@
+# Generated by mksrcinfo v8
+# Mon Feb  6 09:27:47 UTC 2023
 pkgbase = perl-wx
 	pkgdesc = Interface to the wxWidgets cross-platform GUI toolkit
 	pkgver = 0.9932
-	pkgrel = 5
+	pkgrel = 6
 	url = https://metacpan.org/dist/Wx
 	arch = x86_64
 	license = GPL
 	license = PerlArtistic
+	checkdepends = xorg-server-xvfb
 	makedepends = perl-module-build
 	depends = perl-alien-wxwidgets
 	depends = perl-extutils-xspp
 	depends = wxgtk3
 	options = !emptydirs
 	source = https://cpan.metacpan.org/authors/id/M/MD/MDOOTSON/Wx-0.9932.tar.gz
-	source = gtk3.patch
+	source = https://src.fedoraproject.org/rpms/perl-Wx/raw/rawhide/f/Wx-0.9932-Undefine-BOM_UTF8.patch
+	source = https://src.fedoraproject.org/rpms/perl-Wx/raw/rawhide/f/gtk3.patch
+	source = https://src.fedoraproject.org/rpms/perl-Wx/raw/rawhide/f/wxWidgets_3.2_MakeMaker.patch
+	source = https://src.fedoraproject.org/rpms/perl-Wx/raw/rawhide/f/wxWidgets_3.2_port.patch
 	sha256sums = 1cfdb6535a0f4676e6f1aab2c9d8e16d577be3eb3b7cc04c8074d685e6651b70
+	sha256sums = db9a10e52a91c754ea95a1ee0f37249947ebc12190566ee46221c48e416bb9b6
 	sha256sums = 61fca0928af91231988779b74b2aa735f92bea40804c3c50aaa8cac4ac5b3f1b
+	sha256sums = bc579d66dab5e497aa165c297ea77ae42d6b30e42e958f3fcc7fd82d4f1ea20e
+	sha256sums = e185d46ef500618e98898e189be65ece769efbc330beebb6a03112736289a5ed
 
 pkgname = perl-wx
+
diff --git a/PKGBUILD b/PKGBUILD
index 8fe3dd65f6ad..bb15702dab73 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: dracorp aka Piotr Rogoza <piotr.r.public at gmail.com>
 pkgname=perl-wx
 pkgver=0.9932
-pkgrel=5
+pkgrel=6
 pkgdesc="Interface to the wxWidgets cross-platform GUI toolkit"
 arch=('x86_64')
 url="https://metacpan.org/dist/Wx"
@@ -13,15 +13,31 @@ makedepends=('perl-module-build')
 #checkdepends=('xorg-server-xvfb')
 options=('!emptydirs')
 source=("https://cpan.metacpan.org/authors/id/M/MD/MDOOTSON/Wx-$pkgver.tar.gz"
-        'gtk3.patch')
+        'https://src.fedoraproject.org/rpms/perl-Wx/raw/rawhide/f/Wx-0.9932-Undefine-BOM_UTF8.patch'
+        'https://src.fedoraproject.org/rpms/perl-Wx/raw/rawhide/f/gtk3.patch'
+        'https://src.fedoraproject.org/rpms/perl-Wx/raw/rawhide/f/wxWidgets_3.2_MakeMaker.patch'
+        'https://src.fedoraproject.org/rpms/perl-Wx/raw/rawhide/f/wxWidgets_3.2_port.patch'
+        )
 sha256sums=('1cfdb6535a0f4676e6f1aab2c9d8e16d577be3eb3b7cc04c8074d685e6651b70'
-            '61fca0928af91231988779b74b2aa735f92bea40804c3c50aaa8cac4ac5b3f1b')
+            'db9a10e52a91c754ea95a1ee0f37249947ebc12190566ee46221c48e416bb9b6'
+            '61fca0928af91231988779b74b2aa735f92bea40804c3c50aaa8cac4ac5b3f1b'
+            'bc579d66dab5e497aa165c297ea77ae42d6b30e42e958f3fcc7fd82d4f1ea20e'
+            'e185d46ef500618e98898e189be65ece769efbc330beebb6a03112736289a5ed')
 
 prepare() {
   cd "Wx-$pkgver"
 
+  # Fix from fedora package
+  msg2 "Fix line endings"
+  dos2unix MANIFEST
+  dos2unix typemap
+
+
   # Fixes for GTK3 compatibility
-  patch -Np1 -i ../gtk3.patch
+  for patch in ../*.patch; do
+    msg2 "Applying $patch"
+    patch -Np1 -i $patch
+  done
 }
 
 build(){
diff --git a/gtk3.patch b/gtk3.patch
deleted file mode 100644
index 7d385bd6a61b..000000000000
--- a/gtk3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Fixes for GTK3 compatibility
- wxWidgets 3.0 built with GTK3 doesn't have wxColour::GetPixel(), see:
- http://trac.wxwidgets.org/ticket/15141#comment:2
-Author: Olly Betts <olly@survex.com>
-Forwarded: no
-Last-Update: 2018-04-01
-
---- a/XS/Colour.xs
-+++ b/XS/Colour.xs
-@@ -114,7 +114,7 @@
- 
- #endif
- 
--#if !defined(__WXMAC__)
-+#if !defined(__WXMAC__) && !defined (__WXGTK3__)
- 
- long
- wxColour::GetPixel()
---- a/ext/propgrid/XS/PGProperty.xsp
-+++ b/ext/propgrid/XS/PGProperty.xsp
-@@ -1148,7 +1148,7 @@
-     bool SetPlValue( wxColour* col, int flags = wxPG_SETVAL_REFRESH_EDITOR )
-       %code{%
-             if( col->IsOk() ) {
--                wxVariant value = wxVariant(*col);
-+                wxVariant value = wxVariant(wxAny(*col));
-                 THIS->SetValue(value, NULL, flags );
-                 RETVAL = true;
-             } else {