commit 7b380484499b9ef1fe74a55fdd18270e4a64d513
Author: Jakub Bogusz <[email protected]>
Date: Thu Aug 31 22:03:58 2023 +0200
- added ptr patch (fixes pointer-related build errors with recent gcc)
icc_examin-ptr.patch | 17 +++++++++++++++++
icc_examin.spec | 6 ++++--
2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/icc_examin.spec b/icc_examin.spec
index 1c46cb5..9e15ae1 100644
--- a/icc_examin.spec
+++ b/icc_examin.spec
@@ -15,6 +15,7 @@ Source0:
https://github.com/oyranos-cms/icc-examin/archive/%{version}/icc-examin
Patch0: %{name}-configure.patch
Patch1: %{name}-paths.patch
Patch2: %{name}-pld.patch
+Patch3: %{name}-ptr.patch
#URL: http://www.oyranos.org/icc-examin
URL: https://github.com/oyranos-cms/icc-examin
BuildRequires: OpenGL-GLU-devel
@@ -28,7 +29,7 @@ BuildRequires: lcms-devel >= 1.14
BuildRequires: libXcm-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
-BuildRequires: oyranos-devel >= 0.9.5
+BuildRequires: oyranos-devel >= 0.9.6
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXinerama-devel
BuildRequires: xorg-lib-libXxf86vm-devel
@@ -37,7 +38,7 @@ Requires: fltk >= 1.1.4
Requires: fonts-TTF-DejaVu
Requires: ftgl >= 2.1.2
Requires: lcms >= 1.14
-Requires: oyranos-libs >= 0.9.5
+Requires: oyranos-libs >= 0.9.6
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -55,6 +56,7 @@ tablic gamma kart graficznych.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
export CC="%{__cc}"
diff --git a/icc_examin-ptr.patch b/icc_examin-ptr.patch
new file mode 100644
index 0000000..de25db2
--- /dev/null
+++ b/icc_examin-ptr.patch
@@ -0,0 +1,17 @@
+--- icc-examin-0.56/icc_profile_tags.cpp.orig 2016-12-09 23:50:43.000000000
+0100
++++ icc-examin-0.56/icc_profile_tags.cpp 2023-08-31 21:54:14.201770620
+0200
+@@ -349,12 +349,12 @@ ICCtag::getText (std
+ # ifdef DEBUG_ICCTAG
+ DBG_NUM_S ((int)strchr(txt, 13))
+ # endif
+- while (strchr(txt, 13) > 0) { // \r 013 0x0d
++ while (strchr(txt, 13) != NULL) { // \r 013 0x0d
+ pos = strchr(txt, 13);
+ # ifdef DEBUG_ICCTAG
+ //cout << (int)pos << " "; DBG
+ # endif
+- if (pos > 0) {
++ if (pos != NULL) {
+ if (*(pos+1) == '\n')
+ *pos = ' ';
+ else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/icc_examin.git/commitdiff/7b380484499b9ef1fe74a55fdd18270e4a64d513
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
