Update to 1.21

2 files changed, 15 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ce24421235fa..e376ed5ead9e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,21 @@
 pkgbase = numworks-omega
 	pkgdesc = A simulator for the Numworks graphic calculator (Omega firmware)
-	pkgver = 1.20.3.E14
+	pkgver = 1.21.0.E15
 	pkgrel = 1
-	url = https://getomega.web.app
+	url = https://getomega.dev
 	arch = x86_64
 	license = custom:CC-BY-NC-SA
 	makedepends = freetype2
-	makedepends = imagemagick
 	makedepends = gendesk
 	depends = gcc-libs
 	depends = libxext
 	depends = libjpeg-turbo
-	source = numworks-omega-1.20.3.E14.tar.gz::https://github.com/Omega-Numworks/Omega/archive/O1.20.3-E14.tar.gz
+	source = numworks-omega-1.21.0.E15.tar.gz::https://github.com/Omega-Numworks/Omega/archive/O1.21.0-E15.tar.gz
 	source = https://github.com/Omega-Numworks/Omega-Atom/archive/8f710a9d3fa4daedde14ba489e418dbac5d590c5.tar.gz
-	source = https://github.com/Omega-Numworks/Omega-RPN/archive/279ec6333ab15e08988dff66eea01c6fdaee4ea0.tar.gz
-	source = https://github.com/Omega-Numworks/Omega-Themes/archive/48fc1cc72739ad766abbf161d78c2f98cf2f797d.tar.gz
-	md5sums = 42b7ff0178ecb91bdf6756daaf812288
+	source = https://github.com/Omega-Numworks/Omega-RPN/archive/67d66295b0a5a9bc5daf52412db9ae2ac87bbf57.tar.gz
+	md5sums = 974f3cb5aa2e481563e93e8ae3ffb1e5
 	md5sums = 9253b9e172b7838d1de2e5d1d2e70a2d
-	md5sums = 61e0c0d58ea5b99c1abb22cf69db04fb
-	md5sums = 49971dccb8e581c1f5f114a8fb5926e6
+	md5sums = ed2e66171fbfa495d897bc6b2ac8b549
 
 pkgname = numworks-omega
 
diff --git a/PKGBUILD b/PKGBUILD
index f643cd266c03..2caed1d1e6f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Julien Savard <juju@juju2143.ca>
 pkgname=numworks-omega
-_pkgver=1.20.3-E14
+_pkgver=1.21.0-E15
 pkgver=${_pkgver//-/.}
 pkgrel=1
 pkgdesc="A simulator for the Numworks graphic calculator (Omega firmware)"
 arch=('x86_64')
-url="https://getomega.web.app"
+url="https://getomega.dev"
 license=('custom:CC-BY-NC-SA')
 groups=()
 depends=('gcc-libs' 'libxext' 'libjpeg-turbo')
-makedepends=('freetype2' 'imagemagick' 'gendesk')
+makedepends=('freetype2' 'gendesk')
 optdepends=()
 provides=()
 conflicts=()
@@ -18,26 +18,21 @@ options=()
 install=
 changelog=
 _subpkgver=('8f710a9d3fa4daedde14ba489e418dbac5d590c5'
-            '279ec6333ab15e08988dff66eea01c6fdaee4ea0'
-            '48fc1cc72739ad766abbf161d78c2f98cf2f797d')
+            '67d66295b0a5a9bc5daf52412db9ae2ac87bbf57')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/Omega-Numworks/Omega/archive/O$_pkgver.tar.gz"
 	"https://github.com/Omega-Numworks/Omega-Atom/archive/${_subpkgver[0]}.tar.gz"
-	"https://github.com/Omega-Numworks/Omega-RPN/archive/${_subpkgver[1]}.tar.gz"
-	"https://github.com/Omega-Numworks/Omega-Themes/archive/${_subpkgver[2]}.tar.gz")
-md5sums=('42b7ff0178ecb91bdf6756daaf812288'
+	"https://github.com/Omega-Numworks/Omega-RPN/archive/${_subpkgver[1]}.tar.gz")
+md5sums=('974f3cb5aa2e481563e93e8ae3ffb1e5'
          '9253b9e172b7838d1de2e5d1d2e70a2d'
-         '61e0c0d58ea5b99c1abb22cf69db04fb'
-         '49971dccb8e581c1f5f114a8fb5926e6')
+         'ed2e66171fbfa495d897bc6b2ac8b549')
 
 prepare() {
 	cd "Omega-O$_pkgver"
 
-	rm -r apps/atom apps/rpn themes
+	rm -r apps/atom apps/rpn
 	cp -r "${srcdir}"/Omega-Atom-${_subpkgver[0]} apps/atom
 	cp -r "${srcdir}"/Omega-RPN-${_subpkgver[1]} apps/rpn
-	cp -r "${srcdir}"/Omega-Themes-${_subpkgver[2]} themes
 
-	convert -background "#C53431" "ion/src/simulator/assets/logo.svg" "$pkgname.png"
 	gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name "Numworks Omega" --icon "$pkgname" --exec "$pkgname" --categories "Education;Emulator"
 }
 
@@ -51,6 +46,6 @@ package() {
 	cd "Omega-O$_pkgver"
 	install -Dm755 output/release/simulator/linux/epsilon.bin "$pkgdir/usr/bin/$pkgname"
 	install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-	install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+	install -Dm644 "ion/src/simulator/assets/logoAUR.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
 	install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
 }