diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-03-14 09:21:27 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-03-14 09:21:27 +0800 |
commit | 6ea8cdadd34fade98a807bf84429806612c65079 (patch) | |
tree | b7f18e7e629139c395bf0080243a2218963d0301 /sysutils/nautilus-cd-burner/files | |
parent | 857bb773fe0bad1b58fa9c68ece3c326f60613e6 (diff) | |
download | marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar.gz marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar.bz2 marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar.lz marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar.xz marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.tar.zst marcuscom-ports-6ea8cdadd34fade98a807bf84429806612c65079.zip |
Remove these ports now that they have been merged into the ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3934 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/nautilus-cd-burner/files')
3 files changed, 0 insertions, 336 deletions
diff --git a/sysutils/nautilus-cd-burner/files/patch-configure b/sysutils/nautilus-cd-burner/files/patch-configure deleted file mode 100644 index e8dbb4a5b..000000000 --- a/sysutils/nautilus-cd-burner/files/patch-configure +++ /dev/null @@ -1,27 +0,0 @@ ---- configure.orig Thu Jul 22 10:27:35 2004 -+++ configure Thu Jul 22 10:29:32 2004 -@@ -21015,6 +21015,8 @@ - if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -+ ac_check_lib_save_LIBS=$LIBS -+ LIBS="-lintl $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -21097,6 +21099,7 @@ - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -+ LIBS=$ac_check_lib_save_LIBS - fi - echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -@@ -21104,6 +21107,7 @@ - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF -+LIBS="-lintl $LIBS" - - fi - done diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c deleted file mode 100644 index c2299e572..000000000 --- a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c +++ /dev/null @@ -1,276 +0,0 @@ ---- nautilus-burn-drive.c.orig Tue Feb 22 19:34:17 2005 -+++ nautilus-burn-drive.c Tue Mar 1 00:46:50 2005 -@@ -62,6 +62,13 @@ - - #define CD_ROM_SPEED 176 - -+#if !defined(__linux) -+static int get_device_max_read_speed (char *device); -+#endif -+#if defined(__linux__) || defined(__FreeBSD__) -+static int get_device_max_write_speed (char *device); -+#endif -+ - static struct { - const char *name; - gboolean can_write_cdr; -@@ -149,7 +156,7 @@ - int *max_wr_speed, - NautilusBurnDriveType *type) - { -- char *stdout_data, *rd_speed, *wr_speed, *drive_cap; -+ char *stdout_data, *drive_cap; - - *max_rd_speed = -1; - *max_wr_speed = -1; -@@ -278,6 +285,9 @@ - { - int fd; - int mmc_profile; -+#ifdef __FreeBSD__ -+ struct cam_device *cam; -+#endif - - g_return_val_if_fail (device != NULL, NAUTILUS_BURN_MEDIA_TYPE_ERROR); - -@@ -286,6 +296,15 @@ - if (has_data) *has_data = FALSE; - if (has_audio) *has_audio = FALSE; - -+#ifdef __FreeBSD__ -+ cam = cam_open_device (device, O_RDWR); -+ if (cam == NULL) { -+ return NAUTILUS_BURN_MEDIA_TYPE_ERROR; -+ } -+ -+ fd = cam->fd; -+#else -+ - if ((fd = open (device, O_RDWR | O_EXCL | O_NONBLOCK)) < 0 - && (fd = open (device, O_RDONLY | O_EXCL | O_NONBLOCK)) < 0) { - if (errno == EBUSY) { -@@ -293,6 +312,7 @@ - } - return NAUTILUS_BURN_MEDIA_TYPE_ERROR; - } -+#endif - - mmc_profile = get_mmc_profile (fd); - -@@ -303,12 +323,20 @@ - opened = nautilus_burn_drive_door_open (mmc_profile, fd); - - if (opened != FALSE) { -+#ifdef __FreeBSD__ -+ cam_close_device (cam); -+#else - close (fd); -+#endif - return NAUTILUS_BURN_MEDIA_TYPE_ERROR; - } else { - int blank, rewrite, empty; - if (get_disc_status (fd, &empty, &rewrite, &blank) == 0) { -+#ifdef __FreeBSD__ -+ cam_close_device (cam); -+#else - close (fd); -+#endif - - if (is_rewritable) - *is_rewritable = rewrite; -@@ -325,12 +353,20 @@ - else - return NAUTILUS_BURN_MEDIA_TYPE_UNKNOWN; - } -+#ifdef __FreeBSD__ -+ cam_close_device (cam); -+#else - close (fd); -+#endif - return NAUTILUS_BURN_MEDIA_TYPE_UNKNOWN; - } - } - -+#ifdef __FreeBSD__ -+ cam_close_device (cam); -+#else - close (fd); -+#endif - - if (is_blank) - *is_blank = mmc_profile & 0x10000; -@@ -569,11 +605,21 @@ - int secs; - int mmc_profile; - gint64 size; -+#ifdef __FreeBSD__ -+ struct cam_device *cam; -+#endif - - g_return_val_if_fail (device != NULL, NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN); - - secs = 0; -+#ifdef __FreeBSD__ -+ cam = cam_open_device (device, O_RDWR); -+ if (cam == NULL) { -+ return NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN; -+ } - -+ fd = cam->fd; -+#else - if ((fd = open (device, O_RDWR | O_EXCL | O_NONBLOCK)) < 0 - && (fd = open (device, O_RDONLY | O_EXCL | O_NONBLOCK)) < 0) { - if (errno == EBUSY) { -@@ -581,6 +627,7 @@ - } - return NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN; - } -+#endif - - mmc_profile = get_mmc_profile (fd); - -@@ -603,7 +650,11 @@ - size = NAUTILUS_BURN_MEDIA_SIZE_NA; - } - -+#ifdef __FreeBSD__ -+ cam_close_device (cam); -+#else - close (fd); -+#endif - - return size; - } -@@ -896,9 +947,81 @@ - #endif /* USE_HAL */ - - #if defined(__linux__) || defined(__FreeBSD__) -+static int -+get_device_max_write_speed (char *device) -+{ -+ int fd; -+ int max_speed; -+ int read_speed, write_speed; -+#ifdef __FreeBSD__ -+ struct cam_device *cam; -+#endif -+ -+ max_speed = -1; -+#ifdef __FreeBSD__ -+ cam = cam_open_device (device, O_RDWR); -+ if (cam == NULL) { -+ return -1; -+ } -+ -+ fd = cam->fd; -+#else -+ -+ fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); -+ if (fd < 0) { -+ return -1; -+ } -+#endif -+ -+ get_read_write_speed (fd, &read_speed, &write_speed); -+#ifdef __FreeBSD__ -+ cam_close_device (cam); -+#else -+ close (fd); -+#endif -+ max_speed = (int)floor (write_speed) / CD_ROM_SPEED; -+ -+ return max_speed; -+} - -+#if !defined(__linux) -+static int -+get_device_max_read_speed (char *device) -+{ -+ int fd; -+ int max_speed; -+ int read_speed, write_speed; -+#ifdef __FreeBSD__ -+ struct cam_device *cam; -+#endif - -+ max_speed = -1; -+#ifdef __FreeBSD__ -+ cam = cam_open_device (device, O_RDWR); -+ if (cam == NULL) { -+ return -1; -+ } -+ -+ fd = cam->fd; -+#else -+ -+ fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); -+ if (fd < 0) { -+ return -1; -+ } -+#endif - -+ get_read_write_speed (fd, &read_speed, &write_speed); -+#ifdef __FreeBSD__ -+ cam_close_device (cam); -+#else -+ close (fd); -+#endif -+ max_speed = (int)floor (read_speed) / CD_ROM_SPEED; -+ -+ return max_speed; -+} -+#endif - #endif /* __linux__ || __FreeBSD__ */ - - #if defined (__linux__) -@@ -1111,50 +1234,6 @@ - } - } - return NULL; --} -- --#if !defined(__linux) --static int --get_device_max_read_speed (char *device) --{ -- int fd; -- int max_speed; -- int read_speed, write_speed; -- -- max_speed = -1; -- -- if ((fd = open (device, O_RDWR | O_EXCL | O_NONBLOCK)) < 0 -- && (fd = open (device, O_RDONLY | O_EXCL | O_NONBLOCK)) < 0) { -- return -1; -- } -- -- get_read_write_speed (fd, &read_speed, &write_speed); -- close (fd); -- max_speed = (int)floor (read_speed) / CD_ROM_SPEED; -- -- return max_speed; --} --#endif -- --static int --get_device_max_write_speed (char *device) --{ -- int fd; -- int max_speed; -- int read_speed, write_speed; -- -- max_speed = -1; -- -- if ((fd = open (device, O_RDWR | O_EXCL | O_NONBLOCK)) < 0 -- && (fd = open (device, O_RDONLY | O_EXCL | O_NONBLOCK)) < 0) { -- return -1; -- } -- -- get_read_write_speed (fd, &read_speed, &write_speed); -- close (fd); -- max_speed = (int)floor (write_speed) / CD_ROM_SPEED; -- -- return max_speed; - } - - static char * diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c deleted file mode 100644 index c545be7d5..000000000 --- a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c +++ /dev/null @@ -1,33 +0,0 @@ ---- nautilus-cd-burner.c.orig Mon Feb 28 19:40:05 2005 -+++ nautilus-cd-burner.c Mon Feb 28 20:05:56 2005 -@@ -23,6 +23,8 @@ - * Bastien Nocera <hadess@hadess.net> - */ - -+#include <sys/types.h> -+#include <sys/stat.h> - #include <gtk/gtk.h> - #include <gtk/gtkfilesel.h> - #include <gtk/gtkseparatormenuitem.h> -@@ -843,8 +845,19 @@ - } - - if (res == NAUTILUS_BURN_RECORDER_RESULT_RETRY) { -- g_free (filename); -- filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL); -+ gchar *path1; -+ -+ path1 = g_strdup_printf ("%s/.ncb", g_get_home_dir()); -+ -+ if (!g_file_test (path1, G_FILE_TEST_EXISTS)) { -+ mkdir (path1, 0700); -+ } -+ -+ if (filename != NULL) { -+ g_free (filename); -+ } -+ filename = g_build_filename (path1, "image.iso.XXXXXX", NULL); -+ g_free (path1); - fd = g_mkstemp(filename); - close (fd); - |