summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Reichel <sre@ring0.de>2018-09-15 20:26:38 +0200
committerSebastian Reichel <sre@ring0.de>2018-09-15 20:26:40 +0200
commitb0c1c2de705219ab79cb3e976678560ffd0f9ce3 (patch)
tree55cc2956942fd3cc8e3d5d785258ae8c533f7d1c
parent5393dcd9671499430a867de6a93395ec55bc95ab (diff)
downloadserial-barcode-scanner-b0c1c2de705219ab79cb3e976678560ffd0f9ce3.tar.bz2
pgp: fix build for valac 0.42
The change is not backwards compatible, so bump vala dependency.
-rw-r--r--debian/control2
-rw-r--r--src/pgp/pgp.vala4
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/control b/debian/control
index 479528b..b704e7f 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
libssl-dev,
meson,
udev,
- valac
+ valac (>= 0.42~)
Standards-Version: 4.1.5
Package: shopsystem
diff --git a/src/pgp/pgp.vala b/src/pgp/pgp.vala
index 6d9bed0..9bff922 100644
--- a/src/pgp/pgp.vala
+++ b/src/pgp/pgp.vala
@@ -52,7 +52,7 @@ public class PGPKeyArchive {
archive.support_format_all();
/* load test archive for now */
- if(archive.open_memory(data, data.length) != Archive.Result.OK)
+ if(archive.open_memory(data) != Archive.Result.OK)
return result;
while(archive.next_header(out entry) == Archive.Result.OK) {
@@ -68,7 +68,7 @@ public class PGPKeyArchive {
if(size > 50000)
continue;
- if(archive.read_data((void*) content, (ssize_t) size) == size) {
+ if(archive.read_data(content) == size) {
if(!((string) content).has_prefix("-----BEGIN PGP PUBLIC KEY BLOCK-----"))
continue;