summaryrefslogtreecommitdiff
path: root/extra/gnome-menus
diff options
context:
space:
mode:
Diffstat (limited to 'extra/gnome-menus')
-rw-r--r--extra/gnome-menus/PKGBUILD23
-rw-r--r--extra/gnome-menus/calculator.patch41
-rw-r--r--extra/gnome-menus/menus.patch25
3 files changed, 50 insertions, 39 deletions
diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD
index 09763771a..482a14cce 100644
--- a/extra/gnome-menus/PKGBUILD
+++ b/extra/gnome-menus/PKGBUILD
@@ -1,27 +1,25 @@
-# $Id: PKGBUILD 175187 2013-01-16 10:52:05Z jgc $
+# $Id: PKGBUILD 183388 2013-04-21 22:10:05Z heftig $
# Maintainer: Jan de Groot <jan@archlinux.org>
pkgname=gnome-menus
-pkgver=3.6.2
-pkgrel=1
+pkgver=3.8.0
+pkgrel=2
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')
+ calculator.patch)
+sha256sums=('33c215ae8d815f4a94d2dbfc8c6679fddbbf8026d30da55a350e67ea940ce14f'
+ 'e2b17562cd48794075b6bff98cec1fc8ff817728bcea40834144c699cd8680c8')
build() {
cd "$pkgname-$pkgver"
-
- patch -Np0 -i "$srcdir/menus.patch"
-
- PYTHON=/usr/bin/python2 ./configure \
+ patch -Np1 -i ../calculator.patch
+ ./configure \
--prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static
make
@@ -30,7 +28,4 @@ build() {
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"
}
diff --git a/extra/gnome-menus/calculator.patch b/extra/gnome-menus/calculator.patch
new file mode 100644
index 000000000..9ff1ed261
--- /dev/null
+++ b/extra/gnome-menus/calculator.patch
@@ -0,0 +1,41 @@
+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
diff --git a/extra/gnome-menus/menus.patch b/extra/gnome-menus/menus.patch
deleted file mode 100644
index bf73e86cd..000000000
--- a/extra/gnome-menus/menus.patch
+++ /dev/null
@@ -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>