diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2011-06-08 19:40:54 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-06-09 06:22:56 +0000 |
commit | c73ab454bdcbd9cc9bb1e611209016b418ecbeac (patch) | |
tree | 7dd884edbb0864da8aca8056ce935f89af2f8fc1 | |
parent | 94e9b1305b2c4bd2b45db58cb86fad0fb7ca05c3 (diff) | |
download | aports-c73ab454bdcbd9cc9bb1e611209016b418ecbeac.tar.bz2 aports-c73ab454bdcbd9cc9bb1e611209016b418ecbeac.tar.xz |
main/gobject-introspection: rearrange
we use a -dev subpackage for development like we do for others.
The gobject-introspection is now the runtime only.
This should also fix issue with py-gobject pulling in -dev packages.
32 files changed, 49 insertions, 45 deletions
diff --git a/main/atk/APKBUILD b/main/atk/APKBUILD index c61c784b81..c8c5203090 100644 --- a/main/atk/APKBUILD +++ b/main/atk/APKBUILD @@ -8,7 +8,7 @@ arch="all" license="LGPL" subpackages="$pkgname-dev $pkgname-doc" depends= -makedepends="glib-dev gobject-introspection" +makedepends="glib-dev gobject-introspection-dev" source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2" depends_dev="glib-dev" diff --git a/main/avahi/APKBUILD b/main/avahi/APKBUILD index 680f24e9aa..53cef82d21 100644 --- a/main/avahi/APKBUILD +++ b/main/avahi/APKBUILD @@ -8,7 +8,7 @@ arch="all" license="LGPL" depends="" depends_dev="gtk+-dev gdbm-dev" -makedepends="py-gtk-dev py-dbus-dev intltool gobject-introspection expat-dev +makedepends="py-gtk-dev py-dbus-dev intltool gobject-introspection-dev expat-dev libdaemon-dev glib-dev dbus-dev libcap-dev gdbm-dev gtk+-dev py-gdbm" install="$pkgname.pre-install" pkgusers="avahi" diff --git a/main/dconf/APKBUILD b/main/dconf/APKBUILD index 255a6d8338..812b03c7be 100644 --- a/main/dconf/APKBUILD +++ b/main/dconf/APKBUILD @@ -7,7 +7,7 @@ url="http://live.gnome.org/dconf" arch="all" license="LGPL2.1" depends="" -makedepends="vala gobject-introspection gtk+-dev glib-dev libxml2-dev" +makedepends="vala gobject-introspection-dev gtk+-dev glib-dev libxml2-dev" install= source="http://download.gnome.org/sources/dconf/0.5/dconf-$pkgver.tar.bz2 0001-Avoid-posix_fallocate-so-it-works-on-uClibc.patch diff --git a/main/gconf/APKBUILD b/main/gconf/APKBUILD index 510fc6c82e..fe68102c22 100644 --- a/main/gconf/APKBUILD +++ b/main/gconf/APKBUILD @@ -11,7 +11,7 @@ depends= depends_dev="orbit2-dev libxml2-dev gtk+-dev polkit-dev" makedepends="$depends_dev - gobject-introspection + gobject-introspection-dev gnome-doc-utils" install="" subpackages="$pkgname-dev" diff --git a/main/gdk-pixbuf/APKBUILD b/main/gdk-pixbuf/APKBUILD index 4ec962752b..25779f4a50 100644 --- a/main/gdk-pixbuf/APKBUILD +++ b/main/gdk-pixbuf/APKBUILD @@ -8,7 +8,7 @@ arch="all" license="LGPL" depends= depends_dev= -makedepends="tiff-dev libpng-dev glib-dev jpeg-dev gobject-introspection" +makedepends="tiff-dev libpng-dev glib-dev jpeg-dev gobject-introspection-dev" install="$pkgname.pre-deinstall" triggers="$pkgname.trigger:/usr/lib/gdk-pixbuf-2.0/*/loaders" subpackages="$pkgname-dev $pkgname-doc" diff --git a/main/gnome-bluetooth/APKBUILD b/main/gnome-bluetooth/APKBUILD index b8b78abb4f..721b4ae2b2 100644 --- a/main/gnome-bluetooth/APKBUILD +++ b/main/gnome-bluetooth/APKBUILD @@ -7,7 +7,7 @@ url="http://live.gnome.org/GnomeBluetooth" arch="all" license="GPL LGPL" depends="hicolor-icon-theme obexd-client obex-data-server" -makedepends="intltool py-gtk gobject-introspection libunique-dev libnotify-dev +makedepends="intltool py-gtk gobject-introspection-dev libunique-dev libnotify-dev libxi-dev libxslt py-libxml2 gnome-doc-utils" install= subpackages="$pkgname-dev $pkgname-doc" diff --git a/main/gnome-control-center/APKBUILD b/main/gnome-control-center/APKBUILD index 33e6ca7332..a288d3e61a 100644 --- a/main/gnome-control-center/APKBUILD +++ b/main/gnome-control-center/APKBUILD @@ -32,7 +32,7 @@ depends_dev="gtk+-dev libgnomekbd-dev libxklavier-dev" -makedepends="$depends_dev intltool gobject-introspection desktop-file-utils" +makedepends="$depends_dev intltool gobject-introspection-dev desktop-file-utils" install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade" subpackages= source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" diff --git a/main/gnome-keyring/APKBUILD b/main/gnome-keyring/APKBUILD index 68ce061632..3fe0a221f1 100644 --- a/main/gnome-keyring/APKBUILD +++ b/main/gnome-keyring/APKBUILD @@ -25,7 +25,7 @@ depends_dev="gtk+-dev libxdmcp-dev libxext-dev libxcb-dev" -makedepends="$depends_dev intltool gobject-introspection" +makedepends="$depends_dev intltool gobject-introspection-dev" install= subpackages="$pkgname-dev" source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" diff --git a/main/gnome-menus/APKBUILD b/main/gnome-menus/APKBUILD index 76923a7328..d07e51235d 100644 --- a/main/gnome-menus/APKBUILD +++ b/main/gnome-menus/APKBUILD @@ -9,7 +9,7 @@ arch="all" license="GPL" depends="python" depends_dev="libgnome-dev python-dev" -makedepends="$depends_dev intltool gobject-introspection" +makedepends="$depends_dev intltool gobject-introspection-dev" install= subpackages="$pkgname-dev" source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" diff --git a/main/gnome-panel/APKBUILD b/main/gnome-panel/APKBUILD index fd66f85dbc..5986c0db14 100644 --- a/main/gnome-panel/APKBUILD +++ b/main/gnome-panel/APKBUILD @@ -18,7 +18,7 @@ depends_dev="gtk+-dev libwnck-dev librsvg-dev libgweather-dev" -makedepends="$depends_dev intltool gobject-introspection" +makedepends="$depends_dev intltool gobject-introspection-dev" install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade" subpackages="$pkgname-dev" replaces_dev="$pkgname" diff --git a/main/gnome-power-manager/APKBUILD b/main/gnome-power-manager/APKBUILD index c4d3eb2a72..090587235d 100644 --- a/main/gnome-power-manager/APKBUILD +++ b/main/gnome-power-manager/APKBUILD @@ -29,7 +29,7 @@ depends_dev="gtk+-dev libxcb-dev libxrender-dev libxrandr-dev" -makedepends="$depends_dev intltool gobject-introspection" +makedepends="$depends_dev intltool gobject-introspection-dev" install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade" subpackages= source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 diff --git a/main/gnome-screensaver/APKBUILD b/main/gnome-screensaver/APKBUILD index 2e9e63b48b..1b675a89ca 100644 --- a/main/gnome-screensaver/APKBUILD +++ b/main/gnome-screensaver/APKBUILD @@ -29,7 +29,7 @@ depends_dev="gtk+-dev libxcb-dev libxrender-dev libxrandr-dev" -makedepends="$depends_dev intltool gobject-introspection" +makedepends="$depends_dev intltool gobject-introspection-dev" install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade" subpackages= source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" diff --git a/main/gnome-session/APKBUILD b/main/gnome-session/APKBUILD index 1f00bf62c3..b450f97e8c 100644 --- a/main/gnome-session/APKBUILD +++ b/main/gnome-session/APKBUILD @@ -18,7 +18,7 @@ depends_dev="gtk+-dev librsvg-dev libxcomposite-dev upower-dev" -makedepends="$depends_dev intltool gobject-introspection" +makedepends="$depends_dev intltool gobject-introspection-dev" install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade" subpackages= source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" diff --git a/main/gnome-settings-daemon/APKBUILD b/main/gnome-settings-daemon/APKBUILD index 1c308f466a..943a0fe521 100644 --- a/main/gnome-settings-daemon/APKBUILD +++ b/main/gnome-settings-daemon/APKBUILD @@ -28,7 +28,7 @@ depends_dev="gtk+-dev libgnomekbd-dev libxklavier-dev" -makedepends="$depends_dev intltool gobject-introspection" +makedepends="$depends_dev intltool gobject-introspection-dev" install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade" subpackages="$pkgname-dev" replaces_dev="$pkgname" diff --git a/main/gnome-system-monitor/APKBUILD b/main/gnome-system-monitor/APKBUILD index cc12f2b5fa..5419b692ca 100644 --- a/main/gnome-system-monitor/APKBUILD +++ b/main/gnome-system-monitor/APKBUILD @@ -32,7 +32,7 @@ depends_dev="gtk+-dev gtkmm-dev glibmm-dev" -makedepends="$depends_dev intltool gobject-introspection desktop-file-utils gnome-icon-theme" +makedepends="$depends_dev intltool gobject-introspection-dev desktop-file-utils gnome-icon-theme" install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade" subpackages= source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" diff --git a/main/gobject-introspection/APKBUILD b/main/gobject-introspection/APKBUILD index fae880e077..4c4580475d 100644 --- a/main/gobject-introspection/APKBUILD +++ b/main/gobject-introspection/APKBUILD @@ -1,17 +1,19 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gobject-introspection pkgver=0.10.8 -pkgrel=0 +pkgrel=1 pkgdesc="Introspection system for GObject-based libraries" url="http://live.gnome.org/GObjectInstrospection" arch="all" license="LGPL GPL" -makedepends="flex bison glib-dev libffi-dev python-dev libtool" -depends="python glib-dev libffi-dev cairo-dev" +depends_dev="python glib-dev libffi-dev cairo-dev" +makedepends="$depends_dev flex bison python-dev libtool" +depends= +replaces="libgirepository" source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2" # since this is a dev package by definition we dont bother separate -dev -subpackages="$pkgname-doc libgirepository" +subpackages="$pkgname-doc $pkgname-dev" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -28,22 +30,24 @@ prepare() { build() { cd "$_builddir" -# export CPPFLAGS= ./configure --prefix=/usr --disable-static || return 1 - # FIXME: parallel builds is broken - make -j1 || return 1 + make || return 1 } package() { cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 + find "$pkgdir" -name '*.la' -delete } -libgirepository() { - pkgdesc="Runtime library for gobject-introspection" - cd "$_builddir" - install -d "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libgirepository*.so* "$subpkgdir"/usr/lib/ +dev() { + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/share "$subpkgdir"/usr/ || return 1 + mv "$pkgdir"/usr/lib/gobject-introspection "$subpkgdir"/usr/lib/ \ + || return 1 + mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ || return 1 + default_dev + replaces="gobject-introspection" } md5sums="b5da58a5327d13b4d1e08b8e42b2456d gobject-introspection-0.10.8.tar.bz2" diff --git a/main/gtk+2.0/APKBUILD b/main/gtk+2.0/APKBUILD index 225ea96861..11c080d748 100644 --- a/main/gtk+2.0/APKBUILD +++ b/main/gtk+2.0/APKBUILD @@ -24,7 +24,7 @@ makedepends="pkgconfig gettext-dev glib-dev gnutls-dev - gobject-introspection + gobject-introspection-dev libice-dev libiconv-dev jpeg-dev>=8 diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD index 0e8f8db3bf..826e430359 100644 --- a/main/gtk+3.0/APKBUILD +++ b/main/gtk+3.0/APKBUILD @@ -27,7 +27,7 @@ makedepends="pkgconfig gettext-dev glib-dev gnutls-dev - gobject-introspection + gobject-introspection-dev libice-dev libiconv-dev jpeg-dev>=8 diff --git a/main/gtksourceview/APKBUILD b/main/gtksourceview/APKBUILD index ccfaba07b7..93342ad2e2 100644 --- a/main/gtksourceview/APKBUILD +++ b/main/gtksourceview/APKBUILD @@ -8,7 +8,7 @@ arch="all" license="GPL" depends= depends_dev="gtk+-dev libxml2-dev" -makedepends="$depends_dev gobject-introspection" +makedepends="$depends_dev gobject-introspection-dev" subpackages="$pkgname-dev $pkgname-doc" source="http://ftp.gnome.org/pub/gnome/sources/gtksourceview/${pkgver%.*}/gtksourceview-$pkgver.tar.bz2" diff --git a/main/json-glib/APKBUILD b/main/json-glib/APKBUILD index 9af4b8739b..a913d86a2f 100644 --- a/main/json-glib/APKBUILD +++ b/main/json-glib/APKBUILD @@ -7,7 +7,7 @@ arch="all" url="http://live.gnome.org/JsonGlib" license="GPL" depends="" -makedepends="gobject-introspection glib-dev" +makedepends="gobject-introspection-dev glib-dev" subpackages="$pkgname-dev $pkgname-doc" source="http://ftp.gnome.org/pub/GNOME/sources/json-glib/0.12/json-glib-$pkgver.tar.bz2" diff --git a/main/libgnome-keyring/APKBUILD b/main/libgnome-keyring/APKBUILD index 8a4676b8f1..c039703251 100644 --- a/main/libgnome-keyring/APKBUILD +++ b/main/libgnome-keyring/APKBUILD @@ -25,7 +25,7 @@ depends_dev="gtk+-dev libxdmcp-dev libxext-dev libxcb-dev" -makedepends="$depends_dev intltool gobject-introspection" +makedepends="$depends_dev intltool gobject-introspection-dev" install= subpackages="$pkgname-dev" source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" diff --git a/main/metacity/APKBUILD b/main/metacity/APKBUILD index 9e073b7386..4ce453a1c3 100644 --- a/main/metacity/APKBUILD +++ b/main/metacity/APKBUILD @@ -17,7 +17,7 @@ depends_dev="gtk+-dev libwnck-dev librsvg-dev libxcomposite-dev" -makedepends="$depends_dev intltool gobject-introspection" +makedepends="$depends_dev intltool gobject-introspection-dev" install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade" subpackages="$pkgname-dev" replaces_dev="$pkgname" diff --git a/main/nautilus/APKBUILD b/main/nautilus/APKBUILD index a0aecbb246..90df7a7469 100644 --- a/main/nautilus/APKBUILD +++ b/main/nautilus/APKBUILD @@ -25,7 +25,7 @@ depends_dev="gtk+-dev libxdmcp-dev libxext-dev libxcb-dev" -makedepends="$depends_dev intltool gobject-introspection" +makedepends="$depends_dev intltool gobject-introspection-dev" install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade" subpackages="$pkgname-dev" source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" diff --git a/main/pango/APKBUILD b/main/pango/APKBUILD index 8e67ead139..6708012eb3 100644 --- a/main/pango/APKBUILD +++ b/main/pango/APKBUILD @@ -9,7 +9,7 @@ license="LGPL" subpackages="$pkgname-dev $pkgname-doc" depends= makedepends="pkgconfig glib-dev cairo-dev libxft-dev gettext-dev libiconv-dev - expat-dev gobject-introspection" + expat-dev gobject-introspection-dev" install="pango.post-install $pkgname.pre-deinstall" source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2" diff --git a/main/polkit/APKBUILD b/main/polkit/APKBUILD index 8e8fbe7e5a..85bae9a7f7 100644 --- a/main/polkit/APKBUILD +++ b/main/polkit/APKBUILD @@ -10,7 +10,7 @@ arch="all" license="LGPL" depends= makedepends="expat-dev glib-dev eggdbus-dev intltool dbus-glib-dev autoconf - libtool automake gtk-doc gobject-introspection" + libtool automake gtk-doc gobject-introspection-dev" depends_dev="eggdbus-dev dbus-glib-dev" install= subpackages="$pkgname-dev $pkgname-doc" diff --git a/main/py-gobject/APKBUILD b/main/py-gobject/APKBUILD index f288646e0a..8f9af30d04 100644 --- a/main/py-gobject/APKBUILD +++ b/main/py-gobject/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=py-gobject pkgver=2.26.0 -pkgrel=2 +pkgrel=3 pkgdesc="Python bindings for the GObject library" url="http://www.pygtk.org/" arch="all" license="GPL" depends= -makedepends="python-dev glib-dev py-cairo-dev gobject-introspection" +makedepends="python-dev glib-dev py-cairo-dev gobject-introspection-dev" install= subpackages="$pkgname-dev $pkgname-doc" source="http://ftp.gnome.org/pub/GNOME/sources/pygobject/${pkgver%.*}/pygobject-$pkgver.tar.bz2" diff --git a/main/udev/APKBUILD b/main/udev/APKBUILD index 9019708880..52a6572909 100644 --- a/main/udev/APKBUILD +++ b/main/udev/APKBUILD @@ -8,7 +8,7 @@ arch="all" license="GPL" subpackages="$pkgname-dev $pkgname-doc libudev libgudev" depends= -makedepends="gobject-introspection glib-dev gperf acl-dev libusb-compat-dev +makedepends="gobject-introspection-dev glib-dev gperf acl-dev libusb-compat-dev usbutils pciutils-dev libtool" install= source="http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2 diff --git a/main/webkit/APKBUILD b/main/webkit/APKBUILD index 19d6f8105b..6ecd848ab8 100644 --- a/main/webkit/APKBUILD +++ b/main/webkit/APKBUILD @@ -14,7 +14,7 @@ makedepends=" zlib-dev libgcrypt-dev libgpg-error-dev expat-dev e2fsprogs-dev enchant-dev libxi-dev libxrandr-dev libxcursor-dev libxdamage-dev libxcomposite-dev gstreamer-dev gst-plugins-base-dev - gobject-introspection perl-switch + gobject-introspection-dev perl-switch " install= subpackages="$pkgname-dev gtklauncher" diff --git a/testing/clutter/APKBUILD b/testing/clutter/APKBUILD index 8d8e29878c..43fa88c797 100644 --- a/testing/clutter/APKBUILD +++ b/testing/clutter/APKBUILD @@ -9,7 +9,7 @@ arch="all" license="LGPL" depends= depends_dev="gdk-pixbuf-dev json-glib-dev atk-dev pango-dev mesa-dev libxcomposite-dev cairo-dev" -makedepends="$depends_dev gobject-introspection intltool" +makedepends="$depends_dev gobject-introspection-dev intltool" install="" subpackages="$pkgname-dev $pkgname-doc" source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" diff --git a/testing/gjs/APKBUILD b/testing/gjs/APKBUILD index 3e9b895bac..37e42a0ee8 100644 --- a/testing/gjs/APKBUILD +++ b/testing/gjs/APKBUILD @@ -9,7 +9,7 @@ arch="" license="LGPL" depends="xulrunner" depends_dev="xulrunner-dev gtk+-dev glib-dev cairo-dev dbus-glib-dev nspr-dev" -makedepends="$depends_dev gobject-introspection" +makedepends="$depends_dev gobject-introspection-dev" install="" subpackages="$pkgname-dev" source="ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" diff --git a/testing/mutter/APKBUILD b/testing/mutter/APKBUILD index 047365517f..6b3aefddd2 100644 --- a/testing/mutter/APKBUILD +++ b/testing/mutter/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=mutter pkgver=2.31.5 -pkgrel=1 +pkgrel=2 pkgdesc="clutter-based window manager for GNOME" url="http://www.gnome.org/" arch="all" license="GPL" depends="zenity" depends_dev="clutter-dev libcanberra-dev gconf-dev startup-notification-dev python-dev" -makedepends="$depends_dev gobject-introspection intltool gnome-doc-utils" +makedepends="$depends_dev gobject-introspection-dev intltool gnome-doc-utils" install="$pkgname.pre-deinstall $pkgname.post-install $pkgname.post-upgrade" subpackages="$pkgname-dev $pkgname-doc" source="ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 diff --git a/testing/polkit-gnome/APKBUILD b/testing/polkit-gnome/APKBUILD index 97e837292f..27a8a2ba3b 100644 --- a/testing/polkit-gnome/APKBUILD +++ b/testing/polkit-gnome/APKBUILD @@ -7,7 +7,7 @@ url="http://www.freedesktop.org/wiki/Software/PolicyKit" arch="all" license="LGPL" depends="" -makedepends="polkit-dev gtk+-dev gobject-introspection" +makedepends="polkit-dev gtk+-dev gobject-introspection-dev" subpackages="$pkgname-dev" source="http://hal.freedesktop.org/releases/polkit-gnome-$pkgver.tar.bz2" |