[92103] trunk/dports/science/gwyddion
ryandesign at macports.org
ryandesign at macports.org
Wed Apr 18 12:33:19 PDT 2012
Revision: 92103
https://trac.macports.org/changeset/92103
Author: ryandesign at macports.org
Date: 2012-04-18 12:33:18 -0700 (Wed, 18 Apr 2012)
Log Message:
-----------
gwyddion: fix build with glib 2.32; see #33966 (maintainer timeout)
Modified Paths:
--------------
trunk/dports/science/gwyddion/Portfile
Added Paths:
-----------
trunk/dports/science/gwyddion/files/patch-glib-2.32.diff
Modified: trunk/dports/science/gwyddion/Portfile
===================================================================
--- trunk/dports/science/gwyddion/Portfile 2012-04-18 19:12:36 UTC (rev 92102)
+++ trunk/dports/science/gwyddion/Portfile 2012-04-18 19:33:18 UTC (rev 92103)
@@ -32,6 +32,8 @@
port:fftw-3 \
port:gtkglext
+patchfiles patch-glib-2.32.diff
+
configure.args --disable-desktop-file-update \
--x-include=${prefix}/include \
--x-lib=${prefix}/lib
Added: trunk/dports/science/gwyddion/files/patch-glib-2.32.diff
===================================================================
--- trunk/dports/science/gwyddion/files/patch-glib-2.32.diff (rev 0)
+++ trunk/dports/science/gwyddion/files/patch-glib-2.32.diff 2012-04-18 19:33:18 UTC (rev 92103)
@@ -0,0 +1,176 @@
+--- app/gwymoduleutils-file.h (revision 13350)
++++ app/gwymoduleutils-file.h (revision 13351)
+@@ -22,7 +22,7 @@
+ #define __GWY_MODULEUTILS_FILE_H__
+
+ #include <string.h>
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <libgwyddion/gwycontainer.h>
+ #include <libprocess/datafield.h>
+
+--- app/gradient-editor.h (revision 13350)
++++ app/gradient-editor.h (revision 13351)
+@@ -21,7 +21,7 @@
+ #ifndef __GWY_APP_GRADIENT_EDITOR_H__
+ #define __GWY_APP_GRADIENT_EDITOR_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+--- app/settings.h (revision 13350)
++++ app/settings.h (revision 13351)
+@@ -22,7 +22,7 @@
+ #define __GWY_APP_SETTINGS_H__
+
+ #include <libgwyddion/gwycontainer.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+--- app/glmaterial-editor.h (revision 13350)
++++ app/glmaterial-editor.h (revision 13351)
+@@ -21,7 +21,7 @@
+ #ifndef __GWY_APP_GL_MATERIAL_EDITOR_H__
+ #define __GWY_APP_GL_MATERIAL_EDITOR_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+--- libgwymodule/gwymoduleenums.h (revision 13350)
++++ libgwymodule/gwymoduleenums.h (revision 13351)
+@@ -21,7 +21,7 @@
+ #ifndef __GWY_MODULE_ENUMS_H__
+ #define __GWY_MODULE_ENUMS_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+--- modules/file/err.h (revision 13350)
++++ modules/file/err.h (revision 13351)
+@@ -21,7 +21,7 @@
+ #define __GWY_FILE_ERR_H__
+
+ #include <errno.h>
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <libgwymodule/gwymodule-file.h>
+
+ /* I/O Errors */
+--- modules/file/gwytiff.h (revision 13350)
++++ modules/file/gwytiff.h (revision 13351)
+@@ -18,7 +18,7 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+-#include <glib/gutils.h>
++#include <glib.h>
+
+ /*
+ * This is a rudimentary built-in TIFF reader.
+--- libgwyddion/gwyddionenums.h (revision 13350)
++++ libgwyddion/gwyddionenums.h (revision 13351)
+@@ -21,7 +21,7 @@
+ #ifndef __GWYDDION_ENUMS_H__
+ #define __GWYDDION_ENUMS_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+--- libgwyddion/gwyversion.h.in (revision 13350)
++++ libgwyddion/gwyversion.h.in (revision 13351)
+@@ -21,7 +21,7 @@
+ #ifndef __GWY_VERSION_H__
+ #define __GWY_VERSION_H__
+
+-#include <glib/gtypes.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+--- libgwyddion/gwyexpr.h (revision 13350)
++++ libgwyddion/gwyexpr.h (revision 13351)
+@@ -21,7 +21,7 @@
+ #ifndef __GWY_EXPR_H__
+ #define __GWY_EXPR_H__
+
+-#include <glib/gerror.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+--- libgwyddion/gwymd5.h (revision 13350)
++++ libgwyddion/gwymd5.h (revision 13351)
+@@ -24,7 +24,7 @@
+ #ifndef __GWY_MD5_H__
+ #define __GWY_MD5_H__
+
+-#include <glib/gtypes.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+--- libgwyddion/gwyserializable.c (revision 13350)
++++ libgwyddion/gwyserializable.c (revision 13351)
+@@ -20,8 +20,6 @@
+
+ #include "config.h"
+ #include <string.h>
+-#include <glib-object.h>
+-#include <glib/gutils.h>
+
+ #include <libgwyddion/gwymacros.h>
+ #include <libgwyddion/gwyutils.h>
+--- libdraw/gwydrawenums.h (revision 13350)
++++ libdraw/gwydrawenums.h (revision 13351)
+@@ -21,7 +21,7 @@
+ #ifndef __GWY_DRAW_ENUMS_H__
+ #define __GWY_DRAW_ENUMS_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgwyddion/gwyenum.h>
+
+ G_BEGIN_DECLS
+--- libgwydgets/gwystock.h (revision 13350)
++++ libgwydgets/gwystock.h (revision 13351)
+@@ -21,7 +21,7 @@
+ #ifndef __GWY_STOCK_H__
+ #define __GWY_STOCK_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+--- libgwydgets/gwydgetenums.h (revision 13350)
++++ libgwydgets/gwydgetenums.h (revision 13351)
+@@ -21,7 +21,7 @@
+ #ifndef __GWY_GWYDGET_ENUMS_H__
+ #define __GWY_GWYDGET_ENUMS_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgwyddion/gwyenum.h>
+
+ G_BEGIN_DECLS
+--- libprocess/gwyprocessenums.h (revision 13350)
++++ libprocess/gwyprocessenums.h (revision 13351)
+@@ -21,7 +21,7 @@
+ #ifndef __GWY_PROCESS_ENUMS_H__
+ #define __GWY_PROCESS_ENUMS_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgwyddion/gwyenum.h>
+
+ G_BEGIN_DECLS
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120418/a9c903f4/attachment.html>
More information about the macports-changes
mailing list