fix build with latest glib, same changes as in upstream git; ok pea@

news/pan/patches/patch-pan_data-impl_data-impl_cc

@@ -0,0 +1,12 @@
+$OpenBSD: patch-pan_data-impl_data-impl_cc,v 1.1 2012/03/29 12:09:55 naddy Exp $
+--- pan/data-impl/data-impl.cc.orig	Wed Mar 28 18:07:54 2012
++++ pan/data-impl/data-impl.cc	Wed Mar 28 18:08:12 2012
+@@ -24,7 +24,7 @@
+ #include <config.h>
+ extern "C" {
+   #include <glib/gi18n.h>
+-  #include <glib/gfileutils.h> // for g_build_filename
++  #include <glib.h> // for g_build_filename
+ }
+ #include <pan/general/debug.h>
+ #include <pan/general/file-util.h>

news/pan/patches/patch-pan_data_article-cache_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-pan_data_article-cache_h,v 1.1 2012/03/29 12:09:55 naddy Exp $
+--- pan/data/article-cache.h.orig	Wed Mar 28 17:47:17 2012
++++ pan/data/article-cache.h	Wed Mar 28 17:47:28 2012
+@@ -23,7 +23,7 @@
+ #include <map>
+ #include <vector>
+ extern "C" {
+-  #include <glib/gtypes.h> // for guint64
++  #include <glib.h> // for guint64
+ }
+ #include <pan/general/string-view.h>
+ #include <pan/general/quark.h>

news/pan/patches/patch-pan_general_file-util_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-pan_general_file-util_h,v 1.1 2012/03/29 12:09:55 naddy Exp $
+--- pan/general/file-util.h.orig	Wed Mar 28 17:35:12 2012
++++ pan/general/file-util.h	Wed Mar 28 18:15:22 2012
+@@ -25,7 +25,7 @@
+ extern "C" {
+   #include <stddef.h>
+   #include <stdio.h>
+-  #include <glib/gtypes.h>
++  #include <glib.h>
+   #include <glib/gstdio.h>
+ }
+ #include <pan/general/string-view.h>

