diff --git a/multimedia/graphics/libdmtx/actions.py b/multimedia/graphics/libdmtx/actions.py index ab4c6c0cd4..583909fb49 100644 --- a/multimedia/graphics/libdmtx/actions.py +++ b/multimedia/graphics/libdmtx/actions.py @@ -1,15 +1,15 @@ +#!/usr/bin/python # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt 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.autoreconf("-fiv") autotools.configure("--disable-static") def build(): @@ -21,4 +21,4 @@ def check(): def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.dodoc("AUTHORS", "NEWS", "README", "README.linux") + pisitools.dodoc("AUTHORS", "LICENSE") 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 deleted file mode 100644 index 1ccf17fc75..0000000000 --- a/multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-c99.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 deleted file mode 100644 index 41c755720f..0000000000 --- a/multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-math.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 6dc5fce4d1..0000000000 --- a/multimedia/graphics/libdmtx/files/fedora/libdmtx-0.7.5-size_t.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 74bca3e23e..f2a932579d 100644 --- a/multimedia/graphics/libdmtx/pspec.xml +++ b/multimedia/graphics/libdmtx/pspec.xml @@ -1,22 +1,20 @@ - + libdmtx - http://www.libdmtx.org + https://github.com/dmtx/libdmtx PisiLinux Community admins@pisilinux.org - LGPLv2+ + BSDv2 library - A Library for working with Data Matrix 2D bar-codes + 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. - https://github.com/dmtx/libdmtx/archive/v0.7.5.tar.gz + https://github.com/dmtx/libdmtx/archive/v0.7.7/libdmtx-0.7.7.tar.gz - fedora/libdmtx-0.7.5-c99.patch - fedora/libdmtx-0.7.5-math.patch - fedora/libdmtx-0.7.5-size_t.patch + @@ -24,7 +22,7 @@ libdmtx /usr/lib - /usr/share/doc + /usr/share @@ -37,11 +35,17 @@ /usr/include /usr/lib/pkgconfig - /usr/share/man/man3 + + 2025-02-10 + 0.7.7 + Version bump. + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + 2020-03-06 0.7.5