diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
| commit | b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch) | |
| tree | 16fe44748708acacd909d4e2e160a09a7f6d936a /media-gfx/simple-scan | |
| parent | 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff) | |
gentoo resync : 18.11.2019
Diffstat (limited to 'media-gfx/simple-scan')
| -rw-r--r-- | media-gfx/simple-scan/Manifest | 3 | ||||
| -rw-r--r-- | media-gfx/simple-scan/files/simple-scan-3.32.2-unasigned-variable.patch | 39 | ||||
| -rw-r--r-- | media-gfx/simple-scan/simple-scan-3.32.2.ebuild | 4 |
3 files changed, 45 insertions, 1 deletions
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest index 7715a2fd3ba9..2b3088c8972c 100644 --- a/media-gfx/simple-scan/Manifest +++ b/media-gfx/simple-scan/Manifest @@ -1,6 +1,7 @@ AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08 +AUX simple-scan-3.32.2-unasigned-variable.patch 1294 BLAKE2B 7e513d96237872f5afc8c5a942d40f0f98632129eb9a2476099d8d28b1eb3660c0f5831d161c1c58f989327ff9eaeb4c5d426c3812fd1fe57270176b5dd37d29 SHA512 f3bcde7dd03ff9ade43f10b14124390aa08e0f2c00b7dc3b1cf08c5870c280a1e21dbdce7029a1f4c3372f72bac5f596026e7f70c7ee36c219d0c3f4df7e31a1 DIST simple-scan-3.30.2.tar.xz 512540 BLAKE2B 908af68fbd297e2cc0c0c5440166ebc706f6c0a1a88948e9cdfe30a2e9e548125b31e6a00684a8a0db8e4c37c9d0930765b74e2ba9e1d540e4ae705cfd404349 SHA512 3a4d19bd36a88124ba43d388807afd1d6a51fc691ed83570a095e3b9719b5db5f3eb457a41bc8e36f2f1bf25ff4ab83edc150d4cdddd0d528e9280ea2da6cdb6 DIST simple-scan-3.32.2.tar.xz 790800 BLAKE2B 98e502cbc280285dbe20a0c843d5f8d8b38707e973f2ba6aba2ccef9d739165371f5f30d7d6658853c5a6a280ba2919a98acd02b4757b4e881f96d5a7b53449b SHA512 10322ae72461efe43a4e230443c3aca24aff6f0cab07750c6eab9ebb718889e51d8c77ff722c337f333a8952ac84f69d03ad88eedfd4432ef11f7c7493170e14 EBUILD simple-scan-3.30.2.ebuild 1411 BLAKE2B 336efc46f57cc33f3522ea53a381a40aae08389ab0902d93b23ed5055bd648bf68d1b747e1d8df525f34da59fde2973e2a87f3aef8d4449c4e1d51b6036fc967 SHA512 c45ea9e8396fd2f216e0c7479691f43d6a8aad37a23ce260ec9974a991e30bc4d7d8a781970948fc87047e317f01a952a5fe4e5506562012b71d5e209479724f -EBUILD simple-scan-3.32.2.ebuild 1385 BLAKE2B 0f406f83606d4203dd0d7785b5330db5a0cf7d5a6c00d7a86b8d5768388d8de0016100184ce6afbd95e0e4ab9e598b8d635a8abbcad00024bf7dabe491dc9799 SHA512 6176fa51739f6975a17a0e7147a152464566d3192bc7414e6239351189674768a5d83bb80575f38968e8cc57266a028947c1e10a38c16697736853023e1449b0 +EBUILD simple-scan-3.32.2.ebuild 1528 BLAKE2B 3ace2c7fbe21c9c24f9937942613d7cafc23c2027bba6f5a25bfe2bd6aef100a3739e49aea0d35cf7a00f44b7f0c709571581ceeeda216d6f4f3938c5fd35c3d SHA512 be19bd803d7e3eb315212c2bf4ae7cffd8f4f714e670c7099a56ba0689497eacfd011b498e655ad6ee4e3e729def0e5cb4c5de4ac14bd1e3c27cbabebaaac3a6 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47 diff --git a/media-gfx/simple-scan/files/simple-scan-3.32.2-unasigned-variable.patch b/media-gfx/simple-scan/files/simple-scan-3.32.2-unasigned-variable.patch new file mode 100644 index 000000000000..9ba4aa721349 --- /dev/null +++ b/media-gfx/simple-scan/files/simple-scan-3.32.2-unasigned-variable.patch @@ -0,0 +1,39 @@ +From 47d3532459863e3b0bc1c7fd3a200f612863c814 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/media-gfx/simple-scan/simple-scan-3.32.2.ebuild b/media-gfx/simple-scan/simple-scan-3.32.2.ebuild index c3f42c9f23b3..2c9045ad83f2 100644 --- a/media-gfx/simple-scan/simple-scan-3.32.2.ebuild +++ b/media-gfx/simple-scan/simple-scan-3.32.2.ebuild @@ -3,6 +3,7 @@ EAPI=6 VALA_MIN_API_VERSION="0.34" + inherit gnome.org gnome2-utils meson vala xdg DESCRIPTION="Simple document scanning utility" @@ -43,6 +44,9 @@ DEPEND="${COMMON_DEPEND} PATCHES=( # Add control for optional dependencies "${FILESDIR}"/3.26-add-control-optional-deps.patch + # libwepmix: Fix use of possibly unassigned local variable 'data' + # (from 3.34 branch) + "${FILESDIR}"/${PN}-3.32.2-unasigned-variable.patch ) src_prepare() { |