cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r526491

Browse Source 
games/anki: Update to 2.1.16

* Backport two patches from upstream that fix the argument handling with
  multimedia/mpv since r520597.

* Also slightly change the MASTER_SITES as upstream distribute tarballs for
  newer versions only via GitHub.

Although there are already some newer releases available use the 2.1.16
release for a while.  It's mainly because the build process has changed a
lot since the 2.1.17 release and still needs to be investigated a little
more closely.

Changelog:

https://apps.ankiweb.net/docs/changes.html#changes-in-2.1.16

Approved by:	ports-secteam bugfix blanket
This commit is contained in:
Kai Knoblich 2020-02-19 08:22:09 +00:00
parent 3bb50ea0bc
commit 7b77e19910
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q1/; revision=526492
5 changed files with 90 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
games/anki/Makefile
View File

@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= anki
DISTVERSION= 2.1.15
PORTREVISION= 1
DISTVERSION= 2.1.16
CATEGORIES= games python
MASTER_SITES= https://apps.ankiweb.net/downloads/current/
MASTER_SITES= https://apps.ankiweb.net/downloads/archive/
DISTNAME= anki-${PORTVERSION}-source
DIST_SUBDIR= python
@ -50,6 +49,7 @@ post-patch:
@${REINPLACE_CMD} -i '' \
's|%%PREFIX%%|${PREFIX}|' \
${WRKSRC}/anki/lang.py
@${FIND} ${WRKSRC} -name '*.orig' -delete
post-patch-NLS-off:
@${REINPLACE_CMD} -i '' '/locale/s/^/#/' \

6
games/anki/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1566645545
SHA256 (python/anki-2.1.15-source.tgz) = 5a53760164c77d619f55107a13099cffe620566a7f610b61b6c4b52487f3bb89
SIZE (python/anki-2.1.15-source.tgz) = 4269571
TIMESTAMP = 1581366080
SHA256 (python/anki-2.1.16-source.tgz) = f300dd33c795fbfbf3a883457aea50ee5f5f602899dc7122fd7e526a7328d9bd
SIZE (python/anki-2.1.16-source.tgz) = 4211686

21
games/anki/files/patch-anki_mpv.py Normal file
View File

@ -0,0 +1,21 @@
Fix arguments that are passed to mpv. Otherwise mpv terminates with an error
as it expects option values passed after a '=' since 0.31.0.
Backported and adapted for the 2.1.16 release.
Obtained from: https://github.com/ankitects/anki/commit/ccd715013609133c55e83924734efa78abc03326
--- anki/mpv.py.orig 2020-02-18 09:38:27 UTC
+++ anki/mpv.py
@@ -104,9 +104,9 @@ class MPVBase:
"""
self.argv = [self.executable]
self.argv += self.default_argv
- self.argv += ["--input-ipc-server", self._sock_filename]
+ self.argv += ["--input-ipc-server="+self._sock_filename]
if self.window_id is not None:
- self.argv += ["--wid", str(self.window_id)]
+ self.argv += ["--wid="+str(self.window_id)]
def _start_process(self):
"""Start the mpv process.

16
games/anki/files/patch-anki_sound.py Normal file
View File

@ -0,0 +1,16 @@
Fix arguments that are passed to mpv.
Backported and adapted for the 2.1.16 release.
Obtained from: https://github.com/ankitects/anki/commit/ccd715013609133c55e83924734efa78abc03326
--- anki/sound.py.orig 2020-02-18 09:38:48 UTC
+++ anki/sound.py
@@ -124,7 +124,6 @@ class MpvManager(MPV):
def setMpvConfigBase(base):
mpvConfPath = os.path.join(base, "mpv.conf")
MpvManager.default_argv += [
- "--no-config",
"--include="+mpvConfPath,
]

112
games/anki/pkg-plist
View File

