Attachment 169583 Details for Bug 208988 – Patch to update multimedia/quodlibet to 3.6.1

[patch] Patch to update multimedia/quodlibet to 3.6.1

quodlibet.diff (text/plain), 13.48 KB, created by Ben Woods on 2016-04-23 00:24:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Woods

Created: 2016-04-23 00:24:34 UTC

Size: 13.48 KB

patch

obsolete

>Index: multimedia/quodlibet/Makefile
>===================================================================
>--- multimedia/quodlibet/Makefile	(revision 413796)
>+++ multimedia/quodlibet/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	quodlibet
>-PORTVERSION=	2.6.3
>-PORTREVISION=	3
>+PORTVERSION=	3.6.1
> CATEGORIES=	multimedia audio python gnome
> MASTER_SITES=	http://bitbucket.org/lazka/${PORTNAME}-files/raw/default/releases/
> 
>@@ -11,22 +10,25 @@
> COMMENT=	GTK+-based audio player written in Python
> 
> LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs \
>+		${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen \
>+		${LOCALBASE}/libexec/notification-daemon:deskutils/notification-daemon
>+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
>+		libwebkit2gtk-4.0.so:www/webkit2-gtk3
> 
>-USE_PYTHON=	distutils autoplist
>-USE_GNOME=	intltool pygtk2
>-USES=		display gettext python
>+USE_PYTHON=			distutils autoplist
>+USE_GNOME=			gtk30 intltool pygobject3
>+USES=				desktop-file-utils display gettext python
> PYDISTUTILS_INSTALLNOSINGLE=	yes
> 
>-EXTRA_PATCHES=	${FILESDIR}/extra-patch-pydistutils
>+USE_GSTREAMER1=	good
> 
>-USE_GSTREAMER=	gconf good python
>-
>-OPTIONS_DEFINE=		FLAC MP3 AAC MUSEPACK OGG SPEEX VORBIS WAVPACK DBUS REMOTE
>+OPTIONS_DEFINE=		AAC DBUS FLAC MP3 OGG REMOTE SPEEX VORBIS WAVPACK
> OPTIONS_DEFINE_i386=	SPC
>-OPTIONS_DEFAULT=	FLAC MP3 AAC MUSEPACK OGG SPEEX VORBIS WAVPACK DBUS REMOTE
>+OPTIONS_DEFAULT=	AAC DBUS FLAC MP3 OGG REMOTE SPEEX VORBIS WAVPACK
> OPTIONS_DEFAULT_i386=	SPC
> 
> SPC_DESC=	SPC (SNES ROM audio) support on i386
>@@ -33,21 +35,15 @@
> SPEEX_DESC=	OGG/Speex audio support
> REMOTE_DESC=	Enable remote playback
> 
>-OGG_USE=	GSTREAMER=ogg
>-VORBIS_USE=	GSTREAMER=vorbis
>-SPC_USE=	GSTREAMER=spc
>-SPEEX_USE=	GSTREAMER=speex
>-MP3_USE=	GSTREAMER=mp3
>-FLAC_USE=	GSTREAMER=flac
>+OGG_USE=	GSTREAMER1=ogg
>+VORBIS_USE=	GSTREAMER1=vorbis
>+SPC_USE=	GSTREAMER1=spc
>+SPEEX_USE=	GSTREAMER1=speex
>+MP3_USE=	GSTREAMER1=mad
>+FLAC_USE=	GSTREAMER1=flac
> 
>-MUSEPACK_LIB_DEPENDS=	libmpcdec.so:audio/musepack
>-MUSEPACK_USE=		GSTREAMER=musepack
>-
>-WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
>-WAVPACK_USE=		GSTREAMER=wavpack
>-
> AAC_LIB_DEPENDS=	libmp4v2.so:multimedia/mp4v2
>-AAC_USE=		GSTREAMER=faad
>+AAC_USE=		GSTREAMER1=faad
> 
> DBUS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus
> DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus
>@@ -54,6 +50,8 @@
> 
> REMOTE_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser
> REMOTE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser
>-REMOTE_USE=		GSTREAMER=gnomevfs
> 
>+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
>+WAVPACK_USE=		GSTREAMER1=wavpack
>+
> .include <bsd.port.mk>
>Index: multimedia/quodlibet/distinfo
>===================================================================
>--- multimedia/quodlibet/distinfo	(revision 413796)
>+++ multimedia/quodlibet/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (quodlibet-2.6.3.tar.gz) = dff4ebb90c676678f72cecbff8ab15d80154354f40a865b6c9c82bb048d48a46
>-SIZE (quodlibet-2.6.3.tar.gz) = 2507416
>+SHA256 (quodlibet-3.6.1.tar.gz) = e6525bbdebd790992431b15775e9ec257f72a4dccb1136994186c32549c04a48
>+SIZE (quodlibet-3.6.1.tar.gz) = 3167319
>Index: multimedia/quodlibet/files/extra-patch-pydistutils
>===================================================================
>--- multimedia/quodlibet/files/extra-patch-pydistutils	(revision 413796)
>+++ multimedia/quodlibet/files/extra-patch-pydistutils	(nonexistent)
>@@ -1,145 +0,0 @@
>---- gdist/icons.py.orig	2013-09-25 12:31:19.000000000 +0200
>-+++ gdist/icons.py	2014-04-23 11:06:22.328926759 +0200
>-@@ -35,13 +35,16 @@
>-     prefix = None
>- 
>-     def initialize_options(self):
>--        pass
>-+        self.outfiles = []
>- 
>-     def finalize_options(self):
>-         self.set_undefined_options('install',
>-                                    ('root', 'root'),
>-                                    ('install_base', 'prefix'))
>- 
>-+    def get_outputs(self):
>-+        return self.outfiles
>-+
>-     def run(self):
>-         # install into hicolor icon theme
>-         basepath = os.path.join(self.prefix, 'share', 'icons', 'hicolor')
>-@@ -52,11 +55,13 @@
>- 
>-         scalable = os.path.join(local, "scalable", "apps")
>-         scalable_dst = os.path.join(basepath, "scalable", "apps")
>--        self.copy_tree(scalable, scalable_dst)
>-+        out = self.copy_tree(scalable, scalable_dst)
>-+        self.outfiles.extend(out)
>- 
>-         png = os.path.join(local, "64x64", "apps")
>-         png_dst = os.path.join(basepath, "64x64", "apps")
>--        self.copy_tree(png, png_dst)
>-+        out = self.copy_tree(png, png_dst)
>-+        self.outfiles.extend(out)
>- 
>-         # this fails during packaging.. so ignore the outcome
>-         subprocess.call(['gtk-update-icon-cache', basepath])
>-@@ -66,4 +71,5 @@
>-         if self.root is not None:
>-             basepath = change_root(self.root, basepath)
>- 
>--        self.copy_tree(png, basepath)
>-+        out = self.copy_tree(png, basepath)
>-+        self.outfiles.extend(out)
>---- gdist/man.py.orig	2013-09-25 12:31:19.000000000 +0200
>-+++ gdist/man.py	2014-04-23 11:10:03.793912457 +0200
>-@@ -29,7 +29,7 @@
>-     root = None
>- 
>-     def initialize_options(self):
>--        pass
>-+        self.outfiles = []
>- 
>-     def finalize_options(self):
>-         self.set_undefined_options('install', ('root', 'root'), ('install_base', 'prefix'))
>-@@ -38,15 +38,22 @@
>-             if not man_page[-1].isdigit():
>-                 raise SystemExit("%r has no section" % man_page)
>- 
>-+    def get_outputs(self):
>-+        return self.outfiles
>-+
>-     def run(self):
>-         basepath = os.path.join(self.prefix, 'share', 'man')
>-         if self.root != None:
>-           basepath = change_root(self.root, basepath)
>--        self.mkpath(basepath)
>-+        out = self.mkpath(basepath)
>-+        self.outfiles.extend(out or [])
>-         for man_page in self.man_pages:
>-             manpath = os.path.join(basepath, "man" + man_page[-1])
>-             self.mkpath(manpath)
>-+            out = self.mkpath(manpath)
>-+            self.outfiles.extend(out or [])
>-             fullpath = os.path.join(manpath, os.path.basename(man_page))
>--            self.copy_file(man_page, fullpath)
>-+            (out, _) = self.copy_file(man_page, fullpath)
>-+            self.outfiles.append(out)
>- 
>- __all__ = ["install_man"]
>---- gdist/po.py.orig	2013-09-25 12:31:19.000000000 +0200
>-+++ gdist/po.py	2014-04-23 11:06:22.329926420 +0200
>-@@ -149,7 +149,7 @@
>-     root = None
>- 
>-     def initialize_options(self):
>--        pass
>-+        self.outfiles = []
>- 
>-     def finalize_options(self):
>-         self.set_undefined_options('build', ('build_base', 'build_base'))
>-@@ -159,6 +159,9 @@
>-             ('install_base', 'install_base'),
>-             ('skip_build', 'skip_build'))
>- 
>-+    def get_outputs(self):
>-+        return self.outfiles
>-+
>-     def run(self):
>-         if not self.skip_build:
>-             self.run_command('build_mo')
>-@@ -166,6 +169,7 @@
>-         dest = os.path.join(self.install_base, "share", "locale")
>-         if self.root != None:
>-             dest = change_root(self.root, dest)
>--        self.copy_tree(src, dest)
>-+        out = self.copy_tree(src, dest)
>-+        self.outfiles.extend(out)
>- 
>- __all__ = ["build_mo", "install_mo", "po_stats", "check_pot"]
>---- gdist/shortcuts.py.orig	2013-09-25 12:31:19.000000000 +0200
>-+++ gdist/shortcuts.py	2014-04-23 11:11:31.218905210 +0200
>-@@ -66,7 +66,7 @@
>-     root = None
>- 
>-     def initialize_options(self):
>--        pass
>-+        self.outfiles = []
>- 
>-     def finalize_options(self):
>-         self.set_undefined_options('build', ('build_base', 'build_base'))
>-@@ -79,6 +79,9 @@
>-         self.set_undefined_options(
>-             'build_shortcuts', ('shortcuts', 'shortcuts'))
>- 
>-+    def get_outputs(self):
>-+        return self.outfiles
>-+
>-     def run(self):
>-         if not self.skip_build:
>-             self.run_command('build_shortcuts')
>-@@ -86,10 +89,13 @@
>-         if self.root != None:
>-             basepath = change_root(self.root, basepath)
>-         srcpath = os.path.join(self.build_base, 'share', 'applications')
>--        self.mkpath(basepath)
>-+        out = self.mkpath(basepath)
>-+        self.outfiles.extend(out or [])
>-         for shortcut in self.shortcuts:
>-             fullsrc = os.path.join(srcpath, shortcut)
>-             fullpath = os.path.join(basepath, shortcut)
>-             self.copy_file(fullsrc, fullpath)
>-+            (out, _) = self.copy_file(fullsrc, fullpath)
>-+            self.outfiles.append(out)
>- 
>- __all__ = ["build_shortcuts", "install_shortcuts"]
>
>Property changes on: multimedia/quodlibet/files/extra-patch-pydistutils
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: multimedia/quodlibet/files/patch-gdist__man.py
>===================================================================
>--- multimedia/quodlibet/files/patch-gdist__man.py	(revision 413796)
>+++ multimedia/quodlibet/files/patch-gdist__man.py	(nonexistent)
>@@ -1,11 +0,0 @@
>---- gdist/man.py.orig	2010-02-18 02:56:24.000000000 -0500
>-+++ gdist/man.py	2010-02-18 02:56:58.000000000 -0500
>-@@ -36,7 +36,7 @@
>-                 raise SystemExit("%r has no section" % man_page)
>- 
>-     def run(self):
>--        basepath = os.path.join(self.prefix, 'share', 'man')
>-+        basepath = os.path.join(self.prefix, 'man')
>-         if self.root != None:
>-           basepath = change_root(self.root, basepath)
>-         self.mkpath(basepath)
>
>Property changes on: multimedia/quodlibet/files/patch-gdist__man.py
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: multimedia/quodlibet/files/patch-gdist_man.py
>===================================================================
>--- multimedia/quodlibet/files/patch-gdist_man.py	(nonexistent)
>+++ multimedia/quodlibet/files/patch-gdist_man.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- gdist/man.py.orig	2016-04-22 21:47:37 UTC
>++++ gdist/man.py
>+@@ -40,7 +40,7 @@ class install_man(Command):
>+         )
>+ 
>+         if self.mandir is None:
>+-            self.mandir = os.path.join(self.install_dir, 'share', 'man')
>++            self.mandir = os.path.join(self.install_dir, 'man')
>+ 
>+         self.man_pages = self.distribution.man_pages
>+         for man_page in self.man_pages:
>
>Property changes on: multimedia/quodlibet/files/patch-gdist_man.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: multimedia/quodlibet/files/patch-operon.py
>===================================================================
>--- multimedia/quodlibet/files/patch-operon.py	(revision 413796)
>+++ multimedia/quodlibet/files/patch-operon.py	(nonexistent)
>@@ -1,8 +0,0 @@
>---- operon.py.orig	2013-09-13 00:49:22.000000000 +0200
>-+++ operon.py	2014-04-23 12:21:26.430626881 +0200
>-@@ -1,4 +1,4 @@
>--#!/usr/bin/python
>-+#!/usr/bin/env python
>- # Copyright 2012,2013 Christoph Reiter
>- #
>- # This program is free software; you can redistribute it and/or modify
>
>Property changes on: multimedia/quodlibet/files/patch-operon.py
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: multimedia/quodlibet/pkg-descr
>===================================================================
>--- multimedia/quodlibet/pkg-descr	(revision 413796)
>+++ multimedia/quodlibet/pkg-descr	(working copy)
>@@ -6,4 +6,4 @@
> lets you do this for all the file formats it supports -- Ogg Vorbis,
> FLAC, MP3, Musepack, and MOD.
> 
>-WWW: http://code.google.com/p/quodlibet/
>+WWW: https://quodlibet.readthedocs.org/
>Index: multimedia/quodlibet/pkg-message
>===================================================================
>--- multimedia/quodlibet/pkg-message	(revision 413796)
>+++ multimedia/quodlibet/pkg-message	(nonexistent)
>@@ -1,11 +0,0 @@
>-=====================================================================
>-For additional Quod Libet plugins:
>-
>-1. Fetch plugins archive from project download page:
>-   https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-plugins-2.6.3.tar.gz
>-
>-2. Extract archive into plugin dir in a user's home directory
>-   mkdir -p ~/.quodlibet/plugins/
>-   cd ~/.quodlibet/plugins/
>-   tar xf path/to/downloaded/quodlibet-plugins-2.6.3.tar.gz
>-=====================================================================
>
>Property changes on: multimedia/quodlibet/pkg-message
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Flags:

woodsb02: maintainer-approval? (johnson.peter)

Actions: View | Diff

Attachments on bug 208988: 169583 | 169584 | 169585