diff --git a/02_pager-size-for-viewport.patch b/02_pager-size-for-viewport.patch index e23fdc1075fd9a98efe795077588163805ca6c56..f49f32d20ef761433609529094cd4e7f7971d40c 100644 --- a/02_pager-size-for-viewport.patch +++ b/02_pager-size-for-viewport.patch @@ -1,7 +1,10 @@ -diff -uNr xfce4-panel-4.16.0.orig/plugins/pager/pager.c xfce4-panel-4.16.0/plugins/pager/pager.c ---- xfce4-panel-4.16.0.orig/plugins/pager/pager.c 2020-12-11 07:14:07.000000000 +0800 -+++ xfce4-panel-4.16.0/plugins/pager/pager.c 2021-06-16 10:48:07.941357680 +0800 -@@ -776,6 +776,19 @@ +Description: Fix workspace miniature size calculation wrong for viewport mode +Author: Bin Guo +Debian-Bug: https://bugs.debian.org/785582 + +--- a/plugins/pager/pager.c ++++ b/plugins/pager/pager.c +@@ -662,6 +662,18 @@ pager_plugin_get_preferred_width (GtkWid else if (plugin->miniature_view) { n_workspaces = wnck_screen_get_workspace_count (plugin->wnck_screen); @@ -17,7 +20,6 @@ diff -uNr xfce4-panel-4.16.0.orig/plugins/pager/pager.c xfce4-panel-4.16.0/plugi + * (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.14.4.tar.bz2 b/xfce4-panel-4.14.4.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..b5c00c505b4301b7a1146ae343697341cf6ca5a9 Binary files /dev/null and b/xfce4-panel-4.14.4.tar.bz2 differ diff --git a/xfce4-panel.spec b/xfce4-panel.spec index 27ed206b8f0eeeac638496e2f614777a08df94bd..273ac564e5fb2ac232da3ec4eff57c9fe0cbd930 100644 --- a/xfce4-panel.spec +++ b/xfce4-panel.spec @@ -1,18 +1,15 @@ -%global xfceversion 4.16 - -%global namespc Libxfce4panel - +%global xfceversion 4.14 +# Don't check .so files in /lib64/xfce4/panel/plugins %global __provides_exclude_from ^%{_libdir}/xfce4/panel/plugins/.*\\.so$ %global _with_vala 0 Name: xfce4-panel -Version: 4.16.0 -Release: 1 -Summary: Next generation panel for Xfce - +Version: 4.14.4 +Release: 2 +Summary: panel for Xfce4 desktop environment License: GPLv2+ and LGPLv2+ +#Group: Development/Libraries URL: http://www.xfce.org/ -#VCS git:git://git.xfce.org/xfce/xfce4-panel Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2 # clock icon taken from system-config-date, license is GPLv2+ @@ -21,7 +18,8 @@ Source2: xfce4-clock.svg # patch from Debian Patch1: 02_pager-size-for-viewport.patch -BuildRequires: make +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +#BuildArch: noarch BuildRequires: gcc-c++ BuildRequires: gtk3-devel BuildRequires: libxfce4ui-devel >= %{xfceversion} @@ -36,25 +34,15 @@ BuildRequires: intltool BuildRequires: desktop-file-utils BuildRequires: gtk-doc BuildRequires: gobject-introspection-devel -BuildRequires: libdbusmenu-gtk3-devel - %if %{_with_vala} BuildRequires: vala %endif - -# obsolete old plugins -Obsoletes: orage < 4.12.1-17 -Obsoletes: xfce4-embed-plugin < 1.6.0-13 -Obsoletes: xfce4-cellmodem-plugin < 0.0.5-29 -Obsoletes: xfce4-kbdleds-plugins < 0.0.6-20 -Obsoletes: xfce4-hardware-monitor-plugin < 1.6.0-11 - %description This package includes the panel for the Xfce desktop environment. %package devel -Summary: Development headers for xfce4-panel +Summary: Xfce4 panel development files Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: libxfce4util-devel >= %{xfceversion} @@ -64,7 +52,6 @@ Requires: libxfce4ui-devel >= %{xfceversion} This package includes the header files you will need to build plugins for xfce4-panel. - %prep %setup -q %patch1 -p1 -b .default @@ -72,9 +59,13 @@ plugins for xfce4-panel. # 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 \ +%if !%{_with_vala} + --enable-vala=no \ +%endif + --enable-gtk-doc \ + --disable-static # Remove rpaths sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -89,8 +80,19 @@ export LD_LIBRARY_PATH="`pwd`/libxfce4panel/.libs" %install %make_install +# fix permissions for installed libs +chmod 755 %{buildroot}%{_libdir}/*.so + find %{buildroot} -name '*.la' -exec rm -f {} ';' +# remove duplicate docs +rm -f %{buildroot}%{_docdir}/xfce4-panel/README.gtkrc-2.0 + +# FIXME: We need to own these dirs until all plugins are ported to Xfce 4.8 +mkdir -p %{buildroot}%{_libexecdir}/xfce4/panel-plugins +mkdir -p %{buildroot}%{_libdir}/xfce4/panel-plugins +mkdir -p %{buildroot}%{_datadir}/xfce4/panel-plugins + %find_lang %{name} desktop-file-validate %{buildroot}/%{_datadir}/applications/panel-desktop-handler.desktop @@ -102,13 +104,13 @@ install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ %files -f %{name}.lang %license COPYING -%doc AUTHORS ChangeLog NEWS +%doc AUTHORS ChangeLog NEWS README docs/README.gtkrc-2.0 %config(noreplace) %{_sysconfdir}/xdg/xfce4/panel/default.xml %{_bindir}/* %{_libdir}/libxfce4panel-*.so.* %{_libdir}/xfce4/panel/ -%{_libdir}/girepository-1.0/%{namespc}-2.0.typelib -%{_datadir}/gir-1.0/%{namespc}-2.0.gir +%{_libdir}/girepository-1.0/libxfce4panel-2.0.typelib +%{_datadir}/gir-1.0/libxfce4panel-2.0.gir %{_datadir}/icons/hicolor/*/*/* %{_datadir}/xfce4/panel/ %{_datadir}/applications/*.desktop @@ -116,6 +118,10 @@ install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ %{_datadir}/vala/vapi/libxfce4panel-2.0.deps %{_datadir}/vala/vapi/libxfce4panel-2.0.vapi %endif +# FIXME: Remove these when no longer needed +%dir %{_libexecdir}/xfce4/panel-plugins/ +%dir %{_libdir}/xfce4/panel-plugins +%dir %{_datadir}/xfce4/panel-plugins %files devel %{_libdir}/pkgconfig/* @@ -124,8 +130,5 @@ install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ %{_includedir}/xfce4/libxfce4panel-*/ %changelog -* Fri Jun 18 2021 zhanglin - 4.16.0-1 -- Update to 4.16.0 - * Thu Jul 9 2020 Dillon Chen - 4.14.4-1 - Init package