From ecc692c609745ed2590ee410fcf60f8fc5577767 Mon Sep 17 00:00:00 2001 From: marcus Date: Sun, 7 Nov 2004 23:20:22 +0000 Subject: Remove these ports now that they have been merged into the ports tree. Next stop, GNOME 2.9! git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3045 df743ca5-7f9a-e211-a948-0013205c9059 --- .../files/patch-bacon-cd-selection.c | 15 -- sysutils/nautilus-cd-burner/files/patch-cd-drive.c | 218 --------------------- sysutils/nautilus-cd-burner/files/patch-configure | 27 --- sysutils/nautilus-cd-burner/files/patch-make-iso.c | 18 -- .../files/patch-nautilus-cd-burner.c | 33 ---- 5 files changed, 311 deletions(-) delete mode 100644 sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c delete mode 100644 sysutils/nautilus-cd-burner/files/patch-cd-drive.c delete mode 100644 sysutils/nautilus-cd-burner/files/patch-configure delete mode 100644 sysutils/nautilus-cd-burner/files/patch-make-iso.c delete mode 100644 sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c (limited to 'sysutils/nautilus-cd-burner/files') diff --git a/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c b/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c deleted file mode 100644 index a684ac82a..000000000 --- a/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c +++ /dev/null @@ -1,15 +0,0 @@ ---- bacon-cd-selection.c.orig Thu Nov 4 00:25:43 2004 -+++ bacon-cd-selection.c Thu Nov 4 00:25:57 2004 -@@ -177,10 +177,10 @@ - static void - bacon_cd_selection_init (BaconCdSelection *bcs) - { -- bcs->priv = g_new0 (BaconCdSelectionPrivate, 1); -- - GtkCellRenderer *cell; - GtkListStore *store; -+ bcs->priv = g_new0 (BaconCdSelectionPrivate, 1); -+ - - store = gtk_list_store_new (1, G_TYPE_STRING); - gtk_combo_box_set_model (GTK_COMBO_BOX (bcs), diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c b/sysutils/nautilus-cd-burner/files/patch-cd-drive.c deleted file mode 100644 index 1bcf94f3e..000000000 --- a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c +++ /dev/null @@ -1,218 +0,0 @@ ---- cd-drive.c.orig Wed Sep 22 09:20:04 2004 -+++ cd-drive.c Mon Oct 4 02:20:47 2004 -@@ -270,9 +270,21 @@ - { - int fd; - int mmc_profile; -+#ifdef __FreeBSD__ -+ struct cam_device *cam; -+#endif - - g_return_val_if_fail (device != NULL, CD_MEDIA_TYPE_ERROR); - -+#ifdef __FreeBSD__ -+ cam = cam_open_device (device, O_RDWR); -+ if (cam == NULL) { -+ return CD_MEDIA_TYPE_ERROR; -+ } -+ -+ fd = cam->fd; -+#else -+ - fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); - if (fd < 0) { - if (errno == EBUSY) { -@@ -280,6 +292,7 @@ - } - return CD_MEDIA_TYPE_ERROR; - } -+#endif - - mmc_profile = get_mmc_profile (fd); - -@@ -307,7 +320,11 @@ - } - } - -+#ifdef __FreeBSD__ -+ cam_close_device (cam); -+#else - close (fd); -+#endif - - switch (mmc_profile) { - case -1: -@@ -442,10 +459,21 @@ - int secs; - int mmc_profile; - gint64 size; -+#ifdef __FreeBSD__ -+ struct cam_device *cam; -+#endif - - g_return_val_if_fail (device != NULL, CD_MEDIA_SIZE_UNKNOWN); - - secs = 0; -+#ifdef __FreeBSD__ -+ cam = cam_open_device (device, O_RDWR); -+ if (cam == NULL) { -+ return CD_MEDIA_SIZE_UNKNOWN; -+ } -+ -+ fd = cam->fd; -+#else - - fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); - if (fd < 0) { -@@ -454,6 +482,7 @@ - } - return CD_MEDIA_SIZE_UNKNOWN; - } -+#endif - - mmc_profile = get_mmc_profile (fd); - -@@ -476,7 +505,11 @@ - size = CD_MEDIA_SIZE_NA; - } - -+#ifdef __FreeBSD__ -+ cam_close_device (cam); -+#else - close (fd); -+#endif - - return size; - } -@@ -595,9 +628,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__) -@@ -800,49 +905,7 @@ - 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; -- -- fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); -- if (fd < 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; -- -- fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); -- if (fd < 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 * - get_scsi_cd_name (int bus, int id, int lun, const char *dev, 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-make-iso.c b/sysutils/nautilus-cd-burner/files/patch-make-iso.c deleted file mode 100644 index 87cd0836b..000000000 --- a/sysutils/nautilus-cd-burner/files/patch-make-iso.c +++ /dev/null @@ -1,18 +0,0 @@ ---- make-iso.c.orig Fri Dec 19 13:06:34 2003 -+++ make-iso.c Mon Dec 29 16:18:15 2003 -@@ -571,6 +571,7 @@ - argv[i++] = "-r"; - if (use_joliet) { - argv[i++] = "-J"; -+ argv[i++] = "-joliet-long"; - } - argv[i++] = "-q"; - argv[i++] = "-graft-points"; -@@ -650,6 +651,7 @@ - argv[i++] = "-r"; - if (use_joliet) { - argv[i++] = "-J"; -+ argv[i++] = "-joliet-long"; - } - argv[i++] = "-graft-points"; - argv[i++] = "-path-list"; 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 3b8b07293..000000000 --- a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c +++ /dev/null @@ -1,33 +0,0 @@ ---- nautilus-cd-burner.c.orig Sun Sep 19 18:44:15 2004 -+++ nautilus-cd-burner.c Sun Oct 31 13:06:08 2004 -@@ -21,6 +21,8 @@ - - Authors: Alexander Larsson - */ -+#include -+#include - #include - #include - #include -@@ -632,8 +634,19 @@ - } - - if (res == 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); - -- cgit v1.2.3