From 384bb0033ea371b0be2de21b5a668724d0284a33 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 11 Jan 2010 12:38:50 +0100
Subject: [PATCH] xfce4-panel: sanitize deps, bumprev.
--HG--
extra : convert_revision : 7f9a826ccb35e7c3e3764bb9dbe52736ecf3ff6e
---
srcpkgs/xfce4-panel/template | 59 ++++++++++++++-----
.../xfce4-panel/xfce4-panel-devel.template | 19 ++++++
2 files changed, 62 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index ee8a6d1be2..f36ac3be8a 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,6 +1,7 @@
# Template file for 'xfce4-panel'
pkgname=xfce4-panel
version=4.6.2
+revision=1
distfiles="http://archive.xfce.org/src/xfce/$pkgname/4.6/$pkgname-$version.tar.bz2"
build_style=gnu_configure
short_desc="Next generation panel for Xfce"
@@ -9,25 +10,51 @@ checksum=1d8ab1354c73935a5d12f0d7d226d26ae1b90fdd235460bdb57fd5651229bc8b
long_desc="
This package includes the panel for the Xfce desktop environment."
-conf_files="/etc/xdg/xfce4/panel/launcher-7.rc
- /etc/xdg/xfce4/panel/launcher-8.rc
- /etc/xdg/xfce4/panel/launcher-9.rc
- /etc/xdg/xfce4/panel/systray-4.rc
- /etc/xdg/xfce4/panel/xfce4-menu-5.rc
- /etc/xdg/xfce4/panel/panels.xml
- /etc/xdg/xfce4/panel/launcher-10.rc
- /etc/xdg/xfce4/panel/clock-14.rc"
+conf_files="
+/etc/xdg/xfce4/panel/launcher-7.rc
+/etc/xdg/xfce4/panel/launcher-8.rc
+/etc/xdg/xfce4/panel/launcher-9.rc
+/etc/xdg/xfce4/panel/systray-4.rc
+/etc/xdg/xfce4/panel/xfce4-menu-5.rc
+/etc/xdg/xfce4/panel/panels.xml
+/etc/xdg/xfce4/panel/launcher-10.rc
+/etc/xdg/xfce4/panel/clock-14.rc"
gtk_iconcache_dirs="/usr/share/icons/hicolor"
-
subpackages="$pkgname-devel"
+
+Add_dependency run glibc
+Add_dependency run libxfcegui4
+Add_dependency run gtk+
+Add_dependency run libxfce4util
+Add_dependency run atk
+Add_dependency run glib
+Add_dependency run pango
+Add_dependency run cairo
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run startup-notification
+Add_dependency run libSM
+Add_dependency run libICE
+Add_dependency run libX11
+Add_dependency run libwnck
+Add_dependency run exo
Add_dependency build pkg-config
Add_dependency build intltool
-Add_dependency full glibc
-Add_dependency full glib
-Add_dependency full gtk+
-Add_dependency full startup-notification
-Add_dependency full exo
-Add_dependency full libwnck
-Add_dependency full libxfcegui4
+Add_dependency build libxfcegui4-devel
+Add_dependency build gtk+-devel
+Add_dependency build libxfce4util-devel
+Add_dependency build atk-devel
+Add_dependency build glib-devel
+Add_dependency build pango-devel
+Add_dependency build cairo-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build startup-notification-devel
+Add_dependency build libSM-devel
+Add_dependency build libICE-devel
+Add_dependency build libX11-devel
+Add_dependency build glibc-devel
+Add_dependency build libwnck-devel
+Add_dependency build exo-devel
Add_dependency full hicolor-icon-theme
Add_dependency full desktop-file-utils
diff --git a/srcpkgs/xfce4-panel/xfce4-panel-devel.template b/srcpkgs/xfce4-panel/xfce4-panel-devel.template
index a0340486f1..58874976df 100644
--- a/srcpkgs/xfce4-panel/xfce4-panel-devel.template
+++ b/srcpkgs/xfce4-panel/xfce4-panel-devel.template
@@ -5,6 +5,25 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
+revision=1
+
+Add_dependency run pkg-config
+Add_dependency run libxfcegui4-devel
+Add_dependency run gtk+-devel
+Add_dependency run libxfce4util-devel
+Add_dependency run atk-devel
+Add_dependency run glib-devel
+Add_dependency run pango-devel
+Add_dependency run cairo-devel
+Add_dependency run freetype-devel
+Add_dependency run fontconfig-devel
+Add_dependency run startup-notification-devel
+Add_dependency run libSM-devel
+Add_dependency run libICE-devel
+Add_dependency run libX11-devel
+Add_dependency run glibc-devel
+Add_dependency run libwnck-devel
+Add_dependency run exo-devel
Add_dependency run xfce4-panel
do_install()