news/pan/patches/patch-pan_general_locking_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-pan_general_locking_h,v 1.1 2012/03/29 12:09:55 naddy Exp $
+--- pan/general/locking.h.orig	Wed Mar 28 17:53:37 2012
++++ pan/general/locking.h	Wed Mar 28 17:53:46 2012
+@@ -22,7 +22,7 @@
+ #ifndef _Mutex_h_
+ #define _Mutex_h_
+ 
+-#include <glib/gthread.h>
++#include <glib.h>
+ 
+ namespace pan
+ {

news/pan/patches/patch-pan_general_macros_h

@@ -0,0 +1,20 @@
+$OpenBSD: patch-pan_general_macros_h,v 1.1 2012/03/29 12:09:55 naddy Exp $
+--- pan/general/macros.h.orig	Wed Mar 28 17:36:44 2012
++++ pan/general/macros.h	Wed Mar 28 17:39:43 2012
+@@ -62,15 +62,7 @@
+ 
+ extern "C"
+ {
+-  #include <glibconfig.h> // get the version
+-  #include <glib/gutils.h> // get GLIB_CHECK_VERSION
+-
+-  // pick up g_assert()
+-  #if GLIB_CHECK_VERSION(2,16,0)
+-    #include <glib/gtestutils.h>
+-  #else
+-    #include <glib/gmessages.h>
+-  #endif
++  #include <glib.h>
+ }
+ 
+ #endif

news/pan/patches/patch-pan_general_time-elapsed_h

@@ -0,0 +1,14 @@
+$OpenBSD: patch-pan_general_time-elapsed_h,v 1.1 2012/03/29 12:09:55 naddy Exp $
+--- pan/general/time-elapsed.h.orig	Wed Mar 28 18:06:09 2012
++++ pan/general/time-elapsed.h	Wed Mar 28 18:06:45 2012
+@@ -1,9 +1,7 @@
+ #ifndef __Time_Elapsed_h__
+ #define __Time_Elapsed_h__
+ 
+-#include <glib/gtypes.h> // for GTimeVal
+-#include <glib/gmain.h> // for g_get_current_time
+-#include <glib/gtimer.h> // for GUSEC_PER_SEC
++#include <glib.h> // for GTimeVal, g_get_current_time and GUSEC_PER_SEC
+ 
+ namespace pan
+ {

news/pan/patches/patch-pan_general_worker-pool_cc

@@ -0,0 +1,12 @@
+$OpenBSD: patch-pan_general_worker-pool_cc,v 1.1 2012/03/29 12:09:55 naddy Exp $
+--- pan/general/worker-pool.cc.orig	Wed Mar 28 17:41:49 2012
++++ pan/general/worker-pool.cc	Wed Mar 28 17:41:59 2012
+@@ -21,7 +21,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ #include <cassert>
+-#include <glib/gmain.h> // for g_idle_add
++#include <glib.h> // for g_idle_add
+ #include <pan/general/debug.h>
+ #include <pan/general/macros.h>
+ #include "worker-pool.h"

news/pan/patches/patch-pan_general_worker-pool_h

@@ -0,0 +1,13 @@
+$OpenBSD: patch-pan_general_worker-pool_h,v 1.1 2012/03/29 12:09:55 naddy Exp $
+--- pan/general/worker-pool.h.orig	Wed Mar 28 17:41:29 2012
++++ pan/general/worker-pool.h	Wed Mar 28 17:41:41 2012
+@@ -24,8 +24,7 @@
+ #define _Worker_Pool_H_
+ 
+ #include <set>
+-#include <glib/gtypes.h>
+-#include <glib/gthreadpool.h>
++#include <glib.h>
+ 
+ namespace pan
+ {

news/pan/patches/patch-pan_gui_render-bytes_cc

@@ -0,0 +1,9 @@
+$OpenBSD: patch-pan_gui_render-bytes_cc,v 1.1 2012/03/29 12:09:55 naddy Exp $
+--- pan/gui/render-bytes.cc.orig	Wed Mar 28 18:12:49 2012
++++ pan/gui/render-bytes.cc	Wed Mar 28 18:13:08 2012
+@@ -1,4 +1,4 @@
+-#include <glib/gutils.h> // g_snprintf
++#include <glib.h> // g_snprintf
+ #include "render-bytes.h"
+ 
+ namespace pan

news/pan/patches/patch-pan_gui_render-bytes_h

@@ -0,0 +1,11 @@
+$OpenBSD: patch-pan_gui_render-bytes_h,v 1.1 2012/03/29 12:09:55 naddy Exp $
+--- pan/gui/render-bytes.h.orig	Wed Mar 28 18:11:32 2012
++++ pan/gui/render-bytes.h	Wed Mar 28 18:11:42 2012
+@@ -1,6 +1,6 @@
+ #ifndef RENDER_BYTES_H
+ #define RENDER_BYTES_H
+-#include <glib/gtypes.h>
++#include <glib.h>
+ namespace pan {
+   extern char* render_bytes (guint64);
+ }

news/pan/patches/patch-pan_tasks_socket-impl-gio_h

@@ -0,0 +1,13 @@
+$OpenBSD: patch-pan_tasks_socket-impl-gio_h,v 1.1 2012/03/29 12:09:55 naddy Exp $
+--- pan/tasks/socket-impl-gio.h.orig	Wed Mar 28 17:59:47 2012
++++ pan/tasks/socket-impl-gio.h	Wed Mar 28 17:59:59 2012
+@@ -21,8 +21,7 @@
+ #define __SocketGIO_h__
+ 
+ #include <string>
+-#include <glib/giochannel.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ #include <pan/tasks/socket.h>
+ 
+ namespace pan

news/pan/patches/patch-pan_usenet-utils_mime-utils_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-pan_usenet-utils_mime-utils_h,v 1.3 2012/03/29 12:09:55 naddy Exp $
+--- pan/usenet-utils/mime-utils.h.orig	Wed Mar 28 17:43:38 2012
++++ pan/usenet-utils/mime-utils.h	Wed Mar 28 17:43:47 2012
+@@ -21,7 +21,7 @@
+ #define _UtilMime_h_
+ 
+ #include <vector>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gmime/gmime-filter.h>
+ #include <gmime/gmime-stream.h>
+ #include <gmime/gmime-message.h>

news/pan/patches/patch-pan_usenet-utils_text-massager_cc

@@ -0,0 +1,11 @@
+$OpenBSD: patch-pan_usenet-utils_text-massager_cc,v 1.1 2012/03/29 12:09:55 naddy Exp $
+--- pan/usenet-utils/text-massager.cc.orig	Wed Mar 28 17:45:00 2012
++++ pan/usenet-utils/text-massager.cc	Wed Mar 28 17:45:32 2012
+@@ -25,7 +25,6 @@
+ extern "C" {
+ #include <glib/gi18n.h>
+ }
+-#include <glib/gunicode.h>
+ #include "text-massager.h"
+ #include <pan/general/log.h>
+ using namespace pan;