[PR PATCH] [WIP] Fix autofirma with firefox

[PR PATCH] [WIP] Fix autofirma with firefox

[Eloitor]

[-- Attachment #1: Type: text/plain, Size: 966 bytes --]

There is a new pull request by Eloitor against master on the void-packages repository

https://github.com/Eloitor/void-packages autofirma
https://github.com/void-linux/void-packages/pull/49005

[WIP] Fix autofirma with firefox
#### Testing the changes
- I tested the changes in this PR: **NO**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

I received a bug report for using autofirma from firefox. Basically, somehow autofirma generates a file `/usr/lib64/firefox/defaults/pref/AutoFirma.js` which searches the file `/usr/bin/AutoFirma` which is not the name of the binary provided in the void package.

Maybe we should provide this file in the package instead of letting autofirma generate it? IDK.
I will ask for more testing of this PR (I don't know how to reproduce it) and I'll let you know when this is ready.

A patch file from https://github.com/void-linux/void-packages/pull/49005.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-autofirma-49005.patch --]
[-- Type: text/x-diff, Size: 1187 bytes --]

From cca49111d5c0c1caf3a9a96abaddb097fd4cad19 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Thu, 29 Feb 2024 16:36:39 +0100
Subject: [PATCH] Fix autofirma with firefox

---
 srcpkgs/autofirma/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/autofirma/template b/srcpkgs/autofirma/template
index 2d87e27fb67811..bd076a43d9dbcc 100644
--- a/srcpkgs/autofirma/template
+++ b/srcpkgs/autofirma/template
@@ -1,7 +1,7 @@
 # Template file for 'autofirma'
 pkgname=autofirma
 version=1.8.2
-revision=1
+revision=2
 _jmulticard_version=1.8
 hostmakedepends="apache-maven openjdk11"
 depends="virtual?java-environment"
@@ -17,6 +17,12 @@ checksum="40ebcd1200129ca08c21176a5fbd64c04ce0ac6bd932c4b213d4b7213f851a0d
 # maven-surefire-plugin needed
 make_check=no
 
+do_patch() {
+	cd "clienteafirma-${version}"
+	sed -i 's|/usr/bin/AutoFirma|/usr/bin/autofirma|g' afirma-simple/src/main/resources/linux/AutoFirma.js
+	sed -i 's|/usr/bin/AutoFirma|/usr/bin/autofirma|g' afirma-simple/src/main/resources/help/Spanish.lproj/pgs/LineaComandos.html
+}
+
 do_build() {
 	. /etc/profile.d/jdk.sh
 	cd "jmulticard-${_jmulticard_version}"

Re: [PR PATCH] [Updated] [WIP] Fix autofirma with firefox

[Eloitor]

[-- Attachment #1: Type: text/plain, Size: 971 bytes --]

There is an updated pull request by Eloitor against master on the void-packages repository

https://github.com/Eloitor/void-packages autofirma
https://github.com/void-linux/void-packages/pull/49005

[WIP] Fix autofirma with firefox
#### Testing the changes
- I tested the changes in this PR: **NO**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

I received a bug report for using autofirma from firefox. Basically, somehow autofirma generates a file `/usr/lib64/firefox/defaults/pref/AutoFirma.js` which searches the file `/usr/bin/AutoFirma` which is not the name of the binary provided in the void package.

Maybe we should provide this file in the package instead of letting autofirma generate it? IDK.
I will ask for more testing of this PR (I don't know how to reproduce it) and I'll let you know when this is ready.

A patch file from https://github.com/void-linux/void-packages/pull/49005.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-autofirma-49005.patch --]
[-- Type: text/x-diff, Size: 1883 bytes --]

From 7f7d149a84077a29823210664d565da76f0c42be Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Thu, 29 Feb 2024 16:36:39 +0100
Subject: [PATCH] Fix autofirma with firefox, add desktop file and icon.

---
 srcpkgs/autofirma/template | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/autofirma/template b/srcpkgs/autofirma/template
index 2d87e27fb67811..66309fa9f1c7cd 100644
--- a/srcpkgs/autofirma/template
+++ b/srcpkgs/autofirma/template
@@ -1,7 +1,7 @@
 # Template file for 'autofirma'
 pkgname=autofirma
 version=1.8.2
-revision=1
+revision=2
 _jmulticard_version=1.8
 hostmakedepends="apache-maven openjdk11"
 depends="virtual?java-environment"
@@ -17,6 +17,13 @@ checksum="40ebcd1200129ca08c21176a5fbd64c04ce0ac6bd932c4b213d4b7213f851a0d
 # maven-surefire-plugin needed
 make_check=no
 
+do_patch() {
+	cd "clienteafirma-${version}"
+	sed -i 's|/usr/bin/AutoFirma|/usr/bin/autofirma|g' afirma-simple/src/main/resources/linux/AutoFirma.js
+	sed -i 's|/usr/bin/AutoFirma|/usr/bin/autofirma|g' afirma-simple/src/main/resources/help/Spanish.lproj/pgs/LineaComandos.html
+	sed -i 's|/usr/lib/AutoFirma/AutoFirma.png|Autofirma|g' afirma-simple-installer/linux/instalador_deb/src/usr/share/applications/afirma.desktop
+}
+
 do_build() {
 	. /etc/profile.d/jdk.sh
 	cd "jmulticard-${_jmulticard_version}"
@@ -35,5 +42,7 @@ do_check() {
 do_install() {
 	vmkdir usr/share/java/${pkgname}
 	vinstall clienteafirma-${version}/afirma-simple/target/AutoFirma.jar 644 usr/share/java/autofirma
+	vinstall clienteafirma-${version}/afirma-simple-installer/linux/instalador_deb/src/usr/share/applications/afirma.desktop 644 usr/share/applications
+	vinstall clienteafirma-${version}/afirma-simple-installer/linux/instalador_deb/src/usr/share/AutoFirma/AutoFirma.svg 644 usr/share/applications/icons
 	vbin "${FILESDIR}/autofirma"
 }

Re: [PR PATCH] [Updated] [WIP] Fix autofirma with firefox

[Eloitor]

[-- Attachment #1: Type: text/plain, Size: 971 bytes --]

There is an updated pull request by Eloitor against master on the void-packages repository

https://github.com/Eloitor/void-packages autofirma
https://github.com/void-linux/void-packages/pull/49005

[WIP] Fix autofirma with firefox
#### Testing the changes
- I tested the changes in this PR: **NO**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

I received a bug report for using autofirma from firefox. Basically, somehow autofirma generates a file `/usr/lib64/firefox/defaults/pref/AutoFirma.js` which searches the file `/usr/bin/AutoFirma` which is not the name of the binary provided in the void package.

Maybe we should provide this file in the package instead of letting autofirma generate it? IDK.
I will ask for more testing of this PR (I don't know how to reproduce it) and I'll let you know when this is ready.

A patch file from https://github.com/void-linux/void-packages/pull/49005.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-autofirma-49005.patch --]
[-- Type: text/x-diff, Size: 2321 bytes --]

From 6e4b3af21cf7633a6b3262661851cd929ca05039 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Thu, 29 Feb 2024 16:36:39 +0100
Subject: [PATCH] Fix autofirma with firefox, license, add desktop file and
 icon.

---
 srcpkgs/autofirma/template | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/autofirma/template b/srcpkgs/autofirma/template
index 2d87e27fb67811..2bc59d70f9e544 100644
--- a/srcpkgs/autofirma/template
+++ b/srcpkgs/autofirma/template
@@ -1,13 +1,13 @@
 # Template file for 'autofirma'
 pkgname=autofirma
 version=1.8.2
-revision=1
+revision=2
 _jmulticard_version=1.8
 hostmakedepends="apache-maven openjdk11"
 depends="virtual?java-environment"
 short_desc="Electronic signature client from the Spanish Public Administration"
 maintainer="Eloi Torrents <eloitor@disroot.org>"
-license="GPL-3.0-or-later"
+license="GPL-2.0-or-later, EUPL-1.1" # OR
 homepage="https://firmaelectronica.gob.es/"
 distfiles="https://github.com/ctt-gob-es/clienteafirma/archive/v${version}.tar.gz
  https://github.com/ctt-gob-es/jmulticard/archive/refs/tags/v${_jmulticard_version}.tar.gz"
@@ -17,6 +17,13 @@ checksum="40ebcd1200129ca08c21176a5fbd64c04ce0ac6bd932c4b213d4b7213f851a0d
 # maven-surefire-plugin needed
 make_check=no
 
+do_patch() {
+	cd "clienteafirma-${version}"
+	sed -i 's|/usr/bin/AutoFirma|/usr/bin/autofirma|g' afirma-simple/src/main/resources/linux/AutoFirma.js
+	sed -i 's|/usr/bin/AutoFirma|/usr/bin/autofirma|g' afirma-simple/src/main/resources/help/Spanish.lproj/pgs/LineaComandos.html
+	sed -i 's|/usr/lib/AutoFirma/AutoFirma.png|Autofirma|g' afirma-simple-installer/linux/instalador_deb/src/usr/share/applications/afirma.desktop
+}
+
 do_build() {
 	. /etc/profile.d/jdk.sh
 	cd "jmulticard-${_jmulticard_version}"
@@ -35,5 +42,7 @@ do_check() {
 do_install() {
 	vmkdir usr/share/java/${pkgname}
 	vinstall clienteafirma-${version}/afirma-simple/target/AutoFirma.jar 644 usr/share/java/autofirma
+	vinstall clienteafirma-${version}/afirma-simple-installer/linux/instalador_deb/src/usr/share/applications/afirma.desktop 644 usr/share/applications
+	vinstall clienteafirma-${version}/afirma-simple-installer/linux/instalador_deb/src/usr/share/AutoFirma/AutoFirma.svg 644 usr/share/applications/icons
 	vbin "${FILESDIR}/autofirma"
 }