[arch-commits] Commit in xfdesktop/trunk (4 files)

Jan de Groot jgc at archlinux.org
Fri Jul 18 19:58:56 EDT 2008


    Date: Friday, July 18, 2008 @ 19:58:55
  Author: jgc
Revision: 5628

upgpkg: xfdesktop 4.4.2-3
    Remove dependency on desktop-file-utils - not needed

Added:
  xfdesktop/trunk/memleak.patch
Modified:
  xfdesktop/trunk/PKGBUILD
  xfdesktop/trunk/xfdesktop.install
Deleted:
  xfdesktop/trunk/xfce-registered-categories.xml.it.fix_segfault.diff

-----------------------------------------------------+
 PKGBUILD                                            |   25 -
 memleak.patch                                       |   12 
 xfce-registered-categories.xml.it.fix_segfault.diff |  340 ------------------
 xfdesktop.install                                   |    7 
 4 files changed, 25 insertions(+), 359 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-18 23:50:58 UTC (rev 5627)
+++ PKGBUILD	2008-07-18 23:58:55 UTC (rev 5628)
@@ -3,7 +3,7 @@
 
 pkgname=xfdesktop
 pkgver=4.4.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A desktop manager for Xfce"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -15,19 +15,20 @@
 replaces=('xfce4-menueditor')
 options=('!libtool')
 install=${pkgname}.install
-source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2 \
-        ftp://ftp.archlinux.org/other/xfce4-graphics/ArchLinux-xfce4-backdrops.tar.gz)
-md5sums=('694601234e74903d0fccba064f411e0c' 'e353bb20d5a1fd3e37be69a2213f5436')
+source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2
+        ftp://ftp.archlinux.org/other/xfce4-graphics/ArchLinux-xfce4-backdrops.tar.gz
+	memleak.patch)
+md5sums=('694601234e74903d0fccba064f411e0c'
+         'e353bb20d5a1fd3e37be69a2213f5436'
+         '25db1e6f1702709a54288f21304d6dd2')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}/modules/menu
-  wget http://svn.xfce.org/index.cgi/xfce/diff/xfdesktop/branches/xfce_4_4/modules/menu/desktop-menu-dentry.c\?rev1=26634\;rev2=26635\;mime=text\/plain -O x.patch
-  patch -Np0 -i x.patch || return 1
-  rm x.patch
-  cd ../..
+  cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np0 -i ${srcdir}/memleak.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var --disable-static
+    --localstatedir=/var --disable-static || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-  install -D ../ArchLinux.png ${startdir}/pkg/usr/share/xfce4/backdrops/ArchLinux.png
+  make DESTDIR=${startdir}/pkg install || return 1
+  install -m755 -d ${pkgdir}/usr/share/xfce4/backdrops
+  install -m644 ${srcdir}/ArchLinux.png ${startdir}/pkg/usr/share/xfce4/backdrops/ || return 1
 }

Added: memleak.patch
===================================================================
--- memleak.patch	                        (rev 0)
+++ memleak.patch	2008-07-18 23:58:55 UTC (rev 5628)
@@ -0,0 +1,12 @@
+Index: desktop-menu-dentry.c
+===================================================================
+--- modules/menu/desktop-menu-dentry.c	(revision 26634)
++++ modules/menu/desktop-menu-dentry.c	(revision 26635)
+@@ -173,6 +173,7 @@
+         if(cmpname && g_ascii_strcasecmp(name, cmpname) < 0)
+             break;
+     }
++    g_list_free(items);
+     
+     gtk_menu_shell_insert(menu_shell, mi, i);
+     

Deleted: xfce-registered-categories.xml.it.fix_segfault.diff
===================================================================
--- xfce-registered-categories.xml.it.fix_segfault.diff	2008-07-18 23:50:58 UTC (rev 5627)
+++ xfce-registered-categories.xml.it.fix_segfault.diff	2008-07-18 23:58:55 UTC (rev 5628)
@@ -1,340 +0,0 @@
---- modules/menu/xfce-registered-categories.xml.it	2007-04-06 20:29:54.000000000 +0000
-+++ modules/menu/xfce-registered-categories.xml.it.new	2007-04-18 18:59:46.000000000 +0000
-@@ -332,337 +332,3 @@
- 	<category name="WineX" replace="Wine" toplevel="true" builtin-icon="WINE" />
- 	<category name="CrossOver" replace="Wine" toplevel="true" builtin-icon="WINE" />
- </xfce-registered-categories>
--<?xml version="1.0" encoding="UTF-8"?>
--<!DOCTYPE xfce-registered-categories>
--
--<!-- Note: You can copy this file to ~/.config/xfce4/desktop/ for customisation. -->
--
--<!--
--	Here is how this file works:
--
--	<xfce-registered-categories> - root element, required.
--
--	<category>
--		name:  Required.  Corresponds to an official category from the
--		  freedesktop.org menu spec.
--		replace: Optional.  Name that is displayed as the menu name for items
--		  in the category (useful, e.g., for translations).
--		icon: icon to be displayed for this category (actually, for the menu
--		  item referenced by this category's 'replace' attribute)
--		toplevel: Optional.  Marks categories as being "allowed" to be toplevel
--		  menus.  Note: if a category is unrooted, it will be promoted to
--		  toplevel regardless of the value of this attribute. (default: false)
--		ignore: Optional.  This category will be ignored when organising menu
--		  items. (default: false)
--		hide: Optional.  Items referencing this category will not appear in any
--			menu. (default: false)
--
--	<subcategory> - sub-element of <category>, specifies a subcategory relation
--		name: Required.  Corresponds to an official category from the
--		  freedesktop.org menu spec.
--	  Example:
--	  <category name="Graphics">
--		  <subcategory name="RasterGraphics">
--	  </category>
--	  Note that even if subcategories are definied, it is possible to collapse
--	  all subcategories into a flat one-level menu by specifying style="simple"
--	  in the <include> tag in your menu.xml file.
---->
--
--<xfce-registered-categories>
--	<category name="Legacy" toplevel="true" replace="Accessori" builtin-icon="ACCESSORIES" />
--	<category name="Core" toplevel="true" replace="Accessori" builtin-icon="ACCESSORIES" />
--	<category name="Development" toplevel="true" replace="Sviluppo" builtin-icon="DEVELOPMENT">
--		<subcategory name="Building" />
--		<subcategory name="Debugger" />
--		<subcategory name="IDE" />
--		<subcategory name="GUIDesigner" />
--		<subcategory name="Profiling" />
--		<subcategory name="RevisionControl" />
--		<subcategory name="Translation" />
--		<subcategory name="ProjectManagement" />
--		<subcategory name="WebDevelopment" />
--	</category>
--	<category name="Building" builtin-icon="DEVELOPMENT" />
--	<category name="Debugger" replace="Strumenti di debug" builtin-icon="DEVELOPMENT" />
--	<category name="IDE" replace="Ambienti" builtin-icon="DEVELOPMENT" />
--	<category name="GUIDesigner" replace="Disegnatori GUI" builtin-icon="DEVELOPMENT" />
--	<category name="Profiling" builtin-icon="DEVELOPMENT" />
--	<category name="RevisionControl" replace="Controllo revisioni" builtin-icon="DEVELOPMENT" />
--	<category name="Translation" replace="Traduzioni" builtin-icon="DEVELOPMENT" />
--	<category name="Office" toplevel="true" replace="Ufficio" builtin-icon="OFFICE">
--		<subcategory name="Calendar" />
--		<subcategory name="ContactManagement" />
--		<subcategory name="Database" />
--		<subcategory name="Dictionary" />
--		<subcategory name="Chart" />
--		<subcategory name="Email" />
--		<subcategory name="Finance" />
--		<subcategory name="FlowChart" />
--		<subcategory name="PDA" />
--		<subcategory name="ProjectManagement" />
--		<subcategory name="Presentation" />
--		<subcategory name="Spreadsheet" />
--		<subcategory name="WordProcessor" />
--		<subcategory name="Photograph" />
--		<subcategory name="Viewer" />
--	</category>
--	<category name="Calendar" replace="Agende" builtin-icon="OFFICE" />
--	<category name="ContactManagement" replace="Gestione contatti" builtin-icon="OFFICE" />
--	<category name="Database" builtin-icon="OFFICE" />
--	<category name="Dictionary" replace="Dizionari" builtin-icon="OFFICE" />
--	<category name="Chart" replace="Diagrammmi" builtin-icon="OFFICE" />
--	<category name="Email" replace="Posta elettronica" builtin-icon="OFFICE" />
--	<category name="Finance" replace="Finanza" builtin-icon="OFFICE" />
--	<category name="FlowChart" replace="Diagrammi" builtin-icon="OFFICE" />
--	<category name="PDA" builtin-icon="OFFICE" />
--	<category name="ProjectManagement" replace="Gestione progetti" builtin-icon="OFFICE" />
--	<category name="Presentation" replace="Presentazioni" builtin-icon="OFFICE" />
--	<category name="Spreadsheet" replace="Fogli di calcolo" builtin-icon="OFFICE" />
--	<category name="WordProcessor" replace="Elaborazione testi" builtin-icon="OFFICE" />
--	<category name="Graphics" toplevel="true" replace="Grafica" builtin-icon="GRAPHICS">
--		<subcategory name="2DGraphics" />
--		<subcategory name="3DGraphics" />
--		<subcategory name="Scanning" />
--		<subcategory name="Photograph" />
--		<subcategory name="Viewer" />
--	</category>
--	<category name="2DGraphics" replace="Grafica 2-D" builtin-icon="GRAPHICS">
--		<subcategory name="VectorGraphics" />
--		<subcategory name="RasterGraphics" />
--	</category>
--	<category name="VectorGraphics" replace="Grafica vettoriale" builtin-icon="GRAPHICS" />
--	<category name="RasterGraphics" replace="Grafica Raster" builtin-icon="GRAPHICS" />
--	<category name="3DGraphics" replace="Grafica 3-D" builtin-icon="GRAPHICS" />
--	<category name="Scanning" replace="Scansione" builtin-icon="GRAPHICS">
--		<subcategory name="OCR" />
--	</category>
--	<category name="OCR" builtin-icon="GRAPHICS" />
--	<category name="Photograph" replace="Fotografia" builtin-icon="GRAPHICS" />
--	<category name="Viewer" replace="Visualizzatori" builtin-icon="GRAPHICS" />
--	<category name="Settings" toplevel="true" replace="Impostazioni" builtin-icon="SETTINGS">
--		<subcategory name="DesktopSettings" />
--		<subcategory name="HardwareSettings" />
--		<subcategory name="PackageSettings" />
--		<subcategory name="Security" />
--		<subcategory name="Accessibility" />
--		<subcategory name="Screensaver" />
--	</category>
--	<category name="DesktopSettings" replace="Impostazioni dell'ambiente" builtin-icon="SETTINGS" />
--	<category name="HardwareSettings" replace="Impostazioni dell'hardware" builtin-icon="SETTINGS" />
--	<category name="PackageSettings" replace="Impostazioni dei pacchetti" builtin-icon="SETTINGS" />
--	<category name="Network" toplevel="true" replace="Rete" builtin-icon="NETWORK">
--		<subcategory name="Email" />
--		<subcategory name="Dialup" />
--		<subcategory name="InstantMessaging" />
--		<subcategory name="IRCClient" />
--		<subcategory name="FileTransfer" />
--		<subcategory name="HamRadio" />
--		<subcategory name="News" />
--		<subcategory name="P2P" />
--		<subcategory name="RemoteAccess" />
--		<subcategory name="Telephony" />
--		<subcategory name="WebBrowser" />
--		<subcategory name="WebDevelopment" />
--	</category>
--	<category name="Dialup" builtin-icon="NETWORK" />
--	<category name="InstantMessaging" replace="Messaggistica istantanea" builtin-icon="NETWORK" />
--	<category name="IRCClient" replace="Client IRC" builtin-icon="NETWORK" />
--	<category name="FileTransfer" replace="Trasferimento file" builtin-icon="NETWORK" />
--	<category name="HamRadio" replace="Ham Radio" builtin-icon="NETWORK" />
--	<category name="News" builtin-icon="NETWORK" />
--	<category name="P2P" replace="Peer-to-Peer" builtin-icon="NETWORK" />
--	<category name="RemoteAccess" replace="Accessa remoto" builtin-icon="NETWORK" />
--	<category name="Telephony" replace="Telefonia" builtin-icon="NETWORK" />
--	<category name="WebBrowser" replace="Naviagazione internet" builtin-icon="NETWORK" />
--	<category name="WebDevelopment" replace="Sviluppo web" builtin-icon="NETWORK" />
--	<category name="AudioVideo" replace="Multimedia" toplevel="true" builtin-icon="MULTIMEDIA">
--		<subcategory name="HamRadio" />
--		<subcategory name="Audio" />
--		<subcategory name="Video" />
--		<subcategory name="AudioVideoEditing" />
--		<subcategory name="Player" />
--		<subcategory name="Recorder" />
--		<subcategory name="DiscBurning" />
--	</category>
--	<category name="Audio" builtin-icon="MULTIMEDIA">
--		<subcategory name="Midi" />
--		<subcategory name="Mixer" />
--		<subcategory name="Sequencer" />
--		<subcategory name="Tuner" />
--		<subcategory name="AudioVideoEditing" />
--		<subcategory name="Player" />
--		<subcategory name="Recorder" />
--	</category>
--	<category name="Midi"  builtin-icon="MULTIMEDIA" />
--	<category name="Mixer" replace="Mixer del suono" builtin-icon="MULTIMEDIA" />
--	<category name="Sequencer" replace="Sequencer" builtin-icon="MULTIMEDIA" />
--	<category name="Tuner" replace="Sintonizzatori" builtin-icon="MULTIMEDIA" />
--	<category name="Video" builtin-icon="MULTIMEDIA">
--		<subcategory name="TV" />
--		<subcategory name="AudioVideoEditing" />
--		<subcategory name="Player" />
--		<subcategory name="Recorder" />
--		<subcategory name="Music" />
--	</category>
--	<category name="TV" builtin-icon="MULTIMEDIA" />
--	<category name="AudioVideoEditing" replace="Montaggio" builtin-icon="MULTIMEDIA" />
--	<category name="Player" replace="Riproduttori multimediali" builtin-icon="MULTIMEDIA" />
--	<category name="Recorder" replace="Registratori" builtin-icon="MULTIMEDIA" />
--	<category name="DiscBurning" replace="Masterizzazione CD e DVD" builtin-icon="MULTIMEDIA" />
--	<category name="Game" toplevel="true" replace="Giochi" builtin-icon="GAME">
--		<subcategory name="ActionGame" />
--		<subcategory name="AdventureGame" />
--		<subcategory name="ArcadeGame" />
--		<subcategory name="BoardGame" />
--		<subcategory name="BlocksGame" />
--		<subcategory name="CardGame" />
--		<subcategory name="KidsGame" />
--		<subcategory name="LogicGame" />
--		<subcategory name="RolePlaying" />
--		<subcategory name="Simulation" />
--		<subcategory name="SportsGame" />
--		<subcategory name="StrategyGame" />
--	</category>
--	<category name="ActionGame" replace="Giochi d'azione" builtin-icon="GAME" />
--	<category name="AdventureGame" replace="Giochi d'avventura" builtin-icon="GAME" />
--	<category name="ArcadeGame" replace="Giochi Arcade" builtin-icon="GAME" />
--	<category name="BoardGame" replace="Giochi da tavola" builtin-icon="GAME" />
--	<category name="BlocksGame" replace="Giochi enigmistici" builtin-icon="GAME" />
--	<category name="CardGame" replace="Giochi di carte" builtin-icon="GAME" />
--	<category name="KidsGame" replace="Giochi per bambini" builtin-icon="GAME" />
--	<category name="LogicGame" replace="Giochi di logica" builtin-icon="GAME" />
--	<category name="RolePlaying" replace="Giochi di ruolo" builtin-icon="GAME" />
--	<category name="Simulation" replace="Simulazione" builtin-icon="GAME" />
--	<category name="SportsGame" replace="Giochi di sport" builtin-icon="GAME" />
--	<category name="StrategyGame" replace="Giochi di strategia" builtin-icon="GAME" />
--	<category name="Education" replace="Educazione" toplevel="true">
--		<subcategory name="Art" />
--		<subcategory name="Construction" />
--		<subcategory name="Music" />
--		<subcategory name="Languages" />
--		<subcategory name="Teaching" />
--	</category>
--	<category name="Art" replace="Arte" />
--	<category name="Construction" replace="Costruzione" />
--	<category name="Music" replace="Musica" />
--	<category name="Languages" replace="Lingue" />
--	<category name="Science" replace="Scienza" toplevel="true">
--		<subcategory name="Astronomy" />
--		<subcategory name="Biology" />
--		<subcategory name="Chemistry" />
--		<subcategory name="Geology" />
--		<subcategory name="Math" />
--		<subcategory name="MedicalSoftware" />
--		<subcategory name="Physics" />
--		<subcategory name="Engineering" />
--	</category>
--	<category name="Astronomy" replace="Astronomia" />
--	<category name="Biology" replace="Biologia" />
--	<category name="Chemistry" replace="Chimica" />
--	<category name="Geology" replace="Geometri" />
--	<category name="Math" replace="Matematica" />
--	<category name="MedicalSoftware" replace="Medicina" />
--	<category name="Physics" replace="Fisica" />
--	<category name="Teaching" replace="Insegnamento" />
--	<category name="Amusement" replace="Giochi" builtin-icon="GAME" />
--	<category name="Applet" replace="Applet" />
--	<category name="Archiving" replace="Archiviazione" />
--	<category name="Electronics" replace="Elettronica" />
--	<category name="Emulator" toplevel="true" replace="Emulazione" builtin-icon="SYSTEM" />
--	<category name="Engineering" replace="Ingegneria" />
--	<category name="FileManager" replace="Gestione file" />
--	<category name="Shell" replace="Shell" />
--	<category name="Screensaver" replace="Salva Schermi" />
--	<category name="TerminalEmulator" replace="Emulatori di terminale" />
--	<category name="TrayIcon" replace="Icone dell'area di notifica" />
--	<category name="System" toplevel="true" replace="Sistema" builtin-icon="SYSTEM">
--		<subcategory name="FileSystem" />
--		<subcategory name="Monitor" />
--		<subcategory name="Security" />
--		<subcategory name="Accessibility" />
--		<subcategory name="TerminalEmulator" />
--		<subcategory name="Shell" />
--	</category>
--	<category name="FileSystem" builtin-icon="SYSTEM" />
--	<category name="Monitor" replace="Monitoraggio" builtin-icon="SYSTEM" />
--	<category name="Security" replace="Sicurezza" builtin-icon="SYSTEM" />
--	<category name="Utility" toplevel="true" replace="Accessori" builtin-icon="ACCESSORIES">
--		<subcategory name="Accessibility" />
--		<subcategory name="Calculator" />
--		<subcategory name="Clock" />
--		<subcategory name="TextEditor" />
--		<subcategory name="Archiving" />
--		<subcategory name="TerminalEmulator" />
--		<subcategory name="FileManager" />
--		<subcategory name="Shell" />
--	</category>
--	<category name="Accessibility" replace="Accessibilità" builtin-icon="UTILITY" />
--	<category name="Calculator" replace="Calcolatrici" builtin-icon="ACCESSORIES" />
--	<category name="Clock" replace="Orologi" builtin-icon="ACCESSORIES" />
--	<category name="TextEditor" replace="Editor di testi" builtin-icon="ACCESSORIES" />
--	<category name="KDE" toplevel="true" ignore="true">
--		<subcategory name="Development" />
--		<subcategory name="Office" />
--		<subcategory name="Graphics" />
--		<subcategory name="Settings" />
--		<subcategory name="Network" />
--		<subcategory name="AudioVideo" />
--		<subcategory name="Game" />
--		<subcategory name="Education" />
--		<subcategory name="Science" />
--		<subcategory name="System" />
--		<subcategory name="Utility" />
--	</category>
--	<category name="GNOME" toplevel="true" ignore="true">
--		<subcategory name="Development" />
--		<subcategory name="Office" />
--		<subcategory name="Graphics" />
--		<subcategory name="Settings" />
--		<subcategory name="Network" />
--		<subcategory name="AudioVideo" />
--		<subcategory name="Game" />
--		<subcategory name="Education" />
--		<subcategory name="Science" />
--		<subcategory name="System" />
--		<subcategory name="Utility" />
--	</category>
--	<category name="GTK" toplevel="true" ignore="true">
--		<subcategory name="GNOME" />
--	</category>
--	<category name="Qt" toplevel="true" ignore="true">
--		<subcategory name="KDE" />
--	</category>
--	<category name="Motif" toplevel="true" ignore="true">
--		<subcategory name="Development" />
--		<subcategory name="Office" />
--		<subcategory name="Graphics" />
--		<subcategory name="Settings" />
--		<subcategory name="Network" />
--		<subcategory name="AudioVideo" />
--		<subcategory name="Game" />
--		<subcategory name="Education" />
--		<subcategory name="Science" />
--		<subcategory name="System" />
--		<subcategory name="Utility" />
--	</category>
--	<category name="Java" toplevel="true" ignore="true">
--		<subcategory name="Applet" />
--	</category>
--	<category name="ConsoleOnly" toplevel="true" replace="Console" ignore="true">
--		<subcategory name="Development" />
--		<subcategory name="Office" />
--		<subcategory name="Graphics" />
--		<subcategory name="Settings" />
--		<subcategory name="Network" />
--		<subcategory name="AudioVideo" />
--		<subcategory name="Game" />
--		<subcategory name="Education" />
--		<subcategory name="Science" />
--		<subcategory name="System" />
--		<subcategory name="Utility" />
--	</category>
--	<category name="Wine" toplevel="true" builtin-icon="WINE" />
--	<category name="WineX" replace="Wine" toplevel="true" builtin-icon="WINE" />
--	<category name="CrossOver" replace="Wine" toplevel="true" builtin-icon="WINE" />
--</xfce-registered-categories>

Modified: xfdesktop.install
===================================================================
--- xfdesktop.install	2008-07-18 23:50:58 UTC (rev 5627)
+++ xfdesktop.install	2008-07-18 23:58:55 UTC (rev 5628)
@@ -1,5 +1,4 @@
 post_install() {
-  update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -8,11 +7,5 @@
 }
 
 post_remove() {
-  update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*





More information about the arch-commits mailing list