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

[Jan de Groot]

    Date: Tuesday, March 26, 2013 @ 11:42:00
  Author: jgc
Revision: 180784

upgpkg: gnome-menus 3.8.0-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-26 10:32:42 UTC (rev 180783)
+++ PKGBUILD	2013-03-26 10:42:00 UTC (rev 180784)
@@ -2,26 +2,21 @@
 # Maintainer: Jan de Groot <jan at archlinux.org>
 
 pkgname=gnome-menus
-pkgver=3.6.2
+pkgver=3.8.0
 pkgrel=1
 pkgdesc="GNOME menu specifications"
 arch=('i686' 'x86_64')
-depends=('glib2' 'python2-gobject')
+depends=('glib2')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 license=('GPL' 'LGPL')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        menus.patch)
-sha256sums=('f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f'
-            'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('33c215ae8d815f4a94d2dbfc8c6679fddbbf8026d30da55a350e67ea940ce14f')
 
 build() {
   cd "$pkgname-$pkgver"
-
-  patch -Np0 -i "$srcdir/menus.patch"
-
-  PYTHON=/usr/bin/python2 ./configure \
+  ./configure \
       --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var  --disable-static
   make
@@ -30,7 +25,4 @@
 package(){
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-
-  sed -i "1s|#!/usr/bin/env python$|&2|" \
-    "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py"
 }

Deleted: menus.patch
===================================================================
--- menus.patch	2013-03-26 10:32:42 UTC (rev 180783)
+++ menus.patch	2013-03-26 10:42:00 UTC (rev 180784)
@@ -1,25 +0,0 @@
---- 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>