diff --git a/srcpkgs/gir-gnome-panel b/srcpkgs/gir-gnome-panel new file mode 120000 index 00000000000..50c431b3109 --- /dev/null +++ b/srcpkgs/gir-gnome-panel @@ -0,0 +1 @@ +gnome-panel \ No newline at end of file diff --git a/srcpkgs/gnome-panel/gir-gnome-panel.template b/srcpkgs/gnome-panel/gir-gnome-panel.template new file mode 100644 index 00000000000..bc86c5b3cb1 --- /dev/null +++ b/srcpkgs/gnome-panel/gir-gnome-panel.template @@ -0,0 +1,13 @@ +# Template file for 'gir-gnome-panel'. +# +short_desc="Introspection data for GNOME panel" +long_desc="${long_desc} + + This package contains small pieces of introspection data for the GNOME + panel libraries." + +do_install() +{ + install -d ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib +} diff --git a/srcpkgs/gnome-panel/gnome-panel-devel.template b/srcpkgs/gnome-panel/gnome-panel-devel.template index 41312ec4f63..a5d2798844c 100644 --- a/srcpkgs/gnome-panel/gnome-panel-devel.template +++ b/srcpkgs/gnome-panel/gnome-panel-devel.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 - Add_dependency run pkg-config Add_dependency run intltool Add_dependency run gnome-doc-utils @@ -48,9 +46,13 @@ Add_dependency run gnome-panel do_install() { - mkdir -p ${DESTDIR}/usr/{lib,share} + install -d ${DESTDIR}/usr/lib/gnome-panel/modules + install -d ${DESTDIR}/usr/share + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr mv ${SRCPKGDESTDIR}/usr/lib/lib*.a ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/{idl,gtk-doc} ${DESTDIR}/usr/share + mv ${SRCPKGDESTDIR}/usr/share/{gir*,idl,gtk-doc} ${DESTDIR}/usr/share + mv ${SRCPKGDESTDIR}/usr/lib/gnome-panel/modules/*.a \ + ${DESTDIR}/usr/lib/gnome-panel/modules } diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template index 54b0bf0c722..3cbe1e5737c 100644 --- a/srcpkgs/gnome-panel/template +++ b/srcpkgs/gnome-panel/template @@ -1,15 +1,14 @@ # Template file for 'gnome-panel' pkgname=gnome-panel -version=2.30.0 -revision=1 -distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2" +version=2.32.0 +distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-schemas-install --disable-scrollkeeper --with-gconf-schema-file-dir=/usr/share/gconf/schemas ---localstatedir=/var --enable-polkit --enable-eds=auto" +--localstatedir=/var --enable-eds=auto" short_desc="GNOME common librares" maintainer="Juan RP " -checksum=7e8f99d3105bc0dda038b5859ab56d0a9740e244d7853786f1deb2df0a692220 +checksum=a32d7d4a359a40902722e905b21785db4c2eb97b4e697476e6c0ac54b222bc36 long_desc=" This packages common libraries for the GNOME desktop." @@ -27,7 +26,7 @@ workspace-switcher.schemas" gconf_entries="panel-default-setup.entries" gtk_iconcache_dirs="/usr/share/icons/hicolor" -subpackages="$pkgname-devel" +subpackages="gir-$pkgname $pkgname-devel" Add_dependency run glibc Add_dependency run libbonoboui @@ -64,6 +63,11 @@ Add_dependency run libICE Add_dependency run gnome-menus Add_dependency run libcanberra Add_dependency run libXrandr +Add_dependency run gdk-pixbuf +Add_dependency run libpng +Add_dependency run nspr +Add_dependency run nss +Add_dependency run sqlite Add_dependency build pkg-config Add_dependency build intltool @@ -73,7 +77,12 @@ Add_dependency build libgnomecanvas-devel Add_dependency build libgnome-devel Add_dependency build popt-devel Add_dependency build libart-devel -Add_dependency build gtk+-devel +Add_dependency build gdk-pixbuf-devel +Add_dependency build libpng-devel +Add_dependency build nspr-devel +Add_dependency build nss-devel +Add_dependency build sqlite-devel +Add_dependency build gtk+-devel ">=2.22.0_1" Add_dependency build atk-devel Add_dependency build glib-devel Add_dependency build pango-devel @@ -82,7 +91,7 @@ Add_dependency build freetype-devel Add_dependency build fontconfig-devel Add_dependency build libbonobo-devel Add_dependency build ORBit2-devel -Add_dependency build GConf-devel +Add_dependency build GConf-devel ">=2.32.0_1" Add_dependency build libX11-devel Add_dependency build libXau-devel Add_dependency build libwnck-devel diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt index 6b2fdb62266..6865bf3e501 100644 --- a/xbps-src/common/mapping_shlib_binpkg.txt +++ b/xbps-src/common/mapping_shlib_binpkg.txt @@ -558,7 +558,7 @@ libecal-1.2.so evolution-data-server evolution-data-server-devel libedata-book-1.2.so evolution-data-server evolution-data-server-devel libedata-cal-1.2.so.10 evolution-data-server evolution-data-server-devel libedataserver-1.2.so.14 evolution-data-server evolution-data-server-devel -libedataserverui-1.2.so evolution-data-server evolution-data-server-devel +libedataserverui-1.2.so.11 evolution-data-server evolution-data-server-devel libegroupwise-1.2.so.13 evolution-data-server evolution-data-server-devel libgdata-1.2.so evolution-data-server evolution-data-server-devel libgdata-google-1.2.so evolution-data-server evolution-data-server-devel @@ -572,6 +572,7 @@ libnm-util.so NetworkManager NetworkManager-devel libnm-glib.so NetworkManager NetworkManager-devel libnm-glib-vpn.so NetworkManager NetworkManager-devel libpanel-applet-2.so gnome-panel gnome-panel-devel +libpanel-applet-3.so gnome-panel gnome-panel-devel libgnome-window-settings.so gnome-control-center gnome-control-center-devel libboost_date_time.so.1.42 boost boost-devel libboost_math_tr1f.so.1.42 boost boost-devel