* [ptxdist] [PATCH v2] libxml2: Version bump. 2.11.6 -> 2.12.2
@ 2023-12-07 19:19 Christian Melki
2023-12-11 16:41 ` Michael Olbrich
0 siblings, 1 reply; 3+ messages in thread
From: Christian Melki @ 2023-12-07 19:19 UTC (permalink / raw)
To: ptxdist
Major rework, I guess mostly speed related.
https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.0
https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.1
https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.2
May break stuff, proceed with caution.
Globals are quite reworked and stored in thread local storage
if selected. Default is without.
* Forward patchset, applies cleanly. Although there
have been fixes to the problem the patch addresses, I have
not tested it.
It is very likely libxml2 can live without the patch now.
For now, it seems to work as is still.
* Rework licenses. It's still MIT and ISC, but over a different
set of files. Remove hash.c, add dict.c and list.c.
Copyright file had some references to copyrighted files removed.
They have been replaced.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
.../0200-xml2-config-is-not-SYSROOT-aware.patch | 0
patches/{libxml2-2.11.6 => libxml2-2.12.2}/series | 0
rules/libxml2.make | 10 +++++-----
3 files changed, 5 insertions(+), 5 deletions(-)
rename patches/{libxml2-2.11.6 => libxml2-2.12.2}/0200-xml2-config-is-not-SYSROOT-aware.patch (100%)
rename patches/{libxml2-2.11.6 => libxml2-2.12.2}/series (100%)
diff --git a/patches/libxml2-2.11.6/0200-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.12.2/0200-xml2-config-is-not-SYSROOT-aware.patch
similarity index 100%
rename from patches/libxml2-2.11.6/0200-xml2-config-is-not-SYSROOT-aware.patch
rename to patches/libxml2-2.12.2/0200-xml2-config-is-not-SYSROOT-aware.patch
diff --git a/patches/libxml2-2.11.6/series b/patches/libxml2-2.12.2/series
similarity index 100%
rename from patches/libxml2-2.11.6/series
rename to patches/libxml2-2.12.2/series
diff --git a/rules/libxml2.make b/rules/libxml2.make
index 080b89aa2..08182f763 100644
--- a/rules/libxml2.make
+++ b/rules/libxml2.make
@@ -16,17 +16,17 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2
#
# Paths and names
#
-LIBXML2_VERSION := 2.11.6
-LIBXML2_MD5 := 948141d54edae15daaee80ea216645eb
+LIBXML2_VERSION := 2.12.2
+LIBXML2_MD5 := ea61cf9b3f3afd61fde0e05a54fc5ddd
LIBXML2 := libxml2-$(LIBXML2_VERSION)
LIBXML2_SUFFIX := tar.xz
LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
LIBXML2_DIR := $(BUILDDIR)/$(LIBXML2)
LIBXML2_LICENSE := MIT AND ISC
-# The file 'COPYING' is just a symlink on the file 'Copyright'
LIBXML2_LICENSE_FILES := \
- file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \
- file://hash.c;startline=6;endline=15;md5=e77f77b12cb69e203d8b4090a0eee879
+ file://Copyright;md5=fec7ecfe714722b2bb0aaff7d200c701 \
+ file://dict.c;startline=5;endline=16;md5=6bf674402d04fa793fdc1f4d26635d33 \
+ file://list.c;startline=4;endline=15;md5=3fca05145285fa81f48c16c86a4a70b8
LIBXML2_URL := \
https://download.gnome.org/sources/libxml2/$(basename $(LIBXML2_VERSION))/$(LIBXML2).$(LIBXML2_SUFFIX)
--
2.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [ptxdist] [PATCH v2] libxml2: Version bump. 2.11.6 -> 2.12.2
2023-12-07 19:19 [ptxdist] [PATCH v2] libxml2: Version bump. 2.11.6 -> 2.12.2 Christian Melki
@ 2023-12-11 16:41 ` Michael Olbrich
2023-12-11 17:32 ` Christian Melki
0 siblings, 1 reply; 3+ messages in thread
From: Michael Olbrich @ 2023-12-11 16:41 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
On Thu, Dec 07, 2023 at 08:19:27PM +0100, Christian Melki wrote:
> Major rework, I guess mostly speed related.
> https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.0
> https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.1
> https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.2
>
> May break stuff, proceed with caution.
> Globals are quite reworked and stored in thread local storage
> if selected. Default is without.
>
> * Forward patchset, applies cleanly. Although there
> have been fixes to the problem the patch addresses, I have
> not tested it.
> It is very likely libxml2 can live without the patch now.
> For now, it seems to work as is still.
>
> * Rework licenses. It's still MIT and ISC, but over a different
> set of files. Remove hash.c, add dict.c and list.c.
> Copyright file had some references to copyrighted files removed.
> They have been replaced.
I tried to apply this but dropped it again. There are a lot more packages
that break. It seems 2.12.0 introduced some API (but not ABI) breakage :-/.
And we're not the only ones:
https://www.mail-archive.com/devel@lists.fedoraproject.org/msg195951.html
This will require some more work. And I think we need to wait a bit for the
various upstream packages to catch up and fix this stuff.
Regards,
Michael
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
> .../0200-xml2-config-is-not-SYSROOT-aware.patch | 0
> patches/{libxml2-2.11.6 => libxml2-2.12.2}/series | 0
> rules/libxml2.make | 10 +++++-----
> 3 files changed, 5 insertions(+), 5 deletions(-)
> rename patches/{libxml2-2.11.6 => libxml2-2.12.2}/0200-xml2-config-is-not-SYSROOT-aware.patch (100%)
> rename patches/{libxml2-2.11.6 => libxml2-2.12.2}/series (100%)
>
> diff --git a/patches/libxml2-2.11.6/0200-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.12.2/0200-xml2-config-is-not-SYSROOT-aware.patch
> similarity index 100%
> rename from patches/libxml2-2.11.6/0200-xml2-config-is-not-SYSROOT-aware.patch
> rename to patches/libxml2-2.12.2/0200-xml2-config-is-not-SYSROOT-aware.patch
> diff --git a/patches/libxml2-2.11.6/series b/patches/libxml2-2.12.2/series
> similarity index 100%
> rename from patches/libxml2-2.11.6/series
> rename to patches/libxml2-2.12.2/series
> diff --git a/rules/libxml2.make b/rules/libxml2.make
> index 080b89aa2..08182f763 100644
> --- a/rules/libxml2.make
> +++ b/rules/libxml2.make
> @@ -16,17 +16,17 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2
> #
> # Paths and names
> #
> -LIBXML2_VERSION := 2.11.6
> -LIBXML2_MD5 := 948141d54edae15daaee80ea216645eb
> +LIBXML2_VERSION := 2.12.2
> +LIBXML2_MD5 := ea61cf9b3f3afd61fde0e05a54fc5ddd
> LIBXML2 := libxml2-$(LIBXML2_VERSION)
> LIBXML2_SUFFIX := tar.xz
> LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
> LIBXML2_DIR := $(BUILDDIR)/$(LIBXML2)
> LIBXML2_LICENSE := MIT AND ISC
> -# The file 'COPYING' is just a symlink on the file 'Copyright'
> LIBXML2_LICENSE_FILES := \
> - file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \
> - file://hash.c;startline=6;endline=15;md5=e77f77b12cb69e203d8b4090a0eee879
> + file://Copyright;md5=fec7ecfe714722b2bb0aaff7d200c701 \
> + file://dict.c;startline=5;endline=16;md5=6bf674402d04fa793fdc1f4d26635d33 \
> + file://list.c;startline=4;endline=15;md5=3fca05145285fa81f48c16c86a4a70b8
>
> LIBXML2_URL := \
> https://download.gnome.org/sources/libxml2/$(basename $(LIBXML2_VERSION))/$(LIBXML2).$(LIBXML2_SUFFIX)
> --
> 2.34.1
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [ptxdist] [PATCH v2] libxml2: Version bump. 2.11.6 -> 2.12.2
2023-12-11 16:41 ` Michael Olbrich
@ 2023-12-11 17:32 ` Christian Melki
0 siblings, 0 replies; 3+ messages in thread
From: Christian Melki @ 2023-12-11 17:32 UTC (permalink / raw)
To: ptxdist
On 12/11/23 17:41, Michael Olbrich wrote:
> On Thu, Dec 07, 2023 at 08:19:27PM +0100, Christian Melki wrote:
>> Major rework, I guess mostly speed related.
>> https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.0
>> https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.1
>> https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.2
>>
>> May break stuff, proceed with caution.
>> Globals are quite reworked and stored in thread local storage
>> if selected. Default is without.
>>
>> * Forward patchset, applies cleanly. Although there
>> have been fixes to the problem the patch addresses, I have
>> not tested it.
>> It is very likely libxml2 can live without the patch now.
>> For now, it seems to work as is still.
>>
>> * Rework licenses. It's still MIT and ISC, but over a different
>> set of files. Remove hash.c, add dict.c and list.c.
>> Copyright file had some references to copyrighted files removed.
>> They have been replaced.
>
> I tried to apply this but dropped it again. There are a lot more packages
> that break. It seems 2.12.0 introduced some API (but not ABI) breakage :-/.
>
> And we're not the only ones:
> https://www.mail-archive.com/devel@lists.fedoraproject.org/msg195951.html
>
> This will require some more work. And I think we need to wait a bit for the
> various upstream packages to catch up and fix this stuff.
>
> Regards,
> Michael
>
I had the same feeling when I started off with the upgrades.
Tried waiting for .1 but that didn't help much.
Fwiw, I think it's the right call.
Regards,
Christian
>> Signed-off-by: Christian Melki <christian.melki@t2data.com>
>> ---
>> .../0200-xml2-config-is-not-SYSROOT-aware.patch | 0
>> patches/{libxml2-2.11.6 => libxml2-2.12.2}/series | 0
>> rules/libxml2.make | 10 +++++-----
>> 3 files changed, 5 insertions(+), 5 deletions(-)
>> rename patches/{libxml2-2.11.6 => libxml2-2.12.2}/0200-xml2-config-is-not-SYSROOT-aware.patch (100%)
>> rename patches/{libxml2-2.11.6 => libxml2-2.12.2}/series (100%)
>>
>> diff --git a/patches/libxml2-2.11.6/0200-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.12.2/0200-xml2-config-is-not-SYSROOT-aware.patch
>> similarity index 100%
>> rename from patches/libxml2-2.11.6/0200-xml2-config-is-not-SYSROOT-aware.patch
>> rename to patches/libxml2-2.12.2/0200-xml2-config-is-not-SYSROOT-aware.patch
>> diff --git a/patches/libxml2-2.11.6/series b/patches/libxml2-2.12.2/series
>> similarity index 100%
>> rename from patches/libxml2-2.11.6/series
>> rename to patches/libxml2-2.12.2/series
>> diff --git a/rules/libxml2.make b/rules/libxml2.make
>> index 080b89aa2..08182f763 100644
>> --- a/rules/libxml2.make
>> +++ b/rules/libxml2.make
>> @@ -16,17 +16,17 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2
>> #
>> # Paths and names
>> #
>> -LIBXML2_VERSION := 2.11.6
>> -LIBXML2_MD5 := 948141d54edae15daaee80ea216645eb
>> +LIBXML2_VERSION := 2.12.2
>> +LIBXML2_MD5 := ea61cf9b3f3afd61fde0e05a54fc5ddd
>> LIBXML2 := libxml2-$(LIBXML2_VERSION)
>> LIBXML2_SUFFIX := tar.xz
>> LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
>> LIBXML2_DIR := $(BUILDDIR)/$(LIBXML2)
>> LIBXML2_LICENSE := MIT AND ISC
>> -# The file 'COPYING' is just a symlink on the file 'Copyright'
>> LIBXML2_LICENSE_FILES := \
>> - file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \
>> - file://hash.c;startline=6;endline=15;md5=e77f77b12cb69e203d8b4090a0eee879
>> + file://Copyright;md5=fec7ecfe714722b2bb0aaff7d200c701 \
>> + file://dict.c;startline=5;endline=16;md5=6bf674402d04fa793fdc1f4d26635d33 \
>> + file://list.c;startline=4;endline=15;md5=3fca05145285fa81f48c16c86a4a70b8
>>
>> LIBXML2_URL := \
>> https://download.gnome.org/sources/libxml2/$(basename $(LIBXML2_VERSION))/$(LIBXML2).$(LIBXML2_SUFFIX)
>> --
>> 2.34.1
>>
>>
>>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-12-11 17:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-07 19:19 [ptxdist] [PATCH v2] libxml2: Version bump. 2.11.6 -> 2.12.2 Christian Melki
2023-12-11 16:41 ` Michael Olbrich
2023-12-11 17:32 ` Christian Melki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox