From c3f3d246a37428e06520d31de70c45b6048f26dd41e1ba8073d88c1860093b75 Mon Sep 17 00:00:00 2001 From: andrea florio Date: Sun, 23 Mar 2014 11:28:42 +0000 Subject: [PATCH] Accepting request 226965 from home:jcsl:LXDE - Built against GKT2 to override GTK3 issues * fixes theming issues * avoid mixing LXDE packages built with GTK2 and GTK3 - Removed build compatibility with discontinued versions (<= 12.2) * Removed unneeded lxsession-0.4.9.3-FileAttribute.Standard_Name.patch patch OBS-URL: https://build.opensuse.org/request/show/226965 OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxsession?expand=0&rev=57 --- ...-0.4.9.3-FileAttribute.Standard_Name.patch | 34 ------------------- lxsession.changes | 10 ++++++ lxsession.spec | 12 ------- 3 files changed, 10 insertions(+), 46 deletions(-) delete mode 100644 lxsession-0.4.9.3-FileAttribute.Standard_Name.patch diff --git a/lxsession-0.4.9.3-FileAttribute.Standard_Name.patch b/lxsession-0.4.9.3-FileAttribute.Standard_Name.patch deleted file mode 100644 index e34967d..0000000 --- a/lxsession-0.4.9.3-FileAttribute.Standard_Name.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: lxsession-0.4.9.3.git20130914/lxsession-db/desktop-files-backend.vala -=================================================================== ---- lxsession-0.4.9.3.git20130914.orig/lxsession-db/desktop-files-backend.vala -+++ lxsession-0.4.9.3.git20130914/lxsession-db/desktop-files-backend.vala -@@ -182,7 +182,7 @@ namespace Lxsession - { - KeyFile kf = new KeyFile(); - /* asynchronous call, to get directory entries */ -- var e = yield dir.enumerate_children_async (FileAttribute.STANDARD_NAME, -+ var e = yield dir.enumerate_children_async (FILE_ATTRIBUTE_STANDARD_NAME, - 0, Priority.DEFAULT); - while (true) - { -@@ -220,16 +220,16 @@ namespace Lxsession - { - /* No entry, just pass */; - } -- catch (FileError err) -+ catch (FileError err1) - { -- warning (err.message); -+ warning (err1.message); - } - } - } - } -- catch (Error err) -+ catch (Error err2) - { -- stderr.printf ("Error: list_files failed: %s\n", err.message); -+ stderr.printf ("Error: list_files failed: %s\n", err2.message); - } - message ("Finishing scanning\n"); - diff --git a/lxsession.changes b/lxsession.changes index 1e7dc10..5324a07 100644 --- a/lxsession.changes +++ b/lxsession.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Mar 20 19:55:45 UTC 2014 - trcs@gmx.com + +- Built against GKT2 to override GTK3 issues + * fixes theming issues + * avoid mixing LXDE packages built with GTK2 and GTK3 +- Removed build compatibility with discontinued versions (<= 12.2) + * Removed unneeded lxsession-0.4.9.3-FileAttribute.Standard_Name.patch + patch + ------------------------------------------------------------------- Sat Sep 14 03:52:04 UTC 2013 - i@marguerite.su diff --git a/lxsession.spec b/lxsession.spec index 41dd71c..0952dde 100644 --- a/lxsession.spec +++ b/lxsession.spec @@ -30,17 +30,11 @@ Patch0: lxsession-0.4.9.3-gtk3-fix.patch Patch1: lxsession-0.4.9.3-lower-libgee.patch # PATCH-FIX-UPSTREAM marguerite@opensuse.org - hide_all() is no more in gtk3, replace with hide() Patch2: lxsession-0.4.9.3-gtk3-hide_all.patch -# PATCH-FIX-UPSTREAM marguerite@opensuse.org - FileAttribute.Standard_Name doesn't exist in 0.14 vala -Patch3: lxsession-0.4.9.3-FileAttribute.Standard_Name.patch BuildRequires: dbus-1-glib-devel BuildRequires: docbook-utils BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes -%if 0%{?suse_version} <= 1220 BuildRequires: gtk2-devel -%else -BuildRequires: gtk3-devel -%endif BuildRequires: intltool BuildRequires: libgee-devel BuildRequires: libtool @@ -65,16 +59,10 @@ use when a user logs out and to restart them the next time the user logs in. %if 0%{?suse_version} > 1220 %patch2 -p1 %endif -%if 0%{?suse_version} <= 1210 -%patch3 -p1 -%endif %build autoreconf -fi %configure \ -%if 0%{?suse_version} > 1220 - --enable-gtk3 \ -%endif --enable-man make %{?_smp_mflags} V=1