[113254] trunk/dports/gnome/anjuta

devans at macports.org devans at macports.org
Wed Nov 13 00:23:19 PST 2013


Revision: 113254
          https://trac.macports.org/changeset/113254
Author:   devans at macports.org
Date:     2013-11-13 00:23:19 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
anjuta: merge version 3.8.4 from GNOME-3 test branch.

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

Added Paths:
-----------
    trunk/dports/gnome/anjuta/files/patch-configure.diff
    trunk/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.in.diff

Removed Paths:
-------------
    trunk/dports/gnome/anjuta/files/patch-configure.in.diff
    trunk/dports/gnome/anjuta/files/patch-disable-python.diff
    trunk/dports/gnome/anjuta/files/patch-plugins-project-wizard-autogen.c.diff

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


Property changes on: trunk/dports/gnome/anjuta
___________________________________________________________________
Added: 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-113174
/users/rmstonecipher/gnome/anjuta:102363-103172

Modified: trunk/dports/gnome/anjuta/Portfile
===================================================================
--- trunk/dports/gnome/anjuta/Portfile	2013-11-13 08:13:11 UTC (rev 113253)
+++ trunk/dports/gnome/anjuta/Portfile	2013-11-13 08:23:19 UTC (rev 113254)
@@ -5,9 +5,8 @@
 PortGroup       muniversal 1.0
 
 name            anjuta
-version         2.32.1.1
-revision        1
-license         GPL-2
+version         3.8.4
+license         GPL-2+
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     A GNOME/GTK IDE
 long_description        ${description}
@@ -17,75 +16,62 @@
 homepage        http://anjuta.sourceforge.net/
 master_sites    gnome:sources/${name}/${branch}/
 
-use_bzip2       yes
+use_xz          yes
 
-checksums       rmd160  2f1ae061e75761e60e0a83943ec1e31ee8b43cbf \
-                sha256  f2b67609890a45d907ab5b42fd5963ba7cb41193d4a0dd2543584eca2ec5db58
+checksums       rmd160  ffc3b036c6a7c64e4b425cef03f0f1c23c947270 \
+                sha256  eea77ef71dd156a2296cbaf02a343f3b9099aec245ee7d1495f002ff2f81fa17
 
 depends_build   port:pkgconfig \
                 port:intltool \
-                port:gnome-common \
-                port:gnome-doc-utils \
-                port:gtk-doc \
-                port:p5.12-locale-gettext
+                port:itstool
 
-depends_lib     port:autogen \
-                port:gconf \
-                port:gdl \
-                port:libgda4 \
-                port:libunique \
+depends_lib     port:desktop-file-utils \
+                port:autogen \
+                port:shared-mime-info \
+                port:gtk3 \
+                port:gdl3 \
+                port:gobject-introspection \
+                port:gtksourceview3 \
+                port:libgda5 \
+                port:libxml2 \
                 port:vte
 
-depends_run     port:desktop-file-utils \
-                port:rarian \
-                port:shared-mime-info \
-                port:gnome-settings-daemon \
+depends_run     port:gnome-settings-daemon \
                 port:epiphany \
                 port:yelp \
                 port:xdg-utils
 
-patchfiles      patch-plugins-project-wizard-autogen.c.diff \
-                patch-configure.in.diff \
-                patch-disable-python.diff
+patchfiles      patch-configure.diff \
+                patch-plugins-language-support-vala-Makefile.in.diff
 
-post-patch {
-        reinplace "s|/usr/bin/perl|${prefix}/bin/perl5.12|" ${worksrcpath}/scripts/builder2schema.pl
-}
+configure.cflags-append \
+                -std=gnu89 -Wno-format-nonliteral
 
-use_autoreconf  yes
-autoreconf.args -fvi
-
-configure.perl  ${prefix}/bin/perl5.12
 configure.args  --enable-static \
-                --enable-introspection=no \
-                --disable-scrollkeeper \
-                --disable-schemas-install \
+                --enable-introspection=yes \
+                --disable-schemas-compile \
                 --disable-silent-rules \
-                --disable-graphviz \
+                --disable-packagekit \
                 --disable-plugin-devhelp \
                 --disable-plugin-glade \
-                --disable-plugin-sourceview \
                 --disable-plugin-subversion \
                 --disable-vala
 
-# Buggy inline code, -std=gnu99 (eg, clang) complain
-configure.cflags-append -std=gnu89
+# gobject-introspection g-ir-scanner uses $CC from env
 
+if {[variant_isset universal]} {
+    foreach arch ${configure.universal_archs} {
+        lappend merger_build_args(${arch})  CC='${configure.cc} -arch ${arch}'
+    }
+} else {
+    build.args-append       CC="${configure.cc} ${configure.cc_archflags}"
+}
+
 variant devhelp description {Enable devhelp plugin support} {
                 configure.args-delete   --disable-plugin-devhelp
                 depends_lib-append      port:devhelp
 }
 
-variant sourceview description {Enable gtksourceview editor plugin support instead of scintilla} {
-                configure.args-delete   --disable-plugin-sourceview
-                depends_lib-append      port:gtksourceview2
-}
-
-variant graphviz description {Enable class inheritance plugin support using graphviz} {
-                configure.args-delete   --disable-graphviz
-                depends_lib-append      path:bin/dot:graphviz
-}
-
 variant subversion description {Enable subversion plugin support} {
                 configure.args-delete   --disable-plugin-subversion
                 configure.args-append   --with-subversion-dir=${prefix} \
@@ -97,9 +83,10 @@
                                         port:subversion
 }
 
