aboutsummaryrefslogtreecommitdiffstats
path: root/meta-xfce
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-08-12 14:44:48 -0700
committerKhem Raj <raj.khem@gmail.com>2020-08-13 22:32:07 -0700
commit5a35fe8124789ea54cebf5a102dbcd890583ca56 (patch)
treeeb649e911d13561f6d2b2ecf13b5d737f51a2abe /meta-xfce
parent0a0d6bc8e58701c0ba5b33fe39808bd10c18eea6 (diff)
downloadmeta-openembedded-contrib-5a35fe8124789ea54cebf5a102dbcd890583ca56.tar.gz
xfce4-cpufreq-plugin: Fix build with -fno-common
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-xfce')
-rw-r--r--meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch33
-rw-r--r--meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb4
2 files changed, 36 insertions, 1 deletions
diff --git a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch
new file mode 100644
index 0000000000..d5238d00ff
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch
@@ -0,0 +1,33 @@
+Fix build with -fno-common
+
+Part of Patch from https://src.fedoraproject.org/rpms/xfce4-cpufreq-plugin/raw/master/f/xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- a/panel-plugin/xfce4-cpufreq-plugin.c
++++ b/panel-plugin/xfce4-cpufreq-plugin.c
+@@ -37,7 +37,8 @@
+ #include "xfce4-cpufreq-linux.h"
+ #endif /* __linux__ */
+
+-
++CpuFreqPlugin *cpuFreq;
++GtkCssProvider *currentProvider;
+
+ void
+ cpufreq_label_set_font (void)
+--- a/panel-plugin/xfce4-cpufreq-plugin.h
++++ b/panel-plugin/xfce4-cpufreq-plugin.h
+@@ -93,9 +93,9 @@ typedef struct
+ gint timeoutHandle;
+ } CpuFreqPlugin;
+
+-CpuFreqPlugin *cpuFreq;
++extern CpuFreqPlugin *cpuFreq;
+
+-GtkCssProvider *currentProvider;
++extern GtkCssProvider *currentProvider;
+
+ G_BEGIN_DECLS
+
diff --git a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb
index 6addc3b65d..5dce51b925 100644
--- a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb
+++ b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb
@@ -7,4 +7,6 @@ inherit xfce-panel-plugin
SRC_URI[md5sum] = "ccd8f0f7aef51bc4caf1049986d9614f"
SRC_URI[sha256sum] = "c5e044c0dc401d2066f208a3df82a588b3e51ff01425f155d0a1d0f8fce8f5b5"
-SRC_URI += "file://0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch"
+SRC_URI += "file://0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch \
+ file://xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch \
+ "