[arch-commits] Commit in xfce-utils/trunk (PKGBUILD startxfce4_fix.diff)

[andyrtr at archlinux.org]

    Date: Tuesday, January 4, 2011 @ 13:07:10
  Author: andyrtr
Revision: 104640

upgpkg: xfce-utils 4.7.4-1
new upstream release - part of Xfce 4.8pre3 release candidate

Modified:
  xfce-utils/trunk/PKGBUILD
Deleted:
  xfce-utils/trunk/startxfce4_fix.diff

---------------------+
 PKGBUILD            |   31 +++++++++++++++----------------
 startxfce4_fix.diff |   24 ------------------------
 2 files changed, 15 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-04 18:04:19 UTC (rev 104639)
+++ PKGBUILD	2011-01-04 18:07:10 UTC (rev 104640)
@@ -3,35 +3,34 @@
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce-utils
-pkgver=4.6.2
-pkgrel=3
+pkgver=4.7.4
+pkgrel=1
 pkgdesc="Utilities for Xfce"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://www.xfce.org/"
 groups=('xfce4')
-depends=("libxfcegui4>=$pkgver" 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool')
-optdepends=('perl:	enables migration script for 4.4 configuration files'
+depends=('libxfce4ui' 'hicolor-icon-theme')
+makedepends=('pkgconfig' 'intltool') # 'libxml2')
+optdepends=('perl:	for migration scripts'
             'xscreensaver: for locking screen with xflock4'
 	    'gnome-screensaver: for locking screen with xflock4'
 	    'xlockmore: for locking screen with xflock4')
 options=('!libtool')
 install=${pkgname}.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2
-	#http://git.xfce.org/xfce/xfce-utils/patch/?id=cae311cf6453c888a262b435648a194517ce76f3
-	startxfce4_fix.diff)
-md5sums=('5d23407700d7e8c9751e17a5bc955109'
-         '03536fb1315837ada2f27467cc640846')
+source=(http://archive.xfce.org/src/xfce/${pkgname}/4.7/${pkgname}-${pkgver}.tar.bz2)
+md5sums=(2f57594fd504a1a013d0ca5dea898d58'')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-
-  # fix comments in config file http://bugs.archlinux.org/task/20675
-  patch -Np1 -i ${srcdir}/startxfce4_fix.diff
-  
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --disable-static --enable-dbus --disable-debug
+  ./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--libexecdir=/usr/lib \
+	--localstatedir=/var \
+	--disable-static \
+	--enable-dbus \
+	--disable-debug \
+	--with-vendor-info=ArchLinux # 	--enable-gen-doc \
   make
 }
 

Deleted: startxfce4_fix.diff
===================================================================
--- startxfce4_fix.diff	2011-01-04 18:04:19 UTC (rev 104639)
+++ startxfce4_fix.diff	2011-01-04 18:07:10 UTC (rev 104640)
@@ -1,24 +0,0 @@
-From cae311cf6453c888a262b435648a194517ce76f3 Mon Sep 17 00:00:00 2001
-From: Mike Massonnet <mmassonnet at gmail.com>
-Date: Mon, 26 Jul 2010 17:58:06 +0000
-Subject: Use right comment character in Xft.xrdb (bug #6314).
-
----
-diff --git a/scripts/Xft.xrdb b/scripts/Xft.xrdb
-index af45361..cd26513 100644
---- a/scripts/Xft.xrdb
-+++ b/scripts/Xft.xrdb
-@@ -1,7 +1,7 @@
--# Those are fallback settings, use the ui plugin to change it
--# or add your overrides to ~/.Xresources
--# Xft.hintstyle: hintnone/hintslight/hintmedium/hintfull
--# Xft hinting: 1/0
-+! Those are fallback settings, use the ui plugin to change it
-+! or add your overrides to ~/.Xresources
-+! Xft.hintstyle: hintnone/hintslight/hintmedium/hintfull
-+! Xft hinting: 1/0
- 
- Xft.hinting: 1
- Xft.hintstyle: hintmedium
---
-cgit v0.8.3.4