[arch-commits] Commit in xfdesktop/repos (3 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Mon Apr 20 21:23:50 UTC 2009
Date: Monday, April 20, 2009 @ 17:23:50
Author: andyrtr
Revision: 36279
fix svn conflict
Modified:
xfdesktop/repos/extra-x86_64/ (properties)
xfdesktop/repos/extra-x86_64/PKGBUILD
Deleted:
xfdesktop/repos/extra-x86_64/memleak.patch
---------------+
PKGBUILD | 6 +++---
memleak.patch | 12 ------------
2 files changed, 3 insertions(+), 15 deletions(-)
Property changes on: xfdesktop/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /xfdesktop/trunk:1-28057
+ /xfdesktop/trunk:1-36278
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-04-20 21:22:48 UTC (rev 36278)
+++ extra-x86_64/PKGBUILD 2009-04-20 21:23:50 UTC (rev 36279)
@@ -2,21 +2,21 @@
# Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
pkgname=xfdesktop
-pkgver=4.6.0
+pkgver=4.6.1
pkgrel=1
pkgdesc="A desktop manager for Xfce"
arch=(i686 x86_64)
license=('GPL2')
url="http://www.xfce.org/"
groups=('xfce4')
-depends=("libxfce4menu>=$pkgver" 'thunar>=1.0.0' 'hicolor-icon-theme')
+depends=("libxfce4menu>=$pkgver" 'thunar>=1.0.1' 'hicolor-icon-theme')
makedepends=("xfce4-panel>=$pkgver" 'pkgconfig' 'intltool')
conflicts=('xfce4-menueditor')
replaces=('xfce4-menueditor')
options=('!libtool')
install=${pkgname}.install
source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('508b18f9d4ef27833517bba3bd6e2fbf')
+md5sums=('ae15cacc3e3834cca7238a8e1035c50d')
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
Deleted: extra-x86_64/memleak.patch
===================================================================
--- extra-x86_64/memleak.patch 2009-04-20 21:22:48 UTC (rev 36278)
+++ extra-x86_64/memleak.patch 2009-04-20 21:23:50 UTC (rev 36279)
@@ -1,12 +0,0 @@
-Index: desktop-menu-dentry.c
-===================================================================
---- modules/menu/desktop-menu-dentry.c (revision 26634)
-+++ modules/menu/desktop-menu-dentry.c (revision 26635)
-@@ -173,6 +173,7 @@
- if(cmpname && g_ascii_strcasecmp(name, cmpname) < 0)
- break;
- }
-+ g_list_free(items);
-
- gtk_menu_shell_insert(menu_shell, mi, i);
-
More information about the arch-commits
mailing list