From 5c0d20ebf9a3da15f4153fdbba825c9a7f4bd02d Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Tue, 25 Nov 2014 13:32:52 -0500 Subject: Add patch to disable gdbus-codegen (Python tool) --- diff --git a/patches/01_disable-gdbus-codegen.patch b/patches/01_disable-gdbus-codegen.patch new file mode 100644 index 0000000..7fcebf2 --- /dev/null +++ b/patches/01_disable-gdbus-codegen.patch @@ -0,0 +1,70 @@ +Author: "P. J. McDermott" +Subject: Disable gdbus-codegen + +This is a Python program, and ProteanOS doesn't currently have a Python +interpreter. (Nor does ProteanOS have D-Bus.) + +Installation fails with the following error: + + Making install in gio + make[3]: Entering directory '/prokit/sessions/3937473851/wd/tmp/src/gio' + make install-recursive + make[4]: Entering directory '/prokit/sessions/3937473851/wd/tmp/src/gio' + Making install in gdbus-2.0/codegen + make[5]: Entering directory '/prokit/sessions/3937473851/wd/tmp/src/gio/gdbus-2.0/codegen' + make install-am + make[6]: Entering directory '/prokit/sessions/3937473851/wd/tmp/src/gio/gdbus-2.0/codegen' + make[7]: Entering directory '/prokit/sessions/3937473851/wd/tmp/src/gio/gdbus-2.0/codegen' + ../../.././install-sh -c -d '/prokit/sessions/3937473851/wd/tmp/dest/usr/bin' + /usr/bin/install -c gdbus-codegen '/prokit/sessions/3937473851/wd/tmp/dest/usr/bin' + ../../.././install-sh -c -d '/prokit/sessions/3937473851/wd/tmp/dest/usr/share/glib-2.0/codegen' + /usr/bin/install -c -m 644 __init__.py codegen.py codegen_main.py codegen_docbook.py config.py dbustypes.py parser.py utils.py '/prokit/sessions/3937473851/wd/tmp/dest/usr/share/glib-2.0/codegen' + /bin/sh: python2.5: not found + Makefile:970: recipe for target 'install-codegenPYTHON' failed + make[7]: *** [install-codegenPYTHON] Error 127 + make[7]: Leaving directory '/prokit/sessions/3937473851/wd/tmp/src/gio/gdbus-2.0/codegen' + Makefile:1273: recipe for target 'install-am' failed + make[6]: *** [install-am] Error 2 + make[6]: Leaving directory '/prokit/sessions/3937473851/wd/tmp/src/gio/gdbus-2.0/codegen' + Makefile:1267: recipe for target 'install' failed + make[5]: *** [install] Error 2 + make[5]: Leaving directory '/prokit/sessions/3937473851/wd/tmp/src/gio/gdbus-2.0/codegen' + Makefile:3928: recipe for target 'install-recursive' failed + make[4]: *** [install-recursive] Error 1 + make[4]: Leaving directory '/prokit/sessions/3937473851/wd/tmp/src/gio' + Makefile:4250: recipe for target 'install' failed + make[3]: *** [install] Error 2 + make[3]: Leaving directory '/prokit/sessions/3937473851/wd/tmp/src/gio' + +diff -Naur src.orig/gio/Makefile.am src/gio/Makefile.am +--- src.orig/gio/Makefile.am 2014-02-17 13:06:20.000000000 -0500 ++++ src/gio/Makefile.am 2014-11-25 13:26:11.976703037 -0500 +@@ -1,7 +1,5 @@ + include $(top_srcdir)/glib.mk + +-SUBDIRS = gdbus-2.0/codegen +- + if OS_UNIX + SUBDIRS += xdgmime + endif +diff -Naur src.orig/gio/Makefile.in src/gio/Makefile.in +--- src.orig/gio/Makefile.in 2014-03-24 14:54:27.000000000 -0400 ++++ src/gio/Makefile.in 2014-11-25 13:26:47.425771882 -0500 +@@ -823,7 +823,7 @@ + *) \ + b='$*';; \ + esac +-DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue fen win32 . \ ++DIST_SUBDIRS = xdgmime inotify kqueue fen win32 . \ + tests fam + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + am__relativize = \ +@@ -1198,7 +1198,7 @@ + @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_test_scripts) $(dist_installed_test_scripts) + + @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test) +-SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_19) \ ++SUBDIRS = $(am__append_15) $(am__append_19) \ + $(am__append_22) $(am__append_26) $(am__append_29) . tests \ + $(am__append_32) + @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir) -- cgit v0.9.1