Version 0.9.10.r2.5322be9-1

4 files changed, 15 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 527215b1da13..e35650d7be0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = x48ng-git
 	pkgdesc = A reboot of the x48 HP 48 emulator
-	pkgver = 0.9.10.r1.1bdffaf
+	pkgver = 0.9.10.r2.5322be9
 	pkgrel = 1
 	url = https://github.com/gwenhael-le-moine/x48ng
 	install = x48ng-git.install
@@ -10,13 +10,10 @@ pkgbase = x48ng-git
 	depends = readline
 	depends = libxext
 	depends = xterm
-	provides = x48
-	provides = checkrom
-	provides = dump2rom
-	provides = mkcard
-	source = git+https://github.com/gwenhael-le-moine/x48ng.git#commit=1bdffaf18c8279089ff50a67ed09252263dc7c73
-	source = patch-desktop-file-01
+	depends = xorg-mkfontscale
+	depends = xorg-fonts-misc
+	conflicts = x48ng
+	source = git+https://github.com/gwenhael-le-moine/x48ng.git#commit=5322be982ba48ac71f308de0e303393d1ce8cb32
 	sha256sums = SKIP
-	sha256sums = e18c85ecf9d451e77a6ea764e356182bc6af11c46a91ff28b0d48cb8d8b0c644
 
 pkgname = x48ng-git
diff --git a/PKGBUILD b/PKGBUILD
index 5b3a22211bc1..c80832bef602 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,27 +2,24 @@
 
 _githubuser=gwenhael-le-moine
 _githubrepo=x48ng
-_gitcommit=1bdffaf18c8279089ff50a67ed09252263dc7c73
+_gitcommit=5322be982ba48ac71f308de0e303393d1ce8cb32
 
 pkgname=x48ng-git
-pkgver=0.9.10.r1.1bdffaf
+pkgver=0.9.10.r2.5322be9
 pkgrel=1
 pkgdesc='A reboot of the x48 HP 48 emulator'
 arch=('any')
 url="https://github.com/${_githubuser}/${_githubrepo}"
 license=('GPL2')
-depends=('readline' 'libxext' 'xterm')
+depends=('readline' 'libxext' 'xterm' 'xorg-mkfontscale' 'xorg-fonts-misc')
 makedepends=('git')
 install="${pkgname}.install"
-provides=('x48' 'checkrom' 'dump2rom' 'mkcard')
-source=("git+https://github.com/${_githubuser}/${_githubrepo}.git#commit=${_gitcommit}"
-        'patch-desktop-file-01')
-sha256sums=('SKIP'
-            'e18c85ecf9d451e77a6ea764e356182bc6af11c46a91ff28b0d48cb8d8b0c644')
+conflicts=('x48ng')
+source=("git+https://github.com/${_githubuser}/${_githubrepo}.git#commit=${_gitcommit}")
+sha256sums=('SKIP')
 
 build() {
 	cd "${_githubrepo}"
-        patch x48ng.desktop ../patch-desktop-file-01
 	make
 }
 
diff --git a/patch-desktop-file-01 b/patch-desktop-file-01
deleted file mode 100644
index 9f3e5e9f1462..000000000000
--- a/patch-desktop-file-01
+++ /dev/null
@@ -1,9 +0,0 @@
-6,8c6,9
-< Exec=@PREFIX@/bin/x48
-< Name=x48
-< Icon=@PREFIX@/share/x48/hplogo.png
----
-> Exec=@PREFIX@/bin/x48ng -smallFont fixed -mediumFont fixed -largeFont fixed -connFont fixed
-> Name=x48ng
-> Icon=@PREFIX@/share/x48ng/hplogo.png
-> Categories=Utility;
diff --git a/x48ng-git.install b/x48ng-git.install
index 15082ccd2181..412f5cbbf577 100644
--- a/x48ng-git.install
+++ b/x48ng-git.install
@@ -8,18 +8,13 @@ public. The roms for the hp48sx and the hp48gx are included in
 this package.
 
 The first the time program is run, as user, use either
-  x48ng -smallFont fixed -mediumFont fixed -largeFont fixed -connFont fixed -rom /usr/share/x48ng/ROMs/gxrom-r -initialize
+  x48ng -rom /usr/share/x48ng/ROMs/gxrom-r -initialize
 or
-  x48ng -smallFont fixed -mediumFont fixed -largeFont fixed -connFont fixed -rom /usr/share/x48ng/ROMs/sxrom-j -initialize
-to have X48 place the ROM for the desired emulator in \$HOME/.hp48
+  x48ng -rom /usr/share/x48ng/ROMs/sxrom-j -initialize
+to have X48 place the ROM for the desired emulator in \$HOME/.x48ng
 for subsequent use.
 
-On ArchLinux with KDE (Not test with other DE), You need to use this cmd line to start x48ng
-  x48ng -smallFont fixed -mediumFont fixed -largeFont fixed -connFont fixed
+If fonts isn't installed, you need to logout and login back before launching x48ng.
 
 EOF
 }
-
-post_upgrade() {
-  post_install
-}