Fix icon in .desktop

3 files changed, 31 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2af3952b4256..85e999cff60a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = huggle
 	pkgdesc = Anti-vandalism tool for use on MediaWiki-based projects
 	pkgver = 3.4.10
-	pkgrel = 1
+	pkgrel = 2
 	url = https://en.wikipedia.org/wiki/Wikipedia:Huggle
 	arch = i686
 	arch = x86_64
@@ -13,9 +13,10 @@ pkgbase = huggle
 	source = https://github.com/huggle/huggle3-qt-lx/releases/download/3.4.10/huggle_3.4.10.tar.gz
 	source = huggle-yaml.patch
 	source = huggle-extensions.patch
-	sha256sums = 7dbf2c943f80eac551839535df68d1af4c19d52a026a9140a1b2fcf63f5a2249
-	sha256sums = e66bb7ba73b72b08d478715d44baf096c87291e05997ad4786c1515b6574f2bb
-	sha256sums = 823cbf583c00722bfe5ecd74a57ee7e3ef942ecb95a1704e65c226e7a2624497
+	source = huggle-desktop.patch
+	b2sums = 9a628a6a353f3b6e6c3c93d970116f87efd400f757cb2e0c1a603603aec70ee8da8a4ac45faa9769416070c18b11bbbcc23f5cefd7d119366ccfa6bc0c8a31d0
+	b2sums = e33e9f0d6dcab64194574c3963a4fb3ccaea71252190359d86ab8b6eb7c0676b9f27e0818530342cc23d42dbcdd40bae1e5f1a3391cd676c7802bf7604eb10e7
+	b2sums = e37d338085329911277cabd58108a0be5114b2c3b0469d0e3ed4bfbabda02c85315698c1ce466cb3c9bb25adb4ba208f69a134b4eb9079a2f70b8a36815f077a
+	b2sums = 4fa21457d39061bbba01c2e5f5ac9d6d703b56103fac82e48cff09d94b5ca4fe9a912756dad2c7c90079e556814654730b0c18f97f93de11b25b32ac740367ff
 
 pkgname = huggle
-
diff --git a/PKGBUILD b/PKGBUILD
index 204b16017ff4..f34abfd0f6da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,23 @@
 # Contributor: Alex Xu <alex_y_xu dot yahoo at ca>
 pkgname=huggle
 pkgver=3.4.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Anti-vandalism tool for use on MediaWiki-based projects"
 arch=('i686' 'x86_64')
 url="https://en.wikipedia.org/wiki/Wikipedia:Huggle"
 license=('GPL')
 depends=('qt5-multimedia' 'qt5-webengine' 'yaml-cpp')
-makedepends=('cmake') 
+makedepends=('cmake')
 source=(
     "https://github.com/huggle/huggle3-qt-lx/releases/download/${pkgver}/${pkgname}_${pkgver}.tar.gz"
     "huggle-yaml.patch"
     "huggle-extensions.patch"
+    "huggle-desktop.patch"
 )
-sha256sums=('7dbf2c943f80eac551839535df68d1af4c19d52a026a9140a1b2fcf63f5a2249'
-            'e66bb7ba73b72b08d478715d44baf096c87291e05997ad4786c1515b6574f2bb'
-            '823cbf583c00722bfe5ecd74a57ee7e3ef942ecb95a1704e65c226e7a2624497')
+b2sums=('9a628a6a353f3b6e6c3c93d970116f87efd400f757cb2e0c1a603603aec70ee8da8a4ac45faa9769416070c18b11bbbcc23f5cefd7d119366ccfa6bc0c8a31d0'
+        'e33e9f0d6dcab64194574c3963a4fb3ccaea71252190359d86ab8b6eb7c0676b9f27e0818530342cc23d42dbcdd40bae1e5f1a3391cd676c7802bf7604eb10e7'
+        'e37d338085329911277cabd58108a0be5114b2c3b0469d0e3ed4bfbabda02c85315698c1ce466cb3c9bb25adb4ba208f69a134b4eb9079a2f70b8a36815f077a'
+        '4fa21457d39061bbba01c2e5f5ac9d6d703b56103fac82e48cff09d94b5ca4fe9a912756dad2c7c90079e556814654730b0c18f97f93de11b25b32ac740367ff')
 
 prepare() {
     cd "${pkgname}_${pkgver}"
@@ -25,6 +27,8 @@ prepare() {
     patch --forward --strip=1 --input="../huggle-extensions.patch"
     # Backport dependency fix from master, remove in 3.4.11
     patch --forward --strip=1 --input="../huggle-yaml.patch"
+    # Fix icon in huggle.desktop
+    patch --forward --strip=1 --input="../huggle-desktop.patch"
 }
 
 build() {
@@ -46,4 +50,6 @@ build() {
 
 package() {
     make DESTDIR="$pkgdir/" -C build install
+
+    install -Dm644 "${pkgname}_${pkgver}/src/huggle_res/Resources/huggle3_newlogo.png" "$pkgdir/usr/share/pixmaps/huggle.png"
 }
diff --git a/huggle-desktop.patch b/huggle-desktop.patch
new file mode 100644
index 000000000000..88c93b2da860
--- /dev/null
+++ b/huggle-desktop.patch
@@ -0,0 +1,14 @@
+diff --git a/src/build/huggle.desktop b/src/build/huggle.desktop
+index 51d4b72c..3413a79a 100644
+--- a/src/build/huggle.desktop
++++ b/src/build/huggle.desktop
+@@ -3,7 +3,7 @@ Name=Huggle
+ GenericName=Huggle
+ Comment=Huggle is an anti-vandalism tool for use on Wikipedia and related projects
+ Exec=huggle
+-Icon=/snap/huggle/current/meta/gui/icon.png
++Icon=huggle
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+