update to 2.32.1

This switches to the gnome-2.32 release branch.

5 files changed, 55 insertions, 29 deletions

diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 20e9218f421..039d0644d5d 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2010/11/15 22:58:30 abs Exp $
+# $NetBSD: Makefile,v 1.23 2011/01/11 15:27:25 drochner Exp $
 #
 
-DISTNAME=	brasero-2.30.2
-PKGREVISION=	3
+DISTNAME=	brasero-2.32.1
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/brasero/2.30/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/brasero/2.32/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -24,7 +23,6 @@ USE_TOOLS+=	pkg-config gmake intltool gawk msgfmt
 
 CONFIGURE_ARGS+=	--disable-inotify
 
-GCONF_SCHEMAS+=		brasero.schemas
 PKGCONFIG_OVERRIDE+=	libbrasero-media.pc.in
 
 .include "../../databases/shared-mime-info/mimedb.mk"
diff --git a/sysutils/brasero/PLIST b/sysutils/brasero/PLIST
index a31db849b24..63730eded82 100644
--- a/sysutils/brasero/PLIST
+++ b/sysutils/brasero/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2010/07/06 15:23:59 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2011/01/11 15:27:25 drochner Exp $
 bin/brasero
 include/brasero/brasero-blank-dialog.h
 include/brasero/brasero-burn-dialog.h
@@ -58,7 +58,7 @@ lib/libbrasero-utils.la
 lib/pkgconfig/libbrasero-burn.pc
 lib/pkgconfig/libbrasero-media.pc
 man/man1/brasero.1
-share/applications/brasero-copy-medium.desktop
+share/GConf/gsettings/brasero.convert
 share/applications/brasero.desktop
 share/brasero/icons/hicolor/16x16/actions/insert-pause.png
 share/brasero/icons/hicolor/16x16/actions/iso-image-burn.png
@@ -162,6 +162,7 @@ share/brasero/icons/hicolor/32x32/actions/media-optical-burn.png
 share/brasero/icons/hicolor/32x32/actions/media-optical-copy.png
 share/brasero/icons/hicolor/32x32/actions/media-optical-data-new.png
 share/brasero/icons/hicolor/32x32/actions/media-optical-video-new.png
+share/brasero/icons/hicolor/32x32/actions/transform-crop-and-resize.png
 share/brasero/icons/hicolor/32x32/status/brasero-disc-00.png
 share/brasero/icons/hicolor/32x32/status/brasero-disc-05.png
 share/brasero/icons/hicolor/32x32/status/brasero-disc-10.png
@@ -214,8 +215,7 @@ share/brasero/icons/hicolor/scalable/status/brasero-disc-80.svg
 share/brasero/icons/hicolor/scalable/status/brasero-disc-85.svg
 share/brasero/icons/hicolor/scalable/status/brasero-disc-90.svg
 share/brasero/icons/hicolor/scalable/status/brasero-disc-95.svg
-share/brasero/logo.png
-share/gconf/schemas/brasero.schemas
+share/glib-2.0/schemas/org.gnome.brasero.gschema.xml
 share/gnome/help/brasero/C/brasero.xml
 share/gnome/help/brasero/C/figures/brasero_main.png
 share/gnome/help/brasero/C/legal.xml
@@ -237,12 +237,16 @@ share/gnome/help/brasero/fi/brasero.xml
 share/gnome/help/brasero/fi/figures/brasero_main.png
 share/gnome/help/brasero/fr/brasero.xml
 share/gnome/help/brasero/fr/figures/brasero_main.png
+share/gnome/help/brasero/gl/brasero.xml
+share/gnome/help/brasero/gl/figures/brasero_main.png
 share/gnome/help/brasero/it/brasero.xml
 share/gnome/help/brasero/it/figures/brasero_main.png
 share/gnome/help/brasero/pl/brasero.xml
 share/gnome/help/brasero/pl/figures/brasero_main.png
 share/gnome/help/brasero/ru/brasero.xml
 share/gnome/help/brasero/ru/figures/brasero_main.png
+share/gnome/help/brasero/sl/brasero.xml
+share/gnome/help/brasero/sl/figures/brasero_main.png
 share/gnome/help/brasero/sv/brasero.xml
 share/gnome/help/brasero/sv/figures/brasero_main.png
 share/gnome/help/brasero/zh_CN/brasero.xml
