The package rpms/mate-applets.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mate-applets.git/commit/?id=3fb1f....
Change:
-%ifnarch s390 s390x sparc64
Thanks.
Full change:
============
commit 3fb1f1916697981a6176db3bc00982ab510736a9
Author: raveit65 <mate(a)raveit.de>
Date: Sun Mar 8 19:38:41 2020 +0100
rebuild against latest kernel, add some upstream patches
diff --git a/mate-applets.spec b/mate-applets.spec
index cc2821f..3bac545 100644
--- a/mate-applets.spec
+++ b/mate-applets.spec
@@ -15,7 +15,7 @@
Name: mate-applets
Version: %{branch}.2
%if 0%{?rel_build}
-Release: 1%{?dist}
+Release: 2%{?dist}
%else
Release: 0.11%{?git_rel}%{?dist}
%endif
@@ -29,8 +29,10 @@ URL:
http://mate-desktop.org
# Source for snapshot-builds.
%{!?rel_build:Source0:
http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{...
-# fix build for s390x arch
-Patch1:
mate-applets_0001-Revert-Make-cpufreq-builds-independent-from-kernel-h.patch
+Patch1:
mate-applets_0001-build-Don-t-stop-building-when-cpufreq.h-isn-t-avail-1.22.patch
+Patch2:
mate-applets_0002-Initialize-surface-before-testing-its-value-to-avoid-1.22.patch
+Patch3: mate-applets_0003-Fix-build-using-gcc-10-fno-common-flag-1.22.patch
+Patch4: mate-applets_0004-drivemount-Remove-global-variable-1.22.patch
BuildRequires: gucharmap-devel
BuildRequires: libgtop2-devel
@@ -49,9 +51,7 @@ BuildRequires: startup-notification-devel
Buildrequires: upower-devel
Buildrequires: gtksourceview3-devel
BuildRequires: wireless-tools-devel
-%ifnarch s390 s390x sparc64
BuildRequires: kernel-tools-libs-devel
-%endif
Provides: mate-netspeed%{?_isa} = %{version}-%{release}
Provides: mate-netspeed = %{version}-%{release}
@@ -86,8 +86,7 @@ NOCONFIGURE=1 ./autogen.sh
--enable-polkit \
--enable-ipv6 \
--enable-stickynotes \
- --libexecdir=%{_libexecdir}/mate-applets \
- --with-cpufreq-lib=cpupower
+ --libexecdir=%{_libexecdir}/mate-applets
make %{?_smp_mflags} V=1
@@ -150,6 +149,10 @@ make %{?_smp_mflags} V=1
%changelog
+* Thu Sep 19 2019 Wolfgang Ulbrich <fedora(a)raveit.de> - 1.22.2-2
+- add some upstream patches
+- rebuild against latest kernel (5.5.7), and kernel-tools-libs-devel (5.5.6)
+
* Thu Sep 19 2019 Wolfgang Ulbrich <fedora(a)raveit.de> - 1.22.2-1
- update 1.22.2 release
- revert
https://github.com/mate-desktop/mate-applets/commit/bd0cf4
diff --git a/mate-applets_0001-Revert-Make-cpufreq-builds-independent-from-kernel-h.patch
b/mate-applets_0001-Revert-Make-cpufreq-builds-independent-from-kernel-h.patch
deleted file mode 100644
index ce2f67a..0000000
--- a/mate-applets_0001-Revert-Make-cpufreq-builds-independent-from-kernel-h.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From 429c3ab30e69eec68f18ba9c7210ee9e417cdea5 Mon Sep 17 00:00:00 2001
-From: raveit65 <mate(a)raveit.de>
-Date: Thu, 19 Sep 2019 19:17:43 +0200
-Subject: [PATCH] Revert "Make cpufreq builds independent from kernel header
- version."
-
-This reverts commit bd0cf4893b267762cd35fb68f900b4be9de81138.
-Try fixing fedora build for s390x arch
----
- configure.ac | 72 +++++++------------
- cpufreq/src/cpufreq-monitor-libcpufreq.c | 15 ++--
- .../cpufreq-selector-libcpufreq.c | 10 +--
- 3 files changed, 36 insertions(+), 61 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index af66e0ea..def3d96e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -357,51 +357,33 @@ if test "x$HAVE_POLKIT" = "xyes"; then
- enable_suid=no
- fi
-
--build_cpufreq_applet=yes
--AS_IF([test "x$disable_cpufreq" = "xno"], [
-- case "${host}" in
-- *linux*)
-- AC_CHECK_HEADER([cpufreq.h], [
-- AC_CHECK_LIB([cpupower], [cpupower_is_cpu_online], [
-- AC_DEFINE([HAVE_IS_CPU_ONLINE], 1,
-- [Define to 1 if cpupower_is_cpu_online() is available])
-- cpufreq_lib="cpupower"
--
-- AC_CHECK_LIB([cpupower], [cpufreq_get_frequencies], [
-- AC_DEFINE([HAVE_GET_FREQUENCIES], 1,
-- [Define to 1 if cpufreq_get_frequencies() is available])
-- ])
-- ], [
-- AC_CHECK_LIB([cpupower], [cpufreq_cpu_exists], [
-- cpufreq_lib="cpupower"
-- ], [
-- AC_CHECK_LIB([cpufreq], [cpufreq_cpu_exists], [
-- cpufreq_lib="cpufreq"
-- ], [cpufreq_lib=])
-- ])
-- ])
--
-- AS_IF([test "x$cpufreq_lib" != "x"], [
-- LIBCPUFREQ_LIBS="-l$cpufreq_lib"
-- AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.])
-- AC_SUBST([LIBCPUFREQ_LIBS])
-- ], [
-- AC_MSG_WARN([*** cpufreq applet will not be built ***])
-- build_cpufreq_applet=no
-- ])
-- ], [
-- AC_MSG_WARN([*** can't find cpufreq.h, cpufreq applet will not be built
***])
-- build_cpufreq_applet=no
-- ])
-- ;;
-- *)
-- AC_MSG_WARN([${host} is not supported by cpufreq applet, not building])
-- build_cpufreq_applet=no
-- ;;
-- esac
--], [build_cpufreq_applet=no])
--
--AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$cpufreq_lib != x)
-+AC_ARG_WITH([cpufreq-lib],
-+ AS_HELP_STRING([--with-cpufreq-lib=lib], [library to use for cpufreq applet
@<:@default=cpufreq@:>@]),
-+ [with_cpufreq_lib=$withval], [with_cpufreq_lib="cpupower"])
-+
-+AC_CHECK_HEADER(cpufreq.h, have_libcpufreq=yes, have_libcpufreq=no)
-+LIBCPUFREQ_LIBS=
-+if test "x$have_libcpufreq" = "xyes"; then
-+ AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.])
-+ LIBCPUFREQ_LIBS="-l$with_cpufreq_lib"
-+fi
-+AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
-+AC_SUBST(LIBCPUFREQ_LIBS)
-+
-+build_cpufreq_applet=no
-+
-+if test x$disable_cpufreq = xno; then
-+ case "${host}" in
-+ *linux*)
-+ build_cpufreq_applet=yes
-+ ;;
-+ *)
-+ AC_MSG_WARN([${host} is not supported by cpufreq applet, not building])
-+ build_cpufreq_applet=no
-+ ;;
-+ esac
-+fi
-+
- AM_CONDITIONAL(BUILD_CPUFREQ_APPLET, test x$build_cpufreq_applet = xyes)
- AM_CONDITIONAL(BUILD_CPUFREQ_SELECTOR, test x$enable_selector = xyes)
- AM_CONDITIONAL(CPUFREQ_SELECTOR_SUID, test x$enable_suid = xyes)
-diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c
b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-index dd2722ba..9821f2da 100644
---- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-@@ -19,14 +19,11 @@
- * Authors : Carlos Garca Campos <carlosgc(a)gnome.org>
- */
-
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
- #include <glib.h>
- #include <glib/gi18n.h>
-
- #include <stdlib.h>
-+#include <linux/version.h>
- #include <cpufreq.h>
- #include "cpufreq-monitor-libcpufreq.h"
- #include "cpufreq-utils.h"
-@@ -39,12 +36,12 @@ static GList *cpufreq_monitor_libcpufreq_get_available_governors
(CPUFreqMon
-
- G_DEFINE_TYPE (CPUFreqMonitorLibcpufreq, cpufreq_monitor_libcpufreq,
CPUFREQ_TYPE_MONITOR)
-
--#ifdef HAVE_GET_FREQUENCIES
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
-+typedef struct cpufreq_available_frequencies CPUFreqFrequencyList;
-+#else
- typedef struct cpufreq_frequencies CPUFreqFrequencyList;
- #define cpufreq_get_available_frequencies(cpu) cpufreq_get_frequencies
("available", cpu)
- #define cpufreq_put_available_frequencies(first) cpufreq_put_frequencies (first)
--#else
--typedef struct cpufreq_available_frequencies CPUFreqFrequencyList;
- #endif
-
- typedef struct cpufreq_policy CPUFreqPolicy;
-@@ -108,7 +105,7 @@ cpufreq_monitor_libcpufreq_new (guint cpu)
- return CPUFREQ_MONITOR (monitor);
- }
-
--#ifdef HAVE_IS_CPU_ONLINE
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 0)
- extern int cpupower_is_cpu_online (unsigned int cpu);
- #endif
-
-@@ -125,7 +122,7 @@ cpufreq_monitor_libcpufreq_run (CPUFreqMonitor *monitor)
- /* Check whether it failed because
- * cpu is not online.
- */
--#ifndef HAVE_IS_CPU_ONLINE
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
- if (!cpufreq_cpu_exists (cpu)) {
- #else
- if (cpupower_is_cpu_online (cpu)) {
-diff --git a/cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.c
b/cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.c
-index d2fda2bf..f3d76e7e 100644
---- a/cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.c
-@@ -19,10 +19,6 @@
- * Authors : Carlos Garca Campos <carlosgc(a)gnome.org>
- */
-
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
- #include <glib.h>
- #include <glib/gstdio.h>
- #include <cpufreq.h>
-@@ -43,12 +39,12 @@ static gboolean cpufreq_selector_libcpufreq_set_governor
(CPUFreqSelector
-
- G_DEFINE_TYPE (CPUFreqSelectorLibcpufreq, cpufreq_selector_libcpufreq,
CPUFREQ_TYPE_SELECTOR)
-
--#ifdef HAVE_GET_FREQUENCIES
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
-+typedef struct cpufreq_available_frequencies CPUFreqFrequencyList;
-+#else
- typedef struct cpufreq_frequencies CPUFreqFrequencyList;
- #define cpufreq_get_available_frequencies(cpu) cpufreq_get_frequencies
("available", cpu)
- #define cpufreq_put_available_frequencies(first) cpufreq_put_frequencies (first)
--#else
--typedef struct cpufreq_available_frequencies CPUFreqFrequencyList;
- #endif
-
- typedef struct cpufreq_policy CPUFreqPolicy;
---
-2.21.0
-
diff --git
a/mate-applets_0001-build-Don-t-stop-building-when-cpufreq.h-isn-t-avail-1.22.patch
b/mate-applets_0001-build-Don-t-stop-building-when-cpufreq.h-isn-t-avail-1.22.patch
new file mode 100644
index 0000000..a15927e
--- /dev/null
+++ b/mate-applets_0001-build-Don-t-stop-building-when-cpufreq.h-isn-t-avail-1.22.patch
@@ -0,0 +1,27 @@
+From 3c2bd6f214437971e6a82b51e196ee3272067b2c Mon Sep 17 00:00:00 2001
+From: raveit65 <mate(a)raveit.de>
+Date: Mon, 23 Sep 2019 15:21:51 +0200
+Subject: [PATCH 01/11] build: Don't stop building when cpufreq.h isn't
+ available
+
+---
+ configure.ac | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index af66e0ea..280d7252 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -389,9 +389,6 @@ AS_IF([test "x$disable_cpufreq" = "xno"], [
+ AC_MSG_WARN([*** cpufreq applet will not be built ***])
+ build_cpufreq_applet=no
+ ])
+- ], [
+- AC_MSG_WARN([*** can't find cpufreq.h, cpufreq applet will not be built
***])
+- build_cpufreq_applet=no
+ ])
+ ;;
+ *)
+--
+2.21.1
+
diff --git
a/mate-applets_0002-Initialize-surface-before-testing-its-value-to-avoid-1.22.patch
b/mate-applets_0002-Initialize-surface-before-testing-its-value-to-avoid-1.22.patch
new file mode 100644
index 0000000..8126fe9
--- /dev/null
+++ b/mate-applets_0002-Initialize-surface-before-testing-its-value-to-avoid-1.22.patch
@@ -0,0 +1,26 @@
+From 6e18b71bca8e46311e8e27f1ff7ded6f40c5413b Mon Sep 17 00:00:00 2001
+From: dunc <kevetduncombe(a)gmail.com>
+Date: Wed, 8 Jan 2020 10:01:22 -0600
+Subject: [PATCH 07/11] Initialize "surface" before testing its value to avoid
+ a crash.
+
+---
+ accessx-status/applet.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/accessx-status/applet.c b/accessx-status/applet.c
+index 697f5e36..6dd658db 100644
+--- a/accessx-status/applet.c
++++ b/accessx-status/applet.c
+@@ -673,7 +673,7 @@ static cairo_surface_t*
accessx_status_applet_mousekeys_image(AccessxStatusApple
+
+ static void accessx_status_applet_set_state_icon (AccessxStatusApplet* sapplet,
ModifierStruct* modifier, GtkStateFlags state)
+ {
+- cairo_surface_t* surface;
++ cairo_surface_t* surface = NULL;
+ GtkIconTheme *icon_theme;
+ gint icon_size, icon_scale;
+ gchar *icon_name = NULL;
+--
+2.21.1
+
diff --git a/mate-applets_0003-Fix-build-using-gcc-10-fno-common-flag-1.22.patch
b/mate-applets_0003-Fix-build-using-gcc-10-fno-common-flag-1.22.patch
new file mode 100644
index 0000000..0c591d5
--- /dev/null
+++ b/mate-applets_0003-Fix-build-using-gcc-10-fno-common-flag-1.22.patch
@@ -0,0 +1,48 @@
+From 68c7e9230d4b1e4afa89e7cd758588b075183568 Mon Sep 17 00:00:00 2001
+From: rbuj <robert.buj(a)gmail.com>
+Date: Wed, 29 Jan 2020 17:10:12 +0100
+Subject: [PATCH 10/11] Fix build using gcc 10 -fno-common flag
+
+---
+ drivemount/drive-list.c | 4 ++++
+ drivemount/drive-list.h | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/drivemount/drive-list.c b/drivemount/drive-list.c
+index a20e1329..1b3679b3 100644
+--- a/drivemount/drive-list.c
++++ b/drivemount/drive-list.c
+@@ -32,6 +32,8 @@
+
+ G_DEFINE_TYPE (DriveList, drive_list, GTK_TYPE_GRID);
+
++GSettings *settings;
++
+ static GVolumeMonitor *volume_monitor = NULL;
+
+ static void drive_list_finalize (GObject *object);
+@@ -153,6 +155,8 @@ drive_list_finalize (GObject *object)
+ g_hash_table_destroy (self->volumes);
+ g_hash_table_destroy (self->mounts);
+
++ g_object_unref (settings);
++
+ if (G_OBJECT_CLASS (drive_list_parent_class)->finalize)
+ (* G_OBJECT_CLASS (drive_list_parent_class)->finalize) (object);
+ }
+diff --git a/drivemount/drive-list.h b/drivemount/drive-list.h
+index c7e844dd..ea55b908 100644
+--- a/drivemount/drive-list.h
++++ b/drivemount/drive-list.h
+@@ -65,7 +65,7 @@ void drive_list_set_panel_size (DriveList *list,
+ int panel_size);
+ void drive_list_set_transparent (DriveList *self,
+ gboolean transparent);
+-GSettings *settings;
++extern GSettings *settings;
+ void drive_list_redraw (DriveList *self);
+ void settings_color_changed (GSettings *settings, gchar *key, DriveList
*drive_list);
+
+--
+2.21.1
+
diff --git a/mate-applets_0004-drivemount-Remove-global-variable-1.22.patch
b/mate-applets_0004-drivemount-Remove-global-variable-1.22.patch
new file mode 100644
index 0000000..edc6705
--- /dev/null
+++ b/mate-applets_0004-drivemount-Remove-global-variable-1.22.patch
@@ -0,0 +1,93 @@
+From 5813185ad2d6af80676194eb53a3740fc10cda43 Mon Sep 17 00:00:00 2001
+From: rbuj <robert.buj(a)gmail.com>
+Date: Sat, 8 Feb 2020 23:55:57 +0100
+Subject: [PATCH 11/11] drivemount: Remove global variable
+
+---
+ drivemount/drive-list.c | 11 +++++++----
+ drivemount/drive-list.h | 3 ++-
+ drivemount/drivemount.c | 7 +------
+ 3 files changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/drivemount/drive-list.c b/drivemount/drive-list.c
+index 1b3679b3..97e28573 100644
+--- a/drivemount/drive-list.c
++++ b/drivemount/drive-list.c
+@@ -32,8 +32,6 @@
+
+ G_DEFINE_TYPE (DriveList, drive_list, GTK_TYPE_GRID);
+
+-GSettings *settings;
+-
+ static GVolumeMonitor *volume_monitor = NULL;
+
+ static void drive_list_finalize (GObject *object);
+@@ -89,9 +87,15 @@ drive_list_init (DriveList *self)
+ self->mounts = g_hash_table_new (NULL, NULL);
+ self->orientation = GTK_ORIENTATION_HORIZONTAL;
+ self->layout_tag = 0;
++ self->settings = g_settings_new ("org.mate.drivemount");
+ self->icon_size = 24;
+ self->relief = GTK_RELIEF_NORMAL;
+
++ g_signal_connect(self->settings,
++ "changed::drivemount-checkmark-color",
++ G_CALLBACK (settings_color_changed),
++ self);
++
+ /* listen for drive connects/disconnects, and add
+ * currently connected drives. */
+ self->count = 0;
+@@ -154,8 +158,7 @@ drive_list_finalize (GObject *object)
+
+ g_hash_table_destroy (self->volumes);
+ g_hash_table_destroy (self->mounts);
+-
+- g_object_unref (settings);
++ g_object_unref (self->settings);
+
+ if (G_OBJECT_CLASS (drive_list_parent_class)->finalize)
+ (* G_OBJECT_CLASS (drive_list_parent_class)->finalize) (object);
+diff --git a/drivemount/drive-list.h b/drivemount/drive-list.h
+index ea55b908..96eb189a 100644
+--- a/drivemount/drive-list.h
++++ b/drivemount/drive-list.h
+@@ -49,6 +49,8 @@ struct _DriveList
+ GtkWidget *dummy;
+ gint count;
+
++ GSettings *settings;
++
+ int icon_size;
+ };
+
+@@ -65,7 +67,6 @@ void drive_list_set_panel_size (DriveList *list,
+ int panel_size);
+ void drive_list_set_transparent (DriveList *self,
+ gboolean transparent);
+-extern GSettings *settings;
+ void drive_list_redraw (DriveList *self);
+ void settings_color_changed (GSettings *settings, gchar *key, DriveList
*drive_list);
+
+diff --git a/drivemount/drivemount.c b/drivemount/drivemount.c
+index b67a95cb..bbbafb34 100644
+--- a/drivemount/drivemount.c
++++ b/drivemount/drivemount.c
+@@ -189,13 +189,8 @@ applet_factory (MatePanelApplet *applet,
+ mate_panel_applet_set_flags (applet, MATE_PANEL_APPLET_EXPAND_MINOR);
+ mate_panel_applet_set_background_widget (applet, GTK_WIDGET (applet));
+
+- settings = g_settings_new ( "org.mate.drivemount");
+-
+ drive_list = drive_list_new ();
+- g_signal_connect(settings,
+- "changed::drivemount-checkmark-color",
+- G_CALLBACK (settings_color_changed),
+- drive_list);
++
+ gtk_container_add (GTK_CONTAINER (applet), drive_list);
+
+ g_signal_connect_object (applet, "change_orient",
+--
+2.21.1
+