all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#32431] [PATCH] gnu: clementine: Drop dependency on qtwebkit.
@ 2018-08-13 19:26 Pierre Langlois
  2018-08-13 20:58 ` Leo Famulari
  0 siblings, 1 reply; 9+ messages in thread
From: Pierre Langlois @ 2018-08-13 19:26 UTC (permalink / raw)
  To: 32431

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

Hello guix!

I realised clementine wasn't building because qtwebkit isn't building
either. But, it turns out that while it's an optional dependency
according to CMakeList.txt, it isn't actually used anywhere in the
code. Here's a patch that removes qtwebkit from its inputs.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-clementine-Drop-dependency-on-qtwebkit.patch --]
[-- Type: text/x-patch, Size: 931 bytes --]

From c32d30001676d80bc9c80ece3ee8c31ec9b72592 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
Date: Mon, 13 Aug 2018 09:05:17 +0100
Subject: [PATCH] gnu: clementine: Drop dependency on qtwebkit.

QtWebkit is optionally included in CMakeList.txt but isn't actually used
anywhere in the code.

* gnu/packages/music.scm (clementine)[inputs]: Remove qtwebkit.
---
 gnu/packages/music.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index c5ee4293b..cf1e0f82f 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -281,7 +281,6 @@ score, keyboard, guitar, drum and controller views.")
          ("pulseaudio" ,pulseaudio)
          ("qtbase" ,qtbase)
          ("qtx11extras" ,qtx11extras)
-         ("qtwebkit" ,qtwebkit)
          ("sqlite" ,sqlite-with-fts3)
          ("sparsehash" ,sparsehash)
          ("taglib" ,taglib)))
-- 
2.18.0


[-- Attachment #3: Type: text/plain, Size: 17 bytes --]


Thanks!
Pierre


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

* [bug#32431] [PATCH] gnu: clementine: Drop dependency on qtwebkit.
  2018-08-13 19:26 [bug#32431] [PATCH] gnu: clementine: Drop dependency on qtwebkit Pierre Langlois
@ 2018-08-13 20:58 ` Leo Famulari
  2018-08-13 21:12   ` Pierre Langlois
  0 siblings, 1 reply; 9+ messages in thread
From: Leo Famulari @ 2018-08-13 20:58 UTC (permalink / raw)
  To: Pierre Langlois; +Cc: 32431

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

On Mon, Aug 13, 2018 at 08:26:21PM +0100, Pierre Langlois wrote:
> Hello guix!
> 
> I realised clementine wasn't building because qtwebkit isn't building
> either. But, it turns out that while it's an optional dependency
> according to CMakeList.txt, it isn't actually used anywhere in the
> code. Here's a patch that removes qtwebkit from its inputs.
> 

> From c32d30001676d80bc9c80ece3ee8c31ec9b72592 Mon Sep 17 00:00:00 2001
> From: Pierre Langlois <pierre.langlois@gmx.com>
> Date: Mon, 13 Aug 2018 09:05:17 +0100
> Subject: [PATCH] gnu: clementine: Drop dependency on qtwebkit.
> 
> QtWebkit is optionally included in CMakeList.txt but isn't actually used
> anywhere in the code.
> 
> * gnu/packages/music.scm (clementine)[inputs]: Remove qtwebkit.

Thanks!

Does clementine work for you with this change? For me, it fails like
this:


$ clementine
16:58:17.043 INFO  main:315                         Clementine-qt5 1.3.1
16:58:17.065 WARN  Database:275                     Couldn't register FTS3 tokenizer :  QSqlError("1", "Unable to fetch row", "fts3tokenize disabled")
16:58:17.066 DEBUG Database:449                     Applying database schema update 13 from ":/schema/schema-13.sql"
16:58:17.066 ERROR Database:577                     db error:  QSqlError("1", "Unable to fetch row", "unknown tokenizer: unicode")
16:58:17.066 ERROR Database:578                     faulty query:  "CREATE VIRTUAL TABLE songs_fts USING fts3(\n  ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsgenre, ftscomment,\n  tokenize=unicode\n)"
16:58:17.066 ERROR Database:579                     bound values:  QMap()
__logging_message__16:58:17.066 ERROR unknown                          Unable to update music library database

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

* [bug#32431] [PATCH] gnu: clementine: Drop dependency on qtwebkit.
  2018-08-13 20:58 ` Leo Famulari
