diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-16 16:49:47 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-16 16:49:47 +0200 |
commit | bc864260b40f40e8f689788c54f6138007764077 (patch) | |
tree | 9c9be0d9a53d7e3a03d76276fc4b02dd08b552bf /extra/totem | |
parent | b90f83b99150003a2022c3a4bbad90b12eb56b7e (diff) | |
parent | 453f3b8b2c568e9babcdc4852772278a39f130c0 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bird/PKGBUILD
community/drbd/PKGBUILD
community/etherape/PKGBUILD
community/ext4magic/PKGBUILD
community/fcron/PKGBUILD
community/fcron/systab.orig
community/gnome-panel/PKGBUILD
community/libident/PKGBUILD
community/libtorrent/PKGBUILD
community/linux-tools/PKGBUILD
community/linux-tools/usbipd.service
community/makedev/PKGBUILD
community/minbif/PKGBUILD
community/noip/PKGBUILD
community/notmuch/PKGBUILD
community/pam_pwcheck/PKGBUILD
community/pound/PKGBUILD
community/preload/PKGBUILD
community/python-cchardet/PKGBUILD
community/rtorrent/PKGBUILD
community/tor/PKGBUILD
community/ude/PKGBUILD
core/openldap/PKGBUILD
core/sysvinit/PKGBUILD
extra/cd-discid/PKGBUILD
extra/cvs/PKGBUILD
extra/epiphany-extensions/PKGBUILD
extra/fbset/PKGBUILD
extra/fluidsynth/PKGBUILD
extra/gtkmm/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdepim/PKGBUILD
extra/libical/PKGBUILD
extra/mutt/PKGBUILD
extra/netkit-bsd-finger/PKGBUILD
extra/ossp/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/rtkit/PKGBUILD
extra/samba/PKGBUILD
extra/totem/PKGBUILD
extra/webkitgtk/PKGBUILD
libre/liferea-libre/PKGBUILD
libre/mplayer-vaapi-libre/PKGBUILD
Diffstat (limited to 'extra/totem')
-rw-r--r-- | extra/totem/PKGBUILD | 30 | ||||
-rw-r--r-- | extra/totem/bugreport.patch | 22 |
2 files changed, 40 insertions, 12 deletions
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index e68efbb37..b3e7ff9ab 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183323 2013-04-21 22:06:42Z heftig $ +# $Id: PKGBUILD 185508 2013-05-14 12:12:44Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') -pkgver=3.8.0 +pkgver=3.8.2 pkgrel=1 pkgdesc="GNOME3 movie player based on GStreamer" url="http://www.gnome.org" @@ -12,14 +12,24 @@ arch=('i686' 'x86_64' 'mips64el') license=(GPL2 custom) depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas hicolor-icon-theme gnome-icon-theme gsettings-desktop-schemas dconf clutter-gst - clutter-gtk python2-gobject gst-plugins-bad) -makedepends=(intltool libnautilus-extension vala grilo pylint dbus-glib libzeitgeist itstool docbook-xsl) + clutter-gtk python-gobject python-xdg gst-plugins-bad) +makedepends=(intltool libnautilus-extension vala grilo dbus-glib libzeitgeist + itstool docbook-xsl python-pylint) [ "$CARCH" != "mips64el" ] && makedepends+=('lirc-utils') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz - browser-plugins.ini) -sha256sums=('74c73a5decb69572cb182005b144493c2f6e7f48d4c57851e6da33e8e76fb039' - 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e') + browser-plugins.ini bugreport.patch) +sha256sums=('eda9e0a016bb2ac14f7cd7c8c03b8ee1ab3f1b3ba6558f65c64514e5d2583e01' + 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e' + '30481dab7e21b66257e3238f5a8b708e1a5c4797d7da904f7ebaba4c2c2ef167') + + +prepare() { + cd "$pkgbase-$pkgver" + + # Make compatible with Python 3 and Gstreamer 1.0 + patch -Np1 -i ../bugreport.patch +} build() { cd "$pkgbase-$pkgver" @@ -40,7 +50,6 @@ package_totem() { 'gst-libav: Extra media codecs' 'lirc-utils: Infrared Remote Control plugin' 'grilo-plugins: Browse sidebar (remote media)' - 'pyxdg: opensubtitles plugin' 'libzeitgeist: Zeitgeist plugin') cd "$pkgbase-$pkgver" @@ -49,9 +58,6 @@ package_totem() { rm -r "$pkgdir/usr/lib/mozilla" rm "$pkgdir/usr/lib/totem/totem-plugin-viewer" - sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \ - $pkgdir/usr/lib/totem/totem/totem-bugreport.py - install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING" } @@ -65,7 +71,7 @@ package_totem-plugin() { plugindir=/usr/lib/mozilla/plugins \ xptdir=/usr/lib/mozilla/plugins \ DESTDIR="$pkgdir" install - + install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini" install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING" diff --git a/extra/totem/bugreport.patch b/extra/totem/bugreport.patch new file mode 100644 index 000000000..13bcfe2e5 --- /dev/null +++ b/extra/totem/bugreport.patch @@ -0,0 +1,22 @@ +diff -u -r totem-3.8.2/data/totem-bugreport.py totem-3.8.2-bugreport/data/totem-bugreport.py +--- totem-3.8.2/data/totem-bugreport.py 2013-03-13 16:34:44.000000000 +0100 ++++ totem-3.8.2-bugreport/data/totem-bugreport.py 2013-05-14 13:54:04.243699665 +0200 +@@ -4,7 +4,7 @@ + from gi.repository import Gtk + + # Get the GStreamer version +-if os.system ('gst-typefind-0.10 --version') == 0: ++if os.system ('gst-typefind-1.0 --version') == 0: + # List the formats of the last files played + last_visited = 0 + recent_manager = Gtk.RecentManager.get_default () +@@ -15,7 +15,7 @@ + last = recent.get_uri_display () + + if last != None: +- file_handle = os.popen ('gst-typefind-0.10 "%s"' % (last)) ++ file_handle = os.popen ('gst-typefind-1.0 "%s"' % (last)) + parts = file_handle.read ().split (' ') + date = datetime.fromtimestamp (last_visited) +- print 'Listened to a "%s" file on %s' % (parts.pop ().strip (), date.isoformat ()) ++ print('Listened to a "%s" file on %s' % (parts.pop ().strip (), date.isoformat ())) |