diff --git a/lxpanel-0.10.2-default.patch b/lxpanel-0.5.9-default.patch similarity index 84% rename from lxpanel-0.10.2-default.patch rename to lxpanel-0.5.9-default.patch index e4984f2..898296e 100644 --- a/lxpanel-0.10.2-default.patch +++ b/lxpanel-0.5.9-default.patch @@ -1,18 +1,20 @@ diff -dur lxpanel-0.5.9.orig/data/default/panels/panel.in lxpanel-0.5.9/data/default/panels/panel.in --- lxpanel-0.5.9.orig/data/default/panels/panel.in 2012-04-08 01:27:42.000000000 +0200 +++ lxpanel-0.5.9/data/default/panels/panel.in 2012-06-10 19:12:25.864088270 +0200 -@@ -14,8 +14,8 @@ +@@ -14,10 +14,10 @@ setdocktype=1 setpartialstrut=1 usefontcolor=1 - fontcolor=#ffffff -- background=1 + fontcolor=#000000 + usefontsize=0 + fontsize=10 +- background=1 + background=0 backgroundfile=@prefix@/share/lxpanel/images/background.png } -@@ -30,12 +30,13 @@ +@@ -37,12 +37,13 @@ separator { } item { @@ -27,7 +29,7 @@ diff -dur lxpanel-0.5.9.orig/data/default/panels/panel.in lxpanel-0.5.9/data/def command=logout } } -@@ -69,6 +70,7 @@ +@@ -75,6 +76,7 @@ Config { Button1=iconify Button2=shade @@ -44,9 +46,9 @@ diff -dur lxpanel-0.5.9.orig/data/two_panels/panels/bottom.in lxpanel-0.5.9/data usefontcolor=0 - fontcolor=#ffffff + fontcolor=#000000 + usefontsize=0 + fontsize=10 background=0 - backgroundfile=@prefix@/share/lxpanel/images/background.png - } @@ -33,6 +33,7 @@ Config { Button1=iconify @@ -64,10 +66,17 @@ diff -dur lxpanel-0.5.9.orig/data/two_panels/panels/top.in lxpanel-0.5.9/data/tw usefontcolor=0 - fontcolor=#ffffff + fontcolor=#000000 + usefontsize=0 + fontsize=10 background=0 - backgroundfile=@prefix@/share/lxpanel/images/background.png - } -@@ -30,13 +30,14 @@ +@@ -31,19 +31,20 @@ + Plugin { + type = menu + Config { +- image = @prefix@/share/lxpanel/images/my-computer.svg ++ image=@prefix@/share/lxpanel/images/my-computer.png + system { + } separator { } item { diff --git a/lxpanel-0.8.1-Fix-pager-scroll.patch b/lxpanel-0.8.1-Fix-pager-scroll.patch new file mode 100644 index 0000000..4874a9b --- /dev/null +++ b/lxpanel-0.8.1-Fix-pager-scroll.patch @@ -0,0 +1,11 @@ +--- lxpanel-0.8.1/plugins/xkb/xkb-plugin.c.revert 2015-05-07 04:44:51.000000000 +0900 ++++ lxpanel-0.8.1/plugins/xkb/xkb-plugin.c 2015-05-24 15:58:10.987343168 +0900 +@@ -190,7 +190,7 @@ + + /* Change to next or previous group. */ + xkb_change_group(xkb, +- (((event->direction == GDK_SCROLL_UP) || (event->direction == GDK_SCROLL_RIGHT)) ? 1 : -1)); ++ (((event->direction == GDK_SCROLL_DOWN) || (event->direction == GDK_SCROLL_RIGHT)) ? 1 : -1)); + return TRUE; + } + diff --git a/lxpanel.spec b/lxpanel.spec index 5017495..ed9f9ed 100644 --- a/lxpanel.spec +++ b/lxpanel.spec @@ -13,24 +13,23 @@ %global git_builddir %{nil} %if 0%{?use_gitbare} -%global gittardate 20251218 -%global gittartime 1122 -%global use_gitcommit_as_rel 1 +%global gittardate 20250124 +%global gittartime 1010 -%global gitbaredate 20251208 -%global git_rev 94febbf1015aee8d2d718ee451f1f09df3f6150f +%global gitbaredate 20250123 +%global git_rev 13a51958a92130674843d728805ebc39e12062ca %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} %endif -%if 0%{?use_gitcommit_as_rel} +%if 0%{?use_gitbare} %global git_ver_rpm ^%{git_version} %global git_builddir -%{git_version} %endif %dnl %global use_gcc_strict_sanitize 1 -%global main_version 0.11.1 +%global main_version 0.10.1 %global baserelease 1 Name: lxpanel @@ -51,12 +50,15 @@ Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{main_versi Source100: create-tarball-from-git.sh Source101: create-lxpanel-git-bare-tarball.sh +# Fedora bug: https://bugzilla.redhat.com/show_bug.cgi?id=746063 +Patch0: lxpanel-0.8.1-Fix-pager-scroll.patch + # Patches reported upstream Patch52: 0002-SF-894-task-button-correctly-find-the-window-current.patch ## distro specific patches # default configuration -Patch100: lxpanel-0.10.2-default.patch +Patch100: lxpanel-0.5.9-default.patch # use nm-connection-editor to edit network connections # Applied in 0.8.2 #Patch101: lxpanel-0.8.1-nm-connection-editor.patch @@ -166,6 +168,8 @@ git commit -m "base" -q cat %PATCH52 | git am cat %PATCH103 | git am +%patch -P0 -p1 -b .revert + %patch -P100 -p1 -b .default #%%patch101 -p1 -b .system-config-network %patch -P102 -p1 -b .zenity @@ -225,36 +229,6 @@ cd .. %{_libdir}/pkgconfig/lxpanel.pc %changelog -* Thu Dec 18 2025 Mamoru TASAKA - 0.11.1^20251208git94febbf1-1 -- Update to the latest git - -* Thu Jul 24 2025 Fedora Release Engineering - 0.11.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Apr 11 2025 Mamoru TASAKA - 0.11.1-1 -- 0.11.1 - -* Fri Apr 04 2025 Mamoru TASAKA - 0.11.0-1 -- 0.11.0 - -* Sat Mar 22 2025 Mamoru TASAKA - 0.10.1^20250321git28b2556c-1 -- Update to the latest git - -* Tue Mar 11 2025 Mamoru TASAKA - 0.10.1^20250311git30ebe893-1 -- Update to the latest git - -* Thu Mar 06 2025 Mamoru TASAKA - 0.10.1^20250226giteb1688da-1 -- Update to the latest git - -* Sun Feb 16 2025 Mamoru TASAKA - 0.10.1^20250215git56103c83-1 -- Update to the latest git - -* Fri Feb 14 2025 Mamoru TASAKA - 0.10.1^20250207gite4e9b89c-1 -- Update to the latest git - -* Fri Feb 07 2025 Mamoru TASAKA - 0.10.1^20250131git4dcce30a-1 -- Update to the latest git - * Fri Jan 24 2025 Mamoru TASAKA - 0.10.1^20250123git13a51958-1 - Update to the latest git diff --git a/sources b/sources index 65dc8ea..675a98b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxpanel-20251218T1122.tar.gz) = 688313f4a3a7ddd4f058d1c1b83db75fecc628453e00726d8e56cc3e72525a30d20fdbb26e175efed3cdc0d1a169c94dd31bc20d2a1cbcbaca78c5a519d91fff +SHA512 (lxpanel-20250124T1010.tar.gz) = 6e15e9603d25c249a5beb50457ecc42bc1f91b292f72a5e251da64d4197551113f851c243a2d7317c3d68292f1babdbe48b533434e41ca210c62996d422ed43f