Date: Tuesday, December 7, 2010 @ 08:51:12 Author: jgc Revision: 102363
upgpkg: cdrdao 1.2.3-5 Fix build with recent toolchains, fix gconf handling, clean dependencies Added: cdrdao/trunk/cdrdao-1.2.3-stat.patch Modified: cdrdao/trunk/PKGBUILD cdrdao/trunk/gcdmaster.install -------------------------+ PKGBUILD | 41 ++++++++++++++++++++--------------------- cdrdao-1.2.3-stat.patch | 13 +++++++++++++ gcdmaster.install | 5 +++++ 3 files changed, 38 insertions(+), 21 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-12-07 13:27:34 UTC (rev 102362) +++ PKGBUILD 2010-12-07 13:51:12 UTC (rev 102363) @@ -6,55 +6,54 @@ pkgbase=('cdrdao') pkgname=('cdrdao' 'gcdmaster') pkgver=1.2.3 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') license=('GPL') url="http://cdrdao.sourceforge.net/" -makedepends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao' \ - 'libsigc++2.0' 'gtkmm' 'libgnomeuimm') +makedepends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao' 'libgnomeuimm') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - cdrdao-1.2.3-autoconf-update.patch - cdrdao-1.2.3-k3b.patch) + cdrdao-1.2.3-autoconf-update.patch + cdrdao-1.2.3-k3b.patch + cdrdao-1.2.3-stat.patch) md5sums=('8d15ba6280bb7ba2f4d6be31d28b3c0c' '8e53dfc174f7c0882194caa05e68b85e' - '696f6ca01e1eeb9b6a5be88e535d9398') + '696f6ca01e1eeb9b6a5be88e535d9398' + '0fce05542ebad283f36fa1c4d62992a0') build() { - cd ${srcdir}/${pkgbase}-${pkgver} + cd "${srcdir}/${pkgbase}-${pkgver}" - patch -Np1 -i "${srcdir}/cdrdao-1.2.3-autoconf-update.patch" || return 1 - patch -Np1 -i "${srcdir}/cdrdao-1.2.3-k3b.patch" || return 1 + patch -Np1 -i "${srcdir}/cdrdao-1.2.3-autoconf-update.patch" + patch -Np1 -i "${srcdir}/cdrdao-1.2.3-k3b.patch" + patch -Np1 -i "${srcdir}/cdrdao-1.2.3-stat.patch" ./configure --prefix=/usr \ --mandir=/usr/share/man \ --sysconfdir=/etc \ --with-xdao --with-lame \ - --with-ogg-support --with-mp3-support || return 1 - make || return 1 + --with-ogg-support --with-mp3-support + make } package_cdrdao() { pkgdesc='Records audio/data CD-Rs in disk-at-once (DAO) mode' depends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao') - cd ${srcdir}/${pkgbase}-${pkgver} + cd "${srcdir}/${pkgbase}-${pkgver}" for dir in trackdb utils paranoia dao do - make -C ${dir} DESTDIR=${pkgdir} install || return 1 + make -C ${dir} DESTDIR="${pkgdir}" install done } package_gcdmaster() { pkgdesc='GUI frontend for creating audio CDs using cdrdao' - depends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao' \ - 'libsigc++2.0' 'gtkmm' 'libgnomeuimm' "cdrdao>=${pkgver}") + depends=('libgnomeuimm' "cdrdao=${pkgver}") install=gcdmaster.install - cd ${srcdir}/${pkgbase}-${pkgver} - make -C xdao GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}/${pkgbase}-${pkgver}" + make -C xdao GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - install -m755 -d ${pkgdir}/usr/share/gconf/schemas - gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/gcdmaster.schemas \ - --domain gcdmaster ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + mv "${pkgdir}/etc/gconf" "${pkgdir}/usr/share/" + rmdir "${pkgdir}/etc" } Added: cdrdao-1.2.3-stat.patch =================================================================== --- cdrdao-1.2.3-stat.patch (rev 0) +++ cdrdao-1.2.3-stat.patch 2010-12-07 13:51:12 UTC (rev 102363) @@ -0,0 +1,13 @@ +diff -up cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat cdrdao-1.2.3/dao/ScsiIf-linux.cc +--- cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat 2010-01-20 20:11:36.000000000 +0100 ++++ cdrdao-1.2.3/dao/ScsiIf-linux.cc 2010-01-20 20:14:07.000000000 +0100 +@@ -19,6 +19,9 @@ + + #include <config.h> + ++#include <sys/types.h> ++#include <sys/stat.h> ++ + #include <stdio.h> + #include <fcntl.h> + #include <unistd.h> Modified: gcdmaster.install =================================================================== --- gcdmaster.install 2010-12-07 13:27:34 UTC (rev 102362) +++ gcdmaster.install 2010-12-07 13:51:12 UTC (rev 102363) @@ -2,6 +2,7 @@ post_install() { usr/sbin/gconfpkg --install ${pkgname} + update-mime-database usr/share/mime } pre_upgrade() { @@ -15,3 +16,7 @@ pre_remove() { usr/sbin/gconfpkg --uninstall ${pkgname} } + +post_remove() { + update-mime-database usr/share/mime +}