diff --git a/02_pager-size-for-viewport.patch b/02_pager-size-for-viewport.patch deleted file mode 100644 index e8859ad67e33e716d4b17b4ce825e58f2849ca75..0000000000000000000000000000000000000000 --- a/02_pager-size-for-viewport.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -uNr xfce4-panel-4.18.0.orig/plugins/pager/pager.c xfce4-panel-4.18.0/plugins/pager/pager.c ---- xfce4-panel-4.18.0.orig/plugins/pager/pager.c 2020-12-11 07:14:07.000000000 +0800 -+++ xfce4-panel-4.18.0/plugins/pager/pager.c 2021-06-16 10:48:07.941357680 +0800 -@@ -776,6 +776,19 @@ - else if (plugin->miniature_view) - { - n_workspaces = wnck_screen_get_workspace_count (plugin->wnck_screen); -+ if (n_workspaces == 1) -+ { -+ WnckWorkspace *active_ws; -+ /* check if we ware in viewport mode */ -+ active_ws = wnck_screen_get_active_workspace (plugin->wnck_screen); -+ if (wnck_workspace_is_virtual (active_ws)) -+ { -+ /* number of rows * number of columns */ -+ n_workspaces = (wnck_workspace_get_width (active_ws) / wnck_screen_get_width (plugin->wnck_screen)) -+ * (wnck_workspace_get_height (active_ws) / wnck_screen_get_height (plugin->wnck_screen)); -+ } -+ } -+ - n_cols = MAX (1, (n_workspaces + plugin->rows - 1) / plugin->rows); - min_width = nat_width = (gint) (xfce_panel_plugin_get_size (XFCE_PANEL_PLUGIN (plugin)) / plugin->rows * plugin->ratio * n_cols); - } diff --git a/xfce4-panel-4.18.0.tar.bz2 b/xfce4-panel-4.18.0.tar.bz2 deleted file mode 100644 index b8ee29d3a52c2b6f0e15e3bda1c38dcde1f7cea7..0000000000000000000000000000000000000000 Binary files a/xfce4-panel-4.18.0.tar.bz2 and /dev/null differ diff --git a/xfce4-panel-4.18.6.tar.bz2 b/xfce4-panel-4.18.6.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..cdec2f598b08a9418aa0cbf9d7965fb9ef4daf73 Binary files /dev/null and b/xfce4-panel-4.18.6.tar.bz2 differ diff --git a/xfce4-panel.spec b/xfce4-panel.spec index 2769ce6f2e04fb4aabf0c73607f9e857dddac314..43809a6a401d89f1463b42e54ddd9e001b965a6a 100644 --- a/xfce4-panel.spec +++ b/xfce4-panel.spec @@ -6,8 +6,8 @@ %global _with_vala 1 Name: xfce4-panel -Version: 4.18.0 -Release: 2 +Version: 4.18.6 +Release: 1 Summary: Next generation panel for Xfce License: GPLv2+ and LGPLv2+ @@ -18,8 +18,6 @@ Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}- # clock icon taken from system-config-date, license is GPLv2+ Source1: xfce4-clock.png Source2: xfce4-clock.svg -# patch from Debian -Patch1: 02_pager-size-for-viewport.patch BuildRequires: make BuildRequires: gcc-c++ @@ -67,14 +65,13 @@ plugins for xfce4-panel. %prep %setup -q -%patch1 -p1 -b .default # Fix icon in 'Add new panel item' dialog sed -i 's|Icon=office-calendar|Icon=xfce4-clock|g' plugins/clock/clock.desktop.in.in %build -%configure --enable-gtk-doc --disable-static +%configure --enable-gtk-doc --disable-static # Remove rpaths sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -124,6 +121,9 @@ install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ %{_includedir}/xfce4/libxfce4panel-*/ %changelog +* Tue Jul 09 2024 misaka00251 - 4.18.6-1 +- Update to 4.18.6 + * Mon Feb 27 2023 wenlong ding - 4.18.0-2 - Enable vala compile support.