[113323] trunk/dports/gnome/totem
devans at macports.org
devans at macports.org
Wed Nov 13 08:19:34 PST 2013
Revision: 113323
https://trac.macports.org/changeset/113323
Author: devans at macports.org
Date: 2013-11-13 08:19:34 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
totem: merge version 3.8.2 from GNOME-3 test branch.
Modified Paths:
--------------
trunk/dports/gnome/totem/Portfile
trunk/dports/gnome/totem/files/patch-configure.diff
Removed Paths:
-------------
trunk/dports/gnome/totem/files/patch-Makefile.in.diff
trunk/dports/gnome/totem/files/patch-bindings-python-totem.override.diff
trunk/dports/gnome/totem/files/patch-browser-plugin-totemPlugin.cpp.diff
trunk/dports/gnome/totem/files/patch-src-plugins-totem-python-module.c.diff
Property Changed:
----------------
trunk/dports/gnome/totem/
Property changes on: trunk/dports/gnome/totem
___________________________________________________________________
Added: svn:mergeinfo
+ /users/devans/GNOME-3/stable/dports/gnome/totem:108269-113174
Modified: trunk/dports/gnome/totem/Portfile
===================================================================
--- trunk/dports/gnome/totem/Portfile 2013-11-13 16:10:12 UTC (rev 113322)
+++ trunk/dports/gnome/totem/Portfile 2013-11-13 16:19:34 UTC (rev 113323)
@@ -4,8 +4,7 @@
PortSystem 1.0
name totem
-version 2.32.0
-revision 3
+version 3.8.2
set branch [join [lrange [split ${version} .] 0 1] .]
categories gnome
# also has an exception allowing use of non-GPL-compatible plugins
@@ -19,111 +18,79 @@
functionality such as: \
* Video thumbnailer for the file manager \
* Nautilus properties tab \
- * Mozilla (Firefox) plugin to view movies inside your \
- browser (in development) \
* Webcam utility (in development)
homepage http://live.gnome.org/Totem
platforms darwin
master_sites gnome:sources/${name}/${branch}/
-use_bzip2 yes
+use_xz yes
-checksums rmd160 5312aa67e3ff611be0626fd72da66e1c26d6eb4d \
- sha256 982d6aaeca3e4844694fc0a2540d792bea753e24b55cf33203188b32b5914f47
+checksums rmd160 1c3fb87f3be80936063b20d741490c911eb1bed1 \
+ sha256 eda9e0a016bb2ac14f7cd7c8c03b8ee1ab3f1b3ba6558f65c64514e5d2583e01
-patchfiles patch-Makefile.in.diff \
- patch-configure.diff \
- patch-src-plugins-totem-python-module.c.diff \
- patch-bindings-python-totem.override.diff \
- patch-browser-plugin-totemPlugin.cpp.diff
+patchfiles patch-configure.diff
depends_build port:pkgconfig \
port:intltool \
- port:gnome-doc-utils \
- port:gtk-doc
+ port:itstool
depends_lib port:desktop-file-utils \
- port:gtk2 \
- port:gconf \
- port:libgdata \
- port:libunique \
+ port:gnome-icon-theme \
+ port:gnome-icon-theme-symbolic \
+ port:gsettings-desktop-schemas \
+ port:gtk3 \
+ port:gobject-introspection \
+ port:gstreamer1-gst-plugins-base \
+ port:gstreamer1-gst-plugins-good \
+ port:gstreamer1-gst-plugins-bad \
+ port:clutter \
+ port:clutter-gtk \
+ port:clutter-gst \
port:totem-pl-parser \
- port:xorg-libXtst \
- port:xorg-libXxf86vm \
- port:gstreamer010-gst-plugins-base \
- port:iso-codes \
- port:gnome-icon-theme
+ port:libpeas \
+ port:libxml2 \
+ port:shared-mime-info \
+ port:dbus \
+ port:xorg-libX11 \
+ port:xorg-libsm \
+ port:xorg-libice
depends_run port:gnome-settings-daemon \
- port:gstreamer010-gst-plugins-good \
- port:gstreamer010-gst-plugins-bad \
- port:gstreamer010-gst-plugins-ugly
+ port:yelp
-# gst-ffmpeg provides optional decoders, but it is not +universal
-if {![variant_isset universal]} {
- depends_run-append port:gstreamer010-gst-ffmpeg
-}
-
-configure.args --with-plugins="thumbnail ontop gromit media-player-keys properties sidebar-test skipto youtube pythonconsole dbus-service" \
- --disable-static \
- --enable-browser-plugins \
+configure.args --with-plugins=apple-trailers,autoload-subtitles,chapters,dbusservice,im-status,gromit,media-player-keys,ontop,opensubtitles,properties,recent,skipto \
--enable-easy-codec-installation \
- --disable-nautilus \
+ --enable-browser-plugins=no \
+ --enable-introspection=yes \
+ --enable-debug \
+ --disable-python \
--disable-vala \
- --disable-silent-rules \
- --disable-schemas-install \
- --disable-scrollkeeper \
- --x-includes=${prefix}/include \
- --x-libraries=${prefix}/lib \
- BROWSER_PLUGIN_DIR=${prefix}/lib/nsplugins
+ --disable-nautilus \
+ --disable-schemas-compile \
+ --disable-silent-rules
-variant nautilus description {Build optional nautilus properties page} {
- configure.args-replace --disable-nautilus-actions --disable-nautilus-actions
- depends_lib-append port:nautilus
-}
+universal_variant no
-variant python25 conflicts python26 python27 description {Use python 2.5} {
- configure.python ${prefix}/bin/python2.5
- depends_lib-append port:py25-pygtk
- set python_framework ${frameworks_dir}/Python.framework/Versions/2.5
- configure.pkg_config_path ${python_framework}/lib/pkgconfig
- configure.env PATH=${python_framework}/bin:$env(PATH)
+variant nautilus description {Build nautilus properties page plugin} {
+ configure.args-delete --disable-nautilus
+ depends_lib-append port:nautilus
}
-variant python26 conflicts python25 python27 description {Use python 2.6} {
- configure.python ${prefix}/bin/python2.6
- depends_lib-append port:py26-pygtk
- set python_framework ${frameworks_dir}/Python.framework/Versions/2.6
- configure.pkg_config_path ${python_framework}/lib/pkgconfig
- configure.env PATH=${python_framework}/bin:$env(PATH)
-}
-
-variant python27 conflicts python25 python26 description {Use python 2.7} {
+variant python27 description {Use python 2.7} {
configure.python ${prefix}/bin/python2.7
- depends_lib-append port:py27-pygtk
+ depends_lib-append port:py27-gobject3
set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
configure.pkg_config_path ${python_framework}/lib/pkgconfig
configure.env PATH=${python_framework}/bin:$env(PATH)
}
-if {![variant_isset python25] && ![variant_isset python26]} {
- default_variants +python27
-}
+default_variants +python27
-post-patch {
- reinplace "s:libdbus-glib-1.so.2:${prefix}/lib/libdbus-glib-1.2.dylib:" ${worksrcpath}/browser-plugin/totemPluginGlue.cpp
-}
-
-post-destroot {
- eval delete [glob "${destroot}${prefix}/lib/nsplugins/*.la"]
-}
-
post-activate {
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
- system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
- system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
- gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.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
Deleted: trunk/dports/gnome/totem/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/gnome/totem/files/patch-Makefile.in.diff 2013-11-13 16:10:12 UTC (rev 113322)
+++ trunk/dports/gnome/totem/files/patch-Makefile.in.diff 2013-11-13 16:19:34 UTC (rev 113323)
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2013-04-17 10:18:45.000000000 -0700
-+++ Makefile.in 2013-04-17 10:19:04.000000000 -0700
-@@ -356,7 +356,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--NORMAL_SUBDIRS = lib bindings po data help src docs
-+NORMAL_SUBDIRS = lib bindings po data src docs
- SUBDIRS = $(NORMAL_SUBDIRS) $(am__append_1)
- EXTRA_DIST = \
- license_change \
Deleted: trunk/dports/gnome/totem/files/patch-bindings-python-totem.override.diff
===================================================================
--- trunk/dports/gnome/totem/files/patch-bindings-python-totem.override.diff 2013-11-13 16:10:12 UTC (rev 113322)
+++ trunk/dports/gnome/totem/files/patch-bindings-python-totem.override.diff 2013-11-13 16:19:34 UTC (rev 113323)
@@ -1,10 +0,0 @@
---- bindings/python/totem.override.orig 2008-01-07 17:06:14.000000000 +0100
-+++ bindings/python/totem.override 2008-04-03 14:02:39.000000000 +0200
-@@ -5,6 +5,7 @@
-
- #define NO_IMPORT_PYGOBJECT
- #include <pygobject.h>
-+#define NO_IMPORT_PYGTK
- #include <pygtk/pygtk.h>
-
- #include "override_common.h"
Deleted: trunk/dports/gnome/totem/files/patch-browser-plugin-totemPlugin.cpp.diff
===================================================================
--- trunk/dports/gnome/totem/files/patch-browser-plugin-totemPlugin.cpp.diff 2013-11-13 16:10:12 UTC (rev 113322)
+++ trunk/dports/gnome/totem/files/patch-browser-plugin-totemPlugin.cpp.diff 2013-11-13 16:19:34 UTC (rev 113323)
@@ -1,11 +0,0 @@
---- browser-plugin/totemPlugin.cpp.orig 2010-09-10 03:44:33.000000000 -0700
-+++ browser-plugin/totemPlugin.cpp 2013-04-17 08:26:16.000000000 -0700
-@@ -278,7 +278,7 @@
- }
-
- void
--totemPlugin::SetTime (guint64 aTime)
-+totemPlugin::SetTime (uint64_t aTime)
- {
- D ("SetTime '%lu'", aTime);
-
Modified: trunk/dports/gnome/totem/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/totem/files/patch-configure.diff 2013-11-13 16:10:12 UTC (rev 113322)
+++ trunk/dports/gnome/totem/files/patch-configure.diff 2013-11-13 16:19:34 UTC (rev 113323)
@@ -1,18 +1,9 @@
---- configure.orig 2010-09-27 05:42:20.000000000 -0700
-+++ configure 2013-04-17 08:26:16.000000000 -0700
-@@ -19297,7 +19297,7 @@
+--- configure.orig 2013-05-14 03:45:05.000000000 -0700
++++ configure 2013-09-09 22:53:15.000000000 -0700
+@@ -19550,9 +19550,9 @@
- X_LIBS=""
-- X_LIBS="$X_LIBRARIES -lX11"
-+ X_LIBS="$X_LIBRARIES -lX11 -lice"
-
- have_xfree=no
-@@ -19484,9 +19484,9 @@
-
-
-
- PYTHON_PREFIX='${prefix}'
+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'`
Deleted: trunk/dports/gnome/totem/files/patch-src-plugins-totem-python-module.c.diff
===================================================================
--- trunk/dports/gnome/totem/files/patch-src-plugins-totem-python-module.c.diff 2013-11-13 16:10:12 UTC (rev 113322)
+++ trunk/dports/gnome/totem/files/patch-src-plugins-totem-python-module.c.diff 2013-11-13 16:19:34 UTC (rev 113323)
@@ -1,10 +0,0 @@
---- src/plugins/totem-python-module.c.orig 2008-02-04 12:09:43.000000000 +0100
-+++ src/plugins/totem-python-module.c 2008-04-03 14:32:54.000000000 +0200
-@@ -29,6 +29,7 @@
- #endif
-
- #include <Python.h>
-+#define NO_IMPORT
- #include <pygobject.h>
- #include <pygtk/pygtk.h>
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131113/245234ea/attachment-0001.html>
More information about the macports-changes
mailing list