update to 2.20.2

This switches to the new gnome-2.20 branch.

5 files changed, 91 insertions, 30 deletions

diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index f124f2b0d35..2120e0ad88b 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2007/09/21 13:03:48 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2007/11/03 16:22:56 drochner Exp $
 #
 
-DISTNAME=	eog-2.18.2
-PKGREVISION=	4
+DISTNAME=	eog-2.20.2
 CATEGORIES=	graphics gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eog/2.18/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eog/2.20/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -31,6 +30,8 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.20.0
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
@@ -39,6 +40,8 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+BUILDLINK_API_DEPENDS.shared-mime-info+= shared-mime-info>=0.20
+.include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
diff --git a/graphics/eog/PLIST b/graphics/eog/PLIST
index ee5e43523b6..8770b843dd9 100644
--- a/graphics/eog/PLIST
+++ b/graphics/eog/PLIST
@@ -1,8 +1,42 @@
-@comment $NetBSD: PLIST,v 1.4 2007/09/25 10:54:13 hira Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/11/03 16:22:56 drochner Exp $
 bin/eog
+include/eog-2.20/eog/eog-application.h
+include/eog-2.20/eog/eog-debug.h
+include/eog-2.20/eog/eog-dialog.h
+include/eog-2.20/eog/eog-error-message-area.h
+include/eog-2.20/eog/eog-file-chooser.h
+include/eog-2.20/eog/eog-image-save-info.h
+include/eog-2.20/eog/eog-image.h
+include/eog-2.20/eog/eog-job-queue.h
+include/eog-2.20/eog/eog-jobs.h
+include/eog-2.20/eog/eog-list-store.h
+include/eog-2.20/eog/eog-message-area.h
+include/eog-2.20/eog/eog-plugin.h
+include/eog-2.20/eog/eog-properties-dialog.h
+include/eog-2.20/eog/eog-scroll-view.h
+include/eog-2.20/eog/eog-sidebar.h
+include/eog-2.20/eog/eog-statusbar.h
+include/eog-2.20/eog/eog-thumb-nav.h
+include/eog-2.20/eog/eog-thumb-view.h
+include/eog-2.20/eog/eog-thumbnail.h
+include/eog-2.20/eog/eog-transform.h
+include/eog-2.20/eog/eog-window.h
+lib/pkgconfig/eog.pc
 share/applications/eog.desktop
-share/eog/eog-gtk-ui.xml
-share/eog/glade/eog.glade
+share/eog/eog-toolbar.xml
+share/eog/eog-ui.xml
+share/eog/eog.glade
+share/eog/gtkrc
+share/eog/icons/hicolor/16x16/actions/eog-image-collection.png
+share/eog/icons/hicolor/16x16/actions/eog-plugin.png
+share/eog/icons/hicolor/22x22/actions/eog-image-collection.png
+share/eog/icons/hicolor/22x22/actions/eog-plugin.png
+share/eog/icons/hicolor/24x24/actions/eog-image-collection.png
+share/eog/icons/hicolor/32x32/actions/eog-image-collection.png
+share/eog/icons/hicolor/32x32/actions/eog-plugin.png
+share/eog/icons/hicolor/scalable/actions/eog-image-collection.svg
+share/eog/icons/hicolor/scalable/actions/eog-plugin.svg
+share/eog/pixmaps/thumbnail-frame.png
 share/gconf/schemas/eog.schemas
 share/gnome/help/eog/C/eog.xml
 share/gnome/help/eog/C/figures/eog_save_as_window.png
@@ -24,14 +58,17 @@ share/gnome/help/eog/fr/eog.xml
 share/gnome/help/eog/fr/figures/eog_save_as_window.png
 share/gnome/help/eog/fr/figures/eog_start_window.png
 share/gnome/help/eog/it/eog.xml
+share/gnome/help/eog/it/figures/eog_save_as_window.png
 share/gnome/help/eog/it/figures/eog_start_window.png
-share/gnome/help/eog/it/legal.xml
 share/gnome/help/eog/ja/eog.xml
 share/gnome/help/eog/ja/figures/eog_start_window.png
 share/gnome/help/eog/ja/legal.xml
 share/gnome/help/eog/ko/eog.xml
+share/gnome/help/eog/ko/figures/eog_save_as_window.png
 share/gnome/help/eog/ko/figures/eog_start_window.png
-share/gnome/help/eog/ko/legal.xml
+share/gnome/help/eog/oc/eog.xml
+share/gnome/help/eog/oc/figures/eog_save_as_window.png
+share/gnome/help/eog/oc/figures/eog_start_window.png
 share/gnome/help/eog/pa/eog.xml
 share/gnome/help/eog/pa/figures/eog_save_as_window.png
 share/gnome/help/eog/pa/figures/eog_start_window.png
@@ -63,6 +100,7 @@ share/locale/am/LC_MESSAGES/eog.mo
 share/locale/ar/LC_MESSAGES/eog.mo
 share/locale/az/LC_MESSAGES/eog.mo
 share/locale/be/LC_MESSAGES/eog.mo
+share/locale/be@latin/LC_MESSAGES/eog.mo
 share/locale/bg/LC_MESSAGES/eog.mo
 share/locale/bn/LC_MESSAGES/eog.mo
 share/locale/bn_IN/LC_MESSAGES/eog.mo
@@ -118,6 +156,7 @@ share/locale/pt_BR/LC_MESSAGES/eog.mo
 share/locale/ro/LC_MESSAGES/eog.mo
 share/locale/ru/LC_MESSAGES/eog.mo
 share/locale/rw/LC_MESSAGES/eog.mo
+share/locale/si/LC_MESSAGES/eog.mo
 share/locale/sk/LC_MESSAGES/eog.mo
 share/locale/sl/LC_MESSAGES/eog.mo
 share/locale/sq/LC_MESSAGES/eog.mo
@@ -125,6 +164,7 @@ share/locale/sr/LC_MESSAGES/eog.mo
 share/locale/sr@Latn/LC_MESSAGES/eog.mo
 share/locale/sv/LC_MESSAGES/eog.mo
 share/locale/ta/LC_MESSAGES/eog.mo
+share/locale/te/LC_MESSAGES/eog.mo
 share/locale/th/LC_MESSAGES/eog.mo
 share/locale/tk/LC_MESSAGES/eog.mo
 share/locale/tr/LC_MESSAGES/eog.mo
@@ -146,6 +186,7 @@ share/omf/eog/eog-fr.omf
 share/omf/eog/eog-it.omf
 share/omf/eog/eog-ja.omf
 share/omf/eog/eog-ko.omf
+share/omf/eog/eog-oc.omf
 share/omf/eog/eog-pa.omf
 share/omf/eog/eog-pt_BR.omf
 share/omf/eog/eog-ru.omf
@@ -153,9 +194,8 @@ share/omf/eog/eog-sv.omf
 share/omf/eog/eog-uk.omf
 share/omf/eog/eog-zh_CN.omf
 share/omf/eog/eog-zh_TW.omf
-share/pixmaps/gnome-eog.png
-@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/eog
+@comment in scrollkeeper: @dirrm share/omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
@@ -176,6 +216,8 @@ share/pixmaps/gnome-eog.png
 @dirrm share/gnome/help/eog/pt_BR
 @dirrm share/gnome/help/eog/pa/figures
 @dirrm share/gnome/help/eog/pa
+@dirrm share/gnome/help/eog/oc/figures
+@dirrm share/gnome/help/eog/oc
 @dirrm share/gnome/help/eog/ko/figures
 @dirrm share/gnome/help/eog/ko
 @dirrm share/gnome/help/eog/ja/figures
@@ -195,7 +237,22 @@ share/pixmaps/gnome-eog.png
 @dirrm share/gnome/help/eog/C/figures
 @dirrm share/gnome/help/eog/C
 @dirrm share/gnome/help/eog
+@comment in gnome2-dirs: @dirrm share/gnome/help
 @comment in GConf: @dirrm share/gconf/schemas
-@dirrm share/eog/glade
+@dirrm share/eog/pixmaps
+@dirrm share/eog/icons/hicolor/scalable/actions
+@dirrm share/eog/icons/hicolor/scalable
+@dirrm share/eog/icons/hicolor/32x32/actions
+@dirrm share/eog/icons/hicolor/32x32
+@dirrm share/eog/icons/hicolor/24x24/actions
+@dirrm share/eog/icons/hicolor/24x24
+@dirrm share/eog/icons/hicolor/22x22/actions
+@dirrm share/eog/icons/hicolor/22x22
+@dirrm share/eog/icons/hicolor/16x16/actions
+@dirrm share/eog/icons/hicolor/16x16
+@dirrm share/eog/icons/hicolor
+@dirrm share/eog/icons
 @dirrm share/eog
 @comment in xdg-dirs: @dirrm share/applications
+@dirrm include/eog-2.20/eog
+@dirrm include/eog-2.20
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index be9d15a30f9..32e77bfc584 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2007/09/20 20:48:57 wiz Exp $
+$NetBSD: distinfo,v 1.5 2007/11/03 16:22:56 drochner Exp $
 
-SHA1 (eog-2.18.2.tar.bz2) = d3fcca9f2a6b72f37d1a5d37561bd0eae54b730e
-RMD160 (eog-2.18.2.tar.bz2) = 9bc5286913e83058cf3b833493f0ed4cb218c1e7
-Size (eog-2.18.2.tar.bz2) = 1244477 bytes
-SHA1 (patch-aa) = 225c4c8dc0f2b66e81d07b9c7e64c9c90ce6d3e3
+SHA1 (eog-2.20.2.tar.bz2) = eca46e393cd02bf5156c30a6f64a9341e0a3bcca
+RMD160 (eog-2.20.2.tar.bz2) = 0c3bd4f85a76910e5c892b27ec02645de990e2fa
+Size (eog-2.20.2.tar.bz2) = 1656601 bytes
 SHA1 (patch-ab) = d75be607acda1586434b13721ca620326c516ecd
+SHA1 (patch-ac) = d3eb6261275131400c332285147bccbf82e8f1dc
diff --git a/graphics/eog/patches/patch-aa b/graphics/eog/patches/patch-aa
deleted file mode 100644
index f601656d26b..00000000000
--- a/graphics/eog/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/09/20 20:48:57 wiz Exp $
-
---- Makefile.in.orig	2007-05-28 20:21:14.000000000 +0200
-+++ Makefile.in
-@@ -276,7 +276,7 @@ desktop_in_files = eog.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- gladedir = $(datadir)/eog/glade
- glade_DATA = eog.glade
--schemasdir = $(sysconfdir)/gconf/schemas
-+schemasdir = $(datadir)/gconf/schemas
- schemas_in_files = eog.schemas.in
- schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
- icondir = $(datadir)/pixmaps
diff --git a/graphics/eog/patches/patch-ac b/graphics/eog/patches/patch-ac
new file mode 100644
index 00000000000..fa84b7b73b2
--- /dev/null
+++ b/graphics/eog/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2007/11/03 16:22:56 drochner Exp $
+
+--- src/main.c.orig	2007-10-15 21:19:11.000000000 +0200
++++ src/main.c
+@@ -218,7 +218,9 @@ main (int argc, char **argv)
+ 
+ 	load_files ();
+ 
++	gdk_threads_enter();
+ 	gtk_main ();
++	gdk_threads_leave();
+ 
+ 	gnome_accelerators_sync ();
+