Date: Tuesday, October 25, 2022 @ 19:50:38
  Author: heftig
Revision: 458992

1.14.0-2: ostree with curl

Modified:
  flatpak/trunk/PKGBUILD

----------+
 PKGBUILD |   40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-10-25 19:50:16 UTC (rev 458991)
+++ PKGBUILD    2022-10-25 19:50:38 UTC (rev 458992)
@@ -3,8 +3,9 @@
 # Contributor: Jan Alexander Steffens (heftig) <[email protected]>
 
 pkgname=flatpak
+_commit=488038eed44c7edf334d1e28085975d96ce2bdcc  # tags/1.14.0^0
 pkgver=1.14.0
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Linux application sandboxing and distribution framework (formerly 
xdg-app)"
 url="https://flatpak.org";
@@ -12,11 +13,10 @@
 license=(LGPL)
 depends=(dbus glib2 curl polkit libxau ostree json-glib libseccomp libarchive
          python bubblewrap appstream xdg-dbus-proxy systemd fuse3 
libmalcontent)
-makedepends=(gobject-introspection gtk-doc git docbook-xsl xmlto)
+makedepends=(gobject-introspection gtk-doc git docbook-xsl xmlto
+             python-pyparsing)
 checkdepends=(valgrind socat)
-provides=(libflatpak.so)
 options=(debug)
-_commit=488038eed44c7edf334d1e28085975d96ce2bdcc  # tags/1.14.0^0
 source=(
   "git+https://github.com/flatpak/flatpak#commit=$_commit";
   git+https://gitlab.gnome.org/GNOME/libglnx.git
@@ -48,6 +48,7 @@
   # https://bugs.archlinux.org/task/75623
   git apply -3 ../fusermount3.diff
 
+  git config --global protocol.file.allow always
   git submodule init
   git submodule set-url libglnx "$srcdir/libglnx"
   git submodule set-url bubblewrap "$srcdir/bubblewrap"
@@ -59,22 +60,24 @@
 }
 
 build() {
-  cd flatpak
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --sbindir=/usr/bin \
-    --libexecdir=/usr/lib \
-    --disable-static \
-    --enable-gtk-doc \
-    --with-system-bubblewrap \
-    --with-system-dbus-proxy \
+  local configure_options=(
+    --prefix=/usr
+    --sysconfdir=/etc
+    --localstatedir=/var
+    --sbindir=/usr/bin
+    --libexecdir=/usr/lib
+    --disable-static
+    --enable-docbook-docs
+    --enable-gtk-doc
+    --with-curl
     --with-dbus-config-dir=/usr/share/dbus-1/system.d
+    --with-system-bubblewrap
+    --with-system-dbus-proxy
+  )
 
+  cd flatpak
+  ./configure "${configure_options[@]}"
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
   make
 }
 
@@ -84,7 +87,8 @@
 }
 
 package() {
-  depends+=(xdg-desktop-portal)
+  depends+=(xdg-desktop-portal libostree-1.so)
+  provides=(libflatpak.so)
 
   make -C flatpak DESTDIR="$pkgdir" install
 

Reply via email to