Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4ac8f034960f17c0f1a4f0059fd07cd661ae19e6
commit 4ac8f034960f17c0f1a4f0059fd07cd661ae19e6 Author: Baste <[email protected]> Date: Wed Apr 10 10:12:11 2013 +0200 gnome-menus-3.8.0-2-x86_64 * Add git.patch diff --git a/source/gnome/gnome-menus/FrugalBuild b/source/gnome/gnome-menus/FrugalBuild index 9315c1c..b2b823f 100644 --- a/source/gnome/gnome-menus/FrugalBuild +++ b/source/gnome/gnome-menus/FrugalBuild @@ -6,7 +6,7 @@ options+=('asneeded') pkgname=gnome-menus pkgver=3.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME menus and menu editor" depends=('gamin>=0.1.9-3' 'python>=2.7') makedepends=('intltool' 'gobject-introspection') @@ -19,9 +19,10 @@ _F_gnome_ext=".tar.xz" _F_gnome_devel="n" Finclude gnome Fconfopts+=" --enable-python --enable-debug=yes" -source+=( frugalware_category.diff) +source+=(git.patch frugalware_category.diff) #source=(${source[@]} gnomemenu.sh Settings-System.directory frugalware_category.diff) sha1sums=('33f700b6fc9caff64f1056ea085a28e1aaaed0bd' \ + '2b1b542cbd39ac0dd7a41446f13676c6b5e8d0aa' \ 'cdd3b5d8cb18d10112468eb8dd5bd894ca14cff7') if [ "$_F_gnome_git" != "n" ]; then unset sha1sums diff --git a/source/gnome/gnome-menus/git.patch b/source/gnome/gnome-menus/git.patch new file mode 100644 index 0000000..2fe2e95 --- /dev/null +++ b/source/gnome/gnome-menus/git.patch @@ -0,0 +1,42 @@ +From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001 +From: Kalev Lember <[email protected]> +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 +--- layout/gnome-applications.menu ++++ 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 + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
