diff options
| author |   lumag <dbaryshkov@gmail.com> | 2011-09-04 03:05:16 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2011-09-04 09:18:53 +0200 |
| commit | 490d38c2c8a1b324a59c84f46c2aded533392ae1 (patch) | |
| tree | 49e690748bc06f75abbb092277491a756a907d0a /meta-gnome | |
| parent | 23de2d1dd45bcdde815a0e94c1e4ada1965ccf7d (diff) | |
| download | meta-openembedded-contrib-490d38c2c8a1b324a59c84f46c2aded533392ae1.tar.gz | |
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.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-gnome')
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch | 27 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb | 6 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch new file mode 100644 index 0000000000..f36942d194 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch @@ -0,0 +1,27 @@ +From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> +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 <dbaryshkov@gmail.com> + + +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 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 e8069e9f92..f7945c5861 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 @@ -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" |