Merge pull request #6775 from CMB/liblouis

liblouis: update to 3.2.0
This commit is contained in:
Enno Boland 2017-06-20 00:09:58 +02:00 committed by GitHub
commit 064196baaf
4 changed files with 3 additions and 40 deletions

View file

@ -2093,7 +2093,7 @@ libOIS-1.3.0.so ois-1.3_1
libSILLY.so.1 silly-0.1.0_1
libkeybinder-3.0.so.0 libkeybinder3-0.3.0_1
libbrlapi.so.0.6 brltty-5.2_1
liblouis.so.12 liblouis-3.1.0_1
liblouis.so.14 liblouis-3.2.0_1
libCEGUIBase-0.7.9.so cegui07-0.7.9_1
libCEGUIFalagardWRBase-0.7.9.so cegui07-0.7.9_1
libCEGUIDevILImageCodec-0.7.9.so cegui07-0.7.9_1

View file

@ -1,23 +0,0 @@
Fixed by https://github.com/liblouis/liblouis/pull/325
which has been merged upstream.
The Python bindings use ctypes, and they load the .so as soon as they
are imported. setup.py imports them and calls the library's version()
function, rather than hard-coding a version number. This breaks crossbuilds.
diff -Naur python/setup.py liblouis-3.1.0/python/setup.py
--- python/setup.py 2017-03-06 05:49:10.000000000 -0800
+++ python/setup.py 2017-04-24 16:34:57.293458084 -0700
@@ -23,7 +23,6 @@
"""
from distutils.core import setup
-import louis
classifiers = [
'Development Status :: 4 - Beta',
@@ -38,5 +37,5 @@
download_url = "http://code.google.com/p/liblouis/",
license="LGPLv2.2",
classifiers=classifiers,
- version=louis.version().split(',')[0].split('-',1)[-1],
+ version='@VERSION@',
packages=["louis"])

View file

@ -1,14 +0,0 @@
Fixed by https://github.com/liblouis/liblouis/pull/324
which has been merged upstream.
diff --git tools/brl_checks.c tools/brl_checks.c
index c125ed5b..0ef2f808 100644
--- tools/brl_checks.c
+++ tools/brl_checks.c
@@ -13,6 +13,7 @@ are permitted in any medium without royalty provided the copyright
notice and this notice are preserved. This file is offered as-is,
without any warranty. */
+#include <config.h>
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>

View file

@ -1,6 +1,6 @@
# Template file for 'liblouis'
pkgname=liblouis
version=3.1.0
version=3.2.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config help2man python3-devel"
@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-3"
homepage="http://liblouis.org/"
distfiles="https://github.com/$pkgname/$pkgname/releases/download/v$version/$pkgname-$version.tar.gz"
checksum=2132930503b580ecb75b57105db5dbc2fbdae4341ae749e6a432910a3b33ff1c
checksum=c07d8232959bbe4f4a1bdc597a6aa228753526b47f2064bd119754da6cfd6f85
pycompile_module='louis'
# See my commentary in patches/crosspython.patch