[arch-commits] Commit in xfdesktop/repos (10 files)

Evangelos Foutras foutrelis at archlinux.org
Mon Nov 17 14:47:53 UTC 2014


    Date: Monday, November 17, 2014 @ 15:47:53
  Author: foutrelis
Revision: 226347

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xfdesktop/repos/extra-i686/0001-Default-application-not-respected-with-glib-2.41-Bug.patch
    (from rev 226346, xfdesktop/trunk/0001-Default-application-not-respected-with-glib-2.41-Bug.patch)
  xfdesktop/repos/extra-i686/PKGBUILD
    (from rev 226346, xfdesktop/trunk/PKGBUILD)
  xfdesktop/repos/extra-i686/xfdesktop.install
    (from rev 226346, xfdesktop/trunk/xfdesktop.install)
  xfdesktop/repos/extra-x86_64/0001-Default-application-not-respected-with-glib-2.41-Bug.patch
    (from rev 226346, xfdesktop/trunk/0001-Default-application-not-respected-with-glib-2.41-Bug.patch)
  xfdesktop/repos/extra-x86_64/PKGBUILD
    (from rev 226346, xfdesktop/trunk/PKGBUILD)
  xfdesktop/repos/extra-x86_64/xfdesktop.install
    (from rev 226346, xfdesktop/trunk/xfdesktop.install)
Deleted:
  xfdesktop/repos/extra-i686/PKGBUILD
  xfdesktop/repos/extra-i686/xfdesktop.install
  xfdesktop/repos/extra-x86_64/PKGBUILD
  xfdesktop/repos/extra-x86_64/xfdesktop.install

------------------------------------------------------------------------------+
 /PKGBUILD                                                                    |  102 ++++++++++
 /xfdesktop.install                                                           |   26 ++
 extra-i686/0001-Default-application-not-respected-with-glib-2.41-Bug.patch   |   50 ++++
 extra-i686/PKGBUILD                                                          |   42 ----
 extra-i686/xfdesktop.install                                                 |   13 -
 extra-x86_64/0001-Default-application-not-respected-with-glib-2.41-Bug.patch |   50 ++++
 extra-x86_64/PKGBUILD                                                        |   42 ----
 extra-x86_64/xfdesktop.install                                               |   13 -
 8 files changed, 228 insertions(+), 110 deletions(-)