@@ -332,6 +336,7 @@ share/locale/dz/LC_MESSAGES/brasero.mo
 share/locale/el/LC_MESSAGES/brasero.mo
 share/locale/en@shaw/LC_MESSAGES/brasero.mo
 share/locale/en_GB/LC_MESSAGES/brasero.mo
+share/locale/eo/LC_MESSAGES/brasero.mo
 share/locale/es/LC_MESSAGES/brasero.mo
 share/locale/et/LC_MESSAGES/brasero.mo
 share/locale/eu/LC_MESSAGES/brasero.mo
@@ -346,6 +351,7 @@ share/locale/hu/LC_MESSAGES/brasero.mo
 share/locale/id/LC_MESSAGES/brasero.mo
 share/locale/it/LC_MESSAGES/brasero.mo
 share/locale/ja/LC_MESSAGES/brasero.mo
+share/locale/kk/LC_MESSAGES/brasero.mo
 share/locale/kn/LC_MESSAGES/brasero.mo
 share/locale/ko/LC_MESSAGES/brasero.mo
 share/locale/ku/LC_MESSAGES/brasero.mo
@@ -355,6 +361,7 @@ share/locale/mai/LC_MESSAGES/brasero.mo
 share/locale/mk/LC_MESSAGES/brasero.mo
 share/locale/ml/LC_MESSAGES/brasero.mo
 share/locale/mr/LC_MESSAGES/brasero.mo
+share/locale/ms/LC_MESSAGES/brasero.mo
 share/locale/nb/LC_MESSAGES/brasero.mo
 share/locale/nds/LC_MESSAGES/brasero.mo
 share/locale/nl/LC_MESSAGES/brasero.mo
@@ -367,6 +374,7 @@ share/locale/pt/LC_MESSAGES/brasero.mo
 share/locale/pt_BR/LC_MESSAGES/brasero.mo
 share/locale/ro/LC_MESSAGES/brasero.mo
 share/locale/ru/LC_MESSAGES/brasero.mo
+share/locale/sk/LC_MESSAGES/brasero.mo
 share/locale/sl/LC_MESSAGES/brasero.mo
 share/locale/sr/LC_MESSAGES/brasero.mo
 share/locale/sr@latin/LC_MESSAGES/brasero.mo
@@ -375,6 +383,7 @@ share/locale/ta/LC_MESSAGES/brasero.mo
 share/locale/te/LC_MESSAGES/brasero.mo
 share/locale/th/LC_MESSAGES/brasero.mo
 share/locale/tr/LC_MESSAGES/brasero.mo
+share/locale/ug/LC_MESSAGES/brasero.mo
 share/locale/uk/LC_MESSAGES/brasero.mo
 share/locale/vi/LC_MESSAGES/brasero.mo
 share/locale/zh_CN/LC_MESSAGES/brasero.mo
@@ -391,9 +400,11 @@ share/omf/brasero/brasero-en_GB.omf
 share/omf/brasero/brasero-es.omf
 share/omf/brasero/brasero-fi.omf
 share/omf/brasero/brasero-fr.omf
+share/omf/brasero/brasero-gl.omf
 share/omf/brasero/brasero-it.omf
 share/omf/brasero/brasero-pl.omf
 share/omf/brasero/brasero-ru.omf
+share/omf/brasero/brasero-sl.omf
 share/omf/brasero/brasero-sv.omf
 share/omf/brasero/brasero-zh_CN.omf
 share/omf/brasero/brasero-zh_HK.omf
diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo
index 83265215a97..9a4e85dd1de 100644
--- a/sysutils/brasero/distinfo
+++ b/sysutils/brasero/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.9 2010/07/06 15:23:59 drochner Exp $
+$NetBSD: distinfo,v 1.10 2011/01/11 15:27:25 drochner Exp $
 
-SHA1 (brasero-2.30.2.tar.bz2) = 2250f8174ff5f253beb99b1ef6e21aeddcbc10ff
-RMD160 (brasero-2.30.2.tar.bz2) = a0073be5e56afe22d3838df2fb120e0898742e2e
-Size (brasero-2.30.2.tar.bz2) = 4460261 bytes
-SHA1 (patch-ah) = 985d7defd928ee186e53864fec6da8b3e377a9e0
+SHA1 (brasero-2.32.1.tar.bz2) = 56141108561f2b8d45998662b86cf6e20f0ff4f2
+RMD160 (brasero-2.32.1.tar.bz2) = 0acfcc53077cbbdaa5e0e593f290c41825f72838
+Size (brasero-2.32.1.tar.bz2) = 4530933 bytes
+SHA1 (patch-ah) = 8caa999a276674bfc0512fc414ee08ab3f8f185e
 SHA1 (patch-aj) = 31928e19cfcc2612bd0826f0a89a23eb7b378c7f
 SHA1 (patch-ak) = 3db8ae8a44083aff6519f0be173b31f50d2ed3e6
+SHA1 (patch-al) = 185f31a3b59de0d65c0b7134db1fcd44061e5a43
 SHA1 (patch-ba) = 1e314b690f72c767f553bcfb8360076f61b0a8b8
diff --git a/sysutils/brasero/patches/patch-ah b/sysutils/brasero/patches/patch-ah
index 024f34dff64..03222172be4 100644
--- a/sysutils/brasero/patches/patch-ah
+++ b/sysutils/brasero/patches/patch-ah
@@ -1,25 +1,26 @@
-$NetBSD: patch-ah,v 1.3 2010/07/06 15:23:59 drochner Exp $
+$NetBSD: patch-ah,v 1.4 2011/01/11 15:27:26 drochner Exp $
 
---- nautilus/Makefile.in.orig	2010-04-26 23:29:14.000000000 +0000
+--- nautilus/Makefile.in.orig	2010-11-15 16:04:32.000000000 +0000
 +++ nautilus/Makefile.in
-@@ -72,9 +72,7 @@ am__installdirs = "$(DESTDIR)$(nautilus_
+@@ -71,10 +71,7 @@ am__installdirs = "$(DESTDIR)$(nautilus_
+ 	"$(DESTDIR)$(desktopdir)"
  LTLIBRARIES = $(nautilus_extension_LTLIBRARIES)
  am__DEPENDENCIES_1 =
- libnautilus_brasero_extension_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1) ../libbrasero-utils/libbrasero-utils.la \
--	../libbrasero-media/libbrasero-media.la \
--	../libbrasero-burn/libbrasero-burn.la
-+	$(am__DEPENDENCIES_1)
+-libnautilus_brasero_extension_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	../libbrasero-utils/libbrasero-utils@BRASERO_LIBRARY_SUFFIX@.la \
+-	../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la \
+-	../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
++libnautilus_brasero_extension_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
  am_libnautilus_brasero_extension_la_OBJECTS = nautilus-burn-bar.lo \
- 	nautilus-burn-extension.lo brasero-project-name.lo
- libnautilus_brasero_extension_la_OBJECTS =  \
-@@ -368,9 +366,10 @@ libnautilus_brasero_extension_la_SOURCES
+ 	nautilus-burn-extension.lo brasero-project-name.lo \
+ 	brasero-drive-settings.lo
+@@ -371,9 +368,10 @@ libnautilus_brasero_extension_la_SOURCES
+ 
  libnautilus_brasero_extension_la_LIBADD = \
- 	$(BRASERO_GCONF_CFLAGS)	\
  	$(NAUTILUS_EXTENSION_LIBS)		\
--	../libbrasero-utils/libbrasero-utils.la	\
--	../libbrasero-media/libbrasero-media.la	\
--	../libbrasero-burn/libbrasero-burn.la
+-	../libbrasero-utils/libbrasero-utils@BRASERO_LIBRARY_SUFFIX@.la	\
+-	../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la	\
+-	../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
 +	-L$(prefix)/lib -Wl,-R$(prefix)/lib \
 +	-lbrasero-utils \
 +	-lbrasero-media \
diff --git a/sysutils/brasero/patches/patch-al b/sysutils/brasero/patches/patch-al
new file mode 100644
index 00000000000..b4adebc90bb
--- /dev/null
+++ b/sysutils/brasero/patches/patch-al
@@ -0,0 +1,15 @@
+$NetBSD: patch-al,v 1.1 2011/01/11 15:27:26 drochner Exp $
+
+--- configure.orig	2010-11-15 16:04:30.000000000 +0000
++++ configure
+@@ -11223,8 +11223,8 @@ install-data-am: install-gsettings-schem
+ .SECONDARY: $(gsettings_SCHEMAS)
+ 
+ gsettings__base_list = \
+-  sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
+-  sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
++  gsed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
++  gsed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
+ 
+ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+ 	@$(NORMAL_INSTALL)