[149606] trunk/dports/gnome/anjuta

27 Jun 2016

Revision: 149606
          https://trac.macports.org/changeset/149606
Author:   devans@macports.org
Date:     2016-06-27 15:12:54 -0700 (Mon, 27 Jun 2016)
Log Message:
-----------
anjuta: update to version 3.20.0, add dependency on gnutls, blacklist compilers that do not support C11 redefinition of typedef, add variants +python34 +python35, default +python34, patch python loader plugin to fix python3 runtime issue.

Modified Paths:
--------------
    trunk/dports/gnome/anjuta/Portfile

Added Paths:
-----------
    trunk/dports/gnome/anjuta/files/patch-plugins-python-loader-plugin.c.diff

Property Changed:
----------------
    trunk/dports/gnome/anjuta/


Property changes on: trunk/dports/gnome/anjuta
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/anjuta:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/anjuta:108269-142425
/users/devans/GNOME-3/unstable/dports/gnome/anjuta:116619-118151,119539-125908,132270-134577
/users/devans/dports/gnome/anjuta:117797-117811
/users/rmstonecipher/gnome/anjuta:102363-103172
   + /branches/mld-qt-481/dports/gnome/anjuta:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/anjuta:108269-149603
/users/devans/GNOME-3/unstable/dports/gnome/anjuta:116619-118151,119539-125908,132270-134577
/users/devans/dports/gnome/anjuta:117797-117811
/users/rmstonecipher/gnome/anjuta:102363-103172

Modified: trunk/dports/gnome/anjuta/Portfile
===================================================================

--- trunk/dports/gnome/anjuta/Portfile	2016-06-27 22:08:38 UTC (rev 149605)
+++ trunk/dports/gnome/anjuta/Portfile	2016-06-27 22:12:54 UTC (rev 149606)
@@ -7,8 +7,7 @@
 PortGroup           muniversal 1.0
 
 name                anjuta
-version             3.18.2
-revision            2
+version             3.20.0
 license             GPL-2+
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         A GNOME/GTK IDE
@@ -21,8 +20,8 @@
 
 use_xz              yes
 
-checksums           rmd160  0c8289d057d2b1543032b34543668c539c461e47 \
-                    sha256  be864f2f1807e1b870697f646294e997d221d5984a135245543b719e501cef8e
+checksums           rmd160  34f28bc54b8331a8a110471a9b58c27fb4aa43ce \
+                    sha256  a676c587a28f784ec2096775460cd29fafc3f0216c53e0821641bcd9126b6935
 
 depends_build       port:pkgconfig \
                     port:intltool \
@@ -54,7 +53,8 @@
 patchfiles          patch-configure.ac.diff \
                     patch-python-cflags.diff \
                     python-ldflags.patch \
-                    patch-ltmain.sh.diff
+                    patch-ltmain.sh.diff \
+                    patch-plugins-python-loader-plugin.c.diff
 
 gobject_introspection yes
 
@@ -106,17 +106,22 @@
     depends_lib-append      port:vala
 }
 
-variant python27 conflicts python34 description {Use Python 2.7} {
+variant python27 conflicts python34 python35 description {Use Python 2.7} {
     configure.python        ${prefix}/bin/python2.7
     depends_lib-append      port:py27-gobject3
 }
 
-variant python34 conflicts python27 description {Use Python 3.4} {
+variant python34 conflicts python27 python35 description {Use Python 3.4} {
     configure.python        ${prefix}/bin/python3.4
     depends_lib-append      port:py34-gobject3
 }
 
-if {![variant_isset python27]} {
+variant python35 conflicts python27 python34 description {Use Python 3.5} {
+    configure.python        ${prefix}/bin/python3.5
+    depends_lib-append      port:py35-gobject3
+}
+
+if {![variant_isset python27] && ![variant_isset python35]} {
     default_variants +python34
 }
 

Copied: trunk/dports/gnome/anjuta/files/patch-plugins-python-loader-plugin.c.diff (from rev 149603, users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-plugins-python-loader-plugin.c.diff)
===================================================================
--- trunk/dports/gnome/anjuta/files/patch-plugins-python-loader-plugin.c.diff	                        (rev 0)
+++ trunk/dports/gnome/anjuta/files/patch-plugins-python-loader-plugin.c.diff	2016-06-27 22:12:54 UTC (rev 149606)
@@ -0,0 +1,42 @@
+--- plugins/python-loader/plugin.c.orig	2016-06-13 21:39:50.000000000 -0700
++++ plugins/python-loader/plugin.c	2016-06-13 22:11:53.000000000 -0700
+@@ -93,6 +93,12 @@
+ /* AnjutaPlugin functions
+  *---------------------------------------------------------------------------*/
+ 
++#if PY_MAJOR_VERSION >= 3
++#include <stdlib.h>
++
++static wchar_t *wargv;
++#endif
++
+ static gboolean
+ pyl_plugin_activate (AnjutaPlugin *plugin)
+ {
+@@ -112,7 +118,15 @@
+ 		return FALSE;
+ 	}
+ 
++#if PY_MAJOR_VERSION >= 3
++	char *s = argv[0];
++	size_t slen = sizeof (s);
++	wargv = (wchar_t *) calloc (slen + 1, sizeof (wchar_t));
++	mbstowcs (wargv, s, slen);
++	PySys_SetArgv (1, &wargv);
++#else
+ 	PySys_SetArgv (1, argv);
++#endif
+ 
+ 	/* Retrieve the Python type for anjuta plugin */
+ 	m = PyImport_ImportModule ("gi.repository.Anjuta");
+@@ -136,6 +150,10 @@
+ 		while (PyGC_Collect ())
+ 			;
+ 
++#if PY_MAJOR_VERSION >= 3
++		free (wargv);
++#endif
++
+ 		Py_Finalize ();
+ 	}
+

    

devans＠macports.org

tags

participants (1)