Hello community, here is the log from the commit of package xfce4-desktop checked in at Wed Aug 6 01:58:56 CEST 2008. -------- --- xfce4-desktop/xfce4-desktop.changes 2008-04-29 14:33:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/xfce4-desktop/xfce4-desktop.changes 2008-08-01 15:54:52.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Aug 1 14:56:34 CEST 2008 - prusnak@suse.cz + +- fixed relocation and memleak (relocation-and-memleak.patch) +- do not show YaST modules in Xfce menu - workaround for [bnc#393955] + (no-yast-desktop-files.patch) + +------------------------------------------------------------------- +Mon Jul 28 15:09:40 CEST 2008 - prusnak@suse.cz + +- moved /etc/xdg/xfce4/desktop/menu.xml.* to branding subpackage + +------------------------------------------------------------------- New: ---- xfdesktop-no-yast-desktop-files.patch xfdesktop-relocation-and-memleak.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-desktop.spec ++++++ --- /var/tmp/diff_new_pack.e14101/_old 2008-08-06 01:58:32.000000000 +0200 +++ /var/tmp/diff_new_pack.e14101/_new 2008-08-06 01:58:32.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package xfce4-desktop (Version 4.4.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -19,7 +26,7 @@ BuildRequires: thunar-devel Summary: Desktop manager for the Xfce Desktop Environment Version: 4.4.2 -Release: 53 +Release: 87 License: GPL v2 or later Url: http://www.xfce.org/ Source0: xfdesktop-%{version}.tar.bz2 @@ -27,6 +34,8 @@ Patch0: xfce-utils-cpp.patch Patch1: xfdesktop-eject.patch Patch2: xfdesktop-backdrops.patch +Patch3: xfdesktop-relocation-and-memleak.patch +Patch4: xfdesktop-no-yast-desktop-files.patch Group: System/GUI/XFCE BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: gtk2 @@ -73,18 +82,22 @@ %setup -q -n xfdesktop-%{version} -b1 %patch1 %patch2 +%patch3 -p 1 +%patch4 cd ../xfce-utils-%{version} %patch0 %build -%configure --disable-static --with-pic +%configure \ + --disable-static \ + --with-pic make %{?jobs:-j%jobs} cd ../xfce-utils-%{version} %configure \ --enable-gdm \ --with-gdm-prefix=%{_sysconfdir} \ - --with-pic \ - --disable-static + --disable-static \ + --with-pic make %{?jobs:-j%jobs} %install @@ -117,14 +130,25 @@ %{_libdir}/xfce4 %{_libexecdir}/xfce4/panel-plugins/xfce4-menu-plugin %{_mandir}/man1/* -%{_sysconfdir}/xdg/xfce4 +%dir %{_sysconfdir}/xdg/xfce4 +%{_sysconfdir}/xdg/xfce4/Xft.xrdb +%{_sysconfdir}/xdg/xfce4/xinitrc +%dir %{_sysconfdir}/xdg/xfce4/desktop +%{_sysconfdir}/xdg/xfce4/desktop/xfce-registered-categories.xml* %files -n %{name}-branding-upstream %defattr(-,root,root) %dir %{_datadir}/wallpapers %{_datadir}/wallpapers/* +%{_sysconfdir}/xdg/xfce4/desktop/menu.xml* %changelog +* Fri Aug 01 2008 prusnak@suse.cz +- fixed relocation and memleak (relocation-and-memleak.patch) +- do not show YaST modules in Xfce menu - workaround for [bnc#393955] + (no-yast-desktop-files.patch) +* Mon Jul 28 2008 prusnak@suse.cz +- moved /etc/xdg/xfce4/desktop/menu.xml.* to branding subpackage * Tue Apr 29 2008 prusnak@suse.cz - moved backdrops to %%{_datadir}/wallpapers - split upstream backdrops to xfce4-desktop-branding-upstream ++++++ xfce-utils-cpp.patch ++++++ --- /var/tmp/diff_new_pack.e14101/_old 2008-08-06 01:58:32.000000000 +0200 +++ /var/tmp/diff_new_pack.e14101/_new 2008-08-06 01:58:32.000000000 +0200 @@ -1,6 +1,6 @@ --- scripts/xinitrc +++ scripts/xinitrc -@@ -47,7 +47,7 @@ +@@ -48,7 +48,7 @@ test -r "$HOME/.Xresources" && XRESOURCES="$XRESOURCES $HOME/.Xresources" # load all X resources (adds /dev/null to avoid an empty list that would hang the process) ++++++ xfdesktop-no-yast-desktop-files.patch ++++++ --- modules/menu/desktop-menu-dentry.c +++ modules/menu/desktop-menu-dentry.c @@ -525,6 +525,12 @@ //TRACE("dummy"); + // workaround bug https://bugzilla.novell.com/show_bug.cgi?id=393955 + // - skip all desktop files which belong to YaST modules (/usr/share/applications/YaST2/*.desktop) + // - two slashes are intentional because of the way how the path is built + if ( !strncmp(filename, "/usr/share/applications//YaST2/", 31) ) + return FALSE; + dentry = xfce_desktop_entry_new(filename, dentry_keywords, G_N_ELEMENTS(dentry_keywords)); if(dentry) { ++++++ xfdesktop-relocation-and-memleak.patch ++++++ diff -ur xfdesktop-4.4.2.orig/modules/menu/desktop-menu-dentry.c xfdesktop-4.4.2/modules/menu/desktop-menu-dentry.c --- xfdesktop-4.4.2.orig/modules/menu/desktop-menu-dentry.c 2007-11-17 21:31:43.000000000 +0200 +++ xfdesktop-4.4.2/modules/menu/desktop-menu-dentry.c 2008-03-21 11:18:59.000000000 +0200 @@ -173,7 +173,8 @@ if(cmpname && g_ascii_strcasecmp(name, cmpname) < 0) break; } - + g_list_free(items); + gtk_menu_shell_insert(menu_shell, mi, i); return i; diff -ur xfdesktop-4.4.2.orig/modules/menu/desktop-menuspec.c xfdesktop-4.4.2/modules/menu/desktop-menuspec.c --- xfdesktop-4.4.2.orig/modules/menu/desktop-menuspec.c 2007-11-17 21:31:43.000000000 +0200 +++ xfdesktop-4.4.2/modules/menu/desktop-menuspec.c 2008-03-21 11:18:59.000000000 +0200 @@ -203,7 +203,7 @@ else foundcat = NULL; if(!foundcat) { - g_ptr_array_free(revpath, FALSE); + g_ptr_array_free(revpath, TRUE); revpath = NULL; break; } @@ -220,7 +220,7 @@ newpath[totlen] = 0; g_ptr_array_add(mtfpi->paths, newpath); - g_ptr_array_free(revpath, FALSE); + g_ptr_array_free(revpath, TRUE); } } } diff -ur xfdesktop-4.4.2.orig/modules/menu/desktop-menuspec.h xfdesktop-4.4.2/modules/menu/desktop-menuspec.h --- xfdesktop-4.4.2.orig/modules/menu/desktop-menuspec.h 2007-11-17 21:31:43.000000000 +0200 +++ xfdesktop-4.4.2/modules/menu/desktop-menuspec.h 2008-03-21 11:18:56.000000000 +0200 @@ -82,6 +82,6 @@ * @param paths A GPtrArray obtained from either menuspec_get_path_simple() or * menuspec_get_path_multilevel(). */ -G_INLINE_FUNC void desktop_menuspec_path_free(GPtrArray *paths); +void desktop_menuspec_path_free(GPtrArray *paths); #endif /* ifdef __MENUSPEC_H__ */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org