Update to 0.4.0 pre-release to fix wxGTK3 issues.

4 files changed, 15 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7c7e72ee67b8..4146679005f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = colorgrab
 	pkgdesc = A cross-platform color picker.
-	pkgver = 0.3
-	pkgrel = 4
+	pkgver = 0.4.0_pre
+	pkgrel = 1
 	url = https://github.com/nielssp/colorgrab
 	install = colorgrab.install
 	arch = x86_64
@@ -9,9 +9,7 @@ pkgbase = colorgrab
 	license = MIT
 	makedepends = cmake
 	depends = wxwidgets-gtk3
-	source = https://github.com/nielssp/colorgrab/archive/v0.3.tar.gz
-	source = fixbuild.patch
-	md5sums = d1db6f37cd4a4f0cf1878d3cb76ef216
-	md5sums = 18e9012cf812f2c56ab044dbe7175b5c
+	source = https://github.com/nielssp/colorgrab/archive/refs/tags/v0.4.0-pre.tar.gz
+	md5sums = 9cfddc4007ff483a58e5f2adf8e1b666
 
 pkgname = colorgrab
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..c622fc33b238
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/src
+/pkg
+*.tar.zst
+*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index d022a4da6f60..cdb804599116 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Niels Sonnich Poulsen <niels@nielssp.dk>
 pkgname=colorgrab
-pkgver=0.3
-pkgrel=4
+pkgver=0.4.0_pre
+_pkgver=0.4.0-pre
+pkgrel=1
 pkgdesc="A cross-platform color picker."
 url="https://github.com/nielssp/colorgrab"
 arch=('x86_64' 'i686')
@@ -13,28 +14,21 @@ replaces=()
 backup=()
 install="${pkgname}.install"
 source=(
-  "https://github.com/nielssp/${pkgname}/archive/v${pkgver}.tar.gz"
-  "fixbuild.patch"
+  "https://github.com/nielssp/${pkgname}/archive/refs/tags/v${_pkgver}.tar.gz"
 )
 md5sums=(
-  'd1db6f37cd4a4f0cf1878d3cb76ef216'
-  '18e9012cf812f2c56ab044dbe7175b5c'
+  '9cfddc4007ff483a58e5f2adf8e1b666'
 )
 
-prepare() {
-  cd "$pkgname-$pkgver"
-  patch --forward --strip=1 --input="${srcdir}/fixbuild.patch"
-}
-
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${_pkgver}"
   cmake ./ -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
 package() {
   cd "${srcdir}"
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}-${_pkgver}"
   install -Dm755 "${pkgname}" "$pkgdir/usr/bin/${pkgname}"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   
diff --git a/fixbuild.patch b/fixbuild.patch
deleted file mode 100644
index c493e5bd175a..000000000000
--- a/fixbuild.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --unified --recursive --text colorgrab-0.3/src/tools/PaletteTool.cpp colorgrab-0.3.new/src/tools/PaletteTool.cpp
---- colorgrab-0.3/src/tools/PaletteTool.cpp	2016-01-27 13:28:12.000000000 +0100
-+++ colorgrab-0.3.new/src/tools/PaletteTool.cpp	2022-07-15 08:45:56.819382949 +0200
-@@ -173,7 +173,7 @@
- void PaletteTool::AddColor(const wxColour& color, const wxString& name)
- {
-     wxVector<wxVariant> data;
--    data.push_back(wxVariant(color));
-+    data.push_back(wxVariant(wxAny(color)));
-     data.push_back(wxVariant(name));
-     colorList->AppendItem(data);
-     isSaved = false;