commit 667f44b99b24a2504e4b3b62bfd8ec9301914dac
Author: Jan Rękorajski <[email protected]>
Date: Sun Jun 10 20:09:17 2018 +0000
- up to 4.13.0
verbose-logging.patch | 28 ----------------------------
xfce4-session.spec | 14 ++++++--------
2 files changed, 6 insertions(+), 36 deletions(-)
---
diff --git a/xfce4-session.spec b/xfce4-session.spec
index 45cbf40..f1f60d4 100644
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@@ -6,29 +6,28 @@
Summary: Xfce session manager
Summary(pl.UTF-8): Zarządca sesji Xfce
Name: xfce4-session
-Version: 4.12.1
-Release: 3
+Version: 4.13.0
+Release: 1
License: GPL v2
Group: X11/Applications
-Source0:
http://archive.xfce.org/src/xfce/%{name}/4.12/%{name}-%{version}.tar.bz2
-# Source0-md5: f4921fb2e606e74643daf1212263076c
+Source0:
http://archive.xfce.org/src/xfce/%{name}/4.13/%{name}-%{version}.tar.bz2
+# Source0-md5: 0de0afd0c8dfe66f846c6c1c5ff3164a
Source1: http://www.blues.gda.pl/SOURCES/%{name}-ubuntu_icons.tar.bz2
# Source1-md5: bf19add3364c0b0d804a7490c1a1fcbe
# taken from mate-polkit (GTK+2), license is LGPLv2+, requires because of
#
http://lists.fedoraproject.org/pipermail/devel-announce/2011-February/000758.html
Source2: polkit-mate-authentication-agent-1.desktop
Patch0: %{name}-ubuntu_icons.patch
-Patch1: verbose-logging.patch
URL: http://www.xfce.org/projects/xfce4-session
BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: dbus-devel >= 1.0.0
BuildRequires: dbus-glib-devel >= 0.74
BuildRequires: gettext-tools
-BuildRequires: gtk+2-devel >= 2:2.24.0
+BuildRequires: gtk+3-devel
BuildRequires: intltool >= 0.35.0
BuildRequires: libtool
-BuildRequires: libwnck2-devel >= 2.22.0
+BuildRequires: libwnck-devel
BuildRequires: libxfce4ui-devel >= %{xfce_version}
BuildRequires: libxfce4util-devel >= %{xfce_version}
BuildRequires: pkgconfig
@@ -95,7 +94,6 @@ Statyczna biblioteka zarządcy sesji dla środowiska Xfce.
%prep
%setup -q -a1
%patch0 -p1
-%patch1 -p1
%build
%{__intltoolize}
diff --git a/verbose-logging.patch b/verbose-logging.patch
deleted file mode 100644
index 3b9f247..0000000
--- a/verbose-logging.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 26f9ae8df629f02af0773df2ed82db6b85c5b556 Mon Sep 17 00:00:00 2001
-From: Eric Koegel <[email protected]>
-Date: Sat, 28 Mar 2015 16:57:24 +0300
-Subject: Make verbose logging conditional (Bug #11698)
-
-Bug report and patch submitted by Zhihao Yuan
-
-Signed-off-by: Eric Koegel <[email protected]>
-
-diff --git a/xfce4-session/xfsm-global.h b/xfce4-session/xfsm-global.h
-index d2e0c29..d458712 100644
---- a/xfce4-session/xfsm-global.h
-+++ b/xfce4-session/xfsm-global.h
-@@ -49,7 +49,10 @@ extern XfsmSplashScreen *splash_screen;
- #if defined(G_HAVE_ISO_VARARGS)
-
- #define xfsm_verbose(...)\
-- xfsm_verbose_real (__func__, __FILE__, __LINE__, __VA_ARGS__)
-+G_STMT_START{ \
-+ if (G_UNLIKELY (verbose)) \
-+ xfsm_verbose_real (__func__, __FILE__, __LINE__, __VA_ARGS__); \
-+}G_STMT_END
-
- #else
-
---
-cgit v0.10.1
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xfce4-session.git/commitdiff/667f44b99b24a2504e4b3b62bfd8ec9301914dac
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