Copied: xfdesktop/repos/extra-i686/0001-Default-application-not-respected-with-glib-2.41-Bug.patch (from rev 226346, xfdesktop/trunk/0001-Default-application-not-respected-with-glib-2.41-Bug.patch)
===================================================================
--- extra-i686/0001-Default-application-not-respected-with-glib-2.41-Bug.patch	                        (rev 0)
+++ extra-i686/0001-Default-application-not-respected-with-glib-2.41-Bug.patch	2014-11-17 14:47:53 UTC (rev 226347)
@@ -0,0 +1,50 @@
+From a4d701b2836724f101d319c11205fa03201134fb Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel at gmail.com>
+Date: Sun, 16 Nov 2014 16:35:26 +0300
+Subject: [PATCH] Default application not respected with glib >= 2.41 (Bug
+ #11306)
+
+Ensure xfdesktop's right click menu has the default
+application as the first element of the returned list. This is
+just a copy of Thunar's patch adapted for xfdesktop. See:
+https://bugzilla.xfce.org/show_bug.cgi?id=11212 and
+http://git.xfce.org/xfce/thunar/commit/?id=4b142af9dfe19f90ffe5529e2f099dc55298ecef
+---
+ src/xfdesktop-file-icon-manager.c | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
+index 3d02d51..ccfd91e 100644
+--- a/src/xfdesktop-file-icon-manager.c
++++ b/src/xfdesktop-file-icon-manager.c
+@@ -1539,7 +1539,26 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop,
+                 
+                 app_infos = g_app_info_get_all_for_type(g_file_info_get_content_type(info));
+                 if(app_infos) {
+-                    GAppInfo *app_info = G_APP_INFO(app_infos->data);
++                    GAppInfo *app_info, *default_application;
++                    GList *ap;
++
++                    /* move any default application in front of the list */
++                    default_application = g_app_info_get_default_for_type (g_file_info_get_content_type(info), FALSE);
++                    if (G_LIKELY (default_application != NULL))
++                    {
++                        for (ap = app_infos; ap != NULL; ap = ap->next)
++                        {
++                            if (g_app_info_equal (ap->data, default_application))
++                            {
++                                g_object_unref (ap->data);
++                                app_infos = g_list_delete_link (app_infos, ap);
++                                break;
++                            }
++                        }
++                        app_infos = g_list_prepend (app_infos, default_application);
++                    }
++
++                    app_info = G_APP_INFO(app_infos->data);
+                     
+                     mi = xfdesktop_menu_item_from_app_info(fmanager, file_icon,
+                                                            app_info, TRUE, TRUE);
+-- 
+2.1.3
+

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-11-17 14:47:37 UTC (rev 226346)
+++ extra-i686/PKGBUILD	2014-11-17 14:47:53 UTC (rev 226347)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfdesktop
-pkgver=4.10.3
-pkgrel=1
-pkgdesc="A desktop manager for Xfce"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('libxfce4ui' 'thunar' 'garcon' 'hicolor-icon-theme' 'libwnck')
-makedepends=('intltool')
-conflicts=('xfce4-menueditor')
-replaces=('xfce4-menueditor')
-install=xfdesktop.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('09ca2ba554d8b724b4bbb34b6fb3523de36b556efa4f28ecd802c9c5ba3272ce')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib \
-    --localstatedir=/var \
-    --disable-static \
-    --enable-gio-unix \
-    --enable-thunarx \
-    --enable-notifications \
-    --disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: xfdesktop/repos/extra-i686/PKGBUILD (from rev 226346, xfdesktop/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-11-17 14:47:53 UTC (rev 226347)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfdesktop
+pkgver=4.10.3
+pkgrel=2
+pkgdesc="A desktop manager for Xfce"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'thunar' 'garcon' 'hicolor-icon-theme' 'libwnck')
+makedepends=('intltool')
+conflicts=('xfce4-menueditor')
+replaces=('xfce4-menueditor')
+install=xfdesktop.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
+        0001-Default-application-not-respected-with-glib-2.41-Bug.patch)
+sha256sums=('09ca2ba554d8b724b4bbb34b6fb3523de36b556efa4f28ecd802c9c5ba3272ce'
+            '0dc0be760c2e36f50c42fd58bbbc8b0a6e3feedcfcb303db333b35459e4d1c59')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # https://bugzilla.xfce.org/show_bug.cgi?id=11306
+  patch -Np1 -i ../0001-Default-application-not-respected-with-glib-2.41-Bug.patch
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-gio-unix \
+    --enable-thunarx \
+    --enable-notifications \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-i686/xfdesktop.install
===================================================================
--- extra-i686/xfdesktop.install	2014-11-17 14:47:37 UTC (rev 226346)
+++ extra-i686/xfdesktop.install	2014-11-17 14:47:53 UTC (rev 226347)
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: xfdesktop/repos/extra-i686/xfdesktop.install (from rev 226346, xfdesktop/trunk/xfdesktop.install)
===================================================================
--- extra-i686/xfdesktop.install	                        (rev 0)
+++ extra-i686/xfdesktop.install	2014-11-17 14:47:53 UTC (rev 226347)
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: xfdesktop/repos/extra-x86_64/0001-Default-application-not-respected-with-glib-2.41-Bug.patch (from rev 226346, xfdesktop/trunk/0001-Default-application-not-respected-with-glib-2.41-Bug.patch)
===================================================================
--- extra-x86_64/0001-Default-application-not-respected-with-glib-2.41-Bug.patch	                        (rev 0)
+++ extra-x86_64/0001-Default-application-not-respected-with-glib-2.41-Bug.patch	2014-11-17 14:47:53 UTC (rev 226347)
@@ -0,0 +1,50 @@
+From a4d701b2836724f101d319c11205fa03201134fb Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel at gmail.com>
+Date: Sun, 16 Nov 2014 16:35:26 +0300
+Subject: [PATCH] Default application not respected with glib >= 2.41 (Bug
+ #11306)
+
+Ensure xfdesktop's right click menu has the default
+application as the first element of the returned list. This is
+just a copy of Thunar's patch adapted for xfdesktop. See:
+https://bugzilla.xfce.org/show_bug.cgi?id=11212 and
+http://git.xfce.org/xfce/thunar/commit/?id=4b142af9dfe19f90ffe5529e2f099dc55298ecef
+---
+ src/xfdesktop-file-icon-manager.c | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
+index 3d02d51..ccfd91e 100644
+--- a/src/xfdesktop-file-icon-manager.c
++++ b/src/xfdesktop-file-icon-manager.c
+@@ -1539,7 +1539,26 @@ xfdesktop_file_icon_manager_populate_context_menu(XfceDesktop *desktop,
+                 
+                 app_infos = g_app_info_get_all_for_type(g_file_info_get_content_type(info));
+                 if(app_infos) {
+-                    GAppInfo *app_info = G_APP_INFO(app_infos->data);
++                    GAppInfo *app_info, *default_application;
++                    GList *ap;
++
++                    /* move any default application in front of the list */
++                    default_application = g_app_info_get_default_for_type (g_file_info_get_content_type(info), FALSE);
++                    if (G_LIKELY (default_application != NULL))
++                    {
++                        for (ap = app_infos; ap != NULL; ap = ap->next)
++                        {
++                            if (g_app_info_equal (ap->data, default_application))
++                            {
++                                g_object_unref (ap->data);
++                                app_infos = g_list_delete_link (app_infos, ap);
++                                break;
++                            }
++                        }
++                        app_infos = g_list_prepend (app_infos, default_application);
++                    }
++
++                    app_info = G_APP_INFO(app_infos->data);
+                     
+                     mi = xfdesktop_menu_item_from_app_info(fmanager, file_icon,
+                                                            app_info, TRUE, TRUE);
+-- 
+2.1.3
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2014-11-17 14:47:37 UTC (rev 226346)
+++ extra-x86_64/PKGBUILD	2014-11-17 14:47:53 UTC (rev 226347)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfdesktop
-pkgver=4.10.3
-pkgrel=1
-pkgdesc="A desktop manager for Xfce"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('libxfce4ui' 'thunar' 'garcon' 'hicolor-icon-theme' 'libwnck')
-makedepends=('intltool')
-conflicts=('xfce4-menueditor')
-replaces=('xfce4-menueditor')
-install=xfdesktop.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('09ca2ba554d8b724b4bbb34b6fb3523de36b556efa4f28ecd802c9c5ba3272ce')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib \
-    --localstatedir=/var \
-    --disable-static \
-    --enable-gio-unix \
-    --enable-thunarx \
-    --enable-notifications \
-    --disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: xfdesktop/repos/extra-x86_64/PKGBUILD (from rev 226346, xfdesktop/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-11-17 14:47:53 UTC (rev 226347)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfdesktop
+pkgver=4.10.3
+pkgrel=2
+pkgdesc="A desktop manager for Xfce"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'thunar' 'garcon' 'hicolor-icon-theme' 'libwnck')
+makedepends=('intltool')
+conflicts=('xfce4-menueditor')
+replaces=('xfce4-menueditor')
+install=xfdesktop.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
+        0001-Default-application-not-respected-with-glib-2.41-Bug.patch)
+sha256sums=('09ca2ba554d8b724b4bbb34b6fb3523de36b556efa4f28ecd802c9c5ba3272ce'
+            '0dc0be760c2e36f50c42fd58bbbc8b0a6e3feedcfcb303db333b35459e4d1c59')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # https://bugzilla.xfce.org/show_bug.cgi?id=11306
+  patch -Np1 -i ../0001-Default-application-not-respected-with-glib-2.41-Bug.patch
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-gio-unix \
+    --enable-thunarx \
+    --enable-notifications \
+    --disable-debug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-x86_64/xfdesktop.install
===================================================================
--- extra-x86_64/xfdesktop.install	2014-11-17 14:47:37 UTC (rev 226346)
+++ extra-x86_64/xfdesktop.install	2014-11-17 14:47:53 UTC (rev 226347)
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: xfdesktop/repos/extra-x86_64/xfdesktop.install (from rev 226346, xfdesktop/trunk/xfdesktop.install)
===================================================================
--- extra-x86_64/xfdesktop.install	                        (rev 0)
+++ extra-x86_64/xfdesktop.install	2014-11-17 14:47:53 UTC (rev 226347)
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:


More information about the arch-commits mailing list