[arch-commits] Commit in libfm/trunk (PKGBUILD hide-lxshortcut.patch libfm.install)

[Balló György]

    Date: Monday, May 12, 2014 @ 21:22:39
  Author: bgyorgy
Revision: 111063

upgpkg: libfm 1.2.0-4

Move udisks to optdepends, hide lxshortcut menu entry, remove from lxde group

Added:
  libfm/trunk/hide-lxshortcut.patch
Modified:
  libfm/trunk/PKGBUILD
  libfm/trunk/libfm.install

-----------------------+
 PKGBUILD              |   22 +++++++++++++++-------
 hide-lxshortcut.patch |   22 ++++++++++++++++++++++
 libfm.install         |    1 -
 3 files changed, 37 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-12 18:55:38 UTC (rev 111062)
+++ PKGBUILD	2014-05-12 19:22:39 UTC (rev 111063)
@@ -6,21 +6,29 @@
 
 pkgname=libfm
 pkgver=1.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Library for file management'
 url='http://pcmanfm.sourceforge.net/'
 arch=('i686' 'x86_64')
 license=('GPL')
-groups=('lxde')
-depends=('gtk2' 'menu-cache' 'udisks' 'desktop-file-utils' 'libexif')
-makedepends=('intltool' 'gtk-doc')
+depends=('gtk2' 'menu-cache' 'desktop-file-utils' 'libexif' 'dbus-glib')
+makedepends=('udisks' 'intltool' 'gtk-doc')
 replaces=('lxshortcut')
 provides=('lxshortcut')
 conflicts=('lxshortcut')
 install=libfm.install
-source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz)
-md5sums=('07d1361bc008db46b0fd4c775f5696de')
+source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz
+        hide-lxshortcut.patch)
+md5sums=('07d1361bc008db46b0fd4c775f5696de'
+         '88d447f4d425f6ae110a0495a5c8dae9')
 
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Hide desktop entry of lxshortcut
+  patch -Np1 -i ../hide-lxshortcut.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr \
@@ -27,7 +35,7 @@
     --sysconfdir=/etc \
     --enable-udisks \
     --with-gnu-ld
-  make LDFLAGS+=' -lgobject-2.0 -lglib-2.0'
+  make
 }
 
 package() {

Added: hide-lxshortcut.patch
===================================================================
--- hide-lxshortcut.patch	                        (rev 0)
+++ hide-lxshortcut.patch	2014-05-12 19:22:39 UTC (rev 111063)
@@ -0,0 +1,22 @@
+From 4d2b79048573dd2fa1dee853230ccc45b1d9c8df Mon Sep 17 00:00:00 2001
+From: Andriy Grytsenko <andrej at rep.kiev.ua>
+Date: Tue, 25 Feb 2014 15:24:59 +0200
+Subject: [PATCH] [LP#1284401]The lxshortcut should not be present in the
+ menus.
+
+---
+ data/lxshortcut.desktop.in |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/lxshortcut.desktop.in b/data/lxshortcut.desktop.in
+index 8ef7bca..f60a63e 100644
+--- a/data/lxshortcut.desktop.in
++++ b/data/lxshortcut.desktop.in
+@@ -8,3 +8,4 @@ Exec=lxshortcut -i %f
+ StartupNotify=true
+ Terminal=false
+ MimeType=application/x-desktop;
++NoDisplay=true;
+-- 
+1.7.10.4
+

Modified: libfm.install
===================================================================
--- libfm.install	2014-05-12 18:55:38 UTC (rev 111062)
+++ libfm.install	2014-05-12 19:22:39 UTC (rev 111063)
@@ -1,7 +1,6 @@
 post_install() {
   update-mime-database /usr/share/mime > /dev/null
   update-desktop-database -q
-  #[ -d /usr/lib/gio/modules ] && gio-querymodules /usr/lib/gio/modules
 }
 
 post_upgrade() {