From a4ae77024067b9ad1653e0d19ed0eabca85f9e4f Mon Sep 17 00:00:00 2001 From: Steve Prybylski <sa.prybylx@gmail.com> Date: Tue, 1 Dec 2015 13:44:41 -0500 Subject: [PATCH] libdbusmenu-glib: unbreak build; template cleanup. --- srcpkgs/libdbusmenu-glib/template | 43 ++++++++++++++----------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/srcpkgs/libdbusmenu-glib/template b/srcpkgs/libdbusmenu-glib/template index 2cabd91553..5d02b27272 100644 --- a/srcpkgs/libdbusmenu-glib/template +++ b/srcpkgs/libdbusmenu-glib/template @@ -1,28 +1,25 @@ # Template file for 'libdbusmenu-glib' -_pkgbase=libdbusmenu pkgname=libdbusmenu-glib version=12.10.2 -revision=1 +revision=2 +wrksrc="libdbusmenu-${version}" build_style=gnu-configure configure_args="--disable-dumper --disable-static --disable-tests $(vopt_enable gir 'vala introspection') HAVE_VALGRIND_FALSE=''" -hostmakedepends="automake gettext-devel gnome-doc-utils glib-devel intltool libtool pkg-config +hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config $(vopt_if gir 'gobject-introspection vala-devel')" -makedepends="libglib-devel gtk+3-devel gnome-doc-utils rarian" +makedepends="libglib-devel gtk+3-devel gnome-doc-utils" short_desc="Library for passing menus over DBus" maintainer="Steve Prybylski <sa.prybylx@gmail.com>" license="GPL-3, LGPL-2.1, LGPL-3" homepage="https://launchpad.net/libdbusmenu" -distfiles="https://launchpad.net/libdbusmenu/${version%.*}/${version}/+download/${_pkgbase}-${version}.tar.gz" +distfiles="${homepage}/${version%.*}/${version}/+download/libdbusmenu-${version}.tar.gz" checksum=9d6ad4a0b918b342ad2ee9230cce8a095eb601cb0cee6ddc1122d0481f9d04c9 -wrksrc="$_pkgbase-$version" - -CFLAGS='-Wno-deprecated-declarations' build_options="gir" # Disable gir for cross builds if [ -z "$CROSS_BUILD" ]; then - build_options_default+="gir" + build_options_default="gir" fi pre_configure() { @@ -33,13 +30,13 @@ libdbusmenu-glib-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { - vmove "usr/include/libdbusmenu-glib-*" - vmove "usr/lib/pkgconfig/dbusmenu-glib-*.pc" - vmove "usr/lib/libdbusmenu-glib.so" - vmove "usr/share/gtk-doc/html/libdbusmenu-glib" + vmove usr/include/libdbusmenu-glib-* + vmove usr/lib/pkgconfig/dbusmenu-glib-*.pc + vmove usr/lib/libdbusmenu-glib.so + vmove usr/share/gtk-doc/html/libdbusmenu-glib if [ "$build_option_gir" ]; then - vmove "usr/share/gir-1.0/Dbusmenu-*.gir" - vmove "usr/share/vala/vapi/Dbusmenu-*.vapi" + vmove usr/share/gir-1.0/Dbusmenu-*.gir + vmove usr/share/vala/vapi/Dbusmenu-*.vapi fi } } @@ -47,9 +44,9 @@ libdbusmenu-glib-devel_package() { libdbusmenu-gtk3_package() { short_desc+=" (GTK+3)" pkg_install() { - vmove "usr/lib/libdbusmenu-gtk3.so.*" + vmove usr/lib/libdbusmenu-gtk3.so.* if [ "$build_option_gir" ]; then - vmove "usr/lib/girepository-1.0/DbusmenuGtk3-*.typelib" + vmove usr/lib/girepository-1.0/DbusmenuGtk3-*.typelib fi } } @@ -58,13 +55,13 @@ libdbusmenu-gtk3-devel_package() { depends="gtk+3-devel libdbusmenu-gtk3>=${version}_${revision}" short_desc+=" (GTK+3) - development files" pkg_install() { - vmove "usr/include/libdbusmenu-gtk3-*" - vmove "usr/lib/pkgconfig/dbusmenu-gtk3-*.pc" - vmove "usr/lib/libdbusmenu-gtk3.so" - vmove "usr/share/gtk-doc/html/libdbusmenu-gtk" + vmove usr/include/libdbusmenu-gtk3-* + vmove usr/lib/pkgconfig/dbusmenu-gtk3-*.pc + vmove usr/lib/libdbusmenu-gtk3.so + vmove usr/share/gtk-doc/html/libdbusmenu-gtk if [ "$build_option_gir" ]; then - vmove "usr/share/gir-1.0/DbusmenuGtk3-*.gir" - vmove "usr/share/vala/vapi/DbusmenuGtk3-*.vapi" + vmove usr/share/gir-1.0/DbusmenuGtk3-*.gir + vmove usr/share/vala/vapi/DbusmenuGtk3-*.vapi fi } }