Update eog to 2.26.0.

Version 2.26.0
--------------

New and updated translations:

- Runa Bhattacharjee [bn_IN]
- Kenneth Nielsen, Ask H. Larsen [da]
- Suso Baleato, Ignacio Casal Quinteiro [gl]
- Yaron Shahrabani [he]
- Rajesh Ranjan [hi]
- Žygimantas Beručka, Gintautas Miliauskas [lt]
- Rajesh Ranjan [mai]
- Ani Peter [ml]
- Sandeep Shedmake [mr]
- Manoj Kumar Giri [or]
- Duarte Loreto [pt]
- Nickolay V. Shmyrev [ru]
- I. Felix [ta]
- Krishna Babu K, Krishnababu K [te]

New and updated manual translations:

- Kenneth Nielsen [da]
- Philip Withnall [en_GB]
- Milo Casagrande [it]
- Łukasz Jernaś [pl]

Version 2.25.92
---------------

  * Code improvements / fixes (Christian Persch, Claudio Saavedra)
  * Typo fixes in UI / docs (Milo Casagrande, Łukasz Jernaś)

Bug fixes:

  #550086, Rotate image counterclockwise shortcut (Felix Riemann)
  #558086, simplify drag targets handling (Christian Persch)
  #572410, eog crashed with SIGSEGV in g_closure_invoke() (Claudio Saavedra)
  #572723, Misspelled word in a window (Milo Casagrande)
  #572889, Possible typo (Łukasz Jernaś)

New and updated translations:

- Jordi Mas, David Planella [ca]
- Petr Kovar, Adrian Gunis [cs]
- Marios Zindilis, Simos Xenitellis [el]
- David Lodge, Philip Withnall [en_GB]
- Ivar Smolin [et]
- Claude Paroz [fr]
- Sweta Kothari [gu]
- Milo Casagrande [it]
- Shankar Prasad [kn]
- Changwoo Ryu [ko]
- Manoj Kumar Giri [or]
- Adi Roiban, Jani Monoses [ro]

New and updated manual translations:

- Joan Duran [ca]
- Jorge Gonzalez [es]
- Daniel Nylander [sv]

Version 2.25.91
---------------

  * Additional workaround for CVE-2008-5978 (Morten Welinder)

Bug fixes:

  #569228, eog: untrusted python modules search path (Morten Welinder)

New and updated translations:

- Ihar Hrachyshka [be@latin]
- Alexander Shopov [bg]
- Kenneth Nielsen [da]
- Christian Kirbach [de]
- Iñaki Larrañaga Murgoitio [eu]
- Gabor Kelemen [hu]
- Takeshi AIHANA [ja]
- Kjartan Maraas [nb]
- Wouter Bolsterlee [nl]
- Tomasz Dominikowski [pl]
- Duarte Loreto [pt]
- Adi Roiban, Jani Monoses [ro]
- Daniel Nylander [sv]
- Theppitak Karoonboonyanan [th]
- Clytie Siddall [vi]

New and updated manual translations:

- Ask. H. Larsen [da]
- Daniel Nylander [sv]

Version 2.25.90
---------------

  * Support for deleting files that can't be trashed (Claudio Saavedra)
  * Build system improvements / fixes (Luis Medinas, Felix Riemann)
  * Code improvements / fixes (Christian Persch, Joaquim Rocha)

Bug fixes:

  #441637, Patch to delete file when Trash isn't found (Claudio Saavedra)
  #568410, eog 2.25.5 build fails (Felix Riemann)
  #568882, don't rely on gtk implementation details (Christian Persch)
  #569657, Eog needs update on data/eog.pc.in (Luis Medinas)
  #569855, Unref on thumbnail manipulator functions (Joaquim Rocha)

New and updated translations:

- Jordi Mas, Gil Forcada [ca]
- Andre Klapper [de]
- Jorge González [es]
- Ilkka Tuohela [fi]
- Changwoo Ryu [ko]
- Krix Apolinário, Og Maciel, Henrique P. Machado, César Veiga [pt_BR]
- Chao-Hsiung Liao [zh_HK]
- Chao-Hsiung Liao [zh_TW]

New and updated manual translations:

- Andre Klapper [de]

Version 2.25.5
--------------

  * Code improvements / fixes (Felix Riemann)
  * Drop libgnome dependency (Felix Riemann)

Bug fixes:

  #559500, drop libgnome dependency (Felix Riemann)
  #557662, Cannot build doc without exif enabled. (Arun Raghavan)
  #566104, Reverse Left/Right arrows action in RTL mode (Khaled Hosny)
  #566190, scroll buttons of the icons navigation window are reversed for
           RTL locales (Yair Hershkovitz)

