diff --git a/srcpkgs/appstream-glib/patches/0001-flip-archive_h-and-archive_entry_h-order-on-client-as-util.patch b/srcpkgs/appstream-glib/patches/0001-flip-archive_h-and-archive_entry_h-order-on-client-as-util.patch new file mode 100644 index 0000000000..5535c39cef --- /dev/null +++ b/srcpkgs/appstream-glib/patches/0001-flip-archive_h-and-archive_entry_h-order-on-client-as-util.patch @@ -0,0 +1,14 @@ +They are in the wrong order. + +--- client/as-util.c ++++ client/as-util.c +@@ -27,8 +27,8 @@ + #include + + #include +-#include + #include ++#include + #include + #include + #include diff --git a/srcpkgs/appstream-glib/patches/0002-flip-archive_h-and-archive_entry_h-order-on-libappstream-glib-as-util.patch b/srcpkgs/appstream-glib/patches/0002-flip-archive_h-and-archive_entry_h-order-on-libappstream-glib-as-util.patch new file mode 100644 index 0000000000..8c5f70c480 --- /dev/null +++ b/srcpkgs/appstream-glib/patches/0002-flip-archive_h-and-archive_entry_h-order-on-libappstream-glib-as-util.patch @@ -0,0 +1,14 @@ +They are in the wrong order. + +--- libappstream-glib/as-utils.c ++++ libappstream-glib/as-utils.c +@@ -34,8 +34,8 @@ + + #include + #include +-#include + #include ++#include + #include + #include + #include diff --git a/srcpkgs/appstream-glib/template b/srcpkgs/appstream-glib/template index 6b10820219..24bda0a842 100644 --- a/srcpkgs/appstream-glib/template +++ b/srcpkgs/appstream-glib/template @@ -1,26 +1,32 @@ # Template file for 'appstream-glib' pkgname=appstream-glib -version=0.6.13 -revision=2 -build_style=gnu-configure -hostmakedepends="pkg-config intltool gobject-introspection automake gperf gcab" +version=0.7.6 +revision=1 +configure_args="-Dgtk-doc=false -Drpm=false -Dstemmer=false + -Dintrospection=$(vopt_if gir true false)" +build_style=meson +hostmakedepends="pkg-config $(vopt_if gir gobject-introspection) gperf gcab" # XXX: add libstemmer support +# Requires tagged release +# https://github.com/snowballstem/snowball/issues/7 makedepends="gtk+3-devel libyaml-devel gcab-devel libsoup-devel libarchive-devel json-glib-devel" short_desc="Install and update applications" maintainer="Enno Boland " -license="GPL-2" +license="LGPL-2.1" homepage="https://people.freedesktop.org/~hughsient/appstream-glib/" distfiles="$homepage/releases/$pkgname-$version.tar.xz" -checksum=1a3734b2cdaab55ad63c6e3ee31026fdceb122cecae39f9f7126a0305e8836bf +checksum=b216583a8b9c47f6db52031fbbdfd9005a274c6a0a97c8db8c1d80c890b7d545 -pre_build() { - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool -} +build_options="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gir" +fi -post_install() { - rm -r $DESTDIR/usr/share/gtk-doc -} +if [ "$CROSS_BUILD" ]; then + # the cross-build craps out due to no glib-resources-compile + hostmakedepends+=" glib-devel" +fi appstream-glib-devel_package() { depends="${sourcepkg}>=${version}_${revision} libarchive-devel gcab-devel gdk-pixbuf-devel" @@ -28,7 +34,6 @@ appstream-glib-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/*.a" vmove "usr/lib/*.so" } }