Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 679046 - dev-libs/libxml2: (apply upstream patch) always define LIBXML_THREAD_ENABLED
Summary: dev-libs/libxml2: (apply upstream patch) always define LIBXML_THREAD_ENABLED
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gentoo Linux Gnome Desktop Team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2019-02-28 13:34 UTC by Michael Haubenwallner (RETIRED)
Modified: 2019-03-03 20:20 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
proposed commit (0001-dev-libs-libxml2-always-define-LIBXML_THREAD_ENABLED.patch,9.25 KB, patch)
2019-02-28 13:38 UTC, Michael Haubenwallner (RETIRED)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Michael Haubenwallner (RETIRED) gentoo-dev 2019-02-28 13:34:42 UTC
https://mail.gnome.org/archives/xml/2019-February/msg00002.html
Comment 1 Michael Haubenwallner (RETIRED) gentoo-dev 2019-02-28 13:38:45 UTC
Created attachment 566884 [details, diff]
proposed commit

This does apply the upstream committed patch with revbump, diff to former rev (beyond unstable keywords) is:
@@ -84,6 +84,9 @@
        # Fix python tests when building out of tree #565576
        eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
 
+       # always define LIBXML_THREAD_ENABLED when enabled
+       eapply "${FILESDIR}"/${P}-define-when-threads-enabled.patch
+
        if [[ ${CHOST} == *-darwin* ]] ; then
                # Avoid final linking arguments for python modules
                sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
Comment 2 Michael Haubenwallner (RETIRED) gentoo-dev 2019-02-28 13:41:02 UTC
description from upstream accepted patch:

When libxml2 is compiled with threads enabled, have the header file
define LIBXML_THREAD_ENABLED even if the subsequent application by
itself does not enable threads.  Otherwise, the application would see
the unthreaded API functions, but these are not exported (where it does
make a difference, like on Win32 based platforms).

Ok to push?
Comment 3 Mart Raudsepp gentoo-dev 2019-02-28 13:43:22 UTC
As this is a revbump and -r0 is being security stabilized already, I'd prefer to take a chance to find anything else to backport in addition to this.
How does this sound - I do it with more patches by Monday, and if I don't get to it, you can just push only this instead yourself?
Comment 4 Michael Haubenwallner (RETIRED) gentoo-dev 2019-02-28 19:24:27 UTC
Absolutely fine with me, thanks!
Comment 5 Arfrever Frehtes Taifersar Arahesis 2019-03-01 03:42:38 UTC
(In reply to Mart Raudsepp from comment #3)
> I'd prefer to take a chance to find anything else to backport in addition to
> this.

I found some fixes to backport and reported it in bug #679096.
Comment 6 Mart Raudsepp gentoo-dev 2019-03-01 11:17:40 UTC
OK, lets not do a single change for sure then. I'll finish up with some core gnome 3.28 bumps and then get back to libxml2.
But maybe upstream could be convinced to roll a release and tarball too?
Comment 7 Larry the Git Cow gentoo-dev 2019-03-03 20:20:06 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f33b7a6cb6cb08274e34472cca930620fced3c7

commit 9f33b7a6cb6cb08274e34472cca930620fced3c7
Author:     Mart Raudsepp <leio@gentoo.org>
AuthorDate: 2019-03-03 20:18:16 +0000
Commit:     Mart Raudsepp <leio@gentoo.org>
CommitDate: 2019-03-03 20:19:11 +0000

    dev-libs/libxml2: revbump for patchset, fix xmlconf for tests
    
    Closes: https://bugs.gentoo.org/679046
    Closes: https://bugs.gentoo.org/679096
    Package-Manager: Portage-2.3.52, Repoman-2.3.12
    Signed-off-by: Mart Raudsepp <leio@gentoo.org>

 dev-libs/libxml2/Manifest                |   1 +
 dev-libs/libxml2/libxml2-2.9.9-r1.ebuild | 219 +++++++++++++++++++++++++++++++
 2 files changed, 220 insertions(+)