[arch-commits] Commit in cdrdao/trunk (3 files)
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 === --- PKGBUILD2010-12-07 13:27:34 UTC (rev 102362) +++ PKGBUILD2010-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.0 +0100 cdrdao-1.2.3/dao/ScsiIf-linux.cc 2010-01-20 20:14:07.0 +0100 +@@ -19,6 +19,9 @@ + + #include + ++#include ++#include ++ + #include + #include + #include 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 +}
[arch-commits] Commit in cdrdao/trunk (3 files)
Date: Friday, January 20, 2017 @ 22:26:21 Author: jgc Revision: 287037 upgpkg: cdrdao 1.2.3-10 Drop gcdmaster, add patches from fedora to fix things instead of working them around using CXXFLAGS Added: cdrdao/trunk/cdrdao-1.2.3-format_security.patch cdrdao/trunk/cdrdao-1.2.3-narrowing.patch Modified: cdrdao/trunk/PKGBUILD + PKGBUILD | 81 ++- cdrdao-1.2.3-format_security.patch | 57 cdrdao-1.2.3-narrowing.patch | 24 ++ 3 files changed, 114 insertions(+), 48 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-01-20 21:14:47 UTC (rev 287036) +++ PKGBUILD2017-01-20 22:26:21 UTC (rev 287037) @@ -3,63 +3,48 @@ # Contributor: Andrea Scarpino # Contributor: dorphell -pkgbase=('cdrdao') -pkgname=('cdrdao' 'gcdmaster') +pkgname=cdrdao pkgver=1.2.3 -pkgrel=9 +pkgrel=10 arch=('i686' 'x86_64') license=('GPL') url="http://cdrdao.sourceforge.net/"; -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-stat.patch') -md5sums=('8d15ba6280bb7ba2f4d6be31d28b3c0c' - '8e53dfc174f7c0882194caa05e68b85e' - '696f6ca01e1eeb9b6a5be88e535d9398' - '0fce05542ebad283f36fa1c4d62992a0') +pkgdesc='Records audio/data CD-Rs in disk-at-once (DAO) mode' +depends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao') +source=(https://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-stat.patch +cdrdao-1.2.3-format_security.patch +cdrdao-1.2.3-narrowing.patch) +sha256sums=('8193cb8fa6998ac362c55807e89ad0b3c63edc6b01afaeb3d5042519527fb75e' +'2f4f54ed23b4f3b22fd64a2a3d4fa67ff186b3865213cba3fbe81ed9f6c42c74' +'6eddd7c79f548b3ad1d8d4ce23367bcae3cd6dee74f0aeb6439758d6599090e0' +'ca89b7c56a376d5a9574c5757f0d372236a895334f81867ff5e1703806565bbc' +'7909a3ad290d45fd2db5059025bf219be7b77af60050a409a3dc2a41a4859fe3' +'6222e307ebabe5149f88d64ef2cee7bf2a44588b9022babb7071bb87c224cae6') prepare() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - 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" - - find -name '*.h' -exec sed -i '/sigc++\/object.h/d' {} + + cd ${pkgname}-${pkgver} + + patch -Np1 -i ../cdrdao-1.2.3-autoconf-update.patch + patch -Np1 -i ../cdrdao-1.2.3-k3b.patch + patch -Np1 -i ../cdrdao-1.2.3-stat.patch + patch -Np1 -i ../cdrdao-1.2.3-format_security.patch + patch -Np1 -i ../cdrdao-1.2.3-narrowing.patch } build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - CXXFLAGS+=' -std=c++11 -Wno-narrowing' - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --sysconfdir=/etc \ - --with-xdao --with-lame \ - --with-ogg-support --with-mp3-support - make + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --without-xdao --with-lame \ + --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}" - for dir in trackdb utils paranoia dao - do -make -C ${dir} DESTDIR="${pkgdir}" install - done +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } - -package_gcdmaster() { - pkgdesc='GUI frontend for creating audio CDs using cdrdao' - depends=('libgnomeuimm' "cdrdao=${pkgver}") - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C xdao GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - mv "${pkgdir}/etc/gconf" "${pkgdir}/usr/share/" - rmdir "${pkgdir}/etc" -} Added: cdrdao-1.2.3-format_security.patch === --- cdrdao-1.2.3-format_security.patch (rev 0) +++ cdrdao-1.2.3-format_security.patch 2017-01-20 22:26:21 UTC (rev 287037) @@ -0,0 +1,57 @@ +diff -up wrk/pccts/antlr/fset2.c.wrk wrk/pccts/antlr/fset2.c +--- wrk/pccts/antlr/fset2.c.wrk2013-12-05 11:33:33.561962126 +0100 wrk/pccts/antlr/fset2.c2013-12-05 11:33:52.009105807 +0100 +@@ -2210,7 +2210,7 @@ void MR_backTraceReport() + if (p->ntype != nToken) continue; + tn=(TokNode *)p; + if (depth != 0) fprintf(stdout," "); +- fprintf(