Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory 
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv19449/10.4/unstable/main/finkinfo/gnome

Modified Files:
        nautilus-cd-burner.info nautilus-cd-burner.patch 
Log Message:
New version. Still has burning broken/disabled.


Index: nautilus-cd-burner.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/nautilus-cd-burner.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nautilus-cd-burner.patch    6 Feb 2006 16:05:57 -0000       1.1
+++ nautilus-cd-burner.patch    27 Jul 2006 23:15:03 -0000      1.2
@@ -1,24 +1,176 @@
-diff -Naur nautilus-cd-burner-2.6.0-old/make-iso.c 
nautilus-cd-burner-2.6.0/make-iso.c
---- nautilus-cd-burner-2.6.0-old/make-iso.c    Tue Mar  2 03:52:11 2004
-+++ nautilus-cd-burner-2.6.0/make-iso.c        Thu Apr  8 22:43:36 2004
-@@ -24,7 +24,7 @@
+diff -Nurd -x'*~' nautilus-cd-burner-2.14.2.orig/dvd_plus_rw_utils.cpp 
nautilus-cd-burner-2.14.2/dvd_plus_rw_utils.cpp
+--- nautilus-cd-burner-2.14.2.orig/dvd_plus_rw_utils.cpp       2005-12-16 
11:00:22.000000000 -0500
++++ nautilus-cd-burner-2.14.2/dvd_plus_rw_utils.cpp    2006-07-27 
16:18:15.000000000 -0400
+@@ -34,7 +34,7 @@
+ #include <signal.h>
+ #include <glib.h>
+ 
+-#include "transport.hxx"
++//#include "transport.hxx"
+ 
+ #ifdef LIBSTDCXX_HACK
+ /* Some C++ stuff needed when we not link to libstdc++ */
+@@ -70,6 +70,8 @@
+ extern "C"
+ int get_dvd_r_rw_profile (const char *name)
+ {
++  return -1;
++# if 0
+   Scsi_Command cmd;
+   int retval = -1;
+   unsigned char page[20];
+@@ -154,11 +156,14 @@
+ bail:
+ 
+   return retval;
++#endif
+ }
+ 
+ extern "C"
+ int get_mmc_profile (int fd)
+ {
++  return -1;
++#if 0
+   Scsi_Command cmd(fd);
+   int retval = -1;
+   unsigned char formats[260],disc_info[32];
+@@ -297,11 +302,14 @@
+ 
+   return retval;
+ 
++#endif
+ }
+ 
+ extern "C"
+ int get_disc_status (int fd, int *empty, int *is_rewritable, int *is_blank)
+ {
++  return -1;
++#if 0
+   Scsi_Command cmd(fd);
+   int retval = -1;
+   unsigned char page[32];
+@@ -344,11 +352,14 @@
+ 
+   return retval;
+ 
++#endif
+ }
+ 
+ extern "C"
+ int get_disc_size_cdr (int fd)
+ {
++  return -1;
++#if 0
+   Scsi_Command cmd(fd);
+   int retval = -1;
+   unsigned char toc[4], *atip;
+@@ -386,8 +397,10 @@
+ bail:
+ 
+   return retval;
++#endif
+ }
+ 
++#if 0
+ static gint64
+ get_read_capacity (Scsi_Command &cmd)
+ {
+@@ -417,15 +430,15 @@
+ 
+   return retval;
+ }
++#endif
+ 
+ extern "C"
+ gint64 get_disc_size_cd (int fd)
+ {
+-  Scsi_Command cmd (fd);
+-
+-  return get_read_capacity (cmd);
++  return -1;
+ }
+ 
++#if 0
+ static unsigned int get_2k_capacity (Scsi_Command &cmd, int mmc_profile)
+ { unsigned char       buf[32];
+   unsigned int        ret=0;
+@@ -539,28 +552,27 @@
+ 
+   return ret;
+ }
++#endif
+ 
+ /* Returns the size of a DVD in bytes */
+ extern "C"
+ gint64 get_disc_size_dvd (int fd)
+ {
+-  Scsi_Command cmd(fd);
+-
+-  return get_read_capacity (cmd);
++  return -1;
+ }
+ 
+ /* Returns the size of a DVD+R[W] or DVD-R[W] in bytes */
+ extern "C"
+ gint64 get_disc_size_dvdr (int fd, int mmc_profile)
+ {
+-  Scsi_Command cmd(fd);
+-
+-  return (gint64)get_2k_capacity(cmd, mmc_profile) * 2048;
++  return 0;
+ }
+ 
+ extern "C"
+ int get_read_write_speed (int fd, int *read_speed, int *write_speed)
+ {
++  return -1;
++#if 0
+   Scsi_Command cmd(fd);
+   int retval = -1;
+   unsigned char header[12], *page2A, *p;
+@@ -642,5 +654,6 @@
+ 
+   return -1;
+ 
++#endif
+ }
+ 
+diff -Nurd -x'*~' nautilus-cd-burner-2.14.2.orig/make-iso.c 
nautilus-cd-burner-2.14.2/make-iso.c
+--- nautilus-cd-burner-2.14.2.orig/make-iso.c  2005-11-30 12:04:44.000000000 
-0500
++++ nautilus-cd-burner-2.14.2/make-iso.c       2006-07-27 17:37:02.000000000 
-0400
+@@ -26,12 +26,6 @@
  
  #include "config.h"
  
 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || 