@ -354,8 +354,8 @@ man/man1/anki.1.gz
%%DATADIR%%/aqt/modelchooser.py
%%DATADIR%%/aqt/models.py
%%DATADIR%%/aqt/overview.py
%%DATADIR%%/aqt/preferences.py
%%DATADIR%%/aqt/pinnedmodules.py
%%DATADIR%%/aqt/preferences.py
%%DATADIR%%/aqt/profiles.py
%%DATADIR%%/aqt/progress.py
%%DATADIR%%/aqt/qt.py
@ -772,76 +772,58 @@ man/man1/anki.1.gz
%%DATADIR%%/web/webview.css
%%DATADIR%%/web/webview.js
share/applications/anki.desktop
%%NLS%%share/locale/af/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ar/LC_MESSAGES/anki.mo
%%NLS%%share/locale/az/LC_MESSAGES/anki.mo
%%NLS%%share/locale/bg/LC_MESSAGES/anki.mo
%%NLS%%share/locale/bn/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ca/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ca@valencia/LC_MESSAGES/anki.mo
%%NLS%%share/locale/cs/LC_MESSAGES/anki.mo
%%NLS%%share/locale/da/LC_MESSAGES/anki.mo
%%NLS%%share/locale/de/LC_MESSAGES/anki.mo
%%NLS%%share/locale/el/LC_MESSAGES/anki.mo
%%NLS%%share/locale/af_ZA/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ar_SA/LC_MESSAGES/anki.mo
%%NLS%%share/locale/bg_BG/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ca_ES/LC_MESSAGES/anki.mo
%%NLS%%share/locale/cs_CZ/LC_MESSAGES/anki.mo
%%NLS%%share/locale/da_DK/LC_MESSAGES/anki.mo
%%NLS%%share/locale/de_DE/LC_MESSAGES/anki.mo
%%NLS%%share/locale/el_GR/LC_MESSAGES/anki.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/anki.mo
%%NLS%%share/locale/eo/LC_MESSAGES/anki.mo
%%NLS%%share/locale/es/LC_MESSAGES/anki.mo
%%NLS%%share/locale/et/LC_MESSAGES/anki.mo
%%NLS%%share/locale/eu/LC_MESSAGES/anki.mo
%%NLS%%share/locale/fa/LC_MESSAGES/anki.mo
%%NLS%%share/locale/fi/LC_MESSAGES/anki.mo
%%NLS%%share/locale/fr/LC_MESSAGES/anki.mo
%%NLS%%share/locale/fr_CA/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ga/LC_MESSAGES/anki.mo
%%NLS%%share/locale/gl/LC_MESSAGES/anki.mo
%%NLS%%share/locale/gu/LC_MESSAGES/anki.mo
%%NLS%%share/locale/he/LC_MESSAGES/anki.mo
%%NLS%%share/locale/hr/LC_MESSAGES/anki.mo
%%NLS%%share/locale/hu/LC_MESSAGES/anki.mo
%%NLS%%share/locale/hy/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ia/LC_MESSAGES/anki.mo
%%NLS%%share/locale/is/LC_MESSAGES/anki.mo
%%NLS%%share/locale/it/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ja/LC_MESSAGES/anki.mo
%%NLS%%share/locale/jbo/LC_MESSAGES/anki.mo
%%NLS%%share/locale/kab/LC_MESSAGES/anki.mo
%%NLS%%share/locale/km/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ko/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ku/LC_MESSAGES/anki.mo
%%NLS%%share/locale/la/LC_MESSAGES/anki.mo
%%NLS%%share/locale/lt/LC_MESSAGES/anki.mo
%%NLS%%share/locale/lv/LC_MESSAGES/anki.mo
%%NLS%%share/locale/mn/LC_MESSAGES/anki.mo
%%NLS%%share/locale/mr/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ms/LC_MESSAGES/anki.mo
%%NLS%%share/locale/nb/LC_MESSAGES/anki.mo
%%NLS%%share/locale/nl/LC_MESSAGES/anki.mo
%%NLS%%share/locale/no/LC_MESSAGES/anki.mo
%%NLS%%share/locale/oc/LC_MESSAGES/anki.mo
%%NLS%%share/locale/pl/LC_MESSAGES/anki.mo
%%NLS%%share/locale/pt/LC_MESSAGES/anki.mo
%%NLS%%share/locale/eo_UY/LC_MESSAGES/anki.mo
%%NLS%%share/locale/es_ES/LC_MESSAGES/anki.mo
%%NLS%%share/locale/et_EE/LC_MESSAGES/anki.mo
%%NLS%%share/locale/eu_ES/LC_MESSAGES/anki.mo
%%NLS%%share/locale/fa_IR/LC_MESSAGES/anki.mo
%%NLS%%share/locale/fi_FI/LC_MESSAGES/anki.mo
%%NLS%%share/locale/fr_FR/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ga_IE/LC_MESSAGES/anki.mo
%%NLS%%share/locale/gl_ES/LC_MESSAGES/anki.mo
%%NLS%%share/locale/he_IL/LC_MESSAGES/anki.mo
%%NLS%%share/locale/hr_HR/LC_MESSAGES/anki.mo
%%NLS%%share/locale/hu_HU/LC_MESSAGES/anki.mo
%%NLS%%share/locale/hy_AM/LC_MESSAGES/anki.mo
%%NLS%%share/locale/it_IT/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ja_JP/LC_MESSAGES/anki.mo
%%NLS%%share/locale/jbo_EN/LC_MESSAGES/anki.mo
%%NLS%%share/locale/kab_KAB/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ko_KR/LC_MESSAGES/anki.mo
%%NLS%%share/locale/la_LA/LC_MESSAGES/anki.mo
%%NLS%%share/locale/mn_MN/LC_MESSAGES/anki.mo
%%NLS%%share/locale/mr_IN/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ms_MY/LC_MESSAGES/anki.mo
%%NLS%%share/locale/nb_NO/LC_MESSAGES/anki.mo
%%NLS%%share/locale/nl_NL/LC_MESSAGES/anki.mo
%%NLS%%share/locale/no_NO/LC_MESSAGES/anki.mo
%%NLS%%share/locale/oc_FR/LC_MESSAGES/anki.mo
%%NLS%%share/locale/pl_PL/LC_MESSAGES/anki.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ro/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ru/LC_MESSAGES/anki.mo
%%NLS%%share/locale/sco/LC_MESSAGES/anki.mo
%%NLS%%share/locale/sk/LC_MESSAGES/anki.mo
%%NLS%%share/locale/sl/LC_MESSAGES/anki.mo
%%NLS%%share/locale/sr/LC_MESSAGES/anki.mo
%%NLS%%share/locale/sv/LC_MESSAGES/anki.mo
%%NLS%%share/locale/szl/LC_MESSAGES/anki.mo
%%NLS%%share/locale/th/LC_MESSAGES/anki.mo
%%NLS%%share/locale/tlh/LC_MESSAGES/anki.mo
%%NLS%%share/locale/tr/LC_MESSAGES/anki.mo
%%NLS%%share/locale/uk/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ur/LC_MESSAGES/anki.mo
%%NLS%%share/locale/vi/LC_MESSAGES/anki.mo
%%NLS%%share/locale/wo/LC_MESSAGES/anki.mo
%%NLS%%share/locale/pt_PT/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ro_RO/LC_MESSAGES/anki.mo
%%NLS%%share/locale/ru_RU/LC_MESSAGES/anki.mo
%%NLS%%share/locale/sk_SK/LC_MESSAGES/anki.mo
%%NLS%%share/locale/sl_SI/LC_MESSAGES/anki.mo
%%NLS%%share/locale/sr_SP/LC_MESSAGES/anki.mo
%%NLS%%share/locale/sv_SE/LC_MESSAGES/anki.mo
%%NLS%%share/locale/th_TH/LC_MESSAGES/anki.mo
%%NLS%%share/locale/tr_TR/LC_MESSAGES/anki.mo
%%NLS%%share/locale/uk_UA/LC_MESSAGES/anki.mo
%%NLS%%share/locale/vi_VN/LC_MESSAGES/anki.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/anki.mo
%%NLS%%share/locale/zh_HK/LC_MESSAGES/anki.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/anki.mo
share/pixmaps/anki.png
share/pixmaps/anki.xpm
%%NLS%%@dir %%DATADIR%%/locale
@dir %%DATADIR%%/aqt/template
%%NLS%%@dir share/locale
%%NLS%%@dir share/