Unbreak working with ISO files, from FreeBSD.

"looks retty ok" to Vlad Glagolev (maintainer)
ok jasper@
This commit is contained in:
ajacoutot 2009-11-07 15:54:33 +00:00
parent 8cf328daaa
commit 58de98b406
4 changed files with 35 additions and 10 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.8 2009/07/16 12:46:51 giovanni Exp $
# $OpenBSD: Makefile,v 1.9 2009/11/07 15:54:33 ajacoutot Exp $
COMMENT= GUI to dvd+rw-tools and cdrecord
DISTNAME= tkdvd-4.0.9
PKGNAME= ${DISTNAME}p0
CATEGORIES= sysutils
HOMEPAGE= http://regis.damongeot.free.fr/tkdvd/

View File

@ -1,13 +1,13 @@
$OpenBSD: patch-TkDVD_sh,v 1.3 2008/11/10 20:18:14 steven Exp $
--- TkDVD.sh.orig Sat Mar 10 18:10:04 2007
+++ TkDVD.sh Mon Nov 10 19:49:55 2008
$OpenBSD: patch-TkDVD_sh,v 1.4 2009/11/07 15:54:33 ajacoutot Exp $
--- TkDVD.sh.orig Sat Aug 30 14:04:00 2008
+++ TkDVD.sh Sat Nov 7 15:47:06 2009
@@ -1,6 +1,6 @@
#!/bin/sh
# the next line restarts using wish \
-exec wish "$0" "$@"
+exec ${MODTK_BIN} "$0" "$@"
# Copyright 2003,2007 Regis Damongeot
# Copyright 2003,2008 Regis Damongeot
@@ -25,7 +25,7 @@ wm geometry . 700x550
wm protocol . WM_DELETE_WINDOW { save_options; destroy . }
@ -17,4 +17,4 @@ $OpenBSD: patch-TkDVD_sh,v 1.3 2008/11/10 20:18:14 steven Exp $
+set burning_device "/dev/rcd0c"
#used when creating ISO to save CD/DVD device
set temp_burning_device ""
set burn_command "growisofs"
set dvd_burning_command "growisofs"

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src-other_procedures_tcl,v 1.2 2008/11/10 20:18:14 steven Exp $
--- src/other_procedures.tcl.orig Fri Feb 2 13:25:32 2007
+++ src/other_procedures.tcl Mon Nov 10 19:49:54 2008
@@ -177,13 +177,13 @@ proc launch {burn_type burn_opt} {
$OpenBSD: patch-src-other_procedures_tcl,v 1.3 2009/11/07 15:54:33 ajacoutot Exp $
--- src/other_procedures.tcl.orig Sat Aug 30 11:43:00 2008
+++ src/other_procedures.tcl Sat Nov 7 15:47:32 2009
@@ -176,13 +176,13 @@ proc launch {burn_type burn_opt} {
}
} elseif { $burn_type == "create_iso" } {
# burn_opt contains destination file for ISO image
@ -18,3 +18,12 @@ $OpenBSD: patch-src-other_procedures_tcl,v 1.2 2008/11/10 20:18:14 steven Exp $
}
} elseif { $burn_type == "erase_dvd" } {
# $burn_opt= "" or "force" or "blank"
@@ -448,7 +448,7 @@ proc disc_to_iso { disc_type } {
button .create_iso_window.f_dest_file.b_mess -highlightbackground blue -text "$i18n_choose_target_file" -command { set dest_file [tk_getSaveFile -filetypes {{ {ISO Image} { .iso } } {{All Files} * } } -defaultextension .iso] }
entry .create_iso_window.f_dest_file.e_fp -relief flat -highlightbackground blue -highlightcolor blue -readonlybackground #f5f5f5 -state readonly -textvariable dest_file -width 57
- button .create_iso_window.b_create -highlightbackground red -text "$i18n_create" -command { if { $dest_file == "" } { tk_messageBox -icon error -message $i18n_error_target_file_ns -type ok -title $i18n_error } else {launch "create_iso" "[exec echo $dest_file | sed s/\ /\\\\\ /g -]"; destroy .create_iso_window} }
+ button .create_iso_window.b_create -highlightbackground red -text "$i18n_create" -command { if { $dest_file == "" } { tk_messageBox -icon error -message $i18n_error_target_file_ns -type ok -title $i18n_error } else {launch "create_iso" "[exec echo $dest_file | sed s/\ /\\\\\ /g]"; destroy .create_iso_window} }
button .create_iso_window.b_close -highlightbackground red -text "$i18n_close" -command { destroy .create_iso_window}
pack .create_iso_window.f_dest_file.b_mess -side left -padx {12 12}

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_proc_refresh_cmd_line_tcl,v 1.1 2009/11/07 15:54:33 ajacoutot Exp $
--- src/proc_refresh_cmd_line.tcl.orig Fri Mar 28 13:15:04 2008
+++ src/proc_refresh_cmd_line.tcl Sat Nov 7 15:49:52 2009
@@ -127,9 +127,9 @@ proc refresh_cmd_line {} {
set local_burn_speed ""
}
if { $dvd_size <= 716800 } {
- set command_line "$burn_command $option_overburn $local_burn_speed $option_eject_cd $option_tao_dao_cd dev=$burning_device [exec echo $iso_file | sed s/\ /\\\\\ /g -]"
+ set command_line "$burn_command $option_overburn $local_burn_speed $option_eject_cd $option_tao_dao_cd dev=$burning_device [exec echo $iso_file | sed s/\ /\\\\\ /g]"
} else {
- set command_line "$burn_command $option_dvd_compat $local_burn_speed $option_overburn $t_session $burning_device=[exec echo $iso_file | sed s/\ /\\\\\ /g -]"
+ set command_line "$burn_command $option_dvd_compat $local_burn_speed $option_overburn $t_session $burning_device=[exec echo $iso_file | sed s/\ /\\\\\ /g]"
}
if { [.f_burn.go_button cget -state] == "disabled" } { .f_burn.go_button configure -state normal }
}