[arch-commits] Commit in cdrdao/repos (10 files)
Jelle van der Waa
jelle at archlinux.org
Tue Nov 13 20:34:07 UTC 2018
Date: Tuesday, November 13, 2018 @ 20:34:06
Author: jelle
Revision: 339642
archrelease: copy trunk to extra-x86_64
Added:
cdrdao/repos/extra-x86_64/PKGBUILD
(from rev 339641, cdrdao/trunk/PKGBUILD)
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-autoconf-update.patch
(from rev 339641, cdrdao/trunk/cdrdao-1.2.3-autoconf-update.patch)
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-k3b.patch
(from rev 339641, cdrdao/trunk/cdrdao-1.2.3-k3b.patch)
Deleted:
cdrdao/repos/community-x86_64/
cdrdao/repos/extra-x86_64/PKGBUILD
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-autoconf-update.patch
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-format_security.patch
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-k3b.patch
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-narrowing.patch
cdrdao/repos/extra-x86_64/cdrdao-1.2.3-stat.patch
-------------------------------------------------+
/PKGBUILD | 40 +++++++++++++++
/cdrdao-1.2.3-autoconf-update.patch | 52 ++++++++++++++++++++
/cdrdao-1.2.3-k3b.patch | 11 ++++
extra-x86_64/PKGBUILD | 50 -------------------
extra-x86_64/cdrdao-1.2.3-autoconf-update.patch | 52 --------------------
extra-x86_64/cdrdao-1.2.3-format_security.patch | 57 ----------------------
extra-x86_64/cdrdao-1.2.3-k3b.patch | 11 ----
extra-x86_64/cdrdao-1.2.3-narrowing.patch | 24 ---------
extra-x86_64/cdrdao-1.2.3-stat.patch | 13 -----
9 files changed, 103 insertions(+), 207 deletions(-)
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2018-11-13 20:32:47 UTC (rev 339641)
+++ extra-x86_64/PKGBUILD 2018-11-13 20:34:06 UTC (rev 339642)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=cdrdao
-pkgver=1.2.3
-pkgrel=10
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://cdrdao.sourceforge.net/"
-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 ${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 ${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --sysconfdir=/etc \
- --without-xdao --with-lame \
- --with-ogg-support --with-mp3-support
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-}
Copied: cdrdao/repos/extra-x86_64/PKGBUILD (from rev 339641, cdrdao/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2018-11-13 20:34:06 UTC (rev 339642)
@@ -0,0 +1,40 @@
+# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=cdrdao
+pkgver=1.2.4
+pkgrel=1
+arch=('x86_64')
+license=('GPL')
+url="http://cdrdao.sourceforge.net/"
+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)
+sha256sums=('358d9cb83370ceaecdc60564cbf14c2ea2636eac60a966e2461c011ba09853b4'
+ '2f4f54ed23b4f3b22fd64a2a3d4fa67ff186b3865213cba3fbe81ed9f6c42c74'
+ '6eddd7c79f548b3ad1d8d4ce23367bcae3cd6dee74f0aeb6439758d6599090e0')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ patch -Np1 -i ../cdrdao-1.2.3-autoconf-update.patch
+ patch -Np1 -i ../cdrdao-1.2.3-k3b.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc \
+ --without-xdao --with-lame \
+ --with-ogg-support --with-mp3-support
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/cdrdao-1.2.3-autoconf-update.patch
===================================================================
--- extra-x86_64/cdrdao-1.2.3-autoconf-update.patch 2018-11-13 20:32:47 UTC (rev 339641)
+++ extra-x86_64/cdrdao-1.2.3-autoconf-update.patch 2018-11-13 20:34:06 UTC (rev 339642)
@@ -1,52 +0,0 @@
---- cdrdao-1.2.3rc2/acinclude.m4.orig 2009-02-21 11:30:02.000000000 +0100
-+++ cdrdao-1.2.3rc2/acinclude.m4 2009-05-22 22:38:15.448770972 +0200
-@@ -1,5 +1,49 @@
-+dnl AM_GCONF_SOURCE_2
-+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-+dnl (i.e. pass to gconftool-2
-+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-+dnl you should install foo.schemas files
-+dnl
-+
-+AC_DEFUN([AM_GCONF_SOURCE_2],
-+[
-+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-+ else
-+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-+ fi
-+
-+ AC_ARG_WITH([gconf-source],
-+ AC_HELP_STRING([--with-gconf-source=sourceaddress],
-+ [Config database for installing schema files.]),
-+ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-+
-+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-+
-+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+ fi
-+
-+ AC_ARG_WITH([gconf-schema-file-dir],
-+ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-+ [Directory for installing schema files.]),
-+ [GCONF_SCHEMA_FILE_DIR="$withval"],)
-+
-+ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-+
-+ AC_ARG_ENABLE(schemas-install,
-+ AC_HELP_STRING([--disable-schemas-install],
-+ [Disable the schemas installation]),
-+ [case ${enableval} in
-+ yes|no) ;;
-+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-+ esac])
-+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-+])
- # Configure paths for GTK--
- # Erik Andersen 30 May 1998
- # Modified by Tero Pulkkinen (added the compiler checks... I hope they work..)
-
- dnl Check and configure include and link paths for lame library
Copied: cdrdao/repos/extra-x86_64/cdrdao-1.2.3-autoconf-update.patch (from rev 339641, cdrdao/trunk/cdrdao-1.2.3-autoconf-update.patch)
===================================================================
--- extra-x86_64/cdrdao-1.2.3-autoconf-update.patch (rev 0)
+++ extra-x86_64/cdrdao-1.2.3-autoconf-update.patch 2018-11-13 20:34:06 UTC (rev 339642)
@@ -0,0 +1,52 @@
+--- cdrdao-1.2.3rc2/acinclude.m4.orig 2009-02-21 11:30:02.000000000 +0100
++++ cdrdao-1.2.3rc2/acinclude.m4 2009-05-22 22:38:15.448770972 +0200
+@@ -1,5 +1,49 @@
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
++dnl (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl you should install foo.schemas files
++dnl
++
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++ else
++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++ fi
++
++ AC_ARG_WITH([gconf-source],
++ AC_HELP_STRING([--with-gconf-source=sourceaddress],
++ [Config database for installing schema files.]),
++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
++
++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
++
++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++ fi
++
++ AC_ARG_WITH([gconf-schema-file-dir],
++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
++ [Directory for installing schema files.]),
++ [GCONF_SCHEMA_FILE_DIR="$withval"],)
++
++ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++
++ AC_ARG_ENABLE(schemas-install,
++ AC_HELP_STRING([--disable-schemas-install],
++ [Disable the schemas installation]),
++ [case ${enableval} in
++ yes|no) ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
++ esac])
++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
++])
+ # Configure paths for GTK--
+ # Erik Andersen 30 May 1998
+ # Modified by Tero Pulkkinen (added the compiler checks... I hope they work..)
+
+ dnl Check and configure include and link paths for lame library
Deleted: extra-x86_64/cdrdao-1.2.3-format_security.patch
===================================================================
--- extra-x86_64/cdrdao-1.2.3-format_security.patch 2018-11-13 20:32:47 UTC (rev 339641)
+++ extra-x86_64/cdrdao-1.2.3-format_security.patch 2018-11-13 20:34:06 UTC (rev 339642)
@@ -1,57 +0,0 @@
-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");
Deleted: extra-x86_64/cdrdao-1.2.3-k3b.patch
===================================================================
--- extra-x86_64/cdrdao-1.2.3-k3b.patch 2018-11-13 20:32:47 UTC (rev 339641)
+++ extra-x86_64/cdrdao-1.2.3-k3b.patch 2018-11-13 20:34:06 UTC (rev 339642)
@@ -1,11 +0,0 @@
---- cdrdao/dao/main.cc~ 2009-04-16 15:34:27.000000000 +0200
-+++ cdrdao/dao/main.cc 2009-04-16 15:34:38.000000000 +0200
-@@ -207,7 +207,7 @@
-
- static void printVersion()
- {
-- log_message(2, "Cdrdao version %s - (C) Andreas Mueller <andreas at daneb.de>",
-+ log_message(0, "Cdrdao version %s - (C) Andreas Mueller <andreas at daneb.de>",
- VERSION);
-
- std::list<std::string> list;
Copied: cdrdao/repos/extra-x86_64/cdrdao-1.2.3-k3b.patch (from rev 339641, cdrdao/trunk/cdrdao-1.2.3-k3b.patch)
===================================================================
--- extra-x86_64/cdrdao-1.2.3-k3b.patch (rev 0)
+++ extra-x86_64/cdrdao-1.2.3-k3b.patch 2018-11-13 20:34:06 UTC (rev 339642)
@@ -0,0 +1,11 @@
+--- cdrdao/dao/main.cc~ 2009-04-16 15:34:27.000000000 +0200
++++ cdrdao/dao/main.cc 2009-04-16 15:34:38.000000000 +0200
+@@ -207,7 +207,7 @@
+
+ static void printVersion()
+ {
+- log_message(2, "Cdrdao version %s - (C) Andreas Mueller <andreas at daneb.de>",
++ log_message(0, "Cdrdao version %s - (C) Andreas Mueller <andreas at daneb.de>",
+ VERSION);
+
+ std::list<std::string> list;
Deleted: extra-x86_64/cdrdao-1.2.3-narrowing.patch
===================================================================
--- extra-x86_64/cdrdao-1.2.3-narrowing.patch 2018-11-13 20:32:47 UTC (rev 339641)
+++ extra-x86_64/cdrdao-1.2.3-narrowing.patch 2018-11-13 20:34:06 UTC (rev 339642)
@@ -1,24 +0,0 @@
-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);
Deleted: extra-x86_64/cdrdao-1.2.3-stat.patch
===================================================================
--- extra-x86_64/cdrdao-1.2.3-stat.patch 2018-11-13 20:32:47 UTC (rev 339641)
+++ extra-x86_64/cdrdao-1.2.3-stat.patch 2018-11-13 20:34:06 UTC (rev 339642)
@@ -1,13 +0,0 @@
-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>
More information about the arch-commits
mailing list