Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (118c3a8bcd26f6e17b6c4655cc10c63654d07895)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (118c3a8bcd26f6e17b6c4655cc10c63654d07895)
  • Date: Wed, 7 Jul 2021 19:08:05 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

ChangeLog | 3 +++
graphics/tesseract/DETAILS | 6 +++---
graphics/tesseract/HISTORY | 4 ++++
graphics/tesseract/PRE_BUILD | 1 +
graphics/tesseract/patches/fix-missing-includes.patch | 14 ++++++++++++++
libs/libnfc/BUILD | 2 ++
libs/libnfc/DETAILS | 16 ++++++++--------
libs/libnfc/HISTORY | 6 ++++++
libs/libnfc/PRE_BUILD | 5 +++--
libs/libnfc/patches/fix-musl.patch | 12 ++++++++++++
python-pypi/djvubind/DEPENDS | 8 ++++++++
python-pypi/djvubind/DETAILS | 15 +++++++++++++++
python-pypi/djvubind/HISTORY | 2 ++
13 files changed, 81 insertions(+), 13 deletions(-)

New commits:
commit 118c3a8bcd26f6e17b6c4655cc10c63654d07895
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

djvubind: new spell, Simple tool to create djvu files

commit a33b84625a084aeace26063b2fd2a25a7dd6cb92
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

tesseract: Fix build against musl

commit 249ee16a7e6d77dc241c5b45c0de9140b60b3add
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

tesseract: Fix checksum for traineddata files (fra, ita, spa)

commit 3841df9b3d266ca7ec174fa73f7ddef24bb95812
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libnfc 1.8.0

diff --git a/ChangeLog b/ChangeLog
index c81867e..f51ccda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2021-07-07 Ismael Luceno <ismael AT sourcemage.org>
+ * python-pypi/djvubind: new spell, Simple tool to create djvu files
+
2021-07-07 Treeve Jelbert <treeve AT sourcemage.org>
* accounts, groups: added account data for seatd

diff --git a/graphics/tesseract/DETAILS b/graphics/tesseract/DETAILS
index 45964fb..f7d6dd4 100755
--- a/graphics/tesseract/DETAILS
+++ b/graphics/tesseract/DETAILS
@@ -18,12 +18,12 @@ for LL in $TESS_LANG; do
fra)
SOURCE3=$LL.traineddata-$LANGVER
SOURCE3_URL[0]=$DAT/$LL.traineddata
-
SOURCE3_HASH=sha512:d617f5c5b826640b2871dbe3d7973bcc5e66fafd837921a20e009d683806ed50f0f258aa455019d99fc54f5cb65c2fa0380e3a3c92b39ab0684b8799c730b09d
+
SOURCE3_HASH=sha512:ecf1ded66b3e5c903161377903b5a693ea8221b155ac61fa88b0e2ba1fdb34cce8d8e6d0270a45ed822baa012d7d24ee15c6032a31b62d9b773106e39bd18603
;;
ita)
SOURCE4=$LL.traineddata-$LANGVER
SOURCE4_URL[0]=$DAT/$LL.traineddata
-
SOURCE4_HASH=sha512:d617f5c5b826640b2871dbe3d7973bcc5e66fafd837921a20e009d683806ed50f0f258aa455019d99fc54f5cb65c2fa0380e3a3c92b39ab0684b8799c730b09d
+
SOURCE4_HASH=sha512:0e32802292edb6bde1300a28af43e720e8cd6ea28e236865b01f8f5ff7b2e04b88d5d1ff2c32bf4fe20691c01aee4e524411c4cabb612e881e7573dc836ed0e6
;;
nld)
SOURCE5=$LL.traineddata-$LANGVER
@@ -33,7 +33,7 @@ for LL in $TESS_LANG; do
spa)
SOURCE6=$LL.traineddata-$LANGVER
SOURCE6_URL[0]=$DAT/$LL.traineddata
-
SOURCE6_HASH=sha512:d617f5c5b826640b2871dbe3d7973bcc5e66fafd837921a20e009d683806ed50f0f258aa455019d99fc54f5cb65c2fa0380e3a3c92b39ab0684b8799c730b09d
+
SOURCE6_HASH=sha512:5d009401faa71d3a8e9c4ff32dd1efc5e38c02b8c4170653ebb33874e6c489f7556c67ce6ca7cee27500496f657cf4361314563576176ff5e545b8079722bb8f
;;
deu)
SOURCE7=$LL.traineddata-$LANGVER
diff --git a/graphics/tesseract/HISTORY b/graphics/tesseract/HISTORY
index 5773068..d82e161 100644
--- a/graphics/tesseract/HISTORY
+++ b/graphics/tesseract/HISTORY
@@ -1,3 +1,7 @@
+2021-07-07 Ismael Luceno <ismael AT iodev.co.uk>
+ * DETAILS: fixed checksum for traineddata files (fra, ita, spa)
+ * PRE_BUILD, patches/fix-missing-includes.patch: fixed build against
musl
+
2019-12-30 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 4.1.1

