From 592f68bf9c83fd1a604a3a1c533fc97c782054b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= <ruben@trisquel.info> Date: Mon, 10 Feb 2014 01:46:53 +0100 Subject: [PATCH] dbus-python helper no longer needed --- helpers/make-dbus-python | 48 ---------------------------------------- 1 file changed, 48 deletions(-) delete mode 100644 helpers/make-dbus-python diff --git a/helpers/make-dbus-python b/helpers/make-dbus-python deleted file mode 100644 index af5355db..00000000 --- a/helpers/make-dbus-python +++ /dev/null @@ -1,48 +0,0 @@ -#!/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 -- GitLab