summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author skaendo2019-09-30 17:15:21 +0200
committer Matteo Bernardini2020-01-18 09:58:26 +0100
commit6597d889c4918343a9a05d9e11d501599e58e98c (patch)
treed087c37001e85179fb4472b3056ea91c42ef9d81
parente7c5997b9311a3ac31e986a3d4f525c9af840c89 (diff)
downloadslackbuilds-simple-scan.tar.gz
graphics/simple-scan: Updated for version 3.34.0, changed homepage.simple-scan
Patch from upstream for libwebpmux Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--graphics/simple-scan/libwebpmux.patch38
-rw-r--r--graphics/simple-scan/simple-scan.SlackBuild6
-rw-r--r--graphics/simple-scan/simple-scan.info8
-rw-r--r--graphics/simple-scan/slack-desc2
4 files changed, 47 insertions, 7 deletions
diff --git a/graphics/simple-scan/libwebpmux.patch b/graphics/simple-scan/libwebpmux.patch
new file mode 100644
index 0000000000..51d17eb7dd
--- /dev/null
+++ b/graphics/simple-scan/libwebpmux.patch
@@ -0,0 +1,38 @@
+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/graphics/simple-scan/simple-scan.SlackBuild b/graphics/simple-scan/simple-scan.SlackBuild
index 4014836c87..d8ac34317d 100644
--- a/graphics/simple-scan/simple-scan.SlackBuild
+++ b/graphics/simple-scan/simple-scan.SlackBuild
@@ -26,8 +26,8 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM="simple-scan"
-VERSION=${VERSION:-3.25.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.34.0}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -71,6 +71,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 640 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/libwebpmux.patch
+
meson --prefix $PKG/usr build
# Fix for meson-0.44.0, thanks to Andrew Clemons
diff --git a/graphics/simple-scan/simple-scan.info b/graphics/simple-scan/simple-scan.info
index 5c6d85d344..826b74bacf 100644
--- a/graphics/simple-scan/simple-scan.info
+++ b/graphics/simple-scan/simple-scan.info
@@ -1,8 +1,8 @@
PRGNAM="simple-scan"
-VERSION="3.25.1"
-HOMEPAGE="https://launchpad.net/simple-scan"
-DOWNLOAD="https://launchpad.net/simple-scan/3.25/3.25.1/+download/simple-scan-3.25.1.tar.xz"
-MD5SUM="6bff2b9bdfb529e21582f4a65c3f2d27"
+VERSION="3.34.0"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
+DOWNLOAD="https://gitlab.gnome.org/GNOME/simple-scan/-/archive/3.34.0/simple-scan-3.34.0.tar.bz2"
+MD5SUM="69464d41aa25c5de2385f332dd22f508"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="colord packagekit meson libgusb vala"
diff --git a/graphics/simple-scan/slack-desc b/graphics/simple-scan/slack-desc
index d201d02f6e..9df18325a6 100644
--- a/graphics/simple-scan/slack-desc
+++ b/graphics/simple-scan/slack-desc
@@ -12,7 +12,7 @@ simple-scan: simple-scan is a simple scanning utility without the overwhelming
simple-scan: options of xsane.
simple-scan:
simple-scan:
-simple-scan: Homepage: https://launchpad.net/simple-scan
+simple-scan: Homepage: https://gitlab.gnome.org/GNOME/simple-scan
simple-scan:
simple-scan:
simple-scan: