From e50eae6ac5938355d3b2bf896066bc3c12bac093 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Sat, 18 Apr 2009 20:52:04 +0000
Subject: nautilus-cd-burner: Added version 2.24.0, removed old one.

---
 conf/checksums.ini                                 |  4 +++
 recipes/nautilus/nautilus-cd-burner/makefile.patch | 42 ----------------------
 recipes/nautilus/nautilus-cd-burner_2.24.0.bb      | 14 ++++++++
 recipes/nautilus/nautilus-cd-burner_2.8.5.bb       | 30 ----------------
 4 files changed, 18 insertions(+), 72 deletions(-)
 delete mode 100644 recipes/nautilus/nautilus-cd-burner/makefile.patch
 create mode 100644 recipes/nautilus/nautilus-cd-burner_2.24.0.bb
 delete mode 100644 recipes/nautilus/nautilus-cd-burner_2.8.5.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 4adcd816df..679a60b290 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -16774,6 +16774,10 @@ sha256=86c8839ad5c8a1c5674eb3617bbe15e9c9bb2358a7435a0e2d22cd25ab7718ff
 md5=50c5732c0c9736b7026bce1c6b0007dc
 sha256=83f1d6623e142af30a9b3fa9135ecf973fbb8c89f1dc36a218de0c0fef6ddf07
 
+[http://ftp.gnome.org/pub/GNOME/sources/nautilus-cd-burner/2.24/nautilus-cd-burner-2.24.0.tar.bz2]
+md5=eb211dd03d0518263fa4eadccc3caa88
+sha256=d4ff952115a2fca28c613ce6a2b46740ce1000b0c213c482bcf3f127ceab99ad
+
 [http://ftp.gnome.org/pub/GNOME/sources/nautilus-cd-burner/2.8/nautilus-cd-burner-2.8.5.tar.bz2]
 md5=970173a3f93270950ca9fd247bdf07a7
 sha256=978d470f5f0cc314fab20ad8b4f771c568915fb78e933960bf33444ac44f9a39
diff --git a/recipes/nautilus/nautilus-cd-burner/makefile.patch b/recipes/nautilus/nautilus-cd-burner/makefile.patch
deleted file mode 100644
index ece201e25d..0000000000
--- a/recipes/nautilus/nautilus-cd-burner/makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- nautilus-cd-burner-2.8.5/Makefile.am	2004-10-20 15:52:13.000000000 -0700
-+++ nautilus-cd-burner-2.8.5.new/Makefile.am	2004-11-15 16:57:16.530130640 -0700
-@@ -52,6 +51,8 @@
- CLEANFILES = $(desktop_in_files:.desktop.in=.desktop) \
- 	     $(schema_DATA) $(CDRECMARSHALFILES)
- 
-+DISTCLEANFILES = intltool-extract intltool-merge intltool-update
-+
- modulesconfdir=$(sysconfdir)/gnome-vfs-2.0/modules
- modulesconf_DATA = mapping-modules.conf
- modulesdir = $(libdir)/gnome-vfs-2.0/modules
-@@ -109,6 +110,12 @@
- 	mapping-protocol.c \
- 	$(NULL)
- 
-+# we set this so that Automake will use different file names when
-+# compiling, so that the copy of mapping-method.o compiled for
-+# libmapping.la doesn't conflict with the copy compiled for
-+# mapping-daemon (the library one should be PIC code).
-+libmapping_la_CFLAGS =
-+
- libmapping_la_LDFLAGS = $(module_flags)
- libmapping_la_LIBADD = $(MAPPING_LIBS)
- 
-@@ -142,12 +149,11 @@
- 
- if LIBSTDCXX_HACK
- AM_CXXFLAGS = -fno-exceptions -fno-rtti
--CXXLD=--tag=CC $(CXX)
--else
--# If we don't set it, it doesn't seem to appear in the Makefile at all
--# and we can't recursively set it, hence
--CXXLD=$(CXX)
--endif
-+CXX_LINK_TAG = --tag=CC
-+endif 
-+CXXLINK = $(LIBTOOL) --mode=link $(CXX_LINK_TAG) $(CXXLD) $(AM_CXXFLAGS) \
-+  $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+
- 
- libnautilus_burn_la_LIBADD = $(BURN_LIBS)
- libnautilus_burnincludedir = $(includedir)/libnautilus-burn/
diff --git a/recipes/nautilus/nautilus-cd-burner_2.24.0.bb b/recipes/nautilus/nautilus-cd-burner_2.24.0.bb
new file mode 100644
index 0000000000..71a8b6de53
--- /dev/null
+++ b/recipes/nautilus/nautilus-cd-burner_2.24.0.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Easy To Use GNOME CD/DVD Burning Application"
+LICENSE = "LGPL GPL"
+SECTION = "x11/gnome"
+inherit gnome
+
+DEPENDS="dbus-glib eel glib-2.0 gtk+ hal libglade libgnomeui nautilus"
+# recipe does not exist yet:
+#DEPENDS += "gnome-mount"
+# FIXME: recipes are missing
+#RDEPENDS = "genisoimage growisofs wodim"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/recipes/nautilus/nautilus-cd-burner_2.8.5.bb b/recipes/nautilus/nautilus-cd-burner_2.8.5.bb
deleted file mode 100644
index 71f0a5c44e..0000000000
--- a/recipes/nautilus/nautilus-cd-burner_2.8.5.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-# nautilus-cd-burner OE build file
-# Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-inherit gnome
-LICENSE="GPL"
-
-DEPENDS="nautilus"
-
-SRC_URI += "file://makefile.patch;patch=1"
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-PACKAGES += "libnautilus-burn"
-
-FILES_${PN} = "/usr/share/* /usr/bin/* /etc /usr/lib/gnome-vfs-2.0/* \
-	/usr/lib/nautilus/*"
-FILES_libnautilus-burn="/usr/lib/*.so*"
-
-headers="bacon-cd-selection.h  cd-drive.h  cd-recorder.h"
-hdir="${STAGING_INCDIR}/libnautilus-burn"
-
-do_stage() {
-	install -d ${hdir}
-	for file in ${headers}; do
-		install -m 0644 $file ${hdir}/$file
-	done
-
-	oe_libinstall libnautilus-burn  ${STAGING_LIBDIR}
-}
-- 
cgit 1.2.3-korg