desktop and icon file moved to upstream repo

4 files changed, 6 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a4bdb6208d5e..2616ebf5a7c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,11 +17,7 @@ pkgbase = chatterino2-git
 	optdepends = gst-plugins-good: For audio output
 	provides = chatterino
 	conflicts = chatterino
-	source = chatterino.png
-	source = chatterino.desktop
 	source = git://github.com/Chatterino/chatterino2#branch=nightly
-	md5sums = b8de2f4e09b13025f92e12bb292dccb1
-	md5sums = 6dc7280e81653e9a1f35e150fbebd8a0
 	md5sums = SKIP
 
 pkgname = chatterino2-git
diff --git a/PKGBUILD b/PKGBUILD
index 5d8d323419c1..30282d04008a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,8 +14,8 @@ optdepends=('streamlink: For piping streams to video players'
 provides=('chatterino')
 conflicts=('chatterino')
 install=$pkgname.install
-source=('chatterino.png' 'chatterino.desktop' "git://github.com/Chatterino/chatterino2#branch=nightly")
-md5sums=('b8de2f4e09b13025f92e12bb292dccb1' '6dc7280e81653e9a1f35e150fbebd8a0' 'SKIP')
+source=("git://github.com/Chatterino/chatterino2#branch=nightly")
+md5sums=('SKIP')
 
 pkgver() {
     cd "$srcdir/chatterino2"
@@ -36,8 +36,8 @@ build() {
 }
 
 package() {
-    cd "$srcdir/chatterino2/build/bin"
-    install -Dm755 chatterino "$pkgdir/usr/bin/chatterino"
-    install -Dm644 "$srcdir/chatterino.desktop" "$pkgdir/usr/share/applications/chatterino.desktop"
-    install -Dm644 "$srcdir/chatterino.png" "$pkgdir/usr/share/pixmaps/chatterino.png"
+    cd "$srcdir/chatterino2"
+    install -Dm755 "build/bin/chatterino" "$pkgdir/usr/bin/chatterino"
+    install -Dm644 "resources/chatterino.desktop" "$pkgdir/usr/share/applications/chatterino.desktop"
+    install -Dm644 "resources/icon.png" "$pkgdir/usr/share/pixmaps/chatterino.png"
 }
diff --git a/chatterino.desktop b/chatterino.desktop
deleted file mode 100644
index 828aa39d2ce7..000000000000
--- a/chatterino.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Chatterino
-Comment=Chat client for twitch
-Exec=chatterino
-Icon=chatterino.png
-Terminal=false
-Type=Application
-Categories=Network;InstantMessaging;
diff --git a/chatterino.png b/chatterino.png
deleted file mode 100644
index 837e2009e59a..000000000000
--- a/chatterino.png
+++ /dev/null