From 7cd4f681cf4c64ed81fa650143f70875d0d5ec10 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Thu, 24 Mar 2022 18:40:26 -0700 Subject: [PATCH] libportal: update to 0.6 --- common/shlibs | 4 +- srcpkgs/libportal-gtk3 | 1 + srcpkgs/libportal-gtk3-devel | 1 + srcpkgs/libportal-gtk4 | 1 + srcpkgs/libportal-gtk4-devel | 1 + srcpkgs/libportal/template | 80 ++++++++++++++++++++++++++++++------ 6 files changed, 75 insertions(+), 13 deletions(-) create mode 120000 srcpkgs/libportal-gtk3 create mode 120000 srcpkgs/libportal-gtk3-devel create mode 120000 srcpkgs/libportal-gtk4 create mode 120000 srcpkgs/libportal-gtk4-devel diff --git a/common/shlibs b/common/shlibs index 8064f62c7a0..7a025942642 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3924,7 +3924,9 @@ libhidrd_strm.so.0 hidrd-0.2.0_1 libhidrd_fmt.so.0 hidrd-0.2.0_1 libjcat.so.1 libjcat-0.1.2_1 libmatio.so.9 matio-1.5.17_2 -libportal.so.0 libportal-0.3_1 +libportal.so.1 libportal-0.6_1 +libportal-gtk3.so.1 libportal-gtk3-0.6_1 +libportal-gtk4.so.1 libportal-gtk4-0.6_1 libvips.so.42 libvips-8.9.2_1 libvips-cpp.so.42 libvips-8.9.2_1 libselinux.so.1 libselinux-3.0_1 diff --git a/srcpkgs/libportal-gtk3 b/srcpkgs/libportal-gtk3 new file mode 120000 index 00000000000..2e15139a5d9 --- /dev/null +++ b/srcpkgs/libportal-gtk3 @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal-gtk3-devel b/srcpkgs/libportal-gtk3-devel new file mode 120000 index 00000000000..2e15139a5d9 --- /dev/null +++ b/srcpkgs/libportal-gtk3-devel @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal-gtk4 b/srcpkgs/libportal-gtk4 new file mode 120000 index 00000000000..2e15139a5d9 --- /dev/null +++ b/srcpkgs/libportal-gtk4 @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal-gtk4-devel b/srcpkgs/libportal-gtk4-devel new file mode 120000 index 00000000000..2e15139a5d9 --- /dev/null +++ b/srcpkgs/libportal-gtk4-devel @@ -0,0 +1 @@ +libportal \ No newline at end of file diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template index 2e8cd79422b..31228a120f1 100644 --- a/srcpkgs/libportal/template +++ b/srcpkgs/libportal/template @@ -1,33 +1,89 @@ # Template file for 'libportal' pkgname=libportal -version=0.4 +version=0.6 revision=1 build_style=meson -configure_args="$(vopt_bool gtk_doc gtk_doc)" -hostmakedepends="pkg-config gtk-doc glib-devel" -makedepends="glib-devel" +configure_args="$(vopt_bool gtk_doc docs) $(vopt_bool gir vapi) -Dbackends=gtk3,gtk4" +hostmakedepends="pkg-config glib-devel gobject-introspection $(vopt_if gir vala) + $(vopt_if gtk_doc gi-docgen)" +makedepends="glib-devel gobject-introspection gtk+3-devel gtk4-devel" short_desc="Flatpak portal library" maintainer="q66 " license="LGPL-2.0-or-later" homepage="https://github.com/flatpak/libportal" distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28 +checksum=88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566 -build_options="gtk_doc" +build_options="gir gtk_doc" +build_options_default="gir gtk_doc" -if [ -z "$CROSS_BUILD" ]; then - build_options_default="gtk_doc" +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" qemu-user-static prelink-cross" fi libportal-devel_package() { depends="libportal>=${version}_${revision} glib-devel" short_desc+=" - development files" pkg_install() { - vmove usr/include - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig + vmove usr/include/libportal + vmove "usr/lib/libportal.so" + vmove usr/lib/pkgconfig/libportal.pc if [ "$build_option_gtk_doc" ]; then - vmove usr/share/gtk-doc + vmove usr/share/doc + fi + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0/Xdp-1.0.gir + vmove "usr/share/vala/vapi/libportal.*" + fi + } +} + +libportal-gtk3_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - GTK3" + pkg_install() { + vmove "usr/lib/libportal-gtk3.so.*" + if [ "$build_option_gir" ]; then + vmove "usr/lib/girepository-1.0/XdpGtk3*" + fi + } +} + +libportal-gtk3-devel_package() { + depends="libportal-gtk3>=${version}_${revision} libportal-devel>=${version}_${revision} glib-devel gtk+3-devel" + short_desc+=" - GTK3 - development files" + pkg_install() { + vmove usr/include/libportal-gtk3 + vmove "usr/lib/libportal-gtk3.so" + vmove usr/lib/pkgconfig/libportal-gtk3.pc + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0/XdpGtk3* + vmove "usr/share/vala/vapi/libportal-gtk3*" + fi + } +} + +libportal-gtk4_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - GTK4" + pkg_install() { + vmove "usr/lib/libportal-gtk4.so.*" + if [ "$build_option_gir" ]; then + vmove "usr/lib/girepository-1.0/XdpGtk4*" + fi + } +} + +libportal-gtk4-devel_package() { + depends="libportal-gtk4>=${version}_${revision} libportal-devel>=${version}_${revision} glib-devel gtk4-devel" + short_desc+=" - GTK4 - development files" + pkg_install() { + vmove usr/include/libportal-gtk4 + vmove "usr/lib/libportal-gtk4.so" + vmove usr/lib/pkgconfig/libportal-gtk4.pc + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0/XdpGtk4* + vmove "usr/share/vala/vapi/libportal-gtk4*" fi } }