Compare commits
34 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0cccf489d8 | ||
|
|
6f6c0578a7 | ||
|
|
1a5fceb139 | ||
|
|
fe29e221e7 | ||
|
|
194b4fab1f | ||
|
|
18e8a1e5ab | ||
|
|
ceaaf2df28 | ||
|
|
49a548872e | ||
|
|
0dca476d35 | ||
|
|
756d4a0856 | ||
|
|
278ae10ee1 | ||
|
|
36c8760624 | ||
|
|
aef7afccd6 | ||
|
|
bdb64b2f3a | ||
|
|
222f986c92 | ||
|
|
26364209e5 | ||
|
|
688e9dd7bd | ||
|
|
eac7d6d7b1 | ||
|
|
71b9ac6acf | ||
|
|
733c84e34d | ||
|
|
081496bc2b | ||
|
|
587882ddef | ||
|
|
459c2e645c | ||
|
|
d3b3bf0074 | ||
|
|
ac9517058f | ||
|
|
8adb5feb07 | ||
|
|
c980520ba5 | ||
|
|
f01c6502bb | ||
|
|
1a10918b89 | ||
|
|
5f9dae622d | ||
|
|
1b4b17037d | ||
|
|
1584d4d446 | ||
|
|
f3e8a76425 | ||
|
|
ceeb1e1ab9 |
7 changed files with 496 additions and 96 deletions
13
.gitignore
vendored
13
.gitignore
vendored
|
|
@ -1,12 +1 @@
|
|||
lxsession-0.4.4.tar.gz
|
||||
/lxsession-0.4.5.tar.gz
|
||||
/lxsession-0.4.6.1.tar.gz
|
||||
/0.5.2.tar.gz
|
||||
/lxsession-0.5.2.tar.xz
|
||||
/lxsession-0.5.2-D20160417git9f8d613332abec5ec0b64b94e1a17caa0c56798b.tar.gz
|
||||
/lxsession-0.5.2-D20160817git699c1695c2adcf0ec04d9da579c65a66417064f0.tar.gz
|
||||
/lxsession-0.5.2-D20161106git7b9a9580da6929af5bf8d1c577cc61db990c8d91.tar.gz
|
||||
/lxsession-0.5.3-D20161210gite284f41ad4467c8b292d94cbcbc9a3393c618da5.tar.gz
|
||||
/lxsession-0.5.3.tar.xz
|
||||
/lxsession-0.5.4.tar.xz
|
||||
/lxsession-0.5.5.tar.xz
|
||||
/lxsession-*.tar.gz
|
||||
|
|
|
|||
27
create-lxsession-git-bare-tarball.sh
Normal file
27
create-lxsession-git-bare-tarball.sh
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -x
|
||||
set -e
|
||||
|
||||
REPONAME=lxsession
|
||||
GITURL=https://github.com/lxde/${REPONAME}.git
|
||||
|
||||
DATE=$(date '+%Y%m%d')
|
||||
TIME=$(date '+%H%M')
|
||||
|
||||
TARNAME=${REPONAME}-${DATE}T${TIME}.tar.gz
|
||||
|
||||
PWDDIR=$(pwd)
|
||||
TMPDIR=$(mktemp -d /var/tmp/libfm-XXXXXX)
|
||||
pushd $TMPDIR
|
||||
|
||||
git clone --mirror $GITURL
|
||||
tar czf ${TARNAME} ${REPONAME}.git/
|
||||
|
||||
pushd ${REPONAME}.git/
|
||||
git log --format=fuller | head -n 12
|
||||
popd
|
||||
|
||||
cp -p ${TARNAME} $PWDDIR
|
||||
popd
|
||||
rm -rf $TMPDIR
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/Makefile.am.reload 2016-06-21 00:15:37.370393487 +0900
|
||||
+++ lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/Makefile.am 2016-06-21 00:17:34.190841661 +0900
|
||||
@@ -418,6 +418,7 @@
|
||||
--- lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/Makefile.am.reload 2020-02-29 23:15:59.000000000 +0900
|
||||
+++ lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/Makefile.am 2020-10-12 22:57:27.616976651 +0900
|
||||
@@ -416,6 +416,7 @@ lxsession_lxsession_VALAFLAGS = \
|
||||
--pkg gio-2.0 \
|
||||
--pkg posix \
|
||||
--pkg lxsettings-daemon \
|
||||
|
|
@ -8,8 +8,8 @@
|
|||
$(buildinclip_VALAFLAGS) \
|
||||
$(buildinpolkit_VALAFLAGS) \
|
||||
$(lxsession_gtk_lxsession_VALAFLAGS) \
|
||||
--- lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/vapi/xevent.vapi.reload 2016-06-21 00:15:37.370393487 +0900
|
||||
+++ lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/vapi/xevent.vapi 2016-06-21 00:15:37.370393487 +0900
|
||||
--- lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/vapi/xevent.vapi.reload 2020-10-12 22:57:27.616976651 +0900
|
||||
+++ lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/vapi/xevent.vapi 2020-10-12 22:57:27.616976651 +0900
|
||||
@@ -0,0 +1,10 @@
|
||||
+[CCode (cprefix = "LxsessionXEvent", cheader_filename = "lxsettings-daemon/xevent.h")]
|
||||
+ public static void send_internal_command( int cmd );
|
||||
|
|
@ -21,9 +21,9 @@
|
|||
+ EXIT,
|
||||
+ LAST_CMD
|
||||
+ }
|
||||
--- lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/lxsettings-daemon/xevent.c.reload 2016-04-18 03:13:01.000000000 +0900
|
||||
+++ lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/lxsettings-daemon/xevent.c 2016-06-21 00:15:37.370393487 +0900
|
||||
@@ -71,13 +71,19 @@
|
||||
--- lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/lxsettings-daemon/xevent.c.reload 2019-02-28 07:02:03.000000000 +0900
|
||||
+++ lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/lxsettings-daemon/xevent.c 2020-10-12 22:58:13.620914596 +0900
|
||||
@@ -71,13 +71,20 @@ void send_internal_command( int cmd )
|
||||
XSync(dpy, False);
|
||||
}
|
||||
|
||||
|
|
@ -32,6 +32,7 @@
|
|||
+ dpy = XOpenDisplay( g_getenv("DISPLAY") );
|
||||
+ if( ! dpy )
|
||||
+ return FALSE;
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
gboolean xevent_init()
|
||||
|
|
@ -45,9 +46,9 @@
|
|||
return FALSE;
|
||||
|
||||
/* according to the spec, private Atoms should prefix their names with _. */
|
||||
--- lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/lxsession/main.vala.reload 2016-04-18 03:13:01.000000000 +0900
|
||||
+++ lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/lxsession/main.vala 2016-06-21 00:15:37.370393487 +0900
|
||||
@@ -99,6 +99,17 @@
|
||||
--- lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/lxsession/main.vala.reload 2020-02-29 23:53:10.000000000 +0900
|
||||
+++ lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/lxsession/main.vala 2020-10-12 22:57:27.617976650 +0900
|
||||
@@ -99,6 +99,17 @@ namespace Lxsession {
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -65,3 +66,13 @@
|
|||
message ("Session is %s",session);
|
||||
message ("DE is %s", desktop_environnement);
|
||||
|
||||
--- lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/lxsettings-daemon/xevent.h.reload 2019-02-28 07:02:03.000000000 +0900
|
||||
+++ lxsession-9f8d613332abec5ec0b64b94e1a17caa0c56798b/lxsettings-daemon/xevent.h 2020-10-12 22:57:27.617976650 +0900
|
||||
@@ -35,6 +35,7 @@ typedef enum{
|
||||
LXS_LAST_CMD
|
||||
}LXS_CMD;
|
||||
|
||||
+gboolean xdpy_init();
|
||||
gboolean xevent_init();
|
||||
gboolean single_instance_check();
|
||||
void xevent_finalize();
|
||||
|
|
|
|||
144
lxsession-0.5.5-split-indicator-support.patch
Normal file
144
lxsession-0.5.5-split-indicator-support.patch
Normal file
|
|
@ -0,0 +1,144 @@
|
|||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 5a1177e..7d20d37 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -459,9 +459,13 @@ lxsession_lxsession_CPPFLAGS += \
|
||||
lxsession_lxsession_LDADD += \
|
||||
$(GTK_LIBS)
|
||||
|
||||
+if USE_INDICATOR
|
||||
+lxsession_lxsession_VALAFLAGS += \
|
||||
+ --pkg appindicator-0.1
|
||||
+endif
|
||||
+
|
||||
if USE_ADVANCED_NOTIFICATIONS
|
||||
lxsession_lxsession_VALAFLAGS += \
|
||||
- --pkg appindicator-0.1 \
|
||||
--pkg libnotify \
|
||||
-D USE_ADVANCED_NOTIFICATIONS
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 38c6c93..33a6fc7 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -108,7 +108,6 @@ else
|
||||
AS_HELP_STRING([--enable-advanced-notifications],
|
||||
[Build with advanced notification using indicators and libnotify (default: no)]),
|
||||
use_advanced_notifications=$enableval, use_advanced_notifications="no")
|
||||
-
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(USE_BUILDIN_CLIPBOARD, test "$use_buildin_clipboard" = "yes")
|
||||
@@ -117,7 +116,8 @@ AM_CONDITIONAL(USE_GTK3, test "$enable_gtk3" = "yes")
|
||||
AM_CONDITIONAL(USE_ADVANCED_NOTIFICATIONS, test "$use_advanced_notifications" = "yes")
|
||||
|
||||
if test "$use_advanced_notifications" = "yes"; then
|
||||
- PKG_CHECK_MODULES(INDICATORS, [indicator-0.4 >= 0.4.93 appindicator-0.1])
|
||||
+ use_indicator=no
|
||||
+ PKG_CHECK_MODULES(INDICATORS, [indicator-0.4 >= 0.4.93 appindicator-0.1], [use_indicator=no], [use_indicator=no])
|
||||
AC_SUBST(INDICATORS_CFLAGS)
|
||||
AC_SUBST(INDICATORS_LIBS)
|
||||
|
||||
@@ -126,6 +126,9 @@ if test "$use_advanced_notifications" = "yes"; then
|
||||
AC_SUBST(LIBNOTIFY_LIBS)
|
||||
fi
|
||||
|
||||
+AM_CONDITIONAL(USE_INDICATOR, test "$use_indicator" = "yes")
|
||||
+
|
||||
+
|
||||
if test "$use_buildin_polkit" = "yes"; then
|
||||
HIDE_LXPOLKIT_AUTOSTART=true
|
||||
else
|
||||
diff --git a/lxsession/notifications.vala b/lxsession/notifications.vala
|
||||
index 5432aa8..b706ab8 100644
|
||||
--- a/lxsession/notifications.vala
|
||||
+++ b/lxsession/notifications.vala
|
||||
@@ -19,7 +19,9 @@
|
||||
#if USE_GTK
|
||||
using Gtk;
|
||||
#if USE_ADVANCED_NOTIFICATIONS
|
||||
+#if USE_INDICATOR
|
||||
using AppIndicator;
|
||||
+#endif
|
||||
using Notify;
|
||||
#endif
|
||||
#endif
|
||||
@@ -78,7 +80,9 @@ namespace Lxsession
|
||||
public MenuObject menu;
|
||||
#if USE_GTK
|
||||
#if USE_ADVANCED_NOTIFICATIONS
|
||||
+#if USE_INDICATOR
|
||||
public Indicator indicator;
|
||||
+#endif
|
||||
public Notify.Notification notification;
|
||||
#endif
|
||||
#endif
|
||||
@@ -106,7 +110,9 @@ namespace Lxsession
|
||||
this.menu = menu_param;
|
||||
#if USE_GTK
|
||||
#if USE_ADVANCED_NOTIFICATIONS
|
||||
+#if USE_INDICATOR
|
||||
this.indicator = new Indicator(this.name, this.icon_name, IndicatorCategory.APPLICATION_STATUS);
|
||||
+#endif
|
||||
this.notification = new Notify.Notification ("LXsession", this.notification_text, this.icon_name);
|
||||
this.notification.set_timeout(6000);
|
||||
#endif
|
||||
@@ -117,6 +123,7 @@ namespace Lxsession
|
||||
#if USE_ADVANCED_NOTIFICATIONS
|
||||
public void init()
|
||||
{
|
||||
+#if USE_INDICATOR
|
||||
if (this.indicator == null)
|
||||
{
|
||||
this.indicator = new Indicator(this.name, this.icon_name, IndicatorCategory.APPLICATION_STATUS);
|
||||
@@ -128,10 +135,12 @@ namespace Lxsession
|
||||
{
|
||||
this.indicator.set_menu(this.menu);
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
public void activate()
|
||||
{
|
||||
+#if USE_INDICATOR
|
||||
message("Try activate");
|
||||
if (this.indicator != null)
|
||||
{
|
||||
@@ -147,10 +156,12 @@ namespace Lxsession
|
||||
}
|
||||
message("Activate done");
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
public void inactivate()
|
||||
{
|
||||
+#if USE_INDICATOR
|
||||
message("Try inactivate");
|
||||
if (this.indicator != null)
|
||||
{
|
||||
@@ -158,19 +169,24 @@ namespace Lxsession
|
||||
this.indicator.set_status(IndicatorStatus.PASSIVE);
|
||||
message("Inactivate done");
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
public void set_icon(string param_icon_name)
|
||||
{
|
||||
+#if USE_INDICATOR
|
||||
this.icon_name = param_icon_name;
|
||||
message("Set new icon");
|
||||
this.indicator.icon_name = param_icon_name;
|
||||
+#endif
|
||||
}
|
||||
|
||||
public void set_menu(MenuObject param_menu)
|
||||
{
|
||||
+#if USE_INDICATOR
|
||||
this.menu = param_menu;
|
||||
this.indicator.set_menu(param_menu);
|
||||
+#endif
|
||||
}
|
||||
|
||||
public void add_action (string action, string label, owned ActionCallback callback)
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
From e935beaa73f30dd54253f96ca951a4b47fc9a3b7 Mon Sep 17 00:00:00 2001
|
||||
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
|
||||
Date: Fri, 15 Aug 2025 15:35:58 +0900
|
||||
Subject: [PATCH] lxsession: workaround for setting ally bus
|
||||
|
||||
---
|
||||
lxsession/environement.vala | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/lxsession/environement.vala b/lxsession/environement.vala
|
||||
index a18f840..503f3f0 100644
|
||||
--- a/lxsession/environement.vala
|
||||
+++ b/lxsession/environement.vala
|
||||
@@ -281,6 +281,9 @@ namespace Lxsession
|
||||
}
|
||||
*/
|
||||
|
||||
+ /* Workaround: set up ally bus */
|
||||
+ lxsession_spawn_command_line_async("gdbus call --session --dest org.a11y.Bus --object-path /org/a11y/bus --method org.a11y.Bus.GetAddress");
|
||||
+
|
||||
if (global_settings.get_item_string("Environment", "toolkit_integration", null) == "true")
|
||||
{
|
||||
/* Enable toolkit integration for OpenOffice.org / LibreOffice, if available. */
|
||||
--
|
||||
2.50.1
|
||||
|
||||
347
lxsession.spec
347
lxsession.spec
|
|
@ -2,68 +2,100 @@
|
|||
# renamed from lxsession-lite. Original review at
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=442268
|
||||
|
||||
%global usegit 0
|
||||
%global mainrel 2
|
||||
%global use_release 0
|
||||
%global use_gitbare 1
|
||||
|
||||
%global githash e284f41ad4467c8b292d94cbcbc9a3393c618da5
|
||||
%global shorthash %(TMP=%githash ; echo ${TMP:0:10})
|
||||
%global gitdate Sat, 10 Dec 2016 12:23:09 +0200
|
||||
%global gitdate_num 20161210
|
||||
|
||||
%if 0%{?usegit} >= 1
|
||||
%global fedorarel %{mainrel}.D%{gitdate_num}git%{shorthash}
|
||||
%else
|
||||
%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}
|
||||
%if 0%{?use_gitbare} < 1
|
||||
# force
|
||||
%global use_release 1
|
||||
%endif
|
||||
|
||||
Name: lxsession
|
||||
Version: 0.5.5
|
||||
Release: %{fedorarel}%{?dist}
|
||||
Summary: Lightweight X11 session manager
|
||||
Summary(de): Leichtgewichtiger X11 Sitzungsverwalter
|
||||
%global git_version %{nil}
|
||||
%global git_ver_rpm %{nil}
|
||||
%global git_builddir %{nil}
|
||||
|
||||
License: GPLv2+
|
||||
URL: http://lxde.sourceforge.net/
|
||||
%if 0%{?usegit} >= 1
|
||||
Source0: https://github.com/lxde/lxsession/archive/%{githash}/%{name}-%{version}-D%{gitdate_num}git%{githash}.tar.gz
|
||||
%else
|
||||
Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz
|
||||
%if 0%{?use_gitbare}
|
||||
%global gittardate 20250403
|
||||
%global gittartime 1600
|
||||
%define use_gitcommit_as_rel 0
|
||||
|
||||
%global gitbaredate 20250330
|
||||
%global git_rev 886b9ad90f98b12c775313331431769295138f69
|
||||
%global git_short %(echo %{git_rev} | cut -c-8)
|
||||
%global git_version %{gitbaredate}git%{git_short}
|
||||
|
||||
%if 0%{?use_gitcommit_as_rel}
|
||||
%global git_ver_rpm ^%{git_version}
|
||||
%global git_builddir -%{git_version}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
%global main_version 0.5.6
|
||||
|
||||
Name: lxsession
|
||||
Version: %{main_version}%{git_ver_rpm}
|
||||
Release: 3%{?dist}
|
||||
Summary: Lightweight X11 session manager
|
||||
Summary(de): Leichtgewichtiger X11 Sitzungsverwalter
|
||||
|
||||
# LGPL-3.0-or-later lxsession-logout/lxsession-logout-dbus-interface.c
|
||||
# HPND lxsettings-daemon/xsettings-common.c and some files under lxsettings-daemon/
|
||||
# GPL-2.0-or-later Others
|
||||
# SPDX confirmed
|
||||
License: GPL-2.0-or-later AND HPND AND LGPL-3.0-or-later
|
||||
|
||||
URL: http://lxde.sourceforge.net/
|
||||
%if 0%{?use_gitbare}
|
||||
Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz
|
||||
%endif
|
||||
%if 0%{?use_release}
|
||||
Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz
|
||||
%endif
|
||||
#http://sourceforge.net/p/lxde/bugs/760/
|
||||
Patch1000: lxsession-0.5.2-git9f8d6133-reload.patch
|
||||
Patch1002: lxsession-0.5.2-notify-daemon-default.patch
|
||||
Patch1000: lxsession-0.5.2-git9f8d6133-reload.patch
|
||||
Patch1002: lxsession-0.5.2-notify-daemon-default.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1801071
|
||||
# race condition when calling "lxsession -r" from imsettings-lxde and when daemon is not configured yet
|
||||
# explicitly do nullptr check
|
||||
Patch1005: lxsession-0.5.4-load-settings-nullcheck.patch
|
||||
Patch1005: lxsession-0.5.4-load-settings-nullcheck.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1830588
|
||||
# add custom directory to XDG_CONFIG_DIRS
|
||||
Patch2001: lxsession-0.5.5-add-custom-xdg-config-dir.patch
|
||||
Patch2001: lxsession-0.5.5-add-custom-xdg-config-dir.patch
|
||||
# Split out appindicator support and kill it for now:
|
||||
# libappindicator 12.10.1 kills GTK2 vapi support
|
||||
Patch2002: lxsession-0.5.5-split-indicator-support.patch
|
||||
# Workaround for explicitly setting ally bus
|
||||
# ref: https://bugzilla.redhat.com/show_bug.cgi?id=2209584#c6
|
||||
# ref: https://forums.gentoo.org/viewtopic-t-1172784-start-75-postdays-0-postorder-asc-highlight-.html
|
||||
Patch2003: lxsession-0.5.6-lxsession-workaround-for-setting-ally-bus.patch
|
||||
|
||||
BuildRequires: pkgconfig(gtk+-2.0)
|
||||
BuildRequires: pkgconfig(indicator-0.4)
|
||||
BuildRequires: pkgconfig(appindicator-0.1)
|
||||
BuildRequires: pkgconfig(libnotify)
|
||||
BuildRequires: pkgconfig(polkit-agent-1)
|
||||
BuildRequires: vala
|
||||
BuildRequires: docbook-utils
|
||||
BuildRequires: intltool
|
||||
BuildRequires: gettext
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: docbook-style-xsl
|
||||
BuildRequires: %{_bindir}/xsltproc
|
||||
BuildRequires: pkgconfig(gtk+-2.0)
|
||||
#BuildRequires: pkgconfig(indicator-0.4)
|
||||
#BuildRequires: pkgconfig(appindicator-0.1)
|
||||
BuildRequires: pkgconfig(libnotify)
|
||||
BuildRequires: pkgconfig(polkit-agent-1)
|
||||
BuildRequires: make
|
||||
BuildRequires: vala
|
||||
BuildRequires: docbook-utils
|
||||
BuildRequires: intltool
|
||||
BuildRequires: gettext
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: docbook-style-xsl
|
||||
BuildRequires: /usr/bin/xsltproc
|
||||
|
||||
BuildRequires: automake
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: /usr/bin/git
|
||||
|
||||
# name changed back from lxsession-lite to lxsession
|
||||
Obsoletes: lxsession-lite <= 0.3.6-6
|
||||
Provides: lxsession-lite = %{version}-%{release}
|
||||
Obsoletes: lxsession-lite <= 0.3.6-6
|
||||
Provides: lxsession-lite = %{version}-%{release}
|
||||
# lxde-settings-daemon was merged into lxsession
|
||||
Obsoletes: lxde-settings-daemon <= 0.4.1-2
|
||||
Provides: lxde-settings-daemon = 0.4.1-3
|
||||
Obsoletes: lxde-settings-daemon <= 0.4.1-2
|
||||
Provides: lxde-settings-daemon = 0.4.1-3
|
||||
# required for suspend and hibernate
|
||||
Requires: upower
|
||||
Requires: upower
|
||||
|
||||
%description
|
||||
LXSession is a standard-compliant X11 session manager with shutdown/
|
||||
|
|
@ -86,7 +118,7 @@ Abhängigkeiten.
|
|||
|
||||
|
||||
%package edit
|
||||
Summary: Simple GUI to configure what’s automatically started in LXDE
|
||||
Summary: Simple GUI to configure what’s automatically started in LXDE
|
||||
|
||||
%description edit
|
||||
LXSession-edit is a tool to manage freedesktop.org compliant desktop session
|
||||
|
|
@ -94,10 +126,10 @@ autostarts. Currently adding and removing applications from the startup list
|
|||
is not yet available, but it will be support in the next release.
|
||||
|
||||
%package -n lxpolkit
|
||||
Summary: Simple PolicyKit authentication agent
|
||||
Requires: polkit >= 0.95
|
||||
Summary: Simple PolicyKit authentication agent
|
||||
Requires: polkit >= 0.95
|
||||
# required to replace polkit-gnome and polkit-kde
|
||||
Provides: PolicyKit-authentication-agent
|
||||
Provides: PolicyKit-authentication-agent
|
||||
|
||||
|
||||
%description -n lxpolkit
|
||||
|
|
@ -105,20 +137,67 @@ LXPolKit is a simple PolicyKit authentication agent developed for LXDE, the
|
|||
Lightweight X11 Desktop Environment.
|
||||
|
||||
%prep
|
||||
%if 0%{?usegit} < 1
|
||||
%setup -q -n %{name}-%{version}%{?prever}
|
||||
%else
|
||||
%setup -q -n %{name}-%{githash}
|
||||
%if 0%{?use_release}
|
||||
%setup -q -n %{name}-%{main_version}%{git_builddir}
|
||||
|
||||
git init
|
||||
%endif
|
||||
|
||||
%if 0%{?use_gitbare}
|
||||
%setup -q -c -T -n %{name}-%{main_version}%{git_builddir} -a 0
|
||||
git clone ./%{name}.git/
|
||||
cd %{name}
|
||||
|
||||
git checkout -b %{main_version}-fedora %{git_rev}
|
||||
cp -a [A-Z]* ..
|
||||
cp -a data/ ..
|
||||
|
||||
cat > GITHASH <<EOF
|
||||
EOF
|
||||
|
||||
cat GITHASH | while read line
|
||||
do
|
||||
commit=$(echo "$line" | sed -e 's|[ \t].*||')
|
||||
git cherry-pick $commit
|
||||
done
|
||||
|
||||
# Restore timestamps
|
||||
set +x
|
||||
echo "Restore timestamps"
|
||||
git ls-tree -r --name-only HEAD | while read f
|
||||
do
|
||||
unixtime=$(git log -n 1 --pretty='%ct' -- $f)
|
||||
touch -d "@${unixtime}" $f
|
||||
done
|
||||
set -x
|
||||
%endif
|
||||
|
||||
git config user.name "lxpanel Fedora maintainer"
|
||||
git config user.email "lxpanel-maintainers@fedoraproject.org"
|
||||
|
||||
%if 0%{?use_release}
|
||||
git add .
|
||||
git commit -m "base" -q
|
||||
%endif
|
||||
|
||||
#%patch0 -p1 -b .dsofix
|
||||
%patch1000 -p1 -b .reload
|
||||
%patch1002 -p1 -b .notify
|
||||
%patch1005 -p1 -b .nullcheck
|
||||
%patch2001 -p1 -b .custom
|
||||
%patch -P1000 -p1 -b .reload
|
||||
%patch -P1002 -p1 -b .notify
|
||||
%patch -P1005 -p1 -b .nullcheck
|
||||
%patch -P2001 -p1 -b .custom
|
||||
%patch -P2002 -p1 -b .indicator
|
||||
%patch -P2003 -p1 -b .ally
|
||||
%if 0%{?use_gitbare}
|
||||
git commit -m "Apply Fedora specific configulation" -a
|
||||
%endif
|
||||
|
||||
mkdir m4 || :
|
||||
sh autogen.sh
|
||||
# Umm?? Why are warnings killed by default?
|
||||
sed -i.warn Makefile.am \
|
||||
-e '\@include.*config\.h@s| -w | |'
|
||||
|
||||
%if 0%{?use_gitbare}
|
||||
git commit -m "Enable warnings" -a
|
||||
%endif
|
||||
|
||||
# Don't start in Xfce to avoid bugs like
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=616730
|
||||
|
|
@ -127,20 +206,40 @@ sed -i 's/^NotShowIn=GNOME;KDE;/NotShowIn=GNOME;KDE;XFCE;/g' data/lxpolkit.deskt
|
|||
# fix icon in desktop file
|
||||
# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxsession-edit;a=commit;h=3789a96691eadac9b8f3bf3034a97645860bd138
|
||||
sed -i 's/^Icon=xfwm4/Icon=session-properties/g' data/lxsession-edit.desktop.in
|
||||
%if 0%{?use_gitbare}
|
||||
git commit -m "Apply Fedora specific configulation 2" -a
|
||||
%endif
|
||||
|
||||
|
||||
mkdir m4 || :
|
||||
sh autogen.sh
|
||||
|
||||
%build
|
||||
%configure --enable-man --disable-silent-rules \
|
||||
%if 0%{?use_gitbare}
|
||||
cd %{name}
|
||||
%endif
|
||||
|
||||
%configure \
|
||||
--enable-man \
|
||||
--disable-silent-rules \
|
||||
--enable-advanced-notifications \
|
||||
--enable-debug \
|
||||
%{nil}
|
||||
make clean
|
||||
make %{?_smp_mflags}
|
||||
|
||||
# Tweak optflags here
|
||||
find . -name Makefile | \
|
||||
xargs sed -i -e 's|\(-Werror=format-security\)|\1 -Werror=implicit-function-declaration -Werror=return-type |'
|
||||
%make_build -k
|
||||
|
||||
|
||||
%install
|
||||
%if 0%{?use_gitbare}
|
||||
cd %{name}
|
||||
%endif
|
||||
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
|
||||
%find_lang %{name}
|
||||
%make_install
|
||||
mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/xdg/%{name}
|
||||
|
||||
desktop-file-install \
|
||||
|
|
@ -157,29 +256,46 @@ desktop-file-install \
|
|||
%{buildroot}%{_datadir}/applications/*.desktop
|
||||
|
||||
|
||||
%if 0%{?use_gitbare}
|
||||
cd ..
|
||||
%endif
|
||||
%find_lang %{name}
|
||||
|
||||
%files -f %{name}.lang
|
||||
%doc AUTHORS ChangeLog COPYING README data/desktop.conf.example
|
||||
|
||||
%doc AUTHORS
|
||||
%doc ChangeLog
|
||||
%license COPYING
|
||||
%doc README
|
||||
%doc data/desktop.conf.example
|
||||
|
||||
%{_bindir}/%{name}
|
||||
%{_bindir}/%{name}-logout
|
||||
%{_bindir}/%{name}-db
|
||||
%{_bindir}/%{name}-default
|
||||
%{_bindir}/%{name}-default-apps
|
||||
%{_bindir}/%{name}-default-terminal
|
||||
%dir %{_libexecdir}/%{name}
|
||||
|
||||
%dir %{_libexecdir}/%{name}
|
||||
%{_libexecdir}/%{name}/%{name}-xsettings
|
||||
|
||||
%{_bindir}/lxsettings-daemon
|
||||
%{_bindir}/%{name}-xdg-autostart
|
||||
%{_bindir}/lxlock
|
||||
%{_bindir}/lxclipboard
|
||||
%{_datadir}/%{name}/
|
||||
%exclude %{_datadir}/%{name}/ui/lxpolkit.ui
|
||||
%exclude %{_datadir}/%{name}/ui/lxsession-edit.ui
|
||||
%{_mandir}/man*/%{name}*.*
|
||||
# we need to own
|
||||
%dir %{_sysconfdir}/xdg/%{name}
|
||||
|
||||
%dir %{_datadir}/%{name}/
|
||||
%{_datadir}/%{name}/images/
|
||||
%dir %{_datadir}/%{name}/ui/
|
||||
%{_datadir}/%{name}/ui/lxsession-default-apps.ui
|
||||
|
||||
%{_datadir}/applications/lxsession-default-apps.desktop
|
||||
|
||||
# we need to own
|
||||
%dir %{_sysconfdir}/xdg/%{name}
|
||||
|
||||
|
||||
%{_mandir}/man*/%{name}*.*
|
||||
%{_mandir}/man1/lxlock.1*
|
||||
%{_mandir}/man1/lxpolkit.1*
|
||||
%{_mandir}/man1/lxclipboard.1*
|
||||
|
|
@ -192,10 +308,97 @@ desktop-file-install \
|
|||
|
||||
%files -n lxpolkit
|
||||
%{_bindir}/lxpolkit
|
||||
%config %{_sysconfdir}/xdg/autostart/lxpolkit.desktop
|
||||
%{_sysconfdir}/xdg/autostart/lxpolkit.desktop
|
||||
%{_datadir}/%{name}/ui/lxpolkit.ui
|
||||
|
||||
%changelog
|
||||
* Fri Aug 15 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.6-3
|
||||
- Add workaround for setting a11y bus explicitly
|
||||
|
||||
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Thu Apr 03 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.6-1
|
||||
- 0.5.6
|
||||
|
||||
* Thu Feb 13 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5^20241019gitc72db4f8-1
|
||||
- Update to the latest git
|
||||
|
||||
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5^20240821git95e902d7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Sun Aug 25 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5^20240821git95e902d7-1
|
||||
- Update to the latest git
|
||||
|
||||
* Tue Aug 13 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5^20240812git626a654b-1
|
||||
- Update to the latest git
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5^20230917gite0fffa66-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sun Feb 25 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5^20230917gite0fffa66-4
|
||||
- Apply upstream PR for gcc14 -Werror=incompatible-pointer-types
|
||||
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5^20230917gite0fffa66-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5^20230917gite0fffa66-2
|
||||
- Change -Wincompatible-pointer-types from error to warning
|
||||
|
||||
* Sun Dec 31 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5^20230917gite0fffa66-1
|
||||
- Update to the latest git
|
||||
|
||||
* Tue Aug 15 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5^20230810git27c1eaf6-1
|
||||
- Update to the latest git
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5-11.D20210419git82580e45
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Mon Jun 12 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5-10.D20210419git82580e45
|
||||
- Always create parent directory for lxsession autostart file (bug 2213030)
|
||||
|
||||
* Fri Jan 20 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5-9.D20210419git82580e45
|
||||
- F-37+: kill appindicator support for now due to 12.10.1 GTK2 support removal
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5-8.D20210419git82580e45.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Tue Sep 13 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5-8.D20210419git82580e45
|
||||
- Update to the latest git (20210419)
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5-7.D20210130git8543c00a.3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5-7.D20210130git8543c00a.2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5-7.D20210130git8543c00a.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Sat Mar 20 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5-7.D20210130git8543c00a
|
||||
- Avoid lxsession-default-apps segfault (with recent glib2)
|
||||
|
||||
* Fri Mar 12 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5-6.D20210130git8543c00a
|
||||
- Avoid lxsession-xdg-autostart segfault (with recent glib2)
|
||||
|
||||
* Tue Feb 2 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5-5.D20210130git8543c00a
|
||||
- Update to the latest git
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5-4.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Oct 12 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5-4
|
||||
- Turn on warning flags disabled by default on tarball
|
||||
- Turn some warnings into error
|
||||
- Enable LTO again
|
||||
- Breakage by LTO was because of -Wreturn-type issue
|
||||
|
||||
* Thu Aug 27 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5-3
|
||||
- Disable LTO for now for workaround (bug 1872429)
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.5-2.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Thu May 7 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.5-2
|
||||
- Add custom directory to XDG_CONFIG_DIRS (ref: bug 1830588)
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (lxsession-0.5.5.tar.xz) = 12e25214485cf855b380a5aa91eb536f31536c98f5a50a1115cb4bf8ff884c7cdcd40c69a1502eeb9f4d3e6169e0607d6488ef3152ee184662fee39fe7a04d54
|
||||
SHA512 (lxsession-20250403T1600.tar.gz) = b3282ea072d3cf2552c9581cca8251f9f7b2f7c7e062b4a9ee4d9725ab2218f35dd437beab53d56417b94a036d428cfe196b58a0e9af73d33f295bbefd938a5e
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue