* [bug#40712] gnu: Add midori.
@ 2020-04-19 10:04 Raghav Gururajan
2020-04-19 10:34 ` Mathieu Othacehe
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Raghav Gururajan @ 2020-04-19 10:04 UTC (permalink / raw)
To: 40712
[-- Attachment #1: Type: text/plain, Size: 2 bytes --]
[-- Attachment #2: 0001-gnu-Add-midori.patch --]
[-- Type: application/octet-stream, Size: 3792 bytes --]
From 5f771bfce9842f232954cc2b7335c2de449accde Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 19 Apr 2020 06:02:42 -0400
Subject: [PATCH] gnu: Add midori.
* gnu/packages/web-browsers.scm (midori): New variable.
---
gnu/packages/web-browsers.scm | 57 +++++++++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 8a6ffaeef1..7f7b898f88 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -30,10 +30,13 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (gnu packages)
+ #:use-module (gnu packages backup)
#:use-module (gnu packages compression)
#:use-module (gnu packages documentation)
#:use-module (gnu packages fltk)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages libevent)
@@ -42,6 +45,7 @@
#:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages lua)
#:use-module (gnu packages gnome)
+ #:use-module (gnu packages gnome-xyz)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@@ -57,11 +61,64 @@
#:use-module (gnu packages gcc)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system python)
#:use-module (guix build-system asdf))
+(define-public midori
+ (package
+ (name "midori")
+ (version "9.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://github.com/midori-browser/core/releases/"
+ "download/v" version "/" name "-v" version ".tar.gz"))
+ (sha256
+ (base32
+ "05i04qa83dnarmgkx4xsk6fga5lw1lmslh4rb3vhyyy4ala562jy"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:imported-modules (,@%cmake-build-system-modules
+ (guix build glib-or-gtk-build-system))
+ #:modules ((guix build cmake-build-system)
+ ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
+ (guix build utils))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'glib-or-gtk-compile-schemas
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
+ (add-after 'install 'glib-or-gtk-wrap
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
+ (native-inputs
+ `(("glib:bin" ,glib "bin")
+ ("gtk+:bin" ,gtk+ "bin")
+ ("intltool" ,intltool)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("adwaita-icon-theme" ,adwaita-icon-theme)
+ ("gcr" ,gcr)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("json-glib" ,json-glib)
+ ("libarchive" ,libarchive)
+ ("libpeas" ,libpeas)
+ ("libsoup" ,libsoup)
+ ("sqlite" ,sqlite)
+ ("vala" ,vala)
+ ("webkitgtk" ,webkitgtk)))
+ (synopsis "Lightweight and Fast Web Browser")
+ (description "Midori is a lightweight yet powerful web browser which runs
+just as well on little embedded computers named for delicious pastries as it
+does on beefy machines with a core temperature exceeding that of planet
+earth. And it looks good doing that, too. Oh, and of course it's free
+software.")
+ (home-page "https://www.midori-browser.org")
+ (license license:lgpl2.1+)))
+
(define-public dillo
(package
(name "dillo")
--
2.26.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#40712] gnu: Add midori.
2020-04-19 10:04 [bug#40712] gnu: Add midori Raghav Gururajan
@ 2020-04-19 10:34 ` Mathieu Othacehe
2020-04-19 17:26 ` Rene via Guix-patches via
2020-04-19 10:40 ` Raghav Gururajan
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Mathieu Othacehe @ 2020-04-19 10:34 UTC (permalink / raw)
To: Raghav Gururajan; +Cc: 40712, pacoon
Hello Raghav,
Thanks for your patch! This is a duplicate of
https://lists.gnu.org/archive/html/guix-patches/2020-03/msg00729.html.
Like with Rene patch HTTPS didn't work for me. However when adding:
--8<---------------cut here---------------start------------->8---
("glib-networking" ,glib-networking)
--8<---------------cut here---------------end--------------->8---
to inputs, yours work. Not sure how to proceed here.
Rene, would it be ok for your you if we merge Raghav patch?
Thanks,
Mathieu
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#40712] gnu: Add midori.
2020-04-19 10:04 [bug#40712] gnu: Add midori Raghav Gururajan
2020-04-19 10:34 ` Mathieu Othacehe
@ 2020-04-19 10:40 ` Raghav Gururajan
2020-04-19 10:49 ` Raghav Gururajan
2020-04-19 11:12 ` [bug#40712] gnu: Add midori. (v2) Raghav Gururajan
3 siblings, 0 replies; 8+ messages in thread
From: Raghav Gururajan @ 2020-04-19 10:40 UTC (permalink / raw)
To: Mathieu Othacehe; +Cc: 40712, pacoon
Hi Mathieu!
> Thanks for your patch! This is a duplicate of
> https://lists.gnu.org/archive/html/guix-patches/2020-03/msg00729.html.
Oops! I did not know that. Sorry!
> Like with Rene patch HTTPS didn't work for me. However when adding:
>
> --8<---------------cut here---------------start------------->8---
> ("glib-networking" ,glib-networking)
> --8<---------------cut here---------------end--------------->8---
>
> to inputs, yours work. Not sure how to proceed here.
It's because I have used glib phases.
Regards,
RG.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#40712] gnu: Add midori.
2020-04-19 10:04 [bug#40712] gnu: Add midori Raghav Gururajan
2020-04-19 10:34 ` Mathieu Othacehe
2020-04-19 10:40 ` Raghav Gururajan
@ 2020-04-19 10:49 ` Raghav Gururajan
2020-04-19 11:12 ` [bug#40712] gnu: Add midori. (v2) Raghav Gururajan
3 siblings, 0 replies; 8+ messages in thread
From: Raghav Gururajan @ 2020-04-19 10:49 UTC (permalink / raw)
To: Mathieu Othacehe; +Cc: 40712, pacoon
Hi Mathieu!
>> Thanks for your patch! This is a duplicate of
>> https://lists.gnu.org/archive/html/guix-patches/2020-03/msg00729.html.
>
> Oops! I did not know that. Sorry!
>
>> Like with Rene patch HTTPS didn't work for me. However when adding:
>>
>> --8<---------------cut here---------------start------------->8---
>> ("glib-networking" ,glib-networking)
>> --8<---------------cut here---------------end--------------->8---
>>
>> to inputs, yours work. Not sure how to proceed here.
>
> It's because I have used glib phases.
Along with 'glib-networking', could you also add the following please?
(add-after 'install 'wrap-typelib
(lambda* (#:key outputs #:allow-other-keys)
(let ((prog (string-append (assoc-ref outputs "out")
"/bin/midori")))
(wrap-program prog
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
#t)))
Sorry, I am at work now and do not have my machine.
Regards,
RG.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#40712] gnu: Add midori. (v2)
2020-04-19 10:04 [bug#40712] gnu: Add midori Raghav Gururajan
` (2 preceding siblings ...)
2020-04-19 10:49 ` Raghav Gururajan
@ 2020-04-19 11:12 ` Raghav Gururajan
2020-04-19 13:42 ` [bug#40712] gnu: Add midori. (v3) Raghav Gururajan
3 siblings, 1 reply; 8+ messages in thread
From: Raghav Gururajan @ 2020-04-19 11:12 UTC (permalink / raw)
To: Mathieu Othacehe; +Cc: 40712, pacoon
[-- Attachment #1: Type: text/plain, Size: 1067 bytes --]
Hi Mathieu!
>>> Thanks for your patch! This is a duplicate of
>>> https://lists.gnu.org/archive/html/guix-patches/2020-03/msg00729.html.
>>
>> Oops! I did not know that. Sorry!
>>
>>> Like with Rene patch HTTPS didn't work for me. However when adding:
>>>
>>> --8<---------------cut here---------------start------------->8---
>>> ("glib-networking" ,glib-networking)
>>> --8<---------------cut here---------------end--------------->8---
>>>
>>> to inputs, yours work. Not sure how to proceed here.
>>
>> It's because I have used glib phases.
>
> Along with 'glib-networking', could you also add the following please?
>
> (add-after 'install 'wrap-typelib
> (lambda* (#:key outputs #:allow-other-keys)
> (let ((prog (string-append (assoc-ref outputs "out")
> "/bin/midori")))
> (wrap-program prog
> `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
> #t)))
>
> Sorry, I am at work now and do not have my machine.
Looks like typelib wrap not required. Please find the revised oatch attached with this email.
Regards,
RG.
[-- Attachment #2: 0001-gnu-Add-midori.patch --]
[-- Type: application/octet-stream, Size: 4147 bytes --]
From 3e52a3d57fb218191275e26c6c34abf47c334b9f Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 19 Apr 2020 07:10:06 -0400
Subject: [PATCH] gnu: Add midori.
* gnu/packages/web-browsers.scm (midori): New variable.
---
gnu/packages/web-browsers.scm | 59 +++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 8a6ffaeef1..30ca6d3453 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
+;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -30,10 +31,13 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (gnu packages)
+ #:use-module (gnu packages backup)
#:use-module (gnu packages compression)
#:use-module (gnu packages documentation)
#:use-module (gnu packages fltk)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages libevent)
@@ -42,6 +46,7 @@
#:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages lua)
#:use-module (gnu packages gnome)
+ #:use-module (gnu packages gnome-xyz)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@@ -57,11 +62,65 @@
#:use-module (gnu packages gcc)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system python)
#:use-module (guix build-system asdf))
+(define-public midori
+ (package
+ (name "midori")
+ (version "9.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://github.com/midori-browser/core/releases/"
+ "download/v" version "/" name "-v" version ".tar.gz"))
+ (sha256
+ (base32
+ "05i04qa83dnarmgkx4xsk6fga5lw1lmslh4rb3vhyyy4ala562jy"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:imported-modules (,@%cmake-build-system-modules
+ (guix build glib-or-gtk-build-system))
+ #:modules ((guix build cmake-build-system)
+ ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
+ (guix build utils))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'glib-or-gtk-compile-schemas
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
+ (add-after 'install 'glib-or-gtk-wrap
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
+ (native-inputs
+ `(("glib:bin" ,glib "bin")
+ ("gtk+:bin" ,gtk+ "bin")
+ ("intltool" ,intltool)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("adwaita-icon-theme" ,adwaita-icon-theme)
+ ("gcr" ,gcr)
+ ("glib" ,glib)
+ ("glib-networking" ,glib-networking)
+ ("gtk+" ,gtk+)
+ ("json-glib" ,json-glib)
+ ("libarchive" ,libarchive)
+ ("libpeas" ,libpeas)
+ ("libsoup" ,libsoup)
+ ("sqlite" ,sqlite)
+ ("vala" ,vala)
+ ("webkitgtk" ,webkitgtk)))
+ (synopsis "Lightweight and Fast Web Browser")
+ (description "Midori is a lightweight yet powerful web browser which runs
+just as well on little embedded computers named for delicious pastries as it
+does on beefy machines with a core temperature exceeding that of planet
+earth. And it looks good doing that, too. Oh, and of course it's free
+software.")
+ (home-page "https://www.midori-browser.org")
+ (license license:lgpl2.1+)))
+
(define-public dillo
(package
(name "dillo")
--
2.26.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#40712] gnu: Add midori. (v3)
2020-04-19 11:12 ` [bug#40712] gnu: Add midori. (v2) Raghav Gururajan
@ 2020-04-19 13:42 ` Raghav Gururajan
2020-04-20 17:00 ` bug#40712: " Mathieu Othacehe
0 siblings, 1 reply; 8+ messages in thread
From: Raghav Gururajan @ 2020-04-19 13:42 UTC (permalink / raw)
To: Mathieu Othacehe; +Cc: 40712, pacoon
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
Hi Mathieu!
> >>> Thanks for your patch! This is a duplicate of
> >>> https://lists.gnu.org/archive/html/guix-patches/2020-03/msg00729.html.
> >>
> >> Oops! I did not know that. Sorry!
> >>
> >>> Like with Rene patch HTTPS didn't work for me. However when adding:
> >>>
> >>> --8<---------------cut here---------------start------------->8---
> >>> ("glib-networking" ,glib-networking)
> >>> --8<---------------cut here---------------end--------------->8---
> >>>
> >>> to inputs, yours work. Not sure how to proceed here.
> >>
> >> It's because I have used glib phases.
> >
> > Along with 'glib-networking', could you also add the following please?
> >
> > (add-after 'install 'wrap-typelib
> > (lambda* (#:key outputs #:allow-other-keys)
> > (let ((prog (string-append (assoc-ref outputs "out")
> > "/bin/midori")))
> > (wrap-program prog
> > `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
> > #t)))
> >
> > Sorry, I am at work now and do not have my machine.
>
> Looks like typelib wrap not required. Please find the revised oatch attached
> with this email.
Here is the final revised patch. This works perfectly. I tried `./pre-inst-env
guix environment --ad-hoc midori --pure` and `midori`.
Regards,
RG
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-midori.patch --]
[-- Type: text/x-patch, Size: 4326 bytes --]
From f5ec76af711402fce8b505b4912d9a71a7aceeba Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 19 Apr 2020 09:39:05 -0400
Subject: [PATCH] gnu: Add midori.
* gnu/packages/web-browsers.scm (midori): New variable.
---
gnu/packages/web-browsers.scm | 60 +++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 8a6ffaeef1..0cfc65ee56 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
+;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -30,10 +31,13 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (gnu packages)
+ #:use-module (gnu packages backup)
#:use-module (gnu packages compression)
#:use-module (gnu packages documentation)
#:use-module (gnu packages fltk)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages libevent)
@@ -42,6 +46,7 @@
#:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages lua)
#:use-module (gnu packages gnome)
+ #:use-module (gnu packages gnome-xyz)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@@ -57,11 +62,66 @@
#:use-module (gnu packages gcc)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system python)
#:use-module (guix build-system asdf))
+(define-public midori
+ (package
+ (name "midori")
+ (version "9.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://github.com/midori-browser/core/releases/"
+ "download/v" version "/" name "-v" version ".tar.gz"))
+ (sha256
+ (base32
+ "05i04qa83dnarmgkx4xsk6fga5lw1lmslh4rb3vhyyy4ala562jy"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:imported-modules (,@%cmake-build-system-modules
+ (guix build glib-or-gtk-build-system))
+ #:modules ((guix build cmake-build-system)
+ ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
+ (guix build utils))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'glib-or-gtk-compile-schemas
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
+ (add-after 'install 'glib-or-gtk-wrap
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
+ (native-inputs
+ `(("glib:bin" ,glib "bin")
+ ("gtk+:bin" ,gtk+ "bin")
+ ("intltool" ,intltool)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("adwaita-icon-theme" ,adwaita-icon-theme)
+ ("gcr" ,gcr)
+ ("glib" ,glib)
+ ("glib-networking" ,glib-networking)
+ ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+ ("gtk+" ,gtk+)
+ ("json-glib" ,json-glib)
+ ("libarchive" ,libarchive)
+ ("libpeas" ,libpeas)
+ ("libsoup" ,libsoup)
+ ("sqlite" ,sqlite)
+ ("vala" ,vala)
+ ("webkitgtk" ,webkitgtk)))
+ (synopsis "Lightweight and Fast Web Browser")
+ (description "Midori is a lightweight yet powerful web browser which runs
+just as well on little embedded computers named for delicious pastries as it
+does on beefy machines with a core temperature exceeding that of planet
+earth. And it looks good doing that, too. Oh, and of course it's free
+software.")
+ (home-page "https://www.midori-browser.org")
+ (license license:lgpl2.1+)))
+
(define-public dillo
(package
(name "dillo")
--
2.26.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-04-20 17:01 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-19 10:04 [bug#40712] gnu: Add midori Raghav Gururajan
2020-04-19 10:34 ` Mathieu Othacehe
2020-04-19 17:26 ` Rene via Guix-patches via
2020-04-19 10:40 ` Raghav Gururajan
2020-04-19 10:49 ` Raghav Gururajan
2020-04-19 11:12 ` [bug#40712] gnu: Add midori. (v2) Raghav Gururajan
2020-04-19 13:42 ` [bug#40712] gnu: Add midori. (v3) Raghav Gururajan
2020-04-20 17:00 ` bug#40712: " Mathieu Othacehe
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).