Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] anki: fix mpv args
@ 2020-11-13  2:28 My9xVm
  2020-11-13  2:31 ` My9xVm
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: My9xVm @ 2020-11-13  2:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 387 bytes --]

There is a new pull request by My9xVm against master on the void-packages repository

https://github.com/My9xVm/void-packages anki
https://github.com/void-linux/void-packages/pull/26341

anki: fix mpv args
source: https://github.com/ankitects/anki/commit/ccd715013609133c55e83924734efa78abc03326

A patch file from https://github.com/void-linux/void-packages/pull/26341.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-anki-26341.patch --]
[-- Type: text/x-diff, Size: 2136 bytes --]

From bf6ab2b1068b7d3a9ee2084bc3bdb5829e256fc6 Mon Sep 17 00:00:00 2001
From: My9xVm <48840001+My9xVm@users.noreply.github.com>
Date: Fri, 13 Nov 2020 02:21:38 +0000
Subject: [PATCH 1/2] Update template

---
 srcpkgs/anki/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/anki/template b/srcpkgs/anki/template
index a25bc0d4e7e..d9f54c25f99 100644
--- a/srcpkgs/anki/template
+++ b/srcpkgs/anki/template
@@ -1,7 +1,7 @@
 # Template file for 'anki'
 pkgname=anki
 version=2.1.15
-revision=3
+revision=4
 archs=noarch
 build_style=gnu-makefile
 depends="python3-PyQt5-webengine python3-requests python3-SQLAlchemy

From 42aa75c9c9f575e0fe8b38bef23739236c1e1c20 Mon Sep 17 00:00:00 2001
From: My9xVm <48840001+My9xVm@users.noreply.github.com>
Date: Fri, 13 Nov 2020 02:23:49 +0000
Subject: [PATCH 2/2] Create 0000-fix_mpv_args.patch

---
 srcpkgs/anki/patches/0000-fix_mpv_args.patch | 29 ++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/anki/patches/0000-fix_mpv_args.patch

diff --git a/srcpkgs/anki/patches/0000-fix_mpv_args.patch b/srcpkgs/anki/patches/0000-fix_mpv_args.patch
new file mode 100644
index 00000000000..96dec5eceaf
--- /dev/null
+++ b/srcpkgs/anki/patches/0000-fix_mpv_args.patch
@@ -0,0 +1,29 @@
+--- ./anki/mpv.py
++++ ./anki/mpv.py
+@@ -104,9 +104,9 @@
+         """
+         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.
+
+--- ./anki/sound.py
++++ ./anki/sound.py
+@@ -123,10 +123,7 @@
+ 
+ def setMpvConfigBase(base):
+     mpvConfPath = os.path.join(base, "mpv.conf")
+-    MpvManager.default_argv += [
+-        "--no-config",
+-        "--include="+mpvConfPath,
+-    ]
++    MpvManager.default_argv += ["--include="+mpvConfPath]
+ 
+ mpvManager = None
+ 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: anki: fix mpv args
  2020-11-13  2:28 [PR PATCH] anki: fix mpv args My9xVm
@ 2020-11-13  2:31 ` My9xVm
  2020-11-13  2:31 ` [PR PATCH] [Closed]: " My9xVm
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: My9xVm @ 2020-11-13  2:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

New comment by My9xVm on void-packages repository

https://github.com/void-linux/void-packages/pull/26341#issuecomment-726468474

Comment:
https://github.com/void-linux/void-packages/issues/25848

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Closed]: anki: fix mpv args
  2020-11-13  2:28 [PR PATCH] anki: fix mpv args My9xVm
  2020-11-13  2:31 ` My9xVm
@ 2020-11-13  2:31 ` My9xVm
  2020-11-13  2:32 ` My9xVm
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: My9xVm @ 2020-11-13  2:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

There's a closed pull request on the void-packages repository

anki: fix mpv args
https://github.com/void-linux/void-packages/pull/26341

Description:
source: https://github.com/ankitects/anki/commit/ccd715013609133c55e83924734efa78abc03326

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: anki: fix mpv args
  2020-11-13  2:28 [PR PATCH] anki: fix mpv args My9xVm
  2020-11-13  2:31 ` My9xVm
  2020-11-13  2:31 ` [PR PATCH] [Closed]: " My9xVm
@ 2020-11-13  2:32 ` My9xVm
  2020-11-14  2:01 ` ericonr
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: My9xVm @ 2020-11-13  2:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

New comment by My9xVm on void-packages repository

https://github.com/void-linux/void-packages/pull/26341#issuecomment-726468474

