fixes & improvements ...

- improve compiler options
- update GCC paths
- build with gtk3
- use upstream desktop file
- update license

4 files changed, 35 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 765b968e0f9c..114a8f00d4e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
 pkgbase = ntfix-git
 	pkgdesc = Fixes the problem of Proton games not running on NTFS partitions
 	pkgver = 0.2.1.r6.g48f4bc1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/benjamimgois/ntfix
 	arch = x86_64
-	license = unknown
+	license = GPL-3.0-or-later
 	makedepends = git
 	makedepends = lazarus
-	depends = gtk2
+	makedepends = xmlstarlet
+	depends = gtk3
 	provides = ntfix
 	conflicts = ntfix
 	source = git+https://github.com/benjamimgois/ntfix.git
-	source = ntfix.desktop
 	sha256sums = SKIP
-	sha256sums = 1ef509b7f32723e2ee41d33dbc0c8460b1e12f34ca52a7fc0fd7f74985a1a71b
 
 pkgname = ntfix-git
diff --git a/.gitignore b/.gitignore
index 28debd37a6cd..4dab8d6386e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,3 @@
 !.gitignore
 !PKGBUILD
 !.SRCINFO
-!ntfix.desktop
diff --git a/PKGBUILD b/PKGBUILD
index eecaeb4ecb14..c5260c5ac14d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,49 @@
 # Maintainer: Mark Wagie <mark dot wagie at proton dot me>
 pkgname=ntfix-git
 pkgver=0.2.1.r6.g48f4bc1
-pkgrel=1
+pkgrel=2
 pkgdesc="Fixes the problem of Proton games not running on NTFS partitions"
 arch=('x86_64')
 url="https://github.com/benjamimgois/ntfix"
-license=('unknown')
-depends=('gtk2')
-makedepends=('git' 'lazarus')
+license=('GPL-3.0-or-later')
+depends=('gtk3')
+makedepends=('git' 'lazarus' 'xmlstarlet')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=('git+https://github.com/benjamimgois/ntfix.git'
-        "${pkgname%-git}.desktop")
-sha256sums=('SKIP'
-            '1ef509b7f32723e2ee41d33dbc0c8460b1e12f34ca52a7fc0fd7f74985a1a71b')
+source=('git+https://github.com/benjamimgois/ntfix.git')
+sha256sums=('SKIP')
 
 pkgver() {
   cd "${pkgname%-git}"
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+  cd "${pkgname%-git}"
+
+  # modify compiler options
+  for i in "${pkgname%-git}.lpi"; do
+    xmlstarlet edit --inplace --delete '//Other' "$i"
+    sed -E 's&(</CompilerOptions>)&<Other><CustomOptions Value='\''-O3 -Sa -CX -XX -k"--sort-common --as-needed -z relro -z now"'\''/></Other>\n\1&' \
+      -i "$i"
+  done
+
+  # update GCC paths
+  sed -i 's/9.3.0/13.3.0/g
+          s/10.1.0/14.1.1/g' "${pkgname%-git}.lpi"
+
+  # icon name
+  sed -i "s/${pkgname%-git}48/${pkgname%-git}/g" "data/${pkgname%-git}.desktop"
+
+  mkdir -p build
 }
 
 build() {
   cd "${pkgname%-git}"
-  lazbuild \
+  lazbuild -B "${pkgname%-git}.lpi" \
     --lazarusdir=/usr/lib/lazarus \
-    --build-all \
-    "${pkgname%-git}.lpi"
+    --widgetset=gtk3 \
+    --primary-config-path=build
 }
 
 package() {
@@ -35,6 +53,6 @@ package() {
     "$pkgdir/usr/share/icons/hicolor/48x48/apps/${pkgname%-git}.png"
   install -Dm644 "data/icons/${pkgname%-git}_128.png" \
     "$pkgdir/usr/share/icons/hicolor/128x128/apps/${pkgname%-git}.png"
-  install -Dm644 "$srcdir/${pkgname%-git}.desktop" -t \
+  install -Dm644 "data/${pkgname%-git}.desktop" -t \
     "$pkgdir/usr/share/applications"
 }
diff --git a/ntfix.desktop b/ntfix.desktop
deleted file mode 100755
index 31a82ac9ec7c..000000000000
--- a/ntfix.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Icon=ntfix
-Name=NTfix
-Exec=ntfix
-Terminal=false
-Hidden=false
-Categories=Utility
-Comment=Fixes the problem of Proton games not running on NTFS partitions