From c4a2111c2b500725a72e35a8b4c81a5ab4d8b5a4 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 25 Sep 2012 17:01:06 +0200
Subject: [PATCH] gnome-panel: update to 3.6.0.

---
 .../gnome-panel/gnome-panel-devel.template    |  3 +-
 srcpkgs/gnome-panel/gnome-panel.rshlibs       | 21 +++++++-------
 srcpkgs/gnome-panel/template                  | 29 ++++++++-----------
 3 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/srcpkgs/gnome-panel/gnome-panel-devel.template b/srcpkgs/gnome-panel/gnome-panel-devel.template
index 296cdb25d64..2512014630e 100644
--- a/srcpkgs/gnome-panel/gnome-panel-devel.template
+++ b/srcpkgs/gnome-panel/gnome-panel-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'gnome-panel-devel'.
 #
-depends="glib-devel gtk+3-devel GConf-devel gnome-panel>=3.4.2.1"
+depends="glib-devel gtk+3-devel gnome-panel>=${version}"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
 noarch=yes
 
 do_install() {
diff --git a/srcpkgs/gnome-panel/gnome-panel.rshlibs b/srcpkgs/gnome-panel/gnome-panel.rshlibs
index 38a584c342e..d1b34b41ac0 100644
--- a/srcpkgs/gnome-panel/gnome-panel.rshlibs
+++ b/srcpkgs/gnome-panel/gnome-panel.rshlibs
@@ -1,33 +1,32 @@
-libSM.so.6
 libICE.so.6
-libgnome-desktop-3.so.2
+libSM.so.6
+libgmodule-2.0.so.0
+libgnome-desktop-3.so.4
 libgtk-3.so.0
 libgdk-3.so.0
 libatk-1.0.so.0
 libgdk_pixbuf-2.0.so.0
-libcairo.so.2
 libpango-1.0.so.0
+libcairo.so.2
 libgconf-2.so.4
 libgnome-menu-3.so.0
-libdconf.so.0
+libdconf.so.1
 libgio-2.0.so.0
 libgobject-2.0.so.0
-libgmodule-2.0.so.0
 libglib-2.0.so.0
 libtelepathy-glib.so.0
 libXrandr.so.2
 libX11.so.6
 libpthread.so.0
 libc.so.6
-libical.so.0
-libedataserverui-3.0.so.1
 librsvg-2.so.2
-libgweather-3.so.0
+libgweather-3.so.1
+libpolkit-gobject-1.so.0
+libecal-1.2.so.15
+libical.so.0
+libedataserver-1.2.so.17
 libm.so.6
 libwnck-3.so.0
 libpangocairo-1.0.so.0
 libcairo-gobject.so.2
 libXau.so.6
-libecal-1.2.so.11
-libedataserver-1.2.so.16
-libpolkit-gobject-1.so.0
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 63cfbb99f4d..7d73b60318e 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -1,29 +1,24 @@
 # Template file for 'gnome-panel'
 pkgname=gnome-panel
-version=3.4.2.1
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
-build_style=gnu-configure
-configure_args="--disable-schemas-install --disable-scrollkeeper
---with-gconf-schema-file-dir=/usr/share/gconf/schemas --disable-schemas-compile"
-depends="hicolor-icon-theme desktop-file-utils"
-makedepends="pkg-config intltool which gnome-doc-utils gobject-introspection gnome-desktop-devel gnome-menus-devel evolution-data-server-devel librsvg-devel libwnck-devel telepathy-glib-devel dconf-devel NetworkManager-devel polkit-devel libgweather-devel"
+version=3.6.0
 revision=1
+build_style=gnu-configure
+configure_args="--disable-schemas-compile --disable-scrollkeeper
+--enable-eds --disable-schemas-install"
+depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool itstool which gnome-doc-utils
+gobject-introspection gnome-desktop-devel>=3.6.0 gnome-menus-devel>=3.6.0
+evolution-data-server-devel>=3.6.0_2 librsvg-devel libwnck-devel
+telepathy-glib-devel dconf-devel>=0.13.90 NetworkManager-devel polkit-devel
+libgweather-devel>=3.6.0 GConf-devel"
 short_desc="GNOME Panel"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
-checksum=188ea2b93e4c8116e187abac3ecf590429ff8366ef4b610fab438bd338d857d2
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=6a8058df6263af35b0e430514f7e16d1b4df095365242d39e170cfc451a328b6
 long_desc="
  This packages the GNOME panel."
 
-gconf_schemas="${pkgname}.schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="$pkgname-devel"
-
-
-
-post_install() {
-	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
-	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
-		--domain ${pkgname}-3.0 ${wrksrc}/${gconf_schemas}
-}