diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2019-09-23 01:56:44 +0200 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2019-09-23 01:57:15 +0200 |
| commit | 090fcfa8a18a61543a3f926c228d86f913de3f68 (patch) | |
| tree | d1094793eb9558fd1f7037b5af25ee7d5a98d47c /community/simple-scan | |
| parent | 284b2143743db46854a5647acb20241b2a9d711f (diff) | |
| download | aports-090fcfa8a18a61543a3f926c228d86f913de3f68.tar.bz2 aports-090fcfa8a18a61543a3f926c228d86f913de3f68.tar.xz | |
community/simple-scan: fix build against vala-0.46.0-r0
Diffstat (limited to 'community/simple-scan')
| -rw-r--r-- | community/simple-scan/14fe1c4d345d692ab4f73be59ca4a0b96893d0b1.patch | 39 | ||||
| -rw-r--r-- | community/simple-scan/APKBUILD | 6 |
2 files changed, 43 insertions, 2 deletions
diff --git a/community/simple-scan/14fe1c4d345d692ab4f73be59ca4a0b96893d0b1.patch b/community/simple-scan/14fe1c4d345d692ab4f73be59ca4a0b96893d0b1.patch new file mode 100644 index 0000000000..b79002f63a --- /dev/null +++ b/community/simple-scan/14fe1c4d345d692ab4f73be59ca4a0b96893d0b1.patch @@ -0,0 +1,39 @@ +From 14fe1c4d345d692ab4f73be59ca4a0b96893d0b1 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz <ricotz@ubuntu.com> +Date: Sat, 14 Sep 2019 20:03:47 +0200 +Subject: [PATCH] libwepmix: Fix use of possibly unassigned local variable + 'data' + +--- + src/libwebpmux.vapi | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/src/libwebpmux.vapi b/src/libwebpmux.vapi +index f2461a2..42d2886 100644 +--- a/src/libwebpmux.vapi ++++ b/src/libwebpmux.vapi +@@ -61,9 +61,7 @@ namespace WebP + [CCode (cname = "vala_set_image")] + public MuxError set_image (uint8[] bitstream, bool copy_data) + { +- Data data; +- data.bytes = bitstream; +- data.size = bitstream.length; ++ Data data = { bitstream, bitstream.length }; + return _set_image (data, copy_data); + } + +@@ -89,9 +87,7 @@ namespace WebP + public MuxError set_chunk (string fourcc, uint8[] chunk_data, bool copy_data) + requires (fourcc.length == 4) + { +- Data data; +- data.bytes = chunk_data; +- data.size = chunk_data.length; ++ Data data = { chunk_data ,chunk_data.length }; + return _set_chunk ((uchar[]) fourcc, data, copy_data); + } + +-- +2.22.0 + diff --git a/community/simple-scan/APKBUILD b/community/simple-scan/APKBUILD index a201dee2c6..90903d2eb4 100644 --- a/community/simple-scan/APKBUILD +++ b/community/simple-scan/APKBUILD @@ -11,7 +11,8 @@ license="GPL-3.0-or-later" makedepends="sane-dev dconf-dev gtk+3.0-dev colord-dev libgusb-dev vala itstool libxml2-utils meson libwebp-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.gnome.org/sources/simple-scan/${pkgver%.*}/simple-scan-$pkgver.tar.xz" +source="https://download.gnome.org/sources/simple-scan/${pkgver%.*}/simple-scan-$pkgver.tar.xz + 14fe1c4d345d692ab4f73be59ca4a0b96893d0b1.patch" build() { @@ -31,4 +32,5 @@ package() { DESTDIR="$pkgdir" ninja -C output install } -sha512sums="daee50349c93e7c0cc025de53f702db80d50dbbd70edbe1331533e15f500f8ca2eb8cec148d1b68af9cf623723f1950fecec4e3018f7d1f7b7eb048d964059d2 simple-scan-3.34.0.tar.xz" +sha512sums="daee50349c93e7c0cc025de53f702db80d50dbbd70edbe1331533e15f500f8ca2eb8cec148d1b68af9cf623723f1950fecec4e3018f7d1f7b7eb048d964059d2 simple-scan-3.34.0.tar.xz +dcf9aae3f5682858e8d601d1ce79edc7274d1229203c32e3558a471c770cfa3608d27601135f044e174382df5d73f4224baf2cc8cd2b674ed586973edeb44e26 14fe1c4d345d692ab4f73be59ca4a0b96893d0b1.patch" |