jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dmtx-utils: update to 0.7.6.

Browse source
This commit is contained in:
maxice8 2019-01-14 23:42:32 -02:00 committed by maxice8
parent f81573fa32
commit 026cf3b073
4 changed files with 55 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
srcpkgs/dmtx-utils/patches/fix-compiler-warnings.patch Normal file
View file

@ -0,0 +1,30 @@
Description: kill compiler warnings
Author: Roberto Lumbreras <rover@debian.org>
Index: dmtx-utils-0.7.6/dmtxread/dmtxread.c
===================================================================
--- dmtxread/dmtxread.c 2018-08-09 08:08:03.657379018 +0200
+++ dmtxread/dmtxread.c 2018-08-09 08:08:03.649378973 +0200
@@ -724,7 +724,7 @@
int i, idx;
int row, rowCount;
int col, colCount;
- unsigned long totalCount;
+ size_t totalCount;
char **list;
list = MagickQueryFormats("*", &totalCount);
Index: dmtx-utils-0.7.6/dmtxwrite/dmtxwrite.c
===================================================================
--- dmtxwrite/dmtxwrite.c 2018-08-09 08:08:03.657379018 +0200
+++ dmtxwrite/dmtxwrite.c 2018-08-09 08:08:03.649378973 +0200
@@ -455,7 +455,7 @@
int i, idx;
int row, rowCount;
int col, colCount;
- unsigned long totalCount;
+ size_t totalCount;
char **list;
list = MagickQueryFormats("*", &totalCount);

109
srcpkgs/dmtx-utils/patches/imagemagick-7.patch
View file

