From ac5aa6245ffc5057fc255b3354b1c70dacee3ed7 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Mon, 5 Mar 2018 20:05:58 -0800 Subject: glade3: move from oe to gnome layer Signed-off-by: Armin Kuster --- ...C_PRINTF-on-functions-with-format-strings.patch | 62 ++++++++++++++++++++++ ...gnome-doc-utils.make-sysrooted-pkg-config.patch | 51 ++++++++++++++++++ .../glade/glade3/0002-fix-gcc-6-build.patch | 39 ++++++++++++++ .../recipes-devtools/glade/glade3_%.bbappend | 1 - meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb | 24 +++++++++ ...C_PRINTF-on-functions-with-format-strings.patch | 62 ---------------------- ...gnome-doc-utils.make-sysrooted-pkg-config.patch | 51 ------------------ .../glade/glade3/0002-fix-gcc-6-build.patch | 39 -------------- meta-oe/recipes-devtools/glade/glade3_3.8.5.bb | 24 --------- 9 files changed, 176 insertions(+), 177 deletions(-) create mode 100644 meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch create mode 100644 meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch create mode 100644 meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch delete mode 100644 meta-gnome/recipes-devtools/glade/glade3_%.bbappend create mode 100644 meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb delete mode 100644 meta-oe/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch delete mode 100644 meta-oe/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch delete mode 100644 meta-oe/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch delete mode 100644 meta-oe/recipes-devtools/glade/glade3_3.8.5.bb diff --git a/meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch b/meta-gnome/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-gnome/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 +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 +--- + 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-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch b/meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch new file mode 100644 index 000000000..1b24c39ce --- /dev/null +++ b/meta-gnome/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?= +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 +--- + 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-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch b/meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch new file mode 100644 index 000000000..f735ff819 --- /dev/null +++ b/meta-gnome/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?= +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 +--- + 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-gnome/recipes-devtools/glade/glade3_%.bbappend b/meta-gnome/recipes-devtools/glade/glade3_%.bbappend deleted file mode 100644 index 3abacfb86..000000000 --- a/meta-gnome/recipes-devtools/glade/glade3_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -PACKAGECONFIG ??= "gnome" diff --git a/meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb b/meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb new file mode 100644 index 000000000..69162bd2b --- /dev/null +++ b/meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb @@ -0,0 +1,24 @@ +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 autotools pkgconfig pythonnative gtk-icon-cache + +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" + +PACKAGECONFIG ?= "gnome" +PACKAGECONFIG[gnome] = "--enable-gnome,--disable-gnome,libbonoboui libgnomeui" + +FILES_${PN} += "${datadir}/icons" diff --git a/meta-oe/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch b/meta-oe/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch deleted file mode 100644 index 03cb762ce..000000000 --- a/meta-oe/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch +++ /dev/null @@ -1,62 +0,0 @@ -From fcf29abe59607b5791f9de18ddb86b9ae3c9b7cc Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 ---- - 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-oe/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch b/meta-oe/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch deleted file mode 100644 index 1b24c39ce..000000000 --- a/meta-oe/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch +++ /dev/null @@ -1,51 +0,0 @@ -From aed002cd9ff9e8f972120fbac33b4a65aba952e1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -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 ---- - 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-oe/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch b/meta-oe/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch deleted file mode 100644 index f735ff819..000000000 --- a/meta-oe/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5aa3d2abb905fa8594f6c6572a87809da54c9342 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -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 ---- - 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-oe/recipes-devtools/glade/glade3_3.8.5.bb b/meta-oe/recipes-devtools/glade/glade3_3.8.5.bb deleted file mode 100644 index c4f600095..000000000 --- a/meta-oe/recipes-devtools/glade/glade3_3.8.5.bb +++ /dev/null @@ -1,24 +0,0 @@ -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 autotools pkgconfig pythonnative gtk-icon-cache - -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" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gnome] = "--enable-gnome,--disable-gnome,libbonoboui libgnomeui" - -FILES_${PN} += "${datadir}/icons" -- cgit v1.2.3-54-g00ecf