From 48cdc4c571464a6d9ddfc891f79c64707beee737 Mon Sep 17 00:00:00 2001
From: Vincent Batts
Date: Tue, 30 Oct 2018 23:15:47 -0400
Subject: desktop/flatpak: Updated for version 1.0.4.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 desktop/flatpak/flatpak.SlackBuild | 35 ++++++++++++++++++++++++++++++++---
 desktop/flatpak/flatpak.info       |  8 +++++---
 2 files changed, 37 insertions(+), 6 deletions(-)

(limited to 'desktop')

diff --git a/desktop/flatpak/flatpak.SlackBuild b/desktop/flatpak/flatpak.SlackBuild
index ca29414539..8793724e17 100644
--- a/desktop/flatpak/flatpak.SlackBuild
+++ b/desktop/flatpak/flatpak.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for flatpak
 
-# Copyright 2017 Vincent Batts <vbatts@hashbangbash.com>
+# Copyright 2017, 2018 Vincent Batts <vbatts@hashbangbash.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=flatpak
-VERSION=${VERSION:-0.11.7}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.0.4}
+BUILDER_PRGNAM=${PRGNAM}-builder
+BUILDER_VERSION=${BUILDER_VERSION:-1.0.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -84,6 +86,33 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+cd $TMP
+rm -rf ${BUILDER_PRGNAM}-${BUILDER_VERSION}
+tar xvf $CWD/${BUILDER_PRGNAM}-${BUILDER_VERSION}.tar.xz
+cd ${BUILDER_PRGNAM}-${BUILDER_VERSION}
+
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
+  --with-system-bubblewrap
+
+make
+make install DESTDIR=$PKG
+
 chmod +x $PKG/etc/profile.d/flatpak.sh
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/desktop/flatpak/flatpak.info b/desktop/flatpak/flatpak.info
index cfa6c67924..4d358ea229 100644
--- a/desktop/flatpak/flatpak.info
+++ b/desktop/flatpak/flatpak.info
@@ -1,8 +1,10 @@
 PRGNAM="flatpak"
-VERSION="0.11.7"
+VERSION="1.0.4"
 HOMEPAGE="https://flatpak.org/"
-DOWNLOAD="https://github.com/flatpak/flatpak/releases/download/0.11.7/flatpak-0.11.7.tar.xz"
-MD5SUM="8fa74d84c6339e9df6fe34491cde4fba"
+DOWNLOAD="https://github.com/flatpak/flatpak/releases/download/1.0.4/flatpak-1.0.4.tar.xz \
+           https://github.com/flatpak/flatpak-builder/releases/download/1.0.1/flatpak-builder-1.0.1.tar.xz"
+MD5SUM="9999f47a53c3b347208a92b56c0d3f12 \
+        a29d824c7d84d5bd2112a1b9de872b33"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="bubblewrap ostree appstream-glib json-glib libseccomp"
-- 
cgit v1.2.3