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

[andyrtr at archlinux.org]

    Date: Monday, November 22, 2010 @ 11:02:02
  Author: andyrtr
Revision: 100306

upgpkg: xfce-utils 4.6.2-3
fix optdepends and satisfy our source fetching script

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

---------------------+
 PKGBUILD            |   20 +++++++++++---------
 startxfce4_fix.diff |   24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-22 15:58:03 UTC (rev 100305)
+++ PKGBUILD	2010-11-22 16:02:02 UTC (rev 100306)
@@ -4,7 +4,7 @@
 
 pkgname=xfce-utils
 pkgver=4.6.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Utilities for Xfce"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -13,27 +13,29 @@
 depends=("libxfcegui4>=$pkgver" 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'intltool')
 optdepends=('perl:	enables migration script for 4.4 configuration files'
-            'xscreensaver|gnome-screensaver|xlockmore: for locking screen with xflock4')
+            '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
-	 )
+	#http://git.xfce.org/xfce/xfce-utils/patch/?id=cae311cf6453c888a262b435648a194517ce76f3
+	startxfce4_fix.diff)
 md5sums=('5d23407700d7e8c9751e17a5bc955109'
-         'b1b40010d7df2e413061118b60443700')
+         '03536fb1315837ada2f27467cc640846')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   # fix comments in config file http://bugs.archlinux.org/task/20675
-  patch -Np1 -i ${srcdir}/'?id=cae311cf6453c888a262b435648a194517ce76f3' || return 1
+  patch -Np1 -i ${srcdir}/startxfce4_fix.diff
   
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --disable-static
-  make || return 1
+    --localstatedir=/var --disable-static --enable-dbus --disable-debug
+  make
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 }

Added: startxfce4_fix.diff
===================================================================
--- startxfce4_fix.diff	                        (rev 0)
+++ startxfce4_fix.diff	2010-11-22 16:02:02 UTC (rev 100306)
@@ -0,0 +1,24 @@
+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