summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-03-12 08:20:30 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-03-12 08:20:30 +0000
commit5acc2e16158a5e0b4159ba9d9b47027e9288d9c4 (patch)
tree6cfaf008dd3001f0f01ef464e5537c0670ca844f /app-cdr/cdrdao/files
parent[bump] dev-perl/ExtUtils-XSpp-0.160.0 (diff)
downloadhistorical-5acc2e16158a5e0b4159ba9d9b47027e9288d9c4.tar.gz
historical-5acc2e16158a5e0b4159ba9d9b47027e9288d9c4.tar.bz2
historical-5acc2e16158a5e0b4159ba9d9b47027e9288d9c4.zip
old
Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64
Diffstat (limited to 'app-cdr/cdrdao/files')
-rw-r--r--app-cdr/cdrdao/files/cdrdao-1.2.3-autoconf-update.patch52
-rw-r--r--app-cdr/cdrdao/files/cdrdao-1.2.3-gcc44.patch23
-rw-r--r--app-cdr/cdrdao/files/cdrdao-1.2.3-pkg-config.patch15
-rw-r--r--app-cdr/cdrdao/files/cdrdao-1.2.3-toc2cue.patch12
-rw-r--r--app-cdr/cdrdao/files/cdrdao-1.2.3-tocparser.patch17
5 files changed, 0 insertions, 119 deletions
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-autoconf-update.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-autoconf-update.patch
deleted file mode 100644
index 4eb1ade7e71e..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-autoconf-update.patch
+++ /dev/null
@@ -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
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-gcc44.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-gcc44.patch
deleted file mode 100644
index b7483147d9d5..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-gcc44.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- cdrdao-1.2.3rc2/trackdb/TempFileManager.cc~ 2008-02-17 14:05:05.000000000 +0100
-+++ cdrdao-1.2.3rc2/trackdb/TempFileManager.cc 2009-04-07 09:05:41.000000000 +0200
-@@ -20,6 +20,7 @@
- #include "TempFileManager.h"
- #include "log.h"
-
-+#include <stdio.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
---- cdrdao-1.2.3rc2/dao/CdrDriver.cc~ 2009-02-21 11:01:32.000000000 +0100
-+++ cdrdao-1.2.3rc2/dao/CdrDriver.cc 2009-04-07 09:07:14.000000000 +0200
-@@ -2114,8 +2114,8 @@
- ret = 1;
- }
- else {
-- if ((caps & CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW) != 0)
-- ret = 1;
-+ if ((caps & (CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW)) != 0)
-+ ret = 1;
- }
- break;
-
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-pkg-config.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-pkg-config.patch
deleted file mode 100644
index 51bb6adc9545..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-pkg-config.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -NrU5 cdrdao-1.2.3rc2.orig/configure.ac cdrdao-1.2.3rc2/configure.ac
---- cdrdao-1.2.3rc2.orig/configure.ac 2009-05-19 16:03:03.616292795 +0200
-+++ cdrdao-1.2.3rc2/configure.ac 2009-05-19 16:04:55.826318499 +0200
-@@ -32,10 +32,11 @@
- AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_RANLIB
- AC_CHECK_PROG(AR,ar,ar)
- AC_PROG_MAKE_SET
-+PKG_PROG_PKG_CONFIG
-
- dnl Checks for header files.
- AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
- AC_CHECK_HEADERS(fcntl.h getopt.h malloc.h unistd.h sys/mman.h sched.h)
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-toc2cue.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-toc2cue.patch
deleted file mode 100644
index 076b55f90f43..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-toc2cue.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur cdrdao-1.2.2/trackdb/TocParser.g cdrdao-1.2.2-cclpatch/trackdb/TocParser.g
---- cdrdao-1.2.2/trackdb/TocParser.g 2008-10-06 08:50:48.000000000 -0700
-+++ cdrdao-1.2.2-cclpatch/trackdb/TocParser.g 2008-10-06 08:50:48.000000000 -0700
-@@ -774,7 +774,7 @@
- << if (item != NULL) {
- int type = item->packType();
-
-- if (isTrack && ((type >= 0x86 && type <= 0x89) || type == 0x8f)) {
-+ if (isTrack && ((type > 0x86 && type <= 0x89) || type == 0x8f)) {
- log_message(-2, "%s:%d: Invalid CD-TEXT item for a track.",
- filename_, lineNr);
- error_ = 1;
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-tocparser.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-tocparser.patch
deleted file mode 100644
index d5fb9b7760be..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-tocparser.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- cdrdao-1.2.3.orig/trackdb/TocParser.g 2009/02/21 21:40:56 1.14
-+++ cdrdao-1.2.3/trackdb/TocParser.g 2009/05/04 15:49:52 1.15
-@@ -511,8 +511,12 @@
- >>
- )
- << if ($st != NULL && $st->length() == 0) {
-- // try to determine length
-- $st->determineLength();
-+ // try to determine length
-+ if ($st->determineLength() != 0) {
-+ log_message(-2, "%s:%d: Cannot determine length of track data specification.",
-+ filename_, $lineNr);
-+ error_ = 1;
-+ }
- }
- >>
- ;