[PATCH][V2 0/2] xfce4-terminal+raptor2

[PATCH][V2 0/2] xfce4-terminal+raptor2

[Andreas Müller]

V1->V2:

* raptor2: check and fix licenses (thanks Khem)
* raptor2: check and fix patch Upstream-Status

Andreas Müller (2):
  xfce4-terminal: update to 0.8.2
  raptor2: initial add 2.0.15

 ...c-do-additional-checks-on-libxml2-also-wh.patch | 34 ++++++++++++++++++++++
 meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb  | 25 ++++++++++++++++
 ...4-terminal_0.8.1.bb => xfce4-terminal_0.8.2.bb} |  4 +--
 3 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
 create mode 100644 meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb
 rename meta-xfce/recipes-apps/xfce4-terminal/{xfce4-terminal_0.8.1.bb => xfce4-terminal_0.8.2.bb} (68%)

-- 
2.5.5

[PATCH][V2 1/2] xfce4-terminal: update to 0.8.2

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../{xfce4-terminal_0.8.1.bb => xfce4-terminal_0.8.2.bb}              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-apps/xfce4-terminal/{xfce4-terminal_0.8.1.bb => xfce4-terminal_0.8.2.bb} (68%)

diff --git a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.1.bb b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.2.bb
similarity index 68%
rename from meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.1.bb
rename to meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.2.bb
index 9313efb..8df7b5f 100644
--- a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.1.bb
+++ b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.2.bb
@@ -8,5 +8,5 @@ inherit xfce-app
 FILES_${PN} += "${datadir}/xfce4 \
                 ${datadir}/gnome-control-center"
 
-SRC_URI[md5sum] = "46d347c0ecbb74a7878d48833042371d"
-SRC_URI[sha256sum] = "ddfe53a89d315a4a9170ca6d2cee2d33145bd63630062b2e867fb3a5fcde5fdf"
+SRC_URI[md5sum] = "53d46d7dbcb74d238dc5e0c8dbc447cd"
+SRC_URI[sha256sum] = "92aad3e14f3ef8d4c6c1409463e989bd8f5eefb686234f3cdbfe574729401681"
-- 
2.5.5

[PATCH][V2 2/2] raptor2: initial add 2.0.15

[Andreas Müller]

* it is it in meta-office for a while. Now I need it in meta-qt5-extra too
* LICENSE.txt summarizes all licenses and explains that ot is user's choice
  which one to use

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...c-do-additional-checks-on-libxml2-also-wh.patch | 34 ++++++++++++++++++++++
 meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb  | 25 ++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
 create mode 100644 meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb

diff --git a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
new file mode 100644
index 0000000..7faeb13
--- /dev/null
+++ b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
@@ -0,0 +1,34 @@
+From 3f97aac5a1f43ef57b02fb9ccdcadd41a6b69fa9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 27 Oct 2015 10:21:24 +0100
+Subject: [PATCH] configure.ac: do additional checks on libxml2 also when
+ detected by pkg-config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Applied [1]
+
+[1] https://github.com/dajobe/raptor/pull/33
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 10ff870..35fa08e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -601,7 +601,7 @@ have_libxml=0
+ need_libxml=0
+ 
+ oCPPFLAGS="$CPPFLAGS"
+-if test "X$XML_CONFIG" != X; then
++if test "X$libxml_source" != X; then
+   CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS"
+   LIBS="$LIBS $LIBXML_LIBS"
+   AC_CHECK_FUNC(xmlCreatePushParserCtxt, have_xmlCreatePushParserCtxt=yes, have_xmlCreatePushParserCtxt=no)
+-- 
+2.1.0
+
diff --git a/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb b/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb
new file mode 100644
index 0000000..8c6d008
--- /dev/null
+++ b/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Library for parsing and serializing RDF syntaxes"
+LICENSE = "GPLv2 | LGPLv2.1 | Apache-2.0"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.txt;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
+    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://LICENSE-2.0.txt;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+"
+
+DEPENDS = "libxml2 libxslt curl yajl"
+
+SRC_URI = " \
+    http://download.librdf.org/source/${BPN}-${PV}.tar.gz \
+    file://0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch \
+"
+SRC_URI[md5sum] = "a39f6c07ddb20d7dd2ff1f95fa21e2cd"
+SRC_URI[sha256sum] = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " \
+    --without-xml2-config \
+    --without-curl-config \
+    --without-xslt-config \
+"
-- 
2.5.5

Re: [PATCH][V2 2/2] raptor2: initial add 2.0.15

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 4072 bytes --]

On Wed, Jan 04, 2017 at 02:27:23AM +0100, Andreas Müller wrote:
> * it is it in meta-office for a while. Now I need it in meta-qt5-extra too
> * LICENSE.txt summarizes all licenses and explains that ot is user's choice
>   which one to use
> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  ...c-do-additional-checks-on-libxml2-also-wh.patch | 34 ++++++++++++++++++++++
>  meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb  | 25 ++++++++++++++++
>  2 files changed, 59 insertions(+)
>  create mode 100644 meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
>  create mode 100644 meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb
> 
> diff --git a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
> new file mode 100644
> index 0000000..7faeb13
> --- /dev/null
> +++ b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
> @@ -0,0 +1,34 @@
> +From 3f97aac5a1f43ef57b02fb9ccdcadd41a6b69fa9 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> +Date: Tue, 27 Oct 2015 10:21:24 +0100
> +Subject: [PATCH] configure.ac: do additional checks on libxml2 also when
> + detected by pkg-config
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Applied [1]
> +
> +[1] https://github.com/dajobe/raptor/pull/33
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> +---
> + configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 10ff870..35fa08e 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -601,7 +601,7 @@ have_libxml=0
> + need_libxml=0
> + 
> + oCPPFLAGS="$CPPFLAGS"
> +-if test "X$XML_CONFIG" != X; then
> ++if test "X$libxml_source" != X; then
> +   CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS"
> +   LIBS="$LIBS $LIBXML_LIBS"
> +   AC_CHECK_FUNC(xmlCreatePushParserCtxt, have_xmlCreatePushParserCtxt=yes, have_xmlCreatePushParserCtxt=no)
> +-- 
> +2.1.0
> +
> diff --git a/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb b/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb
> new file mode 100644
> index 0000000..8c6d008
> --- /dev/null
> +++ b/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb
> @@ -0,0 +1,25 @@
> +SUMMARY = "Library for parsing and serializing RDF syntaxes"
> +LICENSE = "GPLv2 | LGPLv2.1 | Apache-2.0"
> +LIC_FILES_CHKSUM = " \
> +    file://LICENSE.txt;md5=2d5025d4aa3495befef8f17206a5b0a1 \
> +    file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
> +    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
> +    file://LICENSE-2.0.txt;md5=2d5025d4aa3495befef8f17206a5b0a1 \
> +"

I haven't checked why, but doesn't match for me:

ERROR: raptor2-2.0.15-r0 do_populate_lic: QA Issue: raptor2: The LIC_FILES_CHKSUM does not match for file://LICENSE.txt;md5=2d5025d4aa3495befef8f17206a5b0a1
raptor2: The new md5 checksum is b840e5ae3aeb897f45b473341348cd9c

> +DEPENDS = "libxml2 libxslt curl yajl"
> +
> +SRC_URI = " \
> +    http://download.librdf.org/source/${BPN}-${PV}.tar.gz \
> +    file://0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch \
> +"
> +SRC_URI[md5sum] = "a39f6c07ddb20d7dd2ff1f95fa21e2cd"
> +SRC_URI[sha256sum] = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"
> +
> +inherit autotools pkgconfig
> +
> +EXTRA_OECONF = " \
> +    --without-xml2-config \
> +    --without-curl-config \
> +    --without-xslt-config \
> +"
> -- 
> 2.5.5
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

Re: [PATCH][V2 2/2] raptor2: initial add 2.0.15

[Andreas Müller]

On Thu, Jan 5, 2017 at 7:04 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, Jan 04, 2017 at 02:27:23AM +0100, Andreas Müller wrote:
>> * it is it in meta-office for a while. Now I need it in meta-qt5-extra too
>> * LICENSE.txt summarizes all licenses and explains that ot is user's choice
>>   which one to use
>>
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> ---
>>  ...c-do-additional-checks-on-libxml2-also-wh.patch | 34 ++++++++++++++++++++++
>>  meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb  | 25 ++++++++++++++++
>>  2 files changed, 59 insertions(+)
>>  create mode 100644 meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
>>  create mode 100644 meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb
>>
>> diff --git a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
>> new file mode 100644
>> index 0000000..7faeb13
>> --- /dev/null
>> +++ b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
>> @@ -0,0 +1,34 @@
>> +From 3f97aac5a1f43ef57b02fb9ccdcadd41a6b69fa9 Mon Sep 17 00:00:00 2001
>> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
>> +Date: Tue, 27 Oct 2015 10:21:24 +0100
>> +Subject: [PATCH] configure.ac: do additional checks on libxml2 also when
>> + detected by pkg-config
>> +MIME-Version: 1.0
>> +Content-Type: text/plain; charset=UTF-8
>> +Content-Transfer-Encoding: 8bit
>> +
>> +Upstream-Status: Applied [1]
>> +
>> +[1] https://github.com/dajobe/raptor/pull/33
>> +
>> +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> +---
>> + configure.ac | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/configure.ac b/configure.ac
>> +index 10ff870..35fa08e 100644
>> +--- a/configure.ac
>> ++++ b/configure.ac
>> +@@ -601,7 +601,7 @@ have_libxml=0
>> + need_libxml=0
>> +
>> + oCPPFLAGS="$CPPFLAGS"
>> +-if test "X$XML_CONFIG" != X; then
>> ++if test "X$libxml_source" != X; then
>> +   CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS"
>> +   LIBS="$LIBS $LIBXML_LIBS"
>> +   AC_CHECK_FUNC(xmlCreatePushParserCtxt, have_xmlCreatePushParserCtxt=yes, have_xmlCreatePushParserCtxt=no)
>> +--
>> +2.1.0
>> +
>> diff --git a/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb b/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb
>> new file mode 100644
>> index 0000000..8c6d008
>> --- /dev/null
>> +++ b/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb
>> @@ -0,0 +1,25 @@
>> +SUMMARY = "Library for parsing and serializing RDF syntaxes"
>> +LICENSE = "GPLv2 | LGPLv2.1 | Apache-2.0"
>> +LIC_FILES_CHKSUM = " \
>> +    file://LICENSE.txt;md5=2d5025d4aa3495befef8f17206a5b0a1 \
>> +    file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
>> +    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
>> +    file://LICENSE-2.0.txt;md5=2d5025d4aa3495befef8f17206a5b0a1 \
>> +"
>
> I haven't checked why, but doesn't match for me:
>
> ERROR: raptor2-2.0.15-r0 do_populate_lic: QA Issue: raptor2: The LIC_FILES_CHKSUM does not match for file://LICENSE.txt;md5=2d5025d4aa3495befef8f17206a5b0a1
> raptor2: The new md5 checksum is b840e5ae3aeb897f45b473341348cd9c
>
Strange: it is not the first time for me that a recipes build and then
on fresh rebuild I see this kind of error. Will look into this.

