Received: from mail-ew0-f47.google.com ([209.85.215.47]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1Qv328-0006af-03 for openembedded-devel@lists.openembedded.org; Sun, 21 Aug 2011 10:05:28 +0200 Received: by ewy5 with SMTP id 5so1533717ewy.6 for ; Sun, 21 Aug 2011 01:00:45 -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; bh=EhJTJXxy3spkIr58lHvZNmyKG9c2724MmejKASGidCs=; b=YAN89BXl/5kFEt7rMK863YLPO9z1/HZbJw4Xpd4qTj6GNaFJZRY++i+xEuOof5oprb x9JW1Yu+HwT9+T2GvC/4DuxasdiQ219nuD7YtMXQ/P92LdrwskQbG9AxZpKiHioPcMDv oP+3KPEh4eww9RYzsnG7BmvlJQZQGNZwxyB+E= Received: by 10.213.15.138 with SMTP id k10mr264473eba.84.1313913642528; Sun, 21 Aug 2011 01:00:42 -0700 (PDT) Received: from localhost.localdomain ([194.85.238.22]) by mx.google.com with ESMTPS id v20sm2168441eeh.46.2011.08.21.01.00.40 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 21 Aug 2011 01:00:41 -0700 (PDT) From: Dmitry Eremin-Solenikov To: openembedded-devel@lists.openembedded.org Date: Sun, 21 Aug 2011 12:00:35 +0400 Message-Id: <1313913636-31667-1-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.7.2.5 Cc: Dmitry Eremin-Solenikov Subject: [meta-gnome 1/2] gnome-disk-utility: disable scrollkeeper 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 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 --- .../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 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 0000000..ccc6f6a --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch @@ -0,0 +1,27 @@ +From: Dmitry Eremin-Solenikov +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 + + +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 e8069e9..f7945c5 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" -- 1.7.2.5