Received: from mail-ew0-f47.google.com ([209.85.215.47]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1Qv328-0006ag-Bv for openembedded-devel@lists.openembedded.org; Sun, 21 Aug 2011 10:05:28 +0200 Received: by ewy5 with SMTP id 5so1533718ewy.6 for ; Sun, 21 Aug 2011 01:00:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=kVmvuV/T549OTx4JWMVknb0TZu6CfYNBumJcKeZ4KB0=; b=vmwX4nt7rl6ZCWXWT8hFNM0adV4zdh2YIOb4+yswkvc5uaxqWCiiIWgqyPLYWuaI4x 6Bd1T7KljCKv1Z+qLVgUCHl7TuQRHWD70wIB1Z2o2i0MJ3rcqBhJK6jy/h8C3rXhCNXu yHVinYdPzYcs165MApV+eFxHW4WP3RxvUA6dA= Received: by 10.14.146.12 with SMTP id q12mr270587eej.103.1313913643833; Sun, 21 Aug 2011 01:00:43 -0700 (PDT) Received: from localhost.localdomain ([194.85.238.22]) by mx.google.com with ESMTPS id v20sm2168441eeh.46.2011.08.21.01.00.42 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 21 Aug 2011 01:00:43 -0700 (PDT) From: Dmitry Eremin-Solenikov To: openembedded-devel@lists.openembedded.org Date: Sun, 21 Aug 2011 12:00:36 +0400 Message-Id: <1313913636-31667-2-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1313913636-31667-1-git-send-email-dbaryshkov@gmail.com> References: <1313913636-31667-1-git-send-email-dbaryshkov@gmail.com> Cc: Dmitry Eremin-Solenikov Subject: [meta-gnome 2/2] gnome-disk-utility: fix path for dbus interface definitions X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Aug 2011 08:05:28 -0000 During compilation gdu looks for several UDisks dbus xml files. However it looks for them in system root and not in sysroot, failing if those don't exist. Fix that. Signed-off-by: Dmitry Eremin-Solenikov --- .../gnome-disk-utility/fix-dbus-interfaces.patch | 35 ++++++++++++++++++++ .../gnome-disk-utility_2.32.0.bb | 1 + 2 files changed, 36 insertions(+), 0 deletions(-) create mode 100644 meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch new file mode 100644 index 0000000..1faadb1 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch @@ -0,0 +1,35 @@ +Index: gnome-disk-utility-2.32.0/src/gdu/Makefile.am +=================================================================== +--- gnome-disk-utility-2.32.0.orig/src/gdu/Makefile.am 2011-08-20 01:59:16.000000000 +0400 ++++ gnome-disk-utility-2.32.0/src/gdu/Makefile.am 2011-08-20 02:08:18.000000000 +0400 +@@ -14,20 +14,20 @@ + gdu-marshal.c: gdu-marshal.list + echo "#include \"gdu-marshal.h\"" > $@ && glib-genmarshal $< --prefix=gdu_marshal --body >> $@ + +-udisks-daemon-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml Makefile.am +- dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-daemon-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml ++udisks-daemon-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml Makefile.am ++ dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-daemon-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml + +-udisks-device-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml Makefile.am +- dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-device-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml ++udisks-device-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml Makefile.am ++ dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-device-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml + +-udisks-adapter-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml Makefile.am +- dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-adapter-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml ++udisks-adapter-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml Makefile.am ++ dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-adapter-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml + +-udisks-expander-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml Makefile.am +- dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-expander-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml ++udisks-expander-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml Makefile.am ++ dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-expander-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml + +-udisks-port-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml Makefile.am +- dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-port-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml ++udisks-port-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml Makefile.am ++ dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-port-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml + + lib_LTLIBRARIES=libgdu.la + diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb index f7945c5..ab1113c 100644 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb @@ -11,6 +11,7 @@ SRC_URI[archive.sha256sum] = "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d SRC_URI += "\ file://disable-scrollkeeper.patch \ + file://fix-dbus-interfaces.patch \ " EXTRA_OECONF += "--disable-scrollkeeper" -- 1.7.2.5