-variant glade description {Enable glade-3 plugin support} {
+variant glade description {Enable glade plugin support} {
                 configure.args-delete   --disable-plugin-glade
-                depends_lib-append      port:glade3
+                configure.args-append   --enable-glade-catalog
+                depends_lib-append      port:glade
 }
 
 
@@ -108,13 +95,30 @@
                 depends_lib-append      port:vala
 }
 
+variant python27 conflicts python32 python33 description {Use Python 2.7} {
+                configure.python        ${prefix}/bin/python2.7
+                depends_lib-append      port:py27-gobject3
+}
+
+variant python32 conflicts python27 python33 description {Use Python 3.2} {
+                configure.python        ${prefix}/bin/python3.2
+                depends_lib-append      port:py32-gobject3
+}
+
+variant python33 conflicts python27 python32 description {Use Python 3.3} {
+                configure.python        ${prefix}/bin/python3.3
+                depends_lib-append      port:py33-gobject3
+}
+
+if {![variant_isset python32] && ![variant_isset python33]} {
+    default_variants +python27
+}
+
 post-activate {
-    system "scrollkeeper-update"
-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
     system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
-    system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
-        gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
+    system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
 livecheck.type  gnome

Copied: trunk/dports/gnome/anjuta/files/patch-configure.diff (from rev 113174, users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-configure.diff)
===================================================================
--- trunk/dports/gnome/anjuta/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/gnome/anjuta/files/patch-configure.diff	2013-11-13 08:23:19 UTC (rev 113254)
@@ -0,0 +1,23 @@
+--- configure.save	2013-09-18 21:25:43.000000000 -0700
++++ configure	2013-09-18 21:25:51.000000000 -0700
+@@ -5458,7 +5458,7 @@
+ 
+ 
+ ANJUTA_LDFLAGS="-no-undefined"
+-ANJUTA_PLUGIN_LDFLAGS="-module -avoid-version -no-undefined"
++ANJUTA_PLUGIN_LDFLAGS="-module -avoid-version"
+ 
+ 
+ 
+@@ -17939,9 +17939,9 @@
+ 
+ 
+ 
+-  PYTHON_PREFIX='${prefix}'
++  PYTHON_PREFIX=`$PYTHON -c 'import sys; print(sys.prefix);'`
+ 
+-  PYTHON_EXEC_PREFIX='${exec_prefix}'
++  PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print(sys.exec_prefix);'`
+ 
+ 
+ 

Deleted: trunk/dports/gnome/anjuta/files/patch-configure.in.diff
===================================================================
--- trunk/dports/gnome/anjuta/files/patch-configure.in.diff	2013-11-13 08:13:11 UTC (rev 113253)
+++ trunk/dports/gnome/anjuta/files/patch-configure.in.diff	2013-11-13 08:23:19 UTC (rev 113254)
@@ -1,10 +0,0 @@
---- configure.in.orig	2013-06-29 10:59:10.000000000 -0700
-+++ configure.in	2013-06-29 10:59:56.000000000 -0700
-@@ -147,6 +147,7 @@ PKG_CHECK_MODULES([ANJUTA], 
-    [gthread-2.0 >= $GTHREAD_REQUIRED 
- 	unique-1.0 >= $UNIQUE_REQUIRED
- 	glib-2.0 >= $GLIB_REQUIRED
-+	gmodule-2.0 >= $GLIB_REQUIRED
- 	gio-2.0 >= $GLIB_REQUIRED
- 	gtk+-2.0 >= $GTK_REQUIRED
- 	gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED

Deleted: trunk/dports/gnome/anjuta/files/patch-disable-python.diff
===================================================================
--- trunk/dports/gnome/anjuta/files/patch-disable-python.diff	2013-11-13 08:13:11 UTC (rev 113253)
+++ trunk/dports/gnome/anjuta/files/patch-disable-python.diff	2013-11-13 08:23:19 UTC (rev 113254)
@@ -1,13 +0,0 @@
---- configure.in.orig	2013-07-08 16:02:45.000000000 -0700
-+++ configure.in	2013-07-08 16:07:16.000000000 -0700
-@@ -300,6 +300,10 @@
- 	[have_python="yes"],
- 	[have_python="no"])
- 
-+dnl Disable Python support due to misconfiguration when Python is built universal
-+
-+have_python="no"
-+
- if test x$have_python = xyes; then
- 	if test -x $PYTHON-config; then
- 		PYTHON_CFLAGS=`$PYTHON-config --cflags`

Copied: trunk/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.in.diff (from rev 113174, users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.in.diff)
===================================================================
--- trunk/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.in.diff	2013-11-13 08:23:19 UTC (rev 113254)
@@ -0,0 +1,12 @@
+--- plugins/language-support-vala/Makefile.in.orig	2013-09-18 17:59:47.000000000 -0700
++++ plugins/language-support-vala/Makefile.in	2013-09-18 18:00:11.000000000 -0700
+@@ -453,8 +453,7 @@
+ @ENABLE_VALA_TRUE@	$(LIBANJUTA_CFLAGS) \
+ @ENABLE_VALA_TRUE@	$(VALA_CFLAGS) \
+ @ENABLE_VALA_TRUE@	-DPACKAGE_SRC_DIR=\"$(srcdir)\" \
+- at ENABLE_VALA_TRUE@	-DG_LOG_DOMAIN=\"language-support-vala\" \
+- at ENABLE_VALA_TRUE@	--no-warn
++ at ENABLE_VALA_TRUE@	-DG_LOG_DOMAIN=\"language-support-vala\"
+ 
+ 
+ # The plugin

Deleted: trunk/dports/gnome/anjuta/files/patch-plugins-project-wizard-autogen.c.diff
===================================================================
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131113/aa4b32e6/attachment-0001.html>


More information about the macports-changes mailing list