@ 2018-08-13 21:12   ` Pierre Langlois
  2018-08-14  2:31     ` Leo Famulari
  0 siblings, 1 reply; 9+ messages in thread
From: Pierre Langlois @ 2018-08-13 21:12 UTC (permalink / raw)
  To: Leo Famulari; +Cc: 32431

Hi Leo,

Leo Famulari writes:

> On Mon, Aug 13, 2018 at 08:26:21PM +0100, Pierre Langlois wrote:
>> Hello guix!
>> 
>> I realised clementine wasn't building because qtwebkit isn't building
>> either. But, it turns out that while it's an optional dependency
>> according to CMakeList.txt, it isn't actually used anywhere in the
>> code. Here's a patch that removes qtwebkit from its inputs.
>> 
>
>> From c32d30001676d80bc9c80ece3ee8c31ec9b72592 Mon Sep 17 00:00:00 2001
>> From: Pierre Langlois <pierre.langlois@gmx.com>
>> Date: Mon, 13 Aug 2018 09:05:17 +0100
>> Subject: [PATCH] gnu: clementine: Drop dependency on qtwebkit.
>> 
>> QtWebkit is optionally included in CMakeList.txt but isn't actually used
>> anywhere in the code.
>> 
>> * gnu/packages/music.scm (clementine)[inputs]: Remove qtwebkit.
>
> Thanks!
>
> Does clementine work for you with this change? For me, it fails like
> this:
>
>
> $ clementine
> 16:58:17.043 INFO  main:315                         Clementine-qt5 1.3.1
> 16:58:17.065 WARN  Database:275                     Couldn't register FTS3 tokenizer :  QSqlError("1", "Unable to fetch row", "fts3tokenize disabled")
> 16:58:17.066 DEBUG Database:449                     Applying database schema update 13 from ":/schema/schema-13.sql"
> 16:58:17.066 ERROR Database:577                     db error:  QSqlError("1", "Unable to fetch row", "unknown tokenizer: unicode")
> 16:58:17.066 ERROR Database:578                     faulty query:  "CREATE VIRTUAL TABLE songs_fts USING fts3(\n  ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsgenre, ftscomment,\n  tokenize=unicode\n)"
> 16:58:17.066 ERROR Database:579                     bound values:  QMap()
> __logging_message__16:58:17.066 ERROR unknown                          Unable to update music library database

That's strange, it works OK for me. I'm on master, which branch are you
on? IIRC this was the error I was getting when sqlite wasn't built with
FTS3 support, hence the sqlite-with-fts3 package (although I'm not sure
what it is).

Thanks,
Pierre

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

