From a9eda1ddd7a66984a0398b8497836725008f68c0 Mon Sep 17 00:00:00 2001
From: kth5 <alex.bldck@gmail.com>
Date: Sat, 26 Oct 2024 23:07:27 +0200
Subject: [PATCH] * update cdrdao to 1.2.5-7

---
 cdrdao/.SRCINFO | 53 +++++++++++++++++++++++++++++++---------
 cdrdao/PKGBUILD | 64 +++++++++++++++++++++++++++++++------------------
 2 files changed, 83 insertions(+), 34 deletions(-)

diff --git a/cdrdao/.SRCINFO b/cdrdao/.SRCINFO
index 9c3bf836b4..009431c752 100644
--- a/cdrdao/.SRCINFO
+++ b/cdrdao/.SRCINFO
@@ -1,28 +1,59 @@
 pkgbase = cdrdao
 	pkgdesc = Records audio/data CD-Rs in disk-at-once (DAO) mode
 	pkgver = 1.2.5
-	pkgrel = 3.1
+	pkgrel = 7
 	url = http://cdrdao.sourceforge.net/
 	arch = x86_64
 	arch = powerpc64le
 	arch = powerpc64
 	arch = powerpc
 	arch = riscv64
-	license = GPL
-	makedepends = gtkmm3
+	license = GPL-2.0-or-later
+	depends = atkmm
+	depends = cairomm
+	depends = dconf
 	depends = gcc-libs
+	depends = glib2
+	depends = glibc
+	depends = glibmm
+	depends = gtk3
+	depends = gtkmm3
 	depends = lame
-	depends = libmad
-	depends = libvorbis
 	depends = libao
-	optdepends = gtkmm3: for gcdmaster
+	depends = libmad
+	depends = libsigc++
+	depends = libvorbis
+	depends = pangomm
+	options = !emptydirs
 	source = https://downloads.sourceforge.net/cdrdao/cdrdao-1.2.5.tar.bz2
-	source = https://github.com/cdrdao/cdrdao//commit/251a40ab.patch
-	source = cdrdao-1.2.3-autoconf-update.patch
-	source = cdrdao-1.2.3-k3b.patch
+	source = cdrdao-uninitialized-filename.patch
+	source = cdrdao-version-command.patch
 	sha256sums = d19b67c853c5dba2406afaab6cd788e77f35eebe634cac4679528477c7be01b6
 	sha256sums = 970e5d18513f298b915f9d84f206d7489400e93f42b9c04ec55acf2fe9d43e5a
-	sha256sums = 2f4f54ed23b4f3b22fd64a2a3d4fa67ff186b3865213cba3fbe81ed9f6c42c74
-	sha256sums = 6eddd7c79f548b3ad1d8d4ce23367bcae3cd6dee74f0aeb6439758d6599090e0
+	sha256sums = cbb8ec897e390d5a4c4c113e35a88893f5be3ebc2fec3b09eb2ae84bd4275021
 
 pkgname = cdrdao
+	depends = gcc-libs
+	depends = glibc
+	depends = lame
+	depends = libao
+	depends = libmad
+	depends = libvorbis
+
+pkgname = gcdmaster
+	pkgdesc = GUI frontend for creating audio CDs and burning them using cdrdao
+	depends = atkmm
+	depends = cairomm
+	depends = cdrdao
+	depends = dconf
+	depends = gcc-libs
+	depends = glib2
+	depends = glibc
+	depends = glibmm
+	depends = gtk3
+	depends = gtkmm3
+	depends = libao
+	depends = libmad
+	depends = libsigc++
+	depends = libvorbis
+	depends = pangomm
diff --git a/cdrdao/PKGBUILD b/cdrdao/PKGBUILD
index b25fdfb6a8..bca0170481 100644
--- a/cdrdao/PKGBUILD
+++ b/cdrdao/PKGBUILD
@@ -4,45 +4,63 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
-pkgname=cdrdao
+pkgbase=cdrdao
+pkgname=('cdrdao' 'gcdmaster')
 pkgver=1.2.5
-pkgrel=3.1
+pkgrel=7
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
-license=('GPL')
+license=('GPL-2.0-or-later')
 url="http://cdrdao.sourceforge.net/"
 pkgdesc='Records audio/data CD-Rs in disk-at-once (DAO) mode'
-depends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao')
-makedepends=('gtkmm3')
-optdepends=('gtkmm3: for gcdmaster')
-source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        https://github.com/cdrdao/cdrdao//commit/251a40ab.patch
-        cdrdao-1.2.3-autoconf-update.patch
-        cdrdao-1.2.3-k3b.patch)
+depends=('atkmm' 'cairomm' 'dconf' 'gcc-libs' 'glib2' 'glibc' 'glibmm' 'gtk3' 'gtkmm3' 'lame'
+         'libao' 'libmad' 'libsigc++' 'libvorbis' 'pangomm')
+options=('!emptydirs')
+source=(https://downloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
+        cdrdao-uninitialized-filename.patch
+        cdrdao-version-command.patch)
 sha256sums=('d19b67c853c5dba2406afaab6cd788e77f35eebe634cac4679528477c7be01b6'
             '970e5d18513f298b915f9d84f206d7489400e93f42b9c04ec55acf2fe9d43e5a'
-            '2f4f54ed23b4f3b22fd64a2a3d4fa67ff186b3865213cba3fbe81ed9f6c42c74'
-            '6eddd7c79f548b3ad1d8d4ce23367bcae3cd6dee74f0aeb6439758d6599090e0')
+            'cbb8ec897e390d5a4c4c113e35a88893f5be3ebc2fec3b09eb2ae84bd4275021')
 
 prepare() {
-  cd ${pkgname}-${pkgver}
-  
-  patch -Np1 -i ../cdrdao-1.2.3-autoconf-update.patch
-  patch -Np1 -i ../cdrdao-1.2.3-k3b.patch
-# Fix uninitialized variable
-  patch -p1 -i ../251a40ab.patch
+  cd ${pkgbase}-${pkgver}
+
+  # Fix uninitialized TOC data file name
+  # https://github.com/cdrdao/cdrdao/pull/21
+  patch -Np1 -i ../cdrdao-uninitialized-filename.patch
+
+  # Fix version command
+  # https://github.com/cdrdao/cdrdao/pull/25
+  patch -Np1 -i ../cdrdao-version-command.patch
+
+  # Remove gconf dependency
+  sed -i '/AM_GCONF_SOURCE_2/d' configure.ac
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgbase}-${pkgver}
   ./configure --prefix=/usr \
 	--mandir=/usr/share/man \
 	--sysconfdir=/etc \
-	--without-xdao --with-lame \
-	--with-ogg-support --with-mp3-support
+	--with-lame \
+	--with-ogg-support \
+	--with-mp3-support
   make
 }
 
-package() {
-  cd ${pkgname}-${pkgver}
+package_cdrdao() {
+  depends=('gcc-libs' 'glibc' 'lame' 'libao' 'libmad' 'libvorbis')
+
+  cd ${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install
+  make -C gcdmaster DESTDIR="${pkgdir}" uninstall
+}
+
+package_gcdmaster() {
+  pkgdesc='GUI frontend for creating audio CDs and burning them using cdrdao'
+  depends=('atkmm' 'cairomm' 'cdrdao' 'dconf' 'gcc-libs' 'glib2' 'glibc' 'glibmm' 'gtk3' 'gtkmm3'
+           'libao' 'libmad' 'libsigc++' 'libvorbis' 'pangomm')
+
+  cd ${pkgbase}-${pkgver}
+  make -C gcdmaster DESTDIR="${pkgdir}" install
 }