defined(__Darwin__)
- #include <sys/param.h>
- #include <sys/mount.h>
- #else
-diff -Naur nautilus-cd-burner-2.6.0-old/po/Makefile.in.in 
nautilus-cd-burner-2.6.0/po/Makefile.in.in
---- nautilus-cd-burner-2.6.0-old/po/Makefile.in.in     Mon Mar 22 09:39:17 2004
-+++ nautilus-cd-burner-2.6.0/po/Makefile.in.in Thu Apr  8 22:39:16 2004
-@@ -28,7 +28,7 @@
- exec_prefix = @exec_prefix@
+-#include <sys/param.h>
+-#include <sys/mount.h>
+-#else
+-#include <sys/vfs.h>
+-#endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ */
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <time.h>
+diff -Nurd -x'*~' nautilus-cd-burner-2.14.2.orig/mapping-protocol.c 
nautilus-cd-burner-2.14.2/mapping-protocol.c
+--- nautilus-cd-burner-2.14.2.orig/mapping-protocol.c  2005-12-20 
17:21:47.000000000 -0500
++++ nautilus-cd-burner-2.14.2/mapping-protocol.c       2006-07-27 
16:13:13.000000000 -0400
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <sys/time.h>
+ 
+ #include "mapping-protocol.h"
+ 
+diff -Nurd -x'*~' nautilus-cd-burner-2.14.2.orig/po/Makefile.in.in 
nautilus-cd-burner-2.14.2/po/Makefile.in.in
+--- nautilus-cd-burner-2.14.2.orig/po/Makefile.in.in   2006-04-10 
11:48:00.000000000 -0400
++++ nautilus-cd-burner-2.14.2/po/Makefile.in.in        2006-07-27 
15:35:07.000000000 -0400
+@@ -34,7 +34,7 @@
  datadir = @datadir@
+ datarootdir = @datarootdir@
  libdir = @libdir@
 -localedir = $(libdir)/locale
-+localedir = $(datadir)/locale
++localedir = $(libdir)/localewoof
  gnulocaledir = $(datadir)/locale
  gettextsrcdir = $(datadir)/glib-2.0/gettext/po
  subdir = po

Index: nautilus-cd-burner.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/nautilus-cd-burner.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- nautilus-cd-burner.info     20 Jul 2006 02:49:26 -0000      1.5
+++ nautilus-cd-burner.info     27 Jul 2006 23:15:02 -0000      1.6
@@ -1,28 +1,63 @@
 Package: nautilus-cd-burner
-Version: 2.6.1
-Revision: 1013
+Version: 2.4.2
+Revision: 1001
 GCC: 4.0