* [bug#32431] [PATCH] gnu: clementine: Drop dependency on qtwebkit.
  2018-08-13 21:12   ` Pierre Langlois
@ 2018-08-14  2:31     ` Leo Famulari
  2018-08-14  9:24       ` Pierre Langlois
  0 siblings, 1 reply; 9+ messages in thread
From: Leo Famulari @ 2018-08-14  2:31 UTC (permalink / raw)
  To: Pierre Langlois; +Cc: 32431

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

On Mon, Aug 13, 2018 at 10:12:14PM +0100, Pierre Langlois wrote:
> That's strange, it works OK for me. I'm on master, which branch are you
> on? IIRC this was the error I was getting when sqlite wasn't built with
> FTS3 support, hence the sqlite-with-fts3 package (although I'm not sure
> what it is).

I'm also working on the master branch, Guix on Debian. I can reproduce
the error on commit 9285f8bbae9d71139873430c71b7ca7634bda31b like this:

------
$ ./pre-inst-env guix environment --pure --ad-hoc clementine -- clementine
22:30:46.067 INFO  main:315                         Clementine-qt5 1.3.1                     
__logging_message__22:30:46.071 WARN  unknown                          QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-leo'
__logging_message__22:30:46.083 WARN  unknown                          QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-leo'
22:30:46.091 WARN  Database:275                     Couldn't register FTS3 tokenizer :  QSqlError("1", "Unable to fetch row", "fts3tokenize disabled")
22:30:46.092 DEBUG Database:449                     Applying database schema update 13 from ":/schema/schema-13.sql"
22:30:46.092 ERROR Database:577                     db error:  QSqlError("1", "Unable to fetch row", "unknown tokenizer: unicode")
22:30:46.092 ERROR Database:578                     faulty query:  "CREATE VIRTUAL TABLE songs_fts USING fts3(\n  ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsgenre, ftscomment,\n  tokenize=unicode\n)"
22:30:46.092 ERROR Database:579                     bound values:  QMap()
__logging_message__22:30:46.092 ERROR unknown                          Unable to update music library database
------

If it works for you on GuixSD or another distro, we should go ahead and
push the patch, and find out why it doesn't work for me later.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

* [bug#32431] [PATCH] gnu: clementine: Drop dependency on qtwebkit.
  2018-08-14  2:31     ` Leo Famulari
@ 2018-08-14  9:24       ` Pierre Langlois
  2018-08-14 21:32         ` Pierre Langlois
  0 siblings, 1 reply; 9+ messages in thread
From: Pierre Langlois @ 2018-08-14  9:24 UTC (permalink / raw)
  To: Leo Famulari; +Cc: 32431


Leo Famulari writes:

> On Mon, Aug 13, 2018 at 10:12:14PM +0100, Pierre Langlois wrote:
>> That's strange, it works OK for me. I'm on master, which branch are you
>> on? IIRC this was the error I was getting when sqlite wasn't built with
>> FTS3 support, hence the sqlite-with-fts3 package (although I'm not sure
>> what it is).
>
> I'm also working on the master branch, Guix on Debian. I can reproduce
> the error on commit 9285f8bbae9d71139873430c71b7ca7634bda31b like this:
>
> ------
> $ ./pre-inst-env guix environment --pure --ad-hoc clementine -- clementine
> 22:30:46.067 INFO  main:315                         Clementine-qt5 1.3.1                     
> __logging_message__22:30:46.071 WARN  unknown                          QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-leo'
> __logging_message__22:30:46.083 WARN  unknown                          QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-leo'
> 22:30:46.091 WARN  Database:275                     Couldn't register FTS3 tokenizer :  QSqlError("1", "Unable to fetch row", "fts3tokenize disabled")
> 22:30:46.092 DEBUG Database:449                     Applying database schema update 13 from ":/schema/schema-13.sql"
> 22:30:46.092 ERROR Database:577                     db error:  QSqlError("1", "Unable to fetch row", "unknown tokenizer: unicode")
> 22:30:46.092 ERROR Database:578                     faulty query:  "CREATE VIRTUAL TABLE songs_fts USING fts3(\n  ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsgenre, ftscomment,\n  tokenize=unicode\n)"
> 22:30:46.092 ERROR Database:579                     bound values:  QMap()
> __logging_message__22:30:46.092 ERROR unknown                          Unable to update music library database
> ------
>
> If it works for you on GuixSD or another distro, we should go ahead and
> push the patch, and find out why it doesn't work for me later.

Actually, now I can reproduce the error. I already had a database
created in my home directory by the previous working installation so I
didn't see the error. If I remove '.config/Clementine' it crashes the
same way. I don't think it's because of this patch though, which means
the problem has probably been there a while :-(, I'll investigate when I
get the time tonight!

Thanks for finding that bug!
Pierre

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

* [bug#32431] [PATCH] gnu: clementine: Drop dependency on qtwebkit.
  2018-08-14  9:24       ` Pierre Langlois
@ 2018-08-14 21:32         ` Pierre Langlois
  2018-08-15  0:42           ` Leo Famulari
  0 siblings, 1 reply; 9+ messages in thread
From: Pierre Langlois @ 2018-08-14 21:32 UTC (permalink / raw)
  To: Leo Famulari; +Cc: 32431

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

Hi Leo,

Pierre Langlois writes:

> Leo Famulari writes:
>
>> On Mon, Aug 13, 2018 at 10:12:14PM +0100, Pierre Langlois wrote:
>>> That's strange, it works OK for me. I'm on master, which branch are you
>>> on? IIRC this was the error I was getting when sqlite wasn't built with
>>> FTS3 support, hence the sqlite-with-fts3 package (although I'm not sure
>>> what it is).
>>
>> I'm also working on the master branch, Guix on Debian. I can reproduce
>> the error on commit 9285f8bbae9d71139873430c71b7ca7634bda31b like this:
>>
>> ------
>> $ ./pre-inst-env guix environment --pure --ad-hoc clementine -- clementine
>> 22:30:46.067 INFO  main:315                         Clementine-qt5 1.3.1                     
>> __logging_message__22:30:46.071 WARN  unknown                          QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-leo'
>> __logging_message__22:30:46.083 WARN  unknown                          QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-leo'
>> 22:30:46.091 WARN  Database:275                     Couldn't register FTS3 tokenizer :  QSqlError("1", "Unable to fetch row", "fts3tokenize disabled")
>> 22:30:46.092 DEBUG Database:449                     Applying database schema update 13 from ":/schema/schema-13.sql"
>> 22:30:46.092 ERROR Database:577                     db error:  QSqlError("1", "Unable to fetch row", "unknown tokenizer: unicode")
>> 22:30:46.092 ERROR Database:578                     faulty query:  "CREATE VIRTUAL TABLE songs_fts USING fts3(\n  ftstitle, ftsalbum, ftsartist, ftsalbumartist, ftscomposer, ftsgenre, ftscomment,\n  tokenize=unicode\n)"
>> 22:30:46.092 ERROR Database:579                     bound values:  QMap()
>> __logging_message__22:30:46.092 ERROR unknown                          Unable to update music library database
>> ------
>>
>> If it works for you on GuixSD or another distro, we should go ahead and
>> push the patch, and find out why it doesn't work for me later.
>
> Actually, now I can reproduce the error. I already had a database
> created in my home directory by the previous working installation so I
> didn't see the error. If I remove '.config/Clementine' it crashes the
> same way. I don't think it's because of this patch though, which means
> the problem has probably been there a while :-(, I'll investigate when I
> get the time tonight!

OK, it's working now :-). It was indeed unrelated to qtwebkit so here is
a follow-up patch that fixes the issue. I'm not sure of the details, but
there is a pull request [0] that allows us to patch clementine to fix
this, and on top of this, it allows us to use the generic sqlite! It
seems OpenSUSE have also patched clementine this way.

WDYT?

Thanks,
Pierre

[0]: https://github.com/clementine-player/Clementine/pull/5669


[-- Attachment #2: 0001-gnu-clementine-Fix-creating-initial-database.patch --]
[-- Type: text/x-patch, Size: 5854 bytes --]

From 304f288f3be2438fe4ecf536728a6dc5579f04d0 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
Date: Tue, 14 Aug 2018 22:17:24 +0100
Subject: [PATCH] gnu: clementine: Fix creating initial database.

It seems a recent version of sqlite broke Clementine's first startup. It turns
out we can patch clementine to fix the problem instead of providing a
different sqlite package:
https://github.com/clementine-player/Clementine/pull/5669

* gnu/packages/databases.scm (sqlite-with-fts3): Remove.
* gnu/packages/music.scm (clementine)[inputs]: Replace sqlite-with-fts3 with
sqlite.
[source][patches]: Add clementine-fix-sqlite.patch.
* gnu/packages/patches/clementine-fix-sqlite.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/databases.scm                    | 16 +------------
 gnu/packages/music.scm                        |  5 ++--
 .../patches/clementine-fix-sqlite.patch       | 23 +++++++++++++++++++
 4 files changed, 28 insertions(+), 17 deletions(-)
 create mode 100644 gnu/packages/patches/clementine-fix-sqlite.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 15e7beac6..ffcd7eb85 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -611,6 +611,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/clang-runtime-asan-build-fixes.patch	\
   %D%/packages/patches/clang-runtime-esan-build-fixes.patch	\
   %D%/packages/patches/classpath-aarch64-support.patch		\
+  %D%/packages/patches/clementine-fix-sqlite.patch		\
   %D%/packages/patches/clementine-remove-crypto++-dependency.patch	\
   %D%/packages/patches/clementine-use-openssl.patch		\
   %D%/packages/patches/clisp-glibc-2.26.patch			\
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index c148ba499..ba3a3233a 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -27,7 +27,7 @@
 ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
 ;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
-;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2017, 2018 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2017 Kristofer Buffington <kristoferbuffington@gmail.com>
 ;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
@@ -1069,20 +1069,6 @@ is in the public domain.")
        ((#:configure-flags flags)
         `(cons "--enable-fts5" ,flags))))))
 
