trivionomicon: athena-bccr: update 1.9.8 -> latest master
This commit is contained in:
parent
cbc0180d60
commit
d835588135
2 changed files with 10 additions and 10 deletions
|
|
@ -8,18 +8,18 @@ Subject: [PATCH] Remove CheckUpdatePlugin from default list
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/src/main/java/cr/libre/firmador/Settings.java b/src/main/java/cr/libre/firmador/Settings.java
|
diff --git a/src/main/java/cr/libre/firmador/Settings.java b/src/main/java/cr/libre/firmador/Settings.java
|
||||||
index e5ddf01..a028d6e 100644
|
index e392a82..c2ab5e4 100644
|
||||||
--- a/src/main/java/cr/libre/firmador/Settings.java
|
--- a/src/main/java/cr/libre/firmador/Settings.java
|
||||||
+++ b/src/main/java/cr/libre/firmador/Settings.java
|
+++ b/src/main/java/cr/libre/firmador/Settings.java
|
||||||
@@ -81,7 +81,7 @@ public class Settings {
|
@@ -160,7 +160,7 @@ public class Settings {
|
||||||
|
@SuppressWarnings("this-escape")
|
||||||
public Settings() {
|
public Settings() {
|
||||||
activePlugins.add("cr.libre.firmador.plugins.DummyPlugin");
|
activePlugins.add("cr.libre.firmador.plugins.DummyPlugin");
|
||||||
- activePlugins.add("cr.libre.firmador.plugins.CheckUpdatePlugin");
|
- activePlugins.add("cr.libre.firmador.plugins.CheckUpdatePlugin");
|
||||||
+ // activePlugins.add("cr.libre.firmador.plugins.CheckUpdatePlugin");
|
+ // activePlugins.add("cr.libre.firmador.plugins.CheckUpdatePlugin");
|
||||||
|
// activePlugins.add("cr.libre.firmador.plugins.DocumentSignLogs");
|
||||||
availablePlugins.add("cr.libre.firmador.plugins.DummyPlugin");
|
availablePlugins.add("cr.libre.firmador.plugins.DummyPlugin");
|
||||||
availablePlugins.add("cr.libre.firmador.plugins.CheckUpdatePlugin");
|
availablePlugins.add("cr.libre.firmador.plugins.CheckUpdatePlugin");
|
||||||
}
|
|
||||||
--
|
--
|
||||||
2.49.0
|
2.51.2
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
enableJavaFX = true;
|
enableJavaFX = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
version = "1.9.8";
|
version = "1.9.8+master";
|
||||||
in
|
in
|
||||||
maven.buildMavenPackage {
|
maven.buildMavenPackage {
|
||||||
pname = "firmador";
|
pname = "firmador";
|
||||||
|
|
@ -19,15 +19,15 @@ in
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://codeberg.org/firmador/firmador";
|
url = "https://codeberg.org/firmador/firmador";
|
||||||
rev = version;
|
rev = "676b0e3c0dc5adb0628d4d98efcfccfca3daa8a7";
|
||||||
hash = "sha256-xdiVPjihRADPK4nG+WQHWsDzVYLCeN6ouQ6SDtjf1qQ=";
|
hash = "sha256-f/EKll1csvUCRSt4G1SeDB4gVW+ZtUgJjlmM7PlafyQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./0001-Remove-CheckUpdatePlugin-from-default-list.patch
|
./0001-Remove-CheckUpdatePlugin-from-default-list.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
mvnHash = "sha256-m3UaOLNyIlVAOI5tzxMlxg4KZ1N5gT2O2WSka+jBat4=";
|
mvnHash = "sha256-0vwJ1f+0UXxrXRaJ1BHqfOXDU/pxrSPdYYEQ71m4jJQ=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
makeWrapper
|
makeWrapper
|
||||||
|
|
@ -35,7 +35,7 @@ in
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = lib.optionalString (libasep11 != null) ''
|
postPatch = lib.optionalString (libasep11 != null) ''
|
||||||
sed -i 's@/usr/lib/x64-athena/libASEP11.so@${libasep11}@g' src/main/java/cr/libre/firmador/CRSigner.java
|
sed -i 's@/usr/lib/x64-athena/libASEP11.so@${libasep11}@g' src/main/java/cr/libre/firmador/signers/CRSigner.java
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue