From ff9ab1d4a19de77feebd3760555122f7779450bc Mon Sep 17 00:00:00 2001 From: Rmys Date: Fri, 6 Mar 2020 22:46:49 +0300 Subject: [PATCH] libdmtx ver. bump --- multimedia/graphics/libdmtx/actions.py | 4 ++- .../files/fedora/libdmtx-0.7.5-c99.patch | 36 +++++++++++++++++++ .../files/fedora/libdmtx-0.7.5-math.patch | 11 ++++++ .../files/fedora/libdmtx-0.7.5-size_t.patch | 29 +++++++++++++++ multimedia/graphics/libdmtx/pspec.xml | 14 +++++++- 5 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-c99.patch create mode 100644 multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-math.patch create mode 100644 multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-size_t.patch diff --git a/multimedia/graphics/libdmtx/actions.py b/multimedia/graphics/libdmtx/actions.py index 13ddf68464..ab4c6c0cd4 100644 --- a/multimedia/graphics/libdmtx/actions.py +++ b/multimedia/graphics/libdmtx/actions.py @@ -5,9 +5,11 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools from pisi.actionsapi import get def setup(): + shelltools.system("sh ./autogen.sh") autotools.configure("--disable-static") def build(): @@ -19,4 +21,4 @@ def check(): def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.dodoc("AUTHORS", "NEWS", "README", "README.linux") \ No newline at end of file + pisitools.dodoc("AUTHORS", "NEWS", "README", "README.linux") diff --git a/multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-c99.patch b/multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-c99.patch new file mode 100644 index 0000000000..1ccf17fc75 --- /dev/null +++ b/multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-c99.patch @@ -0,0 +1,36 @@ +diff -up libdmtx-0.7.5/test/multi_test/Makefile.am.std libdmtx-0.7.5/test/multi_test/Makefile.am +--- libdmtx-0.7.5/test/multi_test/Makefile.am.std 2018-04-06 13:14:23.000000000 +0200 ++++ libdmtx-0.7.5/test/multi_test/Makefile.am 2018-04-06 13:14:27.000000000 +0200 +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi ++AM_CPPFLAGS = -Wshadow -Wall -pedantic -std=c99 + + check_PROGRAMS = multi_test + +diff -up libdmtx-0.7.5/test/rotate_test/Makefile.am.std libdmtx-0.7.5/test/rotate_test/Makefile.am +--- libdmtx-0.7.5/test/rotate_test/Makefile.am.std 2018-04-06 13:14:13.000000000 +0200 ++++ libdmtx-0.7.5/test/rotate_test/Makefile.am 2018-04-06 13:14:18.000000000 +0200 +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi ++AM_CPPFLAGS = -Wshadow -Wall -pedantic -std=c99 + + check_PROGRAMS = rotate_test + +diff -up libdmtx-0.7.5/test/simple_test/Makefile.am.std libdmtx-0.7.5/test/simple_test/Makefile.am +--- libdmtx-0.7.5/test/simple_test/Makefile.am.std 2018-04-06 13:13:59.000000000 +0200 ++++ libdmtx-0.7.5/test/simple_test/Makefile.am 2018-04-06 13:14:04.000000000 +0200 +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi ++AM_CPPFLAGS = -Wshadow -Wall -pedantic -std=c99 + + check_PROGRAMS = simple_test + +diff -up libdmtx-0.7.5/test/unit_test/Makefile.am.std libdmtx-0.7.5/test/unit_test/Makefile.am +--- libdmtx-0.7.5/test/unit_test/Makefile.am.std 2018-04-06 13:13:41.000000000 +0200 ++++ libdmtx-0.7.5/test/unit_test/Makefile.am 2018-04-06 13:13:53.000000000 +0200 +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi ++AM_CPPFLAGS = -Wshadow -Wall -pedantic -std=c99 + + check_PROGRAMS = unit_test + diff --git a/multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-math.patch b/multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-math.patch new file mode 100644 index 0000000000..41c755720f --- /dev/null +++ b/multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-math.patch @@ -0,0 +1,11 @@ +diff -up libdmtx-0.7.5/test/simple_test/simple_test.c.math libdmtx-0.7.5/test/simple_test/simple_test.c +--- libdmtx-0.7.5/test/simple_test/simple_test.c.math 2018-04-06 13:19:44.000000000 +0200 ++++ libdmtx-0.7.5/test/simple_test/simple_test.c 2018-04-06 13:19:52.000000000 +0200 +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + + int diff --git a/multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-size_t.patch b/multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-size_t.patch new file mode 100644 index 0000000000..6dc5fce4d1 --- /dev/null +++ b/multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-size_t.patch @@ -0,0 +1,29 @@ +diff -up libdmtx-0.7.5/test/simple_test/simple_test.c.size_t libdmtx-0.7.5/test/simple_test/simple_test.c +--- libdmtx-0.7.5/test/simple_test/simple_test.c.size_t 2018-04-06 13:16:35.000000000 +0200 ++++ libdmtx-0.7.5/test/simple_test/simple_test.c 2018-04-06 13:17:14.000000000 +0200 +@@ -58,9 +58,9 @@ main(int argc, char *argv[]) + + dmtxEncodeDestroy(&enc); + +- fprintf(stdout, "width: \"%d\"\n", width); +- fprintf(stdout, "height: \"%d\"\n", height); +- fprintf(stdout, "bpp: \"%d\"\n", bytesPerPixel); ++ fprintf(stdout, "width: \"%zd\"\n", width); ++ fprintf(stdout, "height: \"%zd\"\n", height); ++ fprintf(stdout, "bpp: \"%zd\"\n", bytesPerPixel); + + for (int i=0; iarraySize : \"%d\"\n", msg->arraySize ); +- fprintf(stdout, "msg->codeSize : \"%d\"\n", msg->codeSize ); +- fprintf(stdout, "msg->outputSize: \"%d\"\n", msg->outputSize); ++ fprintf(stdout, "msg->arraySize : \"%zd\"\n", msg->arraySize ); ++ fprintf(stdout, "msg->codeSize : \"%zd\"\n", msg->codeSize ); ++ fprintf(stdout, "msg->outputSize: \"%zd\"\n", msg->outputSize); + int oned = sqrt(msg->arraySize); + for (int i=0; iarraySize; i++){ + fprintf(stdout, " %c.", msg->array[i]); diff --git a/multimedia/graphics/libdmtx/pspec.xml b/multimedia/graphics/libdmtx/pspec.xml index 20fa105d65..74bca3e23e 100644 --- a/multimedia/graphics/libdmtx/pspec.xml +++ b/multimedia/graphics/libdmtx/pspec.xml @@ -12,7 +12,12 @@ library A Library for working with Data Matrix 2D bar-codes libdmtx is an open source software for reading and writing Data Matrix 2D bar-codes on Linux, Unix, OS X, Windows and mobile devices. - mirrors://sourceforge/libdmtx/libdmtx/0.7.4/libdmtx-0.7.4.tar.gz + https://github.com/dmtx/libdmtx/archive/v0.7.5.tar.gz + + fedora/libdmtx-0.7.5-c99.patch + fedora/libdmtx-0.7.5-math.patch + fedora/libdmtx-0.7.5-size_t.patch + @@ -37,6 +42,13 @@ + + 2020-03-06 + 0.7.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2018-08-11 0.7.4