Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=a54c17398bbe36ace3701595c6de6434bcd561a9

commit a54c17398bbe36ace3701595c6de6434bcd561a9
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Mon Feb 7 13:13:10 2011 +0000

gnome-menus-2.91.6-3-i686
*remove useless patch
*use glib schema
*fixes conflict with kde menu

diff --git a/source/gnome/gnome-menus/FrugalBuild 
b/source/gnome/gnome-menus/FrugalBuild
index 1728494..7f0292a 100644
--- a/source/gnome/gnome-menus/FrugalBuild
+++ b/source/gnome/gnome-menus/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=gnome-menus
pkgver=2.91.6
-pkgrel=2
+pkgrel=3
pkgdesc="GNOME menus and menu editor"
depends=('gamin>=0.1.9-3' 'pygtk>=2.22.0')
makedepends=('intltool')
@@ -12,12 +12,15 @@ replaces=('gnome-main-menu')
archs=('i686' 'x86_64' 'ppc')
Finclude gnome
Fconfopts="$Fconfopts --enable-python --enable-debug=yes"
-source=(${source[@]} gnomemenu.sh)
+source=(${source[@]} gnomemenu.sh ignoreKDE.diff)
sha1sums=('fec7528b06c435983efaa8aa7f7eb263484ccd89' \
-          '7c71b08a5a7716a863be30e75d19ff82f8476e61')
+          '7c71b08a5a7716a863be30e75d19ff82f8476e61' \
+          'a129b1bb220060fabd8701fa771c7ac9dcc5cbe2')

build() {
Fbuild
+       #/etc/profile.d/gnomemenu.sh export prefix gnome-
+       Fmv etc/xdg/menus/applications.menu 
etc/xdg/menus/gnome-applications.menu
Fexe /etc/profile.d/gnomemenu.sh
}

