From: Jan Rękorajski Date: Fri, 21 Apr 2006 23:40:29 +0000 (+0000) Subject: - orphaned, outdated X-Git-Tag: auto/th/cdrdao-1_2_2-1~4 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcdrdao.git;a=commitdiff_plain;h=8edd9d1338ca00a2aa52c3348a34ef81211e51f0 - orphaned, outdated Changed files: cdrdao-acfix.patch -> 1.2 cdrdao-desktop.patch -> 1.2 cdrdao-destdir.patch -> 1.5 cdrdao-gcc3.patch -> 1.2 --- diff --git a/cdrdao-acfix.patch b/cdrdao-acfix.patch deleted file mode 100644 index 73b11aa..0000000 --- a/cdrdao-acfix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- cdrdao-1.1.5/paranoia/configure.in.orig Fri Nov 2 13:34:48 2001 -+++ cdrdao-1.1.5/paranoia/configure.in Fri Nov 2 13:36:37 2001 -@@ -2,9 +2,7 @@ - - AC_CANONICAL_HOST - --if test -z "$CC"; then -- AC_PROG_CC --fi -+AC_PROG_CC - AC_PROG_RANLIB - AC_CHECK_PROG(AR,ar,ar) - diff --git a/cdrdao-desktop.patch b/cdrdao-desktop.patch deleted file mode 100644 index de5a1cd..0000000 --- a/cdrdao-desktop.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- cdrdao-1.1.7/xdao/gcdmaster.desktop.orig 2002-10-06 20:53:56.000000000 +0200 -+++ cdrdao-1.1.7/xdao/gcdmaster.desktop 2004-01-04 15:41:09.439400240 +0100 -@@ -3,5 +3,6 @@ - Comment=Utility to Burn CDs - Exec=gcdmaster - Icon=gcdmaster/gcdmaster.png --Terminal=0 -+Terminal=false - Type=Application -+Categories=DiscBurning diff --git a/cdrdao-destdir.patch b/cdrdao-destdir.patch deleted file mode 100644 index 52855b9..0000000 --- a/cdrdao-destdir.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- cdrdao-1.1.7/xdao/Makefile.in.orig Sun Oct 6 20:53:56 2002 -+++ cdrdao-1.1.7/xdao/Makefile.in Wed Dec 25 20:59:56 2002 -@@ -71,32 +71,32 @@ - all: $(PRG) - - install: all installdirs -- $(INSTALL_PROGRAM) $(PRG) $(bindir) -- $(INSTALL_DATA) xcdrdao.man $(man1dir)/xcdrdao.1 -- $(INSTALL_DATA) gcdmaster.png $(PIXMAPS_DIR)/gcdmaster.png -- $(INSTALL_DATA) pixmap_audiocd.png $(PIXMAPS_DIR)/pixmap_audiocd.png -- $(INSTALL_DATA) pixmap_copycd.png $(PIXMAPS_DIR)/pixmap_copycd.png -- $(INSTALL_DATA) pixmap_datacd.png $(PIXMAPS_DIR)/pixmap_datacd.png -- $(INSTALL_DATA) pixmap_dumpcd.png $(PIXMAPS_DIR)/pixmap_dumpcd.png -- $(INSTALL_DATA) pixmap_help.png $(PIXMAPS_DIR)/pixmap_help.png -- $(INSTALL_DATA) pixmap_mixedcd.png $(PIXMAPS_DIR)/pixmap_mixedcd.png -- $(INSTALL_DATA) pixmap_open.png $(PIXMAPS_DIR)/pixmap_open.png -- $(INSTALL_DATA) pixmap_play-start.xpm $(PIXMAPS_DIR)/pixmap_play-start.xpm -- $(INSTALL_DATA) pixmap_play-pause.xpm $(PIXMAPS_DIR)/pixmap_play-pause.xpm -- $(INSTALL_DATA) pixmap_play-stop.xpm $(PIXMAPS_DIR)/pixmap_play-stop.xpm -- $(INSTALL_DATA) pixmap_cursor-tool.xpm $(PIXMAPS_DIR)/pixmap_cursor-tool.xpm -- $(INSTALL_DATA) pixmap_zoom-tool.xpm $(PIXMAPS_DIR)/pixmap_zoom-tool.xpm -- $(INSTALL_DATA) pixmap_zoom-in.xpm $(PIXMAPS_DIR)/pixmap_zoom-in.xpm -- $(INSTALL_DATA) pixmap_zoom-out.xpm $(PIXMAPS_DIR)/pixmap_zoom-out.xpm -- $(INSTALL_DATA) pixmap_zoom-selection.xpm $(PIXMAPS_DIR)/pixmap_zoom-selection.xpm -- $(INSTALL_DATA) pixmap_zoom-fit.xpm $(PIXMAPS_DIR)/pixmap_zoom-fit.xpm -- $(INSTALL_DATA) gcdmaster.desktop $(datadir)/gnome/apps/Applications/gcdmaster.desktop -+ $(INSTALL_PROGRAM) $(PRG) $(DESTDIR)$(bindir) -+ $(INSTALL_DATA) xcdrdao.man $(DESTDIR)$(man1dir)/gcdmaster.1x -+ $(INSTALL_DATA) gcdmaster.png $(DESTDIR)$(PIXMAPS_DIR)/gcdmaster.png -+ $(INSTALL_DATA) pixmap_audiocd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_audiocd.png -+ $(INSTALL_DATA) pixmap_copycd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_copycd.png -+ $(INSTALL_DATA) pixmap_datacd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_datacd.png -+ $(INSTALL_DATA) pixmap_dumpcd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_dumpcd.png -+ $(INSTALL_DATA) pixmap_help.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_help.png -+ $(INSTALL_DATA) pixmap_mixedcd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_mixedcd.png -+ $(INSTALL_DATA) pixmap_open.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_open.png -+ $(INSTALL_DATA) pixmap_play-start.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_play-start.xpm -+ $(INSTALL_DATA) pixmap_play-pause.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_play-pause.xpm -+ $(INSTALL_DATA) pixmap_play-stop.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_play-stop.xpm -+ $(INSTALL_DATA) pixmap_cursor-tool.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_cursor-tool.xpm -+ $(INSTALL_DATA) pixmap_zoom-tool.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_zoom-tool.xpm -+ $(INSTALL_DATA) pixmap_zoom-in.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_zoom-in.xpm -+ $(INSTALL_DATA) pixmap_zoom-out.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_zoom-out.xpm -+ $(INSTALL_DATA) pixmap_zoom-selection.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_zoom-selection.xpm -+ $(INSTALL_DATA) pixmap_zoom-fit.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_zoom-fit.xpm -+ $(INSTALL_DATA) gcdmaster.desktop $(DESTDIR)$(datadir)/applications/gcdmaster.desktop - - installdirs: -- $(srcdir)/../mkinstalldirs $(bindir) -- $(srcdir)/../mkinstalldirs $(man1dir) -- $(srcdir)/../mkinstalldirs $(PIXMAPS_DIR) -- $(srcdir)/../mkinstalldirs $(datadir)/gnome/apps/Applications -+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) -+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir) -+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(PIXMAPS_DIR) -+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(datadir)/applications - - uninstall: - rm -f $(bindir)/$(PRG) $(man1dir)/xcdrdao.1 ---- cdrdao-1.1.7/dao/Makefile.in.orig Thu Dec 26 09:27:54 2002 -+++ cdrdao-1.1.7/dao/Makefile.in Thu Dec 26 09:27:03 2002 -@@ -67,14 +67,14 @@ - all: $(PRG) - - install: all installdirs -- $(INSTALL_PROGRAM) $(PRG) $(bindir) -- $(INSTALL_DATA) cdrdao.man $(man1dir)/cdrdao.1 -- $(INSTALL_DATA) cdrdao.drivers $(DRIVER_TABLE_FILE) -+ $(INSTALL_PROGRAM) $(PRG) $(DESTDIR)$(bindir) -+ $(INSTALL_DATA) cdrdao.man $(DESTDIR)$(man1dir)/cdrdao.1 -+ $(INSTALL_DATA) cdrdao.drivers $(DESTDIR)$(DRIVER_TABLE_FILE) - - installdirs: -- $(srcdir)/../mkinstalldirs $(bindir) -- $(srcdir)/../mkinstalldirs $(man1dir) -- $(srcdir)/../mkinstalldirs $(CDRDAO_DATA_DIR) -+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) -+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir) -+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(CDRDAO_DATA_DIR) - - clean: - rm -f *.o $(PRG) ---- cdrdao-1.1.7/utils/Makefile.in.orig Sun Oct 6 20:53:56 2002 -+++ cdrdao-1.1.7/utils/Makefile.in Thu Dec 26 09:31:35 2002 -@@ -53,10 +53,10 @@ - all: @utils_targets@ - - install: all installdirs -- $(INSTALL_PROGRAM) @utils_targets@ $(bindir) -+ $(INSTALL_PROGRAM) @utils_targets@ $(DESTDIR)$(bindir) - - installdirs: -- $(srcdir)/../mkinstalldirs $(bindir) -+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) - # $(srcdir)/../mkinstalldirs $(man1dir) - # $(srcdir)/../mkinstalldirs $(CDRDAO_DATA_DIR) - diff --git a/cdrdao-gcc3.patch b/cdrdao-gcc3.patch deleted file mode 100644 index 9efd7e1..0000000 --- a/cdrdao-gcc3.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- cdrdao-1.1.5/trackdb/CdTextItem.cc.orig Sun Apr 29 15:42:08 2001 -+++ cdrdao-1.1.5/trackdb/CdTextItem.cc Sat Oct 12 21:13:26 2002 -@@ -18,6 +18,7 @@ - */ - - #include -+#include - #include - #include - #include -@@ -129,7 +130,7 @@ - else if (isprint(data_[i])) - out << data_[i]; - else -- out.form("\\%03o", (unsigned int)data_[i]); -+ out << '\\' << setw(3) << setfill('0') << oct << (unsigned int)data_[i] << setfill(' ') << dec; - } - - out << "\""; -@@ -140,7 +141,7 @@ - out << " {"; - for (i = 0; i < dataLen_; i++) { - if (i == 0) { -- out.form("%2d", (unsigned int)data_[i]); -+ out << setw(2) << dec << (unsigned int)data_[i]; - } - else { - if (i % 12 == 0) -@@ -148,7 +149,7 @@ - else - out << ", "; - -- out.form("%2d", (unsigned int)data_[i]); -+ out << setw(2) << dec << (unsigned int)data_[i]; - } - } - ---- cdrdao-1.1.5/utils/toc2cue.cc.orig Sun Apr 29 15:42:09 2001 -+++ cdrdao-1.1.5/utils/toc2cue.cc Sat Oct 12 21:21:18 2002 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #include "util.h" - #include "Toc.h" -@@ -291,7 +292,7 @@ - trun != NULL; - trun = titr.next(start, end), trackNr++) { - out << " TRACK "; -- out.form("%02d ", trackNr); -+ out << setw(2) << setfill('0') << dec << trackNr << setfill(' ') << " "; - - switch (trun->type()) { - case TrackData::AUDIO: