summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2020-11-19 15:41:31 +0800
committerKhem Raj <raj.khem@gmail.com>2020-11-19 07:36:26 -0800
commitaffc550278ca10c2a76acc67483ff471073d76ee (patch)
tree9da9b7be308959f86ac0ce8f7183c41ad55b7a5e
parentfc224bdf8ea5e80fc038d656cad5671fb9baa486 (diff)
downloadmeta-openembedded-affc550278ca10c2a76acc67483ff471073d76ee.tar.gz
xfce4-cpufreq-plugin: 1.2.1 -> 1.2.2
1.2.2 - Update URLs and copyright year - Add basic GitLab pipeline - Fix compilation with gcc-10 - Update URLs from goodies.x.o to docs.x.o (Bug #16156) - s/http/https - Fix build with panel 4.15 - Replace GtkStock buttons - Rename applet to plugin (Bug #15582) - Post release tag bump - Translation Updates Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch6
-rw-r--r--meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch26
-rw-r--r--meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.2.bb (renamed from meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb)4
3 files changed, 22 insertions, 14 deletions
diff --git a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch
index 92a6e8384d..ae8bc5279d 100644
--- a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch
+++ b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch
@@ -18,6 +18,7 @@ Upstream-Status: Submitted [1]
18[1] https://bugzilla.xfce.org/attachment.cgi?id=8492 18[1] https://bugzilla.xfce.org/attachment.cgi?id=8492
19 19
20Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 20Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
21
21--- 22---
22 panel-plugin/xfce4-cpufreq-configure.c | 4 ++++ 23 panel-plugin/xfce4-cpufreq-configure.c | 4 ++++
23 panel-plugin/xfce4-cpufreq-plugin.c | 13 +++++++++++-- 24 panel-plugin/xfce4-cpufreq-plugin.c | 13 +++++++++++--
@@ -109,13 +110,12 @@ index a6895e4..6338698 100644
109+++ b/panel-plugin/xfce4-cpufreq-plugin.h 110+++ b/panel-plugin/xfce4-cpufreq-plugin.h
110@@ -95,6 +95,8 @@ typedef struct 111@@ -95,6 +95,8 @@ typedef struct
111 112
112 CpuFreqPlugin *cpuFreq; 113 extern CpuFreqPlugin *cpuFreq;
113 114
114+GtkCssProvider *currentProvider; 115+GtkCssProvider *currentProvider;
115+ 116+
116 G_BEGIN_DECLS 117 G_BEGIN_DECLS
117 118
118 void 119 void
119-- 120---
1202.20.1 1212.20.1
121
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
index d5238d00ff..95605f83ae 100644
--- 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
@@ -5,26 +5,34 @@ Part of Patch from https://src.fedoraproject.org/rpms/xfce4-cpufreq-plugin/raw/m
5Upstream-Status: Pending 5Upstream-Status: Pending
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7 7
8Refresh for xfce4-cpufreq-plugin 1.2.2.
9
10Signed-off-by: Kai Kang <kai.kang@windriver.com>
11
12---
13 panel-plugin/xfce4-cpufreq-plugin.c | 1 +
14 panel-plugin/xfce4-cpufreq-plugin.h | 2 +-
15 2 files changed, 2 insertions(+), 1 deletion(-)
16
17diff --git a/panel-plugin/xfce4-cpufreq-plugin.c b/panel-plugin/xfce4-cpufreq-plugin.c
18index 1e33492..ce9e302 100644
8--- a/panel-plugin/xfce4-cpufreq-plugin.c 19--- a/panel-plugin/xfce4-cpufreq-plugin.c
9+++ b/panel-plugin/xfce4-cpufreq-plugin.c 20+++ b/panel-plugin/xfce4-cpufreq-plugin.c
10@@ -37,7 +37,8 @@ 21@@ -38,6 +38,7 @@
11 #include "xfce4-cpufreq-linux.h"
12 #endif /* __linux__ */ 22 #endif /* __linux__ */
13 23
14- 24 CpuFreqPlugin *cpuFreq;
15+CpuFreqPlugin *cpuFreq;
16+GtkCssProvider *currentProvider; 25+GtkCssProvider *currentProvider;
17 26
18 void 27 void
19 cpufreq_label_set_font (void) 28 cpufreq_label_set_font (void)
29diff --git a/panel-plugin/xfce4-cpufreq-plugin.h b/panel-plugin/xfce4-cpufreq-plugin.h
30index 8cd0d33..7dbccef 100644
20--- a/panel-plugin/xfce4-cpufreq-plugin.h 31--- a/panel-plugin/xfce4-cpufreq-plugin.h
21+++ b/panel-plugin/xfce4-cpufreq-plugin.h 32+++ b/panel-plugin/xfce4-cpufreq-plugin.h
22@@ -93,9 +93,9 @@ typedef struct 33@@ -95,7 +95,7 @@ typedef struct
23 gint timeoutHandle;
24 } CpuFreqPlugin;
25 34
26-CpuFreqPlugin *cpuFreq; 35 extern CpuFreqPlugin *cpuFreq;
27+extern CpuFreqPlugin *cpuFreq;
28 36
29-GtkCssProvider *currentProvider; 37-GtkCssProvider *currentProvider;
30+extern GtkCssProvider *currentProvider; 38+extern GtkCssProvider *currentProvider;
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.2.bb
index 5dce51b925..3b7b9ec5da 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.2.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1f6f1c0be32491a0c8d2915607a28f36"
5 5
6inherit xfce-panel-plugin 6inherit xfce-panel-plugin
7 7
8SRC_URI[md5sum] = "ccd8f0f7aef51bc4caf1049986d9614f" 8SRC_URI[sha256sum] = "500f04b8d857c96da8c8c7a4eecba30a903d0fce6e35a05e674529e43b47e498"
9SRC_URI[sha256sum] = "c5e044c0dc401d2066f208a3df82a588b3e51ff01425f155d0a1d0f8fce8f5b5" 9
10SRC_URI += "file://0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch \ 10SRC_URI += "file://0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch \
11 file://xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch \ 11 file://xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch \
12 " 12 "