From f9ccdeb9d82aaa1300a993824a8d7cfe4e84aad1 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 18 Jul 2017 02:09:04 -0400 Subject: glade: add recipe 3.20.0 The newly added glade is the original Glade codebase, and glade3 is a complete rewrite of it. Signed-off-by: Hongxu Jia Signed-off-by: Martin Jansa --- ...gnome-doc-utils.make-sysrooted-pkg-config.patch | 51 ---------------------- .../glade/files/0002-fix-gcc-6-build.patch | 39 ----------------- .../glade/glade/remove-yelp-help-rules-var.patch | 39 +++++++++++++++++ ...gnome-doc-utils.make-sysrooted-pkg-config.patch | 51 ++++++++++++++++++++++ .../glade/glade3/0002-fix-gcc-6-build.patch | 39 +++++++++++++++++ meta-oe/recipes-devtools/glade/glade_3.20.0.bb | 27 ++++++++++++ 6 files changed, 156 insertions(+), 90 deletions(-) delete mode 100644 meta-oe/recipes-devtools/glade/files/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch delete mode 100644 meta-oe/recipes-devtools/glade/files/0002-fix-gcc-6-build.patch create mode 100644 meta-oe/recipes-devtools/glade/glade/remove-yelp-help-rules-var.patch create mode 100644 meta-oe/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch create mode 100644 meta-oe/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch create mode 100644 meta-oe/recipes-devtools/glade/glade_3.20.0.bb diff --git a/meta-oe/recipes-devtools/glade/files/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch b/meta-oe/recipes-devtools/glade/files/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch deleted file mode 100644 index 1b24c39ce8..0000000000 --- a/meta-oe/recipes-devtools/glade/files/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/files/0002-fix-gcc-6-build.patch b/meta-oe/recipes-devtools/glade/files/0002-fix-gcc-6-build.patch deleted file mode 100644 index f735ff8190..0000000000 --- a/meta-oe/recipes-devtools/glade/files/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/glade/remove-yelp-help-rules-var.patch b/meta-oe/recipes-devtools/glade/glade/remove-yelp-help-rules-var.patch new file mode 100644 index 0000000000..78a8719f23 --- /dev/null +++ b/meta-oe/recipes-devtools/glade/glade/remove-yelp-help-rules-var.patch @@ -0,0 +1,39 @@ +From 42efc94c11d510b41d8cf3407e1c3900eb52b600 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Thu, 4 Jun 2015 16:28:02 +0800 +Subject: [PATCH] Remove unused variable (YELP_HELP_RULES) + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia +--- + help/Makefile.am | 2 -- + help/Makefile.in | 2 -- + 2 files changed, 4 deletions(-) + +diff --git a/help/Makefile.am b/help/Makefile.am +index 50c0e84..5c5d2e9 100644 +--- a/help/Makefile.am ++++ b/help/Makefile.am +@@ -1,5 +1,3 @@ +-@YELP_HELP_RULES@ +- + HELP_ID = glade + + HELP_FILES = \ +diff --git a/help/Makefile.in b/help/Makefile.in +index 6978ea5..e1c7d3b 100644 +--- a/help/Makefile.in ++++ b/help/Makefile.in +@@ -521,8 +521,6 @@ uninstall-am: + + .PRECIOUS: Makefile + +-@YELP_HELP_RULES@ +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +-- +1.9.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 new file mode 100644 index 0000000000..1b24c39ce8 --- /dev/null +++ b/meta-oe/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-oe/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch b/meta-oe/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch new file mode 100644 index 0000000000..f735ff8190 --- /dev/null +++ b/meta-oe/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-oe/recipes-devtools/glade/glade_3.20.0.bb b/meta-oe/recipes-devtools/glade/glade_3.20.0.bb new file mode 100644 index 0000000000..8b35a9c490 --- /dev/null +++ b/meta-oe/recipes-devtools/glade/glade_3.20.0.bb @@ -0,0 +1,27 @@ +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+ gtk+3 glib-2.0 libxml2 intltool-native \ + gnome-common-native \ +" + + +inherit autotools pkgconfig pythonnative gnomebase gobject-introspection + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade/3.20/glade-${PV}.tar.xz \ + file://remove-yelp-help-rules-var.patch \ + " +SRC_URI[md5sum] = "9964a2da14c5f845eae363889586ca43" +SRC_URI[sha256sum] = "82d96dca5dec40ee34e2f41d49c13b4ea50da8f32a3a49ca2da802ff14dc18fe" + +EXTRA_OECONF += "--disable-man-pages" + +FILES_${PN} += "${datadir}/* ${libdir}/glade/modules/libgladegtk.so" +FILES_${PN}-dev += "${libdir}/glade/modules/libgladegtk.la" +FILES_${PN}-dbg += "${libdir}/glade/modules/.debug/libgladegtk.so" + +PYTHON_PN = "python" + -- cgit v1.2.3-54-g00ecf