New and updated translations:

- Gil Forcada, Jordi Mas [ca]
- Marios Zindilis [el]
- Jorge Gonzalez, Jorge González [es]
- Kjartan Maraas [nb]
- Nurali, Nurali Abdurahmonov [uz]

Version 2.25.4
--------------

  * Code improvements / fixes (Felix Riemann)
  * Python bindings improvements (Felix Riemann)

Bug fixes:

  #566367, no weekday calculation in exif date display (Felix Riemann)

New and updated translations:

- Ivar Smolin [et]
- Gabor Kelemen [hu]
- Kjartan Maraas [nb]

New and updated manual translations:

- Jorge Gonzalez [es]

Versio 2.25.3
--------------

  * Build system improvements (Daniel Macks, Felix Riemann)
  * Code improvements / fixes (Claudio Saavedra, Friedrich Oslage, Tom Parker)
  * Fetch tooltip data asynchronously (Claudio Saavedra)
  * UI enhancements (Bob Mauchin, Robin Sonefors)

Bug fixes:

  #514352, HIG says "Page Setup" not "Page Setup..." (Bob Mauchin)
  #555480, Add a delete button (Robin Sonefors)
  #558442, eog should load image tooltips data asynchronously (Claudio Saavedra)
  #560070, Sub-optimal -I flag ordering (Daniel Macks)
  #560073, Poor linking against convenience libs (Daniel Macks, Felix Riemann)
  #563570, GNOME Goal: Clean up GLib and GTK+ includes (Claudio Saavedra)
  #564290, eog_image_load doesn't correctly clear errors on read issues
           (Tom Parker)
  #564526, eog SIGBUS on sparc (Friedrich Oslage)

New and updated translations:

- Jorge González [es]
- Mark Krapivner, Yair Hershkovitz [he]
- Daniel Nylander [sv]

Version 2.25.2
--------------

 * Build system fixes / improvements (Felix Riemann, Kjartan Maraas)
 * Workarounds to make remote images work again (Felix Riemann)
 * Fix broken keyboard keys (Frederic Peters)
 * String improvements (Luca Ferretti)
 * Code improvements (Felix Riemann)

Bug fixes:

-   #559579, Don't use "wallpaper" term deprecated by GDP style guide (Luca Ferretti)
-   #560065, Build failure: local variable-name collides with system-header symbol (Felix Riemann)
-   #560068, Insufficient check for libz (Felix Riemann)
-   #560336, need to update the eggtreemultidnd.[ch] copy from libegg (Felix Riemann)
-   #560396, can't open menu with keyboard when no image is shown (Frederic Peters)
-   #562119, eog doesn't open remote images (Felix Riemann)

New and updated translations:

- Jorge González [es]

Version 2.25.1
--------------

 * Improvements to the JPEG metadata reader (Felix Riemann)
 * Fix progress reporting when images only need copying during "Save As" (Felix Riemann)
 * Fix some critical warnings (Claudio Saavedra, Vincent Untz)
 * Do not open some images at 98% or 99% (Felix Riemann)
 * Install metadata related headers properly (Pierre-Luc Beaudoin)
 * Avoid possible markup "injection attack" (Martin Olsson)
 * Copy non-local images locally when setting them as wallpaper (Claudio Saavedra)
 * Allow DnD without an enabled collection (Claudio Saavedra)
 * Use less deprecated APIs (Felix Riemann, Diego Escalante Urrelo)
 * Code & Docs cleanups + improvements

Bug fixes:

-   #553232, copy remote wallpapers locally (Claudio Saavedra)
-   #476709, I need to drag & drop images from eog's simple viewer (Claudio Saavedra)
-   #530447, Eye of GNOME opens images resized at 98% or 99% zoom (Felix Riemann)
-   #555940, eog is vulnerable to pango injection attack :-) (Martin Olsson)
-   #555942, Not all public EXIF API headers are installed (Pierre-Luc Beaudoin)
-   #556086, Use gtk_show_uri instead of gnome_help (Diego Escalante Urrelo)
-   #555916, drop libglade dependency; use GtkBuilder (Felix Riemann)
-   #556029, Drop gnome-desktop dependency (Felix Riemann)

New and updated translations:

- OsamaKhalid [ar]
- Alexander Shopov [bg]
- Adrian Guniš [cs]
- Pierros Papadeas [el]
- Takeshi AIHANA [ja]
- Jovan Naumovski [mk]
- Wouter Bolsterlee [nl]
- Vladimir Melo [pt_BR]
- Laurent Dhima [sq]
- Daniel Nylander [sv]
- Maxim Dziumanenko [uk]

New and updated manual translations:

- Osama K [ar]
- Mario Blättermann [de]
- Sira Nokyoongtong [th]

5 files changed, 58 insertions, 25 deletions

diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 1e4d24aa413..38204b2bcfd 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2009/01/14 15:19:38 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2009/03/16 23:09:18 jmcneill Exp $
 #
 
-DISTNAME=	eog-2.24.3.1
+DISTNAME=	eog-2.26.0
 CATEGORIES=	graphics gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eog/2.24/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eog/2.26/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -19,6 +19,14 @@ USE_PKGLOCALEDIR=	YES
 
 GCONF_SCHEMAS=	eog.schemas
 
+# The gettext version in pkgsrc cannot handle the .po files, so
+# we strip out usage of the newer features (context and fuzzy matches)
+post-patch:
+	for f in ${WRKSRC}/po/*.po ${WRKSRC}/help/*/*.po ; do \
+		mv $$f $$f.original ; \
+		${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
+	done
+
 .include "../../devel/GConf/schemas.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.15.3
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/graphics/eog/PLIST b/graphics/eog/PLIST
index 629d8046cdd..9d596a8b33d 100644
--- a/graphics/eog/PLIST
+++ b/graphics/eog/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.9 2008/10/25 00:23:03 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/03/16 23:09:18 jmcneill 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-enums.h
 include/eog-2.20/eog/eog-error-message-area.h
 include/eog-2.20/eog/eog-exif-details.h
 include/eog-2.20/eog/eog-exif-util.h
@@ -31,9 +32,9 @@ lib/eog/plugins/reload.eog-plugin
 lib/eog/plugins/statusbar-date.eog-plugin
 lib/pkgconfig/eog.pc
 share/applications/eog.desktop
-share/eog/eog-image-properties-dialog.glade
-share/eog/eog-multiple-save-as-dialog.glade
-share/eog/eog-preferences-dialog.glade
+share/eog/eog-image-properties-dialog.ui
+share/eog/eog-multiple-save-as-dialog.ui
+share/eog/eog-preferences-dialog.ui
 share/eog/eog-toolbar.xml
 share/eog/eog-ui.xml
 share/eog/gtkrc
@@ -111,6 +112,10 @@ 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
 share/gnome/help/eog/pa/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/pl/eog.xml
+share/gnome/help/eog/pl/figures/eog_save_as_window.png
+share/gnome/help/eog/pl/figures/eog_start_window.png
+share/gnome/help/eog/pl/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/pt_BR/eog.xml
 share/gnome/help/eog/pt_BR/figures/eog_save_as_window.png
 share/gnome/help/eog/pt_BR/figures/eog_start_window.png
@@ -145,7 +150,7 @@ share/gtk-doc/html/eog/EogExifDetails.html
 share/gtk-doc/html/eog/EogFileChooser.html
 share/gtk-doc/html/eog/EogImage.html
 share/gtk-doc/html/eog/EogImageSaveInfo.html
-share/gtk-doc/html/eog/EogJobSaveAs.html
+share/gtk-doc/html/eog/EogJobCopy.html
 share/gtk-doc/html/eog/EogListStore.html
 share/gtk-doc/html/eog/EogMessageArea.html
 share/gtk-doc/html/eog/EogMetadataReaderJpg.html
@@ -246,6 +251,7 @@ share/locale/ks/LC_MESSAGES/eog.mo
 share/locale/ku/LC_MESSAGES/eog.mo
 share/locale/lt/LC_MESSAGES/eog.mo
 share/locale/lv/LC_MESSAGES/eog.mo
+share/locale/mai/LC_MESSAGES/eog.mo
 share/locale/mg/LC_MESSAGES/eog.mo
 share/locale/mk/LC_MESSAGES/eog.mo
 share/locale/ml/LC_MESSAGES/eog.mo
@@ -281,6 +287,8 @@ share/locale/tk/LC_MESSAGES/eog.mo
 share/locale/tr/LC_MESSAGES/eog.mo
 share/locale/ug/LC_MESSAGES/eog.mo
 share/locale/uk/LC_MESSAGES/eog.mo
+share/locale/uz/LC_MESSAGES/eog.mo
+share/locale/uz@cyrillic/LC_MESSAGES/eog.mo
 share/locale/vi/LC_MESSAGES/eog.mo
 share/locale/wa/LC_MESSAGES/eog.mo
 share/locale/xh/LC_MESSAGES/eog.mo
@@ -302,6 +310,7 @@ 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-pl.omf
 share/omf/eog/eog-pt_BR.omf
 share/omf/eog/eog-ru.omf
 share/omf/eog/eog-sv.omf
@@ -310,12 +319,19 @@ share/omf/eog/eog-uk.omf
 share/omf/eog/eog-zh_CN.omf
 share/omf/eog/eog-zh_TW.omf
 @dirrm share/omf/eog
+@comment in rarian: @dirrm share/omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@comment in xdg-dirs: @dirrm share/icons
 @dirrm share/gtk-doc/html/eog
 @dirrm share/gnome/help/eog/zh_TW/figures
 @dirrm share/gnome/help/eog/zh_TW
@@ -331,6 +347,8 @@ share/omf/eog/eog-zh_TW.omf
 @dirrm share/gnome/help/eog/ru
 @dirrm share/gnome/help/eog/pt_BR/figures
 @dirrm share/gnome/help/eog/pt_BR
+@dirrm share/gnome/help/eog/pl/figures
+@dirrm share/gnome/help/eog/pl
 @dirrm share/gnome/help/eog/pa/figures
 @dirrm share/gnome/help/eog/pa
 @dirrm share/gnome/help/eog/oc/figures
@@ -360,6 +378,8 @@ share/omf/eog/eog-zh_TW.omf
 @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 gnome2-dirs: @dirrm share/gnome
 @comment in GConf: @dirrm share/gconf/schemas
 @dirrm share/eog/pixmaps
 @dirrm share/eog/icons/hicolor/scalable/actions
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index fe904c2f394..7e02f396e61 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.16 2009/01/14 15:19:38 wiz Exp $
+$NetBSD: distinfo,v 1.17 2009/03/16 23:09:18 jmcneill Exp $
 
-SHA1 (eog-2.24.3.1.tar.bz2) = b5415acbfe99d7ea31f5d12106f4b1817043a320
-RMD160 (eog-2.24.3.1.tar.bz2) = dd35387630d6ebc89b1bb776c8128be35210f58f
-Size (eog-2.24.3.1.tar.bz2) = 2253386 bytes
-SHA1 (patch-aa) = 092880938f9c91a154f9d97a758f5a25317724c9
+SHA1 (eog-2.26.0.tar.bz2) = 89a1f5d1477d5bdb283e28cc2bb52530417897ba
+RMD160 (eog-2.26.0.tar.bz2) = 5ff9a9b5d75a30f300fff019236162505902dd46
+Size (eog-2.26.0.tar.bz2) = 2418149 bytes
diff --git a/graphics/eog/files/msgfmtstrip b/graphics/eog/files/msgfmtstrip
new file mode 100644
index 00000000000..34550792cd1
--- /dev/null
+++ b/graphics/eog/files/msgfmtstrip
@@ -0,0 +1,18 @@
+# $Id: msgfmtstrip,v 1.1 2009/03/16 23:09:18 jmcneill Exp $
+# Simple awk script to strip out .po entries with "msgctxt" or "#~|", so the
+# resultant file can be handled by the msgfmt 0.14.4 in NetBSD 4.0
+{
+if (/^$/) { entry_end(); }
+else if ($1 == "msgctxt" || $2 == "msgctxt") { skip = 1; }
+else if ($1 == "#~|") { skip = 1; }
+else { entry = entry $0 "\n" }
+}
+
+END { entry_end(); }
+
+function entry_end() {
+    if (!skip)
+	print entry;
+    entry = "";
+    skip = 0;
+}
diff --git a/graphics/eog/patches/patch-aa b/graphics/eog/patches/patch-aa
deleted file mode 100644
index 241ee28cb45..00000000000
--- a/graphics/eog/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2008/12/15 19:56:26 drochner Exp $
-
---- src/eog-exif-util.c.orig	2008-10-20 18:31:54.000000000 +0200
-+++ src/eog-exif-util.c
-@@ -55,6 +55,7 @@ eog_exif_util_format_date_with_strptime 
- 
- 	if (p == date + strlen (date)) {
- 		/* A strftime-formatted string, to display the date the image was taken.  */
-+		mktime(&tm);
- 		dlen = strftime (tmp_date, DATE_BUF_SIZE * sizeof(gchar), _("%a, %d %B %Y  %X"), &tm);
- 		new_date = g_strndup (tmp_date, dlen);
- 	}