Compare commits

...

11 Commits

Author SHA1 Message Date
openeuler-ci-bot
636f846b4e
!17 Update to 4.18.0
From: @misaka00251 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2023-01-05 03:44:37 +00:00
misaka00251
b8e3b3cba7
Update to 4.18.0 2023-01-04 18:50:37 +08:00
openeuler-ci-bot
71fcc95d0c
!11 update changelog
From: @dillon_chen 
Reviewed-by: @zhang__3125 
Signed-off-by: @zhang__3125
2022-09-08 03:11:58 +00:00
陈棋德
a3a360b728
update xfce4-session.spec.
Signed-off-by: 陈棋德 <dillon.chen@gmail.com>
2022-09-08 02:55:29 +00:00
openeuler-ci-bot
eaab6e6009 !3 upgrade to 4.16.0 for xfce 4.16
From: @zhang__3125
Reviewed-by: @dwl301
Signed-off-by: @dwl301
2021-06-17 14:24:47 +00:00
linz
f8a2856b60 upgrade to 4.16.0 for xfce 4.16
upgrade to 4.16.0 for xfce 4.16

modify spec
2021-06-16 12:46:49 +08:00
openeuler-ci-bot
51aaf7c310 !2 20201127 add yaml file
From: @zhang__3125
Reviewed-by: @dwl301
Signed-off-by: @dwl301
2020-12-01 11:28:43 +08:00
张琳
50f32b0199 update xfce4-session.yaml. 2020-12-01 11:09:25 +08:00
zhang__3125
a80e6bb94c 20201127 add yaml file 2020-11-27 13:48:34 +08:00
openeuler-ci-bot
102d9542e7 !1 Init package
Merge pull request !1 from 陈棋德/master
2020-07-31 19:40:38 +08:00
dillon chen
8ea4797161 Init package 2020-07-12 13:32:21 +08:00
7 changed files with 169 additions and 73 deletions

View File

@ -1,36 +0,0 @@
# xfce4-session
#### Description
Xfce session manager
#### Software Architecture
Software architecture description
#### Installation
1. xxxx
2. xxxx
3. xxxx
#### Instructions
1. xxxx
2. xxxx
3. xxxx
#### Contribution
1. Fork the repository
2. Create Feat_xxx branch
3. Commit your code
4. Create Pull Request
#### Gitee Feature
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
4. The most valuable open source project [GVP](https://gitee.com/gvp)
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

View File

@ -1,37 +0,0 @@
# xfce4-session
#### 介绍
Xfce session manager
#### 软件架构
软件架构说明
#### 安装教程
1. xxxx
2. xxxx
3. xxxx
#### 使用说明
1. xxxx
2. xxxx
3. xxxx
#### 参与贡献
1. Fork 本仓库
2. 新建 Feat_xxx 分支
3. 提交代码
4. 新建 Pull Request
#### 码云特技
1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md
2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目,是码云综合评定出的优秀开源项目
5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

42
xfce-mimeapps.list Normal file
View File

@ -0,0 +1,42 @@
[Default Applications]
application/x-dia-diagram=dia.desktop
image/x-xcf=gimp.desktop
image/x-compressed-xcf=gimp.desktop
image/x-psd=gimp.desktop
text/html=exo-web-browser.desktop
application/xhtml+xml=exo-web-browser.desktop
x-scheme-handler/http=exo-web-browser.desktop
x-scheme-handler/https=exo-web-browser.desktop
x-scheme-handler/geo=exo-web-browser.desktop
image/svg+xml=exo-web-browser.desktop
text/plain=mousepad.desktop
image/png=ristretto.desktop
image/gif=ristretto.desktop
image/jpeg=ristretto.desktop
image/bmp=ristretto.desktop
image/x-pixmap=ristretto.desktop
image/tiff=ristretto.desktop
image/svg+xml=ristretto.desktop
image/x-xpixmap=ristretto.desktop
inode/directory=Thunar-folder-handler.desktop
application/x-arj=xarchiver.desktop
application/arj=xarchiver.desktop
application/x-bzip=xarchiver.desktop
application/x-bzip-compressed-tar=xarchiver.desktop
application/x-gzip=xarchiver.desktop
application/x-rar=xarchiver.desktop
application/x-rar-compressed=xarchiver.desktop
application/x-tar=xarchiver.desktop
application/x-zip=xarchiver.desktop
application/x-zip-compressed=xarchiver.desktop
application/zip=xarchiver.desktop
application/x-7z-compressed=xarchiver.desktop
application/x-compressed-tar=xarchiver.desktop
application/x-bzip2=xarchiver.desktop
application/x-bzip2-compressed-tar=xarchiver.desktop
application/x-xz=xarchiver.desktop
application/x-xz-compressed-tar=xarchiver.desktop
application/x-cpio=xarchiver.desktop
application/x-cpio-compressed=xarchiver.desktop
application/x-lzop=xarchiver.desktop
text/calendar=xfcalendar.desktop

View File

@ -0,0 +1,21 @@
--- a/scripts/startxfce4.in
+++ a/scripts/startxfce4.in
@@ -108,13 +108,15 @@ then
SERVERRC="-- $SERVERRC"
fi
+tty_num=$(echo $(tty | grep -o '[0-9]'))
+
if [ -f $BASEDIR/xinitrc ]; then
- exec $prog $BASEDIR/xinitrc $CLIENTRC $SERVERRC
+ exec $prog $BASEDIR/xinitrc $CLIENTRC $SERVERRC vt${tty_num}
elif [ -f $HOME/.xfce4/xinitrc ]; then
mkdir -p $BASEDIR
cp $HOME/.xfce4/xinitrc $BASEDIR/
- exec $prog $BASEDIR/xinitrc $CLIENTRC $SERVERRC
+ exec $prog $BASEDIR/xinitrc $CLIENTRC $SERVERRC vt${tty_num}
else
- exec $prog @_sysconfdir_@/xdg/xfce4/xinitrc $CLIENTRC $SERVERRC
+ exec $prog @_sysconfdir_@/xdg/xfce4/xinitrc $CLIENTRC $SERVERRC vt${tty_num}
fi

Binary file not shown.

102
xfce4-session.spec Normal file
View File

@ -0,0 +1,102 @@
%global xfceversion 4.18
Name: xfce4-session
Version: 4.18.0
Release: 1
Summary: Xfce session manager
License: GPLv2+
URL: http://www.xfce.org/
Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
# Add a xfce-mimeapps.list to allow setting mime handlers for Xfce apps
Source2: xfce-mimeapps.list
# Patch startxfce4 to keep it on the same vty for logind
Patch1: xfce-session-4.10-startxfce4.patch
BuildRequires: make
BuildRequires: dbus-devel >= 1.1.0
BuildRequires: dbus-glib-devel >= 0.84
BuildRequires: glib2-devel >= 2.24.0
BuildRequires: libSM-devel
BuildRequires: libwnck3-devel >= 3.14
BuildRequires: libxfce4ui-devel >= %{xfceversion}
BuildRequires: startup-notification-devel
BuildRequires: xfce4-panel-devel >= %{xfceversion}
BuildRequires: xfconf-devel >= %{xfceversion}
BuildRequires: iceauth xrdb xset
# Build tools
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: libxslt
#BuildRequires: libxml2
BuildRequires: systemd-devel >= 195
BuildRequires: polkit-devel
BuildRequires: libtool
Requires: iceauth xrdb xset
Requires: xfce-polkit >= 0.2-2
Requires: systemd >= 195
# Needed for exo desktop preferred applications
Requires: exo
Suggests: imsettings-xfce
Obsoletes: xfce-utils < 4.8.3-7
# splash screens no longer exists
Obsoletes: xfce4-session-engines <= 4.13.1
Obsoletes: xfce4-session-devel <= 4.13.3
%description
xfce4-session is the session manager for the Xfce desktop environment.
%prep
%autosetup -p1
%build
%configure --disable-static
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%make_build
%install
%make_install
# remove xscreensaver autostart file
rm -fr %{buildroot}%{_sysconfdir}/xdg/autostart/xscreensaver.desktop
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}
# install our xfce-mimeapps.list file to set mime handlers
mkdir -p %{buildroot}%{_datadir}/applications
cp -a %{SOURCE2} %{buildroot}%{_datadir}/applications/xfce-mimeapps.list
%files -f %{name}.lang
%license COPYING
%doc AUTHORS BUGS ChangeLog NEWS TODO
%doc doc/FAQ doc/NEWS.pre-4.3 doc/README.Kiosk
%{_sysconfdir}/xdg/xfce4
%{_bindir}/*
%dir %{_libdir}/xfce4/session/
%{_libdir}/xfce4/session/xfsm-shutdown-helper
%{_datadir}/applications/*.desktop
%{_datadir}/applications/xfce-mimeapps.list
%{_datadir}/xsessions/xfce.desktop
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/polkit-1/actions/org.xfce.session.policy
%{_mandir}/man1/*
%changelog
* Wed Jan 04 2023 misaka00251 <liuxin@iscas.ac.cn> - 4.18.0-1
- Update to 4.18.0
* Fri Jun 18 2021 zhanglin <lin.zhang@turbolinux.com.cn> - 4.16.0-1
- Update to 4.16.0
* Sun Jul 12 2021 Dillon Chen <dillon.chen@turbolinux.com.cn> - 4.14.2-1
- Init package

4
xfce4-session.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: git
src_repo: https://gitlab.xfce.org/xfce/xfce4-session.git
tag_prefix: "xfce4-session-"
seperator: "."