[142781] trunk/dports/gnome/anjuta

[devans at macports.org]

Revision: 142781
          https://trac.macports.org/changeset/142781
Author:   devans at macports.org
Date:     2015-11-22 23:28:05 -0800 (Sun, 22 Nov 2015)
Log Message:
-----------
anjuta: minimize compile warnings and disable maintainer mode to fix SL build, correct +python27 conflicts.

Modified Paths:
--------------
    trunk/dports/gnome/anjuta/Portfile
    trunk/dports/gnome/anjuta/files/python-ldflags.patch

Added Paths:
-----------
    trunk/dports/gnome/anjuta/files/patch-python-cflags.diff

Modified: trunk/dports/gnome/anjuta/Portfile
===================================================================
--- trunk/dports/gnome/anjuta/Portfile	2015-11-23 07:04:05 UTC (rev 142780)
+++ trunk/dports/gnome/anjuta/Portfile	2015-11-23 07:28:05 UTC (rev 142781)
@@ -50,8 +50,9 @@
                     port:xdg-utils
 
 patchfiles          patch-configure.ac.diff \
-                    patch-ltmain.sh.diff \
-                    python-ldflags.patch
+                    patch-python-cflags.diff \
+                    python-ldflags.patch \
+                    patch-ltmain.sh.diff
 
 gobject_introspection yes
 
@@ -60,9 +61,11 @@
 configure.cmd       ./autogen.sh
 
 configure.cflags-append \
-                    -std=gnu89 -Wno-format-nonliteral
+                    -std=gnu89
 
 configure.args      --enable-static \
+                    --enable-compile-warnings=minimum \
+                    --disable-maintainer-mode \
                     --disable-schemas-compile \
                     --disable-silent-rules \
                     --disable-packagekit \
@@ -98,7 +101,7 @@
     depends_lib-append      port:vala
 }
 
-variant python27 conflicts python32 python33 description {Use Python 2.7} {
+variant python27 conflicts python34 description {Use Python 2.7} {
     configure.python        ${prefix}/bin/python2.7
     depends_lib-append      port:py27-gobject3
 }

Added: trunk/dports/gnome/anjuta/files/patch-python-cflags.diff
===================================================================
--- trunk/dports/gnome/anjuta/files/patch-python-cflags.diff	                        (rev 0)
+++ trunk/dports/gnome/anjuta/files/patch-python-cflags.diff	2015-11-23 07:28:05 UTC (rev 142781)
@@ -0,0 +1,17 @@
+--- configure.ac.orig	2015-11-07 09:57:30.000000000 -0800
++++ configure.ac	2015-11-22 20:10:15.000000000 -0800
+@@ -362,12 +362,12 @@
+ 
+ if test x$have_python = xyes; then
+ 	if test -x $PYTHON-config; then
+-		PYTHON_CFLAGS=`$PYTHON-config --cflags`
++		PYTHON_CFLAGS=`$PYTHON-config --cflags | sed -e "s|-Wno-unused-result||"`
+ 		PYTHON_LIBS=`$PYTHON-config --libs`
+ 		AC_SUBST(PYTHON_CFLAGS)
+ 		AC_SUBST(PYTHON_LIBS)
+ 	elif test -x $PYTHON$PYTHON_VERSION-config; then
+-		PYTHON_CFLAGS=`$PYTHON$PYTHON_VERSION-config --cflags`
++		PYTHON_CFLAGS=`$PYTHON$PYTHON_VERSION-config --cflags | sed -e "s|-Wno-unused-result||"`
+ 		PYTHON_LIBS=`$PYTHON$PYTHON_VERSION-config --libs`
+ 		AC_SUBST(PYTHON_CFLAGS)
+ 		AC_SUBST(PYTHON_LIBS)		

Modified: trunk/dports/gnome/anjuta/files/python-ldflags.patch
===================================================================
--- trunk/dports/gnome/anjuta/files/python-ldflags.patch	2015-11-23 07:04:05 UTC (rev 142780)
+++ trunk/dports/gnome/anjuta/files/python-ldflags.patch	2015-11-23 07:28:05 UTC (rev 142781)
@@ -14,24 +14,24 @@
  	$(PYGOBJECT_LIBS)
  
  endif # HAVE_PYTHON
---- configure.ac.orig	2014-11-24 14:33:14.000000000 -0500
-+++ configure.ac	2014-11-24 14:46:54.000000000 -0500
-@@ -363,14 +363,14 @@ AM_PATH_PYTHON([],
+--- configure.ac.orig	2015-11-22 20:14:09.000000000 -0800
++++ configure.ac	2015-11-22 20:19:29.000000000 -0800
+@@ -363,14 +363,14 @@
  if test x$have_python = xyes; then
  	if test -x $PYTHON-config; then
- 		PYTHON_CFLAGS=`$PYTHON-config --cflags`
+ 		PYTHON_CFLAGS=`$PYTHON-config --cflags | sed -e "s|-Wno-unused-result||"`
 -		PYTHON_LIBS=`$PYTHON-config --libs`
 +		PYTHON_LDFLAGS=`$PYTHON-config --ldflags`
  		AC_SUBST(PYTHON_CFLAGS)
 -		AC_SUBST(PYTHON_LIBS)
 +		AC_SUBST(PYTHON_LDFLAGS)
  	elif test -x $PYTHON$PYTHON_VERSION-config; then
- 		PYTHON_CFLAGS=`$PYTHON$PYTHON_VERSION-config --cflags`
+ 		PYTHON_CFLAGS=`$PYTHON$PYTHON_VERSION-config --cflags | sed -e "s|-Wno-unused-result||"`
 -		PYTHON_LIBS=`$PYTHON$PYTHON_VERSION-config --libs`
-+		PYTHON_LDFLAGS=`$PYTHON$PYTHON_VERSION-config --ldflags`
++		PYTHON_LDFLAGS=`$PYTHON-config --ldflags`
  		AC_SUBST(PYTHON_CFLAGS)
 -		AC_SUBST(PYTHON_LIBS)		
-+		AC_SUBST(PYTHON_LDFLAGS)		
++		AC_SUBST(PYTHON_LDFLAGS)
  	else
  		have_python="no"
  		echo "$PYTHON-config or $PYTHON$PYTHON_VERSION-config not found - disabling python"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/81a3399e/attachment-0001.html>