[126043] users/devans/GNOME-3/stable/dports/gnome
devans at macports.org
devans at macports.org
Thu Oct 2 08:26:27 PDT 2014
Revision: 126043
https://trac.macports.org/changeset/126043
Author: devans at macports.org
Date: 2014-10-02 08:26:27 -0700 (Thu, 02 Oct 2014)
Log Message:
-----------
GNOME-3/stable: baobab, use gnome stable livecheck type.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/baobab/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/files/versions.txt
users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome3-core/files/versions.txt
users/devans/GNOME-3/stable/dports/gnome/gnumeric/Portfile
users/devans/GNOME-3/stable/dports/gnome/goffice/Portfile
users/devans/GNOME-3/stable/dports/gnome/nemiver/Portfile
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/gnumeric/
users/devans/GNOME-3/stable/dports/gnome/goffice/
users/devans/GNOME-3/stable/dports/gnome/libgtop/
users/devans/GNOME-3/stable/dports/gnome/nemiver/files/patch-consolidate-gerrorsafeptr-definitions.diff
users/devans/GNOME-3/stable/dports/gnome/nemiver/files/patch-src-uicommon-nmv-terminal.cc.diff
users/devans/GNOME-3/stable/dports/gnome/nemiver/files/patch-vte-2.91-api.diff
Property Changed:
----------------
users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/
users/devans/GNOME-3/stable/dports/gnome/gnome3-core/
users/devans/GNOME-3/stable/dports/gnome/nemiver/
Modified: users/devans/GNOME-3/stable/dports/gnome/baobab/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/baobab/Portfile 2014-10-02 15:17:36 UTC (rev 126042)
+++ users/devans/GNOME-3/stable/dports/gnome/baobab/Portfile 2014-10-02 15:26:27 UTC (rev 126043)
@@ -76,4 +76,4 @@
system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
-livecheck.type gnome-with-unstable
+livecheck.type gnome
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome3-apps
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/gnome3-apps:113335-122732
/users/devans/GNOME-3/unstable/dports/gnome/gnome3-apps:115850-118154
+ /trunk/dports/gnome/gnome3-apps:113335-122732
/users/devans/GNOME-3/unstable/dports/gnome/gnome3-apps:115850-118154,119584-125734
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile 2014-10-02 15:17:36 UTC (rev 126042)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/Portfile 2014-10-02 15:26:27 UTC (rev 126043)
@@ -4,8 +4,7 @@
PortSystem 1.0
name gnome3-apps
-version 3.12.2
-revision 2
+version 3.14.0
categories gnome
license Permissive
maintainers devans openmaintainer
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/files/versions.txt
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/files/versions.txt 2014-10-02 15:17:36 UTC (rev 126042)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome3-apps/files/versions.txt 2014-10-02 15:26:27 UTC (rev 126043)
@@ -1,50 +1,51 @@
-apps:accerciser:3.12.0:
-apps:aisleriot:3.12.1:
-apps:anjuta:3.12.0:
-apps:bijiben:3.12.2:
-apps:brasero:3.11.3:
-apps:cheese:3.12.2:
-apps:devhelp:3.12.1:
-apps:evolution:3.12.2:
-apps:file-roller:3.12.2:
-apps:five-or-more:3.12.2:
-apps:four-in-a-row:3.12.2:
-apps:gedit:3.12.1:
-apps:gitg:0.3.2:
+apps:accerciser:3.14.0:
+apps:aisleriot:3.14.0:
+apps:anjuta:3.14.0:
+apps:bijiben:3.14.0:
+apps:brasero:3.11.4:
+apps:cheese:3.14.0:
+apps:devhelp:3.14.0:
+apps:evolution:3.12.6:
+apps:file-roller:3.14.0:
+apps:five-or-more:3.14.0:
+apps:four-in-a-row:3.14.0:
+apps:gedit:3.14.0:
+apps:gitg:3.13.91:
apps:glade:3.18.3:
-apps:gnome-boxes:3.12.2:
-apps:gnome-chess:3.12.2:
-apps:gnome-clocks:3.12.0:
-apps:gnome-color-manager:3.12.2:
-apps:gnome-devel-docs:3.12.2:
-apps:gnome-documents:3.12.1:
-apps:gnome-getting-started-docs:3.12.1:
-apps:gnome-initial-setup:3.12.1:
-apps:gnome-klotski:3.12.2:
-apps:gnome-logs:3.12.2:
-apps:gnome-mahjongg:3.12.2:
-apps:gnome-maps:3.12.2:
-apps:gnome-mines:3.12.2:
-apps:gnome-music:3.12.2.1:
+apps:gnome-boxes:3.14.0:
+apps:gnome-chess:3.14.0:
+apps:gnome-clocks:3.14.0:
+apps:gnome-color-manager:3.14.0:
+apps:gnome-devel-docs:3.14.0:
+apps:gnome-documents:3.14.0:
+apps:gnome-getting-started-docs:3.14.0:
+apps:gnome-initial-setup:3.14.0:
+apps:gnome-klotski:3.14.0:
+apps:gnome-logs:3.14.0:
+apps:gnome-mahjongg:3.14.0:
+apps:gnome-maps:3.14.0:
+apps:gnome-mines:3.14.0:
+apps:gnome-music:3.14.0:
apps:gnome-nettool:3.8.1:
-apps:gnome-nibbles:3.12.2:
-apps:gnome-photos:3.12.1:
-apps:gnome-robots:3.12.2:
-apps:gnome-software:3.12.2:
-apps:gnome-sound-recorder:3.12.2:
-apps:gnome-sudoku:3.12.2:
-apps:gnome-tetravex:3.12.2:
-apps:gnome-tweak-tool:3.12.0:
-apps:gnome-weather:3.12.1:
-apps:iagno:3.12.2:
-apps:lightsoff:3.12.2:
-apps:nautilus-sendto:3.8.1:
+apps:gnome-nibbles:3.14.0:
+apps:gnome-photos:3.13.92:
+apps:gnome-robots:3.14.0:
+apps:gnome-software:3.14.0:
+apps:gnome-sound-recorder:3.14.0.1:
+apps:gnome-sudoku:3.14.0:
+apps:gnome-tetravex:3.14.0:
+apps:gnome-tweak-tool:3.14.0:
+apps:gnome-weather:3.14.0:
+apps:hitori:3.14.0.1:
+apps:iagno:3.14.0:
+apps:lightsoff:3.14.0:
+apps:nautilus-sendto:3.8.2:
apps:nemiver:0.9.5:
-apps:orca:3.12.2:
-apps:polari:3.12.2:
-apps:quadrapassel:3.12.2:
-apps:rygel:0.22.1:
-apps:seahorse:3.12.2:
-apps:swell-foop:3.12.2:
-apps:tali:3.12.2:
-apps:vinagre:3.12.2:
+apps:orca:3.14.0:
+apps:polari:3.14.0:
+apps:quadrapassel:3.14.0:
+apps:rygel:0.24.0:
+apps:seahorse:3.14.0:
+apps:swell-foop:3.14.0:
+apps:tali:3.14.0:
+apps:vinagre:3.14.0:
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome3-core
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/dports/gnome/gnome3-core:113334-119747
/users/devans/GNOME-3/unstable/dports/gnome/gnome3-core:115850-118154
+ /trunk/dports/gnome/gnome3-core:113334-119747
/users/devans/GNOME-3/unstable/dports/gnome/gnome3-core:115850-118154,119584-125734
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile 2014-10-02 15:17:36 UTC (rev 126042)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome3-core/Portfile 2014-10-02 15:26:27 UTC (rev 126043)
@@ -4,8 +4,7 @@
PortSystem 1.0
name gnome3-core
-version 3.12.2
-revision 1
+version 3.14.0
categories gnome
license Permissive
maintainers devans openmaintainer
@@ -42,6 +41,7 @@
# gnome-shell-extensions
# gnome-user-share
# gnome-video-effects
+# libgsystem
# libgxps
# libzapojit
# mousetweaks
@@ -59,7 +59,8 @@
# gnome-system-monitor (builds but segfaults on processes/resources due to g_free error in libgtop-server #41542)
#
-depends_lib port:at-spi2-atk \
+depends_lib port:adwaita-icon-theme \
+ port:at-spi2-atk \
port:at-spi2-core \
port:atk \
port:atkmm \
@@ -88,9 +89,6 @@
port:gnome-desktop \
port:gnome-dictionary \
port:gnome-font-viewer \
- port:gnome-icon-theme \
- port:gnome-icon-theme-extras \
- port:gnome-icon-theme-symbolic \
port:gnome-js-common \
port:gnome-keyring \
port:gnome-menus \
@@ -107,9 +105,6 @@
port:grilo-plugins \
port:gsettings-desktop-schemas \
port:gssdp \
- port:gstreamer1-gst-plugins-base \
- port:gstreamer1-gst-plugins-good \
- port:gstreamer1 \
port:gtk3 \
port:gtk2 \
port:gtk-doc \
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome3-core/files/versions.txt
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome3-core/files/versions.txt 2014-10-02 15:17:36 UTC (rev 126042)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome3-core/files/versions.txt 2014-10-02 15:26:27 UTC (rev 126043)
@@ -1,116 +1,112 @@
-core:NetworkManager:0.9.8.10:
-core:at-spi2-atk:2.13.1:
-core:at-spi2-core:2.13.1:
-core:atk:2.13.1:
+core:NetworkManager:0.9.10.0:
+core:adwaita-icon-theme:3.14.0:
+core:at-spi2-atk:2.14.0:
+core:at-spi2-core:2.14.0:
+core:atk:2.14.0:
core:atkmm:2.22.7:
-core:baobab:3.12.1:
-core:cantarell-fonts:0.0.15:
-core:caribou:0.4.13:
-core:clutter:1.18.2:
-core:clutter-gst:2.0.10:
-core:clutter-gtk:1.5.2:
-core:cogl:1.18.0:
-core:dconf:0.20.0:
-core:empathy:3.12.2:
-core:eog:3.12.2:
-core:epiphany:3.12.1:
-core:evince:3.12.1:
-core:evolution-data-server:3.12.2:
-core:folks:0.9.6:
-core:gcr:3.12.2:
-core:gdk-pixbuf:2.30.7:
-core:gdm:3.12.1:
-core:geocode-glib:3.12.2:
-core:gjs:1.40.1:
-core:glib:2.40.0:
-core:glib-networking:2.40.1:
-core:glibmm:2.40.0:
+core:baobab:3.14.0:
+core:cantarell-fonts:0.0.16:
+core:caribou:0.4.15:
+core:clutter:1.20.0:
+core:clutter-gst:2.0.12:
+core:clutter-gtk:1.6.0:
+core:cogl:1.18.2:
+core:dconf:0.22.0:
+core:empathy:3.12.6:
+core:eog:3.14.0:
+core:epiphany:3.14.0:
+core:evince:3.14.0:
+core:evolution-data-server:3.12.6:
+core:folks:0.10.0:
+core:gcr:3.14.0:
+core:gdk-pixbuf:2.31.1:
+core:gdm:3.14.0:
+core:geocode-glib:3.14.0:
+core:gjs:1.41.91:
+core:glib:2.42.0:
+core:glib-networking:2.42.0:
+core:glibmm:2.42.0:
core:gmime:2.6.20:
-core:gnome-backgrounds:3.12.2:
-core:gnome-bluetooth:3.12.0:
-core:gnome-calculator:3.12.1:
-core:gnome-contacts:3.12.0:
-core:gnome-control-center:3.12.1:
-core:gnome-desktop:3.12.2:
-core:gnome-dictionary:3.10.0:
+core:gnome-backgrounds:3.14.0:
+core:gnome-bluetooth:3.14.0:
+core:gnome-calculator:3.14.0:
+core:gnome-contacts:3.14.0:
+core:gnome-control-center:3.14.0:
+core:gnome-desktop:3.14.0:
+core:gnome-dictionary:3.14.0:
core:gnome-disk-utility:3.12.1:
-core:gnome-font-viewer:3.12.0:
-core:gnome-icon-theme:3.12.0:
-core:gnome-icon-theme-extras:3.12.0:
-core:gnome-icon-theme-symbolic:3.12.0:
+core:gnome-font-viewer:3.14.0:
core:gnome-js-common:0.1.2:
-core:gnome-keyring:3.12.2:
-core:gnome-menus:3.10.1:
-core:gnome-online-accounts:3.12.2:
-core:gnome-online-miners:3.12.0:
-core:gnome-packagekit:3.12.2:
-core:gnome-screenshot:3.12.0:
-core:gnome-session:3.12.1:
-core:gnome-settings-daemon:3.12.2:
-core:gnome-shell:3.12.2:
-core:gnome-shell-extensions:3.12.2:
+core:gnome-keyring:3.14.0:
+core:gnome-menus:3.13.3:
+core:gnome-online-accounts:3.14.0:
+core:gnome-online-miners:3.14.0:
+core:gnome-packagekit:3.14.0:
+core:gnome-screenshot:3.14.0:
+core:gnome-session:3.14.0:
+core:gnome-settings-daemon:3.14.0:
+core:gnome-shell:3.14.0:
+core:gnome-shell-extensions:3.14.0:
core:gnome-system-log:3.9.90:
-core:gnome-system-monitor:3.12.2:
-core:gnome-terminal:3.12.2:
-core:gnome-themes-standard:3.12.0:
-core:gnome-user-docs:3.12.1:
-core:gnome-user-share:3.10.2:
+core:gnome-system-monitor:3.14.0:
+core:gnome-terminal:3.14.0:
+core:gnome-themes-standard:3.14.0:
+core:gnome-user-docs:3.14.0:
+core:gnome-user-share:3.14.0:
core:gnome-video-effects:0.4.1:
-core:gobject-introspection:1.40.0:
-core:grilo:0.2.10:
-core:grilo-plugins:0.2.12:
-core:gsettings-desktop-schemas:3.12.2:
-core:gssdp:0.14.7:
-core:gst-plugins-base:1.2.4:
-core:gst-plugins-good:1.2.4:
-core:gstreamer:1.2.4:
-core:gtk+:3.12.2:
-core:gtk+:2.24.23:
-core:gtk-doc:1.20:
+core:gobject-introspection:1.42.0:
+core:grilo:0.2.11:
+core:grilo-plugins:0.2.13:
+core:gsettings-desktop-schemas:3.14.0:
+core:gssdp:0.14.10:
+core:gtk+:3.14.0:
+core:gtk+:2.24.24:
+core:gtk-doc:1.21:
core:gtk-engines:2.20.2:
-core:gtkmm:3.12.0:
-core:gtksourceview:3.12.2:
-core:gucharmap:3.12.1:
-core:gupnp:0.20.11:
+core:gtkmm:3.14.0:
+core:gtksourceview:3.14.0:
+core:gucharmap:3.14.0:
+core:gupnp:0.20.12:
core:gupnp-igd:0.2.3:
-core:gvfs:1.21.1:
-core:json-glib:1.0.0:
-core:libchamplain:0.12.7:
+core:gvfs:1.22.0:
+core:json-glib:1.0.2:
+core:libchamplain:0.12.9:
core:libcroco:0.6.8:
-core:libgdata:0.15.0:
-core:libgee:0.14.0:
+core:libgdata:0.16.0:
+core:libgee:0.16.0:
core:libgnomekbd:3.6.0:
core:libgsf:1.14.30:
+core:libgsystem:2014.1:
core:libgtop:2.30.0:
-core:libgweather:3.12.2:
+core:libgweather:3.14.0:
core:libgxps:0.2.2:
-core:libmediaart:0.4.0:
+core:libmediaart:0.7.0:
core:libnotify:0.7.6:
-core:libpeas:1.10.0:
-core:rest:0.7.91:
-core:librsvg:2.40.2:
+core:libpeas:1.12.1:
+core:rest:0.7.92:
+core:librsvg:2.40.4:
core:libsecret:0.18:
-core:libsigc++:2.3.1:
-core:libsoup:2.46.0:
-core:libwnck:3.4.7:
+core:libsigc++:2.4.0:
+core:libsoup:2.48.0:
+core:libwnck:3.4.9:
core:libzapojit:0.0.3:
-core:mm-common:0.9.6:
+core:mm-common:0.9.7:
core:mousetweaks:3.12.0:
-core:mutter:3.12.2:
-core:nautilus:3.12.2:
-core:network-manager-applet:0.9.8.10:
-core:pango:1.36.3:
+core:mutter:3.14.0:
+core:nautilus:3.14.0:
+core:network-manager-applet:0.9.10.0:
+core:pango:1.36.8:
core:pangomm:2.34.0:
-core:pygobject:3.12.1:
+core:pygobject:3.14.0:
core:seed:3.8.1:
core:sushi:3.12.0:
-core:totem:3.12.1:
-core:totem-pl-parser:3.10.2:
-core:tracker:1.0.1:
-core:vala:0.24.0:
-core:vino:3.12.0:
-core:vte:0.36.2:
-core:yelp:3.12.0:
-core:yelp-tools:3.12.1:
-core:yelp-xsl:3.12.0:
-core:zenity:3.12.1:
+core:totem:3.14.0:
+core:totem-pl-parser:3.10.3:
+core:tracker:1.2.1:
+core:vala:0.26.0:
+core:vino:3.14.0:
+core:vte:0.38.0:
+core:yelp:3.14.0:
+core:yelp-tools:3.14.0:
+core:yelp-xsl:3.14.0:
+core:zenity:3.14.0:
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnumeric
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/gnumeric:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/rmstonecipher/gnome/gnumeric:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/gnumeric/Portfile
===================================================================
--- trunk/dports/gnome/gnumeric/Portfile 2014-09-30 21:22:36 UTC (rev 125978)
+++ users/devans/GNOME-3/stable/dports/gnome/gnumeric/Portfile 2014-10-02 15:26:27 UTC (rev 126043)
@@ -5,8 +5,7 @@
PortGroup active_variants 1.0
name gnumeric
-version 1.12.8
-revision 3
+version 1.12.18
set branch [join [lrange [split ${version} .] 0 1] .]
license GPL-2+
@@ -26,8 +25,8 @@
master_sites gnome:sources/${name}/${branch}/
use_xz yes
-checksums sha256 02688fb6c32c28db2eb4e9a8e012cf1386f4f3a18b4c94f5ecdd13342521ec76 \
- rmd160 7d803eafc37fb5fd7cc4ba802f53440228c0843c
+checksums sha256 402224f858cfa4e91503ab1be0491fa3322713dabe56b6eae171def8b736d9e9 \
+ rmd160 9c8a9fdde1ecb13d18d7d2a2db66a35749a8ef37
depends_build port:gnome-doc-utils \
port:intltool \
@@ -77,11 +76,11 @@
}
post-activate {
- catch {system "${prefix}/bin/scrollkeeper-update"}
- catch {system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"}
+ system "${prefix}/bin/scrollkeeper-update"
+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
# gtk3 provides gtk-update-icon-cache-3.0
- catch {system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"}
- catch {system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"}
+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
livecheck.type gnome
Property changes on: users/devans/GNOME-3/stable/dports/gnome/goffice
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/goffice:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/rmstonecipher/gnome/goffice:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/goffice/Portfile
===================================================================
--- trunk/dports/gnome/goffice/Portfile 2014-09-30 21:22:36 UTC (rev 125978)
+++ users/devans/GNOME-3/stable/dports/gnome/goffice/Portfile 2014-10-02 15:26:27 UTC (rev 126043)
@@ -22,13 +22,12 @@
if {${name} eq ${subport}} {
epoch 1
- version 0.10.8
- revision 1
+ version 0.10.14
license {GPL-2 GPL-3}
- checksums rmd160 c21635c4f648deb34d5e78b92cbf31b5c2441e09 \
- sha256 11964b907b03dede6d8d8a1a4ae2d5727ffbe8d7bab5c92dec586acb616e807c
+checksums rmd160 47fcf1d4b60a154c6ae71c16773ac08f3f432d31 \
+ sha256 c0783ca32828a64a65fe57609a692c1cb6627d3dfe8bed4fed8a70f32c8f404e
depends_lib port:gtk3 \
port:libgsf \
@@ -38,7 +37,10 @@
port:gobject-introspection \
path:lib/pkgconfig/glib-2.0.pc:glib2
- configure.args-append --enable-introspection
+ configure.optflags -g -O0
+ configure.args-append --enable-introspection \
+ --enable-compile-warnings=minimum
+
patchfiles-append patch_quartz-goffice-goffice.c.diff
livecheck.type gnome
Property changes on: users/devans/GNOME-3/stable/dports/gnome/libgtop
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/libgtop:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/rmstonecipher/gnome/libgtop:102363-103172
Property changes on: users/devans/GNOME-3/stable/dports/gnome/nemiver
___________________________________________________________________
Added: svn:mergeinfo
+ /users/devans/GNOME-3/unstable/dports/gnome/nemiver:121499-125977
Modified: users/devans/GNOME-3/stable/dports/gnome/nemiver/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/nemiver/Portfile 2014-10-02 15:17:36 UTC (rev 126042)
+++ users/devans/GNOME-3/stable/dports/gnome/nemiver/Portfile 2014-10-02 15:26:27 UTC (rev 126043)
@@ -55,6 +55,18 @@
patch-dconf-configure.ac.diff \
patch-gconf-configure.ac.diff
+# proposed upstream patches to port to vte-2.91 API
+# https://bugzilla.gnome.org/show_bug.cgi?id=730243
+
+patchfiles-append patch-consolidate-gerrorsafeptr-definitions.diff \
+ patch-vte-2.91-api.diff
+
+# emulation support now removed from vte, xterm behavior hardcoded
+# https://bugzilla.gnome.org/show_bug.cgi?id=728900#c5
+# https://git.gnome.org/browse/vte/commit/src/vte.c?id=4e253be9282829f594c8a55ca08d1299e80e471d
+
+patchfiles-append patch-src-uicommon-nmv-terminal.cc.diff
+
# update m4/intltool.m4 and autoreconf
pre-configure {
Copied: users/devans/GNOME-3/stable/dports/gnome/nemiver/files/patch-consolidate-gerrorsafeptr-definitions.diff (from rev 125977, users/devans/GNOME-3/unstable/dports/gnome/nemiver/files/patch-consolidate-gerrorsafeptr-definitions.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/nemiver/files/patch-consolidate-gerrorsafeptr-definitions.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/nemiver/files/patch-consolidate-gerrorsafeptr-definitions.diff 2014-10-02 15:26:27 UTC (rev 126043)
@@ -0,0 +1,248 @@
+From 58b36ceaeb6dcdbcee54d5849b282dd10f9b3f24 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir at gnome.org>
+Date: Fri, 16 May 2014 14:15:04 +0200
+Subject: [PATCH 1/2] 730243 Consolidate GErrorSafePtr definitions
+
+ * src/common/nmv-error.h: New file.
+ * src/common/nmv-error.cc: Likewise.
+ * src/common/Makefile.am: Add nmv-error.[h|cc] to the build
+ system.
+ * src/common/nmv-ustring.cc: Remove local copy of GErrorSafePtr.
+ (wstring_to_ustring): Use GErrorSafePtr from nmv-error.h
+ instead of local copy.
+ (ustring_to_wstring): Likewise.
+ * src/confmgr/nmv-gconf-mgr.cc: Remove local copy of
+ GErrorSafePtr.
+---
+ src/common/Makefile.am | 6 +++--
+ src/common/nmv-error.cc | 51 +++++++++++++++++++++++++++++++++++++++++++
+ src/common/nmv-error.h | 52 ++++++++++++++++++++++++++++++++++++++++++++
+ src/common/nmv-ustring.cc | 20 +++--------------
+ src/confmgr/nmv-gconf-mgr.cc | 11 +---------
+ 5 files changed, 111 insertions(+), 29 deletions(-)
+ create mode 100644 src/common/nmv-error.cc
+ create mode 100644 src/common/nmv-error.h
+
+diff --git a/src/common/Makefile.am b/src/common/Makefile.am
+index 074c5bd..9ef837a 100644
+--- src/common/Makefile.am
++++ src/common/Makefile.am
+@@ -42,7 +42,8 @@ $(h)/nmv-insert-statement.h \
+ $(h)/nmv-delete-statement.h \
+ $(h)/nmv-proc-utils.h \
+ $(h)/nmv-proc-mgr.h \
+-$(h)/nmv-loc.h
++$(h)/nmv-loc.h \
++$(h)/nmv-error.h
+
+ libnemivercommon_la_SOURCES= $(headers) \
+ $(h)/nmv-ustring.cc \
+@@ -71,7 +72,8 @@ $(h)/nmv-sql-statement.cc \
+ $(h)/nmv-insert-statement.cc \
+ $(h)/nmv-delete-statement.cc \
+ $(h)/nmv-proc-utils.cc \
+-$(h)/nmv-proc-mgr.cc
++$(h)/nmv-proc-mgr.cc \
++$(h)/nmv-error.cc
+
+ publicheaders_DATA=$(headers)
+ publicheadersdir=$(NEMIVER_INCLUDE_DIR)/common
+diff --git a/src/common/nmv-error.cc b/src/common/nmv-error.cc
+new file mode 100644
+index 0000000..aa7a2be
+--- /dev/null
++++ src/common/nmv-error.cc
+@@ -0,0 +1,51 @@
++/* -*- Mode: C++; indent-tabs-mode:nil; c-basic-offset: 4-*- */
++
++/*Copyright (c) 2014 Red Hat, Inc.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy of this
++ * software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute,
++ * sublicense, and/or sell copies of the Software, and to permit
++ * persons to whom the Software is furnished to do so,
++ * subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in all copies
++ * or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS",
++ * WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
++ * INCLUDING BUT NOT LIMITED TO THE
++ * WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE
++ * AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM,
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
++ * CONTRACT, TORT OR OTHERWISE,
++ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
++ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ */
++#include "config.h"
++#include "nmv-error.h"
++
++NEMIVER_BEGIN_NAMESPACE (nemiver)
++NEMIVER_BEGIN_NAMESPACE (common)
++
++void
++GErrorRef::operator () (GError *a_error)
++{
++}
++
++void
++GErrorUnref::operator () (GError *a_error)
++{
++ if (a_error) {
++ g_error_free (a_error);
++ }
++}
++
++NEMIVER_END_NAMESPACE (common)
++NEMIVER_END_NAMESPACE (nemiver)
++
+diff --git a/src/common/nmv-error.h b/src/common/nmv-error.h
+new file mode 100644
+index 0000000..0230087
+--- /dev/null
++++ src/common/nmv-error.h
+@@ -0,0 +1,52 @@
++/* -*- Mode: C++; indent-tabs-mode:nil; c-basic-offset: 4-*- */
++
++/*Copyright (c) 2014 Red Hat, Inc.
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy of this
++ * software and associated documentation files (the "Software"),
++ * to deal in the Software without restriction, including without limitation
++ * the rights to use, copy, modify, merge, publish, distribute,
++ * sublicense, and/or sell copies of the Software, and to permit
++ * persons to whom the Software is furnished to do so,
++ * subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in all copies
++ * or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS",
++ * WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
++ * INCLUDING BUT NOT LIMITED TO THE
++ * WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE
++ * AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ * HOLDERS BE LIABLE FOR ANY CLAIM,
++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
++ * CONTRACT, TORT OR OTHERWISE,
++ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
++ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ */
++#ifndef __NMV_ERROR_H__
++#define __NMV_ERROR_H__
++
++#include <glib.h>
++#include "nmv-namespace.h"
++#include "nmv-safe-ptr.h"
++
++namespace nemiver {
++namespace common {
++
++struct GErrorRef {
++ void operator () (GError *a_error);
++};
++
++struct GErrorUnref {
++ void operator () (GError *a_error);
++};
++
++typedef SafePtr<GError, GErrorRef, GErrorUnref> GErrorSafePtr;
++
++}//end namespace common
++}//end namespace nemiver
++#endif // __NMV_ERROR_H__
+diff --git a/src/common/nmv-ustring.cc b/src/common/nmv-ustring.cc
+index f5dfe49..076258c 100644
+--- src/common/nmv-ustring.cc
++++ src/common/nmv-ustring.cc
+@@ -30,6 +30,7 @@
+ #include "config.h"
+ #include <cstring>
+ #include <sstream>
++#include "nmv-error.h"
+ #include "nmv-ustring.h"
+ #include "nmv-safe-ptr-utils.h"
+ #include "nmv-log-stream-utils.h"
+@@ -479,21 +480,6 @@ WString::assign (super_type::size_type a_n, gunichar a_c)
+ return *this;
+ }
+
+-struct GErrorRef {
+- void operator () (GError *)
+- {
+- }
+-};
+-
+-struct GErrorUnref {
+- void operator () (GError *a_err)
+- {
+- if (a_err) {
+- g_error_free (a_err);
+- }
+- }
+-};
+-
+ bool
+ wstring_to_ustring (const WString &a_wstr,
+ UString &a_ustr)
+@@ -504,7 +490,7 @@ wstring_to_ustring (const WString &a_wstr,
+ utf8_buf.reset (g_ucs4_to_utf8 (a_wstr.c_str (),
+ a_wstr.size (), &wstr_len,
+ &utf8_bytes_len, &err));
+- SafePtr<GError, GErrorRef, GErrorUnref> error;
++ GErrorSafePtr error;
+ error.reset (err);
+ if (error) {
+ LOG_ERROR ("got error conversion error: '" << error->message << "'");
+@@ -531,7 +517,7 @@ ustring_to_wstring (const UString &a_ustr,
+ &utf8_bytes_len,
+ &wstr_len,
+ &err));
+- SafePtr<GError, GErrorRef, GErrorUnref> error;
++ GErrorSafePtr error;
+ error.reset (err);
+ if (error) {
+ LOG_ERROR ("got error conversion error: '" << error->message << "'");
+diff --git a/src/confmgr/nmv-gconf-mgr.cc b/src/confmgr/nmv-gconf-mgr.cc
+index fd7ff1c..f0f97ad 100644
+--- src/confmgr/nmv-gconf-mgr.cc
++++ src/confmgr/nmv-gconf-mgr.cc
+@@ -24,6 +24,7 @@
+ */
+ #include <gconf/gconf-client.h>
+ #include "nmv-i-conf-mgr.h"
++#include "common/nmv-error.h"
+ #include "common/nmv-ustring.h"
+ #include "common/nmv-exception.h"
+ #include "common/nmv-safe-ptr-utils.h"
+@@ -92,16 +93,6 @@ public:
+
+ //static const char * NEMIVER_KEY_DIR = "/app/nemiver";
+
+-struct GErrorRef {
+- void operator () (GError *a_error) {if (a_error) {}}
+-};
+-
+-struct GErrorUnref {
+- void operator () (GError *a_error) {if (a_error) {g_error_free (a_error);}}
+-};
+-
+-typedef SafePtr<GError, GErrorRef, GErrorUnref> GErrorSafePtr;
+-
+ void
+ client_notify_func (GConfClient *a_client,
+ const char* a_key,
+--
+1.9.0
+
Copied: users/devans/GNOME-3/stable/dports/gnome/nemiver/files/patch-src-uicommon-nmv-terminal.cc.diff (from rev 125977, users/devans/GNOME-3/unstable/dports/gnome/nemiver/files/patch-src-uicommon-nmv-terminal.cc.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/nemiver/files/patch-src-uicommon-nmv-terminal.cc.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/nemiver/files/patch-src-uicommon-nmv-terminal.cc.diff 2014-10-02 15:26:27 UTC (rev 126043)
@@ -0,0 +1,15 @@
+--- src/uicommon/nmv-terminal.cc.orig 2014-06-27 07:54:24.000000000 -0700
++++ src/uicommon/nmv-terminal.cc 2014-06-27 07:59:47.000000000 -0700
+@@ -143,7 +143,11 @@
+
+ vte_terminal_set_scroll_on_output (vte, TRUE);
+ vte_terminal_set_scrollback_lines (vte, 1000);
+- vte_terminal_set_emulation (vte, "xterm");
++
++// emulation support now removed from vte, xterm behavior hardcoded
++// https://bugzilla.gnome.org/show_bug.cgi?id=728900#c5
++// https://git.gnome.org/browse/vte/commit/src/vte.c?id=4e253be9282829f594c8a55ca08d1299e80e471d
++// vte_terminal_set_emulation (vte, "xterm");
+
+ widget = Glib::wrap (w);
+ THROW_IF_FAIL (widget);
Copied: users/devans/GNOME-3/stable/dports/gnome/nemiver/files/patch-vte-2.91-api.diff (from rev 125977, users/devans/GNOME-3/unstable/dports/gnome/nemiver/files/patch-vte-2.91-api.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/nemiver/files/patch-vte-2.91-api.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/nemiver/files/patch-vte-2.91-api.diff 2014-10-02 15:26:27 UTC (rev 126043)
@@ -0,0 +1,85 @@
+From 09dad74181806895a40e749464f84ccc027b4fe6 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir at gnome.org>
+Date: Fri, 16 May 2014 14:16:43 +0200
+Subject: [PATCH 2/2] 730243 Port to vte-2.91 API
+
+ * configure.ac: Build against vte-2.91.
+ * src/uicommon/nmv-terminal (init_body): Use
+ vte_terminal_set_font instead of
+ vte_terminal_set_font_from_string.
+ (init_pty): vte_terminal_set_pty expects a VtePty instead of a
+ fd. Adjust according to that.
+---
+ configure.ac | 4 ++--
+ src/uicommon/nmv-terminal.cc | 14 ++++++++++++--
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 04f5a26..272acd9 100644
+--- configure.ac
++++ configure.ac
+@@ -361,7 +361,7 @@ dnl library dependencies for the nemiver common UI module
+ DEP_UICOMMON=" gtkmm-3.0 >= $LIBGTKMM_VERSION \
+ gtk+-3.0 >= $LIBGTK_VERSION \
+ gtksourceviewmm-3.0 >= $LIBGTKSOURCEVIEWMM_VERSION \
+- vte-2.90 >= $LIBVTE_VERSION"
++ vte-2.91 >= $LIBVTE_VERSION"
+
+ PKG_CHECK_MODULES(NEMIVERUICOMMON, $DEP_UICOMMON $DEP_COMMON $DEP_MEMORYVIEW)
+ NEMIVERUICOMMON_CFLAGS="$NEMIVERUICOMMON_CFLAGS $CPPUNIT_CFLAGS"
+@@ -384,7 +384,7 @@ AC_SUBST(NEMIVERWORKBENCH_CFLAGS)
+
+ dnl library dependencies for the nemiver debug perspective plugin
+ DEP_PERSP="gtksourceviewmm-3.0 >= $LIBGTKSOURCEVIEWMM_VERSION \
+- vte-2.90 >= $LIBVTE_VERSION"
++ vte-2.91 >= $LIBVTE_VERSION"
+
+ PKG_CHECK_MODULES(NEMIVERDBGPERSP, $DEP_UICOMMON $DEP_VFS $DEP_PERSP $DEP_MEMORYVIEW $DEP_DYNAMICLAYOUT)
+ NEMIVERDBGPERSP_LIBS="$NEMIVERDBGPERSP_LIBS $CPPUNIT_LIBS"
+diff --git a/src/uicommon/nmv-terminal.cc b/src/uicommon/nmv-terminal.cc
+index 717c094..e7432c1 100644
+--- src/uicommon/nmv-terminal.cc
++++ src/uicommon/nmv-terminal.cc
+@@ -48,11 +48,13 @@
+ #include <gtkmm/menu.h>
+ #include <gtkmm/builder.h>
+ #include <gtkmm/uimanager.h>
++#include <pangomm/fontdescription.h>
+ #include <vte/vte.h>
+ #include <glib/gi18n.h>
+ #include "common/nmv-exception.h"
+ #include "common/nmv-log-stream-utils.h"
+ #include "common/nmv-env.h"
++#include "common/nmv-error.h"
+ #include "nmv-ui-utils.h"
+
+ NEMIVER_BEGIN_NAMESPACE(nemiver)
+@@ -136,7 +138,8 @@ struct Terminal::Priv {
+ THROW_IF_FAIL (vte);
+
+ // Mandatory for vte 0.14
+- vte_terminal_set_font_from_string (vte, "monospace");
++ Pango::FontDescription font_desc ("monospace");
++ vte_terminal_set_font (vte, font_desc.gobj());
+
+ vte_terminal_set_scroll_on_output (vte, TRUE);
+ vte_terminal_set_scrollback_lines (vte, 1000);
+@@ -266,7 +269,14 @@ struct Terminal::Priv {
+ THROW_IF_FAIL (slave_pty);
+ THROW_IF_FAIL (master_pty);
+
+- vte_terminal_set_pty (vte, master_pty);
++ GError *err = 0;
++ VtePty *pty = vte_pty_new_foreign_sync (master_pty, 0, &err);
++ GErrorSafePtr error (error);
++ THROW_IF_FAIL2 (!error, error->message);
++
++ vte_terminal_set_pty (vte, pty);
++ g_object_unref (pty);
++
+ return true;
+ }
+ };//end Terminal::Priv
+--
+1.9.0
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141002/e776b920/attachment-0001.html>
More information about the macports-changes
mailing list