diff --git a/helpers/make-dbus-python b/helpers/make-dbus-python new file mode 100644 index 0000000000000000000000000000000000000000..af5355dbf69e47089a1beee1435edde54b370011 --- /dev/null +++ b/helpers/make-dbus-python @@ -0,0 +1,48 @@ +#!/bin/sh +# +# Copyright (C) 2008-2010 Rubén RodrÃguez <ruben@trisquel.info> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# + +VERSION=1 + +. ./config + +cat << EOF | patch -p0 +--- dbus/gobject_service.py.orig 2012-01-27 16:52:13.000000000 +0100 ++++ dbus/gobject_service.py 2013-07-11 21:25:25.937253558 +0200 +@@ -24,7 +24,15 @@ + + __all__ = ['ExportedGObject'] + +-from gi.repository import GObject as gobject ++import sys ++ ++if 'gi' in sys.modules: ++ # this worked in dbus-python 1.0, so preserve the functionality ++ from gi.repository import GObject as gobject ++else: ++ # this worked in dbus-python < 1.0 ++ import gobject ++ + import dbus.service + + # The odd syntax used here is required so that the code is compatible with +EOF + +changelog "Backported GObject import method from 1.1.1" + +compile