diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /media-gfx/simple-scan | |
parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) |
gentoo resync : 14.05.2020
Diffstat (limited to 'media-gfx/simple-scan')
-rw-r--r-- | media-gfx/simple-scan/Manifest | 7 | ||||
-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 | 74 | ||||
-rw-r--r-- | media-gfx/simple-scan/simple-scan-3.34.6.ebuild (renamed from media-gfx/simple-scan/simple-scan-3.32.2.1.ebuild) | 18 |
4 files changed, 9 insertions, 129 deletions
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest index 6093ecc89dac..117fe707463a 100644 --- a/media-gfx/simple-scan/Manifest +++ b/media-gfx/simple-scan/Manifest @@ -1,9 +1,6 @@ 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.32.2.1.tar.xz 790848 BLAKE2B ded17193c29698a4e07e3d82689fbf84babceb36b2dedb09da5e81ed35399084d6db5b448d3bed56af559a6dc9c8708b4cda1730a248a094e005755b7dd49e95 SHA512 c49620c4be4289b18c792e35a01494a56a28b46e4f246a4c58203cf86cd34a1aa8f42738ef8b50ae6e99150630ec60f999b2000a8ee9674abc4f307db4c6c0cb -DIST simple-scan-3.32.2.tar.xz 790800 BLAKE2B 98e502cbc280285dbe20a0c843d5f8d8b38707e973f2ba6aba2ccef9d739165371f5f30d7d6658853c5a6a280ba2919a98acd02b4757b4e881f96d5a7b53449b SHA512 10322ae72461efe43a4e230443c3aca24aff6f0cab07750c6eab9ebb718889e51d8c77ff722c337f333a8952ac84f69d03ad88eedfd4432ef11f7c7493170e14 DIST simple-scan-3.34.4.tar.xz 795228 BLAKE2B b6f185bfbc1954ae2573fd1dcfa54f67e26290654c1019bfd34c229235e27cfc1eb40de0e6d5249f97b73c57745e1133fbd6fd1c3f9bdedb795b61068d5ed25d SHA512 b16b653e0a8ce399ecbdb88c4663d7780793518809eb73681c9c6281b9cde784167090c41720b21c184b9fdece28b07ba61fe8a97f10d792cc7326a458741ba4 -EBUILD simple-scan-3.32.2.1.ebuild 1528 BLAKE2B 821ca0207431cafe2cf83a4bb676df2fdade54289184bc4f248a7a326949534753d27adb63a74c195a92cfc430518bcf7efb955b5c98190539a7e6a6169337ab SHA512 0b44fb7b8837fe822085cae5dd5f10e98e56367559121a0932d24a57fec5bad475c4d495a6612095036246a625777690b466d614e7f40a7ae4cda50dbdd6ac9a -EBUILD simple-scan-3.32.2.ebuild 1526 BLAKE2B 759f8334d42a2296fceb82b2a3dd7268ea2d650247e31e72266ed34073dcc2686ab162cece76d75ff6de9239c947e1bee3b9b214b88b053b6f04971cd99a4859 SHA512 bc3b9c5722eb613e4325f21c47e0fbd23b0cb6cde2180a938dc7630e63438e37362054e3342024a3cb0af68144b00213261a13074929c076d6943503988f0813 +DIST simple-scan-3.34.6.tar.xz 801064 BLAKE2B 94c6bc386c2d7701bd13067e384eb294ce145d2e02d66e366e76a2c85fb5e3ac4e9bae0efa37fe13d3fc857b57c1730bf01961f7968d6744a4ea4dc47308cb23 SHA512 7b2d0eab13f08d4110d2143c4572e249297891e3868e6eb178a7a765b2d56960820931fbda538ede318014c578871657aa0e27518d184f861efc18ad4fdd900c EBUILD simple-scan-3.34.4.ebuild 1322 BLAKE2B b6359d130e933254fa3e5350ebb2ac562d4682f5c1af219f07321202e3deab61adf6dc9cd34e1dbbc3a04b0211ed091273e494692fadceca6a52bfebd1383c04 SHA512 16e305af51c31b4f775de7b4afe58cbe7ca51622dfa073c890a3e179b83a5f5853d333042aad26a738fbb19253621cc347e7b8a0984717fa2d04629443a9d219 +EBUILD simple-scan-3.34.6.ebuild 1324 BLAKE2B 61b1cd39eae6762f0cbee289d0b4ee56cb36633fc968fcfc80dad7b99163d19b2e0c0314716c957ae845a56e59ba81df78d68852b7d7ca933c7d22236fb71982 SHA512 dc4b204b412c840749383273bb7c8c3fb4bc4e44d53b8d3e2332b603a372476bf0bbce9780d13a5d5e07e3dc3e9c10145a7be1e08ac22dd44d53ef07a6fe0066 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 deleted file mode 100644 index 9ba4aa721349..000000000000 --- a/media-gfx/simple-scan/files/simple-scan-3.32.2-unasigned-variable.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 deleted file mode 100644 index 79bbc6ac4fd0..000000000000 --- a/media-gfx/simple-scan/simple-scan-3.32.2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -VALA_MIN_API_VERSION="0.34" - -inherit gnome.org gnome2-utils meson vala xdg - -DESCRIPTION="Simple document scanning utility" -HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc64 x86" -IUSE="colord webp" # packagekit - -COMMON_DEPEND=" - >=dev-libs/glib-2.38:2 - >=x11-libs/gtk+-3.22:3 - >=sys-libs/zlib-1.2.3.1:= - x11-libs/cairo:= - x11-libs/gdk-pixbuf:2 - >=dev-libs/libgusb-0.2.7 - colord? ( >=x11-misc/colord-0.1.24:=[udev] ) - webp? ( media-libs/libwebp ) - >=media-gfx/sane-backends-1.0.20:= - - virtual/jpeg:0= -" -# packagekit? ( >=app-admin/packagekit-base-1.1.5 ) -RDEPEND="${COMMON_DEPEND} - x11-misc/xdg-utils -" -DEPEND="${COMMON_DEPEND} - $(vala_depend) - dev-libs/libxml2:2 - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - >=dev-libs/libgusb-0.2.7[vala] - colord? ( >=x11-misc/colord-0.1.24:=[vala] ) -" - -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() { - vala_src_prepare - xdg_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_use colord) - -Dpackagekit=false - $(meson_use webp) - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/media-gfx/simple-scan/simple-scan-3.32.2.1.ebuild b/media-gfx/simple-scan/simple-scan-3.34.6.ebuild index a353c2802059..a2e99a48eaa5 100644 --- a/media-gfx/simple-scan/simple-scan-3.32.2.1.ebuild +++ b/media-gfx/simple-scan/simple-scan-3.34.6.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 VALA_MIN_API_VERSION="0.34" - inherit gnome.org gnome2-utils meson vala xdg DESCRIPTION="Simple document scanning utility" @@ -12,9 +11,9 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan" LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc64 ~x86" -IUSE="colord webp" # packagekit +IUSE="colord webp" -COMMON_DEPEND=" +DEPEND=" >=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.22:3 >=sys-libs/zlib-1.2.3.1:= @@ -28,25 +27,22 @@ COMMON_DEPEND=" virtual/jpeg:0= " # packagekit? ( >=app-admin/packagekit-base-1.1.5 ) -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} x11-misc/xdg-utils " -DEPEND="${COMMON_DEPEND} +BDEPEND=" $(vala_depend) dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig - >=dev-libs/libgusb-0.2.7[vala] - colord? ( >=x11-misc/colord-0.1.24:=[vala] ) + dev-libs/libgusb[vala] + colord? ( x11-misc/colord[vala] ) " 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() { |