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 =================================================================== --- PKGBUILD 2017-01-20 21:14:47 UTC (rev 287036) +++ PKGBUILD 2017-01-20 22:26:21 UTC (rev 287037) @@ -3,63 +3,48 @@ # Contributor: Andrea Scarpino <and...@archlinux.org> # Contributor: dorphell <dorph...@archlinux.org> -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.wrk 2013-12-05 11:33:33.561962126 +0100 ++++ wrk/pccts/antlr/fset2.c 2013-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(stdout,TerminalString(tn->token)); ++ fprintf(stdout,"%s",TerminalString(tn->token)); + depth++; + if (! MR_AmbAidMultiple) { + if (set_nil(tn->tset)) { +diff -up wrk/pccts/antlr/gen.c.wrk wrk/pccts/antlr/gen.c +--- wrk/pccts/antlr/gen.c.wrk 2013-12-05 11:26:36.384714088 +0100 ++++ wrk/pccts/antlr/gen.c 2013-12-05 11:29:41.894158536 +0100 +@@ -3866,7 +3866,7 @@ int file; + /* MR10 */ _gen(" * "); + /* MR10 */ for (i=0 ; i < Save_argc ; i++) { + /* MR10 */ _gen(" "); +-/* MR10 */ _gen(Save_argv[i]); ++/* MR10 */ _gen1("%s",Save_argv[i]); + /* MR10 */ }; + _gen("\n"); + _gen(" *\n"); +diff -up wrk/pccts/antlr/lex.c.wrk wrk/pccts/antlr/lex.c +--- wrk/pccts/antlr/lex.c.wrk 2013-12-05 11:15:51.912722340 +0100 ++++ wrk/pccts/antlr/lex.c 2013-12-05 11:19:04.039210441 +0100 +@@ -706,7 +706,7 @@ FILE *output; + /* MR26 */ if (! (isalpha(*t) || isdigit(*t) || *t == '_' || *t == '$')) break; + /* MR26 */ } + /* MR26 */ } +-/* MR26 */ fprintf(output,strBetween(pSymbol, t, pSeparator)); ++/* MR26 */ fprintf(output,"%s",strBetween(pSymbol, t, pSeparator)); + + *q = p; + return (*pSeparator == 0); +@@ -771,7 +771,7 @@ FILE *f; + &pValue, + &pSeparator, + &nest); +- fprintf(f,strBetween(pDataType, pSymbol, pSeparator)); ++ fprintf(f,"%s",strBetween(pDataType, pSymbol, pSeparator)); + } + + /* check to see if string e is a word in string s */ +@@ -852,9 +852,9 @@ int i; + &pSeparator, + &nest); + fprintf(f,"\t"); +- fprintf(f,strBetween(pDataType, pSymbol, pSeparator)); ++ fprintf(f,"%s",strBetween(pDataType, pSymbol, pSeparator)); + fprintf(f," "); +- fprintf(f,strBetween(pSymbol, pEqualSign, pSeparator)); ++ fprintf(f,"%s",strBetween(pSymbol, pEqualSign, pSeparator)); + fprintf(f,";\n"); + } + fprintf(f,"};\n"); Added: cdrdao-1.2.3-narrowing.patch =================================================================== --- cdrdao-1.2.3-narrowing.patch (rev 0) +++ cdrdao-1.2.3-narrowing.patch 2017-01-20 22:26:21 UTC (rev 287037) @@ -0,0 +1,24 @@ +diff -up wrk/dao/CdrDriver.cc.wrk wrk/dao/CdrDriver.cc +--- wrk/dao/CdrDriver.cc.wrk 2016-02-16 14:06:23.158392345 +0100 ++++ wrk/dao/CdrDriver.cc 2016-02-16 14:07:11.654597254 +0100 +@@ -495,7 +495,7 @@ unsigned char CdrDriver::syncPattern[12] + 0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0 + }; + +-char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 }; ++unsigned char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 }; + + + /* Maps a string to the corresponding driver option value +diff -up wrk/dao/CdrDriver.h.wrk wrk/dao/CdrDriver.h +--- wrk/dao/CdrDriver.h.wrk 2016-02-16 14:21:18.454174199 +0100 ++++ wrk/dao/CdrDriver.h 2016-02-16 14:21:42.381275268 +0100 +@@ -440,7 +440,7 @@ protected: + bool fullBurn_; + + static unsigned char syncPattern[12]; +- static char REMOTE_MSG_SYNC_[4]; ++ static unsigned char REMOTE_MSG_SYNC_[4]; + + static int speed2Mult(int); + static int mult2Speed(int);