diff options
Diffstat (limited to 'meta-openembedded/meta-xfce')
20 files changed, 31 insertions, 369 deletions
diff --git a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb index 8fbe01d2c8..bf3d7ed979 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb @@ -3,11 +3,11 @@ SECTION = "x11/application" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" -inherit xfce-app distutils3 gtk-icon-cache mime-xdg +inherit xfce-app setuptools3 gtk-icon-cache mime-xdg DEPENDS += "python3-distutils-extra-native" -SRC_URI[sha256sum] = "1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47" +SRC_URI[sha256sum] = "e9a99a62d10981391508dd43f3cbfa2d50a69bd6b7d1eeef7d30ba4c673dcfda" FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.1.bb b/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb index bb75e45e47..3d0e55d360 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.1.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb @@ -1,5 +1,5 @@ DESCRIPTION = "An advanced menu editor" -HOMEPAGE = "https://launchpad.net/menulibre" +HOMEPAGE = "https://bluesabre.org/menulibre/" SECTION = "x11/graphics" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" @@ -9,16 +9,15 @@ DEPENDS = " \ intltool-native \ " -inherit distutils3 gtk-icon-cache features_check +inherit setuptools3 gtk-icon-cache features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "https://launchpad.net/menulibre/2.2/${PV}/+download/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "8460ea844a5998c5f722bccb5ce8627a" -SRC_URI[sha256sum] = "5b3ef8e6073d584f6accf282fa1eb649185ee42eb22fab70231491c7377d7e8f" +SRC_URI = "git://github.com/bluesabre/menulibre.git;protocol=https;branch=master" +SRCREV = "86ee9ad7568128fe9555e54799933b2d3762331a" +S = "${WORKDIR}/git" -do_compile() { -} +do_compile[noexec] = "1" do_install:append() { sed -i 's:${D}::g' ${D}${datadir}/applications/menulibre.desktop @@ -27,7 +26,7 @@ do_install:append() { FILES:${PN} += " \ ${datadir}/applications \ - ${datadir}/menulibre \ + ${datadir}/metainfo \ ${datadir}/icons \ " @@ -35,7 +34,7 @@ RDEPENDS:${PN} += " \ gtk+3 \ gtksourceview3 \ python3-pygobject \ - gnome-menus3 \ + gnome-menus \ python3-unixadmin \ python3-psutil \ " diff --git a/meta-openembedded/meta-xfce/recipes-apps/mousepad/files/0001-Plugin-support-Properly-handle-plugin-settings.patch b/meta-openembedded/meta-xfce/recipes-apps/mousepad/files/0001-Plugin-support-Properly-handle-plugin-settings.patch deleted file mode 100644 index 0ace907c41..0000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/mousepad/files/0001-Plugin-support-Properly-handle-plugin-settings.patch +++ /dev/null @@ -1,279 +0,0 @@ -From 6d1800a305698f801236a2d73ebe178fa2d1139d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org> -Date: Sat, 12 Jun 2021 16:45:56 +0200 -Subject: [PATCH] Plugin support: Properly handle plugin settings - -What was done in !92 was strictly speaking only suitable for one plugin. -This could be extended to several plugins by adding a `.gschema.xml` -file in `plugins/`, intermediate between the one of the application and -those of the plugins, or by refactoring the Makefiles with inclusions -and a single call to `@GSETTINGS_RULES@`. - -But in any case, due to the relative rigidity of the `.gschema.xml` file -format and the internal workings of `glib-compile-schemas`, this would -only be suitable for plugins that are present at compile time, i.e. -"fake plugins". - -Instead, this commit adds the plugin settings at load time, as is -natural and as the `GSettingsSchema` documentation states. To do this, -the setting store is extended to contain several roots: the application -root and the plugin roots. - -For the latter, a unified naming convention is preserved, with the -prefix `org.xfce.mousepad.plugins.`, but they are in fact completely -independent of each other and independent of the application root. - -Fixes #136, related to !92. - -Upstream-Status: Backport [https://gitlab.xfce.org/apps/mousepad/-/commit/0d9d4f05aace800118d0a390e4e5dc5ebb940ca5] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - mousepad/mousepad-application.c | 12 +++- - mousepad/mousepad-settings-store.c | 70 ++++++++++++------- - mousepad/mousepad-settings-store.h | 3 + - mousepad/mousepad-settings.c | 14 +++- - mousepad/mousepad-settings.h | 1 + - mousepad/org.xfce.mousepad.gschema.xml | 1 - - ...g.xfce.mousepad.plugins.gspell.gschema.xml | 4 -- - 7 files changed, 71 insertions(+), 34 deletions(-) - -diff --git a/mousepad/mousepad-application.c b/mousepad/mousepad-application.c -index d9a64ff..378d78e 100644 ---- a/mousepad/mousepad-application.c -+++ b/mousepad/mousepad-application.c -@@ -721,7 +721,7 @@ mousepad_application_load_plugins (MousepadApplication *application) - GError *error = NULL; - GDir *dir; - const gchar *basename; -- gchar *provider_name; -+ gchar *provider_name, *schema_id; - gchar **strs; - gsize n_strs; - -@@ -775,6 +775,16 @@ mousepad_application_load_plugins (MousepadApplication *application) - application, G_CONNECT_SWAPPED); - g_action_map_add_action (G_ACTION_MAP (application), G_ACTION (action)); - -+ /* add its settings to the setting store */ -+ if (g_str_has_prefix (provider_name, "mousepad-plugin-")) -+ schema_id = provider_name + 16; -+ else -+ schema_id = provider_name; -+ -+ schema_id = g_strconcat (MOUSEPAD_ID, ".plugins.", schema_id, NULL); -+ mousepad_settings_add_root (schema_id); -+ g_free (schema_id); -+ - /* instantiate this provider types and initialize its action state */ - if (g_strv_contains ((const gchar *const *) strs, provider_name)) - { -diff --git a/mousepad/mousepad-settings-store.c b/mousepad/mousepad-settings-store.c -index de989bd..d117c53 100644 ---- a/mousepad/mousepad-settings-store.c -+++ b/mousepad/mousepad-settings-store.c -@@ -29,9 +29,11 @@ - - struct MousepadSettingsStore_ - { -- GObject parent; -- GSettings *root; -- GHashTable *keys; -+ GObject parent; -+ -+ GSettingsBackend *backend; -+ GList *roots; -+ GHashTable *keys; - }; - - -@@ -76,8 +78,10 @@ mousepad_setting_key_new (const gchar *key_name, - - - static void --mousepad_setting_key_free (MousepadSettingKey *key) -+mousepad_setting_key_free (gpointer data) - { -+ MousepadSettingKey *key = data; -+ - if (G_LIKELY (key != NULL)) - { - g_object_unref (key->settings); -@@ -138,16 +142,16 @@ mousepad_settings_store_class_init (MousepadSettingsStoreClass *klass) - static void - mousepad_settings_store_finalize (GObject *object) - { -- MousepadSettingsStore *self; -+ MousepadSettingsStore *self = MOUSEPAD_SETTINGS_STORE (object); - - g_return_if_fail (MOUSEPAD_IS_SETTINGS_STORE (object)); - -- self = MOUSEPAD_SETTINGS_STORE (object); -+ if (self->backend != NULL) -+ g_object_unref (self->backend); - -+ g_list_free_full (self->roots, g_object_unref); - g_hash_table_destroy (self->keys); - -- g_object_unref (self->root); -- - G_OBJECT_CLASS (mousepad_settings_store_parent_class)->finalize (object); - } - -@@ -212,28 +216,19 @@ static void - mousepad_settings_store_init (MousepadSettingsStore *self) - { - #ifdef MOUSEPAD_SETTINGS_KEYFILE_BACKEND -- GSettingsBackend *backend; -- gchar *conf_file; -- conf_file = g_build_filename (g_get_user_config_dir (), -- "Mousepad", -- "settings.conf", -- NULL); -- backend = g_keyfile_settings_backend_new (conf_file, "/", NULL); -+ gchar *conf_file; -+ -+ conf_file = g_build_filename (g_get_user_config_dir (), "Mousepad", "settings.conf", NULL); -+ self->backend = g_keyfile_settings_backend_new (conf_file, "/", NULL); - g_free (conf_file); -- self->root = g_settings_new_with_backend (MOUSEPAD_ID, backend); -- g_object_unref (backend); - #else -- self->root = g_settings_new (MOUSEPAD_ID); -+ self->backend = NULL; - #endif - -- self->keys = g_hash_table_new_full (g_str_hash, -- g_str_equal, -- NULL, -- (GDestroyNotify) mousepad_setting_key_free); -+ self->roots = NULL; -+ self->keys = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, mousepad_setting_key_free); - -- mousepad_settings_store_add_settings (self, MOUSEPAD_ID, -- g_settings_schema_source_get_default (), -- self->root); -+ mousepad_settings_store_add_root (self, MOUSEPAD_ID); - } - - -@@ -246,6 +241,31 @@ mousepad_settings_store_new (void) - - - -+void -+mousepad_settings_store_add_root (MousepadSettingsStore *self, -+ const gchar *schema_id) -+{ -+ GSettingsSchemaSource *source; -+ GSettingsSchema *schema; -+ GSettings *root; -+ -+ source = g_settings_schema_source_get_default (); -+ schema = g_settings_schema_source_lookup (source, schema_id, TRUE); -+ -+ /* exit silently if no schema is found: plugins may have settings or not */ -+ if (schema == NULL) -+ return; -+ -+ root = g_settings_new_full (schema, self->backend, NULL); -+ g_settings_schema_unref (schema); -+ -+ self->roots = g_list_prepend (self->roots, root); -+ -+ mousepad_settings_store_add_settings (self, schema_id, source, root); -+} -+ -+ -+ - const gchar * - mousepad_settings_store_lookup_key_name (MousepadSettingsStore *self, - const gchar *setting) -diff --git a/mousepad/mousepad-settings-store.h b/mousepad/mousepad-settings-store.h -index 3f5cae1..4842036 100644 ---- a/mousepad/mousepad-settings-store.h -+++ b/mousepad/mousepad-settings-store.h -@@ -38,6 +38,9 @@ GType mousepad_settings_store_get_type (void); - - MousepadSettingsStore *mousepad_settings_store_new (void); - -+void mousepad_settings_store_add_root (MousepadSettingsStore *store, -+ const gchar *schema_id); -+ - const gchar *mousepad_settings_store_lookup_key_name (MousepadSettingsStore *store, - const gchar *setting); - -diff --git a/mousepad/mousepad-settings.c b/mousepad/mousepad-settings.c -index d071de6..66b338d 100644 ---- a/mousepad/mousepad-settings.c -+++ b/mousepad/mousepad-settings.c -@@ -24,6 +24,15 @@ static MousepadSettingsStore *settings_store = NULL; - - - -+void -+mousepad_settings_init (void) -+{ -+ if (settings_store == NULL) -+ settings_store = mousepad_settings_store_new (); -+} -+ -+ -+ - void - mousepad_settings_finalize (void) - { -@@ -39,10 +48,9 @@ mousepad_settings_finalize (void) - - - void --mousepad_settings_init (void) -+mousepad_settings_add_root (const gchar *schema_id) - { -- if (settings_store == NULL) -- settings_store = mousepad_settings_store_new (); -+ mousepad_settings_store_add_root (settings_store, schema_id); - } - - -diff --git a/mousepad/mousepad-settings.h b/mousepad/mousepad-settings.h -index bc63d11..615be51 100644 ---- a/mousepad/mousepad-settings.h -+++ b/mousepad/mousepad-settings.h -@@ -87,6 +87,7 @@ G_BEGIN_DECLS - - void mousepad_settings_init (void); - void mousepad_settings_finalize (void); -+void mousepad_settings_add_root (const gchar *schema_id); - - void mousepad_setting_bind (const gchar *setting, - gpointer object, -diff --git a/mousepad/org.xfce.mousepad.gschema.xml b/mousepad/org.xfce.mousepad.gschema.xml -index e802719..8509ee3 100644 ---- a/mousepad/org.xfce.mousepad.gschema.xml -+++ b/mousepad/org.xfce.mousepad.gschema.xml -@@ -39,7 +39,6 @@ - - <!-- generic schemas --> - <schema id="org.xfce.mousepad" path="/org/xfce/mousepad/" gettext-domain="mousepad"> -- <child name="plugins" schema="org.xfce.mousepad.plugins"/> - <child name="preferences" schema="org.xfce.mousepad.preferences"/> - <child name="state" schema="org.xfce.mousepad.state"/> - </schema> -diff --git a/plugins/gspell-plugin/org.xfce.mousepad.plugins.gspell.gschema.xml b/plugins/gspell-plugin/org.xfce.mousepad.plugins.gspell.gschema.xml -index 6db65b6..95295ba 100644 ---- a/plugins/gspell-plugin/org.xfce.mousepad.plugins.gspell.gschema.xml -+++ b/plugins/gspell-plugin/org.xfce.mousepad.plugins.gspell.gschema.xml -@@ -1,9 +1,5 @@ - <schemalist> - -- <schema id="org.xfce.mousepad.plugins" path="/org/xfce/mousepad/plugins/" gettext-domain="mousepad"> -- <child name="gspell" schema="org.xfce.mousepad.plugins.gspell"/> -- </schema> -- - <schema id="org.xfce.mousepad.plugins.gspell" path="/org/xfce/mousepad/plugins/gspell/" gettext-domain="mousepad"> - <child name="preferences" schema="org.xfce.mousepad.plugins.gspell.preferences"/> - </schema> --- -2.17.1 - diff --git a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.5.bb b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.8.bb index bab564288e..0f847e4596 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.5.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.8.bb @@ -7,9 +7,7 @@ DEPENDS = "gtk+3 gtksourceview4 xfconf xfce4-dev-tools-native" inherit xfce-app gsettings mime-xdg -SRC_URI += "file://0001-Plugin-support-Properly-handle-plugin-settings.patch" - -SRC_URI[sha256sum] = "40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1" +SRC_URI[sha256sum] = "921ebbcfdfd5e2e56f31a5177a2d26f46c758cc972595017bca9e0a6a3c3a721" PACKAGECONFIG ??= "" PACKAGECONFIG[spell] = "--enable-plugin-gspell,--disable-plugin-gspell,gspell" diff --git a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.11.0.bb b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.1.bb index 15717b9f22..aeeb7e7659 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.11.0.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.1.bb @@ -10,6 +10,6 @@ inherit xfce-app mime-xdg RRECOMMENDS:${PN} += "tumbler" -SRC_URI[sha256sum] = "877e30d412c8cbfa9706f4ac0cab1a478f5829beafb773addc7722ca0cb78823" +SRC_URI[sha256sum] = "13853f9ca18466a8e4788e92c7bde3388a93e8340283568f5dee1a9396ffd7ee" FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb index 2d4ae7fa8c..e56824e595 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "gtk+3 glib-2.0 xfce4-dev-tools-native intltool-native" -SRC_URI = "git://github.com/ib/xarchiver.git" +SRC_URI = "git://github.com/ib/xarchiver.git;branch=master;protocol=https" SRCREV = "9ab958a4023b62b43972c55a3143ff0722bd88a6" PV = "0.5.4.14" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb index 2ef81f286d..58e628deca 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb @@ -8,7 +8,7 @@ inherit xfce-app features_check REQUIRED_DISTRO_FEATURES = "polkit" SRC_URI = " \ - git://github.com/ncopa/${BPN}.git \ + git://github.com/ncopa/${BPN}.git;branch=master;protocol=https \ " SRCREV = "6d3282cc1734c305850d48f5bf4b4d94e88885e9" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb index 92317c83fc..4ae83ceca1 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" DEPENDS = "glib-2.0-native libxfce4ui" -SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https \ +SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https;branch=master \ file://fix-inner-dependency.patch \ " SRCREV = "5c7a73a3824b03b91719e05e2604b97c7a72d50f" 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 index 53280581b0..35f1cfec43 100644 --- a/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch +++ b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch @@ -5,18 +5,6 @@ Imported from https://src.fedoraproject.org/rpms/imsettings/raw/master/f/imsetti 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 diff --git a/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.2.bb b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb index bc7d1bc0e8..c94d5e893c 100644 --- a/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.2.bb +++ b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb @@ -19,7 +19,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ file://imsettings-gcc10.patch \ " -SRC_URI[sha256sum] = "412abf3165dbee3cbe03db0c296bab103569a49029429d038569c586ebe9efa9" +SRC_URI[sha256sum] = "45986b9ca1b87b760a5dbaecd9a2b77d080adc47868a0512826077175d5b3ee3" EXTRA_OECONF = "--with-xinputsh=50-xinput.sh \ --disable-static \ diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb index 9d90420266..67f4172228 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb @@ -9,7 +9,7 @@ DEPENDS += "xfce4-dev-tools-native libwnck3 xfconf" PV = "4.16.0" -SRC_URI = "git://github.com/schnitzeltony/xfce4-closebutton-plugin.git" +SRC_URI = "git://github.com/schnitzeltony/xfce4-closebutton-plugin.git;branch=master;protocol=https" SRCREV = "538f9acfc5d5019f5cde734d056bcc0c95da9b4c" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.5.bb index 0895e72097..ad731e0167 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.3.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.5.bb @@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e" inherit xfce-panel-plugin -SRC_URI[sha256sum] = "fb0cccd9a678136256edd0f04f945e611ab0aa912837f57413ef3bb0f515608c" +SRC_URI[sha256sum] = "c2f6dbd7f83c79b63b83c98232c79d050e18640e82464b9ec8d3643a92c3a1b0" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch index ac1d603b29..c4624c6915 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch @@ -18,8 +18,8 @@ diff --git a/configure.ac b/configure.ac index c281af9..60ba0c0 100644 --- a/configure.ac +++ b/configure.ac -@@ -209,19 +209,9 @@ dnl Check for interface for /sys/class/power_supply to be used - AC_ARG_ENABLE([sysfsacpi], [AC_HELP_STRING([--enable-sysfsacpi], [Use /sys/class/power_supply to read your battery value @<:@default=auto@:>@])], +@@ -203,19 +203,9 @@ dnl Check for interface for /sys/class/power_supply to be used + AC_ARG_ENABLE([sysfsacpi], [AS_HELP_STRING([--enable-sysfsacpi], [Use /sys/class/power_supply to read your battery value @<:@default=auto@:>@])], [], [ - enable_sysfsacpi=auto diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.95.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.2.bb index 39fe4b9b7a..c00ca6fafb 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.95.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b94789bed9aec03b9656a9cc5398c706" inherit xfce-panel-plugin -SRC_URI[sha256sum] = "83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c" +SRC_URI[sha256sum] = "da90f12e6ae995bcd1c81be35479a7a9d32308c65ecd64e568ba8c9592d39fcb" SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch" EXTRA_OECONF = " \ diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb index d24f65f4ca..cebe1106c0 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.5.3.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb @@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[sha256sum] = "39cc34c8a83381997c6faaacb6bf792339234303438a1fccd15c9a1770b87daf" +SRC_URI[sha256sum] = "04ae0c1764a0d5ec70f18a760d998a2109bb6724f048554d7d6999d9072ca63e" RRECOMMENDS:${PN} += "menulibre" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.3.bb index 4b31af890d..f27171dc37 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.3.bb @@ -14,7 +14,7 @@ SRC_URI += " \ file://configure.patch \ " -SRC_URI[sha256sum] = "528dac256315ffc2a4a53b3b421979327962121989886e3cf920aeff9912b53b" +SRC_URI[sha256sum] = "722dff3c3fe23f0a65405e63889cf247c99d092d3f9fb16dec78d062cfb8fae6" # Note: python bindings did not work in oe-dev and are about to be moved to # pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560 diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch deleted file mode 100644 index cd6ca32d00..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0002-Remove-GTK2-leftovers.patch +++ /dev/null @@ -1,44 +0,0 @@ -From fb7bd8511d55cf0d24f6f93768f51773cf434a59 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Fri, 8 Jan 2021 21:59:45 +0100 -Subject: [PATCH] Remove GTK2 leftovers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It seems that these cause install performed twice causing natsy races - -see [1] and search for 'TOPDIR/build/tmpfs/hosttools/install -c -m 644 -../../libxfce4ui-4.16.0/libxfce4ui/libxfce4ui.h' - -[1] https://errors.yoctoproject.org/Errors/Details/540832/ - -Upstream-Status: Submitted [https://gitlab.xfce.org/xfce/libxfce4ui/-/merge_requests/29] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - libxfce4ui/Makefile.am | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/libxfce4ui/Makefile.am b/libxfce4ui/Makefile.am -index 935eece..bc5afac 100644 ---- a/libxfce4ui/Makefile.am -+++ b/libxfce4ui/Makefile.am -@@ -51,15 +51,6 @@ libxfce4ui_sources = \ - xfce-filename-input.c \ - xfce-titled-dialog.c - --libxfce4ui_includedir = \ -- $(includedir)/xfce4/libxfce4ui-$(LIBXFCE4UI_VERSION_API)/libxfce4ui -- --libxfce4ui_include_HEADERS = \ -- $(libxfce4ui_headers) -- -- -- -- - ## - ## GTK+ 3 support library - ## --- -2.26.2 - diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb index 7b46c2a76c..a8ede836e5 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb @@ -9,11 +9,8 @@ inherit xfce gtk-doc gobject-introspection features_check REQUIRED_DISTRO_FEATURES = "x11" # TODO: Check if 0001-... can go -SRC_URI += " \ - file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch \ - file://0002-Remove-GTK2-leftovers.patch \ -" -SRC_URI[sha256sum] = "8b06c9e94f4be88a9d87c47592411b6cbc32073e7af9cbd64c7b2924ec90ceaa" +SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" +SRC_URI[sha256sum] = "d96946ae5af6bf078dda415419e0021909f763ee0020b42f3e26f603e51585f6" EXTRA_OECONF += "--with-vendor-info=${DISTRO}" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb index 9545ad1a81..c56af6f382 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb @@ -2,6 +2,9 @@ SUMMARY = "All packages required for a base installation of XFCE" SECTION = "x11/wm" PR = "r5" +# librsvg-gtk gets debian renamed to librsvg-2-gtk +PACKAGE_ARCH = "${TUNE_PKGARCH}" + inherit packagegroup features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.8.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.9.bb index 41963b9966..0872110f80 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.8.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.9.bb @@ -2,13 +2,13 @@ SUMMARY = "File manager for the Xfce Desktop Environment" SECTION = "x11" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo gdk-pixbuf libxfce4ui libsm startup-notification libnotify xfce4-panel udev" +DEPENDS = "libxml-parser-perl-native exo gdk-pixbuf libxfce4ui libsm startup-notification libnotify xfce4-panel udev" -inherit xfce gobject-introspection features_check mime-xdg +inherit xfce gobject-introspection features_check mime-xdg perlnative REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "038ca228d220cd0ba1b7b76465d8a51f2433ad1f74648d1d291daa0a24cb3195" +SRC_URI[sha256sum] = "520bf318eef8bc792db38ae4af343b648f87d4b8d66f5b5d6f092e15264ee5af" PACKAGECONFIG ??= "" PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" |