diff --git a/lxqt-0.13.0-xdg-config-dir.patch b/lxqt-0.13.0-xdg-config-dir.patch index bb94460..d7b0de0 100644 --- a/lxqt-0.13.0-xdg-config-dir.patch +++ b/lxqt-0.13.0-xdg-config-dir.patch @@ -7,25 +7,19 @@ From: Simon Quigley Date: Fri, 25 May 2018 22:57:21 -0500 Subject: [PATCH] Ensure all paths are added to $XDG_CONFIG_DIRS. ---- - startlxqt.in | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/startlxqt.in b/startlxqt.in -index ae0569e..58b2b25 100755 ---- a/startlxqt.in -+++ b/startlxqt.in -@@ -26,9 +26,11 @@ export XDG_DATA_DIRS +diff -urEbw lxqt-session-1.1.0/startlxqt.in lxqt-session-1.1.0.new/startlxqt.in +--- lxqt-session-1.1.0/startlxqt.in 2022-04-16 15:16:20.000000000 +0200 ++++ lxqt-session-1.1.0.new/startlxqt.in 2022-04-29 08:02:41.790512998 +0200 +@@ -26,9 +26,11 @@ if [ -z "$XDG_CONFIG_DIRS" ]; then export XDG_CONFIG_DIRS="@PREDEF_XDG_CONFIG_DIRS@" else - if ! contains "$XDG_CONFIG_DIRS" '@LXQT_ETC_XDG_DIR@'; then - XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:@LXQT_ETC_XDG_DIR@" -- fi + for directory in "/etc" "@LXQT_ETC_XDG_DIR@" "/usr/share"; do + if ! contains "$XDG_CONFIG_DIRS" "$directory"; then + XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:$directory" -+ fi + fi + done fi diff --git a/lxqt-session-1.0.1.tar.xz b/lxqt-session-1.0.1.tar.xz deleted file mode 100644 index 91127e0..0000000 --- a/lxqt-session-1.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3245457cb4a1e59ec62802308c872173baa300fa0f8e517fe14f45112733a6c1 -size 182644 diff --git a/lxqt-session-1.0.1.tar.xz.asc b/lxqt-session-1.0.1.tar.xz.asc deleted file mode 100644 index 3182c4e..0000000 --- a/lxqt-session-1.0.1.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmHP53oVHHRzdWphbjIw -MDBAZ21haWwuY29tAAoJEL55MAetIt9+tPYQANZQI4E9HrlY2ohZlu4zrhs3Rt8F -xnVqkm4JTdgoRvI8DWilKCHlfStfcbPkzEZkGe/RZyy+LhU+aLVHUn+Kc27Qx3z7 -66YHUqgWe4RQhmB2rxMg1AK6CdUTIBGXySEfzYVsezI5FbS3t4B2mhpCFVxQQRnB -l4aJdWRQq150IN/+Jso3Y1HdtHW5bHgdi2SNurKXg/Jnaw2hKV4spJpD3W6qJ6pF -lBqjp4yjnW1OK8/KzyqqKJrUlxeaRM6UqRWXUZBvbbvntAox5EL+VI0lnizplVQj -KJynroVerZrnclLT5rVRW2oAzVLilNay+9BSMisHg5Jp9C+N/oaeImwZVmiYKXaW -Sc8ooxH07I0bD4wRLmb1R3BewPsJGYk2qt+FRQmzrUpL1h846IO1jHiAlJPEIFDu -NpF8FCEF5HRP5EzNjBPBysaPO9aEHnZguMreJ8SDI8KrevIk8yO0qsBFM0+Wss2m -6SdjaSl/6HfpD0o4EskqeU57ntGc7w5wD9+Ip437B93VozkwcnRtHftVvC+9VWjQ -wl184T1PHNTqnWAsAN2TNtipMOYGRZGDdvKV7KZ9hxeu6u+QQNeDV5ejOlBcC1mY -bB2Za++NcQ6PyIp478v75GARvQhfVjVycN6t20KD3PFhIzBPMUpz5sfOgRXXJ/8G -mXEttnNgWoBR/Xuc -=m+fh ------END PGP SIGNATURE----- diff --git a/lxqt-session-1.1.0.tar.xz b/lxqt-session-1.1.0.tar.xz new file mode 100644 index 0000000..76d59a9 --- /dev/null +++ b/lxqt-session-1.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ca98a17eec1b6e084860d92764a34e4e21286a37b90796f1c523c0d576fb117 +size 184448 diff --git a/lxqt-session-1.1.0.tar.xz.asc b/lxqt-session-1.1.0.tar.xz.asc new file mode 100644 index 0000000..36202fc --- /dev/null +++ b/lxqt-session-1.1.0.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJJBAABCAAzFiEEGd/fOleb1QnbtXLYvnkwB60i334FAmJawgwVHHRzdWphbjIw +MDBAZ21haWwuY29tAAoJEL55MAetIt9+DwUQAKvbmS5zgo+98L2gIAwxiwexXPSQ ++591pCgAAURftH+i0Pyf7SSlotuswXsfpPU8UOpDjbHxQqFBMCLkzr5I9vDSX1OY +xob0prucqrbtEv48xubmlVvTOeTokCSGgJj60qDT6H68nvl8HtCa81c/TuZ8YKIr +1FUm/XSkab/KnMfKCGGZfpu/K9rbwi0XfE66DUT1eMPNPHpsw6N8qmpPACgaIgpt +x6EPVeo88l6iplq37IruIZozG8YIJvQMURcGvk4FfX+dCi8Jg/HCRh874CphA7DY +t9gtKC3fNPM0wXml5nEQE4v5RHleLO1ce0bvN7h5h7FxaGOYSOw6itzxL/B4WNRS +85lNE8IsvV11MebDKDdgmhTF/CS+28tBb4qdkU8MzoynpNLaf18GITJaCkZp9Hsp +E75eaIuQT9qta8gwuC+gi7ecEAX4htDoO4aL1MhIsFdnl/wDZW3Hx7pDjmerv1LD +EWlhzSjpJJAyuW+J0qb2bj68C6k+z5VqmwOtxZXUDxHJgh1589ZzvSbzVNN+cFLZ +OrAuQWcOGkvrvX3n1JYBCLGw7lPr6Yhx0jzUBK7oqhmWZ0kWHYeNRilCzMR2duBI +gibqh33956xoX3ZlPJt/hxxPpD9dtuP/JANmMIFvSdF7m9Hpvqu3WCuXdCQ8pdeR +B48pMFga93ZNSIzo +=H1Rr +-----END PGP SIGNATURE----- diff --git a/lxqt-session-icontheme.patch b/lxqt-session-icontheme.patch deleted file mode 100644 index d68f5b3..0000000 --- a/lxqt-session-icontheme.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urEbwB lxqt-session-0.13.0/config/lxqt.conf lxqt-session-0.13.0.new/config/lxqt.conf ---- lxqt-session-0.13.0/config/lxqt.conf 2018-05-21 20:58:27.000000000 +0200 -+++ lxqt-session-0.13.0.new/config/lxqt.conf 2018-10-23 18:02:30.429217422 +0200 -@@ -1,6 +1,6 @@ - [General] - theme=frost --icon_theme=oxygen -+icon_theme=breeze - single_click_activate=false - tool_button_style=ToolButtonTextBesideIcon - diff --git a/lxqt-session.changes b/lxqt-session.changes index ead4508..ea2e99e 100644 --- a/lxqt-session.changes +++ b/lxqt-session.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Apr 29 05:58:38 UTC 2022 - Michael Vetter + +- Update to 1.1.0: + * Added a simple option for global screen scaling. + * Set Clearlooks as the default LXQt theme and changed the default + icon theme to Breeze. + * Add NetBSD support. + * Prevented cut text in the header of Environment page of LXQt + Session Settings. +- Remove lxqt-session-icontheme.patch: + Upstream is using breeze now by default. + Patch was added for bsc#1112961 bsc#1159958 + ------------------------------------------------------------------- Sat Apr 2 07:38:13 UTC 2022 - Andreas Stieger diff --git a/lxqt-session.spec b/lxqt-session.spec index 2bb62e2..7a9ee49 100644 --- a/lxqt-session.spec +++ b/lxqt-session.spec @@ -17,7 +17,7 @@ Name: lxqt-session -Version: 1.0.1 +Version: 1.1.0 Release: 0 Summary: LXQt Session Manager License: LGPL-2.1-or-later @@ -28,14 +28,12 @@ Source1: https://github.com/lxqt/%{name}/releases/download/%{version}/%{n Source2: %{name}.keyring # FIX-OPENSUSE mvetter@suse.com bsc#1099800 Patch0: lxqt-0.13.0-xdg-config-dir.patch -# mvetter@suse.com bsc#1112961 bsc#1159958 - Nicer icons - theme gets required by patterns-lxqt -Patch1: lxqt-session-icontheme.patch # mvetter@suse.com bsc#1127043 - Use Openbox as default WM -Patch2: lxqt-session-default_wm.patch +Patch1: lxqt-session-default_wm.patch BuildRequires: cmake >= 3.0.2 BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: lxqt-build-tools-devel >= 0.10.0 +BuildRequires: lxqt-build-tools-devel >= 0.11.0 BuildRequires: pkgconfig BuildRequires: xdg-user-dirs BuildRequires: cmake(KF5WindowSystem) >= 5.36.0 @@ -44,7 +42,7 @@ BuildRequires: pkgconfig(Qt5Xdg) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libprocps) BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(lxqt) >= 1.0.0 +BuildRequires: pkgconfig(lxqt) >= 1.1.0 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) Requires(post): update-alternatives @@ -65,7 +63,6 @@ use when a user logs out and to restart them the next time the user logs in. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 # Changing LXQt into X-LXQt in desktop files to be freedesktop compliant and shut rpmlint warnings #find -name '*desktop.in*' -exec sed -ri 's/(LXQt;)/X-\1/' {} + @@ -95,8 +92,6 @@ ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadi %files %license LICENSE %doc AUTHORS -%dir %{_datadir}/kdm/ -%dir %{_datadir}/kdm/sessions/ %{_bindir}/lxqt-config-session %{_bindir}/lxqt-session %{_bindir}/lxqt-leave @@ -104,7 +99,6 @@ ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadi %{_mandir}/man?/lxqt-*%{ext_man} %config %{_sysconfdir}/xdg/autostart/lxqt-xscreensaver-autostart.desktop %{_bindir}/startlxqt -%{_datadir}/kdm/sessions/lxqt.desktop %{_mandir}/man1/startlxqt.1%{?ext_man} %{_datadir}/xsessions/lxqt.desktop %config %{_datadir}/lxqt/lxqt.conf