packages/libdmtx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!3 [sync] PR-2: update for 0.7.7-1

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
This commit is contained in:
openeuler-ci-bot 2023-08-31 01:32:17 +00:00 committed by Gitee
commit 44d1310ff8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 7 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libdmtx-0.7.5-c99.patch
View File

@ -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

11
libdmtx-0.7.5-math.patch
View File

@ -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 <stdio.h>
#include <string.h>
#include <assert.h>
+#include <math.h>
#include <dmtx.h>
int

29
libdmtx-0.7.5-size_t.patch
View File

@ -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; i<width*height; i++){
fprintf(stdout, "%d", (pxl[i*3])==0);
@@ -81,9 +81,9 @@ main(int argc, char *argv[])
if(reg != NULL) {
msg = dmtxDecodeMatrixRegion(dec, reg, DmtxUndefined);
- fprintf(stdout, "msg->arraySize : \"%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; i<msg->arraySize; i++){
fprintf(stdout, " %c.", msg->array[i]);

BIN
libdmtx-0.7.5.tar.gz
View File

Binary file not shown.

BIN
libdmtx-0.7.7.tar.gz Normal file
View File

Binary file not shown.

27
libdmtx.spec
View File

@ -1,24 +1,15 @@
Name: libdmtx
Version: 0.7.5
Version: 0.7.7
Release: 1
Summary: Library for working with Data Matrix 2D bar-codes
License: BSD
License: BSD-2-Clause-Views
URL: https://github.com/dmtx
Source0: https://github.com/dmtx/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
# https://github.com/dmtx/libdmtx/pull/13
Patch0: libdmtx-0.7.5-c99.patch
# https://github.com/dmtx/libdmtx/pull/14
Patch1: libdmtx-0.7.5-size_t.patch
# https://github.com/dmtx/libdmtx/pull/12
Patch2: libdmtx-0.7.5-math.patch
BuildRequires: gcc
BuildRequires: libtool
BuildRequires: make
Obsoletes: php-libdmtx < 0.7.4
Obsoletes: python-libdmtx < 0.7.4
Obsoletes: ruby-libdmtx < 0.7.4
%description
@ -27,12 +18,6 @@ bar-codes on Linux, Unix, OS X, Windows, and mobile devices. At its core
libdmtx is a shared library, allowing C/C++ programs to use its capabilities
without restrictions or overhead.
The included utility programs, dmtxread and dmtxwrite, provide the official
interface to libdmtx from the command line, and also serve as a good reference
for programmers who wish to write their own programs that interact with
libdmtx. All of the software in the libdmtx package is distributed under
the LGPLv2 and can be used freely under these terms.
%package devel
Summary: Development files for %{name}
@ -51,14 +36,13 @@ developing applications that use %{name}.
%build
%configure --disable-static
make %{?_smp_mflags}
%make_build
%install
make install DESTDIR=$RPM_BUILD_ROOT
%make_install
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%check
make check
pushd test
@ -83,5 +67,8 @@ popd
%changelog
* Mon Aug 21 2023 huayadong <huayadong@kylinos.cn> - 0.7.7-1
- update for 0.7.7-1
* Thu Jul 14 2022 misaka00251 <misaka00251@misakanet.cn> - 0.7.5-1
- Init package