From c5eee4eddc5ebf88993d8c350ab7334794a706a4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 3 Apr 2012 09:59:09 +0200 Subject: [PATCH] glade3: update to 3.12.0. --- srcpkgs/glade3/glade3-devel.template | 25 +++++++------------------ srcpkgs/glade3/glade3.rshlibs | 1 - srcpkgs/glade3/libgladeui3.rshlibs | 5 +---- srcpkgs/glade3/libgladeui3.template | 13 +++++-------- srcpkgs/glade3/template | 27 ++++++++++----------------- 5 files changed, 23 insertions(+), 48 deletions(-) diff --git a/srcpkgs/glade3/glade3-devel.template b/srcpkgs/glade3/glade3-devel.template index 64a43b4988d..cfdf00b535f 100644 --- a/srcpkgs/glade3/glade3-devel.template +++ b/srcpkgs/glade3/glade3-devel.template @@ -5,26 +5,15 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -Add_dependency run pkg-config -Add_dependency run intltool -Add_dependency run gnome-doc-utils Add_dependency run gtk+3-devel -Add_dependency run atk-devel -Add_dependency run glib-devel -Add_dependency run pango-devel -Add_dependency run gdk-pixbuf-devel -Add_dependency run libpng-devel -Add_dependency run cairo-devel -Add_dependency run freetype-devel -Add_dependency run fontconfig-devel Add_dependency run libxml2-devel -Add_dependency run gobject-introspection +Add_dependency run libgladeui3 ">=${version}" -do_install() -{ - mkdir -p ${DESTDIR}/usr/{lib,share} +noarch=yes - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share +do_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove usr/share/gir-1.0 usr/share + vmove usr/share/gtk-doc usr/share } diff --git a/srcpkgs/glade3/glade3.rshlibs b/srcpkgs/glade3/glade3.rshlibs index 3cba19e0e7a..43028943159 100644 --- a/srcpkgs/glade3/glade3.rshlibs +++ b/srcpkgs/glade3/glade3.rshlibs @@ -6,4 +6,3 @@ libpthread.so.0 libc.so.6 libgdk-3.so.0 libgmodule-2.0.so.0 -libgthread-2.0.so.0 diff --git a/srcpkgs/glade3/libgladeui3.rshlibs b/srcpkgs/glade3/libgladeui3.rshlibs index 720fa8654ff..79d8862f177 100644 --- a/srcpkgs/glade3/libgladeui3.rshlibs +++ b/srcpkgs/glade3/libgladeui3.rshlibs @@ -2,19 +2,16 @@ libgtk-3.so.0 libgdk-3.so.0 libatk-1.0.so.0 libgio-2.0.so.0 -libpangoft2-1.0.so.0 libpangocairo-1.0.so.0 libgdk_pixbuf-2.0.so.0 libcairo-gobject.so.2 libcairo.so.2 libpango-1.0.so.0 -libfreetype.so.6 -libfontconfig.so.1 libgobject-2.0.so.0 libgmodule-2.0.so.0 -libgthread-2.0.so.0 librt.so.1 libglib-2.0.so.0 libxml2.so.2 libpthread.so.0 libc.so.6 +libpython2.7.so.1.0 diff --git a/srcpkgs/glade3/libgladeui3.template b/srcpkgs/glade3/libgladeui3.template index 589b44917d3..26bec891d60 100644 --- a/srcpkgs/glade3/libgladeui3.template +++ b/srcpkgs/glade3/libgladeui3.template @@ -1,18 +1,15 @@ # Template file for 'libgladeui'. # -revision=2 short_desc="GTK+ User Interface Build core library" long_desc="${long_desc} This library provides all the widgets and core code, like parsing and saving files." -Add_dependency run python +Add_dependency run pygobject -do_install() -{ - install -d ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/lib*.so* ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/glade ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/girepository* ${DESTDIR}/usr/lib +do_install() { + vmove "usr/lib/*.so*" usr/lib + vmove usr/lib/glade usr/lib + vmove usr/lib/girepository-1.0 usr/lib } diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template index aba15037ddd..5e1867a3a07 100644 --- a/srcpkgs/glade3/template +++ b/srcpkgs/glade3/template @@ -1,14 +1,13 @@ # Template build file for 'glade3'. pkgname=glade3 -version=3.10.0 +version=3.12.0 wrksrc=glade-${version} -distfiles="${GNOME_SITE}/glade/3.10/glade-$version.tar.bz2" +distfiles="${GNOME_SITE}/glade/3.12/glade-$version.tar.xz" build_style=gnu-configure -configure_args="--disable-scrollkeeper" -revision=2 -short_desc="A User Interface Designer for GTK+" +configure_args="--disable-scrollkeeper --disable-static" +short_desc="An User Interface Designer for GTK+" maintainer="Juan RP " -checksum=7e6a1423f1697d8b40618d0b01f0ebff572ccb80f5818a36af0971c5d1d94253 +checksum=70a820a0007fa3ed7761c92b011fe35ac1532038cab2f9ab30f4d29d5799d44d long_desc=" Glade is a RAD tool to enable quick & easy development of user interfaces for the GTK+ toolkit and the GNOME desktop environment. @@ -23,21 +22,15 @@ long_desc=" subpackages="libgladeui3 $pkgname-devel" gtk_iconcache_dirs="/usr/share/icons/hicolor" +Add_dependency build which Add_dependency build pkg-config Add_dependency build intltool Add_dependency build gnome-doc-utils Add_dependency build gtk+3-devel -Add_dependency build atk-devel -Add_dependency build glib-devel -Add_dependency build pango-devel -Add_dependency build gdk-pixbuf-devel -Add_dependency build libpng-devel -Add_dependency build cairo-devel -Add_dependency build freetype-devel -Add_dependency build fontconfig-devel Add_dependency build libxml2-devel Add_dependency build gobject-introspection +Add_dependency build python-devel +Add_dependency build pygobject-devel -Add_dependency full pygobject -Add_dependency full hicolor-icon-theme -Add_dependency full desktop-file-utils +Add_dependency run hicolor-icon-theme +Add_dependency run desktop-file-utils