Andreas

Re: [PATCH][V2 2/2] raptor2: initial add 2.0.15

[Andreas Müller]

On Thu, Jan 5, 2017 at 7:57 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Thu, Jan 5, 2017 at 7:04 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> On Wed, Jan 04, 2017 at 02:27:23AM +0100, Andreas Müller wrote:
>>> * it is it in meta-office for a while. Now I need it in meta-qt5-extra too
>>> * LICENSE.txt summarizes all licenses and explains that ot is user's choice
>>>   which one to use
>>>
>>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>>> ---
>>>  ...c-do-additional-checks-on-libxml2-also-wh.patch | 34 ++++++++++++++++++++++
>>>  meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb  | 25 ++++++++++++++++
>>>  2 files changed, 59 insertions(+)
>>>  create mode 100644 meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
>>>  create mode 100644 meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb
>>>
>>> diff --git a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
>>> new file mode 100644
>>> index 0000000..7faeb13
>>> --- /dev/null
>>> +++ b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
>>> @@ -0,0 +1,34 @@
>>> +From 3f97aac5a1f43ef57b02fb9ccdcadd41a6b69fa9 Mon Sep 17 00:00:00 2001
>>> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
>>> +Date: Tue, 27 Oct 2015 10:21:24 +0100
>>> +Subject: [PATCH] configure.ac: do additional checks on libxml2 also when
>>> + detected by pkg-config
>>> +MIME-Version: 1.0
>>> +Content-Type: text/plain; charset=UTF-8
>>> +Content-Transfer-Encoding: 8bit
>>> +
>>> +Upstream-Status: Applied [1]
>>> +
>>> +[1] https://github.com/dajobe/raptor/pull/33
>>> +
>>> +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>>> +---
>>> + configure.ac | 2 +-
>>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>>> +
>>> +diff --git a/configure.ac b/configure.ac
>>> +index 10ff870..35fa08e 100644
>>> +--- a/configure.ac
>>> ++++ b/configure.ac
>>> +@@ -601,7 +601,7 @@ have_libxml=0
>>> + need_libxml=0
>>> +
>>> + oCPPFLAGS="$CPPFLAGS"
>>> +-if test "X$XML_CONFIG" != X; then
>>> ++if test "X$libxml_source" != X; then
>>> +   CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS"
>>> +   LIBS="$LIBS $LIBXML_LIBS"
>>> +   AC_CHECK_FUNC(xmlCreatePushParserCtxt, have_xmlCreatePushParserCtxt=yes, have_xmlCreatePushParserCtxt=no)
>>> +--
>>> +2.1.0
>>> +
>>> diff --git a/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb b/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb
>>> new file mode 100644
>>> index 0000000..8c6d008
>>> --- /dev/null
>>> +++ b/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb
>>> @@ -0,0 +1,25 @@
>>> +SUMMARY = "Library for parsing and serializing RDF syntaxes"
>>> +LICENSE = "GPLv2 | LGPLv2.1 | Apache-2.0"
>>> +LIC_FILES_CHKSUM = " \
>>> +    file://LICENSE.txt;md5=2d5025d4aa3495befef8f17206a5b0a1 \
>>> +    file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
>>> +    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
>>> +    file://LICENSE-2.0.txt;md5=2d5025d4aa3495befef8f17206a5b0a1 \
>>> +"
>>
>> I haven't checked why, but doesn't match for me:
>>
>> ERROR: raptor2-2.0.15-r0 do_populate_lic: QA Issue: raptor2: The LIC_FILES_CHKSUM does not match for file://LICENSE.txt;md5=2d5025d4aa3495befef8f17206a5b0a1
>> raptor2: The new md5 checksum is b840e5ae3aeb897f45b473341348cd9c
>>
> Strange: it is not the first time for me that a recipes build and then
> on fresh rebuild I see this kind of error. Will look into this.
>
LOL: Have not yet removed the version in meta-office to avoid users complain...

Andreas