[Python-modules-commits] [python-dmidecode] 08/10: merge patched into master

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository python-dmidecode.

commit c4191adda900f3d84492fe9f46c0a0559ba51f99
Merge: 6aa4045 6698dab
Author: Sandro Tosi <morph at debian.org>
Date:   Tue Dec 5 18:52:30 2017 -0500

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 .../0002-Stop-linking-with-libxml2mod.patch        | 72 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 src/dmidecodemodule.c                              | 27 +++++++-
 src/setup_common.py                                |  3 -
 5 files changed, 101 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index f23feae,0000000..91c3016
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 352feab1a5753c19d3d661c2000d793f75160858
- 352feab1a5753c19d3d661c2000d793f75160858
++6698dabbd45a2d93199d2d3d5abb84f8c260667d
++6698dabbd45a2d93199d2d3d5abb84f8c260667d
 +0616e96b759829b4c4095ee4c38c80836e2d9c06
 +0616e96b759829b4c4095ee4c38c80836e2d9c06
 +python-dmidecode_3.12.2.orig.tar.gz
 +e0a5f9bca278b1a6eb3e899b32e181c9eb5eabbd
 +147096
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Stop-linking-with-libxml2mod.patch
index 0000000,0000000..68a00e1
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Stop-linking-with-libxml2mod.patch
@@@ -1,0 -1,0 +1,72 @@@
++From 6698dabbd45a2d93199d2d3d5abb84f8c260667d Mon Sep 17 00:00:00 2001
++From: Sandro Tosi <morph at debian.org>
++Date: Tue, 5 Dec 2017 18:52:09 -0500
++Subject: Stop linking with libxml2mod
++
++Copy the two funcions used instead of linking with libxml2mod.
++
++Author: Adrian Bunk <bunk at debian.org>
++---
++ src/dmidecodemodule.c | 27 ++++++++++++++++++++++++++-
++ src/setup_common.py   |  3 ---
++ 2 files changed, 26 insertions(+), 4 deletions(-)
++
++diff --git a/src/dmidecodemodule.c b/src/dmidecodemodule.c
++index b31c002..007a892 100644
++--- a/src/dmidecodemodule.c
+++++ b/src/dmidecodemodule.c
++@@ -42,7 +42,6 @@
++ #include <Python.h>
++ 
++ #include <libxml/tree.h>
++-#include "libxml_wrap.h"
++ 
++ #include "dmidecodemodule.h"
++ #include "dmixml.h"
++@@ -64,6 +63,32 @@ char *PyUnicode_AsUTF8(PyObject *unicode) {
++ }
++ #endif
++ 
+++static PyObject *
+++libxml_xmlDocPtrWrap(xmlDocPtr doc)
+++{
+++    PyObject *ret;
+++
+++    if (doc == NULL) {
+++        Py_INCREF(Py_None);
+++        return (Py_None);
+++    }
+++    ret = PyCapsule_New((void *) doc, (char *) "xmlDocPtr", NULL);
+++    return (ret);
+++}
+++
+++static PyObject *
+++libxml_xmlNodePtrWrap(xmlNodePtr node)
+++{
+++    PyObject *ret;
+++
+++    if (node == NULL) {
+++        Py_INCREF(Py_None);
+++        return (Py_None);
+++    }
+++    ret = PyCapsule_New((void *) node, (char *) "xmlNodePtr", NULL);
+++    return (ret);
+++}
+++
++ static void init(options *opt)
++ {
++         opt->devmem = DEFAULT_MEM_DEV;
++diff --git a/src/setup_common.py b/src/setup_common.py
++index aec1f9b..6b678ef 100644
++--- a/src/setup_common.py
+++++ b/src/setup_common.py
++@@ -68,9 +68,6 @@ def libxml2_lib(libdir, libs):
++         elif l.find('-l') == 0:
++             libs.append(l.replace("-l", "", 1))
++ 
++-    # this library is not reported and we need it anyway
++-    libs.append('xml2mod')
++-
++ 
++ 
++ # Get version from src/version.h
diff --cc debian/patches/series
index b872117,0000000..18c34eb
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Don-t-use-unaligned-access-on-ARM.patch
++0002-Stop-linking-with-libxml2mod.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-dmidecode.git