Patchwork [v2] gdk-pixbuf: Pick up ${NM} from the environment.

login
mail settings
Submitter James Limbouris
Date March 6, 2012, 2:23 a.m.
Message ID <1331000623-10956-1-git-send-email-james@digitalmatter.com.au>
Download mbox | patch
Permalink /patch/22727/
State New
Headers show

Comments

James Limbouris - March 6, 2012, 2:23 a.m.
Signed-off-by: James Limbouris <james@digitalmatter.com.au>
---
 .../gdk-pixbuf-2.24.0/configure_nm.patch           |   18 ++++++++++++++++++
 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb |    3 ++-
 2 files changed, 20 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch
Paul Menzel - March 6, 2012, 9:45 a.m.
Dear James,


thank you for sending an improved version of the patch.


Am Dienstag, den 06.03.2012, 10:23 +0800 schrieb James Limbouris:
> Signed-off-by: James Limbouris <james@digitalmatter.com.au>
> ---
>  .../gdk-pixbuf-2.24.0/configure_nm.patch           |   18 ++++++++++++++++++
>  meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb |    3 ++-
>  2 files changed, 20 insertions(+), 1 deletions(-)
>  create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch
> 
> diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch
> new file mode 100644
> index 0000000..0460824
> --- /dev/null
> +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch
> @@ -0,0 +1,18 @@
> +Pick up ${NM} from the environment.
> +Upstream-Status: Inappropriate [configuration]

as Khem and you discussed, it should be useful for upstream [1]. Maybe
you can add more context [2][3], so upstream can better judge if they
want it.

