Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=111a4e04caf4775398a599e39bafe9a3a33e121e
commit 111a4e04caf4775398a599e39bafe9a3a33e121e
Author: Devil505 <devil505li...@gmail.com>
Date: Tue Sep 13 19:33:25 2011 +0200
xfdesktop-4.8.3-1-i686
* version bump
* removed useless patch
diff --git a/source/xfce4/xfdesktop/FrugalBuild
b/source/xfce4/xfdesktop/FrugalBuild
index fe10bf7..de38ac4 100644
--- a/source/xfce4/xfdesktop/FrugalBuild
+++ b/source/xfce4/xfdesktop/FrugalBuild
@@ -3,8 +3,8 @@
# Contributor: Priyank Gosalia <priyan...@gmail.com>
pkgname=xfdesktop
-pkgver=4.8.2
-pkgrel=3
+pkgver=4.8.3
+pkgrel=1
pkgdesc="A desktop manager for Xfce4."
depends=('libxml2' 'libxfce4ui>=4.8.0-2' 'xfconf>=4.8.0' \
'dbus' 'thunar>=1.2.0' 'libexo>=0.6.0' 'libglade>=2.6.4-3' \
@@ -15,13 +15,11 @@ archs=('i686' 'x86_64' 'ppc')
_F_gnome_iconcache=y
Finclude xfce4 gnome-scriptlet
#source=(${source[@]} xfce4-fw.png)
-sha1sums=('fe7d71bb502197b0353b952947826a5a50ab13bc' \
- '5cc04b415cf32353333106fb200244765f86b844' \
- '7a59780acf303dabacc7425bb32ee6fd14677f78')
+sha1sums=('b3af72a69627f860f22b37d021efd81e4e37eb55' \
+ '5cc04b415cf32353333106fb200244765f86b844')
## bug fix release
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2
xfce4-fw.png \
- fix-desktop-drag-and-drop.patch)
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2
xfce4-fw.png)
build()
{
diff --git a/source/xfce4/xfdesktop/fix-desktop-drag-and-drop.patch
b/source/xfce4/xfdesktop/fix-desktop-drag-and-drop.patch
deleted file mode 100644
index 8c0c4bc..0000000
--- a/source/xfce4/xfdesktop/fix-desktop-drag-and-drop.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/src/xfdesktop-file-icon-manager.c
b/src/xfdesktop-file-icon-manager.c
-index 2711646..d3ca2eb 100644
---- a/src/xfdesktop-file-icon-manager.c
-+++ b/src/xfdesktop-file-icon-manager.c
-@@ -2794,7 +2794,7 @@
xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager
- GFile *tfile = NULL;
- gboolean copy_only = TRUE, drop_ok = FALSE;
- GList *file_list;
--
-+
- if(info == TARGET_XDND_DIRECT_SAVE0) {
- /* we don't suppose XdndDirectSave stage 3, result F, i.e., the app
- * has to save the data itself given the filename we provided in
-@@ -2816,7 +2816,7 @@
xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager
- /* data is "URL\nTITLE" */
- GFile *source_file = NULL;
- gchar *exo_desktop_item_edit =
g_find_program_in_path("exo-desktop-item-edit");
--
-+
- if(drop_icon) {
- GFileInfo *finfo =
xfdesktop_file_icon_peek_file_info(XFDESKTOP_FILE_ICON(drop_icon));
- if(g_file_info_get_file_type(finfo) == G_FILE_TYPE_DIRECTORY)
-@@ -2911,8 +2911,15 @@
xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager
- gchar *dest_basename = g_file_get_basename(l->data);
-
- if(dest_basename && *dest_basename != '\0') {
-- GFile *dest_file = g_file_get_child(base_dest_file,
dest_basename);
-- dest_file_list = g_list_prepend(dest_file_list,
dest_file);
-+ /* If we copy a file, we need to use the new absolute
filename
-+ * as the destination. If we move, we need to use the
destination
-+ * directory. */
-+ if(copy_only) {
-+ GFile *dest_file =
g_file_get_child(base_dest_file, dest_basename);
-+ dest_file_list = g_list_prepend(dest_file_list,
dest_file);
-+ } else {
-+ dest_file_list = g_list_prepend(dest_file_list,
base_dest_file);
-+ }
- }
-
- g_free(dest_basename);
-@@ -2923,10 +2930,10 @@
xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager
- if(dest_file_list) {
- dest_file_list = g_list_reverse(dest_file_list);
-
-- drop_ok
=xfdesktop_file_utils_transfer_files(context->action,
-- file_list,
--
dest_file_list,
--
fmanager->priv->gscreen);
-+ drop_ok =
xfdesktop_file_utils_transfer_files(context->action,
-+ file_list,
-+
dest_file_list,
-+
fmanager->priv->gscreen);
- }
-
- xfdesktop_file_utils_file_list_free(dest_file_list);
-
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
