[arch-commits] Commit in xfdesktop/repos (4 files)

[Jan de Groot]

    Date: Friday, July 18, 2008 @ 19:59:09
  Author: jgc
Revision: 5629

Merged revisions 2-5628 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xfdesktop/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r5628 | jgc | 2008-07-18 23:58:55 +0000 (Fri, 18 Jul 2008) | 2 lines
  
  upgpkg: xfdesktop 4.4.2-3
      Remove dependency on desktop-file-utils - not needed
........

Added:
  xfdesktop/repos/extra-x86_64/memleak.patch
    (from rev 5628, xfdesktop/trunk/memleak.patch)
Modified:
  xfdesktop/repos/extra-x86_64/	(properties)
  xfdesktop/repos/extra-x86_64/PKGBUILD
  xfdesktop/repos/extra-x86_64/xfdesktop.install

-------------------+
 PKGBUILD          |   25 +++++++++++++------------
 memleak.patch     |   12 ++++++++++++
 xfdesktop.install |    7 -------
 3 files changed, 25 insertions(+), 19 deletions(-)


Property changes on: xfdesktop/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /xfdesktop/trunk:1
   + /xfdesktop/trunk:1-5628

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-18 23:58:55 UTC (rev 5628)
+++ extra-x86_64/PKGBUILD	2008-07-18 23:59:09 UTC (rev 5629)
@@ -3,7 +3,7 @@
 
 pkgname=xfdesktop
 pkgver=4.4.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A desktop manager for Xfce"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -15,19 +15,20 @@
 replaces=('xfce4-menueditor')
 options=('!libtool')
 install=${pkgname}.install
-source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2 \
-        ftp://ftp.archlinux.org/other/xfce4-graphics/ArchLinux-xfce4-backdrops.tar.gz)
-md5sums=('694601234e74903d0fccba064f411e0c' 'e353bb20d5a1fd3e37be69a2213f5436')
+source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2
+        ftp://ftp.archlinux.org/other/xfce4-graphics/ArchLinux-xfce4-backdrops.tar.gz
+	memleak.patch)
+md5sums=('694601234e74903d0fccba064f411e0c'
+         'e353bb20d5a1fd3e37be69a2213f5436'
+         '25db1e6f1702709a54288f21304d6dd2')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}/modules/menu
-  wget http://svn.xfce.org/index.cgi/xfce/diff/xfdesktop/branches/xfce_4_4/modules/menu/desktop-menu-dentry.c\?rev1=26634\;rev2=26635\;mime=text\/plain -O x.patch
-  patch -Np0 -i x.patch || return 1
-  rm x.patch
-  cd ../..
+  cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np0 -i ${srcdir}/memleak.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var --disable-static
+    --localstatedir=/var --disable-static || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-  install -D ../ArchLinux.png ${startdir}/pkg/usr/share/xfce4/backdrops/ArchLinux.png
+  make DESTDIR=${startdir}/pkg install || return 1
+  install -m755 -d ${pkgdir}/usr/share/xfce4/backdrops
+  install -m644 ${srcdir}/ArchLinux.png ${startdir}/pkg/usr/share/xfce4/backdrops/ || return 1
 }

Copied: xfdesktop/repos/extra-x86_64/memleak.patch (from rev 5628, xfdesktop/trunk/memleak.patch)
===================================================================
--- extra-x86_64/memleak.patch	                        (rev 0)
+++ extra-x86_64/memleak.patch	2008-07-18 23:59:09 UTC (rev 5629)
@@ -0,0 +1,12 @@
+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);
+     

Modified: extra-x86_64/xfdesktop.install
===================================================================
--- extra-x86_64/xfdesktop.install	2008-07-18 23:58:55 UTC (rev 5628)
+++ extra-x86_64/xfdesktop.install	2008-07-18 23:59:09 UTC (rev 5629)
@@ -1,5 +1,4 @@
 post_install() {
-  update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -8,11 +7,5 @@
 }
 
 post_remove() {
-  update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*