@ -1,109 +0,0 @@
source: https://lab.nexedi.com/nexedi/slapos/commit/23a31a55d3041d79684175fdaa5d3eca3f1db7d8
diff -ur dmtx-utils-0.7.4.orig/configure.ac dmtx-utils-0.7.4/configure.ac
--- configure.ac 2011-06-03 07:13:10.000000000 +0200
+++ configure.ac 2016-05-06 22:56:23.129582472 +0200
@@ -60,7 +60,7 @@
fi
if test x$dmtxread = xyes -o x$dmtxwrite = xyes; then
- PKG_CHECK_MODULES(MAGICK, Wand >= 6.2.4, [], AC_MSG_ERROR([dmtxread/dmtxwrite requires Wand >= 6.2.4]))
+ PKG_CHECK_MODULES(MAGICK, MagickWand >= 6.2.4, [], AC_MSG_ERROR([dmtxread/dmtxwrite requires MagickWand >= 6.2.4]))
AC_SUBST(MAGICK_CFLAGS)
AC_SUBST(MAGICK_LIBS)
fi
diff -ur dmtx-utils-0.7.4.orig/configure dmtx-utils-0.7.4/configure
--- configure 2011-06-03 07:13:53.000000000 +0200
+++ configure 2016-05-06 22:56:40.641701426 +0200
@@ -11074,12 +11074,12 @@
pkg_cv_MAGICK_CFLAGS="$MAGICK_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Wand >= 6.2.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "Wand >= 6.2.4") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"MagickWand >= 6.2.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "MagickWand >= 6.2.4") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_MAGICK_CFLAGS=`$PKG_CONFIG --cflags "Wand >= 6.2.4" 2>/dev/null`
+ pkg_cv_MAGICK_CFLAGS=`$PKG_CONFIG --cflags "MagickWand >= 6.2.4" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -11090,12 +11090,12 @@
pkg_cv_MAGICK_LIBS="$MAGICK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Wand >= 6.2.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "Wand >= 6.2.4") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"MagickWand >= 6.2.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "MagickWand >= 6.2.4") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_MAGICK_LIBS=`$PKG_CONFIG --libs "Wand >= 6.2.4" 2>/dev/null`
+ pkg_cv_MAGICK_LIBS=`$PKG_CONFIG --libs "MagickWand >= 6.2.4" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -11115,18 +11115,18 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- MAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "Wand >= 6.2.4" 2>&1`
+ MAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "MagickWand >= 6.2.4" 2>&1`
else
- MAGICK_PKG_ERRORS=`$PKG_CONFIG --print-errors "Wand >= 6.2.4" 2>&1`
+ MAGICK_PKG_ERRORS=`$PKG_CONFIG --print-errors "MagickWand >= 6.2.4" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$MAGICK_PKG_ERRORS" >&5
- as_fn_error $? "dmtxread/dmtxwrite requires Wand >= 6.2.4" "$LINENO" 5
+ as_fn_error $? "dmtxread/dmtxwrite requires MagickWand >= 6.2.4" "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- as_fn_error $? "dmtxread/dmtxwrite requires Wand >= 6.2.4" "$LINENO" 5
+ as_fn_error $? "dmtxread/dmtxwrite requires MagickWand >= 6.2.4" "$LINENO" 5
else
MAGICK_CFLAGS=$pkg_cv_MAGICK_CFLAGS
MAGICK_LIBS=$pkg_cv_MAGICK_LIBS
diff -ur dmtx-utils-0.7.4.orig/dmtxread/dmtxread.c dmtx-utils-0.7.4/dmtxread/dmtxread.c
--- dmtxread/dmtxread.c 2011-06-03 07:13:10.000000000 +0200
+++ dmtxread/dmtxread.c 2016-05-06 23:17:08.190667778 +0200
@@ -114,7 +114,7 @@
}
/* Copy pixels to known format */
- success = MagickGetImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, pxl);
+ success = MagickExportImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, pxl);
if(success == MagickFalse || pxl == NULL) {
CleanupMagick(&wand, DmtxTrue);
FatalError(EX_OSERR, "malloc() error");
diff -ur dmtx-utils-0.7.4.orig/dmtxread/dmtxread.h dmtx-utils-0.7.4/dmtxread/dmtxread.h
--- dmtxread/dmtxread.h 2011-06-03 07:13:10.000000000 +0200
+++ dmtxread/dmtxread.h 2016-05-06 23:01:38.871722717 +0200
@@ -33,7 +33,7 @@
#include <math.h>
#include <stdarg.h>
#include <assert.h>
-#include <wand/magick-wand.h>
+#include <MagickWand/MagickWand.h>
#include <dmtx.h>
#include "../common/dmtxutil.h"
diff -ur dmtx-utils-0.7.4.orig/dmtxwrite/dmtxwrite.h dmtx-utils-0.7.4/dmtxwrite/dmtxwrite.h
--- dmtxwrite/dmtxwrite.h 2011-06-03 07:13:10.000000000 +0200
+++ dmtxwrite/dmtxwrite.h 2016-05-06 23:01:38.871722717 +0200
@@ -34,7 +34,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <assert.h>
-#include <wand/magick-wand.h>
+#include <MagickWand/MagickWand.h>
#include <dmtx.h>
#include "../common/dmtxutil.h"

17
srcpkgs/dmtx-utils/patches/pkg-config.patch Normal file
View file

@ -0,0 +1,17 @@
Description: fix lintian autotools-pkg-config-macro-not-cross-compilation-safe
Author: Roberto Lumbreras <rover@debian.org>
Index: dmtx-utils-0.7.6/configure.ac
===================================================================
--- configure.ac 2018-08-08 19:49:08.880725473 +0200
+++ configure.ac 2018-08-08 19:49:08.872725433 +0200
@@ -6,7 +6,7 @@
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([Makefile])
-AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
+PKG_PROG_PKG_CONFIG([PKG_CONFIG], [pkg-config], [no])
AC_PROG_CC
AC_PROG_LIBTOOL

16
srcpkgs/dmtx-utils/template
View file

@ -1,17 +1,17 @@
# Template file for 'dmtx-utils'
pkgname=dmtx-utils
version=0.7.4
revision=10
version=0.7.6
revision=1
build_style=gnu-configure
maintainer="Orphaned <orphan@voidlinux.org>"
hostmakedepends="automake libtool pkg-config"
makedepends="libdmtx-devel libmagick-devel libXext-devel libxml2-devel"
license="LGPL-2.1-or-later"
homepage="http://www.libdmtx.org/"
short_desc="Command-line utilities for working with Data Matrix barcodes"
distfiles="$SOURCEFORGE_SITE/libdmtx/${pkgname}-${version}.tar.bz2"
checksum=9f510f6c26a2a73e44da28eae78308973cc274043873cc7f90606624066ec7d0
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/dmtx/dmtx-utils"
distfiles="https://github.com/dmtx/dmtx-utils/archive/v${version}/dmtx-utils-${version}.tar.gz"
checksum=0d396ec14f32a8cf9e08369a4122a16aa2e5fa1675e02218f16f1ab777ea2a28
pre_configure() {
autoreconf -if
autoreconf -fi
}