Skip to contentSkip to conversation

libglade: add a recipe from oe-core

PATCH New Alexander Kanavin 1 participant 3 messages Aug 26, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 libglade: add a recipe from oe-core

---
 .../libglade/libglade-2.6.4/glade-cruft.patch      | 102 +++++
 .../libglade/libglade-2.6.4/no-xml2.patch          | 501 +++++++++++++++++++++
 .../libglade-2.6.4/python_environment.patch        |  14 +
 meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb   |  31 ++
 4 files changed, 648 insertions(+)
 create mode 100644 meta-oe/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch
 create mode 100644 meta-oe/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch
 create mode 100644 meta-oe/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch
 create mode 100644 meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb
meta-oe/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch new file +102 -0
new file mode 100644
index 0000000..c5d5864
@@ -0,0 +1,102 @@
+Upstream-Status: Pending
+
+diff -ur libglade-2.4.0~/configure.in libglade-2.4.0/configure.in
+--- libglade-2.4.0~/configure.in	2004-05-17 12:38:31.000000000 +0100
++++ libglade-2.4.0/configure.in	2004-07-28 16:53:09.000000000 +0100
+@@ -147,6 +147,18 @@
+ AM_CONDITIONAL(HAVE_PYTHON, $have_python)
+ AC_SUBST(PYTHON)
+ 
++AC_MSG_CHECKING([for cruft in libgtk])
++AC_TRY_LINK([
++#include <gtk/gtk.h>
++#include <stdio.h>
++],      [ gtk_tree_get_type (); return 0; ],
++        [ AC_MSG_RESULT(yes)
++          have_cruft=yes ],
++        [ AC_MSG_RESULT(no)
++	  AC_DEFINE(DISABLE_CRUFT,,[leave out support for old, broken widgets])
++          have_cruft=no ])
++AC_SUBST(DISABLE_CRUFT)
++
+ dnl add debugging options ...
+ changequote(,)dnl
+ if test "x$GCC" = xyes; then
+Only in libglade-2.4.0: configure.in.orig
+diff -ur libglade-2.4.0~/glade/glade-gtk.c libglade-2.4.0/glade/glade-gtk.c
+--- libglade-2.4.0~/glade/glade-gtk.c	2004-03-13 13:47:35.000000000 +0000
++++ libglade-2.4.0/glade/glade-gtk.c	2004-07-28 16:53:52.000000000 +0100
+@@ -213,6 +213,8 @@
+ 	gtk_clist_column_titles_hide (GTK_CLIST (w));
+ }
+ 
++#ifndef DISABLE_CRUFT
++
+ static void
+ tree_set_selection_mode (GladeXML *xml, GtkWidget *w,
+ 			 const char *name, const char *value)
+@@ -238,6 +240,8 @@
+     gtk_tree_set_view_lines (GTK_TREE (w), BOOL (value));
+ }
+ 
++#endif
++
+ static void
+ list_set_selection_mode (GladeXML *xml, GtkWidget *w,
+ 			 const char *name, const char *value)
+@@ -254,6 +258,7 @@
+     gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (w), BOOL (value));
+ }
+ 
++#ifndef DISABLE_CRUFT
+ static void
+ text_set_text (GladeXML *xml, GtkWidget *w,
+ 	       const char *name, const char *value)
+@@ -262,6 +267,7 @@
+ 
+     gtk_editable_insert_text (GTK_EDITABLE (w), value, -1, &pos);
+ }
++#endif
+ 
+ static void
+ radio_menu_item_set_group (GladeXML *xml, GtkWidget *w,
+@@ -1125,13 +1131,17 @@
+     glade_register_custom_prop (GTK_TYPE_CLIST, "selection_mode", clist_set_selection_mode);
+     glade_register_custom_prop (GTK_TYPE_CLIST, "shadow_type", clist_set_shadow_type);
+     glade_register_custom_prop (GTK_TYPE_CLIST, "show_titles", clist_set_show_titles);
++#ifndef DISABLE_CRUFT
+     glade_register_custom_prop (GTK_TYPE_TREE, "selection_mode", tree_set_selection_mode);
+     glade_register_custom_prop (GTK_TYPE_TREE, "view_mode", tree_set_view_mode);
+     glade_register_custom_prop (GTK_TYPE_TREE, "view_line", tree_set_view_line);
++#endif
+     glade_register_custom_prop (GTK_TYPE_LIST, "selection_mode", list_set_selection_mode);
+     glade_register_custom_prop (GTK_TYPE_CHECK_MENU_ITEM, "always_show_toggle",
+ 				check_menu_item_set_always_show_toggle);
++#ifndef DISABLE_CRUFT
+     glade_register_custom_prop (GTK_TYPE_TEXT, "text", text_set_text);
++#endif
+     glade_register_custom_prop (GTK_TYPE_RADIO_MENU_ITEM, "group",
+ 				radio_menu_item_set_group);
+     glade_register_custom_prop (GTK_TYPE_TOOLBAR, "tooltips", toolbar_set_tooltips);
+@@ -1288,8 +1298,10 @@
+ 			   glade_standard_build_children, NULL);
+     glade_register_widget (GTK_TYPE_TEAROFF_MENU_ITEM, glade_standard_build_widget,
+ 			   NULL, NULL);
++#ifndef DISABLE_CRUFT
+     glade_register_widget (GTK_TYPE_TEXT, glade_standard_build_widget,
+ 			   NULL, NULL);
++#endif
+     glade_register_widget (GTK_TYPE_TEXT_VIEW, glade_standard_build_widget,
+ 			   NULL, NULL);
+     glade_register_widget (GTK_TYPE_TIPS_QUERY, glade_standard_build_widget,
+@@ -1304,8 +1316,10 @@
+ 			   glade_standard_build_children, NULL);
+     glade_register_widget (GTK_TYPE_TOOL_BUTTON, glade_standard_build_widget,
+ 			   NULL, NULL);
++#ifndef DISABLE_CRUFT
+     glade_register_widget (GTK_TYPE_TREE, glade_standard_build_widget,
+ 			   NULL, NULL);
++#endif
+     glade_register_widget (GTK_TYPE_TREE_VIEW, glade_standard_build_widget,
+ 			   NULL, NULL);
+     glade_register_widget (GTK_TYPE_VBUTTON_BOX, glade_standard_build_widget,
meta-oe/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch new file +501 -0

501 lines not on this page · raw message

meta-oe/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch new file +14 -0
new file mode 100644
index 0000000..b5b2ec4
@@ -0,0 +1,14 @@
+Using @PYTHON@ for this path would result in the build system python being 
+referred to. Instead we want to locate python from the environment.
+
+Upstream-Status: Inappropriate [configuration]
+
+diff -ruN libglade-2.6.4-orig//libglade-convert.in libglade-2.6.4/libglade-convert.in
+--- libglade-2.6.4-orig//libglade-convert.in	2011-09-22 10:18:28.991164003 +0800
++++ libglade-2.6.4/libglade-convert.in	2011-09-22 10:18:55.431164003 +0800
+@@ -1,4 +1,4 @@
+-#!@PYTHON@
++#!/usr/bin/env python
+ # -*- mode: python -*-
+ 
+ # yes, this requires python 2.x and an XML parser module (eg. PyExpat)
meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb new file +31 -0
new file mode 100644
index 0000000..553e19c
@@ -0,0 +1,31 @@
+SUMMARY = "Runtime support for the GTK+ interface builder"
+HOMEPAGE = "http://library.gnome.org/devel/libglade/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "LGPLv2 & LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
+                    file://glade/glade.h;endline=22;md5=a04f461c964ba4b57a172d1fbcd8f8fc \
+                    file://glade/glade-gtk.c;endline=22;md5=766f993433e2642fec87936d319990ff"
+
+SECTION = "libs"
+PR = "r5"
+DEPENDS = "zlib gdk-pixbuf gtk+"
+
+inherit autotools pkgconfig gnomebase gtk-doc distro_features_check
+ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
+GNOME_COMPRESS_TYPE="bz2"
+
+SRC_URI += "file://glade-cruft.patch file://no-xml2.patch file://python_environment.patch"
+
+SRC_URI[archive.md5sum] = "d1776b40f4e166b5e9c107f1c8fe4139"
+SRC_URI[archive.sha256sum] = "64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec"
+
+EXTRA_OECONF += "--without-libxml2"
+
+CFLAGS += "-lz"
+
+PACKAGES += " ${PN}-data"
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd"
+FILES_${PN}-dev += "${bindir}/libglade-convert"
+#RDEPENDS_${PN} = "${PN}-data"
Signature · 1 line
2.9.3
#1 lore raw

PATCH 2/3 gnome-control-center, gthumb: correctly remove a file from the source tree

---
 .../recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb   | 2 +-
 meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb +1 -1
index dfb8133..814d829 100644
@@ -16,7 +16,7 @@ LDFLAGS += "-lgthread-2.0 -lxml2"
 
 do_configure_prepend() {
     sed -i s:help::g ${S}/Makefile.am
-    rm -r ${S}/m4/gnome-doc-utils.m4
+    rm -f ${S}/m4/gnome-doc-utils.m4
 }
 do_install_append() {
     rm -rf ${D}${datadir}/mime
meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb +1 -1
index d22d5da..b346c7a 100644
@@ -18,7 +18,7 @@ SRC_URI += "file://parallel.patch \
             file://0001-Drop-help-directory-from-build.patch"
 
 do_configure_prepend () {
-    rm -r ${S}/m4/gnome-doc-utils.m4
+    rm -f ${S}/m4/gnome-doc-utils.m4
 }
 
 do_install_append () {
Signature · 1 line
2.9.3
#2 lore raw

PATCH 3/3 gtk-doc: disable where necessary

In reply to Alexander Kanavin

Several recipes in meta-oe layers are so old that they don't work with modern gtk-doc (which was added and enabled by default in oe-core); disable that where it is necessary for the build to succeed.

---
 meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb        | 2 +-
 meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb             | 2 +-
 meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb     | 2 +-
 meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb | 2 ++
 meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb                 | 2 +-
 meta-oe/recipes-support/farsight/libnice_0.0.13.bb               | 2 ++
 meta-oe/recipes-support/udisks/udisks2_2.1.7.bb                  | 2 +-
 meta-xfce/recipes-multimedia/parole/parole_0.8.1.bb              | 2 ++
 meta-xfce/recipes-xfce/garcon/garcon_0.4.0.bb                    | 2 ++
 9 files changed, 13 insertions(+), 5 deletions(-)
meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb +1 -1
index a5664b0..c31de0c 100644
@@ -48,7 +48,7 @@ do_compile_prepend() {
 
 EXTRA_OECONF = "--without-openldap \
                 --with-libdb=${STAGING_DIR_HOST}${prefix} \
-                --disable-nntp --disable-goa --disable-weather"
+                --disable-nntp --disable-goa --disable-weather --disable-gtk-doc"
 
 PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
              libedata-book libedata-book-dev libedata-cal libedata-cal-dev \
meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb +1 -1
index 2a6f04b..6ec6d46 100644
@@ -21,7 +21,7 @@ do_compile_prepend() {
     export GIR_EXTRA_LIBS_PATH="${B}/gdata/.libs"
 }
 
-EXTRA_OECONF += "--disable-goa --disable-tests"
+EXTRA_OECONF += "--disable-goa --disable-tests --disable-gtk-doc"
 
 SRC_URI[archive.md5sum] = "eb552a8a8482e4231a3d1baf7262e64d"
 SRC_URI[archive.sha256sum] = "8740e071ecb2ae0d2a4b9f180d2ae5fdf9dc4c41e7ff9dc7e057f62442800827"
meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb +1 -1
index 88f69ff..87a3ed0 100644
@@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "f96d30c09b0395ea4e146730fd52d9ea303b619bb139051d9f12d3f868
 
 GPE_TARBALL_SUFFIX = "bz2"
 
-EXTRA_OECONF = "--enable-cairo"
+EXTRA_OECONF = "--enable-cairo --disable-gtk-doc"
 LDFLAGS += " -L${STAGING_LIBDIR}"
 
 PACKAGES =+ "${PN}-bin"
meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb +2 -0
index eb45974..ae95d4f 100644
@@ -2,3 +2,5 @@ require libmediaart.inc
 
 SRC_URI[archive.md5sum] = "1a44933d4cd0064e3c76d8d0ddacddc9"
 SRC_URI[archive.sha256sum] = "3a9dffcad862aed7c0921579b93080d694b8a66f3676bfee8037867f653a1cd3"
+
+EXTRA_OECONF_append = " --disable-gtk-doc"
meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb +1 -1
index 553e19c..8cd023a 100644
@@ -20,7 +20,7 @@ SRC_URI += "file://glade-cruft.patch file://no-xml2.patch file://python_environm
 SRC_URI[archive.md5sum] = "d1776b40f4e166b5e9c107f1c8fe4139"
 SRC_URI[archive.sha256sum] = "64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec"
 
-EXTRA_OECONF += "--without-libxml2"
+EXTRA_OECONF += "--without-libxml2 --disable-gtk-doc"
 
 CFLAGS += "-lz"
 
meta-oe/recipes-support/farsight/libnice_0.0.13.bb +2 -0
index 620ee1f..3c2a054 100644
@@ -18,6 +18,8 @@ PACKAGECONFIG[gupnp] = "--enable-gupnp,--disable-gupnp,gupnp-igd"
 
 inherit autotools pkgconfig gtk-doc
 
+EXTRA_OECONF = "--disable-gtk-doc"
+
 FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
 FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la"
 FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a"
meta-oe/recipes-support/udisks/udisks2_2.1.7.bb +1 -1
index 34762dd..fbf6701 100644
@@ -17,7 +17,7 @@ inherit autotools systemd gtk-doc gobject-introspection
 
 S = "${WORKDIR}/udisks-${PV}"
 
-EXTRA_OECONF = "--disable-man"
+EXTRA_OECONF = "--disable-man --disable-gtk-doc"
 
 FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \
                 ${datadir}/dbus-1/ \
meta-xfce/recipes-multimedia/parole/parole_0.8.1.bb +2 -0
index f27396c..824611a 100644
@@ -24,6 +24,8 @@ SRC_URI[sha256sum] = "4b216f5200490f8d2a9bf1b3fcd9a8b20834c95249bf13b9170c82e1fc
 
 RDEPENDS_${PN} += "gstreamer1.0-plugins-good"
 
+EXTRA_OECONF = "--disable-gtk-doc"
+
 PACKAGECONFIG ??= "notify"
 PACKAGECONFIG[clutter] = "--enable-clutter, --disable-clutter, clutter"
 PACKAGECONFIG[notify] = "--enable-notify-plugin, --disable-notify-plugin, libnotify"
meta-xfce/recipes-xfce/garcon/garcon_0.4.0.bb +2 -0
index 81f6ce1..81143b5 100644
@@ -10,4 +10,6 @@ SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.pat
 SRC_URI[md5sum] = "aba62b80787aac295083bf7afd419ffb"
 SRC_URI[sha256sum] = "787dc859713b6518992d760d4b858fb02e8a30705e6f6e871d7a14cc97bca972"
 
+EXTRA_OECONF = "--disable-gtk-doc"
+
 FILES_${PN} += "${datadir}/desktop-directories"
Signature · 1 line
2.9.3