Compilación desde el código fuente añadida y mejoras.

3 files changed, 42 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3936a470ab01..721838c157ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = pseint
-	pkgdesc = A tool for learning programming basis with a simple spanish pseudocode
+	pkgdesc = A tool for learning programming basis with a simple spanish pseudocode.
 	pkgver = 20210609
 	pkgrel = 1
-	url = http://pseint.sourceforge.net
+	url = sourceforge.net/p/pseint
 	arch = x86_64
 	license = GPL2
 	depends = gendesk
 	depends = wxwidgets-gtk3
 	conflicts = pseint-bin
 	noextract = creator.psz
-	source = pseint-20210609.tar.gz::https://cfhcable.dl.sourceforge.net/project/pseint/20210609/pseint-l64-20210609.tgz
-	sha256sums = a5df4e147c529e3da509b30dee02791642c32cb3b5bbbc6cd3cd7594f10cb9f4
+	source = https://netactuate.dl.sourceforge.net/project/pseint/20210609/pseint-src-20210609.tgz
+	sha256sums = cbebd218c7b8adf3050054c3e778bc4c8fdace59bc6cd43754cf4d267dd02952
 
 pkgname = pseint
diff --git a/PKGBUILD b/PKGBUILD
index e72c2674af71..0b60137c106f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,66 @@
 # Maintainer: dakataca <🐬danieldakataca@gmail.com>
 # Contributor: Cristophero <cristophero.alvarado@gmail.com>
-pkgname=pseint
+pkgname='pseint'
 pkgver=20210609
 pkgrel=1
-pkgdesc="A tool for learning programming basis with a simple spanish pseudocode"
-comment="Educational tool to learn the fundamentals and development of programming logic"
+pkgdesc="A tool for learning programming basis with a simple spanish pseudocode."
 arch=('x86_64')
-url='http://pseint.sourceforge.net'
+url='sourceforge.net/p/pseint'
 license=('GPL2')
 conflicts=('pseint-bin')
 depends=('gendesk' 'wxwidgets-gtk3')
 noextract=(creator.psz)
-source=("$pkgname-$pkgver.tar.gz::https://cfhcable.dl.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-l64-${pkgver}.tgz")
-sha256sums=('a5df4e147c529e3da509b30dee02791642c32cb3b5bbbc6cd3cd7594f10cb9f4')  # 'makepkg -g' para generarlo.
+source=("https://netactuate.dl.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.tgz")
+sha256sums=('cbebd218c7b8adf3050054c3e778bc4c8fdace59bc6cd43754cf4d267dd02952')  # 'makepkg -g' to generate it.
 
 prepare(){
+
+    cd ${pkgname}
     gendesk -f -n \
         --pkgname="${pkgname}" \
         --pkgdesc="${pkgdesc}" \
         --name="${pkgname}" \
         --genericname="${pkgname}" \
-        --comment="${comment}" \
+        --comment="${pkgdesc}" \
         --exec="${pkgname}" \
         --path="/opt/${pkgname}" \
         --icon="${pkgname}" \
         --categories='Development,Education'
 }
 
+pkgver(){
+
+    cd ${pkgname}
+    cat "bin/version"
+}
+
+build(){
+
+    cd ${pkgname}
+    local -r wxconfig_version=$(wx-config --version | sed -E 's/([0-9]\.[0-9])(\.[0-9])*/\1/')
+    sed -Ei \
+        "s/(--version=)[0-9](\.[0-9])*/\1${wxconfig_version}/g ; \
+        s,bin(/bin),\1," \
+        {wxPSeInt,ps{eval,term,draw{E,3}}}/Makefile.lnx
+    make linux
+ }
+
 package(){
-    install -Dvm644 "${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dvm644 "${srcdir}/${pkgname}/imgs/icon.icns" "${pkgdir}/usr/share/pixmaps/${pkgname}.icns"
-    install -Dvm755 "../${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-    cp -r ${srcdir}/${pkgname}/ ${pkgdir}/opt/
+
+    cd "${pkgname}"
+    mkdir -p ${pkgdir}/opt/${pkgname}
+    cp -rv bin/* ${pkgdir}/opt/${pkgname}
+    install -Dvm644 "${pkgname}.desktop" -t "${pkgdir}/usr/share/applications/"
+    install -Dvm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dvm755 <(echo -e '#!/usr/bin/env bash\n/opt/pseint/wxPSeInt') ${pkgdir}/usr/bin/${pkgname}
 }
 
-## Test:
-# rm -rf pseint-{20210609.tar.gz,l64-20210609.tgz,20210609-1.src.tar.gz} src/ pkg/
-## References
+## Test
+# rm -rf pseint-* src/ pkg/
 
+## References
 # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=densify
 # https://wiki.archlinux.org/title/Desktop_entries#How_to_use
-# https://sourceforge.net/projects/pseint/files/
-# https://sourceforge.net/projects/pseint/files/20210609/pseint-l64-20210609.tgz/download
+# https://sourceforge.net/p/pseint/code/ci/master/tree/
+# https://askubuntu.com/questions/1060601/is-there-a-way-to-create-a-script-and-make-it-executable-in-less-code-than-this#comment1736560_1060642
+# https://www.gnu.org/software/bash/manual/html_node/Process-Substitution.html
diff --git a/pseint b/pseint
deleted file mode 100755
index 4d52a033506a..000000000000
--- a/pseint
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-#/opt/pseint/wxPSeInt
-/opt/pseint