diff --git 
a/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch 
b/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch
deleted file mode 100644
index c9fbc1b..0000000
--- a/source/gnome/gnome-menus/gnome-menus-2.18.0-categorize-prefs-menu.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Naur gnome-menus-2.20.0.orig/desktop-directories/Hardware.directory.in 
gnome-menus-2.20.0/desktop-directories/Hardware.directory.in
---- gnome-menus-2.20.0.orig/desktop-directories/Hardware.directory.in  
2007-09-22 00:28:45.000000000 +0200
-+++ gnome-menus-2.20.0/desktop-directories/Hardware.directory.in       
2007-09-22 00:30:05.000000000 +0200
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- _Name=Hardware
- _Comment=Settings for several hardware devices
--Icon=preferences-desktop-peripherals
-+Icon=system
- Type=Directory
- Encoding=UTF-8
---- gnome-menus-2.24.1/layout/settings.menu    2008-10-22 11:15:08.000000000 
+0200
-+++ gnome-menus-2.24.1new/layout/settings.menu 2008-11-18 12:30:50.000000000 
+0100
-@@ -24,15 +24,96 @@
-     <Directory>Settings.directory</Directory>
-     <Include>
-       <And>
--        <Category>Settings</Category>
-+<Category>Settings</Category>
-         <Not>
-           <Or>
-             <Category>System</Category>
-+         <Category>X-GNOME-PersonalSettings</Category><!-- delete category 
move to submenu Frugalware-->
-+           <Category>DesktopSettings</Category><!-- delete category move to 
submenu Frugalware-->
-+           <Category>X-GNOME-NetworkSettings</Category><!-- delete category 
move to submenu Frugalware-->
-+           <Category>HardwareSettings</Category><!-- delete category move to 
submenu Frugalware-->
-+           <Category>X-GNOME-SystemSettings</Category>        <!-- delete 
category move to submenu Frugalware-->
-             <Filename>gnomecc.desktop</Filename>
-           </Or>
-         </Not>
-       </And>
-     </Include>
-+
-+<!-- Begin personal Submenu for Frugalware-->
-+  <Menu>
-+    <Name>Personal</Name>
-+    <Directory>Personal.directory</Directory>
-+    <Include>
-+      <And>
-+        <Category>Settings</Category>
-+        <Category>X-GNOME-PersonalSettings</Category>
-+      </And>
-+    </Include>
-+  </Menu>  <!-- End Personal -->
-+
-+  <!-- Look and Feel submenu -->
-+  <Menu>
-+    <Name>Look and Feel</Name>
-+    <Directory>LookAndFeel.directory</Directory>
-+    <Include>
-+      <And>
-+        <Category>Settings</Category>
-+        <Category>DesktopSettings</Category>
-+      </And>
-+    </Include>
-+    </Menu> <!-- End Look and Feel -->
-+
-+  <!-- Internet and Network submenu -->
-+  <Menu>
-+    <Name>Internet and Network</Name>
-+    <Directory>InternetAndNetwork.directory</Directory>
-+    <Include>
-+      <And>
-+        <Category>Settings</Category>
-+        <Category>X-GNOME-NetworkSettings</Category>
-+      </And>
-+    </Include>
-+  </Menu> <!-- End Internet and Network -->
-+
-+  <!-- Hardware submenu -->
-+  <Menu>
-+    <Name>Hardware</Name>
-+    <Directory>Hardware.directory</Directory>
-+    <Include>
-+      <And>
-+        <Category>Settings</Category>
-+        <Category>HardwareSettings</Category>
-+      </And>
-+    </Include>
-+  </Menu> <!-- End Hardware -->
-+
-+  <!-- System submenu -->
-+  <Menu>
-+    <Name>System</Name>
-+    <Directory>System.directory</Directory>
-+    <Include>
-+      <And>
-+        <Category>Settings</Category>
-+        <Or>
-+          <Category>X-GNOME-SystemSettings</Category>
-+          <And>
-+            <Category>System</Category>
-+            <Not>
-+              <Or>
-+                <Category>X-GNOME-PersonalSettings</Category>
-+                <Category>DesktopSettings</Category>
-+                <Category>HardwareSettings</Category>
-+                <Category>X-GNOME-NetworkSettings</Category>
-+              </Or>
-+            </Not>
-+          </And>
-+        </Or>
-+      </And>
-+    </Include>
-+  </Menu>
-+<!-- End System for Frugalware-->
-+
-+
-   </Menu>
-
-   <!-- System Settings -->
-@@ -45,6 +126,7 @@
-         <Category>System</Category>
-       </And>
-     </Include>
-+
-   </Menu>     <!-- End System Settings -->
-
-   <Layout>
-@@ -54,4 +136,6 @@
-     <Merge type="files"/>
-   </Layout>
-
-+
-+
- </Menu> <!-- End Settings -->
-
diff --git a/source/gnome/gnome-menus/gnome-menus.install 
b/source/gnome/gnome-menus/gnome-menus.install
deleted file mode 100644
index bdc9f18..0000000
--- a/source/gnome/gnome-menus/gnome-menus.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-       #enable icons by default
-
-       gconftool-2 --config-source=xml::/etc/gconf/gconf.xml.defaults \
-               --direct --type boolean --set 
/desktop/gnome/interface/menus_have_icons  true
-}
-
-post_upgrade()
-{
-       post_install
-}
-
-op=$1
-shift
-$op $*
diff --git a/source/gnome/gnome-menus/ignoreKDE.diff 
b/source/gnome/gnome-menus/ignoreKDE.diff
new file mode 100644
index 0000000..6dd75f5
--- /dev/null
+++ b/source/gnome/gnome-menus/ignoreKDE.diff
@@ -0,0 +1,23 @@
+--- layout/applications.menu.orig      2007-09-21 17:51:43.000000000 +0300
++++ layout/applications.menu   2007-09-21 17:55:38.000000000 +0300
+@@ -146,6 +146,19 @@
+         <Not><Category>Core</Category></Not>
+         <Not><Category>Settings</Category></Not>
+         <Not><Category>Screensaver</Category></Not>
++        <Not><Category>X-KDE-settings-accessibility</Category></Not>
++        <Not><Category>X-KDE-settings-components</Category></Not>
++        <Not><Category>X-KDE-settings-desktop</Category></Not>
++        <Not><Category>X-KDE-settings-looknfeel</Category></Not>
++        <Not><Category>X-KDE-settings-network</Category></Not>
++        <Not><Category>X-KDE-settings-webbrowsing</Category></Not>
++        <Not><Category>X-KDE-settings-peripherals</Category></Not>
++        <Not><Category>X-KDE-settings-hardware</Category></Not>
++        <Not><Category>X-KDE-settings-power</Category></Not>
++        <Not><Category>X-KDE-settings-security</Category></Not>
++        <Not><Category>X-KDE-settings-sound</Category></Not>
++        <Not><Category>X-KDE-settings-system</Category></Not>
++        <Not><Category>X-KDE-information</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Other -->
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to