* [gentoo-commits] repo/gentoo:master commit in: media-gfx/simple-scan/, media-gfx/simple-scan/files/
@ 2020-04-25 20:17 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2020-04-25 20:17 UTC (permalink / raw
To: gentoo-commits
commit: 1037bbc547ae7b779503f4cbfae592e53c43d73e
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 19:52:36 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 20:17:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1037bbc5
media-gfx/simple-scan: remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
media-gfx/simple-scan/Manifest | 2 -
.../simple-scan-3.32.2-unasigned-variable.patch | 39 ------------
media-gfx/simple-scan/simple-scan-3.32.2.1.ebuild | 74 ----------------------
media-gfx/simple-scan/simple-scan-3.32.2.ebuild | 74 ----------------------
4 files changed, 189 deletions(-)
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 90d5c5d4030..82db67e594f 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,3 +1 @@
-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
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 9ba4aa72134..00000000000
--- 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.1.ebuild b/media-gfx/simple-scan/simple-scan-3.32.2.1.ebuild
deleted file mode 100644
index a353c280205..00000000000
--- a/media-gfx/simple-scan/simple-scan-3.32.2.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 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.ebuild b/media-gfx/simple-scan/simple-scan-3.32.2.ebuild
deleted file mode 100644
index 79bbc6ac4fd..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/simple-scan/, media-gfx/simple-scan/files/
@ 2024-05-18 8:47 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2024-05-18 8:47 UTC (permalink / raw
To: gentoo-commits
commit: fc332aa1256dadcdc5e56d77468a896f52c16277
Author: Guillermo Joandet <gjoandet <AT> gmail <DOT> com>
AuthorDate: Wed Feb 28 22:29:13 2024 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat May 18 08:47:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc332aa1
media-gfx/simple-scan: Bump to 46.0
Signed-off-by: Guillermo Joandet <gjoandet <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35573
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
media-gfx/simple-scan/Manifest | 1 +
.../files/46.0-add-control-optional-deps.patch | 82 ++++++++++++++++++++++
media-gfx/simple-scan/simple-scan-46.0.ebuild | 71 +++++++++++++++++++
3 files changed, 154 insertions(+)
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index cdd154e673d1..19180b8a9e11 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1 +1,2 @@
DIST simple-scan-44.0.tar.xz 1198824 BLAKE2B 2bc9ea19a99b02d6acdb21036558bd2d42751699a89d41ec4da3336c061ecc7ad249b34ab0b30c6a6fc162fb7f6538859d1c29b2c9a843f2c2a8785dadc8a086 SHA512 8543b687eafec4f2460efa446146b4fe3a0ad469e5dcc5fcd19a02484cbfac5bce80741b488217af44c580720a01577a8e78479a4d2e96307da3de9dcfa467c6
+DIST simple-scan-46.0.tar.xz 1136672 BLAKE2B 0ee2dd5392ed1a888948183e9efbd8943287baad66dd45351cbbb32a9a4c17903415676b3e6e00203d8a3572e90397b51bc23ecec2ad6cfa6597a10ffdd5bcf4 SHA512 f7c4433536f59c71f066cdae51b0de1b0dcf9b8af00f3bedb4c1be281d09f9ce122666ed849bd88de8868042429f14bb7b01409f8a006360ce4285000fd30bdc
diff --git a/media-gfx/simple-scan/files/46.0-add-control-optional-deps.patch b/media-gfx/simple-scan/files/46.0-add-control-optional-deps.patch
new file mode 100644
index 000000000000..18e17c2315e0
--- /dev/null
+++ b/media-gfx/simple-scan/files/46.0-add-control-optional-deps.patch
@@ -0,0 +1,82 @@
+From a5f01beb41a81f483d90eb4dd785822a8615f65f Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 30 May 2018 08:44:18 +0200
+Subject: [PATCH] build: Add control for optional dependencies
+
+---
+ meson.build | 18 ++++++++++++++----
+ meson_options.txt | 3 +++
+ src/meson.build | 12 ++++++++----
+ 3 files changed, 25 insertions(+), 8 deletions(-)
+ create mode 100644 meson_options.txt
+
+diff --git a/meson.build b/meson.build
+index 1e1522c..45d7ed7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -34,10 +34,20 @@ zlib_dep = dependency ('zlib')
+ cairo_dep = dependency ('cairo')
+ gdk_pixbuf_dep = dependency ('gdk-pixbuf-2.0')
+ gusb_dep = dependency ('gusb', version: '>= 0.2.7')
+-colord_dep = dependency ('colord', required: false)
+-packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5', required: false)
+-webp_dep = dependency ('libwebp', required: false)
+-webpmux_dep = dependency ('libwebpmux', required: false)
++
++if get_option('colord')
++ colord_dep = dependency ('colord')
++endif
++
++if get_option('packagekit')
++ packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5')
++endif
++
++if get_option('webp')
++ webp_dep = dependency ('libwebp')
++ webpmux_dep = dependency ('libwebpmux')
++endif
++
+ sane_dep = dependency ('sane-backends')
+ msgfmt = find_program ('msgfmt')
+ itstool = find_program ('itstool')
+diff --git a/meson_options.txt b/meson_options.txt
+new file mode 100644
+index 0000000..570ecdd
+--- /dev/null
++++ b/meson_options.txt
+@@ -0,0 +1,3 @@
++option('colord', type: 'boolean', value: false)
++option('packagekit', type: 'boolean', value: false)
++option('webp', type: 'boolean', value: false)
+diff --git a/src/meson.build b/src/meson.build
+index 3f699eb..0c8965e 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -1,16 +1,20 @@
+ vala_args = [ '--pkg=posix', '--vapidir=' + meson.current_source_dir () ]
+ dependencies = [ glib_dep, gtk_dep, libadwaita_dep, zlib_dep, cairo_dep, gdk_pixbuf_dep, gusb_dep, sane_dep ]
+-if colord_dep.found ()
++if get_option('colord')
+ vala_args += [ '-D', 'HAVE_COLORD' ]
+ dependencies += colord_dep
+ endif
+-if packagekit_dep.found ()
++if get_option('packagekit')
+ vala_args += [ '-D', 'HAVE_PACKAGEKIT' ]
+ dependencies += packagekit_dep
+ endif
+-if webp_dep.found () and (not colord_dep.found () or webpmux_dep.found ()) # Webpmux only required if colord
++if get_option('webp')
+ vala_args += [ '-D', 'HAVE_WEBP' ]
+- dependencies += [ webp_dep, webpmux_dep ]
++ dependencies += [ webp_dep ]
++ # Webpmux only required if colord
++ if get_option('colord')
++ dependencies += [ webpmux_dep ]
++ endif
+ endif
+
+ simple_scan = executable ('simple-scan',
+--
+2.26.3
+
diff --git a/media-gfx/simple-scan/simple-scan-46.0.ebuild b/media-gfx/simple-scan/simple-scan-46.0.ebuild
new file mode 100644
index 000000000000..765098e7a253
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-46.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Simple document scanning utility"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="colord webp"
+
+DEPEND="
+ >=dev-libs/glib-2.38:2
+ >=gui-libs/gtk-4.10.0:4
+ >=gui-libs/libadwaita-1.2.0:1
+ >=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
+"
+RDEPEND="${DEPEND}
+ x11-misc/xdg-utils
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ $(vala_depend)
+ dev-libs/libxml2:2
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ gui-libs/libhandy:1[vala]
+ dev-libs/libgusb[vala]
+ colord? ( x11-misc/colord[vala] )
+"
+
+PATCHES=(
+ # Add control for optional dependencies
+ "${FILESDIR}"/"${PV}"-add-control-optional-deps.patch
+)
+
+src_prepare() {
+ default
+ vala_setup
+ xdg_environment_reset
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/simple-scan/, media-gfx/simple-scan/files/
@ 2022-01-25 0:49 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-01-25 0:49 UTC (permalink / raw
To: gentoo-commits
commit: eb2cc8bc9dced2bcbfe7f92e019b849b52c3a543
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Mon Jan 24 22:34:48 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 00:49:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb2cc8bc
media-gfx/simple-scan: fix build with meson-0.61
Closes: https://bugs.gentoo.org/831891
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/40.7-fix-build-with-meson-0.61.1.patch | 39 ++++++++++++++++++++++
media-gfx/simple-scan/simple-scan-40.7.ebuild | 1 +
2 files changed, 40 insertions(+)
diff --git a/media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch b/media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 000000000000..b1a161df922a
--- /dev/null
+++ b/media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,39 @@
+https://gitlab.gnome.org/GNOME/simple-scan/-/commit/da6626debe00be1a0660f30cf2bf7629186c01d5
+https://bugs.gentoo.org/831891
+
+From: r-value <i@rvalue.moe>
+Date: Tue, 16 Nov 2021 02:43:11 +0800
+Subject: [PATCH] Remove incorrect i18n.merge_file argument
+
+The positional argument was being silently ignored until meson 0.60.0 where
+it fails with "ERROR: Function does not take positional arguments".
+---
+ data/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 2b5a0ee3..cf6e4ae1 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml',
+ install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
+ meson.add_install_script ('meson_compile_gschema.py')
+
+-i18n.merge_file ('desktop-file',
+- input: 'simple-scan.desktop.in',
++i18n.merge_file (input: 'simple-scan.desktop.in',
+ output: 'simple-scan.desktop',
+ install: true,
+ install_dir: join_paths (datadir, 'applications'),
+ po_dir: '../po',
+ type: 'desktop')
+
+-i18n.merge_file ('appdata-file',
+- input: 'simple-scan.appdata.xml.in',
++i18n.merge_file (input: 'simple-scan.appdata.xml.in',
+ output: 'simple-scan.appdata.xml',
+ install: true,
+ install_dir: join_paths (datadir, 'metainfo'),
+--
+GitLab
+
diff --git a/media-gfx/simple-scan/simple-scan-40.7.ebuild b/media-gfx/simple-scan/simple-scan-40.7.ebuild
index 271640f4fb76..0b752878e6c9 100644
--- a/media-gfx/simple-scan/simple-scan-40.7.ebuild
+++ b/media-gfx/simple-scan/simple-scan-40.7.ebuild
@@ -47,6 +47,7 @@ BDEPEND="
PATCHES=(
# Add control for optional dependencies
"${FILESDIR}"/40.0-add-control-optional-deps.patch
+ "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/simple-scan/, media-gfx/simple-scan/files/
@ 2019-11-10 17:36 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2019-11-10 17:36 UTC (permalink / raw
To: gentoo-commits
commit: 94440c223a38b49dc3ba62d0853d3d4ca3c8be51
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 17:34:33 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 17:36:51 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94440c22
media-gfx/simple-scan: Fix unasigned variable build issue
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../simple-scan-3.32.2-unasigned-variable.patch | 39 ++++++++++++++++++++++
media-gfx/simple-scan/simple-scan-3.32.2.ebuild | 4 +++
2 files changed, 43 insertions(+)
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 00000000000..9ba4aa72134
--- /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 c3f42c9f23b..2c9045ad83f 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() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-05-18 8:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-25 20:17 [gentoo-commits] repo/gentoo:master commit in: media-gfx/simple-scan/, media-gfx/simple-scan/files/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2024-05-18 8:47 Pacho Ramos
2022-01-25 0:49 Sam James
2019-11-10 17:36 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox