Merge pull request #9533 from ayhanyalcinsoy/master

simple-scan:new package
This commit is contained in:
2021-06-16 08:07:20 +03:00
committed by GitHub
8 changed files with 998 additions and 352 deletions
+18
View File
@@ -0,0 +1,18 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 2.
# See the file http://www.gnu.org/copyleft/gpl.txt.
from pisi.actionsapi import mesontools, pisitools
def setup():
mesontools.configure("-Dpackagekit=false")
def build():
mesontools.build()
def install():
mesontools.install()
pisitools.dodoc("COPYING", "README*", "NEWS")
@@ -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, libhandy_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
+68
View File
@@ -0,0 +1,68 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org.tr/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>simple-scan</Name>
<Homepage>https://launchpad.net/simple-scan</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<Icon>simple-scan</Icon>
<IsA>app:gui</IsA>
<Summary>Simple scanning utility</Summary>
<Description>Simple scanning utility</Description>
<Archive sha1sum="52d96cc13420f8483d4457927b5fcd30eff4457d" type="tarxz">mirrors://gnome/simple-scan/40/simple-scan-40.1.tar.xz</Archive>
<BuildDependencies>
<Dependency>meson</Dependency>
<Dependency>sane-backends-devel</Dependency>
<Dependency>gettext-devel</Dependency>
<Dependency>itstool</Dependency>
<Dependency>appstream-glib-devel</Dependency>
<Dependency>desktop-file-utils</Dependency>
<Dependency>vala-devel</Dependency>
<Dependency>colord-devel</Dependency>
<Dependency>colord-gtk-devel</Dependency>
<Dependency>gobject-introspection-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
<Dependency>libhandy-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>libgudev-devel</Dependency>
<Dependency>webp-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch>40.0-add-control-optional-deps.patch</Patch>
</Patches>
</Source>
<Package>
<Name>simple-scan</Name>
<RuntimeDependencies>
<Dependency>gtk3</Dependency>
<Dependency>zlib</Dependency>
<Dependency>cairo</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libgusb</Dependency>
<Dependency>libhandy</Dependency>
<Dependency>gdk-pixbuf</Dependency>
<Dependency>sane-backends</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="localdata">/usr/share/locale</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2021-06-15</Date>
<Version>40.1</Version>
<Comment>First release</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
</History>
</PISI>
@@ -0,0 +1,13 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>simple-scan</Name>
<Summary xml:lang="tr">Basit tarayıcı (scanning) uygulması</Summary>
<Description xml:lang="tr">Basit tarayıcı (scanning) uygulması</Description>
</Source>
<Package>
<Name>simple-scan-devel</Name>
<Summary xml:lang="tr">simple-scan için geliştirme dosyaları</Summary>
</Package>
</PISI>
+815 -350
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1 +1 @@
a8d01a6326cc6647ef3776f9790c0936a84b5982
35a0cac9ed009340bdadd2addfe03c0f9395090c
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -1 +1 @@
7e33c2f24158d23472c2e83c986e4a9af96c909c
c366ccde33ccb95643821691b1bce63c98c9d61a