From f75c02a473bc2481e0b42546f8a2a5b3be032949 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 7 Feb 2014 05:25:04 +0100 Subject: [PATCH] gtk+3: added colord/cups build options; cross build support. --- srcpkgs/gtk+3/template | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template index d168a92d9c4..83624c271c9 100644 --- a/srcpkgs/gtk+3/template +++ b/srcpkgs/gtk+3/template @@ -1,10 +1,10 @@ # Template build file for 'gtk+3'. pkgname=gtk+3 version=3.10.7 -revision=1 +revision=2 wrksrc="gtk+-${version}" build_style=gnu-configure -configure_args="--enable-cups --disable-schemas-compile --enable-gtk2-dependency --enable-colord" +configure_args="--disable-schemas-compile --enable-gtk2-dependency" short_desc="The GTK+ toolkit (v3)" maintainer="Juan RP " homepage="http://www.gtk.org/" @@ -12,23 +12,30 @@ license="LGPL-2.1" distfiles="${GNOME_SITE}/gtk+/3.10/gtk+-${version}.tar.xz" checksum=b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427 -hostmakedepends="pkg-config glib-devel>=2.38" +hostmakedepends="libtool pkg-config glib-devel>=2.38 gtk+-devel" makedepends="libglib-devel>=2.38 atk-devel>=2.10 at-spi2-atk-devel>=2.8 - libpng-devel fontconfig-devel cairo-devel pango-devel>=1.36 gdk-pixbuf-devel>=2.30 - gtk+-devel colord-devel>=0.1.23_3 cups-devel" + libpng-devel fontconfig-devel cairo-devel pango-devel>=1.36 + gdk-pixbuf-devel>=2.30 gtk+-devel" depends="gtk-update-icon-cache shared-mime-info glib>=2.38 atk>=2.10 dbus-x11" triggers="gtk3-immodules" conf_files="/etc/gtk-3.0/im-multipress.conf" # Package build options -build_options="broadway gir wayland x11" +build_options="broadway colord cups gir wayland x11" desc_option_broadway="Enable support for the HTML5 Broadway backend" +desc_option_colord="Enable support for colord" +desc_option_cups="Enable support for the cups print backend" desc_option_gir="Enable support for gobject introspection data" desc_option_wayland="Enable support for the Wayland backend" desc_option_x11="Enable support for the X11 backend" # Enable all options by default. -build_options_default="broadway gir wayland x11" +build_options_default="colord cups broadway wayland x11" + +# Enable gir only for native builds. +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gir" +fi if [ "$build_option_broadway" ]; then configure_args+=" --enable-broadway-backend" @@ -36,6 +43,21 @@ else configure_args+=" --disable-broadway-backend" fi +if [ "$build_option_colord" ]; then + configure_args+=" --enable-colord" + makedepends+=" colord-devel" +else + configure_args+=" --disable-colord" +fi + +if [ "$build_option_cups" ]; then + configure_args+=" --enable-cups" + hostmakedepends+=" cups-devel" + makedepends+=" cups-devel" +else + configure_args+=" --disable-cups" +fi + if [ "$build_option_gir" ]; then makedepends+=" gobject-introspection" configure_args+=" --enable-introspection" @@ -44,6 +66,7 @@ else fi if [ "$build_option_wayland" ]; then + hostmakedepends+=" wayland-devel" makedepends+=" libxkbcommon-devel wayland-devel" configure_args+=" --enable-wayland-backend" else @@ -58,6 +81,10 @@ else configure_args+=" --disable-x11-backend" fi +pre_configure() { + libtoolize -f +} + post_install() { rm -f ${DESTDIR}/usr/share/man/man1/gtk-update-icon-cache.1 # Provide a default (icon)theme.