Update to latest release, use shipped Makefile and desktop file

5 files changed, 15 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 609f627e69ba..ec3d0fc9a00b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = zenmonitor-git
 	pkgdesc = Zen monitor is monitoring software for AMD Zen-based CPUs
-	pkgver = 35.495045e
+	pkgver = 51.76b0752
 	pkgrel = 1
 	url = https://github.com/ocerman/zenmonitor
 	arch = x86_64
@@ -11,11 +11,7 @@ pkgbase = zenmonitor-git
 	depends = gtk3
 	provides = zenmonitor
 	source = zenmonitor::git+https://github.com/ocerman/zenmonitor.git
-	source = Makefile
-	source = zenmonitor.desktop
 	sha256sums = SKIP
-	sha256sums = b8beb6d450c13207b30b5775dffea9a1ffb56628646d69c4f287152845539167
-	sha256sums = 64889984173a1e0d319dc71f9d5cb96cf8298e6d78c4ff12513374d7b96bbfe4
 
 pkgname = zenmonitor-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..c8227f5af8f7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+/*.tar.gz
+/*.tar.xz
+/*.tar.zst
+/pkg
+/src
+/zenmonitor
diff --git a/Makefile b/Makefile
deleted file mode 100644
index d6c3b0fd79ce..000000000000
--- a/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-CC=gcc
-CFLAGS=-Wall -Wextra `pkg-config --cflags gtk+-3.0`
-LDFLAGS=`pkg-config --libs gtk+-3.0` -lm
-
-build:
-	$(CC) -Isrc/include  $(CFLAGS) src/*.c src/ss/*.c -o zenmonitor $(CFLAGS) $(LDFLAGS)
diff --git a/PKGBUILD b/PKGBUILD
index 44a564b47316..9bb9b0e2e9cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgbase=zenmonitor
 pkgname=zenmonitor-git
-pkgver=35.495045e
+pkgver=51.76b0752
 pkgrel=1
 pkgdesc="Zen monitor is monitoring software for AMD Zen-based CPUs"
 arch=('x86_64' 'i686')
@@ -13,12 +13,8 @@ depends=('zenpower' 'gtk3')
 makedepends=('git')
 provides=('zenmonitor')
 
-source=("$_pkgbase::git+$url.git"
-        "Makefile"
-        "zenmonitor.desktop")
-sha256sums=("SKIP"
-            "b8beb6d450c13207b30b5775dffea9a1ffb56628646d69c4f287152845539167"
-            "64889984173a1e0d319dc71f9d5cb96cf8298e6d78c4ff12513374d7b96bbfe4")
+source=("$_pkgbase::git+$url.git")
+sha256sums=("SKIP")
 
 pkgver() {
   cd "$srcdir/$_pkgbase"
@@ -27,14 +23,16 @@ pkgver() {
 
 prepare() {
   cd "$srcdir/$_pkgbase"
+  # Fix pkgdir references in desktop files
+  sed -i 's/@APP_EXEC@|${DESTDIR}/@APP_EXEC@|/g' makefile
 }
 
 build() {
   cd "$srcdir/$_pkgbase"
-  make -f ../Makefile
+  make
 }
 
 package() {
-  install -Dm755 "$srcdir/$_pkgbase"/zenmonitor ${pkgdir}/usr/bin/zenmonitor
-  install -Dm644 "$srcdir"/zenmonitor.desktop ${pkgdir}/usr/share/applications/zenmonitor.desktop
+  cd "$srcdir/$_pkgbase"
+  make DESTDIR="${pkgdir}" PREFIX="/usr" install
 }
diff --git a/zenmonitor.desktop b/zenmonitor.desktop
deleted file mode 100644
index d092bb83effc..000000000000
--- a/zenmonitor.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Zen monitor
-Type=Application
-Comment=Show temperature and power consumption of Zen-based CPUs
-Exec=zenmonitor
-Categories=System
-GenericName=CPU infos
-Keywords=system;cpu;temperature