[arch-commits] Commit in lxsession/trunk (PKGBUILD fix-lxsession-db.patch)
Balló György
bgyorgy at archlinux.org
Fri Dec 5 08:38:09 UTC 2014
Date: Friday, December 5, 2014 @ 09:38:08
Author: bgyorgy
Revision: 123470
upgpkg: lxsession 1:0.5.2-1
Update to version 0.5.2
Modified:
lxsession/trunk/PKGBUILD
Deleted:
lxsession/trunk/fix-lxsession-db.patch
------------------------+
PKGBUILD | 21 +++---------------
fix-lxsession-db.patch | 54 -----------------------------------------------
2 files changed, 4 insertions(+), 71 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-12-05 02:42:37 UTC (rev 123469)
+++ PKGBUILD 2014-12-05 08:38:08 UTC (rev 123470)
@@ -4,7 +4,7 @@
# Contributor: Juergen Hoetzel <juergen at archlinux.org>
pkgname=lxsession
-pkgver=0.5.1
+pkgver=0.5.2
pkgrel=1
epoch=1
pkgdesc='Lightweight X11 session manager'
@@ -12,23 +12,13 @@
url="http://lxde.org/"
license=('GPL2')
groups=('lxde')
-depends=('gtk2' 'dbus-glib' 'polkit')
+depends=('dbus-glib' 'gtk2' 'libunique' 'polkit')
makedepends=('intltool' 'docbook-xsl' 'vala')
replaces=('lxpolkit' 'lxsession-lite' 'lxde-settings-daemon')
conflicts=('lxpolkit' 'lxsession-lite' 'lxde-settings-daemon')
-source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz
- fix-lxsession-db.patch)
-md5sums=('39bf77d637fbe40318f91d0d888127fc'
- 'b6508ab44282f56c91d89a8c2c245438')
+source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz)
+md5sums=('2957acccbf9ce37ef8205ec5424f8047')
-prepare() {
- cd $pkgname-$pkgver
-
- # lxsession-db: Don't hang when MIME folders are not available.
- # https://sourceforge.net/p/lxde/patches/479/
- patch -Np1 -i ../fix-lxsession-db.patch
-}
-
build() {
cd $pkgname-$pkgver
./configure --sysconfdir=/etc --prefix=/usr
@@ -38,7 +28,4 @@
package() {
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
-
- # Remove lxpolkit autostart file as we already launch it by lxsession
- rm -r "$pkgdir/etc"
}
Deleted: fix-lxsession-db.patch
===================================================================
--- fix-lxsession-db.patch 2014-12-05 02:42:37 UTC (rev 123469)
+++ fix-lxsession-db.patch 2014-12-05 08:38:08 UTC (rev 123470)
@@ -1,54 +0,0 @@
-diff -Naur lxsession-0.5.1.orig/lxsession-db/desktop-files-backend.vala lxsession-0.5.1/lxsession-db/desktop-files-backend.vala
---- lxsession-0.5.1.orig/lxsession-db/desktop-files-backend.vala 2014-10-17 18:54:57.000000000 +0200
-+++ lxsession-0.5.1/lxsession-db/desktop-files-backend.vala 2014-10-19 20:50:49.587801950 +0200
-@@ -254,16 +254,8 @@
- {
- foreach (string folder in default_available)
- {
-- var dir_log = File.new_for_path (folder);
-- if (dir_log.query_exists ())
-- {
-- message ("Scanning folder: %s", folder);
-- list_desktop_files.begin (folder, "available");
-- }
-- else
-- {
-- message ("%s doesn't exist. Pass", folder);
-- }
-+ message ("Scanning folder: %s", folder);
-+ list_desktop_files.begin (folder, "available");
- }
- }
- else
-@@ -323,21 +315,21 @@
- }
- }
- }
--
-- if (mode == "installed")
-- {
-- finish_scanning_installed();
-- }
-- else if (mode == "available")
-- {
-- finish_scanning_available();
-- }
--
- }
- catch (Error err)
- {
- stderr.printf ("Error: list_files failed: %s\n", err.message);
- }
-+
-+ if (mode == "installed")
-+ {
-+ finish_scanning_installed();
-+ }
-+ else if (mode == "available")
-+ {
-+ finish_scanning_available();
-+ }
-+
- message ("Finishing scanning\n");
- }
-
More information about the arch-commits
mailing list