Comment:
https://github.com/void-linux/void-packages/issues/25848

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: anki: fix mpv args
  2020-11-13  2:28 [PR PATCH] anki: fix mpv args My9xVm
                   ` (2 preceding siblings ...)
  2020-11-13  2:32 ` My9xVm
@ 2020-11-14  2:01 ` ericonr
  2020-11-14 15:44 ` [PR PATCH] [Updated] " My9xVm
  2020-11-16 13:40 ` [PR PATCH] [Merged]: " ericonr
  5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2020-11-14  2:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 250 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26341#issuecomment-727120368

Comment:
Please squash yout commits into single one and follow the commit style "anki: backport patch to fix mpv args"

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] anki: fix mpv args
  2020-11-13  2:28 [PR PATCH] anki: fix mpv args My9xVm
                   ` (3 preceding siblings ...)
  2020-11-14  2:01 ` ericonr
@ 2020-11-14 15:44 ` My9xVm
  2020-11-16 13:40 ` [PR PATCH] [Merged]: " ericonr
  5 siblings, 0 replies; 7+ messages in thread
From: My9xVm @ 2020-11-14 15:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 392 bytes --]

There is an updated pull request by My9xVm against master on the void-packages repository

https://github.com/My9xVm/void-packages anki
https://github.com/void-linux/void-packages/pull/26341

anki: fix mpv args
source: https://github.com/ankitects/anki/commit/ccd715013609133c55e83924734efa78abc03326

A patch file from https://github.com/void-linux/void-packages/pull/26341.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-anki-26341.patch --]
[-- Type: text/x-diff, Size: 1937 bytes --]

From c7a6482290f21022b081f85754456cf43047cd15 Mon Sep 17 00:00:00 2001
From: ghost <ghost@invalid>
Date: Sun, 13 Sep 2020 12:26:40 +0000
Subject: [PATCH] anki: backport patch to fix mpv args

---
 srcpkgs/anki/patches/fix_mpv_args.patch | 29 +++++++++++++++++++++++++
 srcpkgs/anki/template                   |  3 +--
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/anki/patches/fix_mpv_args.patch

diff --git a/srcpkgs/anki/patches/fix_mpv_args.patch b/srcpkgs/anki/patches/fix_mpv_args.patch
new file mode 100644
index 00000000000..96dec5eceaf
--- /dev/null
+++ b/srcpkgs/anki/patches/fix_mpv_args.patch
@@ -0,0 +1,29 @@
+--- ./anki/mpv.py
++++ ./anki/mpv.py
+@@ -104,9 +104,9 @@
+         """
+         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.
+
+--- ./anki/sound.py
++++ ./anki/sound.py
+@@ -123,10 +123,7 @@
+ 
+ def setMpvConfigBase(base):
+     mpvConfPath = os.path.join(base, "mpv.conf")
+-    MpvManager.default_argv += [
+-        "--no-config",
+-        "--include="+mpvConfPath,
+-    ]
++    MpvManager.default_argv += ["--include="+mpvConfPath]
+ 
+ mpvManager = None
+ 
diff --git a/srcpkgs/anki/template b/srcpkgs/anki/template
index a25bc0d4e7e..55976fbd26e 100644
--- a/srcpkgs/anki/template
+++ b/srcpkgs/anki/template
@@ -1,8 +1,7 @@
 # Template file for 'anki'
 pkgname=anki
 version=2.1.15
-revision=3
-archs=noarch
+revision=4
 build_style=gnu-makefile
 depends="python3-PyQt5-webengine python3-requests python3-SQLAlchemy
  python3-PyAudio python3-mpv python3-Markdown python3-send2trash

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Merged]: anki: fix mpv args
  2020-11-13  2:28 [PR PATCH] anki: fix mpv args My9xVm
                   ` (4 preceding siblings ...)
  2020-11-14 15:44 ` [PR PATCH] [Updated] " My9xVm
@ 2020-11-16 13:40 ` ericonr
  5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2020-11-16 13:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

There's a merged pull request on the void-packages repository

anki: fix mpv args
https://github.com/void-linux/void-packages/pull/26341

Description:
source: https://github.com/ankitects/anki/commit/ccd715013609133c55e83924734efa78abc03326

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-11-16 13:40 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-13  2:28 [PR PATCH] anki: fix mpv args My9xVm
2020-11-13  2:31 ` My9xVm
2020-11-13  2:31 ` [PR PATCH] [Closed]: " My9xVm
2020-11-13  2:32 ` My9xVm
2020-11-14  2:01 ` ericonr
2020-11-14 15:44 ` [PR PATCH] [Updated] " My9xVm
2020-11-16 13:40 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).