[PATCH 1/2] libxslt: upgrade to 1.1.27

[PATCH 1/2] libxslt: upgrade to 1.1.27

[Constantin Musca]

pkgconfig_fix.patch: adapted to the new version

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 .../libxslt/libxslt/pkgconfig_fix.patch            | 22 +++++++++++-----------
 .../{libxslt_1.1.26.bb => libxslt_1.1.27.bb}       |  6 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)
 rename meta/recipes-support/libxslt/{libxslt_1.1.26.bb => libxslt_1.1.27.bb} (86%)

diff --git a/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch b/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
index 6386889..16a8010 100644
--- a/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
+++ b/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
@@ -1,24 +1,24 @@
 Upstream-Status: Inappropriate [configuration]
 
-Index: libxslt-1.1.22/libexslt.pc.in
+Index: libxslt-1.1.27/libexslt.pc.in
 ===================================================================
---- libxslt-1.1.22.orig/libexslt.pc.in	2008-03-19 16:52:20.000000000 +0000
-+++ libxslt-1.1.22/libexslt.pc.in	2008-03-19 16:55:49.000000000 +0000
-@@ -8,5 +8,5 @@
+--- libxslt-1.1.27.orig/libexslt.pc.in
++++ libxslt-1.1.27/libexslt.pc.in
+@@ -8,5 +8,5 @@ Name: libexslt
  Version: @LIBEXSLT_VERSION@
  Description: EXSLT Extension library
  Requires: libxml-2.0
 -Libs: @EXSLT_LIBDIR@ @EXSLT_LIBS@
-+Libs: -lexslt @EXSLT_LIBDIR@ @M_LIBS@
++Libs: -lexslt @EXSLT_LIBDIR@ @EXSLT_LIBS@
  Cflags: @EXSLT_INCLUDEDIR@
-Index: libxslt-1.1.22/libxslt.pc.in
+Index: libxslt-1.1.27/libxslt.pc.in
 ===================================================================
---- libxslt-1.1.22.orig/libxslt.pc.in	2008-03-19 16:52:20.000000000 +0000
-+++ libxslt-1.1.22/libxslt.pc.in	2008-03-19 16:55:38.000000000 +0000
-@@ -8,5 +8,5 @@
+--- libxslt-1.1.27.orig/libxslt.pc.in
++++ libxslt-1.1.27/libxslt.pc.in
+@@ -8,5 +8,5 @@ Name: libxslt
  Version: @VERSION@
  Description: XSLT library version 2.
  Requires: libxml-2.0
--Libs: @XSLT_LIBDIR@ @XSLT_LIBS@
-+Libs: -lxslt @XSLT_LIBDIR@ @M_LIBS@
+-Libs: @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@
++Libs: -lxslt @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@
  Cflags: @XSLT_INCLUDEDIR@
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.26.bb b/meta/recipes-support/libxslt/libxslt_1.1.27.bb
similarity index 86%
rename from meta/recipes-support/libxslt/libxslt_1.1.26.bb
rename to meta/recipes-support/libxslt/libxslt_1.1.27.bb
index e4cc214..925c860 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.26.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.27.bb
@@ -7,13 +7,13 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458"
 
 SECTION = "libs"
 DEPENDS = "libxml2"
-PR = "r8"
+PR = "r0"
 
 SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \
            file://pkgconfig_fix.patch"
 
-SRC_URI[md5sum] = "e61d0364a30146aaa3001296f853b2b9"
-SRC_URI[sha256sum] = "55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1"
+SRC_URI[md5sum] = "4d01ff464b9ea7236925a1adf147c7f8"
+SRC_URI[sha256sum] = "b6a8d9a421f2630999ca91d9f8c091ee8ea2d580e6be84c1d21b2a45e11e7e26"
 S = "${WORKDIR}/libxslt-${PV}"
 
 inherit autotools pkgconfig binconfig lib_package
-- 
1.7.11.7

[PATCH 2/2] puzzles: upgrade to r9660

[Constantin Musca]

License checksum change due to diff:
4,5c4,5
< K�lker, Dariusz Olszewski, Michael Schierl, Lambros Lambrou and
< Bernd Schmidt.
> K�lker, Dariusz Olszewski, Michael Schierl, Lambros Lambrou, Bernd
> Schmidt and Steffen Bauer.

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 meta/recipes-sato/puzzles/{puzzles_r9594.bb => puzzles_r9660.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-sato/puzzles/{puzzles_r9594.bb => puzzles_r9660.bb} (96%)

diff --git a/meta/recipes-sato/puzzles/puzzles_r9594.bb b/meta/recipes-sato/puzzles/puzzles_r9660.bb
similarity index 96%
rename from meta/recipes-sato/puzzles/puzzles_r9594.bb
rename to meta/recipes-sato/puzzles/puzzles_r9660.bb
index 310798d..37536c6 100644
--- a/meta/recipes-sato/puzzles/puzzles_r9594.bb
+++ b/meta/recipes-sato/puzzles/puzzles_r9660.bb
@@ -6,7 +6,7 @@ PR = "r0"
 MOD_PV = "${@d.getVar('PV',1)[1:]}"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=453de74d749439762ef4814f7bee1fec"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=87478fe5bc9ea8f356c5479a5617324a"
 
 # Upstream updates puzzles.tar.gz for the new release, so checksums seem to be changing regularly right now
 SRC_URI = "svn://svn.tartarus.org/sgt;module=puzzles;rev=${MOD_PV};protocol=svn"
-- 
1.7.11.7

Re: [PATCH 1/2] libxslt: upgrade to 1.1.27

[Burton, Ross]

On 9 November 2012 10:00, Constantin Musca <constantinx.musca@intel.com> wrote:
> --- a/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
> +++ b/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
> @@ -1,24 +1,24 @@
>  Upstream-Status: Inappropriate [configuration]

This doesn't look "inappropriate" or "configuration" but a genuine
build fix.  Has anyone approached upstream?

(I'm genuinely dismayed at the number of build fixes that get marked
as inappropriate when they are clearly genuine build fixes)

Ross

Re: [PATCH 1/2] libxslt: upgrade to 1.1.27

[Richard Purdie]

On Fri, 2012-11-09 at 10:15 +0000, Burton, Ross wrote:
> On 9 November 2012 10:00, Constantin Musca <constantinx.musca@intel.com> wrote:
> > --- a/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
> > +++ b/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
> > @@ -1,24 +1,24 @@
> >  Upstream-Status: Inappropriate [configuration]
> 
> This doesn't look "inappropriate" or "configuration" but a genuine
> build fix.  Has anyone approached upstream?
> 
> (I'm genuinely dismayed at the number of build fixes that get marked
> as inappropriate when they are clearly genuine build fixes)

I'm not going to reject the patch on this since its not a new issue
being introduced but I do support what you're saying 100% here, the
categories do seem to have gotten a little misplaced and people should
take the time to validate them when upgrading recipes...

Cheers,

Richard