Import of pkgsrc-2013Q2

sysutils/gnome-commander/patches/patch-aa

@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.2 2010/11/29 18:51:51 drochner Exp $
+
+--- configure.orig	2010-09-08 21:42:20.000000000 +0000
++++ configure
+@@ -17900,6 +17900,7 @@ if test "x$have_python" != "xno"; then
+ 
+ 
+ 
++if false; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a shared library depending on libpython" >&5
+ $as_echo_n "checking whether we can build a shared library depending on libpython... " >&6; }
+     rm -rf testpython
+@@ -17925,6 +17926,7 @@ EOF
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+ $as_echo "$result" >&6; }
+ fi
++fi
+ 
+ if test "x$have_python" != "xyes"; then
+     if test "x$enable_python" = "xyes"; then

sysutils/gnome-commander/patches/patch-src_dict.h

@@ -0,0 +1,28 @@
+$NetBSD: patch-src_dict.h,v 1.2 2012/12/23 03:23:20 dholland Exp $
+
+Pick up make_pair from the correct namespace; fixes clang build.
+
+--- src/dict.h.orig	2012-12-22 19:19:36.000000000 +0000
++++ src/dict.h
+@@ -55,8 +55,8 @@ class DICT
+ template <typename KEY, typename VAL>
+ inline void DICT<KEY,VAL>::add(const KEY k, const VAL &v)
+ {
+-    std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(make_pair(k,(const VAL *) NULL));
+-    std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(make_pair(v,(const KEY *) NULL));
++    std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(std::make_pair(k,(const VAL *) NULL));
++    std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(std::make_pair(v,(const KEY *) NULL));
+ 
+     if (k_pos.second)
+         k_pos.first->second = &v_pos.first->first;
+@@ -114,8 +114,8 @@ class DICT<T,T>
+ template <typename T>
+ inline void DICT<T,T>::add(const T k, const T &v)
+ {
+-    std::pair<typename T_COLL::iterator,bool> k_pos = t_coll.insert(make_pair(k,(T *) NULL));
+-    std::pair<typename T_COLL::iterator,bool> v_pos = t_coll.insert(make_pair(v,(T *) NULL));
++    std::pair<typename T_COLL::iterator,bool> k_pos = t_coll.insert(std::make_pair(k,(T *) NULL));
++    std::pair<typename T_COLL::iterator,bool> v_pos = t_coll.insert(std::make_pair(v,(T *) NULL));
+ 
+     if (k_pos.second)
+         k_pos.first->second = &v_pos.first->first;

sysutils/gnome-commander/patches/patch-src_gnome-cmd-user-actions.cc

@@ -0,0 +1,13 @@
+$NetBSD: patch-src_gnome-cmd-user-actions.cc,v 1.1 2013/04/27 23:07:35 joerg Exp $
+
+--- src/gnome-cmd-user-actions.cc.orig	2013-04-27 22:44:06.000000000 +0000
++++ src/gnome-cmd-user-actions.cc
+@@ -1130,7 +1130,7 @@ void command_root_mode (GtkMenuItem *men
+     argv[i++] = su;
+     if (need_c)
+         argv[i++] = "-c";
+-    argv[i++] = g_get_prgname ();
++    argv[i++] = const_cast<char *>(g_get_prgname ());
+     argv[i++] = NULL;
+ 
+     GError *error = NULL;

sysutils/gnome-commander/patches/patch-src_tags_gnome-cmd-tags-doc.cc

@@ -0,0 +1,12 @@
+$NetBSD: patch-src_tags_gnome-cmd-tags-doc.cc,v 1.1 2013/03/24 16:46:37 joerg Exp $
+
+--- src/tags/gnome-cmd-tags-doc.cc.orig	2013-03-21 10:22:58.000000000 +0000
++++ src/tags/gnome-cmd-tags-doc.cc
+@@ -40,6 +40,7 @@
+ 
+ #ifdef HAVE_GSF
+ #include <gsf/gsf-infile.h>
++#include <gsf/gsf-doc-meta-data.h>
+ #include <gsf/gsf-infile-msole.h>
+ #include <gsf/gsf-infile-zip.h>
+ #include <gsf/gsf-input-memory.h>

sysutils/gnome-commander/patches/patch-src_tags_gnome-cmd-tags-poppler.cc

@@ -0,0 +1,24 @@
+$NetBSD: patch-src_tags_gnome-cmd-tags-poppler.cc,v 1.1 2012/12/23 03:23:48 dholland Exp $
+
+Fix build with recent poppler. From Noud de Brouwer in PR 47096.
+
+--- src/tags/gnome-cmd-tags-poppler.cc~	2011-12-06 19:10:29.000000000 +0000
++++ src/tags/gnome-cmd-tags-poppler.cc
+@@ -41,7 +41,7 @@ using namespace std;
+ static regex_t rxDate;
+ static gboolean rxDate_OK;
+ 
+-static void noErrorReporting(int pos, char *msg, va_list args)
++static void noErrorReporting(void *, ErrorCategory, int pos, char *msg)
+ {
+ }
+ #endif
+@@ -52,7 +52,7 @@ void gcmd_tags_poppler_init()
+ #ifdef HAVE_PDF
+     rxDate_OK = regcomp (&rxDate, "^(D:)?([12][019][0-9][0-9]([01][0-9]([0-3][0-9]([012][0-9]([0-5][0-9]([0-5][0-9])?)?)?)?)?)", REG_EXTENDED)==0;
+ 
+-    setErrorFunction(noErrorReporting);
++    setErrorCallback(noErrorReporting, NULL);
+ #endif
+ }
+