Accepting request 1157339 from home:ateixeira:branches:multimedia:color_management

- Fix build with gcc14 (bsc#1221304)
  * Add ajam-gcc14.patch
- Reformat ajam-include.patch with a/b prefixes
- Use %autosetup

OBS-URL: https://build.opensuse.org/request/show/1157339
OBS-URL: https://build.opensuse.org/package/show/multimedia:color_management/argyllcms?expand=0&rev=64

ajam-gcc14.patch

@@ -0,0 +1,25 @@
+Index: b/ajam-2.5.2-1.3.3/mkjambase.c
+===================================================================
+--- a/ajam-2.5.2-1.3.3/mkjambase.c
++++ b/ajam-2.5.2-1.3.3/mkjambase.c
+@@ -24,6 +24,7 @@
+ # include <stdio.h>
+ # include <string.h>
+ 
++int
+ main( int argc, char **argv, char **envp )
+ {
+ 	char buf[ 1024 ];
+Index: b/ajam-2.5.2-1.3.3/execunix.c
+===================================================================
+--- a/ajam-2.5.2-1.3.3/execunix.c
++++ b/ajam-2.5.2-1.3.3/execunix.c
+@@ -106,7 +106,7 @@ execcmd(
+ {
+ 	int pid;
+ 	int slot;
+-	const char *argv[ MAXARGC + 1 ];	/* +1 for NULL */
++	char * argv[ MAXARGC + 1 ];	/* +1 for NULL */
+ 
+ # ifdef USE_EXECNT
+ 	char *p;

ajam-include.patch

@@ -1,6 +1,7 @@
-diff -up ajam-2.5.2-1.3.3/execunix.c.include ajam-2.5.2-1.3.3/execunix.c
---- ajam-2.5.2-1.3.3/execunix.c.include	2012-06-22 17:53:16.769405802 +0200
-+++ ajam-2.5.2-1.3.3/execunix.c	2012-06-22 17:59:09.697662990 +0200
+Index: b/ajam-2.5.2-1.3.3/execunix.c
+===================================================================
+--- a/ajam-2.5.2-1.3.3/execunix.c
++++ b/ajam-2.5.2-1.3.3/execunix.c
 @@ -42,6 +42,10 @@
  # include "lists.h"
  # include "execcmd.h"
@@ -12,9 +13,10 @@ diff -up ajam-2.5.2-1.3.3/execunix.c.include ajam-2.5.2-1.3.3/execunix.c
  
  # ifdef USE_EXECUNIX
  
-diff -up ajam-2.5.2-1.3.3/fileunix.c.include ajam-2.5.2-1.3.3/fileunix.c
---- ajam-2.5.2-1.3.3/fileunix.c.include	2012-06-22 17:53:56.998694847 +0200
-+++ ajam-2.5.2-1.3.3/fileunix.c	2012-06-22 17:54:41.828845967 +0200
+Index: b/ajam-2.5.2-1.3.3/fileunix.c
+===================================================================
+--- a/ajam-2.5.2-1.3.3/fileunix.c
++++ b/ajam-2.5.2-1.3.3/fileunix.c
 @@ -51,12 +51,12 @@
  #   include <sys/stat.h>
  # endif
@@ -29,9 +31,10 @@ diff -up ajam-2.5.2-1.3.3/fileunix.c.include ajam-2.5.2-1.3.3/fileunix.c
  # define STRUCT_DIRENT struct direct 
  # else
  # include <dirent.h>
-diff -up ajam-2.5.2-1.3.3/make1.c.include ajam-2.5.2-1.3.3/make1.c
---- ajam-2.5.2-1.3.3/make1.c.include	2012-06-22 17:59:36.178959199 +0200
-+++ ajam-2.5.2-1.3.3/make1.c	2012-06-22 18:00:04.299195472 +0200
+Index: b/ajam-2.5.2-1.3.3/make1.c
+===================================================================
+--- a/ajam-2.5.2-1.3.3/make1.c
++++ b/ajam-2.5.2-1.3.3/make1.c
 @@ -50,6 +50,7 @@
   */
  

argyllcms.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Mar 12 20:30:35 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
+
+- Fix build with gcc14 (bsc#1221304)
+  * Add ajam-gcc14.patch
+- Reformat ajam-include.patch with a/b prefixes
+- Use %autosetup
+
 -------------------------------------------------------------------
 Tue Feb 20 10:51:32 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

argyllcms.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package argyllcms
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,6 +30,8 @@ Source1:        19-color.fdi
 Source2:        color-device-file.policy
 Source3:        ajam-2.5.2-1.3.3.tgz
 Patch1:         ajam-include.patch
+# PATCH-FIX-OPENSUSE bsc#1216357 -- Fix ajam build with gcc14
+Patch2:         ajam-gcc14.patch
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libtool
@@ -84,10 +86,7 @@ displays.
 This package contains the Argyll color management system documentation.
 
 %prep
-%setup -q -n %{tarname}_V%{version} -a3
-cd ajam-2.5.2-1.3.3
-%patch -P 1 -p1 -b .include
-cd ..
+%autosetup -n %{tarname}_V%{version} -a3 -p1
 
 # remove unused source code
 rm -fr usb/{*.inf,*.rtf,*.inf,*.cat,*.vcproj,*.sys,*.dsw,*.sln,*.dsp,*template*,WinCo*,winsub*,*kext*,KDRIVER_LICENSE,README_MSVC.txt,msvc,*.cmd,bin,driver,binfiles.*}