From 3a0ad5dc35d5cff379cdfc736b9cae856416fe6a Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 8 Oct 2013 02:34:09 -0700
Subject: Tue Oct  8 02:32:53 PDT 2013

---
 extra/gnome-menus/PKGBUILD         | 13 +++++-------
 extra/gnome-menus/calculator.patch | 41 --------------------------------------
 2 files changed, 5 insertions(+), 49 deletions(-)
 delete mode 100644 extra/gnome-menus/calculator.patch

(limited to 'extra/gnome-menus')

diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD
index 482a14cce..81497af6f 100644
--- a/extra/gnome-menus/PKGBUILD
+++ b/extra/gnome-menus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183388 2013-04-21 22:10:05Z heftig $
+# $Id: PKGBUILD 196156 2013-10-07 12:17:09Z jgc $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-menus
-pkgver=3.8.0
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="GNOME menu specifications"
 arch=('i686' 'x86_64')
 depends=('glib2')
@@ -11,14 +11,11 @@ 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
-        calculator.patch)
-sha256sums=('33c215ae8d815f4a94d2dbfc8c6679fddbbf8026d30da55a350e67ea940ce14f'
-            'e2b17562cd48794075b6bff98cec1fc8ff817728bcea40834144c699cd8680c8')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('713a58ff9e3264be70dd233c2935cfce4ee76223c17044ecbf6cb53eba875192')
 
 build() {
   cd "$pkgname-$pkgver"
-  patch -Np1 -i ../calculator.patch
   ./configure \
       --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var  --disable-static
diff --git a/extra/gnome-menus/calculator.patch b/extra/gnome-menus/calculator.patch
deleted file mode 100644
index 9ff1ed261..000000000
--- a/extra/gnome-menus/calculator.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember@gmail.com>
-Date: Thu, 28 Mar 2013 21:54:34 +0000
-Subject: Adapt for gnome-calculator -> gcalctool desktop file rename
-
-gnome-calculator.desktop was renamed back to gcalctool.desktop, at the
-very last minute before the 3.8.0 release.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=696816
----
-diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
-index 84d13ed..503f9ca 100644
---- a/layout/gnome-applications.menu
-+++ b/layout/gnome-applications.menu
-@@ -38,7 +38,6 @@
-         <Not><Filename>file-roller.desktop</Filename></Not>
-         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
-         <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
--        <Not><Filename>gnome-calculator.desktop</Filename></Not>
-         <Not><Filename>gcalctool.desktop</Filename></Not>
-         <Not><Filename>gucharmap.desktop</Filename></Not>
-         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
-@@ -251,7 +250,7 @@
-     <Directory>X-GNOME-Utilities.directory</Directory>
-     <Include>
-       <Filename>file-roller.desktop</Filename>
--      <Filename>gnome-calculator.desktop</Filename>
-+      <Filename>gcalctool.desktop</Filename>
-       <Filename>gnome-font-viewer.desktop</Filename>
-       <Filename>gucharmap.desktop</Filename>
-       <Filename>seahorse.desktop</Filename>
-@@ -287,7 +286,6 @@
-         <Not><Filename>gnome-eog.desktop</Filename></Not>
-         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
-         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
--        <Not><Filename>gcalctool.desktop</Filename></Not>
-       </And>
-     </Include>
-   </Menu> <!-- End Other -->
---
-cgit v0.9.1
-- 
cgit v1.2.3-54-g00ecf