media-gfx/simple-scan: Bump to 46.0

Signed-off-by: Guillermo Joandet <gjoandet@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35573
Signed-off-by: Pacho Ramos <pacho@gentoo.org>
This commit is contained in:
Guillermo Joandet
2024-02-28 19:29:13 -03:00
committed by Pacho Ramos
parent 92df4beb37
commit fc332aa125
3 changed files with 154 additions and 0 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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
}