From 16b8a492d459c8e52944efa2b553278c662cc0bd Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 12 Apr 2010 16:35:39 +0200 Subject: [PATCH] libsoup: update to 2.30.0, add -gnome{,-devel} subpkgs. --HG-- extra : convert_revision : 0ed4f63ebc1879e1222a98051c474f1f815b2f02 --- srcpkgs/libsoup-gnome | 1 + srcpkgs/libsoup-gnome-devel | 1 + srcpkgs/libsoup/libsoup-devel.template | 6 ++-- srcpkgs/libsoup/libsoup-gnome-devel.template | 29 ++++++++++++++++++++ srcpkgs/libsoup/libsoup-gnome.template | 25 +++++++++++++++++ srcpkgs/libsoup/template | 12 ++++---- xbps-src/common/mapping_shlib_binpkg.txt | 1 + 7 files changed, 67 insertions(+), 8 deletions(-) create mode 120000 srcpkgs/libsoup-gnome create mode 120000 srcpkgs/libsoup-gnome-devel create mode 100644 srcpkgs/libsoup/libsoup-gnome-devel.template create mode 100644 srcpkgs/libsoup/libsoup-gnome.template diff --git a/srcpkgs/libsoup-gnome b/srcpkgs/libsoup-gnome new file mode 120000 index 0000000000..ed1af3c9d3 --- /dev/null +++ b/srcpkgs/libsoup-gnome @@ -0,0 +1 @@ +libsoup \ No newline at end of file diff --git a/srcpkgs/libsoup-gnome-devel b/srcpkgs/libsoup-gnome-devel new file mode 120000 index 0000000000..ed1af3c9d3 --- /dev/null +++ b/srcpkgs/libsoup-gnome-devel @@ -0,0 +1 @@ +libsoup \ No newline at end of file diff --git a/srcpkgs/libsoup/libsoup-devel.template b/srcpkgs/libsoup/libsoup-devel.template index e3f0b47de1..b4b182083e 100644 --- a/srcpkgs/libsoup/libsoup-devel.template +++ b/srcpkgs/libsoup/libsoup-devel.template @@ -15,14 +15,14 @@ Add_dependency run libproxy-devel Add_dependency run gnutls-devel Add_dependency run sqlite-devel Add_dependency run GConf-devel +Add_dependency run libgnome-keyring-devel Add_dependency run libsoup do_install() { - mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/{include,share} ${DESTDIR}/usr mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share } diff --git a/srcpkgs/libsoup/libsoup-gnome-devel.template b/srcpkgs/libsoup/libsoup-gnome-devel.template new file mode 100644 index 0000000000..f34c83d09f --- /dev/null +++ b/srcpkgs/libsoup/libsoup-gnome-devel.template @@ -0,0 +1,29 @@ +# Template file for 'libsoup-gnome-devel'. +# +short_desc="${sourcepkg} - GNOME development files" +long_desc="${long_desc} + + This package contains the GNOME support files for development: + headers, static libs, etc." + +Add_dependency run libxml2-devel +Add_dependency run zlib-devel +Add_dependency run gnutls-devel +Add_dependency run libgcrypt-devel +Add_dependency run libgpg-error-devel +Add_dependency run glib-devel +Add_dependency run GConf-devel +Add_dependency run libproxy-devel +Add_dependency run sqlite-devel +Add_dependency run libgnome-keyring-devel +Add_dependency run libsoup-gnome + +do_install() +{ + mkdir -p ${DESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/include + mv ${SRCPKGDESTDIR}/usr/include/libsoup-gnome* \ + ${DESTDIR}/usr/include + mv ${SRCPKGDESTDIR}/usr/lib/libsoup-gnome*.{a,so} ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/*gnome* \ + ${DESTDIR}/usr/lib/pkgconfig +} diff --git a/srcpkgs/libsoup/libsoup-gnome.template b/srcpkgs/libsoup/libsoup-gnome.template new file mode 100644 index 0000000000..a06bc6e864 --- /dev/null +++ b/srcpkgs/libsoup/libsoup-gnome.template @@ -0,0 +1,25 @@ +# Template file for 'libsoup-gnome'. +# +short_desc="${sourcepkg} - GNOME libraries" +long_desc="${long_desc} + + This package contains the GNOME support libraries." + +Add_dependency run glibc +Add_dependency run zlib +Add_dependency run libxml2 +Add_dependency run gnutls +Add_dependency run libgcrypt +Add_dependency run libgpg-error +Add_dependency run glib +Add_dependency run GConf +Add_dependency run libproxy +Add_dependency run sqlite +Add_dependency run libgnome-keyring +Add_dependency run libsoup + +do_install() +{ + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libsoup-gnome*.so.* ${DESTDIR}/usr/lib +} diff --git a/srcpkgs/libsoup/template b/srcpkgs/libsoup/template index 087a4e02a8..f1c02a114a 100644 --- a/srcpkgs/libsoup/template +++ b/srcpkgs/libsoup/template @@ -1,12 +1,12 @@ # Template file for 'libsoup' pkgname=libsoup -version=2.28.2 -distfiles="${GNOME_SITE}/$pkgname/2.28/$pkgname-$version.tar.bz2" +version=2.30.0 +distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2" build_style=gnu_configure -configure_args="--without-gnome" +configure_args="--localstatedir=/var" short_desc="HTTP library implementation in C" maintainer="Juan RP " -checksum=9dd1fce9a051f8176e35c263fcb59b10bf4ffb572b78ca23d1f7f266a0ec5300 +checksum=0ebe715fde45e40835860184cf0240246cd6c276008f27d056c53593f6ea37ce long_desc=" Libsoup is an HTTP library implementation in C. It was originally part of a SOAP (Simple Object Access Protocol) implementation called Soup, but @@ -28,8 +28,9 @@ long_desc=" * HTTP server * Server support for Digest and Basic authentication" -subpackages="$pkgname-devel" +subpackages="$pkgname-gnome $pkgname-gnome-devel $pkgname-devel" Add_dependency run glibc +Add_dependency run zlib Add_dependency run libxml2 Add_dependency run libproxy Add_dependency run sqlite @@ -48,3 +49,4 @@ Add_dependency build libproxy-devel Add_dependency build gnutls-devel Add_dependency build sqlite-devel Add_dependency build GConf-devel +Add_dependency build libgnome-keyring-devel diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt index d8c33f92e4..34ff0ca9b9 100644 --- a/xbps-src/common/mapping_shlib_binpkg.txt +++ b/xbps-src/common/mapping_shlib_binpkg.txt @@ -457,6 +457,7 @@ libhunspell-1.2.so hunspell hunspell-devel libenchant.so enchant enchant-devel libgconf-2.so GConf GConf-devel libsoup-2.4.so libsoup libsoup-devel +libsoup-gnome-2.4.so libsoup-gnome libsoup-gnome-devel libunique-1.0.so libunique libunique-devel libwebkit-1.0.so webkit-gtk webkit-gtk-devel libgimp-2.0.so gimp gimp-devel