-Depends: nautilus (>= 2.6.0-1)
-BuildDepends: audiofile, gettext-dev, libiconv-dev, libxml2, atk1, eel2-dev 
(>= 2.6.0-1), gail17-dev (>= 1.6.0-1), gconf2-dev (>= 2.6.0-1), glib2-dev (>= 
2.6.6-1111), dbus-dev (>= 0.60-1), libhowl-dev, gnome-vfs2-dev (>= 2.6.0-1) | 
gnome-vfs2-ssl-dev (>= 2.6.0-1), gtk+2-dev (>= 2.4.0-1), libart2 (>= 2.3.16-1), 
libbonobo2-dev (>= 2.6.0-1), libbonoboui2-dev (>= 2.6.0-1), libgnome2-dev (>= 
2.6.0-1), libgnomecanvas2-dev (>= 2.6.0-1), libgnomeui2-dev (>= 2.6.0-1), 
libjpeg, nautilus-dev (>= 2.6.0-1), orbit2-dev (>= 2.10.0-1), pango1-xft2-dev 
(>= 1.4.0-1), pkgconfig, intltool, libglade2, popt, gnome-keyring-dev, esound, 
audiofile
-Source: mirror:gnome:sources/%n/2.6/%n-%v.tar.bz2
-Source-MD5: 7998cbe011e9e0a22d9362a2430d578b
+
+Depends: libnautilus-burn3-shlibs (= %v-%r), atk1-shlibs, audiofile-shlibs, 
dbus-shlibs (>= 0.60-1), eel2.2-shlibs (>= 2.13.3-1), esound-shlibs, 
gail17-shlibs (>= 1.6.0-1), gconf2 (>= 2.6.0-1), glib2-shlibs (>= 2.12.0-1), 
gnome-desktop4-shlibs, gnome-keyring-shlibs (>= 0.4.3-1), gnome-menus2-shlibs, 
gnome-vfs2-unified-shlibs, gtk+2-shlibs (>= 2.5.4-1), libart2-shlibs (>= 
2.3.16-1), libbonobo2-shlibs (>= 2.6.0-1), libbonoboui2-shlibs (>= 2.6.0-1), 
libgettext3-shlibs, libglade2-shlibs, libgnome2-shlibs (>= 2.6.0-1), 
libgnomecanvas2-shlibs (>= 2.6.0-1), libgnomeui2-shlibs (>= 2.6.0-1), 
libhowl-shlibs, libiconv, libjpeg-shlibs, libnautilus-ext1-shlibs (>= 
2.13.4-1), libxml2-shlibs, orbit2-shlibs (>= 2.10.0-1), pango1-xft2-shlibs (>= 
1.4.0-1), popt-shlibs, startup-notification-shlibs, x11
+BuildDepends: pkgconfig, intltool, atk1, audiofile, dbus-dev (>= 0.60-1), 
eel2.2-dev (>= 2.13.3-1), esound, gail17-dev (>= 1.6.0-1), gconf2-dev (>= 
2.6.0-1), glib2-dev (>= 2.12.0-1), gnome-desktop4-dev, gnome-keyring-dev (>= 
0.4.3-1), gnome-menus2-dev, gnome-vfs2-unified-dev, gtk+2-dev (>= 2.5.4-1), 
libart2 (>= 2.3.16-1), libbonobo2-dev (>= 2.6.0-1), libbonoboui2-dev (>= 
2.6.0-1), libgettext3-dev, gettext-tools, libglade2, libgnome2-dev (>= 
2.6.0-1), libgnomecanvas2-dev (>= 2.6.0-1), libgnomeui2-dev (>= 2.6.0-1), 
libhowl-dev, libiconv-dev, libjpeg, libnautilus-ext1-dev (>= 2.13.4-1), 
libxml2, orbit2-dev (>= 2.10.0-1), pango1-xft2-dev (>= 1.4.0-1), popt, 
startup-notification-dev, x11-dev
+
+Source: mirror:gnome:sources/%n/2.14/%n-%v.tar.bz2
+Source-MD5: 5e85fc810f6160916fac26caa805cc65
+
 Patch: %n.patch
-SetCPPFLAGS: -no-cpp-precomp -D__Darwin__
-ConfigureParams: --mandir=%p/share/man --libexecdir=%p/lib/%n 
--disable-schemas-install
+SetCPPFLAGS: -no-cpp-precomp
+ConfigureParams: --mandir=%p/share/man --libexecdir=%p/lib/%n 
--disable-dependency-tracking --disable-schemas-install --disable-hal 
--disable-gnome-mount --enable-more-warnings --enable-static
 InstallScript: make install DESTDIR=%d
+DocFiles: AUTHORS COPYING* ChangeLog NEWS README TODO
+ConfFiles: %p/etc/gconf/schemas/ncb.schemas
+
 PostInstScript: <<
   if [ configure = "$1" ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-install-rule %p/etc/gconf/schemas/ncb.schemas 
>/dev/null
   fi
 <<
-DocFiles: AUTHORS COPYING ChangeLog NEWS README
+
+SplitOff: <<
+  Package: libnautilus-burn3-shlibs
+  Replaces: %N (<< 2.14.2-1)
+  Depends: atk1-shlibs, glib2-shlibs (>= 2.12.0-1), gtk+2-shlibs (>= 2.5.4-1), 
libgettext3-shlibs, libiconv, pango1-xft2-shlibs (>= 1.4.0-1), x11
+  Files: lib/libnautilus-burn.3*
+  Shlibs: %p/lib/libnautilus-burn.3.dylib 4.0.0 %n (>= 2.14.2-1)
+  DocFiles: AUTHORS COPYING* ChangeLog NEWS README TODO
+<<
+
+SplitOff2: <<
+  Package: libnautilus-burn3-dev
+  Replaces: %N (<< 2.14.2-1)
+  Depends: libnautilus-burn3-shlibs (= %v-%r)
+  BuildDependsOnly: true
+  Files: lib/libnautilus-burn.* lib/pkgconfig include
+  DocFiles: AUTHORS COPYING* ChangeLog NEWS README TODO
+<<
+
 Description:Nautilus CD Burner
 DescDetail: <<
 Adds cd burning support to nautilus.
 
-CD burning doesn't work on darwin, but it will create iso images.
+Actual CD burning doesn't work on darwin, but it will create iso images.
 <<
-License: GPL
+DescPort: <<
+  Don't have SCSI support so disable all scsi functions.
+
+  Remove #includes we don't have or need. See:
+  http://bugzilla.gnome.org/show_bug.cgi?id=348986
+<<
+DescPackaging: <<
+  Use glib2-2.12.0 for GCC version independence and new glib2 package layout
+
+  -dev/-shlibs splitoffs added in 2.14.2-1
+<<
+License: GPL/LGPL
 Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
 Homepage: http://www.gnome.org/


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to