From 18734169c7ea4e08eef96e6d5d70b587626387b8 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 10 Jul 2017 20:39:54 +0100 Subject: bonobo: remove Signed-off-by: Ross Burton --- meta-gnome/recipes-gnome/bonobo/files/gcc5.patch | 12 -- meta-gnome/recipes-gnome/bonobo/files/gtk-doc.m4 | 53 ------- meta-gnome/recipes-gnome/bonobo/files/gtk-doc.make | 173 --------------------- meta-gnome/recipes-gnome/bonobo/libbonobo.inc | 29 ---- .../0001-Remove-use-of-G_DISABLE_DEPRECATED.patch | 47 ------ .../libbonobo/do-not-use-srcdir-variable.patch | 24 --- .../libbonobo/fix-nonliteral-in-string.patch | 26 ---- .../recipes-gnome/bonobo/libbonobo_2.32.1.bb | 9 -- .../recipes-gnome/bonobo/libbonoboui_2.24.5.bb | 21 --- 9 files changed, 394 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/bonobo/files/gcc5.patch delete mode 100644 meta-gnome/recipes-gnome/bonobo/files/gtk-doc.m4 delete mode 100644 meta-gnome/recipes-gnome/bonobo/files/gtk-doc.make delete mode 100644 meta-gnome/recipes-gnome/bonobo/libbonobo.inc delete mode 100644 meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch delete mode 100644 meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch delete mode 100644 meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch delete mode 100644 meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb delete mode 100644 meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb diff --git a/meta-gnome/recipes-gnome/bonobo/files/gcc5.patch b/meta-gnome/recipes-gnome/bonobo/files/gcc5.patch deleted file mode 100644 index f7528adad4..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/files/gcc5.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: libbonoboui-2.24.5/tools/browser/Makefile.am -=================================================================== ---- libbonoboui-2.24.5.orig/tools/browser/Makefile.am -+++ libbonoboui-2.24.5/tools/browser/Makefile.am -@@ -2,7 +2,6 @@ INCLUDES = \ - -DBONOBO_BROWSER_DATADIR=\""$(datadir)"\" \ - -DBONOBO_SUPPORT_LOCALEDIR=\""$(datadir)/locale"\" \ - -I$(srcdir) -I$(top_srcdir) \ -- -I$(top_srcdir)/bonobo-browser \ - $(BONOBOUI_CFLAGS) \ - $(WARN_CFLAGS) - diff --git a/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.m4 b/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.m4 deleted file mode 100644 index 3ec41666b2..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.m4 +++ /dev/null @@ -1,53 +0,0 @@ -dnl -*- mode: autoconf -*- - -# serial 1 - -dnl Usage: -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -AC_DEFUN([GTK_DOC_CHECK], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - dnl for overriding the documentation installation directory - AC_ARG_WITH(html-dir, - AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST(HTML_DIR) - - dnl enable/disable documentation building - AC_ARG_ENABLE(gtk-doc, - AC_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [default=no]]),, - enable_gtk_doc=no) - - have_gtk_doc=no - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then - have_gtk_doc=yes - fi - - dnl do we want to do a version check? -ifelse([$1],[],, - [gtk_doc_min_version=$1 - if test "$have_gtk_doc" = yes; then - AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) - if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - have_gtk_doc=no - fi - fi -]) - if test x$enable_gtk_doc = xyes; then - if test "$have_gtk_doc" != yes; then - enable_gtk_doc=no - fi - fi - - AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) - AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") -]) diff --git a/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.make b/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.make deleted file mode 100644 index 354ffb7c66..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/files/gtk-doc.make +++ /dev/null @@ -1,173 +0,0 @@ -# -*- mode: makefile -*- - -#################################### -# Everything below here is generic # -#################################### - -if GTK_DOC_USE_LIBTOOL -GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -else -GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -endif - -# We set GPATH here; this gives us semantics for GNU make -# which are more like other make's VPATH, when it comes to -# whether a source that is a target of one rule is then -# searched for in VPATH/GPATH. -# -GPATH = $(srcdir) - -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) - -EXTRA_DIST = \ - $(content_files) \ - $(HTML_IMAGES) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt - -DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - -SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).interfaces \ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -REPORT_FILES = \ - $(DOC_MODULE)-undocumented.txt \ - $(DOC_MODULE)-undeclared.txt \ - $(DOC_MODULE)-unused.txt - -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) - -if ENABLE_GTK_DOC -all-local: html-build.stamp -else -all-local: -endif - -docs: html-build.stamp - -#### scan #### - -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp - @true - -#### templates #### - -tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo 'gtk-doc: Rebuilding template files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -tmpl/*.sgml: - @true - - -#### xml #### - -sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo 'gtk-doc: Building XML' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) - touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -#### html #### - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html - cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - touch html-build.stamp - -############## - -clean-local: - rm -f *~ *.bak - rm -rf .libs - -distclean-local: - cd $(srcdir) && \ - rm -rf xml $(REPORT_FILES) \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - -maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html - -install-data-local: - -installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ - for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ - which gtkdoc-rebase >/dev/null && \ - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ - fi - - -uninstall-local: - rm -f $(DESTDIR)$(TARGET_DIR)/* - -# -# Require gtk-doc when making dist -# -if ENABLE_GTK_DOC -dist-check-gtkdoc: -else -dist-check-gtkdoc: - @echo "*** gtk-doc must be installed and enabled in order to make dist" - @false -endif - -dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/xml - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/xml/*.xml $(distdir)/xml - cp $(srcdir)/html/* $(distdir)/html - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) - -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html - -.PHONY : dist-hook-local docs diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo.inc b/meta-gnome/recipes-gnome/bonobo/libbonobo.inc deleted file mode 100644 index ce34957fc3..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/libbonobo.inc +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Bonobo CORBA interfaces library" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" -SECTION = "x11/gnome/libs" -DEPENDS = "gnome-common-native glib-2.0 orbit2-native orbit2 intltool-native libxml2 dbus dbus-glib" - -inherit gnomebase gtk-doc lib_package - -ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2" - -RDEPENDS_${PN}-bin = "${PN} perl" -FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so" -FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug \ - ${libdir}/bonobo-2.0/samples/.debug ${libdir}/orbit-2.0/.debug" -FILES_${PN}-dev += "${libdir}/orbit-2.0/*.la ${libdir}/bonobo/monikers/*.la ${libdir}/bonobo-2.0/samples" -FILES_${PN}-staticdev += "${libdir}/orbit-2.0/*.a ${libdir}/bonobo/monikers/*.a" - -LEAD_SONAME = "libbonobo-2.so" - -PARALLEL_MAKE = "" - -do_compile() { - oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" -} - -do_install() { - oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install -} diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch b/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch deleted file mode 100644 index 44cf1f9fa0..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/libbonobo/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch +++ /dev/null @@ -1,47 +0,0 @@ -From fef13a371fc91f6d9b42518126c2a8b459fdf0e8 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Thu, 2 May 2013 14:17:38 -0400 -Subject: [PATCH] Remove use of G_DISABLE_DEPRECATED -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This now trips up on GStaticRecMutex; I'm not going to bother to port, -realistically no one is actively maintaining this code anymore. - -Upstream-Status: Applied - -Signed-off-by: Andreas Müller ---- - activation-server/Makefile.am | 1 - - configure.in | 2 +- - 2 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/activation-server/Makefile.am b/activation-server/Makefile.am -index efb18a8..ffa90f6 100644 ---- a/activation-server/Makefile.am -+++ b/activation-server/Makefile.am -@@ -17,7 +17,6 @@ INCLUDES= \ - $(SERVER_CFLAGS) \ - $(WARN_CFLAGS) \ - -DSERVER_CONFDIR=\"$(sysconfdir)\" \ -- -DG_DISABLE_DEPRECATED \ - -DG_LOG_DOMAIN=\"Bonobo-Activation-Server\" \ - $(NULL) - -diff --git a/configure.in b/configure.in -index 70a4e26..6be2bca 100644 ---- a/configure.in -+++ b/configure.in -@@ -132,7 +132,7 @@ AC_SUBST(SERVER_LIBS) - AC_SUBST(SERVER_CFLAGS) - - if test "$enable_maintainer_mode" = "yes"; then -- DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES" -+ DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES" - AC_SUBST(DISABLE_DEPRECATED_CFLAGS) - fi - --- -1.7.6.5 - diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch b/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch deleted file mode 100644 index a20edda841..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/libbonobo/do-not-use-srcdir-variable.patch +++ /dev/null @@ -1,24 +0,0 @@ -| tests/Makefile.am:55: error: using '$(srcdir)' in TESTS is currently broken: '$(srcdir)/te -st-properties.sh' -| tests/test-activation/Makefile.am:76: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS -' (or '*_CPPFLAGS') -| utils/Makefile.am:9: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS -') -| autoreconf: automake failed with exit status: 1 - -Signed-off-by: Khem Raj -Upstream-Status: Not Submitted - -Index: libbonobo-2.32.1/tests/Makefile.am -=================================================================== ---- libbonobo-2.32.1.orig/tests/Makefile.am 2010-08-29 04:56:00.000000000 -0700 -+++ libbonobo-2.32.1/tests/Makefile.am 2014-04-25 15:38:22.024744384 -0700 -@@ -55,7 +55,7 @@ - MODELS_DIR="$(srcdir)/models" - - TESTS = test-moniker$(EXEEXT) test-event-source$(EXEEXT) test-object$(EXEEXT) \ -- test-stream-mem$(EXEEXT) $(srcdir)/test-properties.sh test-storage-mem$(EXEEXT) \ -+ test-stream-mem$(EXEEXT) test-properties.sh test-storage-mem$(EXEEXT) \ - test-main-loop$(EXEEXT) - - # TESTS += test-generic-factory.sh diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch b/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch deleted file mode 100644 index 20db671e05..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch +++ /dev/null @@ -1,26 +0,0 @@ -This checks whether the format string is a literal on the calling function. As bonobo_debug_print() -takes already a va_list, we specify the format on the functions that call it -The second number, which is 0 here, should then be the argument index of the variadic argument - -Fixed warning with clang - -| ../../libbonobo-2.32.1/bonobo/bonobo-debug.c:58:32: error: format string is not a string literal [-Werror,-Wformat-nonliteral] -| vfprintf (_bonobo_debug_file, fmt, args); -| ^~~ -| 1 error generated. - -Upstream-Status: Pending -Signed-off-by: Khem Raj - -Index: libbonobo-2.32.1/bonobo/bonobo-debug.c -=================================================================== ---- libbonobo-2.32.1.orig/bonobo/bonobo-debug.c -+++ libbonobo-2.32.1/bonobo/bonobo-debug.c -@@ -47,6 +47,7 @@ bonobo_debug_init(void) - _bonobo_debug_file = stderr; - } - -+__attribute__((__format__ (printf, 2, 0))) - void - bonobo_debug_print (const char *name, char *fmt, ...) - { diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb b/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb deleted file mode 100644 index 8e00eb4d2d..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require libbonobo.inc - -SRC_URI += "file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch \ - file://do-not-use-srcdir-variable.patch \ - file://fix-nonliteral-in-string.patch \ - " -SRC_URI[archive.md5sum] = "27fa902d4fdf6762ee010e7053aaf77b" -SRC_URI[archive.sha256sum] = "9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b" -GNOME_COMPRESS_TYPE="bz2" diff --git a/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb b/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb deleted file mode 100644 index 627f37ed93..0000000000 --- a/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb +++ /dev/null @@ -1,21 +0,0 @@ -SECTION = "x11/gnome/libs" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" - -inherit gnomebase pkgconfig gtk-doc - -SRC_URI += "file://gcc5.patch" - -SRC_URI[archive.md5sum] = "853be8e28aaa4ce48ba60be7d9046bf4" -SRC_URI[archive.sha256sum] = "fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd" -GNOME_COMPRESS_TYPE="bz2" - -DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gconf libxml2 libglade gnome-common intltool-native" - -FILES_${PN} += "${libdir}/libglade/2.0/*.so" -FILES_${PN}-dev += "${libdir}/libglade/2.0/*.la ${datadir}/gnome-2.0/ui \ - ${libdir}/bonobo-2.0/samples" -FILES_${PN}-staticdev += "${libdir}/libglade/2.0/*.a" -FILES_${PN}-dbg += "${libdir}/bonobo-2.0/samples/.debug \ - ${libdir}/libglade/2.0/.debug" -- cgit 1.2.3-korg