-;; This is used by Clementine.
-(define-public sqlite-with-fts3
-  (package (inherit sqlite)
-    (name "sqlite-with-fts3")
-    (arguments
-     (substitute-keyword-arguments (package-arguments sqlite)
-       ((#:configure-flags flags)
-        `(list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE "
-                              "-DSQLITE_ENABLE_UNLOCK_NOTIFY "
-                              "-DSQLITE_ENABLE_DBSTAT_VTAB "
-                              "-DSQLITE_ENABLE_FTS3 "
-                              "-DSQLITE_ENABLE_FTS3_PARENTHESIS "
-                              "-DSQLITE_ENABLE_FTS3_TOKENIZER")))))))
-
 (define-public tdb
   (package
     (name "tdb")
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index cf1e0f82f..7d4aeff99 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -238,7 +238,8 @@ score, keyboard, guitar, drum and controller views.")
                       "tinysvcmdns"))
                     #t))
                 (patches (search-patches "clementine-use-openssl.patch"
-                                         "clementine-remove-crypto++-dependency.patch"))))
+                                         "clementine-remove-crypto++-dependency.patch"
+                                         "clementine-fix-sqlite.patch"))))
       (build-system cmake-build-system)
       (arguments
        '(#:test-target "clementine_test"
@@ -281,7 +282,7 @@ score, keyboard, guitar, drum and controller views.")
          ("pulseaudio" ,pulseaudio)
          ("qtbase" ,qtbase)
          ("qtx11extras" ,qtx11extras)
-         ("sqlite" ,sqlite-with-fts3)
+         ("sqlite" ,sqlite)
          ("sparsehash" ,sparsehash)
          ("taglib" ,taglib)))
       (home-page "http://clementine-player.org")
diff --git a/gnu/packages/patches/clementine-fix-sqlite.patch b/gnu/packages/patches/clementine-fix-sqlite.patch
new file mode 100644
index 000000000..f9d44f907
--- /dev/null
+++ b/gnu/packages/patches/clementine-fix-sqlite.patch
@@ -0,0 +1,23 @@
+Patch downloaded from https://github.com/clementine-player/Clementine/pull/5669 .
+
+diff -ruN clementine-1.3.1.565.gd20c2244a.orig/src/core/database.cpp clementine-1.3.1.565.gd20c2244a/src/core/database.cpp
+--- clementine-1.3.1.565.gd20c2244a.orig/src/core/database.cpp	2018-07-07 23:59:24.018540126 +0200
++++ clementine-1.3.1.565.gd20c2244a/src/core/database.cpp	2018-07-08 00:04:47.991551728 +0200
+@@ -265,6 +265,17 @@
+   StaticInit();
+ 
+   {
++
++#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
++    // In case sqlite>=3.12 is compiled without -DSQLITE_ENABLE_FTS3_TOKENIZER
++    // (generally a good idea  due to security reasons) the fts3 support should be enabled explicitly.
++    QVariant v = db.driver()->handle();
++    if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) {
++      sqlite3 *handle = *static_cast<sqlite3**>(v.data());
++      if (handle) sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
++    }
++#endif
++
+     QSqlQuery set_fts_tokenizer(db);
+     set_fts_tokenizer.prepare("SELECT fts3_tokenizer(:name, :pointer)");
+     set_fts_tokenizer.bindValue(":name", "unicode");
-- 
2.18.0


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

* [bug#32431] [PATCH] gnu: clementine: Drop dependency on qtwebkit.
  2018-08-14 21:32         ` Pierre Langlois
@ 2018-08-15  0:42           ` Leo Famulari
  2018-08-15  6:57             ` Pierre Langlois
  0 siblings, 1 reply; 9+ messages in thread
From: Leo Famulari @ 2018-08-15  0:42 UTC (permalink / raw)
  To: Pierre Langlois; +Cc: 32431


[-- Attachment #1.1: Type: text/plain, Size: 816 bytes --]

On Tue, Aug 14, 2018 at 10:32:11PM +0100, Pierre Langlois wrote:
> * gnu/packages/databases.scm (sqlite-with-fts3): Remove.
> * gnu/packages/music.scm (clementine)[inputs]: Replace sqlite-with-fts3 with
> sqlite.
> [source][patches]: Add clementine-fix-sqlite.patch.
> * gnu/packages/patches/clementine-fix-sqlite.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.

Thanks!

With this, I could start Clementine but I couldn't actually play
any MP3 or FLAC files. It would fail with a dialog that said:

"GStreamer could not create the element: autoaudiosink. Please make sure
that you have installed all necessary GStreamer plugins (e.g. OGG and
MP3)"

But, when I rebuilt Clementine with the missing plugins (as attached),
it works.

If that change looks good to you I'll push it along with your patches.

[-- Attachment #1.2: clementine.diff --]
[-- Type: text/plain, Size: 524 bytes --]

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 7d4aeff99..2b8ff451b 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -272,6 +272,8 @@ score, keyboard, guitar, drum and controller views.")
          ("glu" ,glu)
          ("gstreamer" ,gstreamer)
          ("gst-plugins-base" ,gst-plugins-base)
+         ("gst-plugins-good" ,gst-plugins-good)
+         ("gst-libav" ,gst-libav)
          ("libcdio" ,libcdio)
          ("libmygpo-qt" ,libmygpo-qt)
          ;; TODO: Package libgpod.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

* [bug#32431] [PATCH] gnu: clementine: Drop dependency on qtwebkit.
  2018-08-15  0:42           ` Leo Famulari
@ 2018-08-15  6:57             ` Pierre Langlois
  2018-08-15 18:35               ` bug#32431: " Leo Famulari
  0 siblings, 1 reply; 9+ messages in thread
From: Pierre Langlois @ 2018-08-15  6:57 UTC (permalink / raw)
  To: Leo Famulari; +Cc: 32431


Leo Famulari writes:

> On Tue, Aug 14, 2018 at 10:32:11PM +0100, Pierre Langlois wrote:
>> * gnu/packages/databases.scm (sqlite-with-fts3): Remove.
>> * gnu/packages/music.scm (clementine)[inputs]: Replace sqlite-with-fts3 with
>> sqlite.
>> [source][patches]: Add clementine-fix-sqlite.patch.
>> * gnu/packages/patches/clementine-fix-sqlite.patch: New file.
>> * gnu/local.mk (dist_patch_DATA): Add it.
>
> Thanks!
>
> With this, I could start Clementine but I couldn't actually play
> any MP3 or FLAC files. It would fail with a dialog that said:
>
> "GStreamer could not create the element: autoaudiosink. Please make sure
> that you have installed all necessary GStreamer plugins (e.g. OGG and
> MP3)"

Ah yes, that's expected. when packaging this we agreed not to add any of
the gst-plugins-{good,bad,ugly} to the inputs and let the user install
what they want instead [0]. Although, while we defenetely shouldn't add
'bad' and 'ugly', I don't see any reason not to add 'good' to make sure
it all works out of the box. But then, the dialog hints the user should
install them so that's not so bad as it is.

Basically, I don't mind either way :-).

Thanks for testing!

Pierre

[0]: https://lists.gnu.org/archive/html/guix-patches/2017-02/msg00192.html

>
> But, when I rebuilt Clementine with the missing plugins (as attached),
> it works.
>
> If that change looks good to you I'll push it along with your patches.
> diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
> index 7d4aeff99..2b8ff451b 100644
> --- a/gnu/packages/music.scm
> +++ b/gnu/packages/music.scm
> @@ -272,6 +272,8 @@ score, keyboard, guitar, drum and controller views.")
>           ("glu" ,glu)
>           ("gstreamer" ,gstreamer)
>           ("gst-plugins-base" ,gst-plugins-base)
> +         ("gst-plugins-good" ,gst-plugins-good)
> +         ("gst-libav" ,gst-libav)
>           ("libcdio" ,libcdio)
>           ("libmygpo-qt" ,libmygpo-qt)
>           ;; TODO: Package libgpod.

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

* bug#32431: [PATCH] gnu: clementine: Drop dependency on qtwebkit.
  2018-08-15  6:57             ` Pierre Langlois
@ 2018-08-15 18:35               ` Leo Famulari
  0 siblings, 0 replies; 9+ messages in thread
From: Leo Famulari @ 2018-08-15 18:35 UTC (permalink / raw)
  To: Pierre Langlois; +Cc: 32431-done

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

On Wed, Aug 15, 2018 at 07:57:07AM +0100, Pierre Langlois wrote:
> Ah yes, that's expected. when packaging this we agreed not to add any of
> the gst-plugins-{good,bad,ugly} to the inputs and let the user install
> what they want instead [0]. Although, while we defenetely shouldn't add
> 'bad' and 'ugly', I don't see any reason not to add 'good' to make sure
> it all works out of the box. But then, the dialog hints the user should
> install them so that's not so bad as it is.
> 
> Basically, I don't mind either way :-).

Previously, MP3 decoding in GStreamer was in gst-plugins-ugly because
MP3 was patented, but the patents expired and now gst-plugins-good
includes MP3.

I think the package should work as-is for its primary use case (music
playback), so I pushed your patches and also added gst-plugins-good and
gst-libav, ending with commit 8473f8024ceb8e7249702289b206782de7d4c71c.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

end of thread, other threads:[~2018-08-15 18:36 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-13 19:26 [bug#32431] [PATCH] gnu: clementine: Drop dependency on qtwebkit Pierre Langlois
2018-08-13 20:58 ` Leo Famulari
2018-08-13 21:12   ` Pierre Langlois
2018-08-14  2:31     ` Leo Famulari
2018-08-14  9:24       ` Pierre Langlois
2018-08-14 21:32         ` Pierre Langlois
2018-08-15  0:42           ` Leo Famulari
2018-08-15  6:57             ` Pierre Langlois
2018-08-15 18:35               ` bug#32431: " Leo Famulari

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.