[bug#54570] [PATCH] gnu: Add parole.

[bug#54570] [PATCH] gnu: Add parole.

[tumashu]

From: Feng Shu <tumashu@163.com>

* gnu/packages/xfce.scm (parole): New variable.
---
 gnu/packages/xfce.scm | 44 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a2d8e99290..76f904d423 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -904,6 +904,50 @@ (define-public gigolo
 local and remote file systems and manage bookmarks of such.")
     (license gpl2)))                              ;version 2 only
 
+(define-public parole
+  (package
+    (name "parole")
+    (version "4.16.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://archive.xfce.org/src/apps/"
+                                  name "/" (version-major+minor version) "/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1rx7apylqb7mf1dl0sswj1630fca3ddk4x1gcdmlv5ykrkc5lc0d"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:configure-flags
+      #~(list (string-append "CPPFLAGS=-I"
+                             #$gst-plugins-base
+                             "/include/gstreamer-1.0"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'wrap-parole
+            (lambda _
+              (let ((gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
+                (wrap-program (string-append #$output "/bin/parole")
+                  `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))))))))
+    (native-inputs
+     (list pkg-config intltool gobject-introspection))
+    (inputs
+     (list dbus-glib
+           (list glib "bin")
+           gstreamer
+           gst-plugins-base
+           gst-plugins-good
+           libnotify
+           libxfce4ui
+           libxfce4util))
+    (home-page "https://www.xfce.org/")
+    (synopsis "Modern simple media player based on the GStreamer framework")
+    (description "Parole is a modern simple media player based on the
+GStreamer framework and written to fit well in the Xfce desktop.  Parole
+features playback of local media files, DVD/CD and live streams. ")
+    (license gpl2)))                    ;version 2 only
+
 (define-public xfce4-terminal
   (package
     (name "xfce4-terminal")
-- 
2.34.0

[bug#54570] [PATCH] gnu: Add parole.

[Maxime Devos]

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

tumashu@163.com schreef op za 26-03-2022 om 07:05 [+0800]:
> +                             #$gst-plugins-base

This hardcoding prevents package transformations.
Try #$(this-package-input "gst-plugins-base") instead.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54570] [PATCH] gnu: Add parole.

[Feng Shu]

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

Maxime Devos <maximedevos@telenet.be> writes:

> tumashu@163.com schreef op za 26-03-2022 om 07:05 [+0800]:
>> +                             #$gst-plugins-base
>
> This hardcoding prevents package transformations.
> Try #$(this-package-input "gst-plugins-base") instead.

Changed!



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-parole.patch --]
[-- Type: text/x-patch, Size: 2522 bytes --]

From 03ca3c58c8bc54cec5e12cafbc6dc65aafcbd6cc Mon Sep 17 00:00:00 2001
From: Feng Shu <tumashu@163.com>
Date: Sat, 26 Mar 2022 07:01:25 +0800
Subject: [patch v2] gnu: Add parole.

* gnu/packages/xfce.scm (parole): New variable.
---
 gnu/packages/xfce.scm | 44 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index bc19fc5250..f7a0a94c7c 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -904,6 +904,50 @@ (define-public gigolo
 local and remote file systems and manage bookmarks of such.")
     (license gpl2)))                              ;version 2 only
 
+(define-public parole
+  (package
+    (name "parole")
+    (version "4.16.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://archive.xfce.org/src/apps/"
+                                  name "/" (version-major+minor version) "/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1rx7apylqb7mf1dl0sswj1630fca3ddk4x1gcdmlv5ykrkc5lc0d"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:configure-flags
+      #~(list (string-append "CPPFLAGS=-I"
+                             #$(this-package-input "gst-plugins-base")
+                             "/include/gstreamer-1.0"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'wrap-parole
+            (lambda _
+              (let ((gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
+                (wrap-program (string-append #$output "/bin/parole")
+                  `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))))))))
+    (native-inputs
+     (list pkg-config intltool gobject-introspection))
+    (inputs
+     (list dbus-glib
+           (list glib "bin")
+           gstreamer
+           gst-plugins-base
+           gst-plugins-good
+           libnotify
+           libxfce4ui
+           libxfce4util))
+    (home-page "https://www.xfce.org/")
+    (synopsis "Modern simple media player based on the GStreamer framework")
+    (description "Parole is a modern simple media player based on the
+GStreamer framework and written to fit well in the Xfce desktop.  Parole
+features playback of local media files, DVD/CD and live streams. ")
+    (license gpl2)))                    ;version 2 only
+
 (define-public xfce4-terminal
   (package
     (name "xfce4-terminal")
-- 
2.34.0


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




>
> Greetings,
> Maxime.
>

-- 

[bug#54570] [PATCH] gnu: Add parole.

[Feng Shu]

"Feng Shu" <tumashu@163.com> writes:

> Maxime Devos <maximedevos@telenet.be> writes:
>
>> tumashu@163.com schreef op za 26-03-2022 om 07:05 [+0800]:
>>> +                             #$gst-plugins-base
>>
>> This hardcoding prevents package transformations.
>> Try #$(this-package-input "gst-plugins-base") instead.
>
> Changed!
>

ping :-)

>
> From 03ca3c58c8bc54cec5e12cafbc6dc65aafcbd6cc Mon Sep 17 00:00:00 2001
> From: Feng Shu <tumashu@163.com>
> Date: Sat, 26 Mar 2022 07:01:25 +0800
> Subject: [patch v2] gnu: Add parole.
>
> * gnu/packages/xfce.scm (parole): New variable.
> ---
>  gnu/packages/xfce.scm | 44 +++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 44 insertions(+)
>
> diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
> index bc19fc5250..f7a0a94c7c 100644
> --- a/gnu/packages/xfce.scm
> +++ b/gnu/packages/xfce.scm
> @@ -904,6 +904,50 @@ (define-public gigolo
>  local and remote file systems and manage bookmarks of such.")
>      (license gpl2)))                              ;version 2 only
>  
> +(define-public parole
> +  (package
> +    (name "parole")
> +    (version "4.16.0")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "https://archive.xfce.org/src/apps/"
> +                                  name "/" (version-major+minor version) "/"
> +                                  name "-" version ".tar.bz2"))
> +              (sha256
> +               (base32
> +                "1rx7apylqb7mf1dl0sswj1630fca3ddk4x1gcdmlv5ykrkc5lc0d"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     (list
> +      #:configure-flags
> +      #~(list (string-append "CPPFLAGS=-I"
> +                             #$(this-package-input "gst-plugins-base")
> +                             "/include/gstreamer-1.0"))
> +      #:phases
> +      #~(modify-phases %standard-phases
> +          (add-after 'install 'wrap-parole
> +            (lambda _
> +              (let ((gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
> +                (wrap-program (string-append #$output "/bin/parole")
> +                  `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))))))))
> +    (native-inputs
> +     (list pkg-config intltool gobject-introspection))
> +    (inputs
> +     (list dbus-glib
> +           (list glib "bin")
> +           gstreamer
> +           gst-plugins-base
> +           gst-plugins-good
> +           libnotify
> +           libxfce4ui
> +           libxfce4util))
> +    (home-page "https://www.xfce.org/")
> +    (synopsis "Modern simple media player based on the GStreamer framework")
> +    (description "Parole is a modern simple media player based on the
> +GStreamer framework and written to fit well in the Xfce desktop.  Parole
> +features playback of local media files, DVD/CD and live streams. ")
> +    (license gpl2)))                    ;version 2 only
> +
>  (define-public xfce4-terminal
>    (package
>      (name "xfce4-terminal")
> -- 
> 2.34.0
>
>
>
>
>>
>> Greetings,
>> Maxime.
>>

-- 

bug#54570: [PATCH] gnu: Add parole.

[Ludovic Courtès]

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

Hi,

"Feng Shu" <tumashu@163.com> skribis:

>>From 03ca3c58c8bc54cec5e12cafbc6dc65aafcbd6cc Mon Sep 17 00:00:00 2001
> From: Feng Shu <tumashu@163.com>
> Date: Sat, 26 Mar 2022 07:01:25 +0800
> Subject: [patch v2] gnu: Add parole.
>
> * gnu/packages/xfce.scm (parole): New variable.

I made the minor changes below mostly to placate ‘guix lint’.

Thanks!

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1899 bytes --]

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a4bdc38aa3..44b6c34b29 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -36,6 +36,7 @@ (define-module (gnu packages xfce)
   #:use-module (gnu artwork)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages calendar)
   #:use-module (gnu packages cdrom)
   #:use-module (gnu packages fonts)
@@ -926,14 +927,16 @@ (define-public parole
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'install 'wrap-parole
-            (lambda _
+            (lambda* (#:key inputs #:allow-other-keys)
               (let ((gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")))
                 (wrap-program (string-append #$output "/bin/parole")
+                  #:sh (search-input-file inputs "bin/bash")
                   `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))))))))
     (native-inputs
      (list pkg-config intltool gobject-introspection))
     (inputs
-     (list dbus-glib
+     (list bash-minimal                           ;for 'wrap-program'
+           dbus-glib
            (list glib "bin")
            gstreamer
            gst-plugins-base
@@ -942,10 +945,10 @@ (define-public parole
            libxfce4ui
            libxfce4util))
     (home-page "https://www.xfce.org/")
-    (synopsis "Modern simple media player based on the GStreamer framework")
+    (synopsis "Media player based on the GStreamer framework")
     (description "Parole is a modern simple media player based on the
 GStreamer framework and written to fit well in the Xfce desktop.  Parole
-features playback of local media files, DVD/CD and live streams. ")
+features playback of local media files, DVD/CD and live streams.")
     (license gpl2)))                    ;version 2 only
 
 (define-public xfce4-terminal

[bug#54570] [PATCH] gnu: Add parole.

[Maxime Devos]

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

Ludovic Courtès schreef op ma 04-04-2022 om 22:54 [+0200]:
> +                  #:sh (search-input-file inputs "bin/bash")

FWIW, this line is unneccessary due to the 'patch-shebangs' phase,
though it might be nice for explicitness.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54570] [PATCH] gnu: Add parole.

[Ludovic Courtès]

Hi,

Maxime Devos <maximedevos@telenet.be> skribis:

> Ludovic Courtès schreef op ma 04-04-2022 om 22:54 [+0200]:
>> +                  #:sh (search-input-file inputs "bin/bash")
>
> FWIW, this line is unneccessary due to the 'patch-shebangs' phase,

Is it?  The default value of #:sh is (which "bash"), which is the wrong
value when cross-compiling, isn’t it?

Ludo’.

[bug#54570] [PATCH] gnu: Add parole.

[Maxime Devos]

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

Ludovic Courtès schreef op wo 06-04-2022 om 10:10 [+0200]:
> Maxime Devos <maximedevos@telenet.be> skribis:
> 
> > Ludovic Courtès schreef op ma 04-04-2022 om 22:54 [+0200]:
> > > +                  #:sh (search-input-file inputs "bin/bash")
> > 
> > FWIW, this line is unneccessary due to the 'patch-shebangs' phase,
> 
> Is it?  The default value of #:sh is (which "bash"), which is the wrong
> value when cross-compiling, isn’t it?

The default value is wrong when cross-compiling, so at least
temporarily, the shebang will be wrong.  However, %standard-phases has

(phases ... install patch-shebangs ...)

so after the 'wrap-parole' phase, 'patch-shebangs' is run, and this
phase will correct the shebang.

<https://lists.gnu.org/r/guix-devel/2021-06/msg00027.html> goes into
more detail.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54570] [PATCH] gnu: Add parole.

[Ludovic Courtès]

Maxime Devos <maximedevos@telenet.be> skribis:

> Ludovic Courtès schreef op wo 06-04-2022 om 10:10 [+0200]:
>> Maxime Devos <maximedevos@telenet.be> skribis:
>> 
>> > Ludovic Courtès schreef op ma 04-04-2022 om 22:54 [+0200]:
>> > > +                  #:sh (search-input-file inputs "bin/bash")
>> > 
>> > FWIW, this line is unneccessary due to the 'patch-shebangs' phase,
>> 
>> Is it?  The default value of #:sh is (which "bash"), which is the wrong
>> value when cross-compiling, isn’t it?
>
> The default value is wrong when cross-compiling, so at least
> temporarily, the shebang will be wrong.  However, %standard-phases has
>
> (phases ... install patch-shebangs ...)
>
> so after the 'wrap-parole' phase, 'patch-shebangs' is run, and this
> phase will correct the shebang.

Oh, got it; this is perfect.

Thanks,
Ludo’.