public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Shawn W Dunn <sfalken@kalpadesktop.org>
To: git-commits@fedoraproject.org
Subject: [rpms/lxqt-panel] f44: Merge branch 'rawhide' into f44
Date: Fri, 29 May 2026 21:59:06 GMT	[thread overview]
Message-ID: <178009194681.1.2943520988013190421.rpms-lxqt-panel-b189d4557f73@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/lxqt-panel
Branch : f44
Commit : b189d4557f737a79e1ec950639ac042487ebdd34
Author : Shawn W Dunn <sfalken@kalpadesktop.org>
Date   : 2026-05-29T21:44:47+00:00
Stats  : +20/-37 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/lxqt-panel/c/b189d4557f737a79e1ec950639ac042487ebdd34?branch=f44

Log:
Merge branch 'rawhide' into f44

---
diff --git a/.gitignore b/.gitignore
index 8a769dc..a1639a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /lxqt-panel-2.3.2.tar.gz
 /lxqt-panel-2.3.3.tar.gz
 /lxqt-panel-2.4.0.tar.gz
+/lxqt-panel-2.4.1.tar.gz

diff --git a/0101-use-wlroots-backend-with-unknown-compositors.patch b/0101-use-wlroots-backend-with-unknown-compositors.patch
index 5fb97ac..84596fd 100644
--- a/0101-use-wlroots-backend-with-unknown-compositors.patch
+++ b/0101-use-wlroots-backend-with-unknown-compositors.patch
@@ -1,7 +1,7 @@
-From a66b37aed30df9968c054f53ec8dede90a6ee081 Mon Sep 17 00:00:00 2001
+From b8b21526d2d92bbffe61a2ed77b06bcdf3e1ca7b Mon Sep 17 00:00:00 2001
 From: "Shawn W. Dunn" <sfalken@cloverleaf-linux.org>
 Date: Mon, 23 Jun 2025 09:18:13 +0000
-Subject: [PATCH] use wlroots backend with unknown compositors
+Subject: [PATCH 1/2] use wlroots backend with unknown compositors
 
 The description of the LXQtPanelApplicationPrivate::loadBackend() method
 already states that if we cannot identify the correct backend for a
@@ -33,5 +33,5 @@ index 51a3237..d366636 100644
          qDebug() << "Specialized backend unavailable. Falling back to generic wlroots";
          preferredBackend = QStringLiteral("wlroots");
 -- 
-2.49.0
+2.54.0
 

diff --git a/lxqt-panel.spec b/lxqt-panel.spec
index 45b5720..c662bf9 100644
--- a/lxqt-panel.spec
+++ b/lxqt-panel.spec
@@ -1,7 +1,7 @@
 Name:          lxqt-panel
 Summary:       Main panel bar for LXQt desktop suite
-Version:       2.4.0
-Release:       3%{?dist}
+Version:       2.4.1
+Release:       1%{?dist}
 License:       LGPL-2.1-or-later
 URL:           https://lxqt-project.org/
 Source0:       https://github.com/lxqt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
@@ -15,7 +15,7 @@ Patch0:        0001-set-fedora-launcher-icon.patch
 Patch0101:   0101-use-wlroots-backend-with-unknown-compositors.patch
 
 BuildRequires:  cmake
-BuildREquires:  desktop-file-utils
+BuildRequires:  desktop-file-utils
 BuildRequires:  gcc-c++
 BuildRequires:  git-core
 BuildRequires:  lm_sensors-devel
@@ -63,6 +63,8 @@ BuildRequires:  pkgconfig(wayland-client)
 Requires: lxqt-menu-data
 Recommends: xscreensaver-base
 
+Obsoletes:      %{name}-l10n < %{version}-%{release}
+Provides:       %{name}-l10n = %{version}-%{release}
 %description
 %{summary}.
 
@@ -73,13 +75,6 @@ Requires: %{name} = %{version}-%{release}
 %description devel
 %{summary}.
 
-%package l10n
-BuildArch:      noarch
-Summary:        Translations for lxqt-panel
-Requires:       lxqt-panel
-%description l10n
-This package provides translations for the lxqt-panel package.
-
 %prep
 %autosetup -S git_am
 
@@ -90,27 +85,12 @@ This package provides translations for the lxqt-panel package.
 %install
 %cmake_install
 
-%find_lang lxqt-panel --with-qt
-%find_lang cpuload --with-qt
-%find_lang desktopswitch --with-qt
-%find_lang directorymenu --with-qt
-%find_lang mainmenu --with-qt
-%find_lang mount --with-qt
-%find_lang networkmonitor --with-qt
-%find_lang quicklaunch --with-qt
-%find_lang sensors --with-qt
-%find_lang showdesktop --with-qt
-%find_lang spacer --with-qt
-%find_lang statusnotifier --with-qt
-%find_lang sysstat --with-qt
-%find_lang taskbar --with-qt
-%find_lang volume --with-qt
-%find_lang worldclock --with-qt
+%find_lang %{name} --with-qt --all-name
 
 %check
 desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}.desktop
 
-%files
+%files -f %{name}.lang
 %{_bindir}/lxqt-panel
 %{_libdir}/lxqt-panel/
 %{_datadir}/lxqt
@@ -123,17 +103,16 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}.desktop
 %dir %{_includedir}/lxqt
 %{_includedir}/lxqt/*
 
-%files l10n -f lxqt-panel.lang -f cpuload.lang -f desktopswitch.lang -f directorymenu.lang  -f mainmenu.lang -f mount.lang -f networkmonitor.lang -f quicklaunch.lang -f sensors.lang -f showdesktop.lang -f spacer.lang -f statusnotifier.lang -f sysstat.lang -f taskbar.lang -f volume.lang -f worldclock.lang
-%license LICENSE
-%doc AUTHORS CHANGELOG README.md
-%dir %{_datadir}/lxqt/translations/lxqt-panel
 
 %changelog
+* Fri May 29 2026 Shawn W Dunn <sfalken@kalpadesktop.org> - 2.4.1-1
+- Update to 2.4.1
+
 * Thu May 14 2026 Jan Grulich <jgrulich@redhat.com> - 2.4.0-3
 - Rebuild (qt6)
 
 * Wed May 06 2026 Shawn W Dunn <sfalken@kalpadesktop.org> - 2.4.0-2
-- Add 0001-set-fedora-launcher-icon.patch
+- Drop l10n package, add patch for Fedora launcher icon
 
 * Thu Apr 23 2026 Shawn W Dunn <sfalken@kalpadesktop.org> - 2.4.0-1
 - Update to 2.4.0

diff --git a/sources b/sources
index cb1529f..fba0890 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lxqt-panel-2.4.0.tar.gz) = 86a34a7c33c9c284d2de1a6f78fb11861de608c1791adb5ece118ab8afb2a3bafb4f35dbf6fa5633f27de081bb8ac89ed6491381e9bd9f4606f4ae0df492095e
+SHA512 (lxqt-panel-2.4.1.tar.gz) = 5fe8aa6ffe276a5474c758f4458edf0cf7d04b77121e56c891ff8819ee3965bb65106848128aac2ce22e9d38ec64d7d3ca3421093947fe844e595a09bb3d418f

diff --git a/lxqt-panel.spec b/lxqt-panel.spec
index b04f5e0..c662bf9 100644
--- a/lxqt-panel.spec
+++ b/lxqt-panel.spec
@@ -7,7 +7,7 @@ URL:           https://lxqt-project.org/
 Source0:       https://github.com/lxqt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 
 # Fedora config patches
-# Changes fancymenu icon to fedora default icon
+# Adds fedora icon to fancymenu launcher by default
 Patch0:        0001-set-fedora-launcher-icon.patch
 
 # Proposed upstream
@@ -108,6 +108,9 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}.desktop
 * Fri May 29 2026 Shawn W Dunn <sfalken@kalpadesktop.org> - 2.4.1-1
 - Update to 2.4.1
 
+* Thu May 14 2026 Jan Grulich <jgrulich@redhat.com> - 2.4.0-3
+- Rebuild (qt6)
+
 * Wed May 06 2026 Shawn W Dunn <sfalken@kalpadesktop.org> - 2.4.0-2
 - Drop l10n package, add patch for Fedora launcher icon
 

                 reply	other threads:[~2026-05-29 21:59 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178009194681.1.2943520988013190421.rpms-lxqt-panel-b189d4557f73@fedoraproject.org \
    --to=sfalken@kalpadesktop.org \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox