From affc550278ca10c2a76acc67483ff471073d76ee Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Thu, 19 Nov 2020 15:41:31 +0800 Subject: 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 Signed-off-by: Khem Raj --- ...-memory-leak-and-reduce-cpu-load-slightly.patch | 6 ++--- .../xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch | 26 ++++++++++++++-------- .../cpufreq/xfce4-cpufreq-plugin_1.2.1.bb | 12 ---------- .../cpufreq/xfce4-cpufreq-plugin_1.2.2.bb | 12 ++++++++++ 4 files changed, 32 insertions(+), 24 deletions(-) delete mode 100644 meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb create mode 100644 meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.2.bb 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] [1] https://bugzilla.xfce.org/attachment.cgi?id=8492 Signed-off-by: Andreas Müller + --- panel-plugin/xfce4-cpufreq-configure.c | 4 ++++ panel-plugin/xfce4-cpufreq-plugin.c | 13 +++++++++++-- @@ -109,13 +110,12 @@ index a6895e4..6338698 100644 +++ b/panel-plugin/xfce4-cpufreq-plugin.h @@ -95,6 +95,8 @@ typedef struct - CpuFreqPlugin *cpuFreq; + extern CpuFreqPlugin *cpuFreq; +GtkCssProvider *currentProvider; + G_BEGIN_DECLS void --- +--- 2.20.1 - 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 Upstream-Status: Pending Signed-off-by: Khem Raj +Refresh for xfce4-cpufreq-plugin 1.2.2. + +Signed-off-by: Kai Kang + +--- + panel-plugin/xfce4-cpufreq-plugin.c | 1 + + panel-plugin/xfce4-cpufreq-plugin.h | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/panel-plugin/xfce4-cpufreq-plugin.c b/panel-plugin/xfce4-cpufreq-plugin.c +index 1e33492..ce9e302 100644 --- a/panel-plugin/xfce4-cpufreq-plugin.c +++ b/panel-plugin/xfce4-cpufreq-plugin.c -@@ -37,7 +37,8 @@ - #include "xfce4-cpufreq-linux.h" +@@ -38,6 +38,7 @@ #endif /* __linux__ */ -- -+CpuFreqPlugin *cpuFreq; + CpuFreqPlugin *cpuFreq; +GtkCssProvider *currentProvider; void cpufreq_label_set_font (void) +diff --git a/panel-plugin/xfce4-cpufreq-plugin.h b/panel-plugin/xfce4-cpufreq-plugin.h +index 8cd0d33..7dbccef 100644 --- a/panel-plugin/xfce4-cpufreq-plugin.h +++ b/panel-plugin/xfce4-cpufreq-plugin.h -@@ -93,9 +93,9 @@ typedef struct - gint timeoutHandle; - } CpuFreqPlugin; +@@ -95,7 +95,7 @@ typedef struct --CpuFreqPlugin *cpuFreq; -+extern CpuFreqPlugin *cpuFreq; + extern CpuFreqPlugin *cpuFreq; -GtkCssProvider *currentProvider; +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.1.bb deleted file mode 100644 index 5dce51b925..0000000000 --- a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Panel plugin to display frequency of all cpus" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=1f6f1c0be32491a0c8d2915607a28f36" - -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 \ - file://xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch \ - " diff --git a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.2.bb b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.2.bb new file mode 100644 index 0000000000..3b7b9ec5da --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.2.bb @@ -0,0 +1,12 @@ +SUMMARY = "Panel plugin to display frequency of all cpus" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=1f6f1c0be32491a0c8d2915607a28f36" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "500f04b8d857c96da8c8c7a4eecba30a903d0fce6e35a05e674529e43b47e498" + +SRC_URI += "file://0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch \ + file://xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch \ + " -- cgit v1.2.3-54-g00ecf