1 |
commit: a784344d55a7d09e712ab99db3e92da1f94bc386 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 29 08:51:00 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 29 08:51:00 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a784344d |
7 |
|
8 |
app-cdr/cdrdao: Drop 1.2.3-r4 |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
app-cdr/cdrdao/Manifest | 1 - |
14 |
app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild | 64 ---- |
15 |
app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch | 418 --------------------- |
16 |
app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch | 12 - |
17 |
app-cdr/cdrdao/files/cdrdao-1.2.3-lame-3.100.patch | 24 -- |
18 |
.../cdrdao/files/cdrdao-1.2.3-unsigned-char.patch | 42 --- |
19 |
.../files/cdrdao-1.2.3-wformat-security.patch | 173 --------- |
20 |
7 files changed, 734 deletions(-) |
21 |
|
22 |
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest |
23 |
index 42faa5dac1c..69cebed78af 100644 |
24 |
--- a/app-cdr/cdrdao/Manifest |
25 |
+++ b/app-cdr/cdrdao/Manifest |
26 |
@@ -1,2 +1 @@ |
27 |
-DIST cdrdao-1.2.3.tar.bz2 1428695 BLAKE2B d5d8e9f2f17b4e4a385e226233d219afdf48fa98bade0dad57292ba45fc4f25c3bb146289884c9ad35224c26a826b305c6f8a1e43c22fe7f1cbd812f1a69790a SHA512 36b14180acf476de062f5f31e2b9dece39e3cc7a84552e80a6714931fa35d6090ec90ddfcdbd2651d690be8ce3fc78d483aa13856c3c311bcc2f571f0040adf6 |
28 |
DIST cdrdao-1.2.4.tar.bz2 1442181 BLAKE2B e1163b25c165a7acd7ec8c53069794724d93f09a486150255a58985e3fd0a222ba7ac5c124cb7a6991cf440ac701651be38754615fd3d0d295affa93595dc388 SHA512 41f20275ca44ec9003d0e3ed280cc98012353005cda6f544ebfa44f3f79f991845c0ef17af74db9456f1bacc342a7fd48c9e942d757927a4a9ff91808f7bbb09 |
29 |
|
30 |
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild |
31 |
deleted file mode 100644 |
32 |
index cc00a1346b4..00000000000 |
33 |
--- a/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,64 +0,0 @@ |
36 |
-# Copyright 1999-2018 Gentoo Foundation |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=6 |
40 |
- |
41 |
-inherit autotools flag-o-matic |
42 |
- |
43 |
-DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend" |
44 |
-HOMEPAGE="http://cdrdao.sourceforge.net/" |
45 |
-if [[ ${PV/*_rc*} ]] |
46 |
-then |
47 |
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
48 |
-else |
49 |
- SRC_URI="http://www.poolshark.org/src/${P/_}.tar.bz2" |
50 |
-fi |
51 |
- |
52 |
-LICENSE="GPL-2" |
53 |
-SLOT="0" |
54 |
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd" |
55 |
-IUSE="encode mad vorbis" |
56 |
- |
57 |
-COMMON_DEPEND=" |
58 |
- virtual/cdrtools |
59 |
- encode? ( >=media-sound/lame-3.99 ) |
60 |
- mad? ( |
61 |
- media-libs/libmad |
62 |
- media-libs/libao |
63 |
- ) |
64 |
- vorbis? ( |
65 |
- media-libs/libvorbis |
66 |
- media-libs/libao |
67 |
- )" |
68 |
-DEPEND="${COMMON_DEPEND} |
69 |
- virtual/pkgconfig" |
70 |
-RDEPEND="${COMMON_DEPEND} |
71 |
- !app-cdr/cue2toc |
72 |
- !dev-util/pccts" |
73 |
- |
74 |
-PATCHES=( |
75 |
- "${FILESDIR}/${P}-glibc212.patch" |
76 |
- "${FILESDIR}/${P}-unsigned-char.patch" |
77 |
- "${FILESDIR}/${P}-ax_pthread.patch" |
78 |
- "${FILESDIR}/${P}-wformat-security.patch" |
79 |
- "${FILESDIR}/${P}-lame-3.100.patch" |
80 |
-) |
81 |
- |
82 |
-S="${WORKDIR}/${P/_}" |
83 |
- |
84 |
-src_prepare() { |
85 |
- default |
86 |
- eautoreconf |
87 |
-} |
88 |
- |
89 |
-src_configure() { |
90 |
- # Fix building with latest libsigc++ |
91 |
- append-cxxflags -std=c++11 |
92 |
- find -name '*.h' -exec sed -i '/sigc++\/object.h/d' {} + || die |
93 |
- |
94 |
- econf \ |
95 |
- --without-xdao \ |
96 |
- $(use_with vorbis ogg-support) \ |
97 |
- $(use_with mad mp3-support) \ |
98 |
- $(use_with encode lame) |
99 |
-} |
100 |
|
101 |
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch |
102 |
deleted file mode 100644 |
103 |
index c20a73dd64a..00000000000 |
104 |
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch |
105 |
+++ /dev/null |
106 |
@@ -1,418 +0,0 @@ |
107 |
-Use AX_PTHREAD for finding proper pthread flags. Forcibly add these flags |
108 |
-to CFLAGS, CXXFLAGS and LIBS. |
109 |
-Also use AM_PROG_AR to detect proper ar |
110 |
-See also: https://bugs.gentoo.org/show_bug.cgi?id=548004 |
111 |
- |
112 |
---- cdrdao-1.2.3/configure.ac |
113 |
-+++ cdrdao-1.2.3/configure.ac |
114 |
-@@ -2,6 +2,7 @@ |
115 |
- AC_REVISION($Revision: 1.25 $)dnl |
116 |
- |
117 |
- AC_INIT(cdrdao, 1.2.3) |
118 |
-+AC_CONFIG_MACRO_DIR([m4]) |
119 |
- |
120 |
- AC_CONFIG_SRCDIR(dao/main.cc) |
121 |
- AM_INIT_AUTOMAKE |
122 |
-@@ -32,7 +33,7 @@ |
123 |
- AC_PROG_CPP |
124 |
- AC_PROG_INSTALL |
125 |
- AC_PROG_RANLIB |
126 |
--AC_CHECK_PROG(AR,ar,ar) |
127 |
-+AM_PROG_AR |
128 |
- AC_PROG_MAKE_SET |
129 |
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
130 |
- |
131 |
-@@ -113,7 +114,10 @@ |
132 |
- fi |
133 |
- |
134 |
- if test "$use_pthreads" = yes; then |
135 |
-- AC_CHECK_FUNC(pthread_create,have_pthread_std=yes,have_pthread_std=no) |
136 |
-+ AX_PTHREAD([have_pthread_std=yes],[have_pthread_std=no]) |
137 |
-+ LIBS="$PTHREAD_LIBS $PTHREAD_CFLAGS $LIBS" |
138 |
-+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" |
139 |
-+ CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" |
140 |
- |
141 |
- if test "$have_pthread_std" = yes; then |
142 |
- AC_DEFINE(USE_POSIX_THREADS,1,"") |
143 |
---- cdrdao-1.2.3/m4/ax_pthread.m4 |
144 |
-+++ cdrdao-1.2.3/m4/ax_pthread.m4 |
145 |
-@@ -0,0 +1,332 @@ |
146 |
-+# =========================================================================== |
147 |
-+# http://www.gnu.org/software/autoconf-archive/ax_pthread.html |
148 |
-+# =========================================================================== |
149 |
-+# |
150 |
-+# SYNOPSIS |
151 |
-+# |
152 |
-+# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) |
153 |
-+# |
154 |
-+# DESCRIPTION |
155 |
-+# |
156 |
-+# This macro figures out how to build C programs using POSIX threads. It |
157 |
-+# sets the PTHREAD_LIBS output variable to the threads library and linker |
158 |
-+# flags, and the PTHREAD_CFLAGS output variable to any special C compiler |
159 |
-+# flags that are needed. (The user can also force certain compiler |
160 |
-+# flags/libs to be tested by setting these environment variables.) |
161 |
-+# |
162 |
-+# Also sets PTHREAD_CC to any special C compiler that is needed for |
163 |
-+# multi-threaded programs (defaults to the value of CC otherwise). (This |
164 |
-+# is necessary on AIX to use the special cc_r compiler alias.) |
165 |
-+# |
166 |
-+# NOTE: You are assumed to not only compile your program with these flags, |
167 |
-+# but also link it with them as well. e.g. you should link with |
168 |
-+# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS |
169 |
-+# |
170 |
-+# If you are only building threads programs, you may wish to use these |
171 |
-+# variables in your default LIBS, CFLAGS, and CC: |
172 |
-+# |
173 |
-+# LIBS="$PTHREAD_LIBS $LIBS" |
174 |
-+# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" |
175 |
-+# CC="$PTHREAD_CC" |
176 |
-+# |
177 |
-+# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant |
178 |
-+# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name |
179 |
-+# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). |
180 |
-+# |
181 |
-+# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the |
182 |
-+# PTHREAD_PRIO_INHERIT symbol is defined when compiling with |
183 |
-+# PTHREAD_CFLAGS. |
184 |
-+# |
185 |
-+# ACTION-IF-FOUND is a list of shell commands to run if a threads library |
186 |
-+# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it |
187 |
-+# is not found. If ACTION-IF-FOUND is not specified, the default action |
188 |
-+# will define HAVE_PTHREAD. |
189 |
-+# |
190 |
-+# Please let the authors know if this macro fails on any platform, or if |
191 |
-+# you have any other suggestions or comments. This macro was based on work |
192 |
-+# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help |
193 |
-+# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by |
194 |
-+# Alejandro Forero Cuervo to the autoconf macro repository. We are also |
195 |
-+# grateful for the helpful feedback of numerous users. |
196 |
-+# |
197 |
-+# Updated for Autoconf 2.68 by Daniel Richard G. |
198 |
-+# |
199 |
-+# LICENSE |
200 |
-+# |
201 |
-+# Copyright (c) 2008 Steven G. Johnson <stevenj@××××××××.edu> |
202 |
-+# Copyright (c) 2011 Daniel Richard G. <skunk@××××××.ORG> |
203 |
-+# |
204 |
-+# This program is free software: you can redistribute it and/or modify it |
205 |
-+# under the terms of the GNU General Public License as published by the |
206 |
-+# Free Software Foundation, either version 3 of the License, or (at your |
207 |
-+# option) any later version. |
208 |
-+# |
209 |
-+# This program is distributed in the hope that it will be useful, but |
210 |
-+# WITHOUT ANY WARRANTY; without even the implied warranty of |
211 |
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
212 |
-+# Public License for more details. |
213 |
-+# |
214 |
-+# You should have received a copy of the GNU General Public License along |
215 |
-+# with this program. If not, see <http://www.gnu.org/licenses/>. |
216 |
-+# |
217 |
-+# As a special exception, the respective Autoconf Macro's copyright owner |
218 |
-+# gives unlimited permission to copy, distribute and modify the configure |
219 |
-+# scripts that are the output of Autoconf when processing the Macro. You |
220 |
-+# need not follow the terms of the GNU General Public License when using |
221 |
-+# or distributing such scripts, even though portions of the text of the |
222 |
-+# Macro appear in them. The GNU General Public License (GPL) does govern |
223 |
-+# all other use of the material that constitutes the Autoconf Macro. |
224 |
-+# |
225 |
-+# This special exception to the GPL applies to versions of the Autoconf |
226 |
-+# Macro released by the Autoconf Archive. When you make and distribute a |
227 |
-+# modified version of the Autoconf Macro, you may extend this special |
228 |
-+# exception to the GPL to apply to your modified version as well. |
229 |
-+ |
230 |
-+#serial 21 |
231 |
-+ |
232 |
-+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) |
233 |
-+AC_DEFUN([AX_PTHREAD], [ |
234 |
-+AC_REQUIRE([AC_CANONICAL_HOST]) |
235 |
-+AC_LANG_PUSH([C]) |
236 |
-+ax_pthread_ok=no |
237 |
-+ |
238 |
-+# We used to check for pthread.h first, but this fails if pthread.h |
239 |
-+# requires special compiler flags (e.g. on True64 or Sequent). |
240 |
-+# It gets checked for in the link test anyway. |
241 |
-+ |
242 |
-+# First of all, check if the user has set any of the PTHREAD_LIBS, |
243 |
-+# etcetera environment variables, and if threads linking works using |
244 |
-+# them: |
245 |
-+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then |
246 |
-+ save_CFLAGS="$CFLAGS" |
247 |
-+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" |
248 |
-+ save_LIBS="$LIBS" |
249 |
-+ LIBS="$PTHREAD_LIBS $LIBS" |
250 |
-+ AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) |
251 |
-+ AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes]) |
252 |
-+ AC_MSG_RESULT([$ax_pthread_ok]) |
253 |
-+ if test x"$ax_pthread_ok" = xno; then |
254 |
-+ PTHREAD_LIBS="" |
255 |
-+ PTHREAD_CFLAGS="" |
256 |
-+ fi |
257 |
-+ LIBS="$save_LIBS" |
258 |
-+ CFLAGS="$save_CFLAGS" |
259 |
-+fi |
260 |
-+ |
261 |
-+# We must check for the threads library under a number of different |
262 |
-+# names; the ordering is very important because some systems |
263 |
-+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the |
264 |
-+# libraries is broken (non-POSIX). |
265 |
-+ |
266 |
-+# Create a list of thread flags to try. Items starting with a "-" are |
267 |
-+# C compiler flags, and other items are library names, except for "none" |
268 |
-+# which indicates that we try without any flags at all, and "pthread-config" |
269 |
-+# which is a program returning the flags for the Pth emulation library. |
270 |
-+ |
271 |
-+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" |
272 |
-+ |
273 |
-+# The ordering *is* (sometimes) important. Some notes on the |
274 |
-+# individual items follow: |
275 |
-+ |
276 |
-+# pthreads: AIX (must check this before -lpthread) |
277 |
-+# none: in case threads are in libc; should be tried before -Kthread and |
278 |
-+# other compiler flags to prevent continual compiler warnings |
279 |
-+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) |
280 |
-+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) |
281 |
-+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) |
282 |
-+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) |
283 |
-+# -pthreads: Solaris/gcc |
284 |
-+# -mthreads: Mingw32/gcc, Lynx/gcc |
285 |
-+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it |
286 |
-+# doesn't hurt to check since this sometimes defines pthreads too; |
287 |
-+# also defines -D_REENTRANT) |
288 |
-+# ... -mt is also the pthreads flag for HP/aCC |
289 |
-+# pthread: Linux, etcetera |
290 |
-+# --thread-safe: KAI C++ |
291 |
-+# pthread-config: use pthread-config program (for GNU Pth library) |
292 |
-+ |
293 |
-+case ${host_os} in |
294 |
-+ solaris*) |
295 |
-+ |
296 |
-+ # On Solaris (at least, for some versions), libc contains stubbed |
297 |
-+ # (non-functional) versions of the pthreads routines, so link-based |
298 |
-+ # tests will erroneously succeed. (We need to link with -pthreads/-mt/ |
299 |
-+ # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather |
300 |
-+ # a function called by this macro, so we could check for that, but |
301 |
-+ # who knows whether they'll stub that too in a future libc.) So, |
302 |
-+ # we'll just look for -pthreads and -lpthread first: |
303 |
-+ |
304 |
-+ ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" |
305 |
-+ ;; |
306 |
-+ |
307 |
-+ darwin*) |
308 |
-+ ax_pthread_flags="-pthread $ax_pthread_flags" |
309 |
-+ ;; |
310 |
-+esac |
311 |
-+ |
312 |
-+# Clang doesn't consider unrecognized options an error unless we specify |
313 |
-+# -Werror. We throw in some extra Clang-specific options to ensure that |
314 |
-+# this doesn't happen for GCC, which also accepts -Werror. |
315 |
-+ |
316 |
-+AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags]) |
317 |
-+save_CFLAGS="$CFLAGS" |
318 |
-+ax_pthread_extra_flags="-Werror" |
319 |
-+CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument" |
320 |
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])], |
321 |
-+ [AC_MSG_RESULT([yes])], |
322 |
-+ [ax_pthread_extra_flags= |
323 |
-+ AC_MSG_RESULT([no])]) |
324 |
-+CFLAGS="$save_CFLAGS" |
325 |
-+ |
326 |
-+if test x"$ax_pthread_ok" = xno; then |
327 |
-+for flag in $ax_pthread_flags; do |
328 |
-+ |
329 |
-+ case $flag in |
330 |
-+ none) |
331 |
-+ AC_MSG_CHECKING([whether pthreads work without any flags]) |
332 |
-+ ;; |
333 |
-+ |
334 |
-+ -*) |
335 |
-+ AC_MSG_CHECKING([whether pthreads work with $flag]) |
336 |
-+ PTHREAD_CFLAGS="$flag" |
337 |
-+ ;; |
338 |
-+ |
339 |
-+ pthread-config) |
340 |
-+ AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no]) |
341 |
-+ if test x"$ax_pthread_config" = xno; then continue; fi |
342 |
-+ PTHREAD_CFLAGS="`pthread-config --cflags`" |
343 |
-+ PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" |
344 |
-+ ;; |
345 |
-+ |
346 |
-+ *) |
347 |
-+ AC_MSG_CHECKING([for the pthreads library -l$flag]) |
348 |
-+ PTHREAD_LIBS="-l$flag" |
349 |
-+ ;; |
350 |
-+ esac |
351 |
-+ |
352 |
-+ save_LIBS="$LIBS" |
353 |
-+ save_CFLAGS="$CFLAGS" |
354 |
-+ LIBS="$PTHREAD_LIBS $LIBS" |
355 |
-+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags" |
356 |
-+ |
357 |
-+ # Check for various functions. We must include pthread.h, |
358 |
-+ # since some functions may be macros. (On the Sequent, we |
359 |
-+ # need a special flag -Kthread to make this header compile.) |
360 |
-+ # We check for pthread_join because it is in -lpthread on IRIX |
361 |
-+ # while pthread_create is in libc. We check for pthread_attr_init |
362 |
-+ # due to DEC craziness with -lpthreads. We check for |
363 |
-+ # pthread_cleanup_push because it is one of the few pthread |
364 |
-+ # functions on Solaris that doesn't have a non-functional libc stub. |
365 |
-+ # We try pthread_create on general principles. |
366 |
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h> |
367 |
-+ static void routine(void *a) { a = 0; } |
368 |
-+ static void *start_routine(void *a) { return a; }], |
369 |
-+ [pthread_t th; pthread_attr_t attr; |
370 |
-+ pthread_create(&th, 0, start_routine, 0); |
371 |
-+ pthread_join(th, 0); |
372 |
-+ pthread_attr_init(&attr); |
373 |
-+ pthread_cleanup_push(routine, 0); |
374 |
-+ pthread_cleanup_pop(0) /* ; */])], |
375 |
-+ [ax_pthread_ok=yes], |
376 |
-+ []) |
377 |
-+ |
378 |
-+ LIBS="$save_LIBS" |
379 |
-+ CFLAGS="$save_CFLAGS" |
380 |
-+ |
381 |
-+ AC_MSG_RESULT([$ax_pthread_ok]) |
382 |
-+ if test "x$ax_pthread_ok" = xyes; then |
383 |
-+ break; |
384 |
-+ fi |
385 |
-+ |
386 |
-+ PTHREAD_LIBS="" |
387 |
-+ PTHREAD_CFLAGS="" |
388 |
-+done |
389 |
-+fi |
390 |
-+ |
391 |
-+# Various other checks: |
392 |
-+if test "x$ax_pthread_ok" = xyes; then |
393 |
-+ save_LIBS="$LIBS" |
394 |
-+ LIBS="$PTHREAD_LIBS $LIBS" |
395 |
-+ save_CFLAGS="$CFLAGS" |
396 |
-+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" |
397 |
-+ |
398 |
-+ # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. |
399 |
-+ AC_MSG_CHECKING([for joinable pthread attribute]) |
400 |
-+ attr_name=unknown |
401 |
-+ for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do |
402 |
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], |
403 |
-+ [int attr = $attr; return attr /* ; */])], |
404 |
-+ [attr_name=$attr; break], |
405 |
-+ []) |
406 |
-+ done |
407 |
-+ AC_MSG_RESULT([$attr_name]) |
408 |
-+ if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then |
409 |
-+ AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name], |
410 |
-+ [Define to necessary symbol if this constant |
411 |
-+ uses a non-standard name on your system.]) |
412 |
-+ fi |
413 |
-+ |
414 |
-+ AC_MSG_CHECKING([if more special flags are required for pthreads]) |
415 |
-+ flag=no |
416 |
-+ case ${host_os} in |
417 |
-+ aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; |
418 |
-+ osf* | hpux*) flag="-D_REENTRANT";; |
419 |
-+ solaris*) |
420 |
-+ if test "$GCC" = "yes"; then |
421 |
-+ flag="-D_REENTRANT" |
422 |
-+ else |
423 |
-+ # TODO: What about Clang on Solaris? |
424 |
-+ flag="-mt -D_REENTRANT" |
425 |
-+ fi |
426 |
-+ ;; |
427 |
-+ esac |
428 |
-+ AC_MSG_RESULT([$flag]) |
429 |
-+ if test "x$flag" != xno; then |
430 |
-+ PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" |
431 |
-+ fi |
432 |
-+ |
433 |
-+ AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], |
434 |
-+ [ax_cv_PTHREAD_PRIO_INHERIT], [ |
435 |
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], |
436 |
-+ [[int i = PTHREAD_PRIO_INHERIT;]])], |
437 |
-+ [ax_cv_PTHREAD_PRIO_INHERIT=yes], |
438 |
-+ [ax_cv_PTHREAD_PRIO_INHERIT=no]) |
439 |
-+ ]) |
440 |
-+ AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"], |
441 |
-+ [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])]) |
442 |
-+ |
443 |
-+ LIBS="$save_LIBS" |
444 |
-+ CFLAGS="$save_CFLAGS" |
445 |
-+ |
446 |
-+ # More AIX lossage: compile with *_r variant |
447 |
-+ if test "x$GCC" != xyes; then |
448 |
-+ case $host_os in |
449 |
-+ aix*) |
450 |
-+ AS_CASE(["x/$CC"], |
451 |
-+ [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], |
452 |
-+ [#handle absolute path differently from PATH based program lookup |
453 |
-+ AS_CASE(["x$CC"], |
454 |
-+ [x/*], |
455 |
-+ [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], |
456 |
-+ [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) |
457 |
-+ ;; |
458 |
-+ esac |
459 |
-+ fi |
460 |
-+fi |
461 |
-+ |
462 |
-+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" |
463 |
-+ |
464 |
-+AC_SUBST([PTHREAD_LIBS]) |
465 |
-+AC_SUBST([PTHREAD_CFLAGS]) |
466 |
-+AC_SUBST([PTHREAD_CC]) |
467 |
-+ |
468 |
-+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: |
469 |
-+if test x"$ax_pthread_ok" = xyes; then |
470 |
-+ ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1]) |
471 |
-+ : |
472 |
-+else |
473 |
-+ ax_pthread_ok=no |
474 |
-+ $2 |
475 |
-+fi |
476 |
-+AC_LANG_POP |
477 |
-+])dnl AX_PTHREAD |
478 |
---- cdrdao-1.2.3/m4/gconf-2.m4 |
479 |
-+++ cdrdao-1.2.3/m4/gconf-2.m4 |
480 |
-@@ -0,0 +1,44 @@ |
481 |
-+dnl AM_GCONF_SOURCE_2 |
482 |
-+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas |
483 |
-+dnl (i.e. pass to gconftool-2 |
484 |
-+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where |
485 |
-+dnl you should install foo.schemas files |
486 |
-+dnl |
487 |
-+ |
488 |
-+AC_DEFUN([AM_GCONF_SOURCE_2], |
489 |
-+[ |
490 |
-+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then |
491 |
-+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` |
492 |
-+ else |
493 |
-+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE |
494 |
-+ fi |
495 |
-+ |
496 |
-+ AC_ARG_WITH([gconf-source], |
497 |
-+ AC_HELP_STRING([--with-gconf-source=sourceaddress], |
498 |
-+ [Config database for installing schema files.]), |
499 |
-+ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) |
500 |
-+ |
501 |
-+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) |
502 |
-+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) |
503 |
-+ |
504 |
-+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then |
505 |
-+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' |
506 |
-+ fi |
507 |
-+ |
508 |
-+ AC_ARG_WITH([gconf-schema-file-dir], |
509 |
-+ AC_HELP_STRING([--with-gconf-schema-file-dir=dir], |
510 |
-+ [Directory for installing schema files.]), |
511 |
-+ [GCONF_SCHEMA_FILE_DIR="$withval"],) |
512 |
-+ |
513 |
-+ AC_SUBST(GCONF_SCHEMA_FILE_DIR) |
514 |
-+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) |
515 |
-+ |
516 |
-+ AC_ARG_ENABLE(schemas-install, |
517 |
-+ AC_HELP_STRING([--disable-schemas-install], |
518 |
-+ [Disable the schemas installation]), |
519 |
-+ [case ${enableval} in |
520 |
-+ yes|no) ;; |
521 |
-+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; |
522 |
-+ esac]) |
523 |
-+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) |
524 |
-+]) |
525 |
|
526 |
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch |
527 |
deleted file mode 100644 |
528 |
index c37fd5d0c37..00000000000 |
529 |
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch |
530 |
+++ /dev/null |
531 |
@@ -1,12 +0,0 @@ |
532 |
-http://bugs.gentoo.org/332237 |
533 |
- |
534 |
---- cdrdao-1.2.3/dao/ScsiIf-linux.cc |
535 |
-+++ cdrdao-1.2.3/dao/ScsiIf-linux.cc |
536 |
-@@ -30,6 +30,7 @@ |
537 |
- #include <asm/param.h> |
538 |
- #include <scsi/scsi.h> |
539 |
- #include <scsi/sg.h> |
540 |
-+#include <sys/stat.h> |
541 |
- |
542 |
- #include "ScsiIf.h" |
543 |
- #include "sg_err.h" |
544 |
|
545 |
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-lame-3.100.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-lame-3.100.patch |
546 |
deleted file mode 100644 |
547 |
index c712de2394c..00000000000 |
548 |
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-lame-3.100.patch |
549 |
+++ /dev/null |
550 |
@@ -1,24 +0,0 @@ |
551 |
---- a/utils/toc2mp3.cc |
552 |
-+++ b/utils/toc2mp3.cc |
553 |
-@@ -143,8 +143,8 @@ |
554 |
- |
555 |
- message(0, "LAME encoder version: %s", get_lame_version()); |
556 |
- message(0, "Supported bit rates: "); |
557 |
-- for (int i = 0; i < 16 && bitrate_table[1][i] >= 0; i++) { |
558 |
-- message(0, "%d ", bitrate_table[1][i]); |
559 |
-+ for (int i = 0; i < 16 && lame_get_bitrate(1, i) >= 0; i++) { |
560 |
-+ message(0, "%d ", lame_get_bitrate(1, i)); |
561 |
- } |
562 |
- message(0, ""); |
563 |
- } |
564 |
-@@ -238,8 +238,8 @@ |
565 |
- lame_global_flags *lf; |
566 |
- int bitrateOk = 0; |
567 |
- |
568 |
-- for (int i = 0; bitrate_table[1][i] >= 0 && !bitrateOk; i++) { |
569 |
-- if (bitrate == bitrate_table[1][i]) |
570 |
-+ for (int i = 0; lame_get_bitrate(1, i) >= 0 && !bitrateOk; i++) { |
571 |
-+ if (bitrate == lame_get_bitrate(1, i)) |
572 |
- bitrateOk = 1; |
573 |
- } |
574 |
- |
575 |
|
576 |
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-unsigned-char.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-unsigned-char.patch |
577 |
deleted file mode 100644 |
578 |
index 18c60830ba3..00000000000 |
579 |
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-unsigned-char.patch |
580 |
+++ /dev/null |
581 |
@@ -1,42 +0,0 @@ |
582 |
-https://bugs.gentoo.org/69344 |
583 |
-https://sourceforge.net/p/cdrdao/patches/26/ |
584 |
- |
585 |
-patch by qbt937@×××××.com |
586 |
- |
587 |
---- a/dao/CdrDriver.cc |
588 |
-+++ b/dao/CdrDriver.cc |
589 |
-@@ -495,7 +495,7 @@ |
590 |
- 0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0 |
591 |
- }; |
592 |
- |
593 |
--char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 }; |
594 |
-+unsigned char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 }; |
595 |
- |
596 |
- |
597 |
- /* Maps a string to the corresponding driver option value |
598 |
---- a/dao/CdrDriver.h |
599 |
-+++ b/dao/CdrDriver.h |
600 |
-@@ -440,7 +440,7 @@ |
601 |
- bool fullBurn_; |
602 |
- |
603 |
- static unsigned char syncPattern[12]; |
604 |
-- static char REMOTE_MSG_SYNC_[4]; |
605 |
-+ unsigned static char REMOTE_MSG_SYNC_[4]; |
606 |
- |
607 |
- static int speed2Mult(int); |
608 |
- static int mult2Speed(int); |
609 |
---- a/xdao/CdDevice.cc |
610 |
-+++ b/xdao/CdDevice.cc |
611 |
-@@ -255,10 +255,10 @@ |
612 |
- |
613 |
- bool CdDevice::updateProgress(Glib::IOCondition cond, int fd) |
614 |
- { |
615 |
-- static char msgSync[4] = { 0xff, 0x00, 0xff, 0x00 }; |
616 |
-+ unsigned static char msgSync[4] = { 0xff, 0x00, 0xff, 0x00 }; |
617 |
- fd_set fds; |
618 |
- int state = 0; |
619 |
-- char buf[10]; |
620 |
-+ unsigned char buf[10]; |
621 |
- struct timeval timeout = { 0, 0 }; |
622 |
- |
623 |
- if (process_ == NULL) |
624 |
|
625 |
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-wformat-security.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-wformat-security.patch |
626 |
deleted file mode 100644 |
627 |
index c5cfad840c1..00000000000 |
628 |
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-wformat-security.patch |
629 |
+++ /dev/null |
630 |
@@ -1,173 +0,0 @@ |
631 |
-Fix -Werror=format-security errors |
632 |
-Also fix incorrect printf() format specifiers |
633 |
-https://bugs.gentoo.org/show_bug.cgi?id=520988 |
634 |
- |
635 |
-* gen.c: In function 'genHdr': |
636 |
-* gen.c:3869:17: error: format not a string literal and no format arguments [-Werror=format-security] |
637 |
- |
638 |
---- cdrdao-1.2.3/pccts/antlr/bits.c |
639 |
-+++ cdrdao-1.2.3/pccts/antlr/bits.c |
640 |
-@@ -574,13 +574,13 @@ |
641 |
- else |
642 |
- fprintf(DefFile, "extern SetWordType zzerr%d[];\n", esetnum); |
643 |
- if ( name!=NULL ) { |
644 |
-- fprintf(ErrFile, "SetWordType %s%s[%d] = {", |
645 |
-+ fprintf(ErrFile, "SetWordType %s%s[%lu] = {", |
646 |
- name, |
647 |
- suffix, |
648 |
- NumWords(TokenNum-1)*sizeof(unsigned)); |
649 |
- } |
650 |
- else { |
651 |
-- fprintf(ErrFile, "SetWordType zzerr%d[%d] = {", |
652 |
-+ fprintf(ErrFile, "SetWordType zzerr%d[%lu] = {", |
653 |
- esetnum, |
654 |
- NumWords(TokenNum-1)*sizeof(unsigned)); |
655 |
- } |
656 |
-@@ -642,20 +642,20 @@ |
657 |
- esetnum++; |
658 |
- |
659 |
- if ( name!=NULL ) { |
660 |
-- fprintf(Parser_h, "\tstatic SetWordType %s%s[%d];\n", name, suffix, |
661 |
-+ fprintf(Parser_h, "\tstatic SetWordType %s%s[%lu];\n", name, suffix, |
662 |
- NumWords(TokenNum-1)*sizeof(unsigned)); |
663 |
-- fprintf(Parser_c, "SetWordType %s::%s%s[%d] = {", |
664 |
-+ fprintf(Parser_c, "SetWordType %s::%s%s[%lu] = {", |
665 |
- CurrentClassName, |
666 |
- name, |
667 |
- suffix, |
668 |
- NumWords(TokenNum-1)*sizeof(unsigned)); |
669 |
- } |
670 |
- else { |
671 |
-- fprintf(Parser_c, "SetWordType %s::err%d[%d] = {", |
672 |
-+ fprintf(Parser_c, "SetWordType %s::err%d[%lu] = {", |
673 |
- CurrentClassName, |
674 |
- esetnum, |
675 |
- NumWords(TokenNum-1)*sizeof(unsigned)); |
676 |
-- fprintf(Parser_h, "\tstatic SetWordType err%d[%d];\n", esetnum, |
677 |
-+ fprintf(Parser_h, "\tstatic SetWordType err%d[%lu];\n", esetnum, |
678 |
- NumWords(TokenNum-1)*sizeof(unsigned)); |
679 |
- } |
680 |
- |
681 |
-@@ -788,7 +788,7 @@ |
682 |
- |
683 |
- /* Build constructors */ |
684 |
- fprintf(Parser_c, "\n%s::", CurrentClassName); |
685 |
-- fprintf(Parser_c, "%s(ANTLRTokenBuffer *input) : %s(input,%d,%d,%d,%d)\n", |
686 |
-+ fprintf(Parser_c, "%s(ANTLRTokenBuffer *input) : %s(input,%d,%d,%d,%lu)\n", |
687 |
- CurrentClassName, |
688 |
- (BaseClassName == NULL ? "ANTLRParser" : BaseClassName), |
689 |
- OutputLL_k, |
690 |
-@@ -913,7 +913,7 @@ |
691 |
- #ifdef DUM |
692 |
- if ( LexGen ) fprintf(ErrFile, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken)); |
693 |
- #endif |
694 |
-- fprintf(ErrFile, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned)); |
695 |
-+ fprintf(ErrFile, "#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned)); |
696 |
- if ( DemandLookahead ) fprintf(ErrFile, "#define DEMAND_LOOK\n"); |
697 |
- fprintf(ErrFile, "#include \"antlr.h\"\n"); |
698 |
- if ( GenAST ) fprintf(ErrFile, "#include \"ast.h\"\n"); |
699 |
---- cdrdao-1.2.3/pccts/antlr/fset2.c |
700 |
-+++ cdrdao-1.2.3/pccts/antlr/fset2.c |
701 |
-@@ -2210,7 +2210,7 @@ |
702 |
- if (p->ntype != nToken) continue; |
703 |
- tn=(TokNode *)p; |
704 |
- if (depth != 0) fprintf(stdout," "); |
705 |
-- fprintf(stdout,TerminalString(tn->token)); |
706 |
-+ fprintf(stdout,"%s",TerminalString(tn->token)); |
707 |
- depth++; |
708 |
- if (! MR_AmbAidMultiple) { |
709 |
- if (set_nil(tn->tset)) { |
710 |
---- cdrdao-1.2.3/pccts/antlr/gen.c |
711 |
-+++ cdrdao-1.2.3/pccts/antlr/gen.c |
712 |
-@@ -159,7 +159,7 @@ |
713 |
- #define gen6(s,a,b,c,d,e,f) {tab(); fprintf(output, s,a,b,c,d,e,f);} |
714 |
- #define gen7(s,a,b,c,d,e,f,g) {tab(); fprintf(output, s,a,b,c,d,e,f,g);} |
715 |
- |
716 |
--#define _gen(s) {fprintf(output, s);} |
717 |
-+#define _gen(s) {fprintf(output, "%s", s);} |
718 |
- #define _gen1(s,a) {fprintf(output, s,a);} |
719 |
- #define _gen2(s,a,b) {fprintf(output, s,a,b);} |
720 |
- #define _gen3(s,a,b,c) {fprintf(output, s,a,b,c);} |
721 |
-@@ -3911,7 +3911,7 @@ |
722 |
- } |
723 |
- #endif |
724 |
- /* ###WARNING: This will have to change when SetWordSize changes */ |
725 |
-- if ( !GenCC ) _gen1("#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned)); |
726 |
-+ if ( !GenCC ) _gen1("#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned)); |
727 |
- if (TraceGen) { |
728 |
- _gen("#ifndef zzTRACE_RULES\n"); /* MR20 */ |
729 |
- _gen("#define zzTRACE_RULES\n"); /* MR20 */ |
730 |
-@@ -4125,7 +4125,7 @@ |
731 |
- if ( LexGen ) fprintf(f, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken)); |
732 |
- #endif |
733 |
- /* ###WARNING: This will have to change when SetWordSize changes */ |
734 |
-- fprintf(f, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned)); |
735 |
-+ fprintf(f, "#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned)); |
736 |
- if (TraceGen) { |
737 |
- fprintf(f,"#ifndef zzTRACE_RULES\n"); /* MR20 */ |
738 |
- fprintf(f,"#define zzTRACE_RULES\n"); /* MR20 */ |
739 |
---- cdrdao-1.2.3/pccts/antlr/lex.c |
740 |
-+++ cdrdao-1.2.3/pccts/antlr/lex.c |
741 |
-@@ -706,7 +706,7 @@ |
742 |
- /* MR26 */ if (! (isalpha(*t) || isdigit(*t) || *t == '_' || *t == '$')) break; |
743 |
- /* MR26 */ } |
744 |
- /* MR26 */ } |
745 |
--/* MR26 */ fprintf(output,strBetween(pSymbol, t, pSeparator)); |
746 |
-+/* MR26 */ fprintf(output,"%s",strBetween(pSymbol, t, pSeparator)); |
747 |
- |
748 |
- *q = p; |
749 |
- return (*pSeparator == 0); |
750 |
-@@ -771,7 +771,7 @@ |
751 |
- &pValue, |
752 |
- &pSeparator, |
753 |
- &nest); |
754 |
-- fprintf(f,strBetween(pDataType, pSymbol, pSeparator)); |
755 |
-+ fprintf(f,"%s",strBetween(pDataType, pSymbol, pSeparator)); |
756 |
- } |
757 |
- |
758 |
- /* check to see if string e is a word in string s */ |
759 |
-@@ -852,9 +852,9 @@ |
760 |
- &pSeparator, |
761 |
- &nest); |
762 |
- fprintf(f,"\t"); |
763 |
-- fprintf(f,strBetween(pDataType, pSymbol, pSeparator)); |
764 |
-+ fprintf(f,"%s",strBetween(pDataType, pSymbol, pSeparator)); |
765 |
- fprintf(f," "); |
766 |
-- fprintf(f,strBetween(pSymbol, pEqualSign, pSeparator)); |
767 |
-+ fprintf(f,"%s",strBetween(pSymbol, pEqualSign, pSeparator)); |
768 |
- fprintf(f,";\n"); |
769 |
- } |
770 |
- fprintf(f,"};\n"); |
771 |
---- cdrdao-1.2.3/pccts/antlr/set.c |
772 |
-+++ cdrdao-1.2.3/pccts/antlr/set.c |
773 |
-@@ -263,7 +263,7 @@ |
774 |
- static set a; |
775 |
- |
776 |
- if ( b == nil ) return( empty ); |
777 |
-- set_new(a, b); |
778 |
-+ set_new(a, (long unsigned int) b); |
779 |
- a.setword[DIVWORD(b)] = bitmask[MODWORD(b)]; |
780 |
- |
781 |
- return(a); |
782 |
---- cdrdao-1.2.3/pccts/dlg/set.c |
783 |
-+++ cdrdao-1.2.3/pccts/dlg/set.c |
784 |
-@@ -263,7 +263,7 @@ |
785 |
- static set a; |
786 |
- |
787 |
- if ( b == nil ) return( empty ); |
788 |
-- set_new(a, b); |
789 |
-+ set_new(a, (long unsigned int) b); |
790 |
- a.setword[DIVWORD(b)] = bitmask[MODWORD(b)]; |
791 |
- |
792 |
- return(a); |
793 |
---- cdrdao-1.2.3/pccts/h/set.h |
794 |
-+++ cdrdao-1.2.3/pccts/h/set.h |
795 |
-@@ -55,7 +55,7 @@ |
796 |
- /* make arg1 a set big enough to hold max elem # of arg2 */ |
797 |
- #define set_new(a,_max) \ |
798 |
- if (((a).setword=(unsigned *)calloc(NumWords(_max),BytesPerWord))==NULL) \ |
799 |
-- fprintf(stderr, "set_new: Cannot allocate set with max of %d\n", _max); \ |
800 |
-+ fprintf(stderr, "set_new: Cannot allocate set with max of %lu\n", _max); \ |
801 |
- (a).n = NumWords(_max); |
802 |
- |
803 |
- #define set_free(a) \ |