Patchwork [meta-gnome,1/2] gnome-disk-utility: disable scrollkeeper

login
register
mail settings
Submitter lumag
Date Aug. 21, 2011, 8 a.m.
Message ID <1313913636-31667-1-git-send-email-dbaryshkov@gmail.com>
Download mbox | patch
Permalink /patch/10345/
State New, archived
Headers show

Comments

lumag - Aug. 21, 2011, 8 a.m.
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>
---
 .../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
Paul Menzel - Aug. 21, 2011, 8:17 a.m.
Dear Dmitry,


Am Sonntag, den 21.08.2011, 12:00 +0400 schrieb Dmitry Eremin-Solenikov:
> 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>
> ---
>  .../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 <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

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

> + 
> + # ********************
> + # 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"

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

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 <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 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"