From 094e733df32edc0b0254dc821a26b1fec6892472 Mon Sep 17 00:00:00 2001 From: jbu Date: Sun, 21 Jun 2015 10:41:05 +0200 Subject: [PATCH] gnome: add build option gir to some pkgs --- srcpkgs/cheese/template | 20 +++++++++++++++----- srcpkgs/liferea/template | 11 ++++++++--- srcpkgs/mousetweaks/template | 9 +++++++-- srcpkgs/nautilus-sendto/template | 9 +++++++-- srcpkgs/rhythmbox/template | 17 ++++++++++++----- srcpkgs/rygel/template | 13 ++++++++++--- srcpkgs/sushi/template | 9 +++++++-- srcpkgs/totem/template | 9 +++++++-- 8 files changed, 73 insertions(+), 24 deletions(-) diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template index 6aebd163f7..62c0bc83f8 100644 --- a/srcpkgs/cheese/template +++ b/srcpkgs/cheese/template @@ -1,11 +1,11 @@ # Template file for 'cheese' pkgname=cheese version=3.16.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile" -hostmakedepends="pkg-config intltool gnome-doc-utils itstool - gobject-introspection" +hostmakedepends="pkg-config intltool gdk-pixbuf glib-devel + gnome-doc-utils itstool $(vopt_if gir gobject-introspection)" makedepends=" gst-plugins-bad1-devel clutter-gtk-devel clutter-gst-devel libgee08-devel libcanberra-devel @@ -24,11 +24,19 @@ license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=44622f6ad6d8703b22c6d40219ae317959495ccc9994b563b324592933ff90a0 +build_options="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default="gir" +fi +LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib" + libcheese_package() { short_desc+=" - shared libraries" pkg_install() { vmove "usr/lib/*.so.*" - vmove usr/lib/girepository-1.0 + if [ -n "$build_option_gir" ]; then + vmove usr/lib/girepository-1.0 + fi } } @@ -43,7 +51,9 @@ cheese-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" - vmove usr/share/gir-1.0 + if [ -n "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + fi vmove usr/share/gtk-doc } } diff --git a/srcpkgs/liferea/template b/srcpkgs/liferea/template index dba674ee39..5f61a22d58 100644 --- a/srcpkgs/liferea/template +++ b/srcpkgs/liferea/template @@ -1,11 +1,11 @@ # Template file for 'liferea' pkgname=liferea version=1.11.5 -revision=1 +revision=2 build_style=gnu-configure makedepends="gtk+3-devel libxslt-devel libsoup-devel webkitgtk-devel - json-glib-devel gobject-introspection gsettings-desktop-schemas-devel - libpeas-devel python-devel sqlite-devel" + json-glib-devel $(vopt_if gir gobject-introspection) + gsettings-desktop-schemas-devel libpeas-devel python-devel sqlite-devel" hostmakedepends="pkg-config intltool" short_desc="GTK news aggregator" maintainer="Enno Boland " @@ -14,3 +14,8 @@ homepage="http://lzone.de/liferea/" distfiles="https://github.com/lwindolf/liferea/releases/download/v${version}/${pkgname}-${version}.tar.bz2" checksum=25d4c2cd0fa9aa0deaa33c2b9ccd9b7a9e48a2b20848398c2249c6ae72bb6907 lib32disabled=yes + +build_options="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default="gir" +fi diff --git a/srcpkgs/mousetweaks/template b/srcpkgs/mousetweaks/template index 6f8aa075dc..29226a5942 100644 --- a/srcpkgs/mousetweaks/template +++ b/srcpkgs/mousetweaks/template @@ -1,9 +1,9 @@ # Template file for 'mousetweaks' pkgname=mousetweaks version=3.12.0 -revision=2 +revision=3 build_style=gnu-configure -hostmakedepends="pkg-config intltool glib-devel gobject-introspection" +hostmakedepends="pkg-config intltool glib-devel $(vopt_if gir gobject-introspection)" makedepends="gsettings-desktop-schemas-devel gtk+3-devel libXtst-devel" depends="gsettings-desktop-schemas>=3.12 desktop-file-utils" short_desc="Mouse accessibility enhancements for the GNOME desktop" @@ -12,3 +12,8 @@ homepage="http://www.gnome.org" license="FDL, GPL-3" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=c0db478ccb390665e3201e9d1ce08b1c6573a697b797c9e828debb94b1ae3b97 + +build_options="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default="gir" +fi diff --git a/srcpkgs/nautilus-sendto/template b/srcpkgs/nautilus-sendto/template index 1d98518d2f..821ea312f7 100644 --- a/srcpkgs/nautilus-sendto/template +++ b/srcpkgs/nautilus-sendto/template @@ -1,11 +1,11 @@ # Template file for 'nautilus-sendto' pkgname=nautilus-sendto version=3.8.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-schemas-compile" # XXX: add pidgin and gajim depends for plugins to work. -hostmakedepends="pkg-config intltool gobject-introspection" +hostmakedepends="pkg-config intltool $(vopt_if gir gobject-introspection)" makedepends="evolution-data-server-devel nautilus-devel gupnp-devel" short_desc="Nautilus context menu for sending files" maintainer="Juan RP " @@ -13,3 +13,8 @@ homepage="http://download.gnome.org/sources/nautilus-sendto/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=932811e781457b1dbf7b396e930d588f433b9ba756b10bde9f03f6d71d54bdc5 + +build_options="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default="gir" +fi diff --git a/srcpkgs/rhythmbox/template b/srcpkgs/rhythmbox/template index 151c2aef81..db6bf32835 100644 --- a/srcpkgs/rhythmbox/template +++ b/srcpkgs/rhythmbox/template @@ -1,11 +1,11 @@ # Template file for 'rhythmbox' pkgname=rhythmbox version=3.2.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile - --with-webkit --with-gudev --without-hal --enable-vala" -hostmakedepends="pkg-config intltool gnome-doc-utils itstool gobject-introspection" + --with-webkit --with-gudev --without-hal $(vopt_if gir --enable-vala)" +hostmakedepends="pkg-config intltool gnome-doc-utils itstool $(vopt_if gir gobject-introspection)" makedepends="gtk+3-devel libsoup-gnome-devel totem-pl-parser-devel json-glib-devel libgudev-devel GConf-devel libdiscid-devel vala-devel libmtp-devel avahi-glib-libs-devel libpeas-devel brasero-devel @@ -13,13 +13,18 @@ makedepends="gtk+3-devel libsoup-gnome-devel totem-pl-parser-devel grilo-devel gst-plugins-base1-devel clutter-gtk-devel python3.4-devel python-gobject-devel libdmapsharing-devel" depends="gir-freedesktop desktop-file-utils hicolor-icon-theme" -short_desc="GNOME integrated music management application, inspired by Apple's iTunes" +short_desc="GNOME integrated music management application" maintainer="Juan RP " license="GPL-2" homepage="http://www.rhythmbox.org" distfiles="${GNOME_SITE}/${pkgname}/${version::3}/${pkgname}-${version}.tar.xz" checksum=bf43ca4f5b7531751241f5e67eaba7da6d9748dd827a600eedf9444961537938 +build_options="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default="gir" +fi + librhythmbox_package() { short_desc+=" - shared library" pkg_install() { @@ -32,7 +37,9 @@ rhythmbox-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/share/gir-1.0 + if [ -n "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + fi vmove usr/share/gtk-doc vmove "usr/lib/*.so" } diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template index 28481a56eb..f4bb075ebd 100644 --- a/srcpkgs/rygel/template +++ b/srcpkgs/rygel/template @@ -1,11 +1,11 @@ # Template file for 'rygel' pkgname=rygel version=0.26.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-gst-launch-plugin" hostmakedepends="automake libtool pkg-config intltool gettext-devel - glib-devel vala-devel gobject-introspection" + glib-devel $(vopt_if gir 'vala-devel gobject-introspection')" makedepends="sqlite-devel gtk+3-devel libsoup-devel libgee08-devel gupnp-av-devel gupnp-dlna-devel tracker-devel libmediaart2-devel" @@ -18,6 +18,11 @@ license="GPL-2" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=390740609e34399b886ddb9a8f7eca25055ad72048dfdd869edf02999b1e1d8f +build_options="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default="gir" +fi + pre_configure() { autoreconf -fi } @@ -30,7 +35,9 @@ rygel-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" - vmove usr/share/vala + if [ -n "$build_option_gir" ]; then + vmove usr/share/vala + fi vmove usr/share/gtk-doc } } diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template index 800d42e5a6..7197099265 100644 --- a/srcpkgs/sushi/template +++ b/srcpkgs/sushi/template @@ -1,10 +1,10 @@ # Template file for 'sushi' pkgname=sushi version=3.16.0 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure -hostmakedepends="pkg-config intltool glib-devel gobject-introspection" +hostmakedepends="pkg-config intltool glib-devel $(vopt_if gir gobject-introspection)" makedepends="webkit2gtk-devel gjs-devel gtksourceview-devel clutter-gst-devel clutter-gtk-devel evince-devel libmusicbrainz5-devel @@ -15,3 +15,8 @@ license="GPL-2" maintainer="Juan RP " distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=86c4e22b374514492334b5fcca6f170d328dae77cfcc0acd357c5426600b0034 + +build_options="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default="gir" +fi diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template index b2f37dd9cc..bd83aa1caf 100644 --- a/srcpkgs/totem/template +++ b/srcpkgs/totem/template @@ -1,7 +1,7 @@ # Template file for 'totem' pkgname=totem version=3.16.1 -revision=1 +revision=2 short_desc="A GNOME integrated movie player based on Gstreamer" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -14,7 +14,7 @@ configure_args="--disable-static --disable-schemas-compile --disable-python --enable-nautilus" hostmakedepends="pkg-config intltool gnome-doc-utils - itstool gobject-introspection" + itstool $(vopt_if gir gobject-introspection)" # XXX missing lirc plugin. makedepends=" @@ -32,6 +32,11 @@ depends="grilo-plugins>=0.2.12 hicolor-icon-theme desktop-file-utils # XXX reenable python plugin if pylint pkg exists. #pycompile_dirs="usr/lib/totem/plugins" +build_options="gir" +if [ -z "$CROSS_BUILD" ]; then + build_options_default="gir" +fi + libtotem_package() { short_desc+=" - runtime library" replaces="totem<3.6.2"