1 |
commit: 8a9a636ab45726aac3c466af1f447c02e369d81c |
2 |
Author: Petros Siligkounas <petross404 <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Feb 17 21:16:59 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 19 17:46:54 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a9a636a |
7 |
|
8 |
media-video/griffith: fixes cannot import name InstrumentationManager |
9 |
|
10 |
Closes: https://bugs.gentoo.org/665068 |
11 |
Package-Manager: Portage-2.3.60, Repoman-2.3.12 |
12 |
Signed-off-by: Πέτρος Σιλιγκούνας <petross404 <AT> gmail.com> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/9763 |
14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
15 |
|
16 |
.../griffith/files/griffith-0.13-validators.patch | 17 +++++++++++++++++ |
17 |
media-video/griffith/griffith-0.13-r2.ebuild | 3 ++- |
18 |
2 files changed, 19 insertions(+), 1 deletion(-) |
19 |
|
20 |
diff --git a/media-video/griffith/files/griffith-0.13-validators.patch b/media-video/griffith/files/griffith-0.13-validators.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..f94275f3c17 |
23 |
--- /dev/null |
24 |
+++ b/media-video/griffith/files/griffith-0.13-validators.patch |
25 |
@@ -0,0 +1,17 @@ |
26 |
+--- a/griffith-0.13/lib/db/validators.py 2018-09-02 00:37:03.052248916 +0300 |
27 |
++++ b/griffith-0.13/lib/db/validators.py 2018-09-02 00:37:22.462248580 +0300 |
28 |
+@@ -23,7 +23,13 @@ |
29 |
+ |
30 |
+ import logging |
31 |
+ |
32 |
+-from sqlalchemy.orm.interfaces import AttributeExtension, InstrumentationManager |
33 |
++from sqlalchemy.orm.interfaces import AttributeExtension |
34 |
++try: |
35 |
++ # sql alchemy 0.8 (and above) |
36 |
++ from sqlalchemy.ext.instrumentation import InstrumentationManager |
37 |
++except: |
38 |
++ # sql alchemy 0.7 |
39 |
++ from sqlalchemy.orm.interfaces import InstrumentationManager |
40 |
+ from sqlalchemy.orm import ColumnProperty |
41 |
+ from sqlalchemy.types import String |
42 |
+ |
43 |
|
44 |
diff --git a/media-video/griffith/griffith-0.13-r2.ebuild b/media-video/griffith/griffith-0.13-r2.ebuild |
45 |
index 66b03bc29c8..788a9f95c7e 100644 |
46 |
--- a/media-video/griffith/griffith-0.13-r2.ebuild |
47 |
+++ b/media-video/griffith/griffith-0.13-r2.ebuild |
48 |
@@ -1,4 +1,4 @@ |
49 |
-# Copyright 1999-2018 Gentoo Foundation |
50 |
+# Copyright 1999-2019 Gentoo Authors |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
|
53 |
EAPI=5 |
54 |
@@ -46,6 +46,7 @@ src_prepare() { |
55 |
"${S}"/lib/gconsole.py || die "sed failed" |
56 |
|
57 |
epatch "${FILESDIR}/0.10-fix_lib_path.patch" |
58 |
+ epatch "${FILESDIR}/griffith-0.13-validators.patch" |
59 |
} |
60 |
|
61 |
src_compile() { |