[91934] trunk/dports/news/pan2
ryandesign at macports.org
ryandesign at macports.org
Fri Apr 13 09:19:59 PDT 2012
Revision: 91934
https://trac.macports.org/changeset/91934
Author: ryandesign at macports.org
Date: 2012-04-13 09:19:59 -0700 (Fri, 13 Apr 2012)
Log Message:
-----------
pan2: fix build with glib 2.32; see #34021
Modified Paths:
--------------
trunk/dports/news/pan2/Portfile
Added Paths:
-----------
trunk/dports/news/pan2/files/patch-glib-2.32.diff
Modified: trunk/dports/news/pan2/Portfile
===================================================================
--- trunk/dports/news/pan2/Portfile 2012-04-13 15:38:50 UTC (rev 91933)
+++ trunk/dports/news/pan2/Portfile 2012-04-13 16:19:59 UTC (rev 91934)
@@ -31,7 +31,7 @@
port:gtkspell2 \
port:libiconv
-patchfiles patch-pan-gui-gui.cc.diff
+patchfiles patch-glib-2.32.diff patch-pan-gui-gui.cc.diff
configure.ldflags-append -liconv
Added: trunk/dports/news/pan2/files/patch-glib-2.32.diff
===================================================================
--- trunk/dports/news/pan2/files/patch-glib-2.32.diff (rev 0)
+++ trunk/dports/news/pan2/files/patch-glib-2.32.diff 2012-04-13 16:19:59 UTC (rev 91934)
@@ -0,0 +1,150 @@
+--- pan/data/article-cache.h 2011-02-15 04:46:29.000000000 -0600
++++ pan/data/article-cache.h 2012-04-13 10:58:01.000000000 -0500
+@@ -23,7 +23,7 @@
+ #include <map>
+ #include <vector>
+ extern "C" {
+- #include <glib/gtypes.h> // for guint64
++ #include <glib.h>
+ }
+ #include <pan/general/string-view.h>
+ #include <pan/general/quark.h>
+--- pan/data-impl/data-impl.cc 2011-05-29 08:19:51.000000000 -0500
++++ pan/data-impl/data-impl.cc 2012-04-13 11:06:55.000000000 -0500
+@@ -24,7 +24,7 @@
+ #include <config.h>
+ extern "C" {
+ #include <glib/gi18n.h>
+- #include <glib/gfileutils.h> // for g_build_filename
++ #include <glib.h>
+ }
+ #include <pan/general/debug.h>
+ #include <pan/general/file-util.h>
+--- pan/general/file-util.h 2011-02-15 04:46:29.000000000 -0600
++++ pan/general/file-util.h 2012-04-13 10:49:32.000000000 -0500
+@@ -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>
+--- pan/general/locking.h 2011-02-15 04:46:29.000000000 -0600
++++ pan/general/locking.h 2012-04-13 11:04:12.000000000 -0500
+@@ -22,7 +22,7 @@
+ #ifndef _Mutex_h_
+ #define _Mutex_h_
+
+-#include <glib/gthread.h>
++#include <glib.h>
+
+ namespace pan
+ {
+--- pan/general/macros.h 2011-02-15 04:46:29.000000000 -0600
++++ pan/general/macros.h 2012-04-13 11:03:00.000000000 -0500
+@@ -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
+--- pan/general/time-elapsed.h 2011-02-15 04:46:29.000000000 -0600
++++ pan/general/time-elapsed.h 2012-04-13 11:08:16.000000000 -0500
+@@ -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>
+
+ namespace pan
+ {
+--- pan/general/worker-pool.cc 2011-02-15 04:46:29.000000000 -0600
++++ pan/general/worker-pool.cc 2012-04-13 10:54:06.000000000 -0500
+@@ -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>
+ #include <pan/general/debug.h>
+ #include <pan/general/macros.h>
+ #include "worker-pool.h"
+--- pan/general/worker-pool.h 2011-02-15 04:46:29.000000000 -0600
++++ pan/general/worker-pool.h 2012-04-13 10:54:57.000000000 -0500
+@@ -24,8 +24,7 @@
+ #define _Worker_Pool_H_
+
+ #include <set>
+-#include <glib/gtypes.h>
+-#include <glib/gthreadpool.h>
++#include <glib.h>
+
+ namespace pan
+ {
+--- pan/gui/render-bytes.cc 2011-02-15 04:46:29.000000000 -0600
++++ pan/gui/render-bytes.cc 2012-04-13 11:10:24.000000000 -0500
+@@ -1,4 +1,4 @@
+-#include <glib/gutils.h> // g_snprintf
++#include <glib.h>
+ #include "render-bytes.h"
+
+ namespace pan
+--- pan/gui/render-bytes.h 2011-02-15 04:46:29.000000000 -0600
++++ pan/gui/render-bytes.h 2012-04-13 11:09:34.000000000 -0500
+@@ -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);
+ }
+--- pan/tasks/socket-impl-gio.h 2011-02-15 04:46:29.000000000 -0600
++++ pan/tasks/socket-impl-gio.h 2012-04-13 11:05:49.000000000 -0500
+@@ -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
+--- pan/usenet-utils/mime-utils.h 2011-02-15 04:46:29.000000000 -0600
++++ pan/usenet-utils/mime-utils.h 2012-04-13 10:56:32.000000000 -0500
+@@ -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>
+--- pan/usenet-utils/text-massager.cc 2011-05-29 08:19:51.000000000 -0500
++++ pan/usenet-utils/text-massager.cc 2012-04-13 10:57:15.000000000 -0500
+@@ -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;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120413/393ea976/attachment.html>
More information about the macports-changes
mailing list