diff options
Diffstat (limited to 'meta-openembedded/meta-xfce')
22 files changed, 378 insertions, 63 deletions
diff --git a/meta-openembedded/meta-xfce/README b/meta-openembedded/meta-xfce/README index 7431e8b7c..84b019896 100644 --- a/meta-openembedded/meta-xfce/README +++ b/meta-openembedded/meta-xfce/README @@ -19,4 +19,3 @@ Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce When sending single patches, please using something like: 'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-xfce][PATCH' -Layer maintainer: Andreas Müller <schnitzeltony@googlemail.com> diff --git a/meta-openembedded/meta-xfce/conf/layer.conf b/meta-openembedded/meta-xfce/conf/layer.conf index 6e9d89294..da07f8e16 100644 --- a/meta-openembedded/meta-xfce/conf/layer.conf +++ b/meta-openembedded/meta-xfce/conf/layer.conf @@ -17,9 +17,6 @@ LAYERDEPENDS_xfce-layer += "openembedded-layer" LAYERDEPENDS_xfce-layer += "gnome-layer" LAYERDEPENDS_xfce-layer += "multimedia-layer" LAYERDEPENDS_xfce-layer += "meta-python" +LAYERDEPENDS_xfce-layer += "networking-layer" LAYERSERIES_COMPAT_xfce-layer = "thud warrior" - -SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ - xfce4-session->machine-host \ -" diff --git a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.3.bb b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.4.bb index d9b9b2cb0..416ac2adc 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.3.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.4.bb @@ -9,8 +9,8 @@ inherit xfce-app RRECOMMENDS_${PN} += "tumbler" -SRC_URI[md5sum] = "5866b4e11c32a38f72bc737239102544" -SRC_URI[sha256sum] = "8c9c11760816dfd9ed57fb8b9df86c6a98a2604ab551be3133996a1c32ca2665" +SRC_URI[md5sum] = "0142c8b9c492cf447e563b00c6204359" +SRC_URI[sha256sum] = "3a0be4526c93ec0ebbf2e63e69dd0c98f16b20b863d3b6426272592e5b00cea2" SRC_URI += "file://0001-Fix-build-after-update-of-xfconf.patch" FILES_${PN} += "${datadir}/appdata" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.3.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.4.bb index d7719051b..06ab0dfeb 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.3.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.4.bb @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = " \ dbus \ dbus-glib \ - dbus-glib-native \ libnotify \ libxfce4util \ libxfce4ui \ @@ -15,8 +14,8 @@ DEPENDS = " \ inherit xfce-app -SRC_URI[md5sum] = "4887c62dfcb4c3e4f45c9acfb3def515" -SRC_URI[sha256sum] = "293dda084cfca4887ae740e2725fdfc64412bc10eac7a55a924eb14482dceac0" +SRC_URI[md5sum] = "9614d4f7c0790e8ab24e55896a44a8ac" +SRC_URI[sha256sum] = "090571acf94c423003426cb779fb23e8545c68bab6485563b589c7def8a21b55" # 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-apps/xfce4-terminal/xfce4-terminal_0.8.7.4.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.4.bb index 7fc638e47..426282e14 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.4.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.4.bb @@ -10,3 +10,5 @@ FILES_${PN} += "${datadir}/xfce4 \ SRC_URI[md5sum] = "c861540dd1dd05f56e62382b3851cf66" SRC_URI[sha256sum] = "a88f98af4da72394f2cfbd7f14b0f053ec0a3b58a4f6a577836357c60a6c42ab" + +RRECOMMENDS_${PN} += "vte-prompt" diff --git a/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala/0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch b/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala/0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch new file mode 100644 index 000000000..a3a9330ef --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala/0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch @@ -0,0 +1,31 @@ +From 35267d995a81263b98f0ad56399ac3e30f9cf152 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Tue, 30 Apr 2019 09:48:08 +0200 +Subject: [PATCH] configure.ac: Detect vala-api version if not set explicitly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 9bf4230..c489385 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -38,7 +38,7 @@ AC_ARG_WITH([vala-api], + AC_HELP_STRING([--with-vala-api=VERSION], + [Use Vala API version VERSION]), + [vala_api=$withval], +- [vala_api='0.16']) ++ [vala_api=`$PKG_CONFIG --variable=vapidir_versioned vapigen | sed -e 's:.*vala-::' -e s:/vapi::`]) + M8T_CHECK_VALA([$vala_api]) + AC_ARG_WITH([default-vapidir], + AC_HELP_STRING([--with-default-vapidir], +-- +2.20.1 + diff --git a/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb b/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb index 97007bec4..68dbc69af 100644 --- a/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb +++ b/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb @@ -7,12 +7,13 @@ inherit xfce pkgconfig distro_features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2" +SRC_URI = " \ + http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2 \ + file://0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch \ +" SRC_URI[md5sum] = "0bbb1d6e473e0fe9b335b7b1b49d8a71" SRC_URI[sha256sum] = "07a8f2b7c09fcdd3d86e0c52adea3c58ca011d0142a93997a01b4af77260ae7b" -EXTRA_OECONF = "-with-vala-api=0.42" - FILES_${PN} += "${datadir}/vala-*/vapi" RDEPENDS_${PN} = "vala" diff --git a/meta-openembedded/meta-xfce/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch b/meta-openembedded/meta-xfce/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch new file mode 100644 index 000000000..03cb762ce --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch @@ -0,0 +1,62 @@ +From fcf29abe59607b5791f9de18ddb86b9ae3c9b7cc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 26 Aug 2017 23:50:05 -0700 +Subject: [PATCH] Add G_GNUC_PRINTF on functions with format strings + +This allows compilation with clang without errors, even when +-Wformat-nonliteral is active (as long as there are no real cases of +non literal formatting). + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gladeui/glade-command.c | 4 ++-- + gladeui/glade-utils.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/gladeui/glade-command.c b/gladeui/glade-command.c +index 9819766..4ac40ee 100644 +--- a/gladeui/glade-command.c ++++ b/gladeui/glade-command.c +@@ -266,7 +266,7 @@ glade_command_collapse (GladeCommand *command, + * + * Marks the begining of a group. + */ +-void ++G_GNUC_PRINTF(1, 2) void + glade_command_push_group (const gchar *fmt, ...) + { + va_list args; +@@ -655,7 +655,7 @@ glade_command_set_properties_list (GladeProject *project, GList *props) + + multiple = g_list_length (me->sdata) > 1; + if (multiple) +- glade_command_push_group (cmd->description); ++ glade_command_push_group ("%s", cmd->description); + + + glade_command_check_group (GLADE_COMMAND (me)); +diff --git a/gladeui/glade-utils.c b/gladeui/glade-utils.c +index ae52501..c51ae59 100644 +--- a/gladeui/glade-utils.c ++++ b/gladeui/glade-utils.c +@@ -197,7 +197,7 @@ glade_utils_get_pspec_from_funcname (const gchar *funcname) + * selected "OK", True if the @type was GLADE_UI_YES_OR_NO and + * the user selected "YES"; False otherwise. + */ +-gint ++G_GNUC_PRINTF(4, 5) gint + glade_util_ui_message (GtkWidget *parent, + GladeUIMessageType type, + GtkWidget *widget, +@@ -320,7 +320,7 @@ remove_message_timeout (FlashInfo * fi) + * + * Flash a temporary message on the statusbar. + */ +-void ++G_GNUC_PRINTF(3, 4) void + glade_util_flash_message (GtkWidget *statusbar, guint context_id, gchar *format, ...) + { + va_list args; +-- +2.14.1 + diff --git a/meta-openembedded/meta-xfce/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch b/meta-openembedded/meta-xfce/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch new file mode 100644 index 000000000..1b24c39ce --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch @@ -0,0 +1,51 @@ +From aed002cd9ff9e8f972120fbac33b4a65aba952e1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Tue, 25 Sep 2012 10:28:33 +0200 +Subject: [PATCH] gnome-doc-utils.make: sysrooted pkg-config +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +same approach as used used in gnome-disk-utility: + +In cross environment we have to prepend the sysroot to the path found by +pkgconfig since the path returned from pkgconfig does not have sysroot prefixed +it ends up using the files from host system. Now usually people have gnome installed +so the build succeeds but if you dont have gnome installed on build host then +it wont find the files on host system and packages using gnome-doc-utils wont +compile. + +This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR +will be empty + +Upstream-Status: pending + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + gnome-doc-utils.make | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make +index 42d9df3..f71bbfa 100644 +--- a/gnome-doc-utils.make ++++ b/gnome-doc-utils.make +@@ -133,11 +133,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@ + _xml2po ?= `which xml2po` + _xml2po_mode = $(if $(DOC_ID),mallard,docbook) + +-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` +-_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` +-_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl +-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl +-_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl ++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` ++_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` ++_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl ++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl ++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl + + if ENABLE_SK + _ENABLE_SK = true +-- +1.7.6.5 + diff --git a/meta-openembedded/meta-xfce/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch b/meta-openembedded/meta-xfce/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch new file mode 100644 index 000000000..f735ff819 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch @@ -0,0 +1,39 @@ +From 5aa3d2abb905fa8594f6c6572a87809da54c9342 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Mon, 5 Sep 2016 11:25:27 +0200 +Subject: [PATCH] fix gcc-6 build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + gladeui/glade-editor-property.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c +index a0c1039..5e9ac38 100644 +--- a/gladeui/glade-editor-property.c ++++ b/gladeui/glade-editor-property.c +@@ -2703,6 +2703,8 @@ glade_eprop_object_view (gboolean radio) + } + + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + static gchar * + glade_eprop_object_dialog_title (GladeEditorProperty *eprop) + { +@@ -2731,6 +2733,7 @@ glade_eprop_object_dialog_title (GladeEditorProperty *eprop) + return g_strdup_printf (format, g_type_name + (eprop->klass->pspec->value_type)); + } ++#pragma GCC diagnostic pop + + + gboolean +-- +2.5.5 + diff --git a/meta-openembedded/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb b/meta-openembedded/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb new file mode 100644 index 000000000..c3da3e9b9 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-devtools/glade/glade3_3.8.5.bb @@ -0,0 +1,23 @@ +SUMMARY = "Glade - A User Interface Designer" +HOMEPAGE = "http://www.gnu.org/software/gnash" +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \ + file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \ + file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475" +DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2 intltool-native" + +inherit distro_features_check autotools pkgconfig pythonnative gtk-icon-cache + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \ + file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch \ + file://0002-fix-gcc-6-build.patch \ + file://0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch \ + " +SRC_URI[md5sum] = "4e4b4f5ee34a03e017e4cef97d796c1f" +SRC_URI[sha256sum] = "58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735" + +EXTRA_OECONF += "--disable-scrollkeeper" + +FILES_${PN} += "${datadir}/icons" diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.1.bb b/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.2.bb index 2b4e97490..a286a5adb 100644 --- a/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.1.bb +++ b/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.2.bb @@ -19,8 +19,8 @@ DEPENDS += " \ taglib \ " -SRC_URI[md5sum] = "46fe86bbe0c4aa02c53244d66e62e90c" -SRC_URI[sha256sum] = "8ad2931fdb35415cc3d7551b5f2207bfaa1aba15545accbacbb4984cdabd7099" +SRC_URI[md5sum] = "cd22ab579470c5728db0aa6c0b9d4c7d" +SRC_URI[sha256sum] = "bff0fc846d0d7b8f435ac5514976f1cd1d82b62dbf1b7d470e253a5b439407da" RDEPENDS_${PN} += "gstreamer1.0-plugins-good" @@ -34,5 +34,3 @@ FILES_${PN} += " \ ${datadir}/appdata \ ${libdir}/parole-0/*.so \ " - -FILES_${PN}-dev += "${libdir}/parole-0/*.la" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch new file mode 100644 index 000000000..92a6e8384 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch @@ -0,0 +1,121 @@ +From f86486e128f62ed5a531163535d11f0aa0268928 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 5 May 2019 20:45:26 +0200 +Subject: [PATCH] Fix memory-leak and reduce cpu-load slightly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* when setting font remove old css provider befor setting new + -> fix memory leak +* do call cpufreq_label_set_font only on init and when font was changed + -> reduce cpu-load + +Fixes https://bugzilla.xfce.org/show_bug.cgi?id=15218 + +Upstream-Status: Submitted [1] + +[1] https://bugzilla.xfce.org/attachment.cgi?id=8492 + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + panel-plugin/xfce4-cpufreq-configure.c | 4 ++++ + panel-plugin/xfce4-cpufreq-plugin.c | 13 +++++++++++-- + panel-plugin/xfce4-cpufreq-plugin.h | 2 ++ + 3 files changed, 17 insertions(+), 2 deletions(-) + +diff --git a/panel-plugin/xfce4-cpufreq-configure.c b/panel-plugin/xfce4-cpufreq-configure.c +index 1205fc9..48e72ff 100644 +--- a/panel-plugin/xfce4-cpufreq-configure.c ++++ b/panel-plugin/xfce4-cpufreq-configure.c +@@ -85,7 +85,10 @@ button_fontname_update(GtkWidget *button, gboolean update_plugin) + } + + if (update_plugin) ++ { ++ cpufreq_label_set_font (); + cpufreq_update_plugin (TRUE); ++ } + } + + +@@ -155,6 +158,7 @@ button_fontcolor_clicked (GtkWidget *button, void *data) + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (button), color); + cpuFreq->options->fontcolor = gdk_rgba_to_string (color); + g_free (color); ++ cpufreq_label_set_font (); + cpufreq_update_plugin (TRUE); + } + +diff --git a/panel-plugin/xfce4-cpufreq-plugin.c b/panel-plugin/xfce4-cpufreq-plugin.c +index e886121..8d7c9e5 100644 +--- a/panel-plugin/xfce4-cpufreq-plugin.c ++++ b/panel-plugin/xfce4-cpufreq-plugin.c +@@ -44,6 +44,7 @@ cpufreq_label_set_font (void) + { + gchar *css = NULL, *css_font = NULL, *css_color = NULL; + GtkCssProvider *provider; ++ GtkStyleContext *context; + PangoFontDescription *font; + + if (G_UNLIKELY (cpuFreq->label == NULL)) +@@ -76,11 +77,17 @@ cpufreq_label_set_font (void) + if (css) + { + provider = gtk_css_provider_new (); ++ context = GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (cpuFreq->label))); ++ ++ if (currentProvider) ++ gtk_style_context_remove_provider (context, currentProvider); + + gtk_css_provider_load_from_data (provider, css, -1, NULL); + gtk_style_context_add_provider ( +- GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (cpuFreq->label))), ++ context, + GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); ++ ++ currentProvider = provider; + } + + g_free (css); +@@ -420,7 +427,6 @@ cpufreq_update_plugin (gboolean reset_label_size) + + if (cpuFreq->layout_changed) + { +- cpufreq_label_set_font (); + cpufreq_widgets_layout (); + } + +@@ -601,6 +607,7 @@ cpufreq_widgets (void) + + gtk_widget_show_all (cpuFreq->button); + ++ cpufreq_label_set_font (); + cpufreq_update_plugin (TRUE); + } + +@@ -775,6 +782,8 @@ cpufreq_construct (XfcePanelPlugin *plugin) + { + xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); + ++ currentProvider = NULL; ++ + cpuFreq = g_new0 (CpuFreqPlugin, 1); + cpuFreq->options = g_new0 (CpuFreqPluginOptions, 1); + cpuFreq->plugin = plugin; +diff --git a/panel-plugin/xfce4-cpufreq-plugin.h b/panel-plugin/xfce4-cpufreq-plugin.h +index a6895e4..6338698 100644 +--- a/panel-plugin/xfce4-cpufreq-plugin.h ++++ b/panel-plugin/xfce4-cpufreq-plugin.h +@@ -95,6 +95,8 @@ typedef struct + + CpuFreqPlugin *cpuFreq; + ++GtkCssProvider *currentProvider; ++ + G_BEGIN_DECLS + + void +-- +2.20.1 + 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 3f5587d80..6addc3b65 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,3 +7,4 @@ 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" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.1.bb index af38ba543..97aa184b0 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.0.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.1.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit xfce-panel-plugin -SRC_URI[md5sum] = "30caaa94c6c267827a31ad69fa472e51" -SRC_URI[sha256sum] = "297f3077f7aee52a237449fbd8595e232267bc600b5b9e7ddc5baab306ed67b9" +SRC_URI[md5sum] = "c42149ec71836fe83085511429e638dc" +SRC_URI[sha256sum] = "e0c7321346ded2539c4688c593f650696ed0ddca0a5f9d4e404d0e7fc42ae256" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.7.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.0.bb index 16be09dca..698152bae 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.7.0.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.0.bb @@ -1,12 +1,13 @@ -DESCRIPTION = "Panel plugin displaying menu with quick access to folders, documents, and removable media" +SUMMARY = "Menu for quick access to folders, documents and removable media" +DESCRIPTION = "Panel plugin displaying menu with quick access to folders, documents and removable media" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f" inherit xfce-panel-plugin -SRC_URI[md5sum] = "fcae9b38a8affcd82699a94991bba29b" -SRC_URI[sha256sum] = "4175c614749abbb5bcf6f49c88125fb0dd36db69f4c374df23563907b16e2c3f" +SRC_URI[md5sum] = "e3a306d927befb8afcb5212f8ab0b8c9" +SRC_URI[sha256sum] = "7ba3f46f88c2845cbf413efeefaed29157f8b98571856c6e2bf35e4de5d8ecce" PACKAGECONFIG ??= "" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch index 076477581..8c950299f 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch +++ b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch @@ -1,6 +1,6 @@ From e710d8d4a3e3480416826c70d56ea3d2598a77e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Thu, 28 Mar 2013 23:41:03 +0100 +Date: Sat, 4 May 2019 14:50:11 +0200 Subject: [PATCH] reduce build to exo-csource only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -16,11 +16,11 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- Makefile.am | 10 +--------- - configure.ac | 22 ---------------------- - 2 files changed, 1 insertion(+), 31 deletions(-) + configure.ac | 20 -------------------- + 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 62ad18d..bdc5fae 100644 +index 62ad18d..8934f1f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,15 +1,7 @@ @@ -41,10 +41,10 @@ index 62ad18d..bdc5fae 100644 distclean-local: rm -rf *.cache *~ diff --git a/configure.ac b/configure.ac -index 3f92d1b..0d4cc38 100644 +index 4e4eb5e..237184c 100644 --- a/configure.ac +++ b/configure.ac -@@ -116,15 +116,6 @@ AC_PROG_CC() +@@ -120,15 +120,6 @@ AC_PROG_CC() AM_PROG_CC_C_O() AC_PROG_INSTALL() IT_PROG_INTLTOOL([intltool_minimum_version], [no-xml]) @@ -60,26 +60,31 @@ index 3f92d1b..0d4cc38 100644 dnl *************************************** dnl *** Check for standard header files *** -@@ -171,19 +162,6 @@ dnl *********************************** +@@ -175,12 +166,6 @@ dnl *********************************** dnl *** Check for required packages *** dnl *********************************** XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0]) -XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0]) --XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) -XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0]) -XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0]) --XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0]) -XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features]) -- + + dnl *********************************************************** + dnl *** Optional support for a GTK+2 version of the library *** +@@ -190,11 +175,6 @@ XDT_CHECK_OPTIONAL_PACKAGE([GTK2], + [GTK+ 2 support]) + AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test "x$GTK2_FOUND" = "xyes"]) + -dnl ********************* -dnl *** Check for X11 *** -dnl ********************* -XDT_CHECK_LIBX11_REQUIRE() - +- dnl ************************* dnl *** Check for gtk-doc *** + dnl ************************* -- -2.14.3 +2.20.1 diff --git a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.4.bb b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.5.bb index 7b7edfe1b..7d61e8f83 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.4.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.5.bb @@ -20,15 +20,16 @@ SRC_URI_append_class-native = " \ file://reduce-build-to-exo-csource-only.patch \ " -SRC_URI[md5sum] = "962bbccb38db0aecd4151ca97f6a39bc" -SRC_URI[sha256sum] = "b0af60816bdb572ce53f19462fb1f3a5895a04017a878893dc03c166ea2050af" +SRC_URI[md5sum] = "1de1d539262847d49474d20cbebc78ea" +SRC_URI[sha256sum] = "e8f434d6436ae647dd1614e8a24aba23c83f70cb14037b5bc98652f558be43e8" PACKAGES =+ "exo-csource" # 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 -FILES_${PN} += "${datadir}/xfce4/ \ - ${libdir}/xfce4/exo-1 \ +FILES_${PN} += " \ + ${datadir}/xfce4/ \ + ${libdir}/xfce4/exo* \ " FILES_exo-csource += "${bindir}/exo-csource" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb index 8a385baeb..df4b25c52 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb @@ -18,6 +18,7 @@ EXTRA_OECONF += "--with-vendor-info=${DISTRO}" PACKAGECONFIG ??= "" PACKAGECONFIG[gladeui] = "--enable-gladeui,--disable-gladeui,glade3" +PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" PACKAGES =+ "${PN}-gtk2 ${PN}-gtk3" @@ -25,8 +26,12 @@ FILES_${PN}-gtk2 += "${libdir}/libxfce4ui-1.so.* ${libdir}/libxfce4kbd-private-2 FILES_${PN}-gtk3 += "${libdir}/libxfce4ui-2.so.* ${libdir}/libxfce4kbd-private-3.so.*" PACKAGES += "${PN}-glade" -FILES_${PN}-glade = "${libdir}/glade3 \ - ${datadir}/glade3" +FILES_${PN}-glade = " \ + ${libdir}/glade \ + ${libdir}/glade3 \ + ${datadir}/glade \ + ${datadir}/glade3 \ +" RDEPENDS_${PN}-gtk2 = "${PN}" RDEPENDS_${PN}-gtk3 = "${PN}" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb deleted file mode 100644 index c79197445..000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Meta package adding machine name to known hosts" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -ALLOW_EMPTY_${PN} = "1" - -LOCALHOSTMACHINE = "127.0.0.1 ${MACHINE}" - -# on some machines starting applications as xfce4-terminal take ages without -# machine name in hosts -pkg_postinst_${PN} () { -if ! grep -q '${LOCALHOSTMACHINE}' $D/etc/hosts ; then - echo '${LOCALHOSTMACHINE}' >> $D/etc/hosts -fi -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb index b11aaa4fe..3b9525fff 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb @@ -26,9 +26,3 @@ FILES_${PN} += " \ ${datadir}/themes/Default/balou/* \ ${datadir}/polkit-1 \ " - -FILES_${PN} += " \ - ${libdir}/xfce4/session/splash-engines/*.la \ -" - -RDEPENDS_${PN} += "machine-host" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.6.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.6.bb index 2667ff947..ded3c44e5 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.6.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.6.bb @@ -16,3 +16,5 @@ FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \ ${datadir}/dbus-1/services/org.xfce.Xfconf.service" FILES_${PN}-dev += "${libdir}/gio/modules/libxfconfgsettingsbackend.la" + +PACKAGECONFIG[gsettings-backend] = "--enable-gsettings-backend,--disable-gsettings-backend," |