> +Signed-off-by: James Limbouris <james@digitalmatter.com.au>
> +
> +Index: gdk-pixbuf-2.24.0/configure.ac
> +===================================================================
> +diff -uNr gdk-pixbuf-2.24.0/configure.ac gdk-pixbuf-2.24.0.mod/configure.ac
> +--- gdk-pixbuf-2.24.0/configure.ac	2011-08-27 11:27:52.000000000 +0800
> ++++ gdk-pixbuf-2.24.0.mod/configure.ac	2012-02-28 14:48:36.481126410 +0800
> +@@ -147,7 +147,7 @@
> + AC_SYS_LARGEFILE
> + 
> + AM_PROG_AS
> +-AC_PATH_PROG(NM, nm, nm)
> ++AC_CHECK_TOOLS(NM, [$NM nm], nm)
> + 
> + AC_MSG_CHECKING([for some Win32 platform])
> + AS_CASE(["$host"],
> diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
> index 121babd..d75bf2a 100644
> --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
> +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb

[…]


Thanks,

Paul


[1] http://lists.linuxtogo.org/pipermail/openembedded-core/2012-March/018554.html
[2] http://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Generic-Programs.html
[3] http://lists.gnu.org/archive/html/bug-ncurses/2011-11/msg00011.html
James Limbouris - March 7, 2012, 1:49 a.m.
> -----Original Message-----
> From: Paul Menzel [mailto:paulepanter@users.sourceforge.net]
> Sent: Tuesday, 6 March 2012 5:45 PM
> To: openembedded-core@lists.openembedded.org
> Cc: James Limbouris
> Subject: Re: [OE-core] [PATCH v2] gdk-pixbuf: Pick up ${NM} from the
> environment.
> 
> Dear James,
> 
> 
> thank you for sending an improved version of the patch.
> 
...
> 
> as Khem and you discussed, it should be useful for upstream [1]. Maybe
> you can add more context [2][3], so upstream can better judge if they
> want it.
> 
...
> 
> Thanks,
> 
> Paul
> 
> 
> [1] http://lists.linuxtogo.org/pipermail/openembedded-core/2012-
> March/018554.html
> [2] http://www.gnu.org/software/autoconf/manual/autoconf-
> 2.67/html_node/Generic-Programs.html
> [3] http://lists.gnu.org/archive/html/bug-ncurses/2011-11/msg00011.html

Hi,

This issue has already been patched for gtk+, and is marked Upstream: inappropriate there.
However, I couldn't find any mention of AC_CHECK_TOOLS in the Gnome bugzilla, so I have submitted bug reports for both gdk-pixbuf and gtk+.

https://bugzilla.gnome.org/show_bug.cgi?id=671515
https://bugzilla.gnome.org/show_bug.cgi?id=671516

Regards,
James
Paul Menzel - March 7, 2012, 9:41 a.m.
Dear James,


Am Mittwoch, den 07.03.2012, 01:49 +0000 schrieb James Limbouris:

> > thank you for sending an improved version of the patch.
> > 
> ...
> > 
> > as Khem and you discussed, it should be useful for upstream [1]. Maybe
> > you can add more context [2][3], so upstream can better judge if they
> > want it.
> > 
> ...

> > [1] http://lists.linuxtogo.org/pipermail/openembedded-core/2012-March/018554.html
> > [2] http://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Generic-Programs.html
> > [3] http://lists.gnu.org/archive/html/bug-ncurses/2011-11/msg00011.html

> This issue has already been patched for gtk+, and is marked Upstream: inappropriate there.
> However, I couldn't find any mention of AC_CHECK_TOOLS in the Gnome bugzilla, so I have submitted bug reports for both gdk-pixbuf and gtk+.
> 
> https://bugzilla.gnome.org/show_bug.cgi?id=671515
> https://bugzilla.gnome.org/show_bug.cgi?id=671516

awesome! Thanks a lot!

Could you add these links to the patch and resend. I guess it will go in
then.


Thanks,

Paul
Saul Wold - March 13, 2012, 4:22 p.m.
On 03/05/2012 06:23 PM, James Limbouris wrote:
> Signed-off-by: James Limbouris<james@digitalmatter.com.au>
> ---
>   .../gdk-pixbuf-2.24.0/configure_nm.patch           |   18 ++++++++++++++++++
>   meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb |    3 ++-
>   2 files changed, 20 insertions(+), 1 deletions(-)
>   create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch
>
> diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch
> new file mode 100644
> index 0000000..0460824
> --- /dev/null
> +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch
> @@ -0,0 +1,18 @@
> +Pick up ${NM} from the environment.
> +Upstream-Status: Inappropriate [configuration]
> +Signed-off-by: James Limbouris<james@digitalmatter.com.au>
> +
> +Index: gdk-pixbuf-2.24.0/configure.ac
> +===================================================================
> +diff -uNr gdk-pixbuf-2.24.0/configure.ac gdk-pixbuf-2.24.0.mod/configure.ac
> +--- gdk-pixbuf-2.24.0/configure.ac	2011-08-27 11:27:52.000000000 +0800
> ++++ gdk-pixbuf-2.24.0.mod/configure.ac	2012-02-28 14:48:36.481126410 +0800
> +@@ -147,7 +147,7 @@
> + AC_SYS_LARGEFILE
> +
> + AM_PROG_AS
> +-AC_PATH_PROG(NM, nm, nm)
> ++AC_CHECK_TOOLS(NM, [$NM nm], nm)
> +
> + AC_MSG_CHECKING([for some Win32 platform])
> + AS_CASE(["$host"],
> diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
> index 121babd..d75bf2a 100644
> --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
> +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
> @@ -11,6 +11,7 @@ SECTION = "libs"
>   DEPENDS = "libpng glib-2.0 jpeg"
>
>   SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${PV}.tar.bz2 \
> +           file://configure_nm.patch \
>              file://hardcoded_libtool.patch \
>              file://configure_fix.patch \
>              "
> @@ -18,7 +19,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
>   SRC_URI[md5sum] = "d8ece3a4ade4a91c768328620e473ab8"
>   SRC_URI[sha256sum] = "38d2630314e6d91976bffd833236f84fefa440a9038f86dc422820a39f2e3700"
>
> -PR = "r4"
> +PR = "r5"
>
>   inherit autotools pkgconfig gettext
>

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch
new file mode 100644
index 0000000..0460824
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch
@@ -0,0 +1,18 @@ 
+Pick up ${NM} from the environment.
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: James Limbouris <james@digitalmatter.com.au>
+
+Index: gdk-pixbuf-2.24.0/configure.ac
+===================================================================
+diff -uNr gdk-pixbuf-2.24.0/configure.ac gdk-pixbuf-2.24.0.mod/configure.ac
+--- gdk-pixbuf-2.24.0/configure.ac	2011-08-27 11:27:52.000000000 +0800
++++ gdk-pixbuf-2.24.0.mod/configure.ac	2012-02-28 14:48:36.481126410 +0800
+@@ -147,7 +147,7 @@
+ AC_SYS_LARGEFILE
+ 
+ AM_PROG_AS
+-AC_PATH_PROG(NM, nm, nm)
++AC_CHECK_TOOLS(NM, [$NM nm], nm)
+ 
+ AC_MSG_CHECKING([for some Win32 platform])
+ AS_CASE(["$host"],
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
index 121babd..d75bf2a 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
@@ -11,6 +11,7 @@  SECTION = "libs"
 DEPENDS = "libpng glib-2.0 jpeg"
 
 SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${PV}.tar.bz2 \
+           file://configure_nm.patch \
            file://hardcoded_libtool.patch \
            file://configure_fix.patch \
            "
@@ -18,7 +19,7 @@  SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
 SRC_URI[md5sum] = "d8ece3a4ade4a91c768328620e473ab8"
 SRC_URI[sha256sum] = "38d2630314e6d91976bffd833236f84fefa440a9038f86dc422820a39f2e3700"
 
-PR = "r4"
+PR = "r5"
 
 inherit autotools pkgconfig gettext