[arch-commits] Commit in gnome-menus/trunk (PKGBUILD menus.patch)

[Jan Steffens]

    Date: Tuesday, March 8, 2011 @ 04:52:22
  Author: heftig
Revision: 113215

upgpkg: gnome-menus 2.91.91-2
Whoops, readd menus.patch

Added:
  gnome-menus/trunk/menus.patch
Modified:
  gnome-menus/trunk/PKGBUILD

-------------+
 PKGBUILD    |   14 +++++++++-----
 menus.patch |   25 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-08 09:48:54 UTC (rev 113214)
+++ PKGBUILD	2011-03-08 09:52:22 UTC (rev 113215)
@@ -3,7 +3,7 @@
 
 pkgname=gnome-menus
 pkgver=2.91.91
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME menu specifications"
 arch=('i686' 'x86_64')
 depends=('glib2' 'python2')
@@ -11,12 +11,16 @@
 options=('!libtool' '!makeflags')
 license=('GPL' 'LGPL')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('79bd6a2b5ec048d811a39567ea22d623a37daf06f05a9ed0ac340b673a639452')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2
+        menus.patch)
+sha256sums=('79bd6a2b5ec048d811a39567ea22d623a37daf06f05a9ed0ac340b673a639452'
+            'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -Np0 -i "$srcdir/menus.patch"
+
   PYTHON=/usr/bin/python2 ./configure \
       --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var  --disable-static
@@ -27,6 +31,6 @@
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" \
-    $pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py
+  sed -i "1s|#!/usr/bin/env python$|&2|" \
+    "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py"
 }

Added: menus.patch
===================================================================
--- menus.patch	                        (rev 0)
+++ menus.patch	2011-03-08 09:52:22 UTC (rev 113215)
@@ -0,0 +1,25 @@
+--- layout/applications.menu	2005-06-28 10:16:39.000000000 +0200
++++ layout/applications.menu	2005-09-12 23:21:20.000000000 +0200
+@@ -7,7 +7,6 @@
+   <Directory>Applications.directory</Directory>
+ 
+   <!-- Scan legacy dirs first, as later items take priority -->
+-  <KDELegacyDirs/>
+   <LegacyDir>/etc/X11/applnk</LegacyDir>
+   <LegacyDir>/usr/share/gnome/apps</LegacyDir>
+ 
+@@ -18,6 +17,14 @@
+   <!-- Read in overrides and child menus from applications-merged/ -->
+   <DefaultMergeDirs/>
+ 
++  <!-- Archlinux submenu -->
++  <Menu>
++    <Name>Archlinux</Name>
++    <Directory>Archlinux.directory</Directory>
++    <Include>
++      <Category>Archlinux</Category>
++    </Include>
++  </Menu> <!-- End Archlinux -->
+   <!-- Accessories submenu -->
+   <Menu>
+     <Name>Accessories</Name>