Fix missing wxgtk2 dependency. Remove unnecessary dependencies.

3 files changed, 26 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6a0384e96fec..48239f923fdc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
 pkgbase = colorgrab
 	pkgdesc = A cross-platform color picker.
 	pkgver = 0.3
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/nielssp/colorgrab
 	install = colorgrab.install
 	arch = x86_64
 	arch = i686
 	license = MIT
 	makedepends = cmake
-	depends = wxgtk2
-	depends = desktop-file-utils
-	depends = gtk-update-icon-cache
+	depends = wxwidgets
 	source = https://github.com/nielssp/colorgrab/archive/v0.3.tar.gz
+	source = fixbuild.patch
 	md5sums = d1db6f37cd4a4f0cf1878d3cb76ef216
+	md5sums = 18e9012cf812f2c56ab044dbe7175b5c
 
 pkgname = colorgrab
-
diff --git a/PKGBUILD b/PKGBUILD
index e13a13a9aa08..c14db74f0caa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Niels Sonnich Poulsen <niels@nielssp.dk>
 pkgname=colorgrab
 pkgver=0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A cross-platform color picker."
 url="https://github.com/nielssp/colorgrab"
 arch=('x86_64' 'i686')
 license=('MIT')
-depends=('wxgtk2' 'desktop-file-utils' 'gtk-update-icon-cache')
+depends=('wxwidgets')
 makedepends=('cmake')
 conflicts=()
 replaces=()
@@ -14,11 +14,18 @@ backup=()
 install="${pkgname}.install"
 source=(
   "https://github.com/nielssp/${pkgname}/archive/v${pkgver}.tar.gz"
+  "fixbuild.patch"
 )
 md5sums=(
   'd1db6f37cd4a4f0cf1878d3cb76ef216'
+  '18e9012cf812f2c56ab044dbe7175b5c'
 )
 
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch --forward --strip=1 --input="${srcdir}/fixbuild.patch"
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   cmake ./ -DCMAKE_INSTALL_PREFIX=/usr
@@ -31,12 +38,10 @@ package() {
   install -Dm755 "${pkgname}" "$pkgdir/usr/bin/${pkgname}"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   
-  desktop-file-install -m 644 --dir "$pkgdir/usr/share/applications" "pkg/arch/colorgrab.desktop"
+  install -Dm644 "pkg/arch/colorgrab.desktop" "$pkgdir/usr/share/applications/${pkgname}.desktop"
   install -Dm644 img/scalable.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
   for size in 16 32 48 64 128 256; do
     install -Dm644 "img/${size}x${size}.png" \
       "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname}.png"
   done
 }
-
-
diff --git a/fixbuild.patch b/fixbuild.patch
new file mode 100644
index 000000000000..c493e5bd175a
--- /dev/null
+++ b/fixbuild.patch
@@ -0,0 +1,12 @@
+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;