* [bug#54570] [PATCH] gnu: Add parole.
@ 2022-03-25 23:05 tumashu
2022-03-26 12:31 ` Maxime Devos
0 siblings, 1 reply; 9+ messages in thread
From: tumashu @ 2022-03-25 23:05 UTC (permalink / raw)
To: 54570; +Cc: Feng Shu
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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#54570] [PATCH] gnu: Add parole.
2022-03-25 23:05 [bug#54570] [PATCH] gnu: Add parole tumashu
@ 2022-03-26 12:31 ` Maxime Devos
2022-03-26 12:44 ` Feng Shu
0 siblings, 1 reply; 9+ messages in thread
From: Maxime Devos @ 2022-03-26 12:31 UTC (permalink / raw)
To: tumashu, 54570
[-- 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 --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#54570] [PATCH] gnu: Add parole.
2022-03-26 12:31 ` Maxime Devos
@ 2022-03-26 12:44 ` Feng Shu
2022-04-02 23:41 ` Feng Shu
2022-04-04 20:54 ` bug#54570: " Ludovic Courtès
0 siblings, 2 replies; 9+ messages in thread
From: Feng Shu @ 2022-03-26 12:44 UTC (permalink / raw)
To: Maxime Devos; +Cc: 54570
[-- 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.
>
--
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#54570] [PATCH] gnu: Add parole.
2022-03-26 12:44 ` Feng Shu
@ 2022-04-02 23:41 ` Feng Shu
2022-04-04 20:54 ` bug#54570: " Ludovic Courtès
1 sibling, 0 replies; 9+ messages in thread
From: Feng Shu @ 2022-04-02 23:41 UTC (permalink / raw)
To: Maxime Devos; +Cc: 54570
"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.
>>
--
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#54570: [PATCH] gnu: Add parole.
2022-03-26 12:44 ` Feng Shu
2022-04-02 23:41 ` Feng Shu
@ 2022-04-04 20:54 ` Ludovic Courtès
2022-04-05 9:25 ` [bug#54570] " Maxime Devos
1 sibling, 1 reply; 9+ messages in thread
From: Ludovic Courtès @ 2022-04-04 20:54 UTC (permalink / raw)
To: Feng Shu; +Cc: Maxime Devos, 54570-done
[-- 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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#54570] [PATCH] gnu: Add parole.
2022-04-04 20:54 ` bug#54570: " Ludovic Courtès
@ 2022-04-05 9:25 ` Maxime Devos
2022-04-06 8:10 ` Ludovic Courtès
0 siblings, 1 reply; 9+ messages in thread
From: Maxime Devos @ 2022-04-05 9:25 UTC (permalink / raw)
To: Ludovic Courtès, Feng Shu; +Cc: 54570
[-- 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 --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#54570] [PATCH] gnu: Add parole.
2022-04-05 9:25 ` [bug#54570] " Maxime Devos
@ 2022-04-06 8:10 ` Ludovic Courtès
2022-04-06 10:41 ` Maxime Devos
0 siblings, 1 reply; 9+ messages in thread
From: Ludovic Courtès @ 2022-04-06 8:10 UTC (permalink / raw)
To: Maxime Devos; +Cc: Feng Shu, 54570
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’.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#54570] [PATCH] gnu: Add parole.
2022-04-06 8:10 ` Ludovic Courtès
@ 2022-04-06 10:41 ` Maxime Devos
2022-04-06 12:23 ` Ludovic Courtès
0 siblings, 1 reply; 9+ messages in thread
From: Maxime Devos @ 2022-04-06 10:41 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: Feng Shu, 54570
[-- 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 --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#54570] [PATCH] gnu: Add parole.
2022-04-06 10:41 ` Maxime Devos
@ 2022-04-06 12:23 ` Ludovic Courtès
0 siblings, 0 replies; 9+ messages in thread
From: Ludovic Courtès @ 2022-04-06 12:23 UTC (permalink / raw)
To: Maxime Devos; +Cc: Feng Shu, 54570
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’.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-04-06 12:24 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-25 23:05 [bug#54570] [PATCH] gnu: Add parole tumashu
2022-03-26 12:31 ` Maxime Devos
2022-03-26 12:44 ` Feng Shu
2022-04-02 23:41 ` Feng Shu
2022-04-04 20:54 ` bug#54570: " Ludovic Courtès
2022-04-05 9:25 ` [bug#54570] " Maxime Devos
2022-04-06 8:10 ` Ludovic Courtès
2022-04-06 10:41 ` Maxime Devos
2022-04-06 12:23 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).