summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlumag <dbaryshkov@gmail.com>2011-09-04 03:05:16 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2011-09-04 09:18:53 +0200
commit490d38c2c8a1b324a59c84f46c2aded533392ae1 (patch)
tree49e690748bc06f75abbb092277491a756a907d0a
parent23de2d1dd45bcdde815a0e94c1e4ada1965ccf7d (diff)
downloadmeta-openembedded-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>
-rw-r--r--meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch27
-rw-r--r--meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb6
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 000000000..f36942d19
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch
@@ -0,0 +1,27 @@
1From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
2Subject: Disable scrollkeeper-config not found message
3Upstream-Status: Not-Applicable
4
5If scrollkeeper-config isn't found, configure fails with an error.
6Fix that by commenting out the check.
7
8Signed-Off-By: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
9
10
11Index: gnome-disk-utility-2.32.0/configure.ac
12===================================================================
13--- gnome-disk-utility-2.32.0.orig/configure.ac 2010-09-15 19:07:25.000000000 +0400
14+++ gnome-disk-utility-2.32.0/configure.ac 2011-08-20 01:29:48.000000000 +0400
15@@ -188,9 +188,9 @@
16 # *************
17
18 AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
19-if test x$SCROLLKEEPER_CONFIG = xno; then
20- AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package)
21-fi
22+dnl if test x$SCROLLKEEPER_CONFIG = xno; then
23+dnl AC_MSG_ERROR([Couldn't find scrollkeeper-config, please install the scrollkeeper package])
24+dnl fi
25
26 # ********************
27 # 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 e8069e9f9..f7945c586 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
9SRC_URI[archive.md5sum] = "f0366c8baebca0404d190b2d78f3582d" 9SRC_URI[archive.md5sum] = "f0366c8baebca0404d190b2d78f3582d"
10SRC_URI[archive.sha256sum] = "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98" 10SRC_URI[archive.sha256sum] = "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98"
11 11
12SRC_URI += "\
13 file://disable-scrollkeeper.patch \
14 "
15
16EXTRA_OECONF += "--disable-scrollkeeper"
17
12PACKAGES =+ "${PN}-nautilus-extension" 18PACKAGES =+ "${PN}-nautilus-extension"
13FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so" 19FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so"