diff --git a/graphics/tesseract/PRE_BUILD b/graphics/tesseract/PRE_BUILD
index 2b0e433..d5a08d8 100755
--- a/graphics/tesseract/PRE_BUILD
+++ b/graphics/tesseract/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches &&
mkdir -p tess-trained &&
cd tess-trained &&

diff --git a/graphics/tesseract/patches/fix-missing-includes.patch
b/graphics/tesseract/patches/fix-missing-includes.patch
new file mode 100644
index 0000000..daa82b6
--- /dev/null
+++ b/graphics/tesseract/patches/fix-missing-includes.patch
@@ -0,0 +1,14 @@
+Explicitly include sys/time.h for timeval on UNIX. Required on non-glibc
+systems.
+
+--- a/src/ccutil/ocrclass.h
++++ b/src/ccutil/ocrclass.h
+@@ -31,6 +31,8 @@
+ #ifdef _WIN32
+ #include <winsock2.h> // for timeval
++#else
++#include <sys/time.h> // for timeval
+ #endif
+
+ /**********************************************************************
+ * EANYCODE_CHAR
diff --git a/libs/libnfc/BUILD b/libs/libnfc/BUILD
new file mode 100755
index 0000000..0d39aba
--- /dev/null
+++ b/libs/libnfc/BUILD
@@ -0,0 +1,2 @@
+CFLAGS+=' -Du_int32_t=uint32_t' &&
+default_build
diff --git a/libs/libnfc/DETAILS b/libs/libnfc/DETAILS
index c9eadbc..77074d8 100755
--- a/libs/libnfc/DETAILS
+++ b/libs/libnfc/DETAILS
@@ -2,17 +2,17 @@
SPELL=libnfc
if [[ "$LIBNFC_BRANCH" == "scm" ]]; then
VERSION=$(get_scm_version)
- SOURCE=$SPELL-svn.tar.bz2
+ SOURCE=$SPELL-git.tar.bz2
FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn_http://libnfc.googlecode.com/svn/trunk:libnfc
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+ SOURCE_URL[0]=git://github.com/nfc-tools/$SPELL:$SPELL-git
SOURCE_IGNORE=volatile
else
- VERSION=1.3.3
- SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
-
SOURCE_HASH=sha512:7c6e9a26893d37e43f4e4d90ed21ed3857ed9e7869a169030daf7c90c7b27a428a9e1d8457f4aeb323caab24c7a9d9b59331e70a9b1316694449c81256199206
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ VERSION=1.8.0
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+
SOURCE_URL[0]=https://github.com/nfc-tools/$SPELL/releases/download/$SPELL-$VERSION/$SOURCE
+
SOURCE_HASH=sha512:aa8762ecb5b94167d20346f2c81491bb5b634bcedbf2aae3e2efdb301bca89ceb7c2e15148d0934fdc1cce6d77ee0225e28e84893232999fdc09d8a90ae2a7c5
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
WEB_SITE="http://www.libnfc.org";
LICENSE[0]=GPL
diff --git a/libs/libnfc/HISTORY b/libs/libnfc/HISTORY
index 36954cc..ee035c2 100644
--- a/libs/libnfc/HISTORY
+++ b/libs/libnfc/HISTORY
@@ -1,3 +1,8 @@
+2021-07-07 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS: updated spell to 1.8.0 (stable branch)
+ * PRE_BUILD, DETAILS: fixed scm branch
+ * PRE_BUILD, patches/fix-musl.patch: fixed build against musl
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version

@@ -6,6 +11,7 @@

2011-09-29 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2010-04-25 Florian Franzmann <bwlf AT bandrate.org>
* PRE_BUILD: use autoreconf instead of autogen.sh

diff --git a/libs/libnfc/PRE_BUILD b/libs/libnfc/PRE_BUILD
index c9178a1..c3f11e9 100755
--- a/libs/libnfc/PRE_BUILD
+++ b/libs/libnfc/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
-if [[ "$LIBNFC_SVN" == "y" ]]; then
- cd ${SOURCE_DIRECTORY} &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+if [[ "$LIBNFC_BRANCH" == "scm" ]]; then
autoreconf -vis
fi
diff --git a/libs/libnfc/patches/fix-musl.patch
b/libs/libnfc/patches/fix-musl.patch
new file mode 100644
index 0000000..6d5858d
--- /dev/null
+++ b/libs/libnfc/patches/fix-musl.patch
@@ -0,0 +1,12 @@
+Origin: Void Linux
+
+--- a/libnfc/buses/spi.c 2015-09-02 23:53:39.609374047 +0200
++++ b/libnfc/buses/spi.c 2015-09-02 23:53:44.994373644 +0200
+@@ -51,6 +51,7 @@
+ #include <stdio.h>
+ #include <termios.h>
+ #include <unistd.h>
++#include <asm/ioctl.h>
+
+ #include <nfc/nfc.h>
+ #include "nfc-internal.h"
diff --git a/python-pypi/djvubind/DEPENDS b/python-pypi/djvubind/DEPENDS
new file mode 100755
index 0000000..d30fa8e
--- /dev/null
+++ b/python-pypi/djvubind/DEPENDS
@@ -0,0 +1,8 @@
+depends python3 &&
+depends djvulibre &&
+depends imagemagick &&
+depends tesseract &&
+optional_depends minidjvu \
+ "" \
+ "" \
+ "for better bitonal image compression"
diff --git a/python-pypi/djvubind/DETAILS b/python-pypi/djvubind/DETAILS
new file mode 100755
index 0000000..d435f60
--- /dev/null
+++ b/python-pypi/djvubind/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=djvubind
+ VERSION=1.2.1
+ SOURCE="$SPELL-$VERSION.tar.gz"
+ WEB_SITE="https://github.com/strider1551/djvubind";
+ SOURCE_URL[0]="$WEB_SITE/archive/refs/tags/v$VERSION.tar.gz"
+
SOURCE_HASH=sha512:551180d071667dfba7217ed1940aaba6a8049f317e3be4e33972d964fb006b520b3ce5fd21e3b072538440f029f502db0a212062947200c0161a39ccc5933e5d
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ LICENSE[0]="GPL-3.0"
+ ENTERED=20210707
+ KEYWORDS=""
+ SHORT="Simple tool to create djvu files"
+cat << EOF
+Combine multiple image files into an optimally compressed djvu file, with
+positional OCR, meta-data and bookmarks.
+EOF
diff --git a/python-pypi/djvubind/HISTORY b/python-pypi/djvubind/HISTORY
new file mode 100644
index 0000000..36165c2
--- /dev/null
+++ b/python-pypi/djvubind/HISTORY
@@ -0,0 +1,2 @@
+2021-07-07 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (118c3a8bcd26f6e17b6c4655cc10c63654d07895), Ismael Luceno, 07/07/2021

Archive powered by MHonArc 2.6.24.

Top of Page