From b83d177f33a0d91d8b9255e7e8ec8f083420d9e9 Mon Sep 17 00:00:00 2001
From: TechniKris <30842158+TechniKris@users.noreply.github.com>
Date: Tue, 22 Oct 2024 17:49:15 +0200
Subject: [PATCH 1/5] Move the icon to /usr/share/icons

---
 PKGBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/PKGBUILD b/PKGBUILD
index 2ca0e16..f633adf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,6 +28,7 @@ package() {
     mkdir -p "$pkgdir/usr/share/applications"
     mkdir -p "$pkgdir/usr/bin"
     mkdir -p "$pkgdir/usr/share/man/man1"
+    mkdir -p "$pkgdir/usr/share/icons/hicolor/scalable/apps"
 
     cp -R "$srcdir/$pkgname-$pkgver/opt/multimc/" -T "$pkgdir/opt/multimc/"
     cp -R "$srcdir/$pkgname-$pkgver/usr/share/metainfo/" -T "$pkgdir/usr/share/metainfo/"
@@ -35,7 +36,7 @@ package() {
 
     install -m644 -D "$srcdir/$pkgname-$pkgver/usr/share/applications/multimc.desktop" "$pkgdir/usr/share/applications/multimc.desktop"
     install -m644 -D "$srcdir/$pkgname-$pkgver/usr/share/metainfo/multimc.metainfo.xml" "$pkgdir/usr/share/metainfo/multimc.metainfo.xml"
-    install -m644 -D "$srcdir/$pkgname-$pkgver/opt/multimc/icon.svg" "$pkgdir/opt/multimc/icon.svg"
+    install -m644 -D "$srcdir/$pkgname-$pkgver/opt/multimc/icon.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/multimc.svg"
     install -m755 -D "$srcdir/$pkgname-$pkgver/opt/multimc/run.sh" "$pkgdir/opt/multimc/run.sh"
     install -m755 -D "$srcdir/multimc.1" "$pkgdir/usr/share/man/man1/multimc.1"
     ln -s "/opt/multimc/run.sh" "$pkgdir/usr/bin/multimc"

From f6c51eeccb28166b13656e3e23561e7a01486002 Mon Sep 17 00:00:00 2001
From: TechniKris <30842158+TechniKris@users.noreply.github.com>
Date: Tue, 22 Oct 2024 18:41:11 +0200
Subject: [PATCH 2/5] Patch the .desktop file

---
 PKGBUILD           |  9 +++++++--
 desktop-icon.patch | 13 +++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 desktop-icon.patch

diff --git a/PKGBUILD b/PKGBUILD
index f633adf..cc8a165 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,9 +10,11 @@ depends=('zlib' 'opengl-driver' 'qt5-base' 'qt5-x11extras' 'qt5-svg' 'xorg-xrand
 conflicts=('multimc' 'multimc5' 'multimc5-git')
 provides=('multimc' 'multimc5' 'multimc5-git')
 source=("$pkgname-$pkgver.deb::https://files.multimc.org/downloads/multimc_$pkgver-1.deb"
-        "https://raw.githubusercontent.com/MultiMC/Launcher/f45f83173662ea8d28a6d69a5312679df76d762b/launcher/package/ubuntu/multimc/usr/share/man/man1/multimc.1")
+        "https://raw.githubusercontent.com/MultiMC/Launcher/f45f83173662ea8d28a6d69a5312679df76d762b/launcher/package/ubuntu/multimc/usr/share/man/man1/multimc.1"
+        'desktop-icon.patch')
 sha1sums=('b943427e5f32f6a41d77a373029731c67571901d'
-          'b4f1dfc021fbf6be22b066734364a1f87ed37214')
+          'b4f1dfc021fbf6be22b066734364a1f87ed37214'
+          '3553ee496ae3327bc6878b455226f7df973ccf37')
 noextract=("$pkgname-$pkgver.deb")
 
 prepare() {
@@ -20,6 +22,9 @@ prepare() {
     bsdtar -xf $pkgname-$pkgver.deb -C "$pkgname-$pkgver"
     cd "$srcdir/$pkgname-$pkgver"
     bsdtar -xf data.tar.xz -C "$srcdir/$pkgname-$pkgver"
+
+    # Patch the .desktop file to point to the icon in /usr/share/icons
+    patch -p1 -i "${srcdir}/desktop-icon.patch"
 }
 
 package() {
diff --git a/desktop-icon.patch b/desktop-icon.patch
new file mode 100644
index 0000000..97e17ae
--- /dev/null
+++ b/desktop-icon.patch
@@ -0,0 +1,13 @@
+diff --git a/usr/share/applications/multimc.desktop b/usr/share/applications/multimc.desktop
+index e0456f8..93ada57 100755
+--- a/usr/share/applications/multimc.desktop
++++ b/usr/share/applications/multimc.desktop
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Categories=Game;
+ Exec=/opt/multimc/run.sh
+-Icon=/opt/multimc/icon.svg
++Icon=multimc
+ Keywords=game;Minecraft;
+ MimeType=
+ Name=MultiMC 5

From 46e832f396878b83a865c4cbaa8a5a3fcdb19c31 Mon Sep 17 00:00:00 2001
From: TechniKris <30842158+TechniKris@users.noreply.github.com>
Date: Tue, 22 Oct 2024 19:16:03 +0200
Subject: [PATCH 3/5] Remove unnecessary copying

---
 PKGBUILD | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index cc8a165..6936d8b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -35,10 +35,6 @@ package() {
     mkdir -p "$pkgdir/usr/share/man/man1"
     mkdir -p "$pkgdir/usr/share/icons/hicolor/scalable/apps"
 
-    cp -R "$srcdir/$pkgname-$pkgver/opt/multimc/" -T "$pkgdir/opt/multimc/"
-    cp -R "$srcdir/$pkgname-$pkgver/usr/share/metainfo/" -T "$pkgdir/usr/share/metainfo/"
-    cp -R "$srcdir/$pkgname-$pkgver/usr/share/applications/" -T "$pkgdir/usr/share/applications/"
-
     install -m644 -D "$srcdir/$pkgname-$pkgver/usr/share/applications/multimc.desktop" "$pkgdir/usr/share/applications/multimc.desktop"
     install -m644 -D "$srcdir/$pkgname-$pkgver/usr/share/metainfo/multimc.metainfo.xml" "$pkgdir/usr/share/metainfo/multimc.metainfo.xml"
     install -m644 -D "$srcdir/$pkgname-$pkgver/opt/multimc/icon.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/multimc.svg"

From 10baf539e3bc02099757b9790ef0370badd98f2e Mon Sep 17 00:00:00 2001
From: TechniKris <30842158+TechniKris@users.noreply.github.com>
Date: Tue, 22 Oct 2024 19:25:03 +0200
Subject: [PATCH 4/5] Update .SRCINFO

---
 .SRCINFO | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.SRCINFO b/.SRCINFO
index 750a977..667855a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -23,7 +23,9 @@ pkgbase = multimc-bin
 	noextract = multimc-bin-1.6.deb
 	source = multimc-bin-1.6.deb::https://files.multimc.org/downloads/multimc_1.6-1.deb
 	source = https://raw.githubusercontent.com/MultiMC/Launcher/f45f83173662ea8d28a6d69a5312679df76d762b/launcher/package/ubuntu/multimc/usr/share/man/man1/multimc.1
+	source = desktop-icon.patch
 	sha1sums = b943427e5f32f6a41d77a373029731c67571901d
 	sha1sums = b4f1dfc021fbf6be22b066734364a1f87ed37214
+	sha1sums = 3553ee496ae3327bc6878b455226f7df973ccf37
 
 pkgname = multimc-bin

From ebaa7f641643a9da5b9388b8970c5b43d6bee1b0 Mon Sep 17 00:00:00 2001
From: TechniKris <30842158+TechniKris@users.noreply.github.com>
Date: Sun, 22 Dec 2024 13:57:52 +0100
Subject: [PATCH 5/5] Move the icon to /usr/share/pixmaps

---
 PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 6936d8b..5d9c6b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,11 +33,11 @@ package() {
     mkdir -p "$pkgdir/usr/share/applications"
     mkdir -p "$pkgdir/usr/bin"
     mkdir -p "$pkgdir/usr/share/man/man1"
-    mkdir -p "$pkgdir/usr/share/icons/hicolor/scalable/apps"
+    mkdir -p "$pkgdir/usr/share/pixmaps"
 
     install -m644 -D "$srcdir/$pkgname-$pkgver/usr/share/applications/multimc.desktop" "$pkgdir/usr/share/applications/multimc.desktop"
     install -m644 -D "$srcdir/$pkgname-$pkgver/usr/share/metainfo/multimc.metainfo.xml" "$pkgdir/usr/share/metainfo/multimc.metainfo.xml"
-    install -m644 -D "$srcdir/$pkgname-$pkgver/opt/multimc/icon.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/multimc.svg"
+    install -m644 -D "$srcdir/$pkgname-$pkgver/opt/multimc/icon.svg" "$pkgdir/usr/share/pixmaps/multimc.svg"
     install -m755 -D "$srcdir/$pkgname-$pkgver/opt/multimc/run.sh" "$pkgdir/opt/multimc/run.sh"
     install -m755 -D "$srcdir/multimc.1" "$pkgdir/usr/share/man/man1/multimc.1"
     ln -s "/opt/multimc/run.sh" "$pkgdir/usr/bin/multimc"