[114039] users/devans/GNOME-3/stable/dports/gnome/gedit
devans at macports.org
devans at macports.org
Wed Nov 27 10:09:40 PST 2013
Revision: 114039
https://trac.macports.org/changeset/114039
Author: devans at macports.org
Date: 2013-11-27 10:09:40 -0800 (Wed, 27 Nov 2013)
Log Message:
-----------
GNOME-3/stable/dports: gedit, update to version 3.10.2, build fails 'duplicate symbol _gedit_app_x11_get_type'.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile
users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.diff
Modified: users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile 2013-11-27 18:00:06 UTC (rev 114038)
+++ users/devans/GNOME-3/stable/dports/gnome/gedit/Portfile 2013-11-27 18:09:40 UTC (rev 114039)
@@ -1,11 +1,10 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
# $Id$
-PortSystem 1.0
+PortSystem 1.0
name gedit
-version 2.30.4
-revision 7
+version 3.10.2
license GPL-2
set branch [join [lrange [split ${version} .] 0 1] .]
description GNOME editor.
@@ -17,63 +16,73 @@
homepage http://www.gnome.org/projects/gedit/
master_sites gnome:sources/${name}/${branch}/
-checksums md5 e1eecb0a92a1a363b3d375ec5ac0fb3b \
- sha1 ff7f4088d0b89224b84406557a7d9970323fdcc3 \
- rmd160 b2659b8847ef02c66a70acd2f4a492555e1e4d21
+use_xz yes
-depends_build port:gtk-doc \
+checksums rmd160 1cb59a4259f208274ad48d409eba58bdc85030b4 \
+ sha256 cc607f877fb925af5c9a71935c70fb76238a62bf133b163471369bd183f15b69
+
+depends_build port:pkgconfig \
port:intltool \
- port:gnome-doc-utils \
- port:pkgconfig
+ port:itstool
depends_lib port:desktop-file-utils \
- port:gconf \
+ port:gnome-icon-theme \
+ port:gnome-icon-theme-symbolic \
+ port:gsettings-desktop-schemas \
+ port:gtk3 \
+ port:gvfs \
+ port:gtksourceview3 \
+ port:libpeas \
+ port:libsoup \
+ port:libxml2 \
+ port:enchant \
port:iso-codes \
- port:enchant \
- port:xorg-libsm \
- port:rarian
+ port:zeitgeist
depends_run port:gnome-settings-daemon \
port:yelp
-use_bzip2 yes
+pre-patch {
+ copy ${worksrcpath}/gedit ${worksrcpath}/gedit.orig
+}
-patchfiles patch-configure.diff
+patchfiles patch-configure.diff \
+ patch-gedit-gedit-app.c.diff
-configure.args --mandir=${prefix}/share/man \
- --disable-scrollkeeper \
- --disable-schemas-install \
- --disable-gvfs-metadata \
- --disable-updater
+configure.cflags-append \
+ -Wno-format-nonliteral
-variant python25 conflicts python26 python27 description {Use python 2.5} {
- configure.python ${prefix}/bin/python2.5
- depends_lib-append port:py25-pygtksourceview
-}
+configure.args --enable-zeitgeist \
+ --disable-python \
+ --disable-schemas-compile \
+ --disable-silent-rules
-variant python26 conflicts python25 python27 description {Use python 2.6} {
- configure.python ${prefix}/bin/python2.6
- depends_lib-append port:py26-pygtksourceview
- set python_framework ${frameworks_dir}/Python.framework/Versions/2.6
+# libpeas is not universal
+
+universal_variant no
+
+# minimum python version is 3.2.3
+
+variant python32 description {Use python 3.2} {
+ depends_lib-append port:py32-gobject3
+ configure.python ${prefix}/bin/python3.2
+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.2
configure.pkg_config_path ${python_framework}/lib/pkgconfig
+ configure.args-replace --disable-python --enable-python
}
-variant python27 conflicts python25 python26 description {Use python 2.7} {
- configure.python ${prefix}/bin/python2.7
- depends_lib-append port:py27-pygtksourceview
- set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
+variant python33 description {Use python 3.3} {
+ depends_lib-append port:py33-gobject3
+ configure.python ${prefix}/bin/python3.3
+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.3
configure.pkg_config_path ${python_framework}/lib/pkgconfig
+ configure.args-replace --disable-python --enable-python
}
-if {![variant_isset python25] && ![variant_isset python26]} {
- default_variants +python27
-}
+default_variants +python32
post-activate {
- system "${prefix}/bin/scrollkeeper-update"
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
- system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
- gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
}
livecheck.type gnome
Modified: users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.diff 2013-11-27 18:00:06 UTC (rev 114038)
+++ users/devans/GNOME-3/stable/dports/gnome/gedit/files/patch-configure.diff 2013-11-27 18:09:40 UTC (rev 114039)
@@ -1,6 +1,6 @@
---- configure.orig 2013-06-25 00:06:32.000000000 -0700
-+++ configure 2013-08-30 11:35:54.000000000 -0700
-@@ -16310,9 +16310,9 @@
+--- configure.orig 2013-11-13 02:04:23.000000000 -0800
++++ configure 2013-11-27 08:02:31.000000000 -0800
+@@ -16455,9 +16455,9 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131127/1ea734af/attachment-0001.html>
More information about the macports-changes
mailing list