From 3409c7a497fd9a3e22bd56401afeba16e7eac28a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 22 Apr 2008 01:55:59 +0000 Subject: [PATCH 01/35] Initialize branch F-9 for xcdroast --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 333df2b495784a484e38ff86e66f63ae46279bca Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Tue, 17 Feb 2009 14:17:23 +0000 Subject: [PATCH 02/35] New version 0.98alpha16. Some spec file fixes. Resolves: #226550 --- .cvsignore | 2 +- sources | 2 +- ...st-0.98alpha15-01_upstream_configure.patch | 92 -- ...t-0.98alpha15-02_upstream_gtk2locale.patch | 26 - ...-0.98alpha15-03_upstream_64bit_gsize.patch | 28 - ...-0.98alpha15-04_upstream_read_eagain.patch | 53 - xcdroast-0.98alpha15-05_upstream_wav.patch | 356 ------- xcdroast-0.98alpha15-06_man.patch | 19 - xcdroast-0.98alpha15-07_case_cmp.patch | 31 - xcdroast-0.98alpha15-08_desktop.patch | 22 - xcdroast-0.98alpha15-09_share_dir.patch | 512 --------- xcdroast-0.98alpha15-10_cddbtool.patch | 56 - xcdroast-0.98alpha15-11_mkisofs_options.patch | 29 - ...ast-0.98alpha15-12_cdrecord_versions.patch | 21 - ...ast-0.98alpha15-13_cdrecord_to_wodim.patch | 984 ++---------------- xcdroast-0.98alpha15-frozen_gui.patch | 84 -- xcdroast-0.98alpha15-prodvd.patch | 328 +++++- xcdroast-0.98alpha15-scan.patch | 35 +- xcdroast.spec | 88 +- 19 files changed, 439 insertions(+), 2329 deletions(-) delete mode 100644 xcdroast-0.98alpha15-01_upstream_configure.patch delete mode 100644 xcdroast-0.98alpha15-02_upstream_gtk2locale.patch delete mode 100644 xcdroast-0.98alpha15-03_upstream_64bit_gsize.patch delete mode 100644 xcdroast-0.98alpha15-04_upstream_read_eagain.patch delete mode 100644 xcdroast-0.98alpha15-05_upstream_wav.patch delete mode 100644 xcdroast-0.98alpha15-06_man.patch delete mode 100644 xcdroast-0.98alpha15-07_case_cmp.patch delete mode 100644 xcdroast-0.98alpha15-08_desktop.patch delete mode 100644 xcdroast-0.98alpha15-09_share_dir.patch delete mode 100644 xcdroast-0.98alpha15-10_cddbtool.patch delete mode 100644 xcdroast-0.98alpha15-11_mkisofs_options.patch delete mode 100644 xcdroast-0.98alpha15-12_cdrecord_versions.patch delete mode 100644 xcdroast-0.98alpha15-frozen_gui.patch diff --git a/.cvsignore b/.cvsignore index 063cbf8..00faaa8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xcdroast-0.98alpha15.tar.gz +xcdroast-0.98alpha16.tar.gz diff --git a/sources b/sources index 2920749..cd024b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2a9c1d9f2ef58713c453e674b989be3e xcdroast-0.98alpha15.tar.gz +bc3d335a30f292067eaaf1ea03ebaf17 xcdroast-0.98alpha16.tar.gz diff --git a/xcdroast-0.98alpha15-01_upstream_configure.patch b/xcdroast-0.98alpha15-01_upstream_configure.patch deleted file mode 100644 index 1aacc12..0000000 --- a/xcdroast-0.98alpha15-01_upstream_configure.patch +++ /dev/null @@ -1,92 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_upstream_configure.dpatch by > -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad trunk~/configure trunk/configure ---- trunk~/configure 2006-01-20 13:34:14.000000000 +0100 -+++ trunk/configure 2006-01-20 13:51:55.000000000 +0100 -@@ -4361,55 +4361,6 @@ - LIBS="$LIBS $PKGCONFIG_LIBS" - CFLAGS="$CFLAGS $PKGCONFIG_CFLAGS" - -- # Extract the first word of "pcre-config", so it can be a program name with args. --set dummy pcre-config; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_path_PCRE_CONFIG+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- case $PCRE_CONFIG in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_PCRE_CONFIG="$PCRE_CONFIG" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_path_PCRE_CONFIG="$as_dir/$ac_word$ac_exec_ext" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- -- test -z "$ac_cv_path_PCRE_CONFIG" && ac_cv_path_PCRE_CONFIG="no" -- ;; --esac --fi --PCRE_CONFIG=$ac_cv_path_PCRE_CONFIG -- --if test -n "$PCRE_CONFIG"; then -- echo "$as_me:$LINENO: result: $PCRE_CONFIG" >&5 --echo "${ECHO_T}$PCRE_CONFIG" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- if test "x$PCRE_CONFIG" = "xno" ; then -- { { echo "$as_me:$LINENO: error: pcre-config not found please install libpcre3-dev or similar" >&5 --echo "$as_me: error: pcre-config not found please install libpcre3-dev or similar" >&2;} -- { (exit 1); exit 1; }; } -- else -- LIBS="$LIBS `$PCRE_CONFIG --libs`" -- CFLAGS="$CFLAGS `$PCRE_CONFIG --cflags`" -- fi -- - else - - -@@ -9249,7 +9200,6 @@ - s,@PKG_CONFIG@,$PKG_CONFIG,;t t - s,@PKGCONFIG_CFLAGS@,$PKGCONFIG_CFLAGS,;t t - s,@PKGCONFIG_LIBS@,$PKGCONFIG_LIBS,;t t --s,@PCRE_CONFIG@,$PCRE_CONFIG,;t t - s,@GLIB_CONFIG@,$GLIB_CONFIG,;t t - s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t - s,@GLIB_LIBS@,$GLIB_LIBS,;t t -diff -urNad trunk~/configure.in trunk/configure.in ---- trunk~/configure.in 2006-01-20 13:34:14.000000000 +0100 -+++ trunk/configure.in 2006-01-20 13:51:58.000000000 +0100 -@@ -105,14 +105,6 @@ - LIBS="$LIBS $PKGCONFIG_LIBS" - CFLAGS="$CFLAGS $PKGCONFIG_CFLAGS" - -- AC_PATH_PROG(PCRE_CONFIG, pcre-config, no) -- if test "x$PCRE_CONFIG" = "xno" ; then -- AC_MSG_ERROR(pcre-config not found please install libpcre3-dev or similar) -- else -- LIBS="$LIBS `$PCRE_CONFIG --libs`" -- CFLAGS="$CFLAGS `$PCRE_CONFIG --cflags`" -- fi -- - else - dnl pure plain GTK+-1.2.x support - diff --git a/xcdroast-0.98alpha15-02_upstream_gtk2locale.patch b/xcdroast-0.98alpha15-02_upstream_gtk2locale.patch deleted file mode 100644 index fddbdf8..0000000 --- a/xcdroast-0.98alpha15-02_upstream_gtk2locale.patch +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_upstream_gtk2locale.patch.dpatch by > -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad trunk~/src/xtools.c trunk/src/xtools.c ---- trunk~/src/xtools.c 2006-01-20 16:07:46.000000000 +0100 -+++ trunk/src/xtools.c 2006-01-20 16:08:06.000000000 +0100 -@@ -3662,9 +3662,13 @@ - if (c_locale_is_utf8) - return str; - -- /* should be logical to use g_filename_from_utf8() here, but -- somehow this works not correctly on my testsystem */ -+#ifdef BROKEN_GTK2_LOCALE -+ /* on my redhat 7.3 system it does only work that way, but -+ on other systems the correct way is in the #else branch */ - locstr = g_locale_from_utf8(str, strlen(str), &in, &out, NULL); -+#else -+ locstr = g_filename_from_utf8(str, strlen(str), &in, &out, NULL); -+#endif - if (locstr) { - strncpy(str, locstr, MAXLINE); - } diff --git a/xcdroast-0.98alpha15-03_upstream_64bit_gsize.patch b/xcdroast-0.98alpha15-03_upstream_64bit_gsize.patch deleted file mode 100644 index de82288..0000000 --- a/xcdroast-0.98alpha15-03_upstream_64bit_gsize.patch +++ /dev/null @@ -1,28 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_upstream_64bit_gsize.patch.dpatch by > -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad trunk~/src/xtools.c trunk/src/xtools.c ---- trunk~/src/xtools.c 2006-01-20 16:07:46.000000000 +0100 -+++ trunk/src/xtools.c 2006-01-20 16:10:23.000000000 +0100 -@@ -3635,7 +3635,7 @@ - return str; - #else - gchar *locstr; --gint in, out; -+gsize in, out; - - locstr = g_locale_from_utf8(str, strlen(str), &in, &out, NULL); - if (locstr) { -@@ -3655,7 +3655,7 @@ - return str; - #else - gchar *locstr; --gint in, out; -+gsize in, out; - - /* ok, if your filesystem is already UTF8 we are not - allowed to change the filenames here. */ diff --git a/xcdroast-0.98alpha15-04_upstream_read_eagain.patch b/xcdroast-0.98alpha15-04_upstream_read_eagain.patch deleted file mode 100644 index db59ea3..0000000 --- a/xcdroast-0.98alpha15-04_upstream_read_eagain.patch +++ /dev/null @@ -1,53 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04_upstream_read_eagain.patch.dpatch by > -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad trunk~/src/tools.c trunk/src/tools.c ---- trunk~/src/tools.c 2006-01-20 16:15:30.000000000 +0100 -+++ trunk/src/tools.c 2006-01-20 16:25:51.000000000 +0100 -@@ -559,6 +559,33 @@ - } - - -+/* read a single char from a file descriptor. If the descriptor -+ says that it is not available, then try again up to 5 times, -+ before giving up. -+ Required for Mac OS 10.3 -+*/ -+ -+static gint read_char(gint fd, gchar *c) { -+gint rc; -+gint retries; -+ -+ retries = 5; -+ -+ while (retries) { -+ rc = read(fd, c, 1); -+ -+ /* all ok, read one char or EOF */ -+ if (rc != -1) { -+ return rc; -+ } -+ -+ /* error code, try again after a little while */ -+ usleep(100); -+ retries--; -+ } -+ return rc; -+} -+ - /* - * Read a line from a descriptor. Read the line one byte at a time, - * looking for the newline. Works fine in nonblocking mode..here -@@ -576,7 +603,7 @@ - str = ptr; - - for (n = 1; n < maxlen; n++) { -- if ( (rc = read(fd, &c, 1)) == 1) { -+ if ( (rc = read_char(fd, &c)) == 1) { - *ptr++ = c; - if (c == '\n') { - break; diff --git a/xcdroast-0.98alpha15-05_upstream_wav.patch b/xcdroast-0.98alpha15-05_upstream_wav.patch deleted file mode 100644 index b9e5219..0000000 --- a/xcdroast-0.98alpha15-05_upstream_wav.patch +++ /dev/null @@ -1,356 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 05_upstream_wav.patch.dpatch by > -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad trunk~/src/main.h trunk/src/main.h ---- trunk~/src/main.h 2006-01-20 16:26:51.000000000 +0100 -+++ trunk/src/main.h 2006-01-20 16:29:30.000000000 +0100 -@@ -175,8 +175,7 @@ - void wavplay_frontend(GtkWidget *widget); - void wavplay_dodouble(); - --gint is_std_wav_file(guchar *hdr); --gint is_in_cd_quality(guchar *hdr); -+off_t is_std_wav_file(int f, off_t *offset); - - void dodebug(gint debuglevel, gchar *fmt, ...); - void dolog(gint loglevel, gchar *fmt, ...); -diff -urNad trunk~/src/wav_id.c trunk/src/wav_id.c ---- trunk~/src/wav_id.c 2006-01-20 16:29:11.000000000 +0100 -+++ trunk/src/wav_id.c 2006-01-20 16:29:30.000000000 +0100 -@@ -5,6 +5,11 @@ - machine-independent (work both on big and little endian) - code to check if we have valid wavheader that is configured - for cd-quality (16 bit, stereo, 44.1kHz) -+ -+ 01.04.04 steve wahl -+ -+ Do correct RIFF parsing, don't assume a static header style. -+ Code borrowed from cdrecord. - */ - - #ifdef HAVE_CONFIG_H -@@ -13,62 +18,147 @@ - - #include "largefile.h" - -+#include -+#include -+#include - #include - #include - #include "xcdroast.h" - --/* check if valid wav-header */ --/* endian independent version */ --/* return 1 if true, 0 if not */ -+typedef struct { -+ guchar ckid[4]; -+ guchar cksize[4]; -+} chunk_t; - --gint is_std_wav_file(guchar *hdr) { --gchar tmp[MAXLINE]; --guint wFormatTag; --guint fmtOffset; -+typedef struct { -+ guchar wave[4]; -+} riff_chunk; - -- strncpy(tmp,(char *) hdr+0,4); -- if (strncmp(tmp,"RIFF",4) != 0) -- return 0; -+typedef struct { -+ guchar fmt_tag[2]; -+ guchar channels[2]; -+ guchar sample_rate[4]; -+ guchar av_byte_rate[4]; -+ guchar block_size[2]; -+ guchar bits_per_sample[2]; -+} fmt_chunk; - -- strncpy(tmp,(char *) hdr+8,4); -- if (strncmp(tmp,(char *)"WAVE",4) != 0) -- return 0; -+#define WAV_RIFF_MAGIC "RIFF" /* Magic for file format */ -+#define WAV_WAVE_MAGIC "WAVE" /* Magic for Waveform Audio */ -+#define WAV_FMT_MAGIC "fmt " /* Start of Waveform format */ -+#define WAV_DATA_MAGIC "data" /* Start of data chunk */ -+#define WAV_FORMAT_PCM 0x0001 /* Linear PCM format */ -+#define WAV_FORMAT_ULAW 0x0101 /* American ISDN Telephonie */ -+#define WAV_FORMAT_ALAW 0x0102 /* International ISDN Tel. */ -+#define WAV_FORMAT_ADPCM 0x0103 /* ADPCM format */ - -- strncpy(tmp,(char *) hdr+12,4); -- if (strncmp(tmp,(char *)"fmt ",4) != 0) -- return 0; -+#define le_a_to_u_short(a) ((unsigned short) \ -+ ((((unsigned char*) a)[0] & 0xFF) | \ -+ (((unsigned char*) a)[1] << 8 & 0xFF00))) - -- fmtOffset = (hdr[19]<<24) + (hdr[18]<<16) + (hdr[17]<<8) + hdr[16]; -- strncpy(tmp,(char *) hdr+20+fmtOffset,4); -- if (strncmp(tmp,(char *)"data",4) != 0) -- return 0; -+#ifdef __STDC__ -+#define le_a_to_u_long(a) ((unsigned long) \ -+ ((((unsigned char*) a)[0] & 0xFF) | \ -+ (((unsigned char*) a)[1] << 8 & 0xFF00) | \ -+ (((unsigned char*) a)[2] << 16 & 0xFF0000) | \ -+ (((unsigned char*) a)[3] << 24 & 0xFF000000UL))) -+#else -+#define le_a_to_u_long(a) ((unsigned long) \ -+ ((((unsigned char*) a)[0] & 0xFF) | \ -+ (((unsigned char*) a)[1] << 8 & 0xFF00) | \ -+ (((unsigned char*) a)[2] << 16 & 0xFF0000) | \ -+ (((unsigned char*) a)[3] << 24 & 0xFF000000))) -+#endif - -- wFormatTag = (hdr[21] << 8) + hdr[20]; -- if (wFormatTag != 1) -- return 0; -+/* check if valid wav-header */ -+/* endian independent version */ -+/* return number of bytes if valid, 0 if not */ -+/* if offset is non NULL, place offset in file to base of wave data there */ -+/* leaves file pointer at begining of wave data if valid */ - -- return 1; --} -+off_t is_std_wav_file(gint f, off_t *offset) -+{ -+ chunk_t chunk; -+ riff_chunk riff; -+ fmt_chunk fmt; -+ struct stat sb; -+ off_t cursor; -+ gint gotFormat; -+ mode_t mode; -+ off_t size; - -+ /* -+ * First check if a bad guy tries to call wavsize() -+ * with an unappropriate file descriptor. -+ * return 0 in this case. -+ */ - --/* check if wav-file is in cd-quality */ --/* endian independent version */ --/* return 1 if true, 0 if not */ -+ if (isatty(f)) -+ return (0); -+ if (fstat(f, &sb) < 0) -+ return (0); -+ mode = sb.st_mode & S_IFMT; -+ if (!S_ISREG(mode) && !S_ISBLK(mode) && !S_ISCHR(mode)) -+ return (0); - --gint is_in_cd_quality(guchar *hdr) { --guint nChannels; --guint wBitsPerSample; --guint nSamplesPerSec; -+ cursor = (off_t)0; -+ lseek(f, cursor, SEEK_SET); -+ gotFormat = FALSE; - -- nChannels = (hdr[23] << 8) + hdr[22]; -- wBitsPerSample = (hdr[35] << 8) + hdr[34]; -- nSamplesPerSec = (hdr[27]<<24) + (hdr[26]<<16) + (hdr[25]<<8) + hdr[24]; -+ for (;;) { -+ if (read(f, &chunk, sizeof (chunk)) != sizeof (chunk)) -+ goto err; -+ size = (off_t)le_a_to_u_long(chunk.cksize); - -- if (nChannels != 2 || wBitsPerSample != 16 || -- nSamplesPerSec != 44100) -- return 0; -+ if (strncmp((char *)chunk.ckid, WAV_RIFF_MAGIC, 4) == 0) { -+ /* -+ * We found (first) RIFF header. Check if a WAVE -+ * magic follows. Set up size to be able to skip -+ * past this header. -+ */ -+ if (read(f, &riff, sizeof (riff)) != sizeof (riff)) -+ goto err; -+ if (strncmp((char *)riff.wave, WAV_WAVE_MAGIC, 4) != 0) -+ goto err; -+ size = (off_t)sizeof (riff); - -- return 1; -+ } else if (strncmp((char *)chunk.ckid, WAV_FMT_MAGIC, 4) == 0) { -+ /* -+ * We found WAVE "fmt " header. Check size (if it is -+ * valid for a WAVE file) and coding whether it is -+ * useable for a CD. -+ */ -+ if (size < (off_t)sizeof (fmt)) goto err; -+ if (sizeof (fmt) != read(f, &fmt, sizeof (fmt))) goto err; -+ if (le_a_to_u_short(fmt.channels) != 2 || -+ le_a_to_u_long(fmt.sample_rate) != 44100 || -+ le_a_to_u_short(fmt.bits_per_sample) != 16) { -+ goto err; -+ } -+ gotFormat = TRUE; -+ -+ } else if (strncmp((char *)chunk.ckid, WAV_DATA_MAGIC, 4) == 0) { -+ /* -+ * We found WAVE "data" header. This contains the -+ * size value of the audio part. -+ */ -+ if (!gotFormat) { -+ goto err; -+ } -+ if ((cursor + size + sizeof (chunk)) > sb.st_size) -+ size = sb.st_size - (cursor + sizeof (chunk)); -+ if (offset) -+ *offset = cursor + sizeof (chunk) ; -+ return (size); -+ } -+ cursor += size + sizeof (chunk); -+ lseek(f, cursor, SEEK_SET); /* Skip over current chunk */ -+ } -+err: -+ lseek(f, (off_t)0L, SEEK_SET); -+ return (0); - } - - -+ -+ -diff -urNad trunk~/src/wavplay.c trunk/src/wavplay.c ---- trunk~/src/wavplay.c 2006-01-20 16:27:15.000000000 +0100 -+++ trunk/src/wavplay.c 2006-01-20 16:29:30.000000000 +0100 -@@ -64,13 +64,12 @@ - #include - #endif - --static guchar waveHdr[44]; -+static off_t waveBase ; - static gint abuf_size; - static guchar *audiobuf; - - gint read_line(gint fd, gchar *ptr, gint maxlen); --gint is_std_wav_file(guchar *hdr); --gint is_in_cd_quality(guchar *hdr); -+off_t is_std_wav_file(int f, off_t *offset); - - - #if defined(linux) || defined(__FreeBSD__) -@@ -747,7 +746,6 @@ - gint oldtick = 0; - off_t bytessofar = 0; - off_t totalbytes; --struct stat stat_buf; - gint min,sec; - gchar keybuffer[MAXLINE]; - #if !(defined(linux)) -@@ -830,20 +828,11 @@ - } - - /* get filesize */ -- fstat(fd, &stat_buf); -- totalbytes = (off_t) (stat_buf.st_size - (off_t)sizeof(waveHdr)); -- -- read(fd, &waveHdr, sizeof(waveHdr)); -+ totalbytes = is_std_wav_file(fd, &waveBase) ; - - /* is it a wav-file? */ -- if (!is_std_wav_file(waveHdr)) { -- g_warning("No valid wavfile\n"); -- exit(0); -- } -- -- /* is it in cd-quality? */ -- if (!is_in_cd_quality(waveHdr)) { -- g_warning("wavfile not in cd-quality\n"); -+ if (totalbytes == 0) { -+ g_warning("No valid wavfile, or not in cd-quality\n"); - exit(0); - } - -@@ -871,7 +860,7 @@ - if (guimode && (read_line(STDIN_FILENO,keybuffer,MAXLINE) > 0)) { - /* stop command */ - if (g_strncasecmp(keybuffer,"stop",4) == 0) { -- lseek(fd, sizeof(waveHdr), SEEK_SET); -+ lseek(fd, waveBase, SEEK_SET); - bytessofar = 0; - tick = 0; - doplay = 0; -@@ -895,7 +884,7 @@ - if (g_strncasecmp(keybuffer,"set",3) == 0) { - tick = atoi(keybuffer+3); - bytessofar = (off_t)tick *CDDAFRAME*75; -- lseek(fd, (off_t)sizeof(waveHdr)+bytessofar, -+ lseek(fd, waveBase+bytessofar, - SEEK_SET); - g_print("%s%d\n",doplay?"play":"stop",tick); - fflush(stdout); -@@ -911,7 +900,15 @@ - if (doplay) { - - /* read from wav-file */ -- l = read(fd, audiobuf, abuf_size); -+ /* but only up until we reach totalbytes */ -+ l = totalbytes - bytessofar ; -+ if (l > abuf_size) -+ l = abuf_size ; -+ if (l < 0) -+ l = 0 ; -+ -+ if (l > 0) -+ l = read(fd, audiobuf, l); - if (l > 0) { - #if !(defined(linux)) - /* turn byte order only on non linux platforms */ -@@ -945,7 +942,7 @@ - exit(-1); - } - #endif -- bytessofar+=(off_t)abuf_size; -+ bytessofar+=(off_t)l; - - } else { - /* read error on wav-file */ -@@ -958,7 +955,7 @@ - doplay = 0; - if (guimode) { - /* roll back */ -- lseek(fd, sizeof(waveHdr), SEEK_SET); -+ lseek(fd, waveBase, SEEK_SET); - bytessofar = 0; - tick = 0; - g_print("done%d\n",tick); -diff -urNad trunk~/src/xtools.c trunk/src/xtools.c ---- trunk~/src/xtools.c 2006-01-20 16:27:42.000000000 +0100 -+++ trunk/src/xtools.c 2006-01-20 16:29:30.000000000 +0100 -@@ -1851,7 +1851,6 @@ - /* return 1 if, 0 if not */ - - gint check_wav_file(gchar *wavname) { --guchar waveHdr[44]; - gint fd; - - fd = open (wavname, O_RDONLY, 0); -@@ -1859,16 +1858,8 @@ - return 0; - } - -- read(fd, &waveHdr, sizeof(waveHdr)); -- -- if (!is_std_wav_file(waveHdr)) { -- /* no wav at all */ -- close(fd); -- return 0; -- } -- -- /* is it in cd-quality? */ -- if (!is_in_cd_quality(waveHdr)) { -+ if (!is_std_wav_file(fd, NULL)) { -+ /* no wav at all or not cd-quality */ - close(fd); - return 0; - } diff --git a/xcdroast-0.98alpha15-06_man.patch b/xcdroast-0.98alpha15-06_man.patch deleted file mode 100644 index 4607d22..0000000 --- a/xcdroast-0.98alpha15-06_man.patch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 06_man.dpatch by > -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad trunk~/man/xcdroast.1 trunk/man/xcdroast.1 ---- trunk~/man/xcdroast.1 2006-01-20 17:39:36.000000000 +0100 -+++ trunk/man/xcdroast.1 2006-01-20 17:40:40.000000000 +0100 -@@ -84,7 +84,7 @@ - fine.) - - .SH BUGS --This 'man' page is to short. Really useable information can be found -+This 'man' page is too short. Really useable information can be found - in the documentation included with X-CD-Roast, in the FAQ - on - .IR http://www.xcdroast.org/faq diff --git a/xcdroast-0.98alpha15-07_case_cmp.patch b/xcdroast-0.98alpha15-07_case_cmp.patch deleted file mode 100644 index f9b7dd0..0000000 --- a/xcdroast-0.98alpha15-07_case_cmp.patch +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 07_case_cmp.dpatch by > -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad trunk~/src/xtools.c trunk/src/xtools.c ---- trunk~/src/xtools.c 2006-01-20 17:09:43.000000000 +0100 -+++ trunk/src/xtools.c 2006-01-20 18:28:52.000000000 +0100 -@@ -974,9 +974,9 @@ - isosize = 0; - - /* now do some tests about file-contents */ -- if (strncmp(file+strlen(file)-4,".toc",4) == 0) { -+ if (strncasecmp(file+strlen(file)-4,".toc",4) == 0) { - type = 4; -- } else if (strncmp(file+strlen(file)-4,".wav",4) == 0) { -+ } else if (strncasecmp(file+strlen(file)-4,".wav",4) == 0) { - /* wav-file */ - if (check_wav_file(tmp) == 0) { - /* invalid wav */ -@@ -1052,7 +1052,7 @@ - /* skip to short filenames */ - if (len2 < len) continue; - -- if (strncmp((ent->d_name)+len2-len,img_ext[i],len) == 0) { -+ if (strncasecmp((ent->d_name)+len2-len,img_ext[i],len) == 0) { - /* we found a match */ - analyze_imgfile(path,ent->d_name,retlist); - } diff --git a/xcdroast-0.98alpha15-08_desktop.patch b/xcdroast-0.98alpha15-08_desktop.patch deleted file mode 100644 index 016ae1b..0000000 --- a/xcdroast-0.98alpha15-08_desktop.patch +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 08_desktop.dpatch by > -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad trunk~/extra/xcdroast.desktop trunk/extra/xcdroast.desktop ---- trunk~/extra/xcdroast.desktop 2006-01-20 13:34:14.000000000 +0100 -+++ trunk/extra/xcdroast.desktop 2006-02-26 18:33:05.000000000 +0100 -@@ -1,6 +1,8 @@ - [Desktop Entry] -+Encoding=UTF-8 - Name=X-CD-Roast -+Comment=Create a CD -+Exec=xcdroast -+Icon=xcdroast.xpm - Type=Application --Exec=/usr/bin/xcdroast --Comment=CD creation tool --Icon=/usr/lib/xcdroast-0.98/icons/xcdricon.png -+Categories=Application;AudioVideo; diff --git a/xcdroast-0.98alpha15-09_share_dir.patch b/xcdroast-0.98alpha15-09_share_dir.patch deleted file mode 100644 index 05c6dd1..0000000 --- a/xcdroast-0.98alpha15-09_share_dir.patch +++ /dev/null @@ -1,512 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 09_share_dir.dpatch by > -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Patch to provide different paths to /usr/lib and /usr/share. - -@DPATCH@ -diff -urNad trunk~/Makefile.in trunk/Makefile.in ---- trunk~/Makefile.in 2006-05-06 15:54:43.000000000 +0200 -+++ trunk/Makefile.in 2006-05-06 15:55:04.000000000 +0200 -@@ -108,6 +108,7 @@ - USE_NONROOTMODE = @USE_NONROOTMODE@ - VERSION = @VERSION@ - XCDRLIB_PREFIX = @XCDRLIB_PREFIX@ -+XCDRSHARE_PREFIX = @XCDRSHARE_PREFIX@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ -diff -urNad trunk~/acinclude.m4 trunk/acinclude.m4 ---- trunk~/acinclude.m4 2006-05-06 15:18:20.000000000 +0200 -+++ trunk/acinclude.m4 2006-05-06 15:54:54.000000000 +0200 -@@ -24,7 +24,7 @@ - AC_DEFUN(AM_PATH_XCDRLIBDIR, - [ AC_ARG_WITH(xcdroast-libdir-prefix, - AC_HELP_STRING([--with-xcdroast-libdir-prefix=PFX], -- [set where the utils/images of xcdroast should be installed - default: PREFIX/lib/xcdroast-0.98]), -+ [set where the utils of xcdroast should be installed - default: PREFIX/lib/xcdroast-0.98]), - xcdrlibdir_config_prefix="$withval", xcdrlibdir_config_prefix="") - - if test "x$xcdrlibdir_config_prefix" = "x"; then -@@ -38,6 +38,26 @@ - AC_SUBST(XCDRLIB_PREFIX) - ]) - -+dnl AM_PATH_XCDRSHAREDIR([MINIMUM-VERSION, -+dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -+dnl -+AC_DEFUN(AM_PATH_XCDRSHAREDIR, -+[ AC_ARG_WITH(xcdroast-sharedir-prefix, -+ AC_HELP_STRING([--with-xcdroast-sharedir-prefix=PFX], -+ [set where the images of xcdroast should be installed - default: PREFIX/share/xcdroast-0.98]), -+ xcdrsharedir_config_prefix="$withval", xcdrsharedir_config_prefix="") -+ -+ if test "x$xcdrsharedir_config_prefix" = "x"; then -+ XCDRSHARE_PREFIX="$prefix/share/xcdroast-0.98" -+ else -+ XCDRSHARE_PREFIX=$xcdrsharedir_config_prefix -+ fi -+ if test "X$XCDRSHARE_PREFIX" = "XNONE/share/xcdroast-0.98"; then -+ XCDRSHARE_PREFIX="$ac_default_prefix/share/xcdroast-0.98" -+ fi -+ AC_SUBST(XCDRSHARE_PREFIX) -+]) -+ - dnl AM_DEP_NONROOTMODE([MINIMUM-VERSION, - dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) - dnl -diff -urNad trunk~/aclocal.m4 trunk/aclocal.m4 ---- trunk~/aclocal.m4 2006-05-06 15:18:20.000000000 +0200 -+++ trunk/aclocal.m4 2006-05-06 15:54:54.000000000 +0200 -@@ -51,6 +51,26 @@ - AC_SUBST(XCDRLIB_PREFIX) - ]) - -+dnl AM_PATH_XCDRSHAREDIR([MINIMUM-VERSION, -+dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -+dnl -+AC_DEFUN(AM_PATH_XCDRSHAREDIR, -+[ AC_ARG_WITH(xcdroast-sharedir-prefix, -+ AC_HELP_STRING([--with-xcdroast-sharedir-prefix=PFX], -+ [set where the images of xcdroast should be installed - default: PREFIX/share/xcdroast-0.98]), -+ xcdrsharedir_config_prefix="$withval", xcdrsharedir_config_prefix="") -+ -+ if test "x$xcdrsharedir_config_prefix" = "x"; then -+ XCDRSHARE_PREFIX="$prefix/share/xcdroast-0.98" -+ else -+ XCDRSHARE_PREFIX=$xcdrsharedir_config_prefix -+ fi -+ if test "X$XCDRSHARE_PREFIX" = "XNONE/share/xcdroast-0.98"; then -+ XCDRSHARE_PREFIX="$ac_default_prefix/share/xcdroast-0.98" -+ fi -+ AC_SUBST(XCDRSHARE_PREFIX) -+]) -+ - dnl AM_DEP_NONROOTMODE([MINIMUM-VERSION, - dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) - dnl -diff -urNad trunk~/configure.in trunk/configure.in ---- trunk~/configure.in 2006-05-06 15:54:54.000000000 +0200 -+++ trunk/configure.in 2006-05-06 15:54:54.000000000 +0200 -@@ -96,6 +96,7 @@ - - AM_PATH_CDRTOOLS - AM_PATH_XCDRLIBDIR -+AM_PATH_XCDRSHAREDIR - AM_DEP_NONROOTMODE - AM_DEP_ENABLEGTK2 - -diff -urNad trunk~/src/Makefile.am trunk/src/Makefile.am ---- trunk~/src/Makefile.am 2006-05-06 15:18:20.000000000 +0200 -+++ trunk/src/Makefile.am 2006-05-06 15:54:54.000000000 +0200 -@@ -23,7 +23,7 @@ - setup.c io.c duplicate.c wav_frontend.c wav_id.c create.c \ - largefile.h language.h main.h xcdrdata.h xcdroast.h gettext.h - --xcdroast_CFLAGS = $(GNUCFLAGS) $(GDK_PIXBUF_CFLAGS) $(EXTRA_CFLAGS) $(AM_CFLAGS) -DPRE_PREFIX="\"$(prefix)\"" -DPRE_LIBDIR="\"$(XCDRLIB_PREFIX)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" -DUSE_NONROOTMODE="$(USE_NONROOTMODE)" -+xcdroast_CFLAGS = $(GNUCFLAGS) $(GDK_PIXBUF_CFLAGS) $(EXTRA_CFLAGS) $(AM_CFLAGS) -DPRE_PREFIX="\"$(prefix)\"" -DPRE_LIBDIR="\"$(XCDRLIB_PREFIX)\"" -DPRE_SHAREDIR="\"$(XCDRSHARE_PREFIX)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" -DUSE_NONROOTMODE="$(USE_NONROOTMODE)" - xcdroast_LDFLAGS = $(EXTRA_LDFLAGS) - xcdroast_LDADD = @LIBINTL@ @ALLOCA@ $(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(AUDIO_LIBS) - -@@ -48,5 +48,5 @@ - cddbtool_LDADD = $(GLIB_LIBS) - - xcdrwrap_SOURCES = xcdrwrap.c largefile.h xcdroast.h --xcdrwrap_CFLAGS = $(GNUCFLAGS) $(EXTRA_CFLAGS) $(AM_CFLAGS) -DPRE_PREFIX="\"$(prefix)\"" -DPRE_LIBDIR="\"$(XCDRLIB_PREFIX)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" -DUSE_NONROOTMODE="$(USE_NONROOTMODE)" -+xcdrwrap_CFLAGS = $(GNUCFLAGS) $(EXTRA_CFLAGS) $(AM_CFLAGS) -DPRE_PREFIX="\"$(prefix)\"" -DPRE_LIBDIR="\"$(XCDRLIB_PREFIX)\"" -DPRE_SHAREDIR="\"$(XCDRSHARE_PREFIX)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" -DUSE_NONROOTMODE="$(USE_NONROOTMODE)" - -diff -urNad trunk~/src/Makefile.in trunk/src/Makefile.in ---- trunk~/src/Makefile.in 2006-05-06 15:54:37.000000000 +0200 -+++ trunk/src/Makefile.in 2006-05-06 15:55:04.000000000 +0200 -@@ -108,6 +108,7 @@ - USE_NONROOTMODE = @USE_NONROOTMODE@ - VERSION = @VERSION@ - XCDRLIB_PREFIX = @XCDRLIB_PREFIX@ -+XCDRSHARE_PREFIX = @XCDRSHARE_PREFIX@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ -@@ -134,7 +135,7 @@ - largefile.h language.h main.h xcdrdata.h xcdroast.h gettext.h - - --xcdroast_CFLAGS = $(GNUCFLAGS) $(GDK_PIXBUF_CFLAGS) $(EXTRA_CFLAGS) $(AM_CFLAGS) -DPRE_PREFIX="\"$(prefix)\"" -DPRE_LIBDIR="\"$(XCDRLIB_PREFIX)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" -DUSE_NONROOTMODE="$(USE_NONROOTMODE)" -+xcdroast_CFLAGS = $(GNUCFLAGS) $(GDK_PIXBUF_CFLAGS) $(EXTRA_CFLAGS) $(AM_CFLAGS) -DPRE_PREFIX="\"$(prefix)\"" -DPRE_LIBDIR="\"$(XCDRLIB_PREFIX)\"" -DPRE_SHAREDIR="\"$(XCDRSHARE_PREFIX)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" -DUSE_NONROOTMODE="$(USE_NONROOTMODE)" - xcdroast_LDFLAGS = $(EXTRA_LDFLAGS) - xcdroast_LDADD = @LIBINTL@ @ALLOCA@ $(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(AUDIO_LIBS) - -@@ -159,7 +160,7 @@ - cddbtool_LDADD = $(GLIB_LIBS) - - xcdrwrap_SOURCES = xcdrwrap.c largefile.h xcdroast.h --xcdrwrap_CFLAGS = $(GNUCFLAGS) $(EXTRA_CFLAGS) $(AM_CFLAGS) -DPRE_PREFIX="\"$(prefix)\"" -DPRE_LIBDIR="\"$(XCDRLIB_PREFIX)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" -DUSE_NONROOTMODE="$(USE_NONROOTMODE)" -+xcdrwrap_CFLAGS = $(GNUCFLAGS) $(EXTRA_CFLAGS) $(AM_CFLAGS) -DPRE_PREFIX="\"$(prefix)\"" -DPRE_LIBDIR="\"$(XCDRLIB_PREFIX)\"" -DPRE_SHAREDIR="\"$(XCDRSHARE_PREFIX)\"" -DCDRTOOLS_PREFIX="\"$(CDRTOOLS_PREFIX)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" -DUSE_NONROOTMODE="$(USE_NONROOTMODE)" - subdir = src - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h -diff -urNad trunk~/src/init.c trunk/src/init.c ---- trunk~/src/init.c 2006-05-06 15:52:32.000000000 +0200 -+++ trunk/src/init.c 2006-05-06 15:54:54.000000000 +0200 -@@ -73,6 +73,7 @@ - gchar username[MAXLINE]; - gchar configdir[MAXLINE]; - gchar sharedir[MAXLINE]; -+gchar libdir[MAXLINE]; - gchar rootconfig[MAXLINE]; - gchar prefixdir[MAXLINE]; - gint support_ontheflyaudio; -@@ -499,13 +500,13 @@ - gtk_exit(1); - } - -- g_snprintf(tmp,MAXLINE,"%s/%s", sharedir, WAVPLAY); -+ g_snprintf(tmp,MAXLINE,"%s/%s", libdir, WAVPLAY); - check_executable(tmp,NULL,1); -- g_snprintf(tmp,MAXLINE,"%s/%s", sharedir, RMTOOL); -+ g_snprintf(tmp,MAXLINE,"%s/%s", libdir, RMTOOL); - check_executable(tmp,NULL,1); -- g_snprintf(tmp,MAXLINE,"%s/%s", sharedir, VRFYTOOL); -+ g_snprintf(tmp,MAXLINE,"%s/%s", libdir, VRFYTOOL); - check_executable(tmp,NULL,1); -- g_snprintf(tmp,MAXLINE,"%s/%s", sharedir, CDDBTOOL); -+ g_snprintf(tmp,MAXLINE,"%s/%s", libdir, CDDBTOOL); - check_executable(tmp,NULL,1); - - return isProDVD; -@@ -520,7 +521,7 @@ - gchar tmp[MAXLINE]; - gint stat; - -- g_snprintf(tmp,MAXLINE,"%s/%s", sharedir, WRAPPER); -+ g_snprintf(tmp,MAXLINE,"%s/%s", libdir, WRAPPER); - check_executable(tmp,NULL,1); - - /* security check. If this fails then the wrapper is wrong */ -@@ -662,7 +663,7 @@ - nofail = 1; - - /* first check if the wrapper got the correct permissions */ -- g_snprintf(tmp,MAXLINE,"%s/%s", sharedir, WRAPPER); -+ g_snprintf(tmp,MAXLINE,"%s/%s", libdir, WRAPPER); - wrap_uid = get_file_owner(tmp); - wrap_gid = sgid_set(tmp); - -@@ -764,7 +765,7 @@ - g_print("Options:\n"); - g_print("\t-d \n"); - g_print("\t-c (currently: %s)\n", configdir); -- g_print("\t-l (currently: %s)\n", sharedir); -+ g_print("\t-l (currently: %s)\n", libdir); - /* g_print("\t-r (currently: %s)\n", rootconfig); */ - g_print("\t-o : Disable multibyte font support\n"); - g_print("\t-n : Disable cdrtools version check (use at own risk)\n"); -@@ -813,11 +814,17 @@ - writerreaderdevs = NULL; - - #ifdef PRE_LIBDIR -- /* use prefix as sharedir as it came from the makefile-option */ -- strncpy(sharedir, PRE_LIBDIR, MAXLINE); -+ /* use prefix as libdir as it came from the makefile-option */ -+ strncpy(libdir, PRE_LIBDIR, MAXLINE); - #else - /* otherwise install our default prefix */ -- strncpy(sharedir, LIBDIR, MAXLINE); -+ strncpy(libdir, LIBDIR, MAXLINE); -+#endif -+ -+#ifdef PRE_SHAREDIR -+ strncpy(sharedir, PRE_SHAREDIR, MAXLINE); -+#else -+ strncpy(sharedir, SHAREDIR, MAXLINE); - #endif - - #ifdef CDRTOOLS_PREFIX -@@ -851,7 +858,7 @@ - break; - */ - case 'l': -- strncpy(sharedir, optarg, MAXLINE); -+ strncpy(libdir, optarg, MAXLINE); - break; - - case 'a': -@@ -908,7 +915,7 @@ - dodebug(1, "debug level: %d\n", debug); - dodebug(1, "configdir: %s\n", configdir); - dodebug(1, "rootconfig: %s\n", rootconfig); -- dodebug(1, "libdir: %s\n",sharedir); -+ dodebug(1, "libdir: %s\n",libdir); - dodebug(1, "checking large file support: sizeof(off_t) = %d\n", sizeof(off_t)); - - /* gettext stuff */ -diff -urNad trunk~/src/io.c trunk/src/io.c ---- trunk~/src/io.c 2006-05-06 15:18:20.000000000 +0200 -+++ trunk/src/io.c 2006-05-06 15:54:54.000000000 +0200 -@@ -114,6 +114,7 @@ - extern gchar hostname[MAXLINE]; - extern gchar username[MAXLINE]; - extern gchar sharedir[MAXLINE]; -+extern gchar libdir[MAXLINE]; - extern gchar configdir[MAXLINE]; - extern gchar prefixdir[MAXLINE]; - extern GtkWidget *cddb_info_label; -@@ -7863,7 +7864,7 @@ - gtk_label_set_text(GTK_LABEL(readtrack_info_label), _("Deleting tracks...")); - - /* build of command line */ -- g_snprintf(orgcmd,MAXLINE,"%s/%s ", sharedir, RMTOOL); -+ g_snprintf(orgcmd,MAXLINE,"%s/%s ", libdir, RMTOOL); - strcpy(cmd,orgcmd); - - length = g_list_length(delfiles); -@@ -8094,7 +8095,7 @@ - - /* always verify in 512 bytes blocks */ - g_snprintf(cmd2,MAXLINE,"%s/%s -b \"%s\" -", -- sharedir, VRFYTOOL, convert_escape(tmptmp)); -+ libdir, VRFYTOOL, convert_escape(tmptmp)); - - dodebug(1, "spawning: %s | %s\n",cmd,cmd2); - dolog(2, "Verify data track %s\n", fname); -@@ -8224,7 +8225,7 @@ - - strcpy(tmptmp,fname); - g_snprintf(cmd2,MAXLINE,"%s/%s -a \"%s\" -", -- sharedir, VRFYTOOL, convert_escape(tmptmp)); -+ libdir, VRFYTOOL, convert_escape(tmptmp)); - - dodebug(1, "spawning: %s | %s\n",cmd,cmd2); - dolog(2, "Verify audio track %s\n", fname); -@@ -8521,7 +8522,7 @@ - if (setupdata.cddb_use_http == 0) { - g_snprintf(cmd,MAXLINE, - "%s/%s -s \"%s\" -p %d -u \"%s\" -h \"%s\" -q \"%s\"", -- sharedir, CDDBTOOL, tmp_cddbhost, setupdata.cddb_port, -+ libdir, CDDBTOOL, tmp_cddbhost, setupdata.cddb_port, - username, hostname, tmp); - } else { - /* we want to use http */ -@@ -8529,13 +8530,13 @@ - /* but no proxy */ - g_snprintf(cmd,MAXLINE, - "%s/%s -s \"%s\" -u \"%s\" -h \"%s\" -H -q \"%s\"", -- sharedir, CDDBTOOL, tmp_cddbhost, -+ libdir, CDDBTOOL, tmp_cddbhost, - username, hostname, tmp); - } else { - /* http with proxy */ - g_snprintf(cmd,MAXLINE, - "%s/%s -s \"%s\" -u \"%s\" -h \"%s\" -U \"%s\" -P %d -q \"%s\"", -- sharedir, CDDBTOOL, tmp_cddbhost, -+ libdir, CDDBTOOL, tmp_cddbhost, - username, hostname, tmp_cddbproxy, - setupdata.cddb_proxy_port, tmp); - } -@@ -8593,8 +8594,8 @@ - FILE *fpin; - - /* allocate memory */ -- g_snprintf(line,MAXLINE,"%s/%s -d \"%s\" \"%s/%s\" 2>&1", sharedir, -- WAVPLAY, setupdata.dsp_device, sharedir, DSPTESTSOUND); -+ g_snprintf(line,MAXLINE,"%s/%s -d \"%s\" \"%s/%s\" 2>&1", libdir, -+ WAVPLAY, setupdata.dsp_device, libdir, DSPTESTSOUND); - - dodebug(1, "calling: %s\n", line); - -@@ -10224,8 +10225,8 @@ - if (strncmp(line,"X-CD-Roast ", 11) == 0) { - strcpy(xcdrver,line+11); - } -- if (strncmp(line,"sharedir: ", 10) == 0) { -- strcpy(sharever,line+10); -+ if (strncmp(line,"libdir: ", 8) == 0) { -+ strcpy(sharever,line+8); - } - if (strncmp(line,"prefixdir: ", 11) == 0) { - strcpy(prefixver,line+11); -@@ -10254,9 +10255,9 @@ - tmp, xcdrver, XCDROAST_VERSION); - ret = 1; - } -- if (strcmp(sharever,sharedir) != 0) { -- fprintf(stderr, "WARNING: Wrapper %s configured\n\tsharedir %s instead of %s\n", -- tmp, sharever, sharedir); -+ if (strcmp(sharever,libdir) != 0) { -+ fprintf(stderr, "WARNING: Wrapper %s configured\n\tlibdir %s instead of %s\n", -+ tmp, sharever, libdir); - ret = 0; - } - if (strcmp(prefixver,prefixdir) != 0) { -@@ -10370,7 +10371,7 @@ - #endif - - /* set the correct permissions to the wrapper */ -- g_snprintf(bin,MAXLINE,"%s/%s", sharedir, WRAPPER); -+ g_snprintf(bin,MAXLINE,"%s/%s", libdir, WRAPPER); - g_snprintf(tmp,MAXLINE,"%s root %s\n", cmd_chown, bin); - strcat(ret,tmp); - #if 0 -@@ -10456,7 +10457,7 @@ - } - free_nonrootvalues(&nrs_vals); - #endif -- g_snprintf(bin,MAXLINE,"%s/%s", sharedir, WRAPPER); -+ g_snprintf(bin,MAXLINE,"%s/%s", libdir, WRAPPER); - g_snprintf(tmp,MAXLINE,"%s 755 %s\n", cmd_chmod, bin); - strcat(ret,tmp); - } -diff -urNad trunk~/src/main.c trunk/src/main.c ---- trunk~/src/main.c 2006-05-06 15:52:28.000000000 +0200 -+++ trunk/src/main.c 2006-05-06 15:54:54.000000000 +0200 -@@ -57,6 +57,7 @@ - static gint lastxsize, lastysize; - - extern gchar sharedir[MAXLINE]; -+extern gchar libdir[MAXLINE]; - extern gchar rootconfig[MAXLINE]; - extern gchar xcdroast_version_loaded[MAXLINE]; - -diff -urNad trunk~/src/menus.c trunk/src/menus.c ---- trunk~/src/menus.c 2006-05-06 15:18:20.000000000 +0200 -+++ trunk/src/menus.c 2006-05-06 15:54:54.000000000 +0200 -@@ -72,6 +72,7 @@ - extern GList *tocfiles; - extern gint read_abort_mark; - extern gchar sharedir[MAXLINE]; -+extern gchar libdir[MAXLINE]; - extern GtkWidget *cdlist_l1, *imglist_l2; - extern GtkCList *cdlist, *imglist2; - extern gchar configdir[MAXLINE]; -diff -urNad trunk~/src/setup.c trunk/src/setup.c ---- trunk~/src/setup.c 2006-05-06 15:18:20.000000000 +0200 -+++ trunk/src/setup.c 2006-05-06 15:54:54.000000000 +0200 -@@ -61,6 +61,7 @@ - extern gchar rootconfig[MAXLINE]; - extern gchar xcdroast_version_loaded[MAXLINE]; - extern gchar sharedir[MAXLINE]; -+extern gchar libdir[MAXLINE]; - extern gint altdevscan; - extern gchar security_key[MAXLINE]; - -diff -urNad trunk~/src/wav_frontend.c trunk/src/wav_frontend.c ---- trunk~/src/wav_frontend.c 2006-05-06 15:18:20.000000000 +0200 -+++ trunk/src/wav_frontend.c 2006-05-06 15:54:54.000000000 +0200 -@@ -50,6 +50,7 @@ - extern setup_data_t setupdata; - extern GList *imagelist; - extern gchar sharedir[MAXLINE]; -+extern gchar libdir[MAXLINE]; - - gint wav_in, wavplay_quit; - GtkWidget *wav_quit_button; -@@ -157,7 +158,7 @@ - } - - strcpy(tmptmp,filename); -- g_snprintf(cmd,MAXLINE,"%s/%s -g -d \"%s\" \"%s\" 2>&1", sharedir, WAVPLAY, -+ g_snprintf(cmd,MAXLINE,"%s/%s -g -d \"%s\" \"%s\" 2>&1", libdir, WAVPLAY, - setupdata.dsp_device, convert_escape(tmptmp)); - - dodebug(1, "spawning shell: %s\n",cmd); -diff -urNad trunk~/src/xcdroast.h trunk/src/xcdroast.h ---- trunk~/src/xcdroast.h 2006-05-06 15:18:20.000000000 +0200 -+++ trunk/src/xcdroast.h 2006-05-06 15:54:54.000000000 +0200 -@@ -174,6 +174,7 @@ - /* default paths/configfile */ - #define PREFIX "/usr/local" - #define LIBDIR "lib/xcdroast-0.98" -+#define SHAREDIR "share/xcdroast-0.98" - #define CONFIGDIR "~/.xcdroast" - #define CONFFILE "xcdr098.cfg" - #define LOGFILE "xcdr098.log" -diff -urNad trunk~/src/xcdrwrap.c trunk/src/xcdrwrap.c ---- trunk~/src/xcdrwrap.c 2006-05-06 15:18:20.000000000 +0200 -+++ trunk/src/xcdrwrap.c 2006-05-06 15:54:54.000000000 +0200 -@@ -91,6 +91,7 @@ - - - static char sharedir[MAXLINE]; -+static char libdir[MAXLINE]; - static char prefixdir[MAXLINE]; - static char rootconfig[MAXLINE]; - static char username[MAXLINE]; -@@ -298,6 +299,7 @@ - } - if (strncmp(cmd,"-V",MAXLINE) == 0) { - printf("X-CD-Roast %s\n", XCDROAST_VERSION); -+ printf("libdir: %s\n", libdir); - printf("sharedir: %s\n", sharedir); - printf("prefixdir: %s\n", prefixdir); - -@@ -359,8 +361,8 @@ - return; - } - -- /* otherwise its relative - add sharedir first */ -- snprintf(ret,MAXLINE,"%s/%s", sharedir, app); -+ /* otherwise its relative - add libdir first */ -+ snprintf(ret,MAXLINE,"%s/%s", libdir, app); - - /* now check if this file does exist */ - if (stat(ret,&buf) != 0) { -@@ -613,11 +615,13 @@ - seen_device_spec = 0; - - #ifdef PRE_LIBDIR -- /* use prefix as sharedir as it came from the makefile-option */ -- strncpy(sharedir, PRE_LIBDIR, MAXLINE); -+ /* use prefix as libdir as it came from the makefile-option */ -+ strncpy(libdir, PRE_LIBDIR, MAXLINE); -+ strncpy(sharedir, PRE_SHAREDIR, MAXLINE); - #else - /* otherwise install our default prefix */ -- strncpy(sharedir, LIBDIR, MAXLINE); -+ strncpy(libdir, LIBDIR, MAXLINE); -+ strncpy(sharedir, SHAREDIR, MAXLINE); - #endif - - #ifdef CDRTOOLS_PREFIX -diff -urNad trunk~/src/xtools.c trunk/src/xtools.c ---- trunk~/src/xtools.c 2006-05-06 15:54:54.000000000 +0200 -+++ trunk/src/xtools.c 2006-05-06 15:54:54.000000000 +0200 -@@ -58,6 +58,7 @@ - extern gint bigfonts; - extern gint oldfontcode; - extern gchar sharedir[MAXLINE]; -+extern gchar libdir[MAXLINE]; - extern gchar prefixdir[MAXLINE]; - extern gint c_locale_is_utf8; - -@@ -2361,8 +2362,8 @@ - return; - } - -- /* otherwise its relative - add sharedir first */ -- g_snprintf(ret,MAXLINE,"%s/%s", sharedir, app); -+ /* otherwise its relative - add libdir first */ -+ g_snprintf(ret,MAXLINE,"%s/%s", libdir, app); - - /* now check if this file does exist */ - if (stat(ret,&buf) != 0) { -@@ -2380,7 +2381,7 @@ - gchar *get_wrap_path(gchar *cmd, gchar *ret) { - gchar tmp[MAXLINE]; - -- g_snprintf(tmp,MAXLINE,"%s/%s %s", sharedir, WRAPPER, cmd); -+ g_snprintf(tmp,MAXLINE,"%s/%s %s", libdir, WRAPPER, cmd); - strncpy(ret, tmp, MAXLINE); - - return ret; -@@ -2394,10 +2395,10 @@ - - /* use DVD version if installed and media type > 1GB */ - if (curset.isProDVD && curset.cdrtype > 1000) { -- g_snprintf(tmp,MAXLINE,"%s/%s %s", sharedir, WRAPPER, -+ g_snprintf(tmp,MAXLINE,"%s/%s %s", libdir, WRAPPER, - "CDRECORDPRODVD"); - } else { -- g_snprintf(tmp,MAXLINE,"%s/%s %s", sharedir, WRAPPER, -+ g_snprintf(tmp,MAXLINE,"%s/%s %s", libdir, WRAPPER, - "CDRECORD"); - } - strncpy(ret, tmp, MAXLINE); diff --git a/xcdroast-0.98alpha15-10_cddbtool.patch b/xcdroast-0.98alpha15-10_cddbtool.patch deleted file mode 100644 index 2db4936..0000000 --- a/xcdroast-0.98alpha15-10_cddbtool.patch +++ /dev/null @@ -1,56 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_cddbtool.dpatch by > -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Patch to suppor sending utf8 char when using gtk2. -## DP: Provided by Robert Grimm. #336202 - -@DPATCH@ -diff -urNad trunk~/src/cddbtool.c trunk/src/cddbtool.c ---- trunk~/src/cddbtool.c 2006-05-04 13:39:56.000000000 +0200 -+++ trunk/src/cddbtool.c 2006-05-04 13:40:52.000000000 +0200 -@@ -46,7 +46,11 @@ - - #define CDDB_HTTP_CMD "GET http://%s/~cddb/cddb.cgi?cmd=" - #define CDDB_HTTP_KEEP " HTTP/1.0\r\nHost: %s\r\nConnection: Keep-Alive\r\nProxy-Connection: Keep-Alive\r\n%s\r\n" -+#if GTK_MAJOR_VERSION < 2 - #define CDDB_HTTP_HELLO "hello=%s+%s+xcdroast+%s&proto=1"CDDB_HTTP_KEEP -+#else -+#define CDDB_HTTP_HELLO "hello=%s+%s+xcdroast+%s&proto=6"CDDB_HTTP_KEEP -+#endif - #define CDDB_HTTP_STAT CDDB_HTTP_CMD"stat&"CDDB_HTTP_HELLO - #define CDDB_HTTP_MOTD CDDB_HTTP_CMD"motd&"CDDB_HTTP_HELLO - #define CDDB_HTTP_QUERY CDDB_HTTP_CMD"cddb+query+%s&"CDDB_HTTP_HELLO -@@ -240,11 +244,30 @@ - fflush(stdout); - return 1; - } -- -+ -+#if GTK_MAJOR_VERSION > 1 -+ -+ g_snprintf(tmp,MAXLINE,"%s %d\r\n", "proto", 6); -+ if (writen(sockfd,tmp,strlen(tmp), 1) != strlen(tmp)) { -+ g_print("Error: write error on socket when setting protocol\n"); -+ fflush(stdout); -+ return 1; -+ } -+ n = read_line2(sockfd, tmp, MAXLINE, 1); -+ if (n < 0) { -+ g_print("Error: read error on socket when setting protocol\n"); -+ fflush(stdout); -+ return 1; -+ } -+#endif - code = get_cddb_code(tmp); - switch(code) { -- /* all ok */ -+ /* all ok */ -+#if GTK_MAJOR_VERSION < 2 - case 200: -+#else -+ case 201: -+#endif - return 0; - - /* handshake failed */ diff --git a/xcdroast-0.98alpha15-11_mkisofs_options.patch b/xcdroast-0.98alpha15-11_mkisofs_options.patch deleted file mode 100644 index 8a735c2..0000000 --- a/xcdroast-0.98alpha15-11_mkisofs_options.patch +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 11_mkisofs_options.dpatch by > -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Support for changes on mkisofs. - -@DPATCH@ -Index: src/io.c -=================================================================== ---- src/io.c.orig 2006-11-05 12:52:46.000000000 +0100 -+++ src/io.c 2006-11-05 12:52:55.000000000 +0100 -@@ -9027,7 +9027,7 @@ - strcat(tmp2,"-D "); - } - if (masterparam.opt[7]) { -- strcat(tmp2,"-L "); -+ strcat(tmp2,"-allow-leading-dots "); - } - if (masterparam.opt[8]) { - strcat(tmp2,"-d "); -@@ -9161,7 +9161,7 @@ - } - if (masterparam.publisher) { - strcpy(tmptmp, masterparam.publisher); -- g_snprintf(tmp5,MAXLINE,"-P \"%s\" ", -+ g_snprintf(tmp5,MAXLINE,"-publisher \"%s\" ", - convert_escape(tmptmp)); - strcat(tmp4,tmp5); - } diff --git a/xcdroast-0.98alpha15-12_cdrecord_versions.patch b/xcdroast-0.98alpha15-12_cdrecord_versions.patch deleted file mode 100644 index a766c68..0000000 --- a/xcdroast-0.98alpha15-12_cdrecord_versions.patch +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 12_cdrecord_versions.dpatch by > -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad trunk~/src/xcdroast.h trunk/src/xcdroast.h ---- trunk~/src/xcdroast.h 2006-05-06 15:18:20.000000000 +0200 -+++ trunk/src/xcdroast.h 2006-05-08 11:47:57.000000000 +0200 -@@ -124,8 +124,8 @@ - IT WONT WORK WITH LOWER VERSIONS, EVEN WHEN YOU THINK IT DOES! */ - - #define CDRECORD_VERSION "1.11a34" --#define CDRECORD_PRODVD_VERSION "2.01a11" --#define CDRECORD_VERSION_WITH_ONTHFLYAUDIO "2.01a13" -+#define CDRECORD_PRODVD_VERSION "2.01.01" -+#define CDRECORD_VERSION_WITH_ONTHFLYAUDIO "2.01.01" - #define MKISOFS_VERSION "1.15a17" - #define CDDA2WAV_VERSION "1.11a34" - #define READCD_VERSION "1.11a34" diff --git a/xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch b/xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch index d453a06..5da1318 100644 --- a/xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch +++ b/xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch @@ -1,5 +1,27 @@ ---- xcdroast-0.98alpha15/src/xcdrdata.h.p23 2003-05-26 22:55:44.000000000 +0200 -+++ xcdroast-0.98alpha15/src/xcdrdata.h 2007-08-13 15:36:40.000000000 +0200 +diff -up xcdroast-0.98alpha16/src/menus.c.p23 xcdroast-0.98alpha16/src/menus.c +--- xcdroast-0.98alpha16/src/menus.c.p23 2008-08-20 17:41:28.000000000 +0200 ++++ xcdroast-0.98alpha16/src/menus.c 2009-02-09 16:55:07.000000000 +0100 +@@ -2701,7 +2701,7 @@ static const gchar *blanktrans[] = BLANK + gtk_container_set_border_width (GTK_CONTAINER (box1), 5); + gtk_container_add(GTK_CONTAINER(dialog),box1); + +- if (!curset.isProDVD) { ++ if (!curset.isDVD) { + f1 = gtk_frame_new(_("Blank CD-RW")); + } else { + f1 = gtk_frame_new(_("Blank CD/DVD+-RW")); +@@ -2811,7 +2811,7 @@ static const gchar *blanktrans[] = BLANK + gtk_box_pack_start(GTK_BOX(box1),box3,FALSE,TRUE,5); + gtk_widget_show(box3); + +- if (!curset.isProDVD) { ++ if (!curset.isDVD) { + button1 = gtk_button_new_with_label(_("Blank CD-RW")); + } else { + button1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); +diff -up xcdroast-0.98alpha16/src/xcdrdata.h.p23 xcdroast-0.98alpha16/src/xcdrdata.h +--- xcdroast-0.98alpha16/src/xcdrdata.h.p23 2008-08-20 17:57:53.000000000 +0200 ++++ xcdroast-0.98alpha16/src/xcdrdata.h 2009-02-09 16:55:07.000000000 +0100 @@ -60,7 +60,9 @@ typedef struct setup_data { gboolean root_option_change_imagedirs; gboolean root_option_change_logoptions; @@ -19,414 +41,64 @@ gint support_ontheflyaudio; gint writer_devnr; gint reader_devnr; ---- xcdroast-0.98alpha15/src/xcdrwrap.c.p23 2007-08-13 15:36:40.000000000 +0200 -+++ xcdroast-0.98alpha15/src/xcdrwrap.c 2007-08-13 15:36:40.000000000 +0200 -@@ -277,8 +277,8 @@ char tmp[MAXLINE]; - strcpy(ret, CDRECORD); - return ret; - } -- if (strncmp(cmd,"CDRECORDPRODVD",MAXLINE) == 0) { -- strcpy(ret, CDRECORDPRODVD); -+ if (strncmp(cmd,"CDRECORDDVD",MAXLINE) == 0) { -+ strcpy(ret, CDRECORDDVD); - return ret; - } - if (strncmp(cmd,"CDDA2WAV",MAXLINE) == 0) { -@@ -314,9 +314,9 @@ char tmp[MAXLINE]; - #endif - /* show found paths of helper apps */ - get_spawn_path(CDRECORD, tmp, 1); -- printf("cdrecord found at: %s\n", tmp); -- get_spawn_path(CDRECORDPRODVD, tmp, 1); -- printf("cdrecord-ProDVD found at: %s\n", tmp); -+ printf(CDRECORD_NAME " found at: %s\n", tmp); -+ get_spawn_path(CDRECORDDVD, tmp, 1); -+ printf(CDRECORDDVD_NAME " found at: %s\n", tmp); - get_spawn_path(CDDA2WAV, tmp, 1); - printf("cdda2wav found at: %s\n", tmp); - get_spawn_path(READCD, tmp, 1); ---- xcdroast-0.98alpha15/src/create.c.p23 2003-10-30 12:28:10.000000000 +0100 -+++ xcdroast-0.98alpha15/src/create.c 2007-08-13 15:36:40.000000000 +0200 -@@ -523,7 +523,7 @@ GtkWidget *scrolled_win, *list; - gtk_widget_show(tbl); - vbox = gtk_vbox_new(FALSE,10); - gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,1,2,0,1); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("CD-Information")); - } else { - f1 = gtk_frame_new(_("CD/DVD-Information")); -@@ -1260,7 +1260,7 @@ GtkWidget *scrolled_win, *img_list; - gtk_widget_show(tbl); - vbox = gtk_vbox_new(FALSE,10); - gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,0,1,0,1); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("CD-Information")); - } else { - f1 = gtk_frame_new(_("CD/DVD-Information")); -@@ -2979,7 +2979,7 @@ GtkTargetEntry target_entry[3]; - GTK_SIGNAL_FUNC(fixate_clicked), NULL); - define_tooltip(b1,_("Just fixate (close) the CD, if for some reason the CD has been written but not fixated.")); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - b1 = gtk_button_new_with_label(_("Blank CD-RW")); - } else { - b1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); -@@ -3086,7 +3086,7 @@ GtkTargetEntry target_entry[3]; - gtk_widget_show (menu_item); - i++; - } -- if (curset.isProDVD) { -+ if (curset.isDVD) { - i = 0; - tmpval = curset.cdrtype; - while (dvdtypes[i] != 0) { -@@ -5774,7 +5774,7 @@ GtkObject *adj; - bootable_frame1 = NULL; - bootable_frame2 = NULL; - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("Options to create a bootable CD")); - } else { - f1 = gtk_frame_new(_("Options to create a bootable CD/DVD")); -@@ -5794,7 +5794,7 @@ GtkObject *adj; - gtk_box_pack_start(GTK_BOX(vbox),tbl,FALSE,FALSE,0); - gtk_widget_show(tbl); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - l1 = rightjust_gtk_label_new(_("Make CD bootable?")); - } else { - l1 = rightjust_gtk_label_new(_("Make CD/DVD bootable?")); +diff -up xcdroast-0.98alpha16/src/create.c.p23 xcdroast-0.98alpha16/src/create.c +--- xcdroast-0.98alpha16/src/create.c.p23 2008-08-20 17:57:53.000000000 +0200 ++++ xcdroast-0.98alpha16/src/create.c 2009-02-09 16:55:07.000000000 +0100 @@ -6792,7 +6792,7 @@ gint sel, btn; fill_session_available(); /* force recalc of session size if dvd */ /* so he will get the multisession warning */ -- if (curset.cdrtype >= 1000 && curset.isProDVD == 1 && curset.multisession == 1) { -+ if (curset.cdrtype >= 1000 && curset.isDVD == 1 && curset.multisession == 1) { +- if (curset.cdrtype >= 1000 && ( curset.isProDVD & 1 ) && curset.multisession == 1) { ++ if (curset.cdrtype >= 1000 && ( curset.isDVD & 1 ) && curset.multisession == 1) { set_sessionsize_unknown(); } break; -@@ -7023,7 +7023,7 @@ gchar tmp2[MAXLINE]; - gtk_widget_show (menu_item); - i++; - } -- if (curset.isProDVD) { -+ if (curset.isDVD) { - i = 0; - tmpval = curset.cdrtype; - while (dvdtypes[i] != 0) { -@@ -7174,7 +7174,7 @@ gchar tmp2[MAXLINE]; - gtk_widget_show(b1); - define_tooltip(b1,_("Set additional write options for advanced users.")); - /* blank button */ -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - b1 = gtk_button_new_with_label(_("Blank CD-RW")); - } else { - b1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); ---- xcdroast-0.98alpha15/src/xtools.c.p23 2007-08-13 15:36:40.000000000 +0200 -+++ xcdroast-0.98alpha15/src/xtools.c 2007-08-13 15:36:40.000000000 +0200 -@@ -2376,7 +2376,7 @@ struct stat buf; +diff -up xcdroast-0.98alpha16/src/xcdroast.h.p23 xcdroast-0.98alpha16/src/xcdroast.h +--- xcdroast-0.98alpha16/src/xcdroast.h.p23 2008-08-21 12:36:52.000000000 +0200 ++++ xcdroast-0.98alpha16/src/xcdroast.h 2009-02-09 17:01:08.000000000 +0100 +@@ -112,22 +112,30 @@ + then in $PREFIX (e.g. /usr/bin/cdrecord instead of + /usr/local/lib/xcdroast-0.98/bin/cdrecord) */ - /* reroute a command through the wrapper */ - /* cmd is one of "CDRECORD", "MKISOFS", "CDDA2WAV", "READCD" -- or "CDRECORDPRODVD" */ -+ or "CDRECORDDVD" */ +-#define CDRECORD "bin/cdrecord" +-#define CDDA2WAV "bin/cdda2wav" +-#define READCD "bin/readcd" +-#define MKISOFS "bin/mkisofs" ++#define CDRECORD "bin/wodim" ++#define CDDA2WAV "bin/icedax" ++#define READCD "bin/readom" ++#define MKISOFS "bin/genisoimage" ++ ++#define CDRECORD_NAME "wodim" ++#define CDRECORDDVD_NAME "wodim" ++#define CDRECORDDVD_IS_FREE ++ ++#define CDDA2WAV_NAME "icedax" ++#define READCD_NAME "readom" ++#define MKISOFS_NAME "genisoimage" - gchar *get_wrap_path(gchar *cmd, gchar *ret) { - gchar tmp[MAXLINE]; -@@ -2388,15 +2388,15 @@ gchar tmp[MAXLINE]; - } + /* MINIMUM required versions. Greater versions are now silently + accepted. + Distribution-Vendors: DO NOT TOUCH THESE! + IT WONT WORK WITH LOWER VERSIONS, EVEN WHEN YOU THINK IT DOES! */ + +-#define CDRECORD_VERSION "2.01" +-#define CDRECORD_PRODVD_VERSION "2.01a11" ++#define CDRECORD_VERSION "1.1.9" ++#define CDRECORDDVD_VERSION "2.01a11" + #define CDRECORD_VERSION_WITH_ONTHFLYAUDIO "2.01a13" +-#define MKISOFS_VERSION "2.01" +-#define CDDA2WAV_VERSION "2.01" +-#define READCD_VERSION "2.01" ++#define MKISOFS_VERSION "1.1.9" ++#define CDDA2WAV_VERSION "1.1.9" ++#define READCD_VERSION "1.1.9" - /* reroute the cdrecord command through the wrapper */ --/* determine automatically if proDVD version is needed or not */ -+/* determine automatically if (pro)DVD version is needed or not */ - - gchar *get_wrap_path_cdrecord(gchar *ret) { - gchar tmp[MAXLINE]; - - /* use DVD version if installed and media type > 1GB */ -- if (curset.isProDVD && curset.cdrtype > 1000) { -+ if (curset.isDVD && curset.cdrtype > 1000) { - g_snprintf(tmp,MAXLINE,"%s/%s %s", libdir, WRAPPER, -- "CDRECORDPRODVD"); -+ "CDRECORDDVD"); - } else { - g_snprintf(tmp,MAXLINE,"%s/%s %s", libdir, WRAPPER, - "CDRECORD"); -@@ -2411,7 +2411,7 @@ gchar tmp[MAXLINE]; - - gint get_gracetime() { - -- if (curset.isProDVD && curset.cdrtype > 1000) { -+ if (curset.isDVD && curset.cdrtype > 1000) { - /* use 10 seconds for prodvd, because the keycheck - can take a while... */ - return 10; -@@ -3522,7 +3522,7 @@ gint count; - - /* return whether we have a empty CD-R or DVD-R in the drive */ - /* we are sure that there IS a medium there - but we dont know which type */ --/* check only if device is dvdwriter and we have prodvd installed */ -+/* check only if device is dvdwriter and we have (pro)dvd installed */ - - gchar *return_media_type(gint devnr) { - gchar drvflags[MAXLINE], drvmodes[MAXLINE]; -@@ -3532,7 +3532,7 @@ gint isdvd,i; - isdvd = 0; - i = get_writerreaderdevs_index(devnr); - -- if (i >= 0 && curset.isProDVD && writerreaderdevs[i]->is_dvdwriter) { -+ if (i >= 0 && curset.isDVD && writerreaderdevs[i]->is_dvdwriter) { - if (convert_devnr2busid(devnr,tmp) != 0) { - g_error("non existing cdrom?"); - } ---- xcdroast-0.98alpha15/src/main.c.p23 2007-08-13 15:36:40.000000000 +0200 -+++ xcdroast-0.98alpha15/src/main.c 2007-08-13 15:36:40.000000000 +0200 -@@ -227,7 +227,7 @@ gchar tmp[MAXLINE]; - gtk_box_pack_start(GTK_BOX(sidespace), side_t,TRUE,TRUE,0); - - side_t_btn1 = gtk_button_new_with_label (_("Setup")); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - side_t_btn2 = gtk_button_new_with_label (_("Duplicate CD")); - side_t_btn3 = gtk_button_new_with_label (_("Create CD")); - } else { -@@ -582,18 +582,20 @@ gint stat; - */ - - /* warn about non-existing LFS support in dvd mode */ -- if (curset.isProDVD == 1 && sizeof(off_t) != 8) { -+ if (curset.isDVD == 1 && sizeof(off_t) != 8) { - show_dialog(ICO_WARN, _("Warning: Your system is not able to create files larger\nthan 2 GB. Writing DVDs will therefore not possible."), T_OK, NULL, NULL, 0); - } - -+#ifndef CDRECORDDVD_IS_FREE - /* if we are in DVD mode, check if the security-key is set */ -- if (curset.isProDVD == 1) { -+ if (curset.isDVD == 1) { - keyenv = getenv("CDR_SECURITY"); - if (keyenv == NULL) { - show_dialog(ICO_WARN, _("Warning: You have not entered a cdrecord-ProDVD key in setup.\nPlease see the FAQ on how to obtain your free key.\nYou also have to renew the key every few months because it got an\nexpire date. You will not be able to properly write DVDs without it."), T_OK, NULL, NULL, 0); - } - - } -+#endif - - dolog(1,"Starting X-CD-Roast\n"); - ---- xcdroast-0.98alpha15/src/main.h.p23 2007-08-13 15:36:40.000000000 +0200 -+++ xcdroast-0.98alpha15/src/main.h 2007-08-13 15:36:40.000000000 +0200 -@@ -194,7 +194,7 @@ gint show_and_start_master(); - gint start_master_action(); - gint start_onthefly_master_action(gint write_devnr); - --gint check_version_cdrecord(gchar *match, gint dvd, gchar *found, gint *isProDVD); -+gint check_version_cdrecord(gchar *match, gint dvd, gchar *found, gint *isDVD); - gint check_version_mkisofs(gchar *match, gchar *found); - gint check_version_cdda2wav(gchar *match, gchar *found); - gint check_version_readcd(gchar *match, gchar *found); ---- xcdroast-0.98alpha15/src/init.c.p23 2007-08-13 15:36:40.000000000 +0200 -+++ xcdroast-0.98alpha15/src/init.c 2007-08-13 15:36:40.000000000 +0200 -@@ -81,8 +81,10 @@ gint c_locale_is_utf8; - gchar *language = NULL; - GdkFont *fixedfont; - -+#ifndef CDRECORDDVD_IS_FREE - /* ProDVD key in global variable to let solaris-putenv access it */ - gchar security_key[MAXLINE]; -+#endif - - /* give the setupdata-structure valid startvalues */ - -@@ -137,7 +139,9 @@ gint fullaccess; - setupdata.root_option_change_imagedirs = fullaccess; - setupdata.root_option_change_logoptions = fullaccess; - -+#ifndef CDRECORDDVD_IS_FREE - setupdata.ProDVDkey = g_strdup(""); -+#endif - - setupdata.mainwindow.x = -1; - setupdata.mainwindow.y = -1; -@@ -157,7 +161,7 @@ static void init_curset() { - gint cdrtypes[] = CDR_TYPES_MIN; - gint i; - -- curset.isProDVD = 0; -+ curset.isDVD = 0; - curset.support_ontheflyaudio = 0; - curset.writer_devnr = -1; - curset.reader_devnr = -1; -@@ -392,16 +396,16 @@ gint second; - } - - /* check if needed binaries are installed */ --/* return if proDVD version found */ -+/* return if (pro)DVD version found */ - - static gint check_binaries(gint noversioncheck) { - gchar tmp[MAXLINE]; - gchar ver[MAXLINE]; - gchar link[MAXLINE]; - gint stat; --gint out, isProDVD; -+gint out, isDVD; - -- isProDVD = 0; -+ isDVD = 0; - check_executable(UNAME,UNAME2,0); - check_executable(DF,DF2,0); - -@@ -417,7 +421,7 @@ gint out, isProDVD; - } - stat = check_version_cdrecord(CDRECORD_VERSION, 0, ver, &out); - if (stat == 1 && !noversioncheck) { -- g_warning("Invalid cdrecord version %s found.\n\tExpecting at least version %s\n\tStart xcdroast with the -n option to override (not recommended!)", ver, CDRECORD_VERSION); -+ g_warning("Invalid " CDRECORD_NAME " version %s found.\n\tExpecting at least version %s\n\tStart xcdroast with the -n option to override (not recommended!)", ver, CDRECORD_VERSION); - gtk_exit(1); - } - if (stat == 2) { -@@ -425,8 +429,8 @@ gint out, isProDVD; - gtk_exit(1); - } - -- /* check optional installation of ProDVD version */ -- get_spawn_path(CDRECORDPRODVD,tmp); -+ /* check optional installation of (Pro)DVD version */ -+ get_spawn_path(CDRECORDDVD,tmp); - if (is_file(tmp)) { - if (check_islink(tmp, link)) { - #if 0 -@@ -435,9 +439,9 @@ gint out, isProDVD; - dodebug(3, "%s is a link to %s\n", tmp, link); - #endif - } -- stat = check_version_cdrecord(CDRECORD_PRODVD_VERSION, 1, ver, &isProDVD); -+ stat = check_version_cdrecord(CDRECORDDVD_VERSION, 1, ver, &isDVD); - if (stat == 1 && !noversioncheck) { -- g_warning("Invalid cdrecord-ProDVD version %s found.\n\tExpecting at least version %s\n\tStart xcdroast with the -n option to override (not recommended!)", ver, CDRECORD_PRODVD_VERSION); -+ g_warning("Invalid " CDRECORDDVD_NAME " version %s found.\n\tExpecting at least version %s\n\tStart xcdroast with the -n option to override (not recommended!)", ver, CDRECORDDVD_VERSION); - gtk_exit(1); - } - } -@@ -509,7 +513,7 @@ gint out, isProDVD; - g_snprintf(tmp,MAXLINE,"%s/%s", libdir, CDDBTOOL); - check_executable(tmp,NULL,1); - -- return isProDVD; -+ return isDVD; - } - - -@@ -702,7 +706,7 @@ gint nofail; - } - - /* check prodvd only when it is installed */ -- get_spawn_path(CDRECORDPRODVD,tmp); -+ get_spawn_path(CDRECORDDVD,tmp); - if (is_file(tmp)) { - if (check_nonroot_mode_cdrtools(tmp) == 0) { - nofail = 0; -@@ -769,7 +773,8 @@ static void usage(gchar *cmd) { - /* g_print("\t-r (currently: %s)\n", rootconfig); */ - g_print("\t-o : Disable multibyte font support\n"); - g_print("\t-n : Disable cdrtools version check (use at own risk)\n"); -- g_print("\t-w : Don't use cdrecord-ProDVD, even when it is available.\n"); -+ if (strcmp(CDRECORD, CDRECORDDVD)) -+ g_print("\t-w : Don't use " CDRECORDDVD_NAME ", even when it is available.\n"); - #if (defined(__MACH__) && defined(__APPLE__)) - g_print("\t-a : Don't display the autodiskmount daemon handling at startup\n"); - #else -@@ -797,7 +802,7 @@ gchar *mylocale; - gchar *p1; - gchar *alt_dev_string; - gint c, usercnf, stat; --gint isProDVD, ignoreProDVD; -+gint isDVD, ignoreDVD; - - if (!language) - language = g_strdup(""); -@@ -807,7 +812,7 @@ gint isProDVD, ignoreProDVD; - no_versioncheck = 0; - support_ontheflyaudio = 0; - c_locale_is_utf8 = 0; -- ignoreProDVD = 0; -+ ignoreDVD = 0; - alt_dev_string = NULL; - strncpy(configdir, CONFIGDIR, MAXLINE); - g_snprintf(rootconfig, MAXLINE, "%s/%s", SYSCONFDIR, ROOTCONFIG); -@@ -874,7 +879,7 @@ gint isProDVD, ignoreProDVD; - break; - - case 'w': -- ignoreProDVD = 1; -+ ignoreDVD = 1; - break; - - case 'f': -@@ -974,17 +979,19 @@ gint isProDVD, ignoreProDVD; - #endif - - dodebug(3, "Checking for helper binaries (noversioncheck = %d)\n", no_versioncheck); -- isProDVD = check_binaries(no_versioncheck); -+ isDVD = check_binaries(no_versioncheck); - -- if (isProDVD) { -- if (ignoreProDVD) { -- isProDVD = 0; -- dodebug(1,"-> cdrecord.ProDVD detected but disabled\n"); -- } else { -- dodebug(1,"-> cdrecord.ProDVD detected\n"); -+ if (strcmp(CDRECORD, CDRECORDDVD)) { -+ if (isDVD) { -+ if (ignoreDVD) { -+ isDVD = 0; -+ dodebug(1,"-> " CDRECORDDVD_NAME " detected but disabled\n"); -+ } else { -+ dodebug(1,"-> " CDRECORDDVD_NAME " detected\n"); -+ } -+ } else { -+ dodebug(1,"-> " CDRECORDDVD_NAME " not detected\n"); - } -- } else { -- dodebug(1,"-> cdrecord.ProDVD not detected\n"); - } - if (support_ontheflyaudio == 1) { - dodebug(1, " Enabled support for on-the-fly audio\n"); -@@ -1025,7 +1032,7 @@ gint isProDVD, ignoreProDVD; - tocfiles = (GList *) NULL; - strcpy(xcdroast_version_loaded, ""); - -- curset.isProDVD = isProDVD; -+ curset.isDVD = isDVD; - curset.support_ontheflyaudio = support_ontheflyaudio; - - /* load iso-options if available */ -@@ -1149,7 +1156,8 @@ gint isProDVD, ignoreProDVD; - } - #endif - -- if (curset.isProDVD == 1) { -+#ifndef CDRECORDDVD_IS_FREE -+ if (curset.isDVD == 1) { - /* set key if we got one from the config-file */ - if (strcmp(setupdata.ProDVDkey,"")) { - -@@ -1162,6 +1170,7 @@ gint isProDVD, ignoreProDVD; - #endif - } - } -+#endif - - if (usercnf == 0) { - /* load ok */ ---- xcdroast-0.98alpha15/src/duplicate.c.p23 2003-10-26 14:14:19.000000000 +0100 -+++ xcdroast-0.98alpha15/src/duplicate.c 2007-08-13 15:36:40.000000000 +0200 + /* group to use for non-root-mode */ + /* #define NONROOTMODEGROUP "xcdwrite" - HISTORIC */ +diff -up xcdroast-0.98alpha16/src/duplicate.c.p23 xcdroast-0.98alpha16/src/duplicate.c +--- xcdroast-0.98alpha16/src/duplicate.c.p23 2003-10-26 14:14:19.000000000 +0100 ++++ xcdroast-0.98alpha16/src/duplicate.c 2009-02-09 16:55:07.000000000 +0100 @@ -1156,7 +1156,7 @@ GtkWidget *scrolled_win; gtk_table_set_col_spacings(GTK_TABLE(tbl),10); gtk_box_pack_start(GTK_BOX(actionspace),tbl,TRUE,TRUE,10); @@ -517,509 +189,15 @@ b1 = gtk_toggle_button_new_with_label(_("Write CD")); } else { b1 = gtk_toggle_button_new_with_label(_("Write CD/DVD")); ---- xcdroast-0.98alpha15/src/xcdroast.h.p23 2007-08-13 15:36:40.000000000 +0200 -+++ xcdroast-0.98alpha15/src/xcdroast.h 2007-08-13 15:36:51.000000000 +0200 -@@ -112,11 +112,19 @@ - then in $PREFIX (e.g. /usr/bin/cdrecord instead of - /usr/local/lib/xcdroast-0.98/bin/cdrecord) */ +diff -up xcdroast-0.98alpha16/src/main.c.p23 xcdroast-0.98alpha16/src/main.c +--- xcdroast-0.98alpha16/src/main.c.p23 2008-08-21 11:45:34.000000000 +0200 ++++ xcdroast-0.98alpha16/src/main.c 2009-02-09 16:55:07.000000000 +0100 +@@ -583,7 +583,7 @@ gint stat; + */ --#define CDRECORD "bin/cdrecord" --#define CDRECORDPRODVD "bin/cdrecord.prodvd" --#define CDDA2WAV "bin/cdda2wav" --#define READCD "bin/readcd" --#define MKISOFS "bin/mkisofs" -+#define CDRECORD "bin/wodim" -+#define CDRECORDDVD "bin/wodim" -+#define CDDA2WAV "bin/icedax" -+#define READCD "bin/readom" -+#define MKISOFS "bin/genisoimage" -+ -+#define CDRECORD_NAME "wodim" -+#define CDRECORDDVD_NAME "wodim" -+#define CDRECORDDVD_IS_FREE -+ -+#define CDDA2WAV_NAME "icedax" -+#define READCD_NAME "readom" -+#define MKISOFS_NAME "genisoimage" - - /* MINIMUM required versions. Greater versions are now silently - accepted. -@@ -124,11 +132,11 @@ - IT WONT WORK WITH LOWER VERSIONS, EVEN WHEN YOU THINK IT DOES! */ - - #define CDRECORD_VERSION "1.11a34" --#define CDRECORD_PRODVD_VERSION "2.01.01" -+#define CDRECORDDVD_VERSION "2.01.01" - #define CDRECORD_VERSION_WITH_ONTHFLYAUDIO "2.01.01" --#define MKISOFS_VERSION "1.15a17" --#define CDDA2WAV_VERSION "1.11a34" --#define READCD_VERSION "1.11a34" -+#define MKISOFS_VERSION "1.1.0" -+#define CDDA2WAV_VERSION "1.1.0" -+#define READCD_VERSION "1.1.0" - - /* group to use for non-root-mode */ - /* #define NONROOTMODEGROUP "xcdwrite" - HISTORIC */ ---- xcdroast-0.98alpha15/src/io.c.p23 2007-08-13 15:36:40.000000000 +0200 -+++ xcdroast-0.98alpha15/src/io.c 2007-08-13 15:36:40.000000000 +0200 -@@ -704,7 +704,7 @@ gint found; - strncpy(tmp2,dev,MAXLINE); - convert_escape(tmp2); - -- g_snprintf(tmp,MAXLINE," -scanbus dev= \"%s\" 2>&1",tmp2); -+ g_snprintf(tmp,MAXLINE," -scanbus dev= \"%s\" 2>/dev/null",tmp2); - strcat(line,tmp); - - dodebug(1, "calling: %s\n", line); -@@ -923,7 +923,7 @@ scsi_devices_t **scsidevices; - - /* traditional scanning first */ - get_wrap_path_cdrecord(line); -- strcat(line," -scanbus 2>&1"); -+ strcat(line," -scanbus 2>/dev/null"); - - dodebug(1, "calling: %s\n", line); - if ((fpin = popen(line,"r")) == NULL) { -@@ -974,7 +974,7 @@ scsi_devices_t **scsidevices; - scsicount = 0; - - get_wrap_path_cdrecord(line); -- g_snprintf(tmp,MAXLINE," dev=%s -scanbus 2>&1", transport); -+ g_snprintf(tmp,MAXLINE," dev=%s -scanbus 2>/dev/null", transport); - strcat(line, tmp); - - dodebug(1, "calling: %s\n", line); -@@ -1284,7 +1284,7 @@ FILE *fpin; - drvcount = 0; - - get_wrap_path_cdrecord(line); -- strcat(line," driver=help 2>&1"); -+ strcat(line," driver=help 2>&1 | sed -n '/Driver types:/,//p'"); - - dodebug(1, "calling: %s\n", line); - if ((fpin = popen(line,"r")) == NULL) { -@@ -1491,9 +1491,9 @@ gchar *p; - - if (!dev) return; - -- /* if prodvd available use it to get additional info */ -- if (curset.isProDVD) { -- get_wrap_path("CDRECORDPRODVD", tmp); -+ /* if (pro)dvd available use it to get additional info */ -+ if (curset.isDVD) { -+ get_wrap_path("CDRECORDDVD", tmp); - } else { - get_wrap_path("CDRECORD", tmp); - } -@@ -2111,9 +2111,11 @@ gint count; - g_snprintf(tmp,MAXLINE,"OPTION_SELECTIONMODE = %d\n",setupdata.option_selectionmode); - fputs(tmp,fd); - -+#ifndef CDRECORDDVD_IS_FREE - strcpy(tmp2,setupdata.ProDVDkey); - g_snprintf(tmp,MAXLINE,"PRODVD_KEY = \"%s\"\n",convert_escape(tmp2)); - fputs(tmp,fd); -+#endif - - /* save geometry data? */ - if (setupdata.option_savepos) { -@@ -2228,6 +2230,7 @@ gint count, i, newadded; - if (fgets(line,MAXLINE,fd) == NULL) - break; - -+#ifndef CDRECORDDVD_IS_FREE - /* special case here to protect pro-dvd-key */ - if (strstr(line, "PRODVD_KEY") && strlen(line) > 50) { - strncpy(tmp,line,50); -@@ -2236,6 +2239,7 @@ gint count, i, newadded; - } else { - dodebug(10,"config: %s", line); - } -+#endif - - /* skip empty or hashed lines */ - strip_string(line); -@@ -2515,6 +2519,7 @@ gint count, i, newadded; - if (strcmp("OPTION_SELECTIONMODE",id) == 0) { - setupdata.option_selectionmode = atoi(value); - } -+#ifndef CDRECORDDVD_IS_FREE - if (strcmp("PRODVD_KEY",id) == 0) { - /* dont overwrite evtuelly set value with empty key */ - if (strcmp(value,"") != 0) { -@@ -2522,6 +2527,7 @@ gint count, i, newadded; - setupdata.ProDVDkey = g_strdup(value); - } - } -+#endif - if (setupdata.option_savepos) { - if (strcmp("GEOMETRY_MAINWINDOW_X",id) == 0) { - setupdata.mainwindow.x = atoi(value); -@@ -5557,8 +5563,8 @@ gint found_atip,errcount; - } - - /* build command line */ -- if (curset.isProDVD) { -- get_wrap_path("CDRECORDPRODVD", tmp3); -+ if (curset.isDVD) { -+ get_wrap_path("CDRECORDDVD", tmp3); - } else { - get_wrap_path("CDRECORD", tmp3); - } -@@ -5867,7 +5873,7 @@ FILE *fpin; - drvcount = 0; - - get_wrap_path_cdrecord(line); -- strcat(line," blank=help 2>&1"); -+ strcat(line," blank=help 2>&1 | sed -n '/Blanking options:/,//p'"); - - dodebug(1, "calling: %s\n", line); - -@@ -5991,11 +5997,12 @@ gchar tmp[MAXLINE]; - dialog_done = -1; - } - -+#ifndef CDRECORDDVD_IS_FREE - /* or cdrecord died by signal? e.g. SIGALRM */ - if (WIFSIGNALED(ret) && read_done == 0) { - - /* most likely invalid prodvd key */ -- if (curset.isProDVD) { -+ if (curset.isDVD) { - strncpy(tmp, "\nReceived ALARM from cdrecord-ProDVD. Aborting blank...\nInvalid ProDVD key?\n", MAXLINE); - - convert_for_gtk2_textwidget(tmp); -@@ -6004,6 +6011,7 @@ gchar tmp[MAXLINE]; - read_done = 1; - } - } -+#endif - - dodebug(10,"Finished in read_blank_out with status: %d\n", - read_done); -@@ -6169,8 +6177,8 @@ gint ret; - strcat(tmp3, tmp4); + /* warn about non-existing LFS support in dvd mode */ +- if ((curset.isProDVD & 1) && sizeof(off_t) != 8) { ++ if ((curset.isDVD & 1) && sizeof(off_t) != 8) { + show_dialog(ICO_WARN, _("Warning: Your system is not able to create files larger\nthan 2 GB. Writing DVDs will therefore not possible."), T_OK, NULL, NULL, 0); } - -- if (curset.isProDVD) { -- get_wrap_path("CDRECORDPRODVD", tmp5); -+ if (curset.isDVD) { -+ get_wrap_path("CDRECORDDVD", tmp5); - } else { - get_wrap_path("CDRECORD", tmp5); - } -@@ -6378,14 +6386,16 @@ gint cdrecord_stderr; - dialog_done = -1; - } -+#ifndef CDRECORDDVD_IS_FREE - /* or cdrecord died by signal? e.g. SIGALRM */ - if (WIFSIGNALED(ret) && read_done == 0) { - - /* most likely invalid prodvd key */ -- if (curset.isProDVD && curset.cdrtype > 1000) { -+ if (curset.isDVD && curset.cdrtype > 1000) { - read_done = 2; - } - } -+#endif - - dodebug(10,"Finished in read_write_out with status: %d\n", - read_done); -@@ -6411,8 +6421,9 @@ gint cdrecord_stderr; - return; - } - -+#ifndef CDRECORDDVD_IS_FREE - /* prodvd and beginning to write soon? */ -- if (curset.isProDVD && curset.cdrtype > 1000) { -+ if (curset.isDVD && curset.cdrtype > 1000) { - if (strstr(line,"Last chance to quit")) { - cdrtimer = gtk_timeout_add(1000, - cdrtimer_callback, NULL); -@@ -6427,6 +6438,7 @@ gint cdrecord_stderr; - } - } - } -+#endif - - /* skip all lines that contain "seconds." */ - if (n > 8) { -@@ -6717,6 +6729,7 @@ gchar *p; - } - - -+#ifndef CDRECORDDVD_IS_FREE - /* display an error when useing prodvd and cdrecord aborts */ - - static void display_invalid_prodvdkey() { -@@ -6725,6 +6738,7 @@ static void display_invalid_prodvdkey() - show_dialog(ICO_WARN, _("cdrecord-ProDVD terminated.\n\nMost likely because you have entered\nan invalid key. Please check if it is correct."), T_OK, NULL, NULL, 0); - } - } -+#endif - - - /* call cdrecord to write some tracks */ -@@ -6973,10 +6987,12 @@ gint wrmode; - if (read_done != 0 || read_output_ctrl == 5) { - gtk_label_set_text(GTK_LABEL(readtrack_info_label), _("Error writing tracks")); - gtk_label_set_text(GTK_LABEL(readtrack_small_info),_("Write-Error:")); -+#ifndef CDRECORDDVD_IS_FREE - if (read_done == 2) { - /* invalid cdrecord key - show window */ - display_invalid_prodvdkey(); - } -+#endif - return 1; - } else { - /* all ok */ -@@ -7571,10 +7587,12 @@ gfloat per; - if (read_done != 0 || read_output_ctrl == 5) { - gtk_label_set_text(GTK_LABEL(readtrack_info_label), _("Error writing tracks")); - gtk_label_set_text(GTK_LABEL(readtrack_small_info),_("Write-Error:")); -+#ifndef CDRECORDDVD_IS_FREE - if (read_done == 2) { - /* invalid cdrecord key - show window */ - display_invalid_prodvdkey(); - } -+#endif - return 1; - } else { - /* all ok */ -@@ -7740,10 +7758,12 @@ gint wrmode; - if (read_done != 0 || read_output_ctrl == 5) { - gtk_label_set_text(GTK_LABEL(readtrack_info_label), _("Error writing tracks")); - gtk_label_set_text(GTK_LABEL(readtrack_small_info),_("Write-Error:")); -+#ifndef CDRECORDDVD_IS_FREE - if (read_done == 2) { - /* invalid cdrecord key - show window */ - display_invalid_prodvdkey(); - } -+#endif - return 1; - } else { - /* all ok */ -@@ -9893,10 +9913,12 @@ gint wrmode; - if (read_done != 0 || read_output_ctrl == 5) { - gtk_label_set_text(GTK_LABEL(readtrack_info_label), _("Error writing tracks")); - gtk_label_set_text(GTK_LABEL(readtrack_small_info),_("Write-Error:")); -+#ifndef CDRECORDDVD_IS_FREE - if (read_done == 2) { - /* invalid cdrecord key - show window */ - display_invalid_prodvdkey(); - } -+#endif - return 1; - } else { - /* all ok */ -@@ -9910,21 +9932,21 @@ gint wrmode; - /* check the version of cdrecord */ - /* return 1 if not correct (to old) */ - --gint check_version_cdrecord(gchar *match, gint dvd, gchar *found, gint *isProDVD) { -+gint check_version_cdrecord(gchar *match, gint dvd, gchar *found, gint *isDVD) { - gchar line[MAXLINE]; - gchar vline[MAXLINE]; - gchar ver[MAXLINE]; - FILE *fpin; - gchar *p; - -- *isProDVD = 0; -+ *isDVD = 0; - strcpy(ver,""); - if (dvd) { -- get_wrap_path("CDRECORDPRODVD",line); -+ get_wrap_path("CDRECORDDVD",line); - } else { - get_wrap_path("CDRECORD",line); - } -- strcat(line," -version 2>/dev/null"); -+ strcat(line," -version 2>&1"); - - dodebug(1, "calling: %s\n", line); - if ((fpin = popen(line,"r")) == NULL) { -@@ -9965,7 +9987,7 @@ gchar *p; - } else { - p = strstr(vline, "Cdrecord-ProDVD-Clone"); - if (p != NULL) { -- *isProDVD = 1; -+ *isDVD = 1; - p = strtok(p+22, " "); - if (p != NULL) { - strcpy(ver,p); -@@ -9979,6 +10001,9 @@ gchar *p; - p = strtok(NULL, " "); - if (p) { - strcpy(ver,p); -+ if (strstr(ver,"-dvd")) { -+ *isDVD = 1; -+ } - } - } - } -@@ -10045,9 +10070,9 @@ gchar *p; - /* now line contains the version string of mkisofs */ - /* try to extract the version number */ - -- p = strstr(line,"mkisofs"); -+ p = strstr(line, MKISOFS_NAME); - if (p != NULL) { -- p = strtok(p+8, " "); -+ p = strtok(p + (sizeof(MKISOFS_NAME) - 1) + 1, " "); - if (p != NULL) { - strcpy(ver,p); - } -@@ -10148,7 +10173,7 @@ gchar *p; - - strcpy(ver,""); - get_wrap_path("READCD",line); -- strcat(line," -version 2>/dev/null"); -+ strcat(line," -version 2>/dev/null | head -n 1"); - - dodebug(1, "calling: %s\n", line); - if ((fpin = popen(line,"r")) == NULL) { -@@ -10175,9 +10200,9 @@ gchar *p; - /* now line contains the version string of readcd */ - /* try to extract the version number */ - -- p = strstr(line,"readcd"); -+ p = strstr(line, READCD_NAME); - if (p != NULL) { -- p = strtok(p+7, " "); -+ p = strtok(p + (sizeof(READCD_NAME) - 1) + 1, " "); - if (p != NULL) { - strcpy(ver,p); - } ---- xcdroast-0.98alpha15/src/menus.c.p23 2007-08-13 15:36:40.000000000 +0200 -+++ xcdroast-0.98alpha15/src/menus.c 2007-08-13 15:36:40.000000000 +0200 -@@ -2702,7 +2702,7 @@ static const gchar *blanktrans[] = BLANK - gtk_container_set_border_width (GTK_CONTAINER (box1), 5); - gtk_container_add(GTK_CONTAINER(dialog),box1); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("Blank CD-RW")); - } else { - f1 = gtk_frame_new(_("Blank CD/DVD+-RW")); -@@ -2812,7 +2812,7 @@ static const gchar *blanktrans[] = BLANK - gtk_box_pack_start(GTK_BOX(box1),box3,FALSE,TRUE,5); - gtk_widget_show(box3); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - button1 = gtk_button_new_with_label(_("Blank CD-RW")); - } else { - button1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); ---- xcdroast-0.98alpha15/src/setup.c.p23 2007-08-13 15:36:40.000000000 +0200 -+++ xcdroast-0.98alpha15/src/setup.c 2007-08-13 15:36:40.000000000 +0200 -@@ -135,8 +135,10 @@ gint i,j; - g_free(bak_setupdata.cddb_proxy_host); - setupdata.logfile = g_strdup(bak_setupdata.logfile); - g_free(bak_setupdata.logfile); -+#ifndef CDRECORDDVD_IS_FREE - setupdata.ProDVDkey = g_strdup(bak_setupdata.ProDVDkey); - g_free(bak_setupdata.ProDVDkey); -+#endif - - /* restore and free also writerreader structure copy */ - if (bak_writerreader) { -@@ -266,6 +268,7 @@ gchar *buf, *locreturn, *p; - /* check_tilde(tmp); */ - setupdata.logfile = g_strdup(tmp); - -+#ifndef CDRECORDDVD_IS_FREE - g_free(setupdata.ProDVDkey); - n = gtk_text_get_length(GTK_TEXT(prodvdkey_txt)); - buf = gtk_editable_get_chars(GTK_EDITABLE(prodvdkey_txt),0,n); -@@ -284,6 +287,7 @@ gchar *buf, *locreturn, *p; - #else - putenv(security_key); - #endif -+#endif - - /* save the current window size if we are asked to */ - if (setupdata.option_savepos) { -@@ -308,8 +312,8 @@ gchar tmp[MAXLINE]; - dolog(2, "Confirm setup\n"); - - /* some lasts checks and warnings */ -- if (is_dvdwriter(setupdata.writer_devnr) && !curset.isProDVD) { -- ret = show_dialog(ICO_WARN, _("Please note that you have to install ProDVD support before\nyou can write DVDs. Currently you will only be able to\nwrite regular CDs with your DVD-Writer."), T_OK,T_CANCEL, NULL, 0); -+ if (is_dvdwriter(setupdata.writer_devnr) && !curset.isDVD) { -+ ret = show_dialog(ICO_WARN, _("Please note that you have to install DVD support before\nyou can write DVDs. Currently you will only be able to\nwrite regular CDs with your DVD-Writer."), T_OK,T_CANCEL, NULL, 0); - if (ret == 1) { - /* abort */ - return; -@@ -333,7 +337,9 @@ gchar tmp[MAXLINE]; - return; - - /* free memory of backup-config */ -+#ifndef CDRECORDDVD_IS_FREE - g_free(bak_setupdata.ProDVDkey); -+#endif - g_free(bak_setupdata.logfile); - g_free(bak_setupdata.cddb_host); - g_free(bak_setupdata.cddb_proxy_host); -@@ -1140,7 +1146,7 @@ static const gchar *helpwritemodes[] = H - gtk_box_pack_start(GTK_BOX(vbox2),tbl,FALSE,TRUE,0); - gtk_widget_show(tbl); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - l1 = rightjust_gtk_label_new(_("CD Writer Device:")); - } else { - l1 = rightjust_gtk_label_new(_("CD/DVD Writer Device:")); -@@ -2740,6 +2746,7 @@ GtkWidget *check; - define_tooltip(check, _("When enabled, then multiple selections in lists are handled like the lists in Windows (hold CTRL-Key to select more than one entry and use SHIFT to select a whole range of entries).")); - - -+#ifndef CDRECORDDVD_IS_FREE - f1 = gtk_frame_new(_("cdrecord-ProDVD key")); - set_font_and_color_frame(f1,BOLDFONT,NULL); - gtk_box_pack_start(GTK_BOX(vbox),f1,TRUE,TRUE,10); -@@ -2782,6 +2789,7 @@ GtkWidget *check; - gtk_widget_set_sensitive(l1, FALSE); - gtk_widget_set_sensitive(txt, FALSE); - } -+#endif // !defined(CDRECORDDVD_IS_FREE) - } - - -@@ -3186,7 +3194,7 @@ gchar tmp[MAXLINE]; - gtk_container_add (GTK_CONTAINER (f1), tbl); - gtk_widget_show(tbl); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - check = gtk_check_button_new_with_label(_("change CD Writer Device")); - } else { - check = gtk_check_button_new_with_label(_("change CD/DVD Writer Device")); -@@ -3208,7 +3216,7 @@ gchar tmp[MAXLINE]; - gtk_widget_show(check); - define_tooltip(check, _("If enabled, then the user is allowed the change the write parameters for the CD Writer (e.g. Speed and FIFO-Buffer-Size).")); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - check = gtk_check_button_new_with_label(_("change CD Reader Device")); - } else { - check = gtk_check_button_new_with_label(_("change CD/DVD Reader Device")); -@@ -3290,7 +3298,9 @@ gint i; - bak_setupdata.cddb_host = g_strdup(setupdata.cddb_host); - bak_setupdata.cddb_proxy_host = g_strdup(setupdata.cddb_proxy_host); - bak_setupdata.logfile = g_strdup(setupdata.logfile); -+#ifndef CDRECORDDVD_IS_FREE - bak_setupdata.ProDVDkey = g_strdup(setupdata.ProDVDkey); -+#endif - - /* backup the dynamic part of the readerwriter structure too */ - bak_writerreader = g_new0(writerreader_bak_t *, MAXDEVICES); -@@ -3375,7 +3385,7 @@ gint i; - gtk_notebook_append_page(GTK_NOTEBOOK (notebook),f1,l1); - draw_scsi_scan(f1); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - l2 = gtk_label_new(_("CD Settings")); - } else { - l2 = gtk_label_new(_("CD/DVD Settings")); diff --git a/xcdroast-0.98alpha15-frozen_gui.patch b/xcdroast-0.98alpha15-frozen_gui.patch deleted file mode 100644 index daee67e..0000000 --- a/xcdroast-0.98alpha15-frozen_gui.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -ur xcdroast-0.98alpha15/src/main.h xcdroast-0.98alpha15.new/src/main.h ---- xcdroast-0.98alpha15/src/main.h 2003-10-30 13:49:04.000000000 +0100 -+++ xcdroast-0.98alpha15.new/src/main.h 2004-12-15 10:21:34.000000000 +0100 -@@ -137,6 +137,7 @@ - gint determine_cd_type(gchar *ret, gint mode); - gint determine_free_space(gint *biggestfree); - gint read_line(gint fd, gchar *ptr, gint maxlen); -+gint read_line_wait(gint fd, gchar *ptr, gint maxlen); - gint allocate_track_filenames(gint *overwrite, gint *overwritebiggest); - gint scan_for_toc_files(); - void print_trackreadset(); -diff -ur xcdroast-0.98alpha15/src/tools.c xcdroast-0.98alpha15.new/src/tools.c ---- xcdroast-0.98alpha15/src/tools.c 2004-12-15 10:28:52.612444656 +0100 -+++ xcdroast-0.98alpha15.new/src/tools.c 2004-12-15 10:24:35.000000000 +0100 -@@ -596,6 +596,69 @@ - if (rc == -1 && errno == EAGAIN) { - if (n == 1) - return(-1); -+ else -+ break; -+ } -+ return(-1); /* error */ -+ } -+ } -+ -+ /* terminate the string */ -+ *ptr = 0; -+ -+ /* strip of some trailing chars - yes..we need both levels */ -+ ptr--; -+ if ((*ptr == '\n') || (*ptr == '\r') ) { -+ *ptr = 0; -+ } -+ ptr--; -+ if ((*ptr == '\n') || (*ptr == '\r') ) { -+ *ptr = 0; -+ } -+ -+ if (strlen(str) == 0) { -+ /* if we read an empty string, but are NOT on EOF return 1 */ -+ return 1; -+ } else { -+ return(strlen(str)); -+ } -+} -+ -+ -+/* -+ * Use this version to work around some of the critical races -+ * such as bz 127658. This issue should be solved on a case by case basis. -+ * Expected side effects: GUI freezes (e.g. if called from read_write_out() in io.c). -+ */ -+ -+gint read_line_wait(gint fd, gchar *ptr, gint maxlen) { -+gint n, rc; -+gchar c; -+gchar *str; -+ -+ str = ptr; -+ -+ for (n = 1; n < maxlen; n++) { -+ if ( (rc = read(fd, &c, 1)) == 1) { -+ *ptr++ = c; -+ if (c == '\n') { -+ break; -+ } -+ -+ } else if (rc == 0) { -+ /* EOF */ -+ if (n == 1) -+ return(0); /* EOF, no data read */ -+ else -+ break; /* EOF, some data was read */ -+ } else if (rc == -2) { -+ /* timeout while reading string */ -+ return(-2); -+ } else { -+ /* nonblocking mode an nothing to read? */ -+ if (rc == -1 && errno == EAGAIN) { -+ if (n == 1) -+ return(-1); - else { - /* Partial line read. Wait a - * bit longer in case there's diff --git a/xcdroast-0.98alpha15-prodvd.patch b/xcdroast-0.98alpha15-prodvd.patch index 106c072..3b94bef 100644 --- a/xcdroast-0.98alpha15-prodvd.patch +++ b/xcdroast-0.98alpha15-prodvd.patch @@ -1,6 +1,112 @@ ---- xcdroast-0.98alpha15/src/io.c.cdrkit 2007-08-13 16:52:35.000000000 +0200 -+++ xcdroast-0.98alpha15/src/io.c 2007-08-13 16:53:28.000000000 +0200 -@@ -4736,7 +4736,7 @@ +diff -up xcdroast-0.98alpha16/src/create.c.cdrkit xcdroast-0.98alpha16/src/create.c +--- xcdroast-0.98alpha16/src/create.c.cdrkit 2009-02-17 06:34:16.000000000 -0500 ++++ xcdroast-0.98alpha16/src/create.c 2009-02-17 06:34:16.000000000 -0500 +@@ -523,7 +523,7 @@ GtkWidget *scrolled_win, *list; + gtk_widget_show(tbl); + vbox = gtk_vbox_new(FALSE,10); + gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,1,2,0,1); +- if (!curset.isProDVD) { ++ if (!curset.isDVD) { + f1 = gtk_frame_new(_("CD-Information")); + } else { + f1 = gtk_frame_new(_("CD/DVD-Information")); +@@ -1260,7 +1260,7 @@ GtkWidget *scrolled_win, *img_list; + gtk_widget_show(tbl); + vbox = gtk_vbox_new(FALSE,10); + gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,0,1,0,1); +- if (!curset.isProDVD) { ++ if (!curset.isDVD) { + f1 = gtk_frame_new(_("CD-Information")); + } else { + f1 = gtk_frame_new(_("CD/DVD-Information")); +@@ -2979,7 +2979,7 @@ GtkTargetEntry target_entry[3]; + GTK_SIGNAL_FUNC(fixate_clicked), NULL); + define_tooltip(b1,_("Just fixate (close) the CD, if for some reason the CD has been written but not fixated.")); + +- if (!curset.isProDVD) { ++ if (!curset.isDVD) { + b1 = gtk_button_new_with_label(_("Blank CD-RW")); + } else { + b1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); +@@ -3086,7 +3086,7 @@ GtkTargetEntry target_entry[3]; + gtk_widget_show (menu_item); + i++; + } +- if (curset.isProDVD) { ++ if (curset.isDVD) { + i = 0; + tmpval = curset.cdrtype; + while (dvdtypes[i] != 0) { +@@ -5774,7 +5774,7 @@ GtkObject *adj; + bootable_frame1 = NULL; + bootable_frame2 = NULL; + +- if (!curset.isProDVD) { ++ if (!curset.isDVD) { + f1 = gtk_frame_new(_("Options to create a bootable CD")); + } else { + f1 = gtk_frame_new(_("Options to create a bootable CD/DVD")); +@@ -5794,7 +5794,7 @@ GtkObject *adj; + gtk_box_pack_start(GTK_BOX(vbox),tbl,FALSE,FALSE,0); + gtk_widget_show(tbl); + +- if (!curset.isProDVD) { ++ if (!curset.isDVD) { + l1 = rightjust_gtk_label_new(_("Make CD bootable?")); + } else { + l1 = rightjust_gtk_label_new(_("Make CD/DVD bootable?")); +@@ -7023,7 +7023,7 @@ gchar tmp2[MAXLINE]; + gtk_widget_show (menu_item); + i++; + } +- if (curset.isProDVD) { ++ if (curset.isDVD) { + i = 0; + tmpval = curset.cdrtype; + while (dvdtypes[i] != 0) { +@@ -7174,7 +7174,7 @@ gchar tmp2[MAXLINE]; + gtk_widget_show(b1); + define_tooltip(b1,_("Set additional write options for advanced users.")); + /* blank button */ +- if (!curset.isProDVD) { ++ if (!curset.isDVD) { + b1 = gtk_button_new_with_label(_("Blank CD-RW")); + } else { + b1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); +diff -up xcdroast-0.98alpha16/src/init.c.cdrkit xcdroast-0.98alpha16/src/init.c +--- xcdroast-0.98alpha16/src/init.c.cdrkit 2009-02-17 06:34:16.000000000 -0500 ++++ xcdroast-0.98alpha16/src/init.c 2009-02-17 06:34:16.000000000 -0500 +@@ -156,7 +156,7 @@ static void init_curset() { + gint cdrtypes[] = CDR_TYPES_MIN; + gint i; + +- curset.isProDVD = 0; ++ curset.isDVD = 0; + curset.support_ontheflyaudio = 0; + curset.writer_devnr = -1; + curset.reader_devnr = -1; +@@ -1005,7 +1005,7 @@ gint isProDVD, ignoreProDVD; + tocfiles = (GList *) NULL; + strcpy(xcdroast_version_loaded, ""); + +- curset.isProDVD = isProDVD; ++ curset.isDVD = isProDVD; + curset.support_ontheflyaudio = support_ontheflyaudio; + + /* load iso-options if available */ +@@ -1129,7 +1129,7 @@ gint isProDVD, ignoreProDVD; + } + #endif + +- if (curset.isProDVD == 1) { ++ if (curset.isDVD == 1) { + /* set key if we got one from the config-file */ + if (strcmp(setupdata.ProDVDkey,"")) { + +diff -up xcdroast-0.98alpha16/src/io.c.cdrkit xcdroast-0.98alpha16/src/io.c +--- xcdroast-0.98alpha16/src/io.c.cdrkit 2009-02-17 06:34:16.000000000 -0500 ++++ xcdroast-0.98alpha16/src/io.c 2009-02-17 08:39:07.000000000 -0500 +@@ -4725,7 +4725,7 @@ gint fd; dolog(3, "Saving extended output to %s\n", fname); /* write to file */ @@ -9,7 +115,82 @@ if (fd < 0) { g_warning("Can't open file %s for writing\n",fname); return 1; -@@ -10041,6 +10041,7 @@ +@@ -5989,7 +5989,7 @@ gchar tmp[MAXLINE]; + if (WIFSIGNALED(ret) && read_done == 0) { + + /* most likely invalid prodvd key */ +- if (curset.isProDVD) { ++ if (curset.isDVD) { + strncpy(tmp, "\nReceived ALARM from cdrecord-ProDVD. Aborting blank...\nInvalid ProDVD key?\n", MAXLINE); + + convert_for_gtk2_textwidget(tmp); +@@ -6372,7 +6372,7 @@ gint cdrecord_stderr; + if (WIFSIGNALED(ret) && read_done == 0) { + + /* most likely invalid prodvd key */ +- if (curset.isProDVD && curset.cdrtype > 1000) { ++ if (curset.isDVD && curset.cdrtype > 1000) { + read_done = 2; + } + } +@@ -6402,7 +6402,7 @@ gint cdrecord_stderr; + } + + /* prodvd and beginning to write soon? */ +- if (curset.isProDVD && curset.cdrtype > 1000) { ++ if (curset.isDVD && curset.cdrtype > 1000) { + if (strstr(line,"Last chance to quit")) { + cdrtimer = gtk_timeout_add(1000, + cdrtimer_callback, NULL); +@@ -6711,7 +6711,7 @@ gchar *p; + + static void display_invalid_prodvdkey() { + +- if (curset.isProDVD && curset.cdrtype > 1000) { ++ if (curset.isDVD && curset.cdrtype > 1000) { + show_dialog(ICO_WARN, _("cdrecord-ProDVD terminated.\n\nMost likely because you have entered\nan invalid key. Please check if it is correct."), T_OK, NULL, NULL, 0); + } + } +@@ -9900,17 +9900,17 @@ gint wrmode; + /* check the version of cdrecord */ + /* return 1 if not correct (to old) */ + +-gint check_version_cdrecord(gchar *match, gchar *found, gint *isProDVD) { ++gint check_version_cdrecord(gchar *match, gchar *found, gint *isDVD) { + gchar line[MAXLINE]; + gchar vline[MAXLINE]; + gchar ver[MAXLINE]; + FILE *fpin; + gchar *p; + +- *isProDVD = 0; ++ *isDVD = 0; + strcpy(ver,""); + get_wrap_path("CDRECORD",line); +- strcat(line," -version 2>/dev/null"); ++ strcat(line," -version 2>&1"); + + dodebug(1, "calling: %s\n", line); + if ((fpin = popen(line,"r")) == NULL) { +@@ -9930,7 +9930,7 @@ gchar *p; + } + if (strstr(line, "This version is an unofficial (modified) version with DVD support")) { + dodebug(1, "WARNING: Inoffical cdrecord version found!\n", line); +- *isProDVD = 1; ++ *isDVD = 1; + } + } + +@@ -9955,7 +9955,7 @@ gchar *p; + } else { + p = strstr(vline, "ProDVD"); + if (p != NULL) { +- *isProDVD = 1; ++ *isDVD = 1; + p = strtok(p, " "); + if (p != NULL) { + p = strtok(NULL, " "); +@@ -10005,6 +10005,7 @@ gchar *p; gint check_version_mkisofs(gchar *match, gchar *found) { gchar line[MAXLINE]; @@ -17,7 +198,7 @@ gchar ver[MAXLINE]; FILE *fpin; gchar *p; -@@ -10055,17 +10056,22 @@ +@@ -10019,17 +10020,22 @@ gchar *p; } strcpy(line,""); @@ -41,7 +222,19 @@ /* failed to open - permission denied */ return 2; } -@@ -10107,7 +10113,7 @@ +@@ -10038,9 +10044,9 @@ gchar *p; + /* now line contains the version string of mkisofs */ + /* try to extract the version number */ + +- p = strstr(line,"mkisofs"); ++ p = strstr(line,"genisoimage"); + if (p != NULL) { +- p = strtok(p+8, " "); ++ p = strtok(p+11, " "); + if (p != NULL) { + strcpy(ver,p); + } +@@ -10070,7 +10076,7 @@ gchar line[MAXLINE]; gchar ver[MAXLINE]; FILE *fpin; gchar *p; @@ -49,29 +242,30 @@ + int icedax=0; strcpy(ver,""); get_wrap_path("CDDA2WAV",line); - strcat(line," -h 2>&1"); -@@ -10126,6 +10132,9 @@ + strcat(line," -version 2>&1"); +@@ -10085,6 +10091,9 @@ gchar *p; if (fgets(line,MAXLINE,fpin) == NULL) break; - dodebug(11,"got: %s",line); + dodebug(10,"got: %s",line); + if (strstr(line, "icedax") != NULL) { + icedax=1; -+ } - if (strncmp(line, "Version", 7) == 0) { - strcpy(line2, line); - dodebug(10,"got version: %s",line); -@@ -10141,6 +10150,10 @@ ++ } + } + + if (pclose(fpin) == -1) { +@@ -10096,6 +10105,11 @@ gchar *p; return 2; } + if (icedax) { + strcpy(found, CDDA2WAV_VERSION); + return 0; -+ } - - /* now line2 contains the version string of cdda2wav */ ++ } ++ + /* now line contains the version string of cdda2wav */ /* try to extract the version number */ -@@ -10176,13 +10189,14 @@ + +@@ -10137,13 +10151,14 @@ gchar *p; gint check_version_readcd(gchar *match, gchar *found) { gchar line[MAXLINE]; @@ -82,14 +276,14 @@ strcpy(ver,""); get_wrap_path("READCD",line); -- strcat(line," -version 2>/dev/null | head -n 1"); +- strcat(line," -version 2>/dev/null"); + strcat(line," -version 2>/dev/null | fgrep " READCD_NAME); dodebug(1, "calling: %s\n", line); if ((fpin = popen(line,"r")) == NULL) { -@@ -10190,17 +10204,22 @@ - } - +@@ -10155,17 +10170,22 @@ gchar *p; + + #if 0 strcpy(line,""); + strcpy(vline,""); for (;;) { @@ -111,3 +305,93 @@ /* failed to open - permission denied */ return 2; } +diff -up xcdroast-0.98alpha16/src/main.c.cdrkit xcdroast-0.98alpha16/src/main.c +--- xcdroast-0.98alpha16/src/main.c.cdrkit 2009-02-17 06:34:16.000000000 -0500 ++++ xcdroast-0.98alpha16/src/main.c 2009-02-17 06:34:16.000000000 -0500 +@@ -226,7 +226,7 @@ gchar tmp[MAXLINE]; + gtk_box_pack_start(GTK_BOX(sidespace), side_t,TRUE,TRUE,0); + + side_t_btn1 = gtk_button_new_with_label (_("Setup")); +- if (!curset.isProDVD) { ++ if (!curset.isDVD) { + side_t_btn2 = gtk_button_new_with_label (_("Duplicate CD")); + side_t_btn3 = gtk_button_new_with_label (_("Create CD")); + } else { +diff -up xcdroast-0.98alpha16/src/setup.c.cdrkit xcdroast-0.98alpha16/src/setup.c +--- xcdroast-0.98alpha16/src/setup.c.cdrkit 2009-02-17 06:34:16.000000000 -0500 ++++ xcdroast-0.98alpha16/src/setup.c 2009-02-17 06:34:16.000000000 -0500 +@@ -316,7 +316,7 @@ gchar tmp[MAXLINE]; + dolog(2, "Confirm setup\n"); + + /* some lasts checks and warnings */ +- if (is_dvdwriter(setupdata.writer_devnr) && !curset.isProDVD) { ++ if (is_dvdwriter(setupdata.writer_devnr) && !curset.isDVD) { + ret = show_dialog(ICO_WARN, _("Please note that you have to install ProDVD support before\nyou can write DVDs. Currently you will only be able to\nwrite regular CDs with your DVD-Writer."), T_OK,T_CANCEL, NULL, 0); + if (ret == 1) { + /* abort */ +@@ -1148,7 +1148,7 @@ static const gchar *helpwritemodes[] = H + gtk_box_pack_start(GTK_BOX(vbox2),tbl,FALSE,TRUE,0); + gtk_widget_show(tbl); + +- if (!curset.isProDVD) { ++ if (!curset.isDVD) { + l1 = rightjust_gtk_label_new(_("CD Writer Device:")); + } else { + l1 = rightjust_gtk_label_new(_("CD/DVD Writer Device:")); +@@ -2788,7 +2788,7 @@ GtkWidget *check; + gtk_text_set_point(GTK_TEXT(txt),0); + gtk_text_thaw(GTK_TEXT(txt)); + +- if (curset.isProDVD == 0) { ++ if (curset.isDVD == 0) { + gtk_widget_set_sensitive(f1, FALSE); + gtk_widget_set_sensitive(l1, FALSE); + gtk_widget_set_sensitive(txt, FALSE); +@@ -3198,7 +3198,7 @@ gchar tmp[MAXLINE]; + gtk_container_add (GTK_CONTAINER (f1), tbl); + gtk_widget_show(tbl); + +- if (!curset.isProDVD) { ++ if (!curset.isDVD) { + check = gtk_check_button_new_with_label(_("change CD Writer Device")); + } else { + check = gtk_check_button_new_with_label(_("change CD/DVD Writer Device")); +@@ -3220,7 +3220,7 @@ gchar tmp[MAXLINE]; + gtk_widget_show(check); + define_tooltip(check, _("If enabled, then the user is allowed the change the write parameters for the CD Writer (e.g. Speed and FIFO-Buffer-Size).")); + +- if (!curset.isProDVD) { ++ if (!curset.isDVD) { + check = gtk_check_button_new_with_label(_("change CD Reader Device")); + } else { + check = gtk_check_button_new_with_label(_("change CD/DVD Reader Device")); +@@ -3387,7 +3387,7 @@ gint i; + gtk_notebook_append_page(GTK_NOTEBOOK (notebook),f1,l1); + draw_scsi_scan(f1); + +- if (!curset.isProDVD) { ++ if (!curset.isDVD) { + l2 = gtk_label_new(_("CD Settings")); + } else { + l2 = gtk_label_new(_("CD/DVD Settings")); +diff -up xcdroast-0.98alpha16/src/xtools.c.cdrkit xcdroast-0.98alpha16/src/xtools.c +--- xcdroast-0.98alpha16/src/xtools.c.cdrkit 2008-08-20 12:10:28.000000000 -0400 ++++ xcdroast-0.98alpha16/src/xtools.c 2009-02-17 06:34:16.000000000 -0500 +@@ -2403,7 +2403,7 @@ gchar tmp[MAXLINE]; + + gint get_gracetime() { + +- if (curset.isProDVD && curset.cdrtype > 1000) { ++ if (curset.isDVD && curset.cdrtype > 1000) { + /* use 10 seconds for prodvd, because the keycheck + can take a while... */ + return 10; +@@ -3521,7 +3521,7 @@ gint isdvd,i; + isdvd = 0; + i = get_writerreaderdevs_index(devnr); + +- if (i >= 0 && curset.isProDVD && writerreaderdevs[i]->is_dvdwriter) { ++ if (i >= 0 && curset.isDVD && writerreaderdevs[i]->is_dvdwriter) { + if (convert_devnr2busid(devnr,tmp) != 0) { + g_error("non existing cdrom?"); + } diff --git a/xcdroast-0.98alpha15-scan.patch b/xcdroast-0.98alpha15-scan.patch index 836ae62..73d3f7b 100644 --- a/xcdroast-0.98alpha15-scan.patch +++ b/xcdroast-0.98alpha15-scan.patch @@ -1,36 +1,5 @@ --- xcdroast-0.98alpha15/src/io.c.scan 2003-10-26 15:24:48.000000000 +0100 +++ xcdroast-0.98alpha15/src/io.c 2004-09-20 16:36:03.841108264 +0200 -@@ -330,16 +330,26 @@ - if (strncmp(line,"Cdrecord",8) == 0) { - return; - } -- -- if (strncmp(line,"scsibus",7) == 0 ) { -+#if 0 -+ if (strncmp(line,"devname",7) == 0 ) { - /* set current scsibus nr */ - strcpy(tmp,line+7); - p1=strtok(tmp,":"); -- strcpy(tmp2,p1); - /* now tmp2 contains the current busnr as string */ -- busnr = atoi(tmp2); -+ devname = strdup(p1); - return; - } -+#endif -+ if (strncmp(line,"scsibus",7) == 0 ) { -+ /* set current scsibus nr */ -+ strcpy(tmp,line+7); -+ p1=strtok(tmp,":"); -+ strcpy(tmp2,p1); -+ /* now tmp2 contains the current busnr as string */ -+ busnr = atoi(tmp2); -+ return; -+ } -+ - - /* a line with an error message? */ - /* get_spawn_path(CDRECORD,tmp); */ @@ -1061,17 +1071,18 @@ if (doscanbus) { @@ -41,8 +10,8 @@ /* scan for alternatives */ #if defined(linux) if (scanparam) { -- scan_other("ATAPI", 1, txt); -+ scan_other("ATAPI", 2, txt); +- scan_other("ATA", 1, txt); ++ scan_other("ATA", 2, txt); } #endif #if defined(sun) diff --git a/xcdroast.spec b/xcdroast.spec index 17edcae..dc8e18e 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -1,33 +1,35 @@ -Summary: An X Window System based tool for creating CDs. +%define alphatag alpha16 +Summary: An X Window System based tool for creating CDs Name: xcdroast -Version: 0.98a15 -Release: 17%{?dist} +Version: 0.98 +Release: 0.1.%{?alphatag}%{?dist} +Epoch: 1 License: LGPLv2+ Group: Applications/Multimedia -Source: http://xcdroast.sourceforge.net/RPMS/a15/src/xcdroast-0.98alpha15.tar.gz +Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{alphatag}.tar.gz Source1: xcdroast.desktop Patch1: xcdroast-0.98alpha15-linebuffer.patch Patch2: xcdroast-0.98alpha15-nowarn.patch Patch3: xcdroast-0.98alpha15-scan.patch -Patch11: xcdroast-0.98alpha15-01_upstream_configure.patch -Patch12: xcdroast-0.98alpha15-02_upstream_gtk2locale.patch -Patch13: xcdroast-0.98alpha15-03_upstream_64bit_gsize.patch -Patch14: xcdroast-0.98alpha15-04_upstream_read_eagain.patch -Patch15: xcdroast-0.98alpha15-05_upstream_wav.patch -Patch16: xcdroast-0.98alpha15-06_man.patch -Patch17: xcdroast-0.98alpha15-07_case_cmp.patch -Patch18: xcdroast-0.98alpha15-08_desktop.patch -Patch19: xcdroast-0.98alpha15-09_share_dir.patch -Patch20: xcdroast-0.98alpha15-10_cddbtool.patch -Patch21: xcdroast-0.98alpha15-11_mkisofs_options.patch -Patch22: xcdroast-0.98alpha15-12_cdrecord_versions.patch +#Patch11: xcdroast-0.98alpha15-01_upstream_configure.patch +#Patch12: xcdroast-0.98alpha15-02_upstream_gtk2locale.patch +#Patch13: xcdroast-0.98alpha15-03_upstream_64bit_gsize.patch +#Patch14: xcdroast-0.98alpha15-04_upstream_read_eagain.patch +#Patch15: xcdroast-0.98alpha15-05_upstream_wav.patch +#Patch16: xcdroast-0.98alpha15-06_man.patch +#Patch17: xcdroast-0.98alpha15-07_case_cmp.patch +#Patch18: xcdroast-0.98alpha15-08_desktop.patch +#Patch19: xcdroast-0.98alpha15-09_share_dir.patch +#Patch20: xcdroast-0.98alpha15-10_cddbtool.patch +#Patch21: xcdroast-0.98alpha15-11_mkisofs_options.patch +#Patch22: xcdroast-0.98alpha15-12_cdrecord_versions.patch Patch23: xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch Patch24: xcdroast-0.98alpha15-14_atapi_to_oldatapi.patch Patch25: xcdroast-0.98alpha15-15_no_readcd_version.patch Patch30: xcdroast-0.98alpha15-prodvd.patch -Patch31: xcdroast-0.98alpha15-frozen_gui.patch +#Patch31: xcdroast-0.98alpha15-frozen_gui.patch Patch32: xcdroast-0.98alpha15-nogtk1.patch Url: http://www.xcdroast.org/ @@ -46,41 +48,42 @@ ISO9660 data CDs, support for production of new audio CDs, fast copying of CDs without hard disk buffering, and a logfile option. %prep -%setup -q -n xcdroast-0.98alpha15 +%setup -q -n %{name}-%{version}%{alphatag} %patch1 -p1 -b .linebuffer %patch2 -p1 -b .nowarn %patch3 -p1 -b .scan -%patch11 -p1 -b .p11 -%patch12 -p1 -b .p12 -%patch13 -p1 -b .p13 -%patch14 -p1 -b .p14 -%patch15 -p1 -b .p15 -%patch16 -p1 -b .p16 -%patch17 -p1 -b .p17 -%patch18 -p1 -b .p18 -%patch19 -p1 -b .p19 -%patch20 -p1 -b .p20 -%patch21 -p0 -b .p21 -%patch22 -p1 -b .p22 +#%patch11 -p1 -b .p11 +#%patch12 -p1 -b .p12 +#%patch13 -p1 -b .p13 +#%patch14 -p1 -b .p14 +#%patch15 -p1 -b .p15 +#%patch16 -p1 -b .p16 +#%patch17 -p1 -b .p17 +#%patch18 -p1 -b .p18 +#%patch19 -p1 -b .p19 +#%patch20 -p1 -b .p20 +#%patch21 -p0 -b .p21 +#%patch22 -p1 -b .p22 %patch23 -p1 -b .p23 %patch24 -p0 -b .p24 %patch25 -p1 -b .p25 %patch30 -p1 -b .cdrkit -%patch31 -p1 -b .frozen +#%patch31 -p1 -b .frozen %patch32 -p1 -b .nogtk1 %build export CFLAGS="$RPM_OPT_FLAGS -g" %configure --enable-gtk2 --disable-nonrootmode -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/{etc/{X11/applnk/Multimedia,pam.d,security/console.apps},usr/sbin} -make install PREFIX=/usr DESTDIR=$RPM_BUILD_ROOT +#make install PREFIX=/usr DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor xcdroast \ @@ -95,18 +98,23 @@ desktop-file-install --vendor xcdroast \ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang -%defattr(-,root,root) +%defattr(-,root,root,-) %doc ChangeLog doc/DOCUMENTATION doc/FAQ doc/README* doc/TRANSLATION.HOWTO -%dir /usr/lib/xcdroast-0.98 -%dir /usr/lib/xcdroast-0.98/bin -%dir /usr/lib/xcdroast-0.98/icons -%dir /usr/lib/xcdroast-0.98/sound -%{_mandir}/man?/xcdroast* +%dir /usr/lib/%{name}-%{version} +%dir /usr/lib/%{name}-%{version}/bin +%dir /usr/lib/%{name}-%{version}/icons +%dir /usr/lib/%{name}-%{version}/sound +%{_mandir}/man?/%{name}* /usr/bin/* -/usr/lib/xcdroast-0.98/*/* +/usr/lib/%{name}-%{version}/*/* %{_datadir}/applications/* %changelog +* Mon Feb 09 2009 Roman Rakus - 0.98-0.1.alpha16 +- New version 0.98alpha16 +- some spec file fixes + Resolves: #226550 + * Mon Feb 18 2008 Fedora Release Engineering - 0.98a15-17 - Autorebuild for GCC 4.3 From 75fd5375c2fca1bcee8fef47df92c9dee2686645 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 07:59:38 +0000 Subject: [PATCH 03/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index dc8e18e..bf69c4f 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.1.%{?alphatag}%{?dist} +Release: 0.2.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ Group: Applications/Multimedia @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 1:0.98-0.2.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Feb 09 2009 Roman Rakus - 0.98-0.1.alpha16 - New version 0.98alpha16 - some spec file fixes From cc9bf2c062f1d291724538b41ed974970e866e69 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 07:39:24 +0000 Subject: [PATCH 04/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index bf69c4f..18d93e5 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.2.%{?alphatag}%{?dist} +Release: 0.3.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ Group: Applications/Multimedia @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 1:0.98-0.3.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 1:0.98-0.2.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 59d11b1bb34e9fbfbe9276fa4cc96b3101db7737 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:40:54 +0000 Subject: [PATCH 05/35] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e5054d0..0d59a9d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xcdroast -# $Id: Makefile,v 1.1 2004/09/09 14:31:46 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:31:27 notting Exp $ NAME := xcdroast SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 9d2c3699e012086abfe3e4b6c18332823d4192aa Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:41 +0000 Subject: [PATCH 06/35] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e5054d0..0d59a9d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xcdroast -# $Id: Makefile,v 1.1 2004/09/09 14:31:46 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:31:27 notting Exp $ NAME := xcdroast SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From aec7aa7cea0a4877ba1badd104b22ee7eaf6d6db Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Fri, 19 Mar 2010 16:04:33 +0000 Subject: [PATCH 07/35] Fixes for Merge review #226550 --- xcdroast.desktop | 2 +- xcdroast.spec | 111 +++++++++++++++++++++-------------------------- 2 files changed, 51 insertions(+), 62 deletions(-) diff --git a/xcdroast.desktop b/xcdroast.desktop index d6d396d..4868c11 100644 --- a/xcdroast.desktop +++ b/xcdroast.desktop @@ -4,4 +4,4 @@ Name=CD Writer Type=Application Exec=/usr/bin/xcdroast Comment=CD creation tool -Icon=/usr/lib/xcdroast-0.98/icons/xcdricon.png +Icon=/usr/lib/xcdroast/icons/xcdricon.png diff --git a/xcdroast.spec b/xcdroast.spec index 18d93e5..e7b7e38 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -1,41 +1,27 @@ -%define alphatag alpha16 +%global alphatag alpha16 Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.3.%{?alphatag}%{?dist} +Release: 0.4.%{?alphatag}%{?dist} Epoch: 1 -License: LGPLv2+ +License: LGPLv2+ and GPLv2+ Group: Applications/Multimedia -Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{alphatag}.tar.gz +URL: http://www.xcdroast.org/ +Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{alphatag}.tar.gz Source1: xcdroast.desktop Patch1: xcdroast-0.98alpha15-linebuffer.patch Patch2: xcdroast-0.98alpha15-nowarn.patch Patch3: xcdroast-0.98alpha15-scan.patch +Patch4: xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch +Patch5: xcdroast-0.98alpha15-14_atapi_to_oldatapi.patch +Patch6: xcdroast-0.98alpha15-15_no_readcd_version.patch +Patch7: xcdroast-0.98alpha15-prodvd.patch +Patch8: xcdroast-0.98alpha15-nogtk1.patch -#Patch11: xcdroast-0.98alpha15-01_upstream_configure.patch -#Patch12: xcdroast-0.98alpha15-02_upstream_gtk2locale.patch -#Patch13: xcdroast-0.98alpha15-03_upstream_64bit_gsize.patch -#Patch14: xcdroast-0.98alpha15-04_upstream_read_eagain.patch -#Patch15: xcdroast-0.98alpha15-05_upstream_wav.patch -#Patch16: xcdroast-0.98alpha15-06_man.patch -#Patch17: xcdroast-0.98alpha15-07_case_cmp.patch -#Patch18: xcdroast-0.98alpha15-08_desktop.patch -#Patch19: xcdroast-0.98alpha15-09_share_dir.patch -#Patch20: xcdroast-0.98alpha15-10_cddbtool.patch -#Patch21: xcdroast-0.98alpha15-11_mkisofs_options.patch -#Patch22: xcdroast-0.98alpha15-12_cdrecord_versions.patch -Patch23: xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch -Patch24: xcdroast-0.98alpha15-14_atapi_to_oldatapi.patch -Patch25: xcdroast-0.98alpha15-15_no_readcd_version.patch - -Patch30: xcdroast-0.98alpha15-prodvd.patch -#Patch31: xcdroast-0.98alpha15-frozen_gui.patch -Patch32: xcdroast-0.98alpha15-nogtk1.patch - -Url: http://www.xcdroast.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: cdrecord >= 2.0, mkisofs >= 2.0 +Requires: cdrecord >= 2.0 +Requires: mkisofs >= 2.0 Requires(hint): cdda2wav >= 2.0 BuildRequires: gtk2-devel >= 2.0.6 BuildRequires: desktop-file-utils >= 0.2.92 @@ -47,50 +33,51 @@ automatic SCSI and IDE hardware setup, support for mastering of new ISO9660 data CDs, support for production of new audio CDs, fast copying of CDs without hard disk buffering, and a logfile option. +%package doc +Summary: Manual for xcdroast +Group: Documentation + +%description doc +This package contains the manual for xcdroast + %prep %setup -q -n %{name}-%{version}%{alphatag} %patch1 -p1 -b .linebuffer %patch2 -p1 -b .nowarn %patch3 -p1 -b .scan +%patch4 -p1 -b .p23 +%patch5 -p0 -b .p24 +%patch6 -p1 -b .p25 +%patch7 -p1 -b .cdrkit +%patch8 -p1 -b .nogtk1 -#%patch11 -p1 -b .p11 -#%patch12 -p1 -b .p12 -#%patch13 -p1 -b .p13 -#%patch14 -p1 -b .p14 -#%patch15 -p1 -b .p15 -#%patch16 -p1 -b .p16 -#%patch17 -p1 -b .p17 -#%patch18 -p1 -b .p18 -#%patch19 -p1 -b .p19 -#%patch20 -p1 -b .p20 -#%patch21 -p0 -b .p21 -#%patch22 -p1 -b .p22 -%patch23 -p1 -b .p23 -%patch24 -p0 -b .p24 -%patch25 -p1 -b .p25 - -%patch30 -p1 -b .cdrkit -#%patch31 -p1 -b .frozen -%patch32 -p1 -b .nogtk1 - +# Fix char sets +for file in doc/TRANSLATION.HOWTO ChangeLog; do + iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \ + touch -r $file $file.new && \ + mv $file.new $file +done %build -export CFLAGS="$RPM_OPT_FLAGS -g" -%configure --enable-gtk2 --disable-nonrootmode +%configure --enable-gtk2 --disable-nonrootmode \ + --with-xcdroast-libdir-prefix=%{_libdir}/%{name} make %{?_smp_mflags} +# Change desktop file to the current libdir +sed 's|/usr/lib|%{_libdir}|' %{SOURCE1} > %{name}.desktop + + %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/{etc/{X11/applnk/Multimedia,pam.d,security/console.apps},usr/sbin} -#make install PREFIX=/usr DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor xcdroast \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Red-Hat-Base \ --add-category System \ - %{SOURCE1} + --add-category DiscBurning \ + %{name}.desktop %find_lang %name @@ -99,17 +86,19 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) -%doc ChangeLog doc/DOCUMENTATION doc/FAQ doc/README* doc/TRANSLATION.HOWTO -%dir /usr/lib/%{name}-%{version} -%dir /usr/lib/%{name}-%{version}/bin -%dir /usr/lib/%{name}-%{version}/icons -%dir /usr/lib/%{name}-%{version}/sound -%{_mandir}/man?/%{name}* -/usr/bin/* -/usr/lib/%{name}-%{version}/*/* -%{_datadir}/applications/* - +%doc AUTHORS COPYING ChangeLog README doc/DOCUMENTATION doc/FAQ doc/README* doc/TRANSLATION.HOWTO +%{_mandir}/man1/xcdroast.1.* +%{_bindir}/xcdroast +%{_libdir}/xcdroast/ +%{_datadir}/applications/%{name}.desktop + +%files doc +%doc doc/manual/* + %changelog +* Fri Mar 19 2010 Roman Rakus - 1:0.98-0.4.alpha16 +- Fixes for Merge review #226550 + * Mon Jul 27 2009 Fedora Release Engineering - 1:0.98-0.3.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From dc487e98e6f504615f683d73a5caa0c06d4aab21 Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Mon, 22 Mar 2010 10:56:54 +0000 Subject: [PATCH 08/35] Corrected license --- xcdroast.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index e7b7e38..0183c56 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -4,7 +4,7 @@ Name: xcdroast Version: 0.98 Release: 0.4.%{?alphatag}%{?dist} Epoch: 1 -License: LGPLv2+ and GPLv2+ +License: LGPLv2+ and GPLv2 Group: Applications/Multimedia URL: http://www.xcdroast.org/ Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{alphatag}.tar.gz From af9dcc4f3e9e38347a150e1de50afbadfecc7f01 Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Tue, 23 Mar 2010 09:16:15 +0000 Subject: [PATCH 09/35] Corrected Source0 URL --- xcdroast.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xcdroast.spec b/xcdroast.spec index 0183c56..7c66d72 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,12 +2,12 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.4.%{?alphatag}%{?dist} +Release: 0.5.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia URL: http://www.xcdroast.org/ -Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{alphatag}.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{alphatag}.tar.gz Source1: xcdroast.desktop Patch1: xcdroast-0.98alpha15-linebuffer.patch Patch2: xcdroast-0.98alpha15-nowarn.patch @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Tue Mar 23 2010 Roman Rakus - 1:0.98-0.5.alpha16 +- Corrected Source0 URL + * Fri Mar 19 2010 Roman Rakus - 1:0.98-0.4.alpha16 - Fixes for Merge review #226550 From 4945e98fc67994e76392b515ad854b4904ca1e5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:34:39 +0000 Subject: [PATCH 10/35] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0d59a9d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xcdroast -# $Id: Makefile,v 1.2 2007/10/15 19:31:27 notting Exp $ -NAME := xcdroast -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From a8b461855b4113319356b6beff65b6e951d328d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:34:41 +0000 Subject: [PATCH 11/35] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0d59a9d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xcdroast -# $Id: Makefile,v 1.2 2007/10/15 19:31:27 notting Exp $ -NAME := xcdroast -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9 From 3d3a9b1d896273974f52eaa3a32c016fa82e9f7c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 21:44:36 -0600 Subject: [PATCH 12/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 7c66d72..0194ca9 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.5.%{?alphatag}%{?dist} +Release: 0.6.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Mon Feb 07 2011 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Mar 23 2010 Roman Rakus - 1:0.98-0.5.alpha16 - Corrected Source0 URL From 982a8cb66e81999e112a967b080098f1babfd5f7 Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Fri, 24 Jun 2011 15:37:34 +0200 Subject: [PATCH 13/35] Fix build fail (#716081) Signed-off-by: Roman Rakus --- xcdroast.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xcdroast.spec b/xcdroast.spec index 0194ca9..3904eb2 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.6.%{?alphatag}%{?dist} +Release: 0.7.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -22,7 +22,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: cdrecord >= 2.0 Requires: mkisofs >= 2.0 -Requires(hint): cdda2wav >= 2.0 +Requires: cdda2wav >= 2.0 BuildRequires: gtk2-devel >= 2.0.6 BuildRequires: desktop-file-utils >= 0.2.92 @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Fri Jun 24 2011 Roman Rakus - 1:0.98-0.7.alpha16 +- Fix build fail (#716081) + * Mon Feb 07 2011 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 7e937ea6d5463f536876776b0b39c62f0a3727b6 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 6 Dec 2011 01:32:24 -0500 Subject: [PATCH 14/35] Rebuild for new libpng --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 3904eb2..ed8d633 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.7.%{?alphatag}%{?dist} +Release: 0.8.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Tue Dec 06 2011 Adam Jackson - 1:0.98-0.8.alpha16 +- Rebuild for new libpng + * Fri Jun 24 2011 Roman Rakus - 1:0.98-0.7.alpha16 - Fix build fail (#716081) From 32884a866cd332d74185a068131d926b6130a01f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:39:40 -0600 Subject: [PATCH 15/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index ed8d633..b95d68d 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.8.%{?alphatag}%{?dist} +Release: 0.9.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1:0.98-0.9.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Dec 06 2011 Adam Jackson - 1:0.98-0.8.alpha16 - Rebuild for new libpng From 84909bb4c2ba36bfcf6336838e6ba64083245933 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 23:37:07 -0500 Subject: [PATCH 16/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index b95d68d..2014d60 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.9.%{?alphatag}%{?dist} +Release: 0.10.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 1:0.98-0.10.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 1:0.98-0.9.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 35c6c508fba5be6400d3f67b07af0ea52f49590e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 21:29:21 -0600 Subject: [PATCH 17/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 2014d60..a2e6809 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.10.%{?alphatag}%{?dist} +Release: 0.11.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 1:0.98-0.11.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 1:0.98-0.10.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 5e21faea840afcba8b40b42bd82906be85ae92cc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 02:41:17 -0500 Subject: [PATCH 18/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index a2e6809..68c234a 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.11.%{?alphatag}%{?dist} +Release: 0.12.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1:0.98-0.12.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 1:0.98-0.11.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 392a6b98b922c1859319150128cd097ef62fc71b Mon Sep 17 00:00:00 2001 From: Tomas Smetana Date: Fri, 21 Feb 2014 13:07:12 +0100 Subject: [PATCH 19/35] fix #926752: aarch64 support - fix #1037391: fails to build with "-Werror=format-security" --- xcdroast-0.98alpha16-wformat.patch | 12 ++++++++++++ xcdroast.spec | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 xcdroast-0.98alpha16-wformat.patch diff --git a/xcdroast-0.98alpha16-wformat.patch b/xcdroast-0.98alpha16-wformat.patch new file mode 100644 index 0000000..e0b2e1e --- /dev/null +++ b/xcdroast-0.98alpha16-wformat.patch @@ -0,0 +1,12 @@ +diff -up xcdroast-0.98alpha16/src/setup.c.wformat xcdroast-0.98alpha16/src/setup.c +--- xcdroast-0.98alpha16/src/setup.c.wformat 2014-02-21 13:04:20.813356229 +0100 ++++ xcdroast-0.98alpha16/src/setup.c 2014-02-21 13:04:33.893300539 +0100 +@@ -4477,7 +4477,7 @@ gchar tmp[MAXLINE]; + if (!textonly) { + show_dialog(ICO_ERROR,tmp, T_OK, NULL, NULL, 0); + } else { +- g_warning(tmp); ++ g_warning("%s", tmp); + } + } + } diff --git a/xcdroast.spec b/xcdroast.spec index 68c234a..b0d3c98 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.12.%{?alphatag}%{?dist} +Release: 0.13.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -17,6 +17,7 @@ Patch5: xcdroast-0.98alpha15-14_atapi_to_oldatapi.patch Patch6: xcdroast-0.98alpha15-15_no_readcd_version.patch Patch7: xcdroast-0.98alpha15-prodvd.patch Patch8: xcdroast-0.98alpha15-nogtk1.patch +Patch9: xcdroast-0.98alpha16-wformat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -50,6 +51,7 @@ This package contains the manual for xcdroast %patch6 -p1 -b .p25 %patch7 -p1 -b .cdrkit %patch8 -p1 -b .nogtk1 +%patch9 -p1 -b .wformat # Fix char sets for file in doc/TRANSLATION.HOWTO ChangeLog; do @@ -59,6 +61,8 @@ for file in doc/TRANSLATION.HOWTO ChangeLog; do done %build +export CFLAGS="$RPM_OPT_FLAGS -Werror=format-security" +autoreconf -ivf %configure --enable-gtk2 --disable-nonrootmode \ --with-xcdroast-libdir-prefix=%{_libdir}/%{name} make %{?_smp_mflags} @@ -96,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Fri Feb 21 2014 Tomas Smetana - 1:0.98-0.13.alpha16 +- fix #926752: aarch64 support +- fix #1037391: fails to build with "-Werror=format-security" + * Sun Aug 04 2013 Fedora Release Engineering - 1:0.98-0.12.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From a4775913991ffae882812bef67b0b3c3269f2ccf Mon Sep 17 00:00:00 2001 From: Tomas Smetana Date: Fri, 21 Feb 2014 13:41:58 +0100 Subject: [PATCH 20/35] Require autoconf and automake for build --- xcdroast.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index b0d3c98..d0ed6f9 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.13.%{?alphatag}%{?dist} +Release: 0.14.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -26,6 +26,7 @@ Requires: mkisofs >= 2.0 Requires: cdda2wav >= 2.0 BuildRequires: gtk2-devel >= 2.0.6 BuildRequires: desktop-file-utils >= 0.2.92 +BuildRequires: autoconf automake %description X-CD-Roast provides a GUI interface for commands like cdrecord and @@ -100,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Fri Feb 21 2014 Tomas Smetana - 1:0.98-0.14.alpha16 +- Require autoconf and automake for build + * Fri Feb 21 2014 Tomas Smetana - 1:0.98-0.13.alpha16 - fix #926752: aarch64 support - fix #1037391: fails to build with "-Werror=format-security" From 21c27ea38bd8afafc64292877c0537e2cdb3f231 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 00:20:00 -0500 Subject: [PATCH 21/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index d0ed6f9..6455822 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.14.%{?alphatag}%{?dist} +Release: 0.15.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1:0.98-0.15.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Feb 21 2014 Tomas Smetana - 1:0.98-0.14.alpha16 - Require autoconf and automake for build From aa13c4e3c4963436c3960648d44c4fb28afa2fb7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 09:23:11 +0000 Subject: [PATCH 22/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 6455822..38586b5 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.15.%{?alphatag}%{?dist} +Release: 0.16.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1:0.98-0.16.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 1:0.98-0.15.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 0f74716c54594827a838e75c45db7f548ba239e7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 03:47:18 +0000 Subject: [PATCH 23/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 38586b5..d40c6f6 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.16.%{?alphatag}%{?dist} +Release: 0.17.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1:0.98-0.17.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 1:0.98-0.16.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 06ee1905e4f1733e755ff49f07d158a0aa99f431 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:19:02 +0000 Subject: [PATCH 24/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index d40c6f6..0b4e79a 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.17.%{?alphatag}%{?dist} +Release: 0.18.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1:0.98-0.18.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 1:0.98-0.17.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 3682996dc714427519ba9caa3db790e9020ada56 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:41:40 +0000 Subject: [PATCH 25/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 0b4e79a..ed9d06e 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.18.%{?alphatag}%{?dist} +Release: 0.19.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1:0.98-0.19.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 1:0.98-0.18.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From a63f70005ae8b7c128fb9231bf722d4a1bbb04d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:55:54 +0000 Subject: [PATCH 26/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index ed9d06e..b0f5deb 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.19.%{?alphatag}%{?dist} +Release: 0.20.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1:0.98-0.20.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 1:0.98-0.19.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 8e2c79013a1c8372d5bd4a5c7221c70818b923f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:30:46 +0000 Subject: [PATCH 27/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index b0f5deb..7d29b45 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.20.%{?alphatag}%{?dist} +Release: 0.21.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1:0.98-0.21.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1:0.98-0.20.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 4f781b7171b1a2c1043f756cddce58670cac775a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:24:03 +0000 Subject: [PATCH 28/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 7d29b45..22ffd79 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.21.%{?alphatag}%{?dist} +Release: 0.22.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 Group: Applications/Multimedia @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/manual/* %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1:0.98-0.22.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1:0.98-0.21.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 15f57604f683fede37911d1ac373f80bb0fcbd5e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:50:21 +0100 Subject: [PATCH 29/35] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- xcdroast.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 22ffd79..e99c27c 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -19,7 +19,6 @@ Patch7: xcdroast-0.98alpha15-prodvd.patch Patch8: xcdroast-0.98alpha15-nogtk1.patch Patch9: xcdroast-0.98alpha16-wformat.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: cdrecord >= 2.0 Requires: mkisofs >= 2.0 From 5f97d4b856bab90ae02856c6c71dc7ca9dfbeb1c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 09:00:18 +0100 Subject: [PATCH 30/35] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- xcdroast.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/xcdroast.spec b/xcdroast.spec index e99c27c..c36c567 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -85,9 +85,6 @@ desktop-file-install --vendor xcdroast \ %find_lang %name -%clean -rm -rf $RPM_BUILD_ROOT - %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README doc/DOCUMENTATION doc/FAQ doc/README* doc/TRANSLATION.HOWTO From a08a7d006652152c4b97f90f017661864e970af5 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 9 Jul 2018 17:07:39 +0100 Subject: [PATCH 31/35] Cleanup spec, update requires, use %%licensee --- xcdroast.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/xcdroast.spec b/xcdroast.spec index c36c567..21b994d 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,11 +2,11 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.22.%{?alphatag}%{?dist} +Release: 0.23.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 -Group: Applications/Multimedia URL: http://www.xcdroast.org/ + Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{alphatag}.tar.gz Source1: xcdroast.desktop Patch1: xcdroast-0.98alpha15-linebuffer.patch @@ -20,9 +20,9 @@ Patch8: xcdroast-0.98alpha15-nogtk1.patch Patch9: xcdroast-0.98alpha16-wformat.patch -Requires: cdrecord >= 2.0 -Requires: mkisofs >= 2.0 -Requires: cdda2wav >= 2.0 +Requires: wodim +Requires: genisoimage +Requires: icedax BuildRequires: gtk2-devel >= 2.0.6 BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: autoconf automake @@ -36,7 +36,6 @@ copying of CDs without hard disk buffering, and a logfile option. %package doc Summary: Manual for xcdroast -Group: Documentation %description doc This package contains the manual for xcdroast @@ -72,7 +71,6 @@ sed 's|/usr/lib|%{_libdir}|' %{SOURCE1} > %{name}.desktop %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/{etc/{X11/applnk/Multimedia,pam.d,security/console.apps},usr/sbin} make install DESTDIR=$RPM_BUILD_ROOT @@ -86,8 +84,8 @@ desktop-file-install --vendor xcdroast \ %find_lang %name %files -f %{name}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README doc/DOCUMENTATION doc/FAQ doc/README* doc/TRANSLATION.HOWTO +%license COPYING +%doc AUTHORS ChangeLog README doc/DOCUMENTATION doc/FAQ doc/README* doc/TRANSLATION.HOWTO %{_mandir}/man1/xcdroast.1.* %{_bindir}/xcdroast %{_libdir}/xcdroast/ @@ -97,6 +95,9 @@ desktop-file-install --vendor xcdroast \ %doc doc/manual/* %changelog +* Mon Jul 9 2018 Peter Robinson 1:0.98-0.23.alpha16 +- Cleanup spec, update requires, use %%licensee + * Fri Feb 09 2018 Fedora Release Engineering - 1:0.98-0.22.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From a865f3a68346b1549bc2edd765eaff014810f11b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:08:44 +0000 Subject: [PATCH 32/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index 21b994d..b9e0851 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.23.%{?alphatag}%{?dist} +Release: 0.24.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 URL: http://www.xcdroast.org/ @@ -95,6 +95,9 @@ desktop-file-install --vendor xcdroast \ %doc doc/manual/* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1:0.98-0.24.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 9 2018 Peter Robinson 1:0.98-0.23.alpha16 - Cleanup spec, update requires, use %%licensee From 0095bdc0320af4ffafd0ddd242e5274a6701c425 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 24 Jul 2018 16:31:56 +0200 Subject: [PATCH 33/35] Add missing BuildRequires on gcc configure: error: no acceptable C compiler found in $PATH References: https://bugzilla.redhat.com/show_bug.cgi?id=1606726 Signed-off-by: Igor Gnatenko --- xcdroast.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xcdroast.spec b/xcdroast.spec index b9e0851..f2b13cb 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -23,6 +23,7 @@ Patch9: xcdroast-0.98alpha16-wformat.patch Requires: wodim Requires: genisoimage Requires: icedax +BuildRequires: gcc BuildRequires: gtk2-devel >= 2.0.6 BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: autoconf automake From 9f31116c6eba29cbf5952bfcb628c35f1619e46e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:10:51 +0000 Subject: [PATCH 34/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xcdroast.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xcdroast.spec b/xcdroast.spec index f2b13cb..b525821 100644 --- a/xcdroast.spec +++ b/xcdroast.spec @@ -2,7 +2,7 @@ Summary: An X Window System based tool for creating CDs Name: xcdroast Version: 0.98 -Release: 0.24.%{?alphatag}%{?dist} +Release: 0.25.%{?alphatag}%{?dist} Epoch: 1 License: LGPLv2+ and GPLv2 URL: http://www.xcdroast.org/ @@ -96,6 +96,9 @@ desktop-file-install --vendor xcdroast \ %doc doc/manual/* %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1:0.98-0.25.alpha16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 1:0.98-0.24.alpha16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From e07cef299530f5f37049794a0e2fcf3e26a5eea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 15 Apr 2019 10:46:41 +0200 Subject: [PATCH 35/35] Orphaned for 6+ weeks --- .gitignore | 1 - dead.package | 1 + sources | 1 - ...ast-0.98alpha15-13_cdrecord_to_wodim.patch | 203 --------- ...ast-0.98alpha15-14_atapi_to_oldatapi.patch | 17 - ...ast-0.98alpha15-15_no_readcd_version.patch | 22 - xcdroast-0.98alpha15-linebuffer.patch | 29 -- xcdroast-0.98alpha15-nogtk1.patch | 31 -- xcdroast-0.98alpha15-nowarn.patch | 22 - xcdroast-0.98alpha15-prodvd.patch | 397 ---------------- xcdroast-0.98alpha15-scan.patch | 50 -- xcdroast-0.98alpha16-wformat.patch | 12 - xcdroast.desktop | 7 - xcdroast.spec | 430 ------------------ 14 files changed, 1 insertion(+), 1222 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch delete mode 100644 xcdroast-0.98alpha15-14_atapi_to_oldatapi.patch delete mode 100644 xcdroast-0.98alpha15-15_no_readcd_version.patch delete mode 100644 xcdroast-0.98alpha15-linebuffer.patch delete mode 100644 xcdroast-0.98alpha15-nogtk1.patch delete mode 100644 xcdroast-0.98alpha15-nowarn.patch delete mode 100644 xcdroast-0.98alpha15-prodvd.patch delete mode 100644 xcdroast-0.98alpha15-scan.patch delete mode 100644 xcdroast-0.98alpha16-wformat.patch delete mode 100644 xcdroast.desktop delete mode 100644 xcdroast.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 00faaa8..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -xcdroast-0.98alpha16.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index cd024b4..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -bc3d335a30f292067eaaf1ea03ebaf17 xcdroast-0.98alpha16.tar.gz diff --git a/xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch b/xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch deleted file mode 100644 index 5da1318..0000000 --- a/xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch +++ /dev/null @@ -1,203 +0,0 @@ -diff -up xcdroast-0.98alpha16/src/menus.c.p23 xcdroast-0.98alpha16/src/menus.c ---- xcdroast-0.98alpha16/src/menus.c.p23 2008-08-20 17:41:28.000000000 +0200 -+++ xcdroast-0.98alpha16/src/menus.c 2009-02-09 16:55:07.000000000 +0100 -@@ -2701,7 +2701,7 @@ static const gchar *blanktrans[] = BLANK - gtk_container_set_border_width (GTK_CONTAINER (box1), 5); - gtk_container_add(GTK_CONTAINER(dialog),box1); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("Blank CD-RW")); - } else { - f1 = gtk_frame_new(_("Blank CD/DVD+-RW")); -@@ -2811,7 +2811,7 @@ static const gchar *blanktrans[] = BLANK - gtk_box_pack_start(GTK_BOX(box1),box3,FALSE,TRUE,5); - gtk_widget_show(box3); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - button1 = gtk_button_new_with_label(_("Blank CD-RW")); - } else { - button1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); -diff -up xcdroast-0.98alpha16/src/xcdrdata.h.p23 xcdroast-0.98alpha16/src/xcdrdata.h ---- xcdroast-0.98alpha16/src/xcdrdata.h.p23 2008-08-20 17:57:53.000000000 +0200 -+++ xcdroast-0.98alpha16/src/xcdrdata.h 2009-02-09 16:55:07.000000000 +0100 -@@ -60,7 +60,9 @@ typedef struct setup_data { - gboolean root_option_change_imagedirs; - gboolean root_option_change_logoptions; - -+#ifndef CDRECORDDVD_IS_FREE - gchar *ProDVDkey; -+#endif - geometry_t mainwindow; - geometry_t burnwindow; - -@@ -120,7 +122,7 @@ typedef struct writer_driver { - } writer_driver_t; - - typedef struct current_set { -- gint isProDVD; -+ gint isDVD; - gint support_ontheflyaudio; - gint writer_devnr; - gint reader_devnr; -diff -up xcdroast-0.98alpha16/src/create.c.p23 xcdroast-0.98alpha16/src/create.c ---- xcdroast-0.98alpha16/src/create.c.p23 2008-08-20 17:57:53.000000000 +0200 -+++ xcdroast-0.98alpha16/src/create.c 2009-02-09 16:55:07.000000000 +0100 -@@ -6792,7 +6792,7 @@ gint sel, btn; - fill_session_available(); - /* force recalc of session size if dvd */ - /* so he will get the multisession warning */ -- if (curset.cdrtype >= 1000 && ( curset.isProDVD & 1 ) && curset.multisession == 1) { -+ if (curset.cdrtype >= 1000 && ( curset.isDVD & 1 ) && curset.multisession == 1) { - set_sessionsize_unknown(); - } - break; -diff -up xcdroast-0.98alpha16/src/xcdroast.h.p23 xcdroast-0.98alpha16/src/xcdroast.h ---- xcdroast-0.98alpha16/src/xcdroast.h.p23 2008-08-21 12:36:52.000000000 +0200 -+++ xcdroast-0.98alpha16/src/xcdroast.h 2009-02-09 17:01:08.000000000 +0100 -@@ -112,22 +112,30 @@ - then in $PREFIX (e.g. /usr/bin/cdrecord instead of - /usr/local/lib/xcdroast-0.98/bin/cdrecord) */ - --#define CDRECORD "bin/cdrecord" --#define CDDA2WAV "bin/cdda2wav" --#define READCD "bin/readcd" --#define MKISOFS "bin/mkisofs" -+#define CDRECORD "bin/wodim" -+#define CDDA2WAV "bin/icedax" -+#define READCD "bin/readom" -+#define MKISOFS "bin/genisoimage" -+ -+#define CDRECORD_NAME "wodim" -+#define CDRECORDDVD_NAME "wodim" -+#define CDRECORDDVD_IS_FREE -+ -+#define CDDA2WAV_NAME "icedax" -+#define READCD_NAME "readom" -+#define MKISOFS_NAME "genisoimage" - - /* MINIMUM required versions. Greater versions are now silently - accepted. - Distribution-Vendors: DO NOT TOUCH THESE! - IT WONT WORK WITH LOWER VERSIONS, EVEN WHEN YOU THINK IT DOES! */ - --#define CDRECORD_VERSION "2.01" --#define CDRECORD_PRODVD_VERSION "2.01a11" -+#define CDRECORD_VERSION "1.1.9" -+#define CDRECORDDVD_VERSION "2.01a11" - #define CDRECORD_VERSION_WITH_ONTHFLYAUDIO "2.01a13" --#define MKISOFS_VERSION "2.01" --#define CDDA2WAV_VERSION "2.01" --#define READCD_VERSION "2.01" -+#define MKISOFS_VERSION "1.1.9" -+#define CDDA2WAV_VERSION "1.1.9" -+#define READCD_VERSION "1.1.9" - - /* group to use for non-root-mode */ - /* #define NONROOTMODEGROUP "xcdwrite" - HISTORIC */ -diff -up xcdroast-0.98alpha16/src/duplicate.c.p23 xcdroast-0.98alpha16/src/duplicate.c ---- xcdroast-0.98alpha16/src/duplicate.c.p23 2003-10-26 14:14:19.000000000 +0100 -+++ xcdroast-0.98alpha16/src/duplicate.c 2009-02-09 16:55:07.000000000 +0100 -@@ -1156,7 +1156,7 @@ GtkWidget *scrolled_win; - gtk_table_set_col_spacings(GTK_TABLE(tbl),10); - gtk_box_pack_start(GTK_BOX(actionspace),tbl,TRUE,TRUE,10); - gtk_widget_show(tbl); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("CD-Information")); - } else { - f1 = gtk_frame_new(_("CD/DVD-Information")); -@@ -1739,7 +1739,7 @@ GtkWidget *tbl, *check; - gtk_widget_show(tbl); - vbox = gtk_vbox_new(FALSE,10); - gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,0,1,0,1); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("CD-Information")); - } else { - f1 = gtk_frame_new(_("CD/DVD-Information")); -@@ -2241,7 +2241,7 @@ GtkWidget *tbl, *omenu, *check; - gtk_widget_show(tbl); - vbox = gtk_vbox_new(FALSE,10); - gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,0,1,0,1); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("CD-Information")); - } else { - f1 = gtk_frame_new(_("CD/DVD-Information")); -@@ -3090,7 +3090,7 @@ gint menuidx, menuhistory; - gtk_table_set_col_spacings(GTK_TABLE(tbl),10); - gtk_box_pack_start(GTK_BOX(actionspace),tbl,TRUE,TRUE,10); - gtk_widget_show(tbl); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("CD to write")); - } else { - f1 = gtk_frame_new(_("CD/DVD to write")); -@@ -3107,7 +3107,7 @@ gint menuidx, menuhistory; - hbox = gtk_hbox_new(TRUE,10); - gtk_box_pack_start(GTK_BOX(actionspace),hbox,FALSE,TRUE,5); - gtk_widget_show(hbox); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - b1 = gtk_button_new_with_label(_("Write CD")); - } else { - b1 = gtk_button_new_with_label(_("Write CD/DVD")); -@@ -3118,7 +3118,7 @@ gint menuidx, menuhistory; - GTK_SIGNAL_FUNC(writetracks_clicked), NULL); - define_tooltip(b1,_("Writes all tracks specified by the TOC file to a CD.")); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - b1 = gtk_button_new_with_label(_("Blank CD-RW")); - } else { - b1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); -@@ -3239,7 +3239,7 @@ gint menuidx, menuhistory; - gtk_widget_show (menu_item); - i++; - } -- if (curset.isProDVD) { -+ if (curset.isDVD) { - i = 0; - tmpval = curset.cdrtype; - while (dvdtypes[i] != 0) { -@@ -3984,7 +3984,7 @@ GtkWidget *b1; - side_widgets[0] = b1; - define_tooltip(b1,_("Displays information about the currently inserted CD and tracks stored on the harddrive.")); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - b1 = gtk_toggle_button_new_with_label(_("Read CD")); - } else { - b1 = gtk_toggle_button_new_with_label(_("Read CD/DVD")); -@@ -3996,7 +3996,7 @@ GtkWidget *b1; - side_widgets[1] = b1; - define_tooltip(b1,_("Reads all tracks of a CD and copy them to the harddrive.")); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - b1 = gtk_toggle_button_new_with_label(_("Verify CD")); - } else { - b1 = gtk_toggle_button_new_with_label(_("Verify CD/DVD")); -@@ -4016,7 +4016,7 @@ GtkWidget *b1; - side_widgets[3] = b1; - define_tooltip(b1,_("Plays audio tracks (.wav files) from the harddrive via soundcard.")); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - b1 = gtk_toggle_button_new_with_label(_("Write CD")); - } else { - b1 = gtk_toggle_button_new_with_label(_("Write CD/DVD")); -diff -up xcdroast-0.98alpha16/src/main.c.p23 xcdroast-0.98alpha16/src/main.c ---- xcdroast-0.98alpha16/src/main.c.p23 2008-08-21 11:45:34.000000000 +0200 -+++ xcdroast-0.98alpha16/src/main.c 2009-02-09 16:55:07.000000000 +0100 -@@ -583,7 +583,7 @@ gint stat; - */ - - /* warn about non-existing LFS support in dvd mode */ -- if ((curset.isProDVD & 1) && sizeof(off_t) != 8) { -+ if ((curset.isDVD & 1) && sizeof(off_t) != 8) { - show_dialog(ICO_WARN, _("Warning: Your system is not able to create files larger\nthan 2 GB. Writing DVDs will therefore not possible."), T_OK, NULL, NULL, 0); - } - diff --git a/xcdroast-0.98alpha15-14_atapi_to_oldatapi.patch b/xcdroast-0.98alpha15-14_atapi_to_oldatapi.patch deleted file mode 100644 index 52ed821..0000000 --- a/xcdroast-0.98alpha15-14_atapi_to_oldatapi.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: src/io.c -=================================================================== ---- src/io.c.orig 2006-12-19 13:02:15.000000000 +0100 -+++ src/io.c 2006-12-19 13:18:53.000000000 +0100 -@@ -985,7 +985,11 @@ - - /* add the found devices to the writerreader structure */ - count = 0; -- g_snprintf(tmp,MAXLINE,"%s:", transport); -+ if (strstr(transport,"ATAPI")) { -+ g_snprintf(tmp,MAXLINE,"OLD%s:", transport); -+ } else { -+ g_snprintf(tmp,MAXLINE,"%s:", transport); -+ } - while(scsidevices[count] != NULL) { - add_writerreader(scsidevices[count], tmp, txt); - g_free(scsidevices[count]); diff --git a/xcdroast-0.98alpha15-15_no_readcd_version.patch b/xcdroast-0.98alpha15-15_no_readcd_version.patch deleted file mode 100644 index e9ac9e6..0000000 --- a/xcdroast-0.98alpha15-15_no_readcd_version.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urip xcdroast-0.98+0alpha15/src/io.c xcdroast-0.98+0alpha15-fixed/src/io.c ---- xcdroast-0.98+0alpha15/src/io.c 2003-10-26 15:24:48.000000000 +0100 -+++ xcdroast-0.98+0alpha15-fixed/src/io.c 2007-01-17 23:04:29.000000000 +0100 -@@ -10143,6 +10143,10 @@ gchar *p; - g_error("popen error\n"); - } - -+ /* all versions of readom is good enough! */ -+ return 0; -+ -+#if 0 - strcpy(line,""); - for (;;) { - if (fgets(line,MAXLINE,fpin) == NULL) -@@ -10185,6 +10189,7 @@ gchar *p; - strcpy(found,ver); - return 1; - } -+#endif - } - - diff --git a/xcdroast-0.98alpha15-linebuffer.patch b/xcdroast-0.98alpha15-linebuffer.patch deleted file mode 100644 index f1d0122..0000000 --- a/xcdroast-0.98alpha15-linebuffer.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- xcdroast-0.98alpha15/src/tools.c.linebuffer 2003-10-26 22:28:57.000000000 +0000 -+++ xcdroast-0.98alpha15/src/tools.c 2004-07-12 12:24:36.134850404 +0100 -@@ -596,8 +596,25 @@ - if (rc == -1 && errno == EAGAIN) { - if (n == 1) - return(-1); -- else -+ else { -+ /* Partial line read. Wait a -+ * bit longer in case there's -+ * more. This does not fix -+ * all the races in the -+ * parsing code, but works -+ * around them somewhat. */ -+ struct timeval t; -+ fd_set set; -+ FD_ZERO(&set); -+ FD_SET(fd,&set); -+ t.tv_sec = 1; -+ t.tv_usec = 0; -+ if (select (fd+1, &set, NULL, -+ NULL, &t) > 0) -+ continue; -+ - break; -+ } - } - return(-1); /* error */ - } diff --git a/xcdroast-0.98alpha15-nogtk1.patch b/xcdroast-0.98alpha15-nogtk1.patch deleted file mode 100644 index c82c902..0000000 --- a/xcdroast-0.98alpha15-nogtk1.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- xcdroast-0.98alpha15/configure.in.nogtk1 2005-04-21 18:11:47.000000000 +0200 -+++ xcdroast-0.98alpha15/configure.in 2005-04-21 18:12:05.000000000 +0200 -@@ -99,25 +99,9 @@ - AM_DEP_NONROOTMODE - AM_DEP_ENABLEGTK2 - --if test "$ENABLE_GTK2" = "TRUE"; then -- -- PKG_CHECK_MODULES(PKGCONFIG, gtk+-2.0 >= 2.0.6) -- LIBS="$LIBS $PKGCONFIG_LIBS" -- CFLAGS="$CFLAGS $PKGCONFIG_CFLAGS" -- --else -- dnl pure plain GTK+-1.2.x support -- -- dnl Check for GLIB -- AM_PATH_GLIB(1.2.3,, AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.)) -- -- dnl Check for GTK+ -- AM_PATH_GTK(1.2.3,, AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.)) -- -- dnl Check for GDK-Pixbuf -- AM_PATH_GDK_PIXBUF(0.8.0,, AC_MSG_ERROR(Test for gdk_pixbuf failed. See the file 'INSTALL' for help.)) --fi -- -+PKG_CHECK_MODULES(PKGCONFIG, gtk+-2.0 >= 2.0.6) -+LIBS="$LIBS $PKGCONFIG_LIBS" -+CFLAGS="$CFLAGS $PKGCONFIG_CFLAGS" - dnl internationalization macros - AM_GNU_GETTEXT - diff --git a/xcdroast-0.98alpha15-nowarn.patch b/xcdroast-0.98alpha15-nowarn.patch deleted file mode 100644 index 7d56328..0000000 --- a/xcdroast-0.98alpha15-nowarn.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- xcdroast-0.98alpha15/src/init.c.nowarn 2003-10-30 12:58:26.000000000 +0100 -+++ xcdroast-0.98alpha15/src/init.c 2004-09-09 16:50:31.651482768 +0200 -@@ -736,7 +736,7 @@ - #if (defined(__MACH__) && defined(__APPLE__)) || (USE_NONROOTMODE == 0) - dodebug(1,"-- X-CD-Roast compiled with disabled non-root-mode.\n"); - --#if !(defined(__MACH__) && defined(__APPLE__)) -+#if !(defined(__MACH__) && defined(__APPLE__)) && 0 - if (!isroot()) { - g_print("\nWARNING: Using X-CD-Roast as non-root and was compiled without non-root-support.\n"); - } -@@ -1125,7 +1125,10 @@ - if (isroot()) { - show_fancy_dialog(_("Warning:"), _("This copy of X-CD-Roast has been compiled without\nnon-root-support. If you want to use X-CD-Roast without entering\nthe root-password, you have to install a fully enabled version.\n\nVisit http://www.xcdroast.org for more information."), T_OK); - } else { -+#if 0 - show_fancy_dialog(_("Warning:"), _("This copy of X-CD-Roast has been compiled without\nnon-root-support. Therefore you will not be able to use it as\nnon-root user unless you have take special precautions. It is\nrecommended that you install a fully enabled version.\n\nVisit http://www.xcdroast.org for more information."), T_OK); -+#endif -+; - } - gtk_widget_destroy(toplevel); - } diff --git a/xcdroast-0.98alpha15-prodvd.patch b/xcdroast-0.98alpha15-prodvd.patch deleted file mode 100644 index 3b94bef..0000000 --- a/xcdroast-0.98alpha15-prodvd.patch +++ /dev/null @@ -1,397 +0,0 @@ -diff -up xcdroast-0.98alpha16/src/create.c.cdrkit xcdroast-0.98alpha16/src/create.c ---- xcdroast-0.98alpha16/src/create.c.cdrkit 2009-02-17 06:34:16.000000000 -0500 -+++ xcdroast-0.98alpha16/src/create.c 2009-02-17 06:34:16.000000000 -0500 -@@ -523,7 +523,7 @@ GtkWidget *scrolled_win, *list; - gtk_widget_show(tbl); - vbox = gtk_vbox_new(FALSE,10); - gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,1,2,0,1); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("CD-Information")); - } else { - f1 = gtk_frame_new(_("CD/DVD-Information")); -@@ -1260,7 +1260,7 @@ GtkWidget *scrolled_win, *img_list; - gtk_widget_show(tbl); - vbox = gtk_vbox_new(FALSE,10); - gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,0,1,0,1); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("CD-Information")); - } else { - f1 = gtk_frame_new(_("CD/DVD-Information")); -@@ -2979,7 +2979,7 @@ GtkTargetEntry target_entry[3]; - GTK_SIGNAL_FUNC(fixate_clicked), NULL); - define_tooltip(b1,_("Just fixate (close) the CD, if for some reason the CD has been written but not fixated.")); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - b1 = gtk_button_new_with_label(_("Blank CD-RW")); - } else { - b1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); -@@ -3086,7 +3086,7 @@ GtkTargetEntry target_entry[3]; - gtk_widget_show (menu_item); - i++; - } -- if (curset.isProDVD) { -+ if (curset.isDVD) { - i = 0; - tmpval = curset.cdrtype; - while (dvdtypes[i] != 0) { -@@ -5774,7 +5774,7 @@ GtkObject *adj; - bootable_frame1 = NULL; - bootable_frame2 = NULL; - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - f1 = gtk_frame_new(_("Options to create a bootable CD")); - } else { - f1 = gtk_frame_new(_("Options to create a bootable CD/DVD")); -@@ -5794,7 +5794,7 @@ GtkObject *adj; - gtk_box_pack_start(GTK_BOX(vbox),tbl,FALSE,FALSE,0); - gtk_widget_show(tbl); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - l1 = rightjust_gtk_label_new(_("Make CD bootable?")); - } else { - l1 = rightjust_gtk_label_new(_("Make CD/DVD bootable?")); -@@ -7023,7 +7023,7 @@ gchar tmp2[MAXLINE]; - gtk_widget_show (menu_item); - i++; - } -- if (curset.isProDVD) { -+ if (curset.isDVD) { - i = 0; - tmpval = curset.cdrtype; - while (dvdtypes[i] != 0) { -@@ -7174,7 +7174,7 @@ gchar tmp2[MAXLINE]; - gtk_widget_show(b1); - define_tooltip(b1,_("Set additional write options for advanced users.")); - /* blank button */ -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - b1 = gtk_button_new_with_label(_("Blank CD-RW")); - } else { - b1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW")); -diff -up xcdroast-0.98alpha16/src/init.c.cdrkit xcdroast-0.98alpha16/src/init.c ---- xcdroast-0.98alpha16/src/init.c.cdrkit 2009-02-17 06:34:16.000000000 -0500 -+++ xcdroast-0.98alpha16/src/init.c 2009-02-17 06:34:16.000000000 -0500 -@@ -156,7 +156,7 @@ static void init_curset() { - gint cdrtypes[] = CDR_TYPES_MIN; - gint i; - -- curset.isProDVD = 0; -+ curset.isDVD = 0; - curset.support_ontheflyaudio = 0; - curset.writer_devnr = -1; - curset.reader_devnr = -1; -@@ -1005,7 +1005,7 @@ gint isProDVD, ignoreProDVD; - tocfiles = (GList *) NULL; - strcpy(xcdroast_version_loaded, ""); - -- curset.isProDVD = isProDVD; -+ curset.isDVD = isProDVD; - curset.support_ontheflyaudio = support_ontheflyaudio; - - /* load iso-options if available */ -@@ -1129,7 +1129,7 @@ gint isProDVD, ignoreProDVD; - } - #endif - -- if (curset.isProDVD == 1) { -+ if (curset.isDVD == 1) { - /* set key if we got one from the config-file */ - if (strcmp(setupdata.ProDVDkey,"")) { - -diff -up xcdroast-0.98alpha16/src/io.c.cdrkit xcdroast-0.98alpha16/src/io.c ---- xcdroast-0.98alpha16/src/io.c.cdrkit 2009-02-17 06:34:16.000000000 -0500 -+++ xcdroast-0.98alpha16/src/io.c 2009-02-17 08:39:07.000000000 -0500 -@@ -4725,7 +4725,7 @@ gint fd; - dolog(3, "Saving extended output to %s\n", fname); - - /* write to file */ -- fd = open(fname,O_WRONLY | O_CREAT); -+ fd = open(fname,O_WRONLY | O_CREAT, 0600); - if (fd < 0) { - g_warning("Can't open file %s for writing\n",fname); - return 1; -@@ -5989,7 +5989,7 @@ gchar tmp[MAXLINE]; - if (WIFSIGNALED(ret) && read_done == 0) { - - /* most likely invalid prodvd key */ -- if (curset.isProDVD) { -+ if (curset.isDVD) { - strncpy(tmp, "\nReceived ALARM from cdrecord-ProDVD. Aborting blank...\nInvalid ProDVD key?\n", MAXLINE); - - convert_for_gtk2_textwidget(tmp); -@@ -6372,7 +6372,7 @@ gint cdrecord_stderr; - if (WIFSIGNALED(ret) && read_done == 0) { - - /* most likely invalid prodvd key */ -- if (curset.isProDVD && curset.cdrtype > 1000) { -+ if (curset.isDVD && curset.cdrtype > 1000) { - read_done = 2; - } - } -@@ -6402,7 +6402,7 @@ gint cdrecord_stderr; - } - - /* prodvd and beginning to write soon? */ -- if (curset.isProDVD && curset.cdrtype > 1000) { -+ if (curset.isDVD && curset.cdrtype > 1000) { - if (strstr(line,"Last chance to quit")) { - cdrtimer = gtk_timeout_add(1000, - cdrtimer_callback, NULL); -@@ -6711,7 +6711,7 @@ gchar *p; - - static void display_invalid_prodvdkey() { - -- if (curset.isProDVD && curset.cdrtype > 1000) { -+ if (curset.isDVD && curset.cdrtype > 1000) { - show_dialog(ICO_WARN, _("cdrecord-ProDVD terminated.\n\nMost likely because you have entered\nan invalid key. Please check if it is correct."), T_OK, NULL, NULL, 0); - } - } -@@ -9900,17 +9900,17 @@ gint wrmode; - /* check the version of cdrecord */ - /* return 1 if not correct (to old) */ - --gint check_version_cdrecord(gchar *match, gchar *found, gint *isProDVD) { -+gint check_version_cdrecord(gchar *match, gchar *found, gint *isDVD) { - gchar line[MAXLINE]; - gchar vline[MAXLINE]; - gchar ver[MAXLINE]; - FILE *fpin; - gchar *p; - -- *isProDVD = 0; -+ *isDVD = 0; - strcpy(ver,""); - get_wrap_path("CDRECORD",line); -- strcat(line," -version 2>/dev/null"); -+ strcat(line," -version 2>&1"); - - dodebug(1, "calling: %s\n", line); - if ((fpin = popen(line,"r")) == NULL) { -@@ -9930,7 +9930,7 @@ gchar *p; - } - if (strstr(line, "This version is an unofficial (modified) version with DVD support")) { - dodebug(1, "WARNING: Inoffical cdrecord version found!\n", line); -- *isProDVD = 1; -+ *isDVD = 1; - } - } - -@@ -9955,7 +9955,7 @@ gchar *p; - } else { - p = strstr(vline, "ProDVD"); - if (p != NULL) { -- *isProDVD = 1; -+ *isDVD = 1; - p = strtok(p, " "); - if (p != NULL) { - p = strtok(NULL, " "); -@@ -10005,6 +10005,7 @@ gchar *p; - - gint check_version_mkisofs(gchar *match, gchar *found) { - gchar line[MAXLINE]; -+gchar vline[MAXLINE]; - gchar ver[MAXLINE]; - FILE *fpin; - gchar *p; -@@ -10019,17 +10020,22 @@ gchar *p; - } - - strcpy(line,""); -+ strcpy(vline,""); - for (;;) { - if (fgets(line,MAXLINE,fpin) == NULL) - break; - dodebug(10,"got: %s",line); -+ /* only get first line */ -+ if (strcmp(vline,"") == 0) { -+ strncpy(vline, line, MAXLINE); -+ } - } - - if (pclose(fpin) == -1) { - g_error("pclose error\n"); - } - -- if (strcmp(line,"") == 0 || strstr(line,"sh:") != NULL) { -+ if (strcmp(vline,"") == 0 || strstr(vline,"sh:") != NULL) { - /* failed to open - permission denied */ - return 2; - } -@@ -10038,9 +10044,9 @@ gchar *p; - /* now line contains the version string of mkisofs */ - /* try to extract the version number */ - -- p = strstr(line,"mkisofs"); -+ p = strstr(line,"genisoimage"); - if (p != NULL) { -- p = strtok(p+8, " "); -+ p = strtok(p+11, " "); - if (p != NULL) { - strcpy(ver,p); - } -@@ -10070,7 +10076,7 @@ gchar line[MAXLINE]; - gchar ver[MAXLINE]; - FILE *fpin; - gchar *p; -- -+ int icedax=0; - strcpy(ver,""); - get_wrap_path("CDDA2WAV",line); - strcat(line," -version 2>&1"); -@@ -10085,6 +10091,9 @@ gchar *p; - if (fgets(line,MAXLINE,fpin) == NULL) - break; - dodebug(10,"got: %s",line); -+ if (strstr(line, "icedax") != NULL) { -+ icedax=1; -+ } - } - - if (pclose(fpin) == -1) { -@@ -10096,6 +10105,11 @@ gchar *p; - return 2; - } - -+ if (icedax) { -+ strcpy(found, CDDA2WAV_VERSION); -+ return 0; -+ } -+ - /* now line contains the version string of cdda2wav */ - /* try to extract the version number */ - -@@ -10137,13 +10151,14 @@ gchar *p; - - gint check_version_readcd(gchar *match, gchar *found) { - gchar line[MAXLINE]; -+gchar vline[MAXLINE]; - gchar ver[MAXLINE]; - FILE *fpin; - gchar *p; - - strcpy(ver,""); - get_wrap_path("READCD",line); -- strcat(line," -version 2>/dev/null"); -+ strcat(line," -version 2>/dev/null | fgrep " READCD_NAME); - - dodebug(1, "calling: %s\n", line); - if ((fpin = popen(line,"r")) == NULL) { -@@ -10155,17 +10170,22 @@ gchar *p; - - #if 0 - strcpy(line,""); -+ strcpy(vline,""); - for (;;) { - if (fgets(line,MAXLINE,fpin) == NULL) - break; - dodebug(10,"got: %s",line); -+ /* only get first line */ -+ if (strcmp(vline,"") == 0) { -+ strncpy(vline, line, MAXLINE); -+ } - } - - if (pclose(fpin) == -1) { - g_error("pclose error\n"); - } - -- if (strcmp(line,"") == 0 || strstr(line,"sh:") != NULL) { -+ if (strcmp(vline,"") == 0 || strstr(vline,"sh:") != NULL) { - /* failed to open - permission denied */ - return 2; - } -diff -up xcdroast-0.98alpha16/src/main.c.cdrkit xcdroast-0.98alpha16/src/main.c ---- xcdroast-0.98alpha16/src/main.c.cdrkit 2009-02-17 06:34:16.000000000 -0500 -+++ xcdroast-0.98alpha16/src/main.c 2009-02-17 06:34:16.000000000 -0500 -@@ -226,7 +226,7 @@ gchar tmp[MAXLINE]; - gtk_box_pack_start(GTK_BOX(sidespace), side_t,TRUE,TRUE,0); - - side_t_btn1 = gtk_button_new_with_label (_("Setup")); -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - side_t_btn2 = gtk_button_new_with_label (_("Duplicate CD")); - side_t_btn3 = gtk_button_new_with_label (_("Create CD")); - } else { -diff -up xcdroast-0.98alpha16/src/setup.c.cdrkit xcdroast-0.98alpha16/src/setup.c ---- xcdroast-0.98alpha16/src/setup.c.cdrkit 2009-02-17 06:34:16.000000000 -0500 -+++ xcdroast-0.98alpha16/src/setup.c 2009-02-17 06:34:16.000000000 -0500 -@@ -316,7 +316,7 @@ gchar tmp[MAXLINE]; - dolog(2, "Confirm setup\n"); - - /* some lasts checks and warnings */ -- if (is_dvdwriter(setupdata.writer_devnr) && !curset.isProDVD) { -+ if (is_dvdwriter(setupdata.writer_devnr) && !curset.isDVD) { - ret = show_dialog(ICO_WARN, _("Please note that you have to install ProDVD support before\nyou can write DVDs. Currently you will only be able to\nwrite regular CDs with your DVD-Writer."), T_OK,T_CANCEL, NULL, 0); - if (ret == 1) { - /* abort */ -@@ -1148,7 +1148,7 @@ static const gchar *helpwritemodes[] = H - gtk_box_pack_start(GTK_BOX(vbox2),tbl,FALSE,TRUE,0); - gtk_widget_show(tbl); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - l1 = rightjust_gtk_label_new(_("CD Writer Device:")); - } else { - l1 = rightjust_gtk_label_new(_("CD/DVD Writer Device:")); -@@ -2788,7 +2788,7 @@ GtkWidget *check; - gtk_text_set_point(GTK_TEXT(txt),0); - gtk_text_thaw(GTK_TEXT(txt)); - -- if (curset.isProDVD == 0) { -+ if (curset.isDVD == 0) { - gtk_widget_set_sensitive(f1, FALSE); - gtk_widget_set_sensitive(l1, FALSE); - gtk_widget_set_sensitive(txt, FALSE); -@@ -3198,7 +3198,7 @@ gchar tmp[MAXLINE]; - gtk_container_add (GTK_CONTAINER (f1), tbl); - gtk_widget_show(tbl); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - check = gtk_check_button_new_with_label(_("change CD Writer Device")); - } else { - check = gtk_check_button_new_with_label(_("change CD/DVD Writer Device")); -@@ -3220,7 +3220,7 @@ gchar tmp[MAXLINE]; - gtk_widget_show(check); - define_tooltip(check, _("If enabled, then the user is allowed the change the write parameters for the CD Writer (e.g. Speed and FIFO-Buffer-Size).")); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - check = gtk_check_button_new_with_label(_("change CD Reader Device")); - } else { - check = gtk_check_button_new_with_label(_("change CD/DVD Reader Device")); -@@ -3387,7 +3387,7 @@ gint i; - gtk_notebook_append_page(GTK_NOTEBOOK (notebook),f1,l1); - draw_scsi_scan(f1); - -- if (!curset.isProDVD) { -+ if (!curset.isDVD) { - l2 = gtk_label_new(_("CD Settings")); - } else { - l2 = gtk_label_new(_("CD/DVD Settings")); -diff -up xcdroast-0.98alpha16/src/xtools.c.cdrkit xcdroast-0.98alpha16/src/xtools.c ---- xcdroast-0.98alpha16/src/xtools.c.cdrkit 2008-08-20 12:10:28.000000000 -0400 -+++ xcdroast-0.98alpha16/src/xtools.c 2009-02-17 06:34:16.000000000 -0500 -@@ -2403,7 +2403,7 @@ gchar tmp[MAXLINE]; - - gint get_gracetime() { - -- if (curset.isProDVD && curset.cdrtype > 1000) { -+ if (curset.isDVD && curset.cdrtype > 1000) { - /* use 10 seconds for prodvd, because the keycheck - can take a while... */ - return 10; -@@ -3521,7 +3521,7 @@ gint isdvd,i; - isdvd = 0; - i = get_writerreaderdevs_index(devnr); - -- if (i >= 0 && curset.isProDVD && writerreaderdevs[i]->is_dvdwriter) { -+ if (i >= 0 && curset.isDVD && writerreaderdevs[i]->is_dvdwriter) { - if (convert_devnr2busid(devnr,tmp) != 0) { - g_error("non existing cdrom?"); - } diff --git a/xcdroast-0.98alpha15-scan.patch b/xcdroast-0.98alpha15-scan.patch deleted file mode 100644 index 73d3f7b..0000000 --- a/xcdroast-0.98alpha15-scan.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- xcdroast-0.98alpha15/src/io.c.scan 2003-10-26 15:24:48.000000000 +0100 -+++ xcdroast-0.98alpha15/src/io.c 2004-09-20 16:36:03.841108264 +0200 -@@ -1061,17 +1071,18 @@ - - if (doscanbus) { - /* scan for scsi devices */ -+ scan_other("ATA", 1, txt); - scan_traditional(txt); - - /* scan for alternatives */ - #if defined(linux) - if (scanparam) { -- scan_other("ATA", 1, txt); -+ scan_other("ATA", 2, txt); - } - #endif - #if defined(sun) - if (scanparam) { -- scan_other("USCSI", 2, txt); -+ scan_other("USCSI", 3, txt); - } - #endif - } ---- xcdroast-0.98alpha15/src/setup.c.scan 2003-10-30 12:50:25.000000000 +0100 -+++ xcdroast-0.98alpha15/src/setup.c 2004-09-20 16:37:12.290702344 +0200 -@@ -22,6 +22,8 @@ - #include - #include - -+#include -+ - /* - #ifdef HAVE_LOCALE_H - #include -@@ -4036,7 +4038,14 @@ - - /* fill textbox and do the actual scanning */ - if (!manual) { -- scanbus_new(txt, scanparam); -+ glob_t globbuf; -+ int i; -+ if (glob("/dev/cdrom*", GLOB_NOSORT, NULL, &globbuf) == 0) { -+ for (i = 0; globbuf.gl_pathv && globbuf.gl_pathv[i] != NULL ; i -+++) { -+ scanbus_new_single(globbuf.gl_pathv[i], txt); -+ } -+ globfree(&globbuf); } - } else { - /* the syntax used to scan for REMOTE scsi devices */ - if (strncmp(devicestr,"REMOTE:", 7) == 0 && diff --git a/xcdroast-0.98alpha16-wformat.patch b/xcdroast-0.98alpha16-wformat.patch deleted file mode 100644 index e0b2e1e..0000000 --- a/xcdroast-0.98alpha16-wformat.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xcdroast-0.98alpha16/src/setup.c.wformat xcdroast-0.98alpha16/src/setup.c ---- xcdroast-0.98alpha16/src/setup.c.wformat 2014-02-21 13:04:20.813356229 +0100 -+++ xcdroast-0.98alpha16/src/setup.c 2014-02-21 13:04:33.893300539 +0100 -@@ -4477,7 +4477,7 @@ gchar tmp[MAXLINE]; - if (!textonly) { - show_dialog(ICO_ERROR,tmp, T_OK, NULL, NULL, 0); - } else { -- g_warning(tmp); -+ g_warning("%s", tmp); - } - } - } diff --git a/xcdroast.desktop b/xcdroast.desktop deleted file mode 100644 index 4868c11..0000000 --- a/xcdroast.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=CD Writer -Type=Application -Exec=/usr/bin/xcdroast -Comment=CD creation tool -Icon=/usr/lib/xcdroast/icons/xcdricon.png diff --git a/xcdroast.spec b/xcdroast.spec deleted file mode 100644 index b525821..0000000 --- a/xcdroast.spec +++ /dev/null @@ -1,430 +0,0 @@ -%global alphatag alpha16 -Summary: An X Window System based tool for creating CDs -Name: xcdroast -Version: 0.98 -Release: 0.25.%{?alphatag}%{?dist} -Epoch: 1 -License: LGPLv2+ and GPLv2 -URL: http://www.xcdroast.org/ - -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{alphatag}.tar.gz -Source1: xcdroast.desktop -Patch1: xcdroast-0.98alpha15-linebuffer.patch -Patch2: xcdroast-0.98alpha15-nowarn.patch -Patch3: xcdroast-0.98alpha15-scan.patch -Patch4: xcdroast-0.98alpha15-13_cdrecord_to_wodim.patch -Patch5: xcdroast-0.98alpha15-14_atapi_to_oldatapi.patch -Patch6: xcdroast-0.98alpha15-15_no_readcd_version.patch -Patch7: xcdroast-0.98alpha15-prodvd.patch -Patch8: xcdroast-0.98alpha15-nogtk1.patch -Patch9: xcdroast-0.98alpha16-wformat.patch - - -Requires: wodim -Requires: genisoimage -Requires: icedax -BuildRequires: gcc -BuildRequires: gtk2-devel >= 2.0.6 -BuildRequires: desktop-file-utils >= 0.2.92 -BuildRequires: autoconf automake - -%description -X-CD-Roast provides a GUI interface for commands like cdrecord and -mkisofs. X-CD-Roast includes a self-explanatory X11 user interface, -automatic SCSI and IDE hardware setup, support for mastering of new -ISO9660 data CDs, support for production of new audio CDs, fast -copying of CDs without hard disk buffering, and a logfile option. - -%package doc -Summary: Manual for xcdroast - -%description doc -This package contains the manual for xcdroast - -%prep -%setup -q -n %{name}-%{version}%{alphatag} -%patch1 -p1 -b .linebuffer -%patch2 -p1 -b .nowarn -%patch3 -p1 -b .scan -%patch4 -p1 -b .p23 -%patch5 -p0 -b .p24 -%patch6 -p1 -b .p25 -%patch7 -p1 -b .cdrkit -%patch8 -p1 -b .nogtk1 -%patch9 -p1 -b .wformat - -# Fix char sets -for file in doc/TRANSLATION.HOWTO ChangeLog; do - iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \ - touch -r $file $file.new && \ - mv $file.new $file -done - -%build -export CFLAGS="$RPM_OPT_FLAGS -Werror=format-security" -autoreconf -ivf -%configure --enable-gtk2 --disable-nonrootmode \ - --with-xcdroast-libdir-prefix=%{_libdir}/%{name} -make %{?_smp_mflags} - -# Change desktop file to the current libdir -sed 's|/usr/lib|%{_libdir}|' %{SOURCE1} > %{name}.desktop - - -%install -mkdir -p $RPM_BUILD_ROOT/{etc/{X11/applnk/Multimedia,pam.d,security/console.apps},usr/sbin} -make install DESTDIR=$RPM_BUILD_ROOT - -desktop-file-install --vendor xcdroast \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Red-Hat-Base \ - --add-category System \ - --add-category DiscBurning \ - %{name}.desktop - -%find_lang %name - -%files -f %{name}.lang -%license COPYING -%doc AUTHORS ChangeLog README doc/DOCUMENTATION doc/FAQ doc/README* doc/TRANSLATION.HOWTO -%{_mandir}/man1/xcdroast.1.* -%{_bindir}/xcdroast -%{_libdir}/xcdroast/ -%{_datadir}/applications/%{name}.desktop - -%files doc -%doc doc/manual/* - -%changelog -* Sun Feb 03 2019 Fedora Release Engineering - 1:0.98-0.25.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1:0.98-0.24.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jul 9 2018 Peter Robinson 1:0.98-0.23.alpha16 -- Cleanup spec, update requires, use %%licensee - -* Fri Feb 09 2018 Fedora Release Engineering - 1:0.98-0.22.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1:0.98-0.21.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1:0.98-0.20.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1:0.98-0.19.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1:0.98-0.18.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1:0.98-0.17.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 1:0.98-0.16.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1:0.98-0.15.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Feb 21 2014 Tomas Smetana - 1:0.98-0.14.alpha16 -- Require autoconf and automake for build - -* Fri Feb 21 2014 Tomas Smetana - 1:0.98-0.13.alpha16 -- fix #926752: aarch64 support -- fix #1037391: fails to build with "-Werror=format-security" - -* Sun Aug 04 2013 Fedora Release Engineering - 1:0.98-0.12.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 1:0.98-0.11.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 1:0.98-0.10.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 1:0.98-0.9.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 06 2011 Adam Jackson - 1:0.98-0.8.alpha16 -- Rebuild for new libpng - -* Fri Jun 24 2011 Roman Rakus - 1:0.98-0.7.alpha16 -- Fix build fail (#716081) - -* Mon Feb 07 2011 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Mar 23 2010 Roman Rakus - 1:0.98-0.5.alpha16 -- Corrected Source0 URL - -* Fri Mar 19 2010 Roman Rakus - 1:0.98-0.4.alpha16 -- Fixes for Merge review #226550 - -* Mon Jul 27 2009 Fedora Release Engineering - 1:0.98-0.3.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 1:0.98-0.2.alpha16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 09 2009 Roman Rakus - 0.98-0.1.alpha16 -- New version 0.98alpha16 -- some spec file fixes - Resolves: #226550 - -* Mon Feb 18 2008 Fedora Release Engineering - 0.98a15-17 -- Autorebuild for GCC 4.3 - -* Thu Aug 23 2007 Harald Hoyer - 0.98a15-16 -- changed license tag - -* Mon Aug 13 2007 Harald Hoyer - 0.98a15-15 -- more cdrkit compat patches -- changed desktop category -- changed build root path -- added mode to open(2) in io.c - -* Wed Jun 20 2007 Harald Hoyer - 0.98a15-13.1 -- added cdrkit compat patches - -* Thu Mar 15 2007 Karsten Hopp 0.98a15-13 -- rebuild with current gtk2 to add png support (#232013) - -* Wed Jul 12 2006 Jesse Keating - 0.98a15-12.2.2 -- rebuild - -* Fri Feb 10 2006 Jesse Keating - 0.98a15-12.2.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 0.98a15-12.2 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Thu Apr 21 2005 Harald Hoyer - 0.98a15-12 -- removed gtk1 build requirement - -* Mon Apr 18 2005 Harald Hoyer - 0.98a15-11 -- fixed frozen progress bars with patch from Didier Heyden (bug #134334) - -* Thu Mar 03 2005 Harald Hoyer -- rebuilt - -* Wed Feb 09 2005 Harald Hoyer -- rebuilt - -* Mon Sep 20 2004 Harald Hoyer - 0.98a15-7 -- only add /dev/cdrom* -- enable prodvd mode for our cdrecord - -* Fri Sep 10 2004 Harald Hoyer - 0.98a15-6 -- improved scanning and removed warnings - -* Sun Aug 29 2004 Tim Waugh - 0.98a15-5 -- Actually apply the patch. - -* Tue Jul 13 2004 Harald Hoyer - 0.98a15-4 -- added xcdroast-0.98alpha15-linebuffer.patch (Tim Waugh, bz 127658) -- corrected buildrequires (bz 127300) - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Wed Feb 25 2004 Harald Hoyer - 0.98a15-2 -- 64bit patch added -- configure patch removing pcre req added - -* Tue Feb 24 2004 Harald Hoyer - 0.98a15-1 -- version 0.98alpha15 - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Mon Oct 13 2003 Harald Hoyer 0.98a14-2 -- added patches from xcdroast.org to work again - with the cdrtools-2.01a17 or newer. - -* Tue Sep 01 2003 Harald Hoyer 0.98a14-1 -- new version - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Tue Jan 07 2003 Harald Hoyer 0.98a13-2 -- removed the old patches -- point the .desktop to an icon - -* Tue Jan 07 2003 Harald Hoyer 0.98a13-2 -- --disable-nonrootmode - -* Tue Jan 07 2003 Harald Hoyer 0.98a13-1 -- bump version - -* Tue Nov 12 2002 Nalin Dahyabhai 0.98a9-21 -- Remove absolute paths from PAM configuration, ensuring that the right set - of modules gets used regardless of arch on multilib systems. - -* Tue Oct 22 2002 Tim Waugh 0.98a9-20 -- Fix POSIX locale patch (bug #76341). - -* Sun Oct 20 2002 Tim Waugh 0.98a9-19 -- Use POSIX locale for df (bug #76341). - -* Tue Aug 13 2002 Havoc Pennington 0.98a9-18 -- rebuild with new imlib soname - -* Tue Aug 13 2002 Tim Waugh 0.98a9-17 -- Another go at fixing bug #70280. - -* Mon Aug 5 2002 Tim Waugh 0.98a9-16 -- Convert translation files to UTF-8 (bug #70280). - -* Fri Jul 26 2002 Tim Waugh 0.98a9-15 -- Use pam_timestamp.so (bug #69884). - -* Tue Jul 23 2002 Tim Waugh 0.98a9-14 -- Desktop file fixes (bug #69537). - -* Mon Jul 15 2002 Tim Waugh 0.98a9-13 -- Use desktop-file-install. - -* Fri Jun 21 2002 Tim Powers 0.98a9-12 -- automated rebuild - -* Thu Jun 20 2002 Tim Waugh 0.98a9-11 -- Set SESSION=true in the console.apps file (bug #62369). - -* Thu May 23 2002 Tim Powers 0.98a9-10 -- automated rebuild - -* Thu Apr 25 2002 Tim Waugh 0.98a9-9 -- Don't explicitly strip binaries (bug #62571). - -* Mon Apr 15 2002 Tim Waugh 0.98a9-8 -- Chicken out of change to fix bug #56844. Better solution needed. - -* Wed Mar 20 2002 Tim Waugh 0.98a9-7 -- Better desktop file comment (bug #61427). - -* Tue Feb 26 2002 Tim Waugh 0.98a9-6 -- Rebuild in new environment. - -* Thu Jan 24 2002 Karsten Hopp -- Fix Requires: - -* Wed Jan 09 2002 Tim Powers -- automated rebuild - -* Thu Nov 29 2001 Tim Waugh 0.98a9-3 -- Fix console.apps file (bug #56844). - -* Mon Jul 30 2001 Tim Waugh 0.98a9-2 -- Put .desktop file in Multimedia, not Applications (bug #50290). - -* Mon Jul 23 2001 Karsten Hopp 0.98a9-1 -- 0.98a9 -- give hint how to setup nonroot-mode (we don't ship the sgid binaries) - -* Wed Jul 19 2001 Karsten Hopp -- remove workaround for older GTK - -* Wed Jul 4 2001 Tim Waugh 0.98a8-5 -- Change Copyright: to License:. -- Change version check for cdrecord to accept 1.10 instead of 1.9. -- ... and require newer cdrecord. - -* Tue Jun 19 2001 Karsten Hopp -- add ExcludeArch: s390 s390x -- add BuildRequires - -* Tue May 22 2001 Karsten Hopp -- fix #41802, needs some testing if cdrecord 1.10 - is compatible with 1.9 - -* Tue Feb 27 2001 Karsten Hopp -- symlink should be relative -- fix strip - -* Mon Feb 12 2001 Karsten Hopp -- update to alpha8 (security bug in alpha7) -- use consolehelper -- fix bugzilla #26870 - -* Fri Dec 01 2000 Karsten Hopp -- rebuild to fix /usr/share/doc permissions - -* Mon Nov 13 2000 Karsten Hopp -- update to 0.98alpha7, which has a new menu to configure non-root mode -- added README.nonroot, README.atapi to documentation - -* Thu Aug 24 2000 Bernhard Rosenkraenzer -- Fix interoperability with mkisofs 1.13 - -* Wed Aug 23 2000 Bernhard Rosenkraenzer -- Update to current, this fixes the "crashes on startup" bug (#16055) - (and the maintainer confirms the "alpha" is more stable than the lastest - "release"). - -* Mon Aug 7 2000 Bernhard Rosenkraenzer -- remove another insistence on Tcl 8.0 - -* Thu Jul 13 2000 Prospector -- automatic rebuild - -* Thu Jun 15 2000 Bill Nottingham -- fix dependencies - -* Sun Jun 11 2000 Bill Nottingham -- build on ia64 - -* Fri Jun 9 2000 Jakub Jelinek -- Remove patch for gcc 2.96 breakages, there were none -- Add patch to make et2c work with recent Tcl/Tk headers - -* Thu Jun 8 2000 Bernhard Rosenkraenzer -- get rid of the ExclusiveArch: line; it compiles on sparc and it might - even work there... -- Exclude ia64 for now; cdrecord isn't available there. - -* Thu Jun 8 2000 Bernhard Rosenkraenzer -- rebuild for main distribution -- fix build with TCL/Tk 8.3 -- remove cdrecord and mkisofs from the package, add - dependencies on the cdrecord and mkisofs packages instead -- fix up the code to find cdrecord where it belongs. -- put man pages in FHS locations -- fix build with kernel 2.4 headers -- work around gcc 2.96 breakages - -* Sun May 28 2000 Ngo Than -- rebuild for 7.0 -- put man page in correct place -- fix xcdroast to build with tcltk8.2 -- add cdrecord-1.8 in xcdroast - -* Tue Apr 04 2000 Ngo Than -- include needed devices in the package (Bug #9997) - -* Fri Feb 11 2000 Ngo Than -- fix Bug 8564 and 8563 - -* Mon Jul 26 1999 Tim Powers -- rebuilt for 6.1 - -* Wed Apr 15 1999 Michael Maher -- built package for 6.0 -- updated source - -* Tue Oct 13 1998 Michael Maher -- rushed by wanger.. not updated - -* Wed May 20 1998 Michael Maher -- built and updated package -- added changelog -- edited paths