diff --git a/xfdashboard-1.0.0.tar.bz2 b/xfdashboard-1.0.0.tar.bz2 deleted file mode 100644 index 2137277..0000000 --- a/xfdashboard-1.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5284343e5ce09722f98d3b578588b36923e1ae5649754aa906980fdcdef48a5 -size 3423708 diff --git a/xfdashboard-1.1.0.tar.xz b/xfdashboard-1.1.0.tar.xz new file mode 100644 index 0000000..6785393 --- /dev/null +++ b/xfdashboard-1.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd577b36f389d5463040d7095926a487cb4ae7ab30173aa269a1bc29bb6ff8d1 +size 2642580 diff --git a/xfdashboard-desktop-category.diff b/xfdashboard-desktop-category.diff index e4eb267..aa39765 100644 --- a/xfdashboard-desktop-category.diff +++ b/xfdashboard-desktop-category.diff @@ -1,8 +1,7 @@ -diff --git a/data/org.xfce.xfdashboard.desktop.in.in b/data/org.xfce.xfdashboard.desktop.in.in -index 7679261..fd63ac0 100644 ---- a/data/org.xfce.xfdashboard.desktop.in.in -+++ b/data/org.xfce.xfdashboard.desktop.in.in -@@ -5,6 +5,6 @@ _Comment=Maybe a Gnome shell like dashboard for Xfce +diff -rup a/data/org.xfce.xfdashboard.desktop.in.in b/data/org.xfce.xfdashboard.desktop.in.in +--- a/data/org.xfce.xfdashboard.desktop.in.in 2025-08-21 16:49:26.000000000 +0200 ++++ b/data/org.xfce.xfdashboard.desktop.in.in 2025-08-22 09:59:04.933378839 +0200 +@@ -6,6 +6,6 @@ GenericName=Xfdashboard TryExec=@bindir@/xfdashboard Exec=@bindir@/xfdashboard Icon=org.xfce.xfdashboard diff --git a/xfdashboard-desktopfile-without-binary.diff b/xfdashboard-desktopfile-without-binary.diff index 2604d1e..d5c641c 100644 --- a/xfdashboard-desktopfile-without-binary.diff +++ b/xfdashboard-desktopfile-without-binary.diff @@ -1,11 +1,10 @@ -diff --git a/data/org.xfce.xfdashboard-autostart.desktop.in.in b/data/org.xfce.xfdashboard-autostart.desktop.in.in -index 16b40aa..40db7f3 100644 ---- a/data/org.xfce.xfdashboard-autostart.desktop.in.in -+++ b/data/org.xfce.xfdashboard-autostart.desktop.in.in +diff -rup a/data/org.xfce.xfdashboard-autostart.desktop.in.in b/data/org.xfce.xfdashboard-autostart.desktop.in.in +--- a/data/org.xfce.xfdashboard-autostart.desktop.in.in 2025-08-21 16:49:26.000000000 +0200 ++++ b/data/org.xfce.xfdashboard-autostart.desktop.in.in 2025-08-22 10:00:42.357495625 +0200 @@ -2,8 +2,8 @@ Type=Application - _Name=Xfdashboard - _Comment=Start xfdashboard as daemon in background + Name=Xfdashboard + Comment=Start xfdashboard as daemon in background -TryExec=@bindir@/xfdashboard -Exec=@bindir@/xfdashboard -d +TryExec=xfdashboard @@ -13,13 +12,12 @@ index 16b40aa..40db7f3 100644 Icon=org.xfce.xfdashboard NotShowIn=GNOME;KDE;Unity; Terminal=false -diff --git a/data/org.xfce.xfdashboard-settings.desktop.in.in b/data/org.xfce.xfdashboard-settings.desktop.in.in -index 24f0ab8..9406a99 100644 ---- a/data/org.xfce.xfdashboard-settings.desktop.in.in -+++ b/data/org.xfce.xfdashboard-settings.desktop.in.in +diff -rup a/data/org.xfce.xfdashboard-settings.desktop.in.in b/data/org.xfce.xfdashboard-settings.desktop.in.in +--- a/data/org.xfce.xfdashboard-settings.desktop.in.in 2025-08-21 16:49:26.000000000 +0200 ++++ b/data/org.xfce.xfdashboard-settings.desktop.in.in 2025-08-22 10:00:46.981500296 +0200 @@ -4,8 +4,8 @@ Type=Application - _Name=Xfdashboard settings - _Comment=Configure xfdashboard + Name=Xfdashboard settings + Comment=Configure xfdashboard GenericName=Xfdashboard settings -TryExec=@bindir@/xfdashboard-settings -Exec=@bindir@/xfdashboard-settings @@ -28,13 +26,12 @@ index 24f0ab8..9406a99 100644 Icon=org.xfce.xfdashboard Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings; NotShowIn=GNOME;KDE;Unity; -diff --git a/data/org.xfce.xfdashboard.desktop.in.in b/data/org.xfce.xfdashboard.desktop.in.in -index 577ecf3..a31f4e7 100644 ---- a/data/org.xfce.xfdashboard.desktop.in.in -+++ b/data/org.xfce.xfdashboard.desktop.in.in +diff -rup a/data/org.xfce.xfdashboard.desktop.in.in b/data/org.xfce.xfdashboard.desktop.in.in +--- a/data/org.xfce.xfdashboard.desktop.in.in 2025-08-22 09:59:42.596428133 +0200 ++++ b/data/org.xfce.xfdashboard.desktop.in.in 2025-08-22 10:00:54.341509806 +0200 @@ -3,8 +3,8 @@ Type=Application - _Name=Xfdashboard - _Comment=Maybe a Gnome shell like dashboard for Xfce + Name=Xfdashboard + Comment=Maybe a Gnome shell like dashboard for Xfce GenericName=Xfdashboard -TryExec=@bindir@/xfdashboard -Exec=@bindir@/xfdashboard diff --git a/xfdashboard-relax-some-package-versions.diff b/xfdashboard-relax-some-package-versions.diff new file mode 100644 index 0000000..0cd46e2 --- /dev/null +++ b/xfdashboard-relax-some-package-versions.diff @@ -0,0 +1,14 @@ +diff -rup a/meson.build b/meson.build +--- a/meson.build 2025-08-21 16:49:26.000000000 +0200 ++++ b/meson.build 2025-08-22 10:23:21.412185014 +0200 +@@ -25,8 +25,8 @@ dependency_versions = { + 'clutter': '>= 1.24.0', + 'x11': '>= 1.6.7', + 'xcomposite': '>= 0.2', +- 'xdamage': '>= 1.1.5', +- 'xinerama': '>= 1.1.4', ++ 'xdamage': '>= 1.1.4', ++ 'xinerama': '>= 1.1.3', + } + + libwnck = dependency('libwnck-3.0', version: dependency_versions['libwnck']) diff --git a/xfdashboard-rpmlintrc b/xfdashboard-rpmlintrc new file mode 100644 index 0000000..1a8dd3a --- /dev/null +++ b/xfdashboard-rpmlintrc @@ -0,0 +1,3 @@ +# We do not want a full soname in the package name: +addFilter("shlib-policy-name-error.*") +addFilter(".*Your package contains a single shared library but is not named after its SONAME.*") diff --git a/xfdashboard.changes b/xfdashboard.changes index 6c2ee09..58abf85 100644 --- a/xfdashboard.changes +++ b/xfdashboard.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Fri Aug 22 07:21:12 UTC 2025 - Manfred Hollstein + +- Update to 1.1.0 + * Update README after switchover to meson + * build: Fix -Wunused-but-set-variable + * x11: Set wnck client type at the very first call + * build: Fix -Werror=undef + * Add meson build + * build: Automate copyright year management + * build: Unbreak example-search-provider + * build: Install version.h + * build: Drop dead code with glib 2.66 + * build: Require clutter 1.24.0 + * build: Require xfce 4.16.0 + * build: Require gtk 3.22.0 + * Replace deprecated exo with libxfce4ui 4.21.0 + * I18n: Update po/LINGUAS list + * I18n: Update po/LINGUAS list + * I18n: Update po/LINGUAS list + * I18n: Update po/LINGUAS list + * xfdashboard: Fix translation in g_option_context_set_summary + * build: Fix gettext warning about empty string + * build: Use XDT_VERSION_INIT and get rid of configure.ac.in + * build: Workaround *.theme translation + * build: Switch from intltool to gettext + * build: Fix deprecation warnings from glib + * build: Fix redefined glib macros + * build: Add new debug option to AS_CASE + * Raise required minimum version of Glib 2.66 due to some functions + of Glib used without #ifdef's and alternatives + * Add icons at missing sizes, clean up SVG metadata + * Remove ENABLE_NLS ifdefs + * Post-release version bump to 1.1.0 + * Translation Updates +- Regenerate xfdashboard-desktop-category.diff and + xfdashboard-desktopfile-without-binary.diff +- Add xfdashboard-relax-some-package-versions.diff +- Rewrite the "tee -a" construct to avoid compressed binary data + being sent to stdout and cluttering the output +- Add xfdashboard-rpmlintrc to avoid an unnecessary complex package + name for libxdashboard0 +- Add "-lm" to CFLAGS on Leap 15.6, because libxfdashboard0.so + doesn't get automatically linked with libm. + ------------------------------------------------------------------- Mon Feb 26 12:08:50 UTC 2024 - Dominique Leuenberger diff --git a/xfdashboard.spec b/xfdashboard.spec index bdae608..31e808f 100644 --- a/xfdashboard.spec +++ b/xfdashboard.spec @@ -1,7 +1,7 @@ # # spec file for package xfdashboard # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,15 +18,16 @@ %define so_ver 0 Name: xfdashboard -Version: 1.0.0 +Version: 1.1.0 Release: 0 Summary: GNOME shell like dashboard for Xfce License: GPL-2.0-or-later Group: System/GUI/XFCE URL: https://docs.xfce.org/apps/xfdashboard/start -Source0: https://archive.xfce.org/src/apps/%{name}/0.8/%{name}-%{version}.tar.bz2 +Source0: https://archive.xfce.org/src/apps/%{name}/1.1/%{name}-%{version}.tar.xz Source8: xfdashboard.1 Source9: xfdashboard-settings.1 +Source10: xfdashboard-rpmlintrc # WARNING! Please don't add OnlyShowIn key to the desktop file # to save possibility to be run from under different desktop environments. @@ -37,21 +38,28 @@ Patch0: xfdashboard-desktop-category.diff # PATCH-FIX-OPENSUSE xfdashboard-desktopfile-without-binary.diff dap.darkness@gmail.com -- fixes "W: desktopfile-without-binary". Patch2: xfdashboard-desktopfile-without-binary.diff +# PATCH-FIX-OPENSUSE xfdashboard-relax-some-package-versions.diff manfred.h@gmx.net -- live with some older packages in Leap 15.6 +Patch3: xfdashboard-relax-some-package-versions.diff + BuildRequires: appstream-glib BuildRequires: clutter-devel BuildRequires: fdupes BuildRequires: libtool -BuildRequires: libxfce4util-devel >= 4.14.0 +BuildRequires: meson >= 0.54.0 BuildRequires: xfce4-dev-tools -BuildRequires: pkgconfig(garcon-1) -BuildRequires: pkgconfig(ice) -BuildRequires: pkgconfig(libwnck-3.0) -BuildRequires: pkgconfig(libxfce4ui-2) >= 4.14.0 -BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.14.0 -BuildRequires: pkgconfig(libxfconf-0) -BuildRequires: pkgconfig(xcomposite) -BuildRequires: pkgconfig(xdamage) -BuildRequires: pkgconfig(xinerama) +BuildRequires: pkgconfig(clutter-1.0) >= 1.24.0 +BuildRequires: pkgconfig(clutter-cogl-1.0) >= 1.24.0 +BuildRequires: pkgconfig(clutter-gdk-1.0) >= 1.24.0 +BuildRequires: pkgconfig(cogl-1.0) >= 1.18.0 +BuildRequires: pkgconfig(garcon-1) >= 4.16.0 +BuildRequires: pkgconfig(libwnck-3.0) >= 3.0 +BuildRequires: pkgconfig(libxfce4ui-2) >= 4.16.0 +BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.16.0 +BuildRequires: pkgconfig(libxfconf-0) >= 4.16.0 +BuildRequires: pkgconfig(x11) >= 1.6.7 +BuildRequires: pkgconfig(xcomposite) >= 0.2 +BuildRequires: pkgconfig(xdamage) >= 1.1.4 +BuildRequires: pkgconfig(xinerama) >= 1.1.3 Requires: libcanberra-gtk-module-common Recommends: %{name}-lang Recommends: %{name}-themes @@ -93,16 +101,21 @@ A library providing authenticators for Xfdashboard. %autosetup -p1 %build +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1600 +# Need to explicitly link with the match library +export CFLAGS="%{optflags} -lm" +%else export CFLAGS="%{optflags}" -%configure -%make_build +%endif +%meson +%meson_build %install -%make_install +%meson_install find %{buildroot} -type f -name "*.la" -delete -print mkdir -p %{buildroot}%{_mandir}/man1 -gzip -c9 %{SOURCE8} | tee -a %{buildroot}%{_mandir}/man1/%{name}.1.gz -gzip -c9 %{SOURCE9} | tee -a %{buildroot}%{_mandir}/man1/%{name}-settings.1.gz +gzip -c9 %{SOURCE8} >> %{buildroot}%{_mandir}/man1/%{name}.1.gz +gzip -c9 %{SOURCE9} >> %{buildroot}%{_mandir}/man1/%{name}-settings.1.gz %fdupes -s %{buildroot}%{_datadir}/themes/%{name}-* %find_lang %{name} %{?no_lang_C}