Skip to contentSkip to conversation

gnome-disk-utility: disable scrollkeeper

PATCH Superseded Dmitry Eremin-Solenikov 2 participants 4 messages Aug 21, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 gnome-disk-utility: disable scrollkeeper

scrollkeeper isn't packaged neither in oe.dev, nor in any oe-core based layer. Disable scrollkeeper in gnome-disk-utils.

---
 .../gnome-disk-utility/disable-scrollkeeper.patch  |   27 ++++++++++++++++++++
 .../gnome-disk-utility_2.32.0.bb                   |    6 ++++
 2 files changed, 33 insertions(+), 0 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch new file +27 -0
new file mode 100644
index 0000000..ccc6f6a
@@ -0,0 +1,27 @@
+From: Dmitry Eremin-Solenikov <[email protected]>
+Subject: Disable scrollkeeper-config not found message
+Upstream-Status: Not-Applicable
+
+If scrollkeeper-config isn't found, configure fails with an error.
+Fix that by commenting out the check.
+
+Signed-Off-By: Dmitry Eremin-Solenikov <[email protected]>
+
+
+Index: gnome-disk-utility-2.32.0/configure.ac
+===================================================================
+--- gnome-disk-utility-2.32.0.orig/configure.ac	2010-09-15 19:07:25.000000000 +0400
++++ gnome-disk-utility-2.32.0/configure.ac	2011-08-20 01:29:48.000000000 +0400
+@@ -188,9 +188,9 @@
+ # *************
+ 
+ AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
+-if test x$SCROLLKEEPER_CONFIG = xno; then
+-  AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package)
+-fi
++dnl if test x$SCROLLKEEPER_CONFIG = xno; then
++dnl  AC_MSG_ERROR([Couldn't find scrollkeeper-config, please install the scrollkeeper package])
++dnl fi
+ 
+ # ********************
+ # Internationalization
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +6 -0
index e8069e9..f7945c5 100644
@@ -9,5 +9,11 @@ inherit gnome
 SRC_URI[archive.md5sum] = "f0366c8baebca0404d190b2d78f3582d"
 SRC_URI[archive.sha256sum] = "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98"
 
+SRC_URI += "\
+     file://disable-scrollkeeper.patch \
+     "
+
+EXTRA_OECONF += "--disable-scrollkeeper"
+
 PACKAGES =+ "${PN}-nautilus-extension"
 FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so"
Signature · 1 line
1.7.2.5
#1 lore raw

PATCH 2/2 gnome-disk-utility: fix path for dbus interface definitions

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.

---
 .../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
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch new file +35 -0
new file mode 100644
index 0000000..1faadb1
@@ -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
+ 
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +1 -0
index f7945c5..ab1113c 100644
@@ -11,6 +11,7 @@ SRC_URI[archive.sha256sum] = "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d
 
 SRC_URI += "\
      file://disable-scrollkeeper.patch \
+     file://fix-dbus-interfaces.patch \
      "
 
 EXTRA_OECONF += "--disable-scrollkeeper"
Signature · 1 line
1.7.2.5
#3 lore raw
In reply to Dmitry Eremin-Solenikov

Dear Dmitry,

Am Sonntag, den 21.08.2011, 12:00 +0400 schrieb Dmitry Eremin-Solenikov:

Quoted 30 lines

scrollkeeper isn't packaged neither in oe.dev, nor in any oe-core based layer. Disable scrollkeeper in gnome-disk-utils.

---
 .../gnome-disk-utility/disable-scrollkeeper.patch  |   27 ++++++++++++++++++++
 .../gnome-disk-utility_2.32.0.bb                   |    6 ++++
 2 files changed, 33 insertions(+), 0 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch new file +14 -0
new file mode 100644
index 0000000..ccc6f6a
@@ -0,0 +1,27 @@
+From: Dmitry Eremin-Solenikov <[email protected]>
+Subject: Disable scrollkeeper-config not found message
+Upstream-Status: Not-Applicable
+
+If scrollkeeper-config isn't found, configure fails with an error.
+Fix that by commenting out the check.
+
+Signed-Off-By: Dmitry Eremin-Solenikov <[email protected]>
+
+
+Index: gnome-disk-utility-2.32.0/configure.ac
+===================================================================
+--- gnome-disk-utility-2.32.0.orig/configure.ac	2010-09-15 19:07:25.000000000 +0400
++++ gnome-disk-utility-2.32.0/configure.ac	2011-08-20 01:29:48.000000000 +0400

meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch line 24

Quoted 10 lines
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch new file +10 -0
+@@ -188,9 +188,9 @@
+ # *************
+ 
+ AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
+-if test x$SCROLLKEEPER_CONFIG = xno; then
+-  AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package)
+-fi
++dnl if test x$SCROLLKEEPER_CONFIG = xno; then
++dnl  AC_MSG_ERROR([Couldn't find scrollkeeper-config, please install the scrollkeeper package])
++dnl fi

is changing the error to a warning a better alternative and send it upstream [1]?

Quoted 9 lines
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch new file +3 -0
+ 
+ # ********************
+ # Internationalization
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +0 -0
index e8069e9..f7945c5 100644
@@ -9,5 +9,11 @@ inherit gnome
 SRC_URI[archive.md5sum] = "f0366c8baebca0404d190b2d78f3582d"

meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb inherit gnome · line 19

Quoted 10 lines
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +6 -0
 SRC_URI[archive.sha256sum] = "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98"
 
+SRC_URI += "\
+     file://disable-scrollkeeper.patch \
+     "
+
+EXTRA_OECONF += "--disable-scrollkeeper"
+
 PACKAGES =+ "${PN}-nautilus-extension"
 FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so"

I guess increasing PR is necessary for this.

Please resend the patch (--subject-prefix="PATCH v2" [2]).

Thanks,

Paul

[1] http://www.gnu.org/software/hello/manual/autoconf/Printing-Messages.html
[2] http://openembedded.org/index.php/How_to_submit_a_patch_to_OpenEmbedded#Create_and_Commit_your_patch

#2 lore raw

Re: [meta-gnome 2/2] gnome-disk-utility: fix path for dbus interface definitions

In reply to Dmitry Eremin-Solenikov

Dear Dmitry,

Am Sonntag, den 21.08.2011, 12:00 +0400 schrieb Dmitry Eremin-Solenikov:

Quoted 3 lines

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.

could you paste the error message please?

meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch

Quoted 12 lines
---
 .../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
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch new file +0 -0
new file mode 100644
index 0000000..1faadb1

The patch header is missing [1]. You can also paste the error message in here.

meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch line 12

Quoted 13 lines
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch new file +12 -0
@@ -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

Hardcoding the path is certainly not portable/good for cross compilation. There should be another Aufomake(?) variable for looking up the sysroot besides using pkg-config. I do not know what though. Who distributes org.freedesktop.UDisks.xml? It looks like udisk.

Anybody else?

Quoted 27 lines
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch new file +22 -0
+-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
+ 
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +0 -0
index f7945c5..ab1113c 100644

meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb SRC_URI[archive.sha256sum] = "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d · line 17

Quoted 7 lines
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +1 -0
@@ -11,6 +11,7 @@ SRC_URI[archive.sha256sum] = "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d
 
 SRC_URI += "\
      file://disable-scrollkeeper.patch \
+     file://fix-dbus-interfaces.patch \
      "
 
 EXTRA_OECONF += "--disable-scrollkeeper"

Thanks,

Paul

[1] http://openembedded.org/index.php/Commit_Patch_Message_Guidelines