[packages/liblouisutdml] - added gcc, libxml2 and types fixes; there is still java types problem left

qboosh qboosh at pld-linux.org
Tue Sep 24 22:04:40 CEST 2024


commit a4ff5bc96df369f7fe64e084fe09159c2bb5baf6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Sep 24 22:07:44 2024 +0200

    - added gcc, libxml2 and types fixes; there is still java types problem left

 liblouisutdml-includes.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++
 liblouisutdml-libxml2.patch  | 20 ++++++++++++++++++
 liblouisutdml-types.patch    | 20 ++++++++++++++++++
 liblouisutdml.spec           |  6 ++++++
 4 files changed, 96 insertions(+)
---
diff --git a/liblouisutdml.spec b/liblouisutdml.spec
index 30f98cf..614322b 100644
--- a/liblouisutdml.spec
+++ b/liblouisutdml.spec
@@ -14,6 +14,9 @@ Source0:	https://github.com/liblouis/liblouisutdml/archive/v%{version}/%{name}-%
 # Source0-md5:	d97e8f90e2631b4ef4e86178bf96a90c
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-pc.patch
+Patch2:		%{name}-includes.patch
+Patch3:		%{name}-libxml2.patch
+Patch4:		%{name}-types.patch
 URL:		http://liblouis.org/
 %{?with_java:BuildRequires:	ant}
 BuildRequires:	autoconf >= 2.69
@@ -87,6 +90,9 @@ Wiązania Javy do biblioteki liblouisutdml.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
diff --git a/liblouisutdml-includes.patch b/liblouisutdml-includes.patch
new file mode 100644
index 0000000..9346c16
--- /dev/null
+++ b/liblouisutdml-includes.patch
@@ -0,0 +1,50 @@
+--- liblouisutdml-2.12.0/liblouisutdml/utd2transinxml.c.orig	2023-11-02 10:23:00.000000000 +0100
++++ liblouisutdml-2.12.0/liblouisutdml/utd2transinxml.c	2024-09-24 20:57:29.429584860 +0200
+@@ -31,6 +31,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ #include "louisutdml.h"
+ 
+ static int findBrlNodes (xmlNode * node);
+--- liblouisutdml-2.12.0/liblouisutdml/utd2dsbible.c.orig	2023-11-02 10:23:00.000000000 +0100
++++ liblouisutdml-2.12.0/liblouisutdml/utd2dsbible.c	2024-09-24 20:58:12.713182590 +0200
+@@ -30,6 +30,7 @@
+    */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include "louisutdml.h"
+ 
+--- liblouisutdml-2.12.0/liblouisutdml/utd2brf.c.orig	2023-11-02 10:23:00.000000000 +0100
++++ liblouisutdml-2.12.0/liblouisutdml/utd2brf.c	2024-09-24 20:58:33.739977698 +0200
+@@ -30,6 +30,7 @@
+    */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include "louisutdml.h"
+ 
+--- liblouisutdml-2.12.0/liblouisutdml/utd2pef.c.orig	2023-11-02 10:23:00.000000000 +0100
++++ liblouisutdml-2.12.0/liblouisutdml/utd2pef.c	2024-09-24 21:01:25.364359393 +0200
+@@ -30,6 +30,7 @@
+    */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include "louisutdml.h"
+ 
+--- liblouisutdml-2.12.0/liblouisutdml/utd2volumes.c.orig	2023-11-02 10:23:00.000000000 +0100
++++ liblouisutdml-2.12.0/liblouisutdml/utd2volumes.c	2024-09-24 21:01:53.734532692 +0200
+@@ -30,6 +30,7 @@
+    */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include "louisutdml.h"
+ 
diff --git a/liblouisutdml-libxml2.patch b/liblouisutdml-libxml2.patch
new file mode 100644
index 0000000..0145849
--- /dev/null
+++ b/liblouisutdml-libxml2.patch
@@ -0,0 +1,20 @@
+--- liblouisutdml-2.12.0/liblouisutdml/liblouisutdml.c.orig	2024-09-24 20:55:19.882126857 +0200
++++ liblouisutdml-2.12.0/liblouisutdml/liblouisutdml.c	2024-09-24 20:55:23.418815128 +0200
+@@ -36,6 +36,7 @@
+ #include "louisutdml.h"
+ #include <libxml/HTMLparser.h>
+ #include <libxml/catalog.h>
++#include <libxml/xmlsave.h>
+ 
+ UserData *ud = NULL;
+ 
+--- liblouisutdml-2.12.0/liblouisutdml/transcriber.c.orig	2023-11-02 10:23:00.000000000 +0100
++++ liblouisutdml-2.12.0/liblouisutdml/transcriber.c	2024-09-24 21:07:31.636596757 +0200
+@@ -32,6 +32,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <libxml/xmlsave.h>
+ #include "louisutdml.h"
+ 
+ static xmlNode *firstBrlNode;
diff --git a/liblouisutdml-types.patch b/liblouisutdml-types.patch
new file mode 100644
index 0000000..c3aee41
--- /dev/null
+++ b/liblouisutdml-types.patch
@@ -0,0 +1,20 @@
+--- liblouisutdml-2.12.0/java/Jliblouisutdml.c.orig	2024-09-24 21:26:15.213409754 +0200
++++ liblouisutdml-2.12.0/java/Jliblouisutdml.c	2024-09-24 21:26:18.810098181 +0200
+@@ -703,7 +703,7 @@ JNIEXPORT void JNICALL Java_org_liblouis
+ }
+ 
+ static jobject louLogCBFunc;
+-static void javaLouLogCallback(int level, const char *message)
++static void javaLouLogCallback(logLevels level, const char *message)
+ {
+   execJavaLogCallback(louLogCBFunc, level, message);
+ }
+@@ -1340,7 +1340,7 @@ JNIEXPORT void JNICALL Java_org_liblouis
+ }
+ 
+ static jobject lbuLogCBFunc;
+-static void javaLbuLogCallbackFunc(int level, const char *message)
++static void javaLbuLogCallbackFunc(logLevels level, const char *message)
+ {
+   execJavaLogCallback(lbuLogCBFunc, level, message);
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/liblouisutdml.git/commitdiff/a4ff5bc96df369f7fe64e084fe09159c2bb5baf6



More information about the pld-cvs-commit mailing list