diff options
Diffstat (limited to 'meta-openembedded/meta-xfce')
14 files changed, 210 insertions, 20 deletions
diff --git a/meta-openembedded/meta-xfce/conf/layer.conf b/meta-openembedded/meta-xfce/conf/layer.conf index 199c69e7b..a71eb8fe5 100644 --- a/meta-openembedded/meta-xfce/conf/layer.conf +++ b/meta-openembedded/meta-xfce/conf/layer.conf @@ -19,4 +19,11 @@ LAYERDEPENDS_xfce-layer += "multimedia-layer" LAYERDEPENDS_xfce-layer += "meta-python" LAYERDEPENDS_xfce-layer += "networking-layer" -LAYERSERIES_COMPAT_xfce-layer = "thud warrior zeus dunfell" +LAYERSERIES_COMPAT_xfce-layer = "gatesgarth" + +SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ + openzone->gdk-pixbuf \ + openzone->gtk+3 \ + rodent-icon-theme->gdk-pixbuf \ + rodent-icon-theme->gtk+3 \ +" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.1.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.2.bb index aed5ce4dc..5476b20bd 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.1.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.2.bb @@ -14,8 +14,7 @@ DEPENDS = " \ inherit xfce-app -SRC_URI[md5sum] = "58e70621d6b9e0e66399ed41ab402a47" -SRC_URI[sha256sum] = "9b5274999c89bf296a7de03b375e8233eef37940b7444502130b92dfb6a089b4" +SRC_URI[sha256sum] = "19ab84c6665c7819998f2269322d53f462c30963ce26042df23ae525e7d16545" # Avoid trouble with other desktops e.g KDE which also ships dbus service named # org.freedesktop.Notifications diff --git a/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch new file mode 100644 index 000000000..53280581b --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch @@ -0,0 +1,31 @@ +Fix build with -fno-common + +Imported from https://src.fedoraproject.org/rpms/imsettings/raw/master/f/imsettings-gcc10.patch + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +diff -pruN imsettings-1.8.2.orig/imsettings-daemon/imsettings-proc.c imsettings-1.8.2/imsettings-daemon/imsettings-proc.c +--- imsettings-1.8.2.orig/imsettings-daemon/imsettings-proc.c 2019-01-18 20:52:58.000000000 +0900 ++++ imsettings-1.8.2/imsettings-daemon/imsettings-proc.c 2020-01-29 13:33:07.051676780 +0900 +@@ -84,7 +84,7 @@ static gboolean _stop_process + + G_DEFINE_TYPE_WITH_PRIVATE (IMSettingsProc, imsettings_proc, G_TYPE_OBJECT); + +-guint signals[LAST_SIGNAL] = { 0 }; ++static guint signals[LAST_SIGNAL] = { 0 }; + + /*< private >*/ + static gboolean +diff -pruN imsettings-1.8.2.orig/imsettings-daemon/imsettings-server.c imsettings-1.8.2/imsettings-daemon/imsettings-server.c +--- imsettings-1.8.2.orig/imsettings-daemon/imsettings-server.c 2019-11-14 14:08:03.000000000 +0900 ++++ imsettings-1.8.2/imsettings-daemon/imsettings-server.c 2020-01-29 13:32:50.827832726 +0900 +@@ -91,7 +91,7 @@ GDBusInterfaceVTable __iface_vtable = { + NULL, + NULL, + }; +-guint signals[LAST_SIGNAL]; ++static guint signals[LAST_SIGNAL]; + + G_DEFINE_TYPE_WITH_PRIVATE (IMSettingsServer, imsettings_server, G_TYPE_OBJECT); + G_LOCK_DEFINE_STATIC (logger); diff --git a/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.2.bb index c8f495edb..bb7ff4235 100644 --- a/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb +++ b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.2.bb @@ -16,9 +16,10 @@ DEPENDS = "gtk+3 libnotify" REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "c04341a008d8c60e1532f033f4020f44" -SRC_URI[sha256sum] = "ebf578299a10c6a1fea9047be6577df6d2b6470d3cc9d40f8a6589a3c13c4c8b" +SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ + file://imsettings-gcc10.patch \ + " +SRC_URI[sha256sum] = "412abf3165dbee3cbe03db0c296bab103569a49029429d038569c586ebe9efa9" EXTRA_OECONF = "--with-xinputsh=50-xinput.sh \ --disable-static \ diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch new file mode 100644 index 000000000..d5238d00f --- /dev/null +++ b/meta-openembedded/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-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb index 6addc3b65..5dce51b92 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb +++ b/meta-openembedded/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 \ + " diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.1.bb index e5c21a1ac..3d8bc854f 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.0.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.1.bb @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin -SRC_URI[md5sum] = "6e274ceda37c7a8ae0821d9d49e965e9" -SRC_URI[sha256sum] = "fdae00036383105a15d12e9809abd5945a8f2152b17e16ccdfbfe5bd9733f29d" +SRC_URI[sha256sum] = "4db780178e529391d53da180e49386904e69a5a33b3bd5185835d0a7e6ff5ac5" FILES_${PN} += "${datadir}/xfce4/eyes" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Fix-multiple-definition-errors-under-GCC-10.0.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Fix-multiple-definition-errors-under-GCC-10.0.patch new file mode 100644 index 000000000..30cb487c8 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Fix-multiple-definition-errors-under-GCC-10.0.patch @@ -0,0 +1,118 @@ +From 6c6de7c07290248a3c72a50c7790885ee4bc13a2 Mon Sep 17 00:00:00 2001 +From: Robin Lee <cheeselee@fedoraproject.org> +Date: Mon, 24 Feb 2020 17:52:39 +0800 +Subject: [PATCH] Fix multiple definition errors under GCC 10.0 + +Fixes #16436, RHBZ#1800268 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/sensors-interface-common.h | 22 ++++++++++++++-------- + lib/sensors-interface-common.c | 1 + + 2 files changed, 15 insertions(+), 8 deletions(-) + +diff --git a/include/sensors-interface-common.h b/include/sensors-interface-common.h +index 62a27eb..05146c5 100644 +--- a/include/sensors-interface-common.h ++++ b/include/sensors-interface-common.h +@@ -146,6 +146,12 @@ t_sensors_dialog; + + + ++#ifdef XFCE4_SENSORS_INTERFACE_COMMON_DEFINING ++#define EXTERN ++#else ++#define EXTERN extern ++#endif ++ + /* Extern functions that need to be re-implemented in the sensors-viewer and + * the panel code. + * They kind of need to be registered at the library by any software +@@ -157,7 +163,7 @@ t_sensors_dialog; + * @param ptr_widget: Pointer to original widget, i.e, the update timer box + * @param ptr_sensorsdialog: argument pointer to sensors dialog data + */ +-void ++EXTERN void + (*adjustment_value_changed) (GtkWidget *ptr_widget, + t_sensors_dialog *ptr_sensorsdialog); + +@@ -167,7 +173,7 @@ void + * @param ptr_widget: Pointer to original widget, i.e, the sensor entry combobox + * @param ptr_sensorsdialog: argument pointer to sensors dialog data + */ +-void ++EXTERN void + (*sensor_entry_changed) (GtkWidget *ptr_widget, + t_sensors_dialog *ptr_sensorsdialog); + +@@ -178,7 +184,7 @@ void + * @param ptr_str_newtext: Pointer to the string containing the new label + * @param ptr_sensorsdialog: argument pointer to sensors dialog data + */ +-void ++EXTERN void + (*list_cell_text_edited) (GtkCellRendererText *ptr_cellrenderertext, + gchar *ptr_str_path, gchar *ptr_str_newtext, + t_sensors_dialog *ptr_sensorsdialog); +@@ -189,7 +195,7 @@ void + * @param ptr_str_path: pointer to the string with the path of the changed item + * @param ptr_sensorsdialog: argument pointer to sensors dialog data + */ +-void ++EXTERN void + (*list_cell_toggle) (GtkCellRendererToggle *ptr_cellrenderertoggle, gchar *ptr_str_path, + t_sensors_dialog *ptr_sensorsdialog); + +@@ -201,7 +207,7 @@ void + * hexadecimal rgb format #0011ff + * @param ptr_sensorsdialog: argument pointer to sensors dialog data + */ +-void ++EXTERN void + (*list_cell_color_edited) (GtkCellRendererText *ptr_cellrenderertext, + gchar *ptr_str_path, gchar *ptr_str_newcolor, + t_sensors_dialog *ptr_sensorsdialog); +@@ -214,7 +220,7 @@ void + * temperature + * @param ptr_sensorsdialog: argument pointer to sensors dialog data + */ +-void ++EXTERN void + (*minimum_changed) (GtkCellRendererText *ptr_cellrenderertext, gchar *ptr_str_path, + gchar *ptr_str_newmin, t_sensors_dialog *ptr_sensorsdialog); + +@@ -226,7 +232,7 @@ void + * temperature + * @param ptr_sensorsdialog: argument pointer to sensors dialog data + */ +-void ++EXTERN void + (*maximum_changed) (GtkCellRendererText *ptr_cellrenderertext, gchar *ptr_str_path, + gchar *ptr_str_newmax, t_sensors_dialog *ptr_sensorsdialog); + +@@ -236,7 +242,7 @@ void + * @param ptr_widget: Pointer to original widget, i.e, the update timer box + * @param ptr_sensorsdialog: argument pointer to sensors dialog data + */ +-void ++EXTERN void + (*temperature_unit_change) (GtkWidget *ptr_widget, + t_sensors_dialog *ptr_sensorsdialog); + +diff --git a/lib/sensors-interface-common.c b/lib/sensors-interface-common.c +index 70aa154..8c79f1d 100644 +--- a/lib/sensors-interface-common.c ++++ b/lib/sensors-interface-common.c +@@ -28,6 +28,7 @@ + #include <libxfce4panel/xfce-panel-plugin.h> + + /* Local/package includes */ ++#define XFCE4_SENSORS_INTERFACE_COMMON_DEFINING + #include <configuration.h> + #include <sensors-interface-common.h> + #include <middlelayer.h> +-- +2.24.1 + diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb index 3fd0ff6cf..aa5fe019d 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb @@ -7,7 +7,9 @@ inherit xfce-panel-plugin SRC_URI[md5sum] = "7327c4c316ebd5d93665e77b432b8d89" SRC_URI[sha256sum] = "3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112" -SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch" +SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch \ + file://0001-Fix-multiple-definition-errors-under-GCC-10.0.patch \ + " EXTRA_OECONF = " \ --disable-procacpi \ diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.1.bb index c3de5964d..f4ef3f626 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.0.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.1.bb @@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit xfce-panel-plugin -SRC_URI[md5sum] = "afa0ef865a49f28165098d3fe625df44" -SRC_URI[sha256sum] = "ee4a51a35076d50cba3824079f8312585373ff2f0d9ebc740d8f3c0426430a19" +SRC_URI[md5sum] = "3087b3248e427822613e5583784b0ac0" +SRC_URI[sha256sum] = "194dbeb8751d8aaedf3850a7a9c770f09d32316a99683cde34d7d0fc5bdba31d" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.1.bb index 2ddc6f67c..f154023e2 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.0.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.1.bb @@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ae39271267fd63eb7619432ff24e7ff1" inherit xfce-panel-plugin -SRC_URI[md5sum] = "32e6a14e80bf9a93db2f2b3bfd7de920" -SRC_URI[sha256sum] = "2e4e5343e39926230cc981d5fe56cd58a2f3817d2e9b6089b5673a2e39bf7e9b" +SRC_URI[md5sum] = "e0df5b6be30993719d084fc4f78a6218" +SRC_URI[sha256sum] = "4b52d2911b1949e945971be6533155ee6ba99c77078eac7fd43b0f2aeca824e3" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.4.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.6.bb index 958ee644c..bbb274ed9 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.4.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.6.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[md5sum] = "7f6faf5ae5ca276d073798a3ff8b0e5b" -SRC_URI[sha256sum] = "624acf6d46484bb35608a76424579571423e2aefa6579f6e444f5cfb5342ff9a" +SRC_URI[md5sum] = "81a4a4c7635273485fac5c2d98e48d02" +SRC_URI[sha256sum] = "8974d38cc87df528693efe4b6e14bcd233cdb49d2018a23ddddf745110b25744" RRECOMMENDS_${PN} += "menulibre" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.8.bb b/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.9.bb index e0d4845a0..d364c8033 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.8.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.9.bb @@ -6,8 +6,7 @@ DEPENDS = "freetype gdk-pixbuf poppler curl xfce4-dev-tools-native libxml2 libgs inherit xfce gtk-doc -SRC_URI[md5sum] = "5d541608b3962fd2b16e23a266fd7a10" -SRC_URI[sha256sum] = "0999b9a3deb57010956db6630ae7205813999147043171049a7b6c333be93e96" +SRC_URI[sha256sum] = "6508906f03e5a6ae3f6503b71b056df47d336d5504f39df6ce0bb9c5248007b6" INSANE_SKIP_${PN} = "dev-so" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.2.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.5.bb index b6066a526..f8febe804 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.2.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.5.bb @@ -9,8 +9,7 @@ inherit xfce update-alternatives features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += "file://0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch" -SRC_URI[md5sum] = "6d61d07b6ea88a429c43e1b9c3293eb8" -SRC_URI[sha256sum] = "b15b40342596a3b6ab5167a58371262adf5484e165cb25a31fef42f0aa8ffd92" +SRC_URI[sha256sum] = "d7a7c63fa42ec6d7cb3caab130d6f496be5bd7689b775d20e8786b7f3e282930" PACKAGECONFIG ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ |