Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libxml2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
libxml2
Commits
da8e5435
Commit
da8e5435
authored
Sep 01, 2019
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated libxml2 to 2.9.9
parent
946fad44
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
42 deletions
+8
-42
Makefile
Makefile
+8
-9
libxml2-2.9.8-python3_hack-1.patch
libxml2-2.9.8-python3_hack-1.patch
+0
-33
libxml2-2.9.9.tar.gz
libxml2-2.9.9.tar.gz
+0
-0
No files found.
Makefile
View file @
da8e5435
all
:
all
:
tar
xf libxml2-2.9.8.tar.gz
tar
xf libxml2-2.9.9.tar.gz
patch
-Np1
-d
libxml2-2.9.8 < libxml2-2.9.8-python3_hack-1.patch
cd
libxml2-2.9.9
&&
sed
-i
'/_PyVerify_fd/,+1d'
python/types.c
cd
libxml2-2.9.8
&&
sed
-i
'/_PyVerify_fd/,+1d'
python/types.c
cd
libxml2-2.9.9
&&
./configure
--build
=
$(CLFS_TARGET)
--prefix
=
/usr
--disable-static
--with-history
--with-python
=
/usr/bin/python3
--with-threads
cd
libxml2-2.9.8
&&
./configure
--build
=
$(CLFS_TARGET)
--prefix
=
/usr
--disable-static
--with-history
--with-python
=
/usr/bin/python3
--with-threads
$(MAKE)
-C
libxml2-2.9.9
$(MAKE)
-C
libxml2-2.9.8
cd
libxml2-2.9.9
&&
tar
xf ../xmlts20130923.tar.gz
cd
libxml2-2.9.8
&&
tar
xf ../xmlts20130923.tar.gz
if
[[
!
"
$(BUILD_OPTIONS)
"
=
~ no-tests
]]
;
then
\
if
[[
!
"
$(BUILD_OPTIONS)
"
=
~ no-tests
]]
;
then
\
$(MAKE)
-C
libxml2-2.9.
8
check
;
\
$(MAKE)
-C
libxml2-2.9.
9
check
;
\
rm
/missing.xml
;
\
rm
/missing.xml
;
\
fi
fi
$(MAKE)
-C
libxml2-2.9.
8
install
$(MAKE)
-C
libxml2-2.9.
9
install
rm
-rf
libxml2-2.9.
8
rm
-rf
libxml2-2.9.
9
libxml2-2.9.8-python3_hack-1.patch
deleted
100644 → 0
View file @
946fad44
diff -uNr libxml2-2.9.8/python/libxml.c libxml2-2.9.8-python3_hack-1/python/libxml.c
--- libxml2-2.9.8/python/libxml.c 2016-06-07 19:34:14.000000000 +0930
+++ libxml2-2.9.8-python3_hack-1/python/libxml.c 2018-06-17 23:18:38.255187110 +0930
@@ -1620,6 +1620,7 @@
PyObject *message;
PyObject *result;
char str[1000];
+ unsigned char *ptr = (unsigned char *)str;
#ifdef DEBUG_ERROR
printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
@@ -1636,12 +1637,20 @@
str[999] = 0;
va_end(ap);
+#if PY_MAJOR_VERSION >= 3
+ /* Ensure the error string doesn't start at UTF8 continuation. */
+ while (*ptr && (*ptr & 0xc0) == 0x80)
+ ptr++;
+#endif
+
list = PyTuple_New(2);
PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
- message = libxml_charPtrConstWrap(str);
+ message = libxml_charPtrConstWrap(ptr);
PyTuple_SetItem(list, 1, message);
result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
+ /* Forget any errors caused in the error handler. */
+ PyErr_Clear();
Py_XDECREF(list);
Py_XDECREF(result);
}
libxml2-2.9.
8
.tar.gz
→
libxml2-2.9.
9
.tar.gz
View file @
da8e5435
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment