public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Filipe Rosset <rosset.filipe@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/cdrdao] f44: update to 1.2.6
Date: Tue, 02 Jun 2026 19:38:28 GMT [thread overview]
Message-ID: <178042910873.1.11096570840479553812.rpms-cdrdao-e3508e79c219@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/cdrdao
Branch : f44
Commit : e3508e79c2193b38f245c767db42eede37d42f18
Author : Filipe Rosset <rosset.filipe@gmail.com>
Date : 2026-04-11T00:14:15-03:00
Stats : +3/-234 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/cdrdao/c/e3508e79c2193b38f245c767db42eede37d42f18?branch=f44
Log:
update to 1.2.6
---
diff --git a/.gitignore b/.gitignore
index 76fb90b..f4c28d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-cdrdao-1.2.3.tar.bz2
-/cdrdao-1.2.4.tar.bz2
-/cdrdao-1.2.5.tar.bz2
+/cdrdao-*.tar.bz2
diff --git a/21.patch b/21.patch
deleted file mode 100644
index 63e8fc9..0000000
--- a/21.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 251a40ab42305c412674c7c2d391374d91e91c95 Mon Sep 17 00:00:00 2001
-From: Ole Bertram <git@bertr.am>
-Date: Thu, 23 Mar 2023 17:08:48 +0100
-Subject: [PATCH] Fix uninitialized TOC data file name
-
-This caused spurious garbled TOC files and/or segfaults when not using
-the `--datafile` option.
----
- dao/main.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dao/main.cc b/dao/main.cc
-index 8bf4590..d09fc69 100644
---- a/dao/main.cc
-+++ b/dao/main.cc
-@@ -219,6 +219,7 @@ DaoCommandLine::DaoCommandLine() :
- fullBurn(false), withCddb(false), taoSource(false), keepImage(false), overburn(false),
- writeSpeedControl(false), keep(false), printQuery(false), no_utf8(false)
- {
-+ dataFilename = NULL;
- readingSpeed = -1;
- writingSpeed = -1;
- command = UNKNOWN;
diff --git a/cdrdao-1.2.5-Fix-version-command.patch b/cdrdao-1.2.5-Fix-version-command.patch
deleted file mode 100644
index a91f656..0000000
--- a/cdrdao-1.2.5-Fix-version-command.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ada9f82dbab5b07da49ca47e0b799b456d696b1a Mon Sep 17 00:00:00 2001
-From: Daniel Foster <daniel@amesite.me>
-Date: Fri, 13 Oct 2023 05:51:48 +0000
-Subject: [PATCH] Fix version command
-
----
- dao/main.cc | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/dao/main.cc b/dao/main.cc
-index 8bf4590..4fd447f 100644
---- a/dao/main.cc
-+++ b/dao/main.cc
-@@ -2489,8 +2489,10 @@ int main(int argc, char **argv)
- options.commitSettings(settings, settingsPath);
-
- // Just show version ? We're done.
-- if (options.command == SHOW_VERSION)
-- goto fail;
-+ if (options.command == SHOW_VERSION) {
-+ printVersion();
-+ goto fail;
-+ }
-
- errPrintParams.no_utf8 = options.no_utf8;
- filePrintParams.no_utf8 = options.no_utf8;
---
-2.43.0
-
diff --git a/cdrdao-1.2.5-gcc15.patch b/cdrdao-1.2.5-gcc15.patch
deleted file mode 100644
index 02d40af..0000000
--- a/cdrdao-1.2.5-gcc15.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From 9ca365163b7447519693d7fba5fb8d13da4b1a2c Mon Sep 17 00:00:00 2001
-From: Yaakov Selkowitz <yselkowi@redhat.com>
-Date: Wed, 19 Mar 2025 17:56:02 -0400
-Subject: [PATCH] Fix build with GCC 15
-
-GCC 15 defaults to C23, in which the interpretation of function
-declarations without parameters changed from undefined (as in K&R) to
-`void`. The pccts code already has support for this via __USE_PROTOS,
-which is enabled in both standard C and C++.
----
- pccts/antlr/gen.c | 4 ++--
- pccts/antlr/globals.c | 8 ++++----
- pccts/antlr/main.c | 4 ++--
- pccts/antlr/proto.h | 14 +++++++-------
- pccts/dlg/main.c | 2 +-
- 5 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/pccts/antlr/gen.c b/pccts/antlr/gen.c
-index 7b417c4..ea2482e 100644
---- a/pccts/antlr/gen.c
-+++ b/pccts/antlr/gen.c
-@@ -47,7 +47,7 @@ static set tokensRefdInBlock;
- /* T r a n s l a t i o n T a b l e s */
-
- /* C_Trans[node type] == pointer to function that knows how to translate that node. */
--#ifdef __cplusplus
-+#ifdef __USE_PROTOS
- void (*C_Trans[NumNodeTypes+1])(...) = {
- NULL,
- NULL, /* See next table.
-@@ -70,7 +70,7 @@ Junctions have many types */
- /* C_JTrans[Junction type] == pointer to function that knows how to translate that
- * kind of junction node.
- */
--#ifdef __cplusplus
-+#ifdef __USE_PROTOS
- void (*C_JTrans[NumJuncTypes+1])(...) = {
- NULL,
- (void (*)(...)) genSubBlk,
-diff --git a/pccts/antlr/globals.c b/pccts/antlr/globals.c
-index 89b3f04..3c73575 100644
---- a/pccts/antlr/globals.c
-+++ b/pccts/antlr/globals.c
-@@ -190,7 +190,7 @@ char *CurAmbigbtype;
- * representing the FIRST sets for that node (maintains spatial info).
- * We use 'struct _tree' not 'tree' due to a g++ 2.4.3 bug.
- */
--#ifdef __cplusplus
-+#ifdef __USE_PROTOS
- struct _tree *(*fpTraverse[NumNodeTypes+1])(... /* Node *, int, set * */) = {
- NULL,
- (struct _tree *(*)(...)) tJunc,
-@@ -212,7 +212,7 @@ Tree *(*fpTraverse[NumNodeTypes+1])() = {
- * that node. (r stands for reach). We use 'struct _set' not 'set'
- * due to a g++ 2.4.3 bug.
- */
--#ifdef __cplusplus
-+#ifdef __USE_PROTOS
- struct _set (*fpReach[NumNodeTypes+1])(... /* Node *, int, set * */) = {
- NULL,
- (struct _set (*)(...)) rJunc,
-@@ -231,7 +231,7 @@ set (*fpReach[NumNodeTypes+1])() = {
- #endif
-
- /* fpPrint[node type] == pointer to function that knows how to print that node. */
--#ifdef __cplusplus
-+#ifdef __USE_PROTOS
- void (*fpPrint[NumNodeTypes+1])(... /* Node * */) = {
- NULL,
- (void (*)(...)) pJunc,
-@@ -312,7 +312,7 @@ FILE *output=NULL; /* current parser output file */
- FILE *input=NULL; /* current grammar input file */
- char *FileStr[MaxNumFiles];/* Ptr to array of file names on command-line */
- int NumFiles=0; /* current grammar file number */
--#ifdef __cplusplus
-+#ifdef __USE_PROTOS
- void (**fpTrans)(...), /* array of ptrs to funcs that translate nodes */
- (**fpJTrans)(...); /* ... that translate junctions */
- #else
-diff --git a/pccts/antlr/main.c b/pccts/antlr/main.c
-index 3eb8b9d..76655cc 100644
---- a/pccts/antlr/main.c
-+++ b/pccts/antlr/main.c
-@@ -49,7 +49,7 @@ static int tnodes_used_in_guard_predicates_etc; /* MR10 */
- typedef struct _Opt {
- char *option;
- int arg;
--#ifdef __cplusplus
-+#ifdef __USE_PROTOS
- void (*process)(...);
- #else
- void (*process)();
-@@ -492,7 +492,7 @@ char *t;
- }
-
- Opt options[] = {
--#ifdef __cplusplus
-+#ifdef __USE_PROTOS
- { "-CC", 0, (void (*)(...)) pCC, "Generate C++ output (default=FALSE)"},
- { "-ck", 1, (void (*)(...)) pCk, "Set compressed lookahead depth; fast approximate lookahead"},
- { "-cr", 0, (void (*)(...)) pCr, "Generate cross reference (default=FALSE)"},
-diff --git a/pccts/antlr/proto.h b/pccts/antlr/proto.h
-index 930b2de..810afbb 100644
---- a/pccts/antlr/proto.h
-+++ b/pccts/antlr/proto.h
-@@ -34,37 +34,37 @@ extern int tp;
- extern Junction *SynDiag;
- extern char Version[];
- extern char VersionDef[];
--#ifdef __cplusplus
-+#ifdef __USE_PROTOS
- extern void (*fpPrint[])(...);
- #else
- extern void (*fpPrint[])();
- #endif
--#ifdef __cplusplus
-+#ifdef __USE_PROTOS
- extern struct _set (*fpReach[])(...);
- #else
- extern struct _set (*fpReach[])();
- #endif
--#ifdef __cplusplus
-+#ifdef __USE_PROTOS
- extern struct _tree *(*fpTraverse[])(...);
- #else
- extern struct _tree *(*fpTraverse[])();
- #endif
--#ifdef __cplusplus
-+#ifdef __USE_PROTOS
- extern void (**fpTrans)(...);
- #else
- extern void (**fpTrans)();
- #endif
--#ifdef __cplusplus
-+#ifdef __USE_PROTOS
- extern void (**fpJTrans)(...);
- #else
- extern void (**fpJTrans)();
- #endif
--#ifdef __cplusplus
-+#ifdef __USE_PROTOS
- extern void (*C_Trans[NumNodeTypes+1])(...);
- #else
- extern void (*C_Trans[])();
- #endif
--#ifdef __cplusplus
-+#ifdef __USE_PROTOS
- extern void (*C_JTrans[NumJuncTypes+1])(...);
- #else
- extern void (*C_JTrans[])();
-diff --git a/pccts/dlg/main.c b/pccts/dlg/main.c
-index 342d771..5605f1e 100644
---- a/pccts/dlg/main.c
-+++ b/pccts/dlg/main.c
-@@ -108,7 +108,7 @@ void p_warn_ambig() { warn_ambig = TRUE; }
- void p_cpp() { gen_cpp = TRUE; }
- #endif
-
--#ifdef __cplusplus
-+#ifdef __USE_PROTOS
- typedef void (*WildFunc)(...);
- #else
- typedef void (*WildFunc)();
---
-2.48.1
-
diff --git a/cdrdao.spec b/cdrdao.spec
index 444cfff..09c1425 100644
--- a/cdrdao.spec
+++ b/cdrdao.spec
@@ -6,23 +6,12 @@
Summary: Writes audio CD-Rs in disk-at-once (DAO) mode
Name: cdrdao
-Version: 1.2.5
+Version: 1.2.6
Release: %autorelease
# Automatically converted from old format: GPLv2+ - review is highly recommended.
License: GPL-2.0-or-later
URL: http://cdrdao.sourceforge.net/
Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-# https://github.com/cdrdao/cdrdao/pull/21
-# should fix whipper failure with this version of cdrdao:
-# https://github.com/whipper-team/whipper/issues/591
-# https://bugzilla.redhat.com/show_bug.cgi?id=2238243
-Patch: 21.patch
-# https://github.com/cdrdao/cdrdao/pull/25
-# fixes the "cdrdao version" command broken in 1.2.5 that brasero relies on
-Patch1: cdrdao-1.2.5-Fix-version-command.patch
-# https://github.com/cdrdao/cdrdao/pull/35
-# Fix build with GCC 15 (C23)
-Patch2: cdrdao-1.2.5-gcc15.patch
BuildRequires: gcc-c++
BuildRequires: gcc
BuildRequires: gtkmm3.0-devel
diff --git a/sources b/sources
index 32c55b4..4283506 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cdrdao-1.2.5.tar.bz2) = 9b07de7849d23824ad2db5d8fdf93717b73ff386105f380cd31e626e3c02c768799cb1c7d9f4955015aab241f8cf9fb23e03980c9fa82126f64ef222346bb4ce
+SHA512 (cdrdao-1.2.6.tar.bz2) = 6f2f1ae4ed74c7b725777de0fb0895eb78639527647ec3dcb3d148e2b7f7ef3354e9cdb71eab8de97a8f815435ce8945bae85ac5a70e6a63493c792f3cf71988
reply other threads:[~2026-06-02 19:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178042910873.1.11096570840479553812.rpms-cdrdao-e3508e79c219@fedoraproject.org \
--to=rosset.filipe@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox