<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/132d47233316684e983b912923b317ab7c1eac7c">https://github.com/macports/macports-ports/commit/132d47233316684e983b912923b317ab7c1eac7c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 132d4723331 totem: update to version 3.34.1
</span>132d4723331 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 132d47233316684e983b912923b317ab7c1eac7c
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Mon Sep 7 13:28:15 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> totem: update to version 3.34.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * port build to meson
</span><span style='display:block; white-space:pre;color:#404040;'> * update dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> * drop variant +python27 (EOL 2020-01-01)
</span><span style='display:block; white-space:pre;color:#404040;'> * drop variant +python35 (EOL 2020-09-13)
</span><span style='display:block; white-space:pre;color:#404040;'> * add variant +python38 as default
</span><span style='display:block; white-space:pre;color:#404040;'> * update python configuration
</span><span style='display:block; white-space:pre;color:#404040;'> * add post-release fix for variable-rate plugin
</span><span style='display:block; white-space:pre;color:#404040;'> * add .so symlinks for plugin modules build as .dylib
</span><span style='display:block; white-space:pre;color:#404040;'> * enable pylint tests
</span>---
gnome/totem/Portfile | 161 ++++++++++-----------
gnome/totem/files/patch-autogen.sh.diff | 13 --
gnome/totem/files/patch-vala-cflags.diff | 10 --
...able-rate-plugin-fix-keys-in-search-entry.patch | 84 +++++++++++
4 files changed, 163 insertions(+), 105 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/totem/Portfile b/gnome/totem/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c85604cf00..e5bbf11a8b5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/totem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/totem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> # -*- 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
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup gobject_introspection 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span>
name totem
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.24.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.34.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories gnome
# also has an exception allowing use of non-GPL-compatible plugins
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,113 +26,110 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 44e76d253349999f71ceff16ccd7504d0166f327 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9bd78f7b940e886b5c809acdfe00a610a834de5080dd40272b92835528a58d01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 850ebc57efbc251a20490f07b489f16ccd83b13f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6bf89ab096dfc564f260976e484165f09bd886434d184410d2f944bfba611a09 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2157160
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:intltool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:itstool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:yelp-tools \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:appstream-glib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gnome-common \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span> port:gtk-doc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:itstool
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib path:lib/pkgconfig/cairo.pc:cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:clutter \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:clutter-gst3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:clutter-gtk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:dbus \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:desktop-file-utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gdk-pixbuf2 \
</span> port:gnome-desktop \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gsettings-desktop-schemas \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gobject-introspection \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:grilo \
</span> port:grilo-plugins \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gsettings-desktop-schemas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gstreamer1 \
</span> port:gstreamer1-gst-plugins-base \
port:gstreamer1-gst-plugins-good \
port:gstreamer1-gst-plugins-bad \
port:gstreamer1-gst-libav \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:clutter \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:clutter-gtk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:clutter-gst3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:totem-pl-parser \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk3 \
</span> port:libpeas \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2 \
</span> port:shared-mime-info \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:dbus \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:vala \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zeitgeist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libsm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libice
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:totem-pl-parser
</span>
depends_run port:adwaita-icon-theme \
port:yelp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-vala-cflags.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-autogen.sh.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gobject_introspection yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reconfigure using autogen.sh for intltool 0.51 compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set withplugins apple-trailers,autoload-subtitles,chapters,dbusservice,im-status,gromit,media-player-keys,ontop,opensubtitles,properties,pythonconsole,recent,rotation,screensaver,screenshot,skipto,zeitgeist-dp,vimeo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles totem-variable-rate-plugin-fix-keys-in-search-entry.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset nautilus]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set withplugins [string map {"rotation" "rotation,save-file"} ${withplugins}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-plugins=${withplugins} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-easy-codec-installation \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-debug \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-compile-warnings=minimum \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-vala \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-nautilus \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-schemas-compile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant nautilus description {Build nautilus properties page plugin} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-nautilus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:nautilus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python35 python36 python37 description {Use python 2.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py27-gobject3 port:py27-pylint
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_framework ${frameworks_dir}/Python.framework/Versions/2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pkg_config_path ${python_framework}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env PATH=${python_framework}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-python --enable-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python27 python36 python37 description {Use python 3.5} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py35-gobject3 port:py35-pylint
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_framework ${frameworks_dir}/Python.framework/Versions/3.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pkg_config_path ${python_framework}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env PATH=${python_framework}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-python --enable-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -Denable-easy-codec-installation=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dwith-plugins=all \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Denable-python=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Denable-gtk-doc=true
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python27 python35 python37 description {Use python 3.6} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python37 python38 description {Use python 3.6} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py36-pylint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py36-gobject3
</span> configure.python ${prefix}/bin/python3.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py36-gobject3 port:py36-pylint
</span> set python_framework ${frameworks_dir}/Python.framework/Versions/3.6
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env PATH=${python_framework}/bin:$env(PATH)
</span> configure.pkg_config_path ${python_framework}/lib/pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env PATH=${python_framework}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-python --enable-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Denable-python=no -Denable-python=yes
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python27 python35 python36 description {Use python 3.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python36 python38 description {Use python 3.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py37-pylint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py37-gobject3
</span> configure.python ${prefix}/bin/python3.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py37-gobject3 port:py37-pylint
</span> set python_framework ${frameworks_dir}/Python.framework/Versions/3.7
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env PATH=${python_framework}/bin:$env(PATH)
</span> configure.pkg_config_path ${python_framework}/lib/pkgconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Denable-python=no -Denable-python=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python36 python37 description {Use python 3.8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py38-pylint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py38-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_framework ${frameworks_dir}/Python.framework/Versions/3.8
</span> configure.env PATH=${python_framework}/bin:$env(PATH)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-python --enable-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path ${python_framework}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Denable-python=no -Denable-python=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python36] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python37] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python38
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27] && ![variant_isset python35] && ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libpeas expects plugin modules with .so extensions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# make .so symlink for each plugin module built as .dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set plugindir lib/totem/plugins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend pluginlibs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ im-status/libtotem-im-status \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ screenshot/libscreenshot \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ autoload-subtitles/libautoload-subtitles \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ screensaver/libscreensaver \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vimeo/libvimeo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ apple-trailers/libapple-trailers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ properties/libmovie-properties \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ skipto/libskipto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ open-directory/libopen-directory \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rotation/librotation \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ save-file/libsave-file \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ media-player-keys/libmedia-player-keys \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variable-rate/libvariable-rate \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ recent/librecent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach pluginlib ${pluginlibs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/${plugindir}/${pluginlib}.dylib ${destroot}${prefix}/${plugindir}/${pluginlib}.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-activate {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/totem/files/patch-autogen.sh.diff b/gnome/totem/files/patch-autogen.sh.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fdba96b1c80..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/totem/files/patch-autogen.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- autogen.sh.orig 2016-06-28 01:45:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ autogen.sh 2016-09-02 00:41:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,8 +16,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd "$srcdir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "+ Setting up submodules"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--git submodule update --init --recursive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# echo "+ Setting up submodules"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# git submodule update --init --recursive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- which gnome-autogen.sh || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You need to install gnome-common from the GNOME git"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/totem/files/patch-vala-cflags.diff b/gnome/totem/files/patch-vala-cflags.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c8aedd7dc54..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/totem/files/patch-vala-cflags.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/Makefile.plugins.orig 2014-04-14 11:52:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/Makefile.plugins 2014-04-14 11:53:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,7 +36,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable some C warnings for Vala plugins which just create noise because the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # C code Vala generates is a little messy.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vala_plugin_cflags = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wno-unused-but-set-variable \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wno-unused-variable \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wno-unused-function \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(NULL)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/totem/files/totem-variable-rate-plugin-fix-keys-in-search-entry.patch b/gnome/totem/files/totem-variable-rate-plugin-fix-keys-in-search-entry.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bbeb10865ff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/totem/files/totem-variable-rate-plugin-fix-keys-in-search-entry.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,84 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From af5c6473920f30b4d0d65dc702fe91bf2da7ba7d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Gabor Karsay <gabor.karsay@gmx.at>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 21 Oct 2019 12:24:31 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] variable-rate: Fix bracket keys and backspace not working in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ search entry
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Let plugin handle key press events only in player mode and propagate them
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in all other modes, e.g. to the search entry.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Closes: #212
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../totem-variable-rate-plugin.c | 28 ++++++++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 27 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/plugins/variable-rate/totem-variable-rate-plugin.c b/src/plugins/variable-rate/totem-variable-rate-plugin.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 792c0cb69..c59a31078 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/variable-rate/totem-variable-rate-plugin.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/variable-rate/totem-variable-rate-plugin.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,8 +48,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TotemObject *totem;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ guint handler_id_key_press;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint handler_id_main_page;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GSimpleAction *action;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GMenuItem *submenu_item;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gboolean player_page;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } TotemVariableRatePluginPrivate;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define NUM_RATES 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,12 +163,24 @@ change_rate (TotemVariableRatePlugin *pi,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_action_change_state (G_ACTION (priv->action), state);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++on_totem_main_page_notify (GObject *object, GParamSpec *spec, TotemVariableRatePlugin *plugin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TotemVariableRatePlugin *pi = TOTEM_VARIABLE_RATE_PLUGIN (plugin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *main_page;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_object_get (pi->priv->totem, "main-page", &main_page, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pi->priv->player_page = (g_strcmp0 (main_page, "player") == 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_free (main_page);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ on_window_key_press_event (GtkWidget *window, GdkEventKey *event, TotemVariableRatePlugin *plugin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TotemVariableRatePlugin *pi = TOTEM_VARIABLE_RATE_PLUGIN (plugin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (event->state == 0 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!pi->priv->player_page ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ event->state == 0 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ event->state & (GDK_CONTROL_MASK | GDK_SUPER_MASK | GDK_HYPER_MASK | GDK_META_MASK)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -200,6 +214,12 @@ impl_activate (PeasActivatable *plugin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ priv->totem = g_object_get_data (G_OBJECT (plugin), "object");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Cache totem's main page */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ priv->handler_id_main_page = g_signal_connect (G_OBJECT(priv->totem),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "notify::main-page",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ G_CALLBACK (on_totem_main_page_notify),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pi);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Key press handler */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ window = totem_object_get_main_window (priv->totem);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ priv->handler_id_key_press = g_signal_connect (G_OBJECT(window),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -245,6 +265,12 @@ impl_deactivate (PeasActivatable *plugin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_object_unref (window);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (priv->handler_id_main_page != 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_signal_handler_disconnect (G_OBJECT(priv->totem),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ priv->handler_id_main_page);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ priv->handler_id_main_page = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Remove the menu */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ totem_object_empty_menu_section (priv->totem, "variable-rate-placeholder");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>