Package: guix-patches;
Reported by: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
Date: Fri, 8 Nov 2019 10:34:02 UTC
Severity: normal
Tags: patch
Done: Hartmut Goebel <h.goebel <at> goebel-consult.de>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 38122 in the body.
You can then email your comments to 38122 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:34:02 GMT) Full text and rfc822 format available.Hartmut Goebel <h.goebel <at> crazy-compilers.com>:guix-patches <at> gnu.org.
(Fri, 08 Nov 2019 10:34:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: guix-patches <at> gnu.org Subject: [PATCH 0/1] qtwebkit: Uses sqlite-with-column-metadata. Date: Fri, 8 Nov 2019 11:33:36 +0100
I had a hard time finding an error caused by conflicting sqlite3 libs to be loaded. I suggest this to go to staging. Hartmut Goebel (1): gnu: qtwebkit: Uses sqlite-with-column-metadata. gnu/packages/qt.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:35:02 GMT) Full text and rfc822 format available.Message #8 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Pierre Neidhardt <mail <at> ambrevar.xyz> Subject: [PATCH 001/197] gnu: Add emacs-eshell-prompt-extras. Date: Fri, 8 Nov 2019 11:33:28 +0100
From: Pierre Neidhardt <mail <at> ambrevar.xyz>
* gnu/packages/emacs-xyz.scm (emacs-eshell-prompt-extras): New variable.
---
gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 1be819728f..6b586abfcc 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -19622,3 +19622,28 @@ minibuffer or an each area message).
The contents and aspect is controlled by the @code{minibuffer-line-format}
variable and the @code{minibuffer-line} face.")
(license license:gpl3+)))
+
+(define-public emacs-eshell-prompt-extras
+ (let ((commit "5a328e1b9112c7f31ce2da7cde340f96626546b6")
+ (revision "1"))
+ (package
+ (name "emacs-eshell-prompt-extras")
+ (version (git-version "0.96" revision commit))
+ (home-page "https://github.com/zwild/eshell-prompt-extras")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0fwlvrzjygs12dcp89wy3rb3wa03mrvbzpmpvmz4x6dfpr7csznk"))))
+ (build-system emacs-build-system)
+ (synopsis "Display extra information and color for your Eshell prompt")
+ (description "This library displays various customizable elements for
+@code{eshell} prompts: remote user, remote host, python virtual environment
+info, git branch, git dirty info and git unpushed number. Multiple themes are
+available.")
+ (license license:gpl3+))))
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:35:02 GMT) Full text and rfc822 format available.Message #11 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Subject: [PATCH 1/1] gnu: qtwebkit: Uses sqlite-with-column-metadata. Date: Fri, 8 Nov 2019 11:33:29 +0100
This needs to be the same variant as for qtbase, otherwise applications
might fail if libQt5WebKit is loaded prior to libQt5Sql.
* gnu/packages/qt.scm(wtwebkit)[inputs]: Replace sqlite by
sqlite-with-column-metadata.
---
gnu/packages/qt.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0ef879678f..222a0cc867 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2182,7 +2182,7 @@ different kinds of sliders, and much more.")
("libjpeg" ,libjpeg)
("libpng" ,libpng)
("libwebp" ,libwebp)
- ("sqlite" ,sqlite)
+ ("sqlite" ,sqlite-with-column-metadata)
("fontconfig" ,fontconfig)
("libxrender" ,libxrender)
("qtbase" ,qtbase)
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:35:03 GMT) Full text and rfc822 format available.Message #14 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Pierre Neidhardt <mail <at> ambrevar.xyz> Subject: [PATCH 002/197] gnu: Add emacs-eshell-did-you-mean. Date: Fri, 8 Nov 2019 11:33:30 +0100
From: Pierre Neidhardt <mail <at> ambrevar.xyz>
* gnu/packages/emacs-xyz.scm (emacs-eshell-did-you-mean): New variable.
---
gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 6b586abfcc..6f584f72b7 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -19647,3 +19647,25 @@ variable and the @code{minibuffer-line} face.")
info, git branch, git dirty info and git unpushed number. Multiple themes are
available.")
(license license:gpl3+))))
+
+(define-public emacs-eshell-did-you-mean
+ (package
+ (name "emacs-eshell-did-you-mean")
+ (version "0.1")
+ (home-page "https://github.com/xuchunyang/eshell-did-you-mean")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg"))))
+ (build-system emacs-build-system)
+ (synopsis "Display suggestions on 'command not found' in Eshell")
+ (description "This library adds a list of 'Did you mean...' suggestions
+when the command was not found in Eshell. The suggestions are found after the
+commands that bear resemblance to the input command.")
+ (license license:gpl3+)))
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:35:04 GMT) Full text and rfc822 format available.Message #17 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Carl Dong <contact <at> carldong.me> Subject: [PATCH 004/197] gnu: make-nsis: Fix cross-compilation. Date: Fri, 8 Nov 2019 11:33:32 +0100
From: Carl Dong <contact <at> carldong.me>
* gnu/packages/installers.scm (make-nsis)[arguments]: Enforce correct
ordering of search paths (mingw-w64 last).
---
gnu/packages/installers.scm | 27 ++++++++++++++++++++++-----
1 file changed, 22 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm
index c987254d61..9229359fdf 100644
--- a/gnu/packages/installers.scm
+++ b/gnu/packages/installers.scm
@@ -28,7 +28,10 @@
#:use-module (guix utils))
(define (make-nsis machine target-arch nsis-target-type)
- (let ((triplet (string-append machine "-" "w64-mingw32")))
+ (let* ((triplet (string-append machine "-" "w64-mingw32"))
+ (xbinutils (cross-binutils triplet))
+ (xlibc (cross-libc triplet))
+ (xgcc (cross-gcc triplet #:libc xlibc)))
(package
(name (string-append "nsis-" machine))
(version "3.04")
@@ -41,13 +44,14 @@
"1xgllk2mk36ll2509hd31mfq6blgncmdzmwxj3ymrwshdh23d5b0"))
(patches (search-patches "nsis-env-passthru.patch"))))
(build-system scons-build-system)
- (native-inputs `(("xgcc" ,(cross-gcc triplet #:libc (cross-libc triplet)))
- ("xbinutils" ,(cross-binutils triplet))
- ("mingw-w64" ,(cross-libc triplet))))
+ (native-inputs `(("xgcc" ,xgcc)
+ ("xbinutils" ,xbinutils)
+ ("mingw-w64" ,xlibc)))
(inputs `(("zlib" ,zlib)))
(arguments
`(#:scons ,scons-python2
#:modules ((srfi srfi-1)
+ (srfi srfi-26)
(guix build utils)
(guix build scons-build-system))
#:tests? #f
@@ -92,7 +96,20 @@
;; CROSS_-prefixed version of env vars
(setenv (string-append "CROSS_" env-name)
(filter-delimited-string env-val mingw-path?))))
- '("CPLUS_INCLUDE_PATH" "LIBRARY_PATH" "C_INCLUDE_PATH"))))
+ '("CPATH" "LIBRARY_PATH"))
+ ;; Hack to place mingw-w64 path at the end of search
+ ;; paths. Could probably use a specfile and dirafter
+ (setenv "CROSS_CPLUS_INCLUDE_PATH"
+ (string-join
+ `(,@(map (cut string-append (assoc-ref %build-inputs "xgcc") <>)
+ `("/include/c++"
+ ,(string-append "/include/c++/" ,triplet)
+ "/include/c++/backward"
+ ,@(map (cut string-append "/lib/gcc/" ,triplet "/" ,(package-version xgcc) <>)
+ '("/include"
+ "/include-fixed"))))
+ ,(getenv "CROSS_CPATH"))
+ ":"))))
(add-before 'build 'fix-target-detection
(lambda _
;; NSIS target detection is screwed up, manually
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:35:04 GMT) Full text and rfc822 format available.Message #20 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Nicolas Goaziou <mail <at> nicolasgoaziou.fr> Subject: [PATCH 003/197] gnu: Fix attribution. Date: Fri, 8 Nov 2019 11:33:31 +0100
From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr> * gnu/packages/game-development.scm: Fix attribution. --- gnu/packages/game-development.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 54d2f32f94..dafa6c2a38 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017, 2019 Rutger Helling <rhelling <at> mykolab.com> ;;; Copyright © 2018 Marius Bakke <mbakke <at> fastmail.com> ;;; Copyright © 2019 Pierre Neidhardt <mail <at> ambrevar.xyz> -;;; Copyright © 2019 Comrade Yuri <yuri <at> nijino> +;;; Copyright © 2019 Leo Prikler <leo.prikler <at> student.tugraz.at> ;;; ;;; This file is part of GNU Guix. ;;; -- 2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:35:05 GMT) Full text and rfc822 format available.Message #23 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Pierre Neidhardt <mail <at> ambrevar.xyz> Subject: [PATCH 005/197] gnu: Add dxvk. Date: Fri, 8 Nov 2019 11:33:33 +0100
From: Pierre Neidhardt <mail <at> ambrevar.xyz>
* gnu/packages/wine.scm (dxvk): New variable.
---
gnu/packages/wine.scm | 84 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 84 insertions(+)
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index e73432ba3a..e561d5c79e 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling <at> mykolab.com>
;;; Copyright © 2017 Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me <at> tobias.gr>
+;;; Copyright © 2019 Pierre Neidhardt <mail <at> ambrevar.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -28,6 +29,7 @@
#:use-module (guix git-download)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
@@ -50,6 +52,7 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages kerberos)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages mingw)
#:use-module (gnu packages openldap)
#:use-module (gnu packages perl)
#:use-module (gnu packages pulseaudio)
@@ -541,3 +544,84 @@ integrated into the main branch.")
(synopsis "Implementation of the Windows API (staging branch, WoW64
version)")
(supported-systems '("x86_64-linux" "aarch64-linux"))))
+
+(define dxvk32
+ ;; This package provides 32-bit dxvk libraries on 64-bit systems.
+ (package
+ (name "dxvk32")
+ (version "1.4.4")
+ (home-page "https://github.com/doitsujin/dxvk/")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0zr8hqyig18q4wp96cmfrkrgxxbgxida6k8cv6qbbldni29qy20w"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:system "i686-linux"
+ #:configure-flags (list "--cross-file"
+ (string-append (assoc-ref %build-inputs "source")
+ "/build-wine32.txt"))))
+ (native-inputs
+ `(("glslang" ,glslang)
+ ("wine" ,wine)))
+ (synopsis "Vulkan-based D3D11 and D3D10 implementation for Wine")
+ (description "A Vulkan-based translation layer for Direct3D 10/11 which
+allows running complex 3D applications with high performance using Wine.
+
+Use @command{setup_dxvk} to install the required libraries to a Wine prefix.")
+ (supported-systems '("x86_64-linux"))
+ (license license:zlib)))
+
+(define-public dxvk
+ (package
+ (inherit dxvk32)
+ (name "dxvk")
+ (arguments
+ `(#:configure-flags (list "--cross-file"
+ (string-append (assoc-ref %build-inputs "source")
+ "/build-wine"
+ (match (%current-system)
+ ("x86_64-linux" "64")
+ (_ "32"))
+ ".txt"))
+ #:phases
+ (modify-phases %standard-phases
+ ,@(if (string=? (%current-system) "x86_64-linux")
+ `((add-after 'unpack 'install-32
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (dxvk32 (assoc-ref inputs "dxvk32")))
+ (mkdir-p (string-append out "/lib32"))
+ (copy-recursively (string-append dxvk32 "/lib")
+ (string-append out "/lib32"))))))
+ '())
+ (add-after 'install 'install-setup
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin/setup_dxvk")))
+ (mkdir-p (string-append out "/bin"))
+ (copy-file "../source/setup_dxvk.sh"
+ bin)
+ (chmod bin #o755)
+ (substitute* bin
+ (("wine=\"wine\"")
+ (string-append "wine=" (assoc-ref inputs "wine") "/bin/wine"))
+ (("x32") ,(match (%current-system)
+ ("x86_64-linux" "../lib32")
+ (_ "../lib")))
+ (("x64") "../lib"))))))))
+ (native-inputs
+ `(("glslang" ,glslang)
+ ("wine" ,(match (%current-system)
+ ("x86_64-linux" wine64)
+ (_ wine)))
+ ,@(match (%current-system)
+ ("x86_64-linux"
+ `(("dxvk32" ,dxvk32)))
+ (_ '()))))
+ (supported-systems '("i686-linux" "x86_64-linux"))))
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:35:05 GMT) Full text and rfc822 format available.Message #26 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Carl Dong <contact <at> carldong.me> Subject: [PATCH 006/197] gnu: Fix make-gcc-libc. Date: Fri, 8 Nov 2019 11:33:34 +0100
From: Carl Dong <contact <at> carldong.me>
Until now the following wouldn't build:
--8<---------------cut here---------------start------------->8---
(use-modules (gnu packages commencement)
(gnu packages gcc)
(gnu packages base))
(make-gcc-libc gcc-9 glibc-2.27)
--8<---------------cut here---------------end--------------->8---
* gnu/packages/base.scm (make-gcc-libc)[phases]: Add environment
variables to place the target libc on the system header search path.
[make-flags]: Remove unncessary FLAGS_FOR_TARGET.
[native-inputs]: Construct in a way that doesn't require emptying
inputs.
---
gnu/packages/base.scm | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 4e80a2fadb..3a3360dc7a 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -981,18 +981,23 @@ with the Linux kernel.")
(substitute-keyword-arguments
(ensure-keyword-arguments (package-arguments base-gcc)
'(#:implicit-inputs? #f))
- ((#:make-flags flags)
- `(let ((libc (assoc-ref %build-inputs "libc")))
- ;; FLAGS_FOR_TARGET are needed for the target libraries to receive
- ;; the -Bxxx for the startfiles.
- (cons (string-append "FLAGS_FOR_TARGET=-B" libc "/lib")
- ,flags)))))
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-before 'configure 'treat-glibc-as-system-header
+ (lambda _
+ (let ((libc (assoc-ref %build-inputs "libc")))
+ ;; GCCs build processes requires that the libc
+ ;; we're building against is on the system header
+ ;; search path.
+ (for-each (lambda (var)
+ (setenv var (string-append libc "/include")))
+ '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH"))
+ #t)))))))
(native-inputs
- `(("libc" ,libc)
- ("libc:static" ,libc "static")
- ,@(append (package-inputs base-gcc)
- (fold alist-delete (%final-inputs) '("libc" "libc:static")))))
- (inputs '())))
+ `(,@(package-native-inputs base-gcc)
+ ,@(append (fold alist-delete (%final-inputs) '("libc" "libc:static")))
+ ("libc" ,libc)
+ ("libc:static" ,libc "static")))))
(define-public (make-glibc-locales glibc)
(package
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:36:02 GMT) Full text and rfc822 format available.Message #29 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Leo Prikler <leo.prikler <at> student.tugraz.at>, Mathieu Othacehe <m.othacehe <at> gmail.com> Subject: [PATCH 007/197] gnu: Add gitg. Date: Fri, 8 Nov 2019 11:33:35 +0100
From: Leo Prikler <leo.prikler <at> student.tugraz.at>
* gnu/packages/gnome.scm: (gitg): New variable.
Signed-off-by: Mathieu Othacehe <m.othacehe <at> gmail.com>
---
gnu/packages/gnome.scm | 67 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 67 insertions(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 276fa56138..428fe1cd16 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8400,6 +8400,73 @@ higher level porcelain stuff.")
(home-page "https://wiki.gnome.org/Projects/Libgit2-glib")
(license license:gpl2+)))
+(define-public gitg
+ (package
+ (name "gitg")
+ (version "3.32.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:glib-or-gtk? #t
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-post-install-partially
+ (lambda _
+ (substitute* "meson_post_install.py"
+ (("'python'") ; there are no python sources to compile
+ (string-append "'" (which "true") "'"))
+ (("gtk-update-icon-cache") (which "true")))
+ #t))
+ (add-after 'unpack 'fix-test-sources
+ (lambda _
+ (substitute* "tests/libgitg/test-commit.vala"
+ (("/bin/bash") (which "bash")))
+ #t))
+ (add-after 'glib-or-gtk-wrap 'wrap-typelib
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((prog (string-append (assoc-ref outputs "out")
+ "/bin/gitg")))
+ (wrap-program prog
+ `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
+ #t))))))
+ (inputs
+ `(("glib" ,glib)
+ ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+ ("gtk+" ,gtk+)
+ ("gtkspell3" ,gtkspell3)
+ ("gtksourceview" ,gtksourceview-3)
+ ("json-glib" ,json-glib)
+ ("libdazzle" ,libdazzle)
+ ("libgee" ,libgee)
+ ("libgit2" ,libgit2) ; propagated by libgit2-glib
+ ("libgit2-glib" ,libgit2-glib)
+ ("libpeas" ,libpeas)
+ ("libsecret" ,libsecret)
+ ("libsoup" ,libsoup)
+ ("libxml2" ,libxml2)))
+ (native-inputs
+ `(("glib:bin" ,glib "bin")
+ ("gtk+:bin" ,gtk+ "bin")
+ ("gobject-introspection" ,gobject-introspection)
+ ("intltool" ,intltool)
+ ("pkg-config" ,pkg-config)
+ ("vala" ,vala)))
+ (synopsis "Graphical user interface for git")
+ (description
+ "gitg is a graphical user interface for git. It aims at being a small,
+fast and convenient tool to visualize the history of git repositories.
+Besides visualization, gitg also provides several utilities to manage your
+repository and commit your work.")
+ (home-page "https://wiki.gnome.org/Apps/Gitg")
+ (license license:gpl2+)))
+
(define-public gnome-mahjongg
(package
(name "gnome-mahjongg")
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:36:02 GMT) Full text and rfc822 format available.Message #32 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Guillaume Le Vaillant <glv <at> posteo.net> Subject: [PATCH 008/197] gnu: Add python-keyutils. Date: Fri, 8 Nov 2019 11:33:36 +0100
From: Guillaume Le Vaillant <glv <at> posteo.net>
* gnu/packages/python-crypto.scm (python-keyutils): New variable.
---
gnu/packages/python-crypto.scm | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index f05c01060f..7dac25eb61 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -19,6 +19,7 @@
;;; Copyright © 2018 Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
;;; Copyright © 2018 Vagrant Cascadian <vagrant <at> debian.org>
;;; Copyright © 2018 Nam Nguyen <namn <at> berkeley.edu>
+;;; Copyright © 2019 Guillaume Le Vaillant <glv <at> posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1062,3 +1063,30 @@ Password-Authenticated Key Exchange algorithm.")
(description "This package provides a Twisted-based Tor controller client,
with state-tracking and configuration abstractions.")
(license license:expat)))
+
+(define-public python-keyutils
+ (package
+ (name "python-keyutils")
+ (version "0.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "keyutils" version))
+ (sha256
+ (base32
+ "0lipygpzhwzzsq2k5imb1jgkmj8y4khxdwhzadjs3bd56g6bmkx9"))))
+ (build-system python-build-system)
+ (native-inputs
+ `(("python-pytest" ,python-pytest)
+ ("python-pytest-runner" ,python-pytest-runner)))
+ (inputs
+ `(("keyutils" ,keyutils)))
+ (arguments
+ '(#:tests? #f))
+ (home-page "https://github.com/sassoftware/python-keyutils")
+ (synopsis "Python bindings for keyutils")
+ (description
+ "This is a set of python bindings for keyutils, a key management suite
+that leverages the infrastructure provided by the Linux kernel for safely
+storing and retrieving sensitive infromation in your programs.")
+ (license license:asl2.0)))
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:36:03 GMT) Full text and rfc822 format available.Message #35 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Guillaume Le Vaillant <glv <at> posteo.net> Subject: [PATCH 009/197] gnu: Add udiskie. Date: Fri, 8 Nov 2019 11:33:37 +0100
From: Guillaume Le Vaillant <glv <at> posteo.net>
* gnu/packages/freedesktop.scm (udiskie): New variable.
* gnu/packages/patches/udiskie-no-appindicator.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
gnu/local.mk | 1 +
gnu/packages/freedesktop.scm | 63 +++++++
.../patches/udiskie-no-appindicator.patch | 155 ++++++++++++++++++
3 files changed, 219 insertions(+)
create mode 100644 gnu/packages/patches/udiskie-no-appindicator.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 41c5a92a0a..96b570a759 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1386,6 +1386,7 @@ dist_patch_DATA = \
%D%/packages/patches/tuxpaint-stamps-path.patch \
%D%/packages/patches/txr-shell.patch \
%D%/packages/patches/u-boot-fix-mkimage-header-verification.patch \
+ %D%/packages/patches/udiskie-no-appindicator.patch \
%D%/packages/patches/unzip-CVE-2014-8139.patch \
%D%/packages/patches/unzip-CVE-2014-8140.patch \
%D%/packages/patches/unzip-CVE-2014-8141.patch \
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index b18d71cb98..2574153cef 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2018 Pierre Neidhardt <mail <at> ambrevar.xyz>
;;; Copyright © 2018 Stefan Stefanović <stefanx2ovic <at> gmail.com>
;;; Copyright © 2019 Reza Alizadeh Majd <r.majd <at> pantherx.org>
+;;; Copyright © 2019 Guillaume Le Vaillant <glv <at> posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -74,6 +75,7 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages polkit)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages valgrind)
@@ -1439,3 +1441,64 @@ encoding names are iconv-compatible.")
;; This combines code under MPL 1.1, LGPL 2.1+, and GPL 2.0+, so the
;; combination is GPL 2.0+.
(license license:gpl2+)))
+
+(define-public udiskie
+ (package
+ (name "udiskie")
+ (version "1.7.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "udiskie" version))
+ (sha256
+ (base32
+ "121g9dkr7drv9igpdbcbkj59x15mm72rzp3198bp50zj0lr4wbvi"))
+ ;; Remove support for the libappindicator library of the
+ ;; Unity desktop environment which is not in Guix.
+ (patches (search-patches "udiskie-no-appindicator.patch"))))
+ (build-system python-build-system)
+ (native-inputs
+ `(("asciidoc" ,asciidoc)
+ ("gettext" ,gettext-minimal)
+ ("gobject-introspection" ,gobject-introspection)))
+ (inputs
+ `(("gobject-introspection" ,gobject-introspection)
+ ("gtk+" ,gtk+)
+ ("libnotify" ,libnotify)
+ ("udisks" ,udisks)))
+ (propagated-inputs
+ `(("python-docopt" ,python-docopt)
+ ("python-pygobject" ,python-pygobject)
+ ("python-keyutils" ,python-keyutils)
+ ("python-pyxdg" ,python-pyxdg)
+ ("python-pyyaml" ,python-pyyaml)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'wrap-gi-typelib
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
+ (wrap-program (string-append out "/bin/udiskie")
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
+ #t)))))
+ (home-page "https://github.com/coldfix/udiskie")
+ (synopsis "Automounter for removable media")
+ (description
+ "The @command{udiskie} program is a udisks2 front-end that allows to
+manage removable media such as CDs or flash drives from userspace.
+
+Its features include:
+
+@itemize
+@item automount removable media,
+@item notifications,
+@item tray icon,
+@item command line tools for manual (un)mounting,
+@item LUKS encrypted devices,
+@item unlocking with keyfiles,
+@item loop devices (mounting ISO archives),
+@item password caching.
+@end itemize
+")
+ (license license:expat)))
diff --git a/gnu/packages/patches/udiskie-no-appindicator.patch b/gnu/packages/patches/udiskie-no-appindicator.patch
new file mode 100644
index 0000000000..c19099cdaa
--- /dev/null
+++ b/gnu/packages/patches/udiskie-no-appindicator.patch
@@ -0,0 +1,155 @@
+Remove the support for Unity's appindicator.
+
+diff -Naur udiskie-1.7.7/completions/_udiskie udiskie-1.7.7a/completions/_udiskie
+--- udiskie-1.7.7/completions/_udiskie 2019-02-17 18:28:58.000000000 +0100
++++ udiskie-1.7.7a/completions/_udiskie 2019-10-29 14:21:04.556193639 +0100
+@@ -21,8 +21,6 @@
+ '(-a)'{-A,--no-automount}"[disable automounting]"
+ '(-N)'{-n,--notify}"[show popup notifications]"
+ '(-n)'{-N,--no-notify}"[disable notifications]"
+- '(--no-appindicator)'--appindicator"[use appindicator for status icon]"
+- '(--appindicator)'--no-appindicator"[don't use appindicator]"
+ '(-T -s)'{-t,--tray}"[show tray icon]"
+ '(-T -t)'{-s,--smart-tray}"[auto hide tray icon]"
+ '(-t -s)'{-T,--no-tray}"[disable tray icon]"
+diff -Naur udiskie-1.7.7/doc/udiskie.8.txt udiskie-1.7.7a/doc/udiskie.8.txt
+--- udiskie-1.7.7/doc/udiskie.8.txt 2019-02-17 18:28:58.000000000 +0100
++++ udiskie-1.7.7a/doc/udiskie.8.txt 2019-10-29 14:21:52.304570344 +0100
+@@ -95,12 +95,6 @@
+ *-F, \--no-file-manager*::
+ Disable browsing.
+
+-*-appindicator*::
+- Use AppIndicator3 for the status icon. Use this on Ubuntu/Unity if no icon is shown.
+-
+-*--no-appindicator*::
+- Use Gtk.StatusIcon for the status icon (default).
+-
+ *--password-cache MINUTES*::
+ Cache passwords for LUKS partitions and set the timeout.
+
+diff -Naur udiskie-1.7.7/udiskie/appindicator.py udiskie-1.7.7a/udiskie/appindicator.py
+--- udiskie-1.7.7/udiskie/appindicator.py 2019-02-17 18:28:58.000000000 +0100
++++ udiskie-1.7.7a/udiskie/appindicator.py 1970-01-01 01:00:00.000000000 +0100
+@@ -1,61 +0,0 @@
+-"""
+-Status icon using AppIndicator3.
+-"""
+-
+-from gi.repository import Gtk
+-from gi.repository import AppIndicator3
+-
+-from udiskie.async_ import Async
+-
+-
+-class AppIndicatorIcon(object):
+-
+- """
+- Show status icon using AppIndicator as backend. Replaces
+- `udiskie.tray.StatusIcon` on ubuntu/unity.
+- """
+-
+- def __init__(self, menumaker, _icons):
+- self._maker = menumaker
+- self._menu = Gtk.Menu()
+- self._indicator = AppIndicator3.Indicator.new(
+- 'udiskie',
+- _icons.get_icon_name('media'),
+- AppIndicator3.IndicatorCategory.HARDWARE)
+- self._indicator.set_status(AppIndicator3.IndicatorStatus.PASSIVE)
+- self._indicator.set_menu(self._menu)
+- # Get notified before menu is shown, see:
+- # https://bugs.launchpad.net/screenlets/+bug/522152/comments/15
+- dbusmenuserver = self._indicator.get_property('dbus-menu-server')
+- self._dbusmenuitem = dbusmenuserver.get_property('root-node')
+- self._conn = self._dbusmenuitem.connect('about-to-show', self._on_show)
+- self.task = Async()
+- menumaker._quit_action = self.destroy
+- # Populate menu initially, so libdbusmenu does not ignore the
+- # 'about-to-show':
+- self._maker(self._menu)
+-
+- def destroy(self):
+- self.show(False)
+- self._dbusmenuitem.disconnect(self._conn)
+- self.task.callback()
+-
+- @property
+- def visible(self):
+- status = self._indicator.get_status()
+- return status == AppIndicator3.IndicatorStatus.ACTIVE
+-
+- def show(self, show=True):
+- if show == self.visible:
+- return
+- status = (AppIndicator3.IndicatorStatus.ACTIVE if show else
+- AppIndicator3.IndicatorStatus.PASSIVE)
+- self._indicator.set_status(status)
+-
+- def _on_show(self, menu):
+- # clear menu:
+- for item in self._menu.get_children():
+- self._menu.remove(item)
+- # repopulate:
+- self._maker(self._menu)
+- self._menu.show_all()
+diff -Naur udiskie-1.7.7/udiskie/cli.py udiskie-1.7.7a/udiskie/cli.py
+--- udiskie-1.7.7/udiskie/cli.py 2019-02-17 18:28:58.000000000 +0100
++++ udiskie-1.7.7a/udiskie/cli.py 2019-10-29 14:18:22.678919186 +0100
+@@ -376,9 +376,6 @@
+ -T, --no-tray Disable tray icon
+ -m MENU, --menu MENU Tray menu [flat/nested]
+
+- --appindicator Use appindicator for status icon
+- --no-appindicator Don't use appindicator
+-
+ --password-cache MINUTES Set password cache timeout
+ --no-password-cache Disable password cache
+
+@@ -400,7 +397,6 @@
+ 'notify': True,
+ 'tray': False,
+ 'menu': 'flat',
+- 'appindicator': False,
+ 'file_manager': 'xdg-open',
+ 'password_prompt': 'builtin:gui',
+ 'password_cache': False,
+@@ -415,7 +411,6 @@
+ '--no-tray': False,
+ '--smart-tray': 'auto'}),
+ 'menu': Value('--menu'),
+- 'appindicator': Switch('appindicator'),
+ 'file_manager': OptionalValue('--file-manager'),
+ 'password_prompt': OptionalValue('--password-prompt'),
+ 'password_cache': OptionalValue('--password-cache'),
+@@ -541,11 +536,7 @@
+ raise ValueError("Invalid menu: %s" % (options['menu'],))
+
+ menu_maker = udiskie.tray.UdiskieMenu(self, icons, actions, flat)
+- if options['appindicator']:
+- import udiskie.appindicator
+- TrayIcon = udiskie.appindicator.AppIndicatorIcon
+- else:
+- TrayIcon = udiskie.tray.TrayIcon
++ TrayIcon = udiskie.tray.TrayIcon
+ trayicon = TrayIcon(menu_maker, icons)
+ return udiskie.tray.UdiskieStatusIcon(trayicon, menu_maker, smart)
+
+diff -Naur udiskie-1.7.7/udiskie.egg-info/SOURCES.txt udiskie-1.7.7a/udiskie.egg-info/SOURCES.txt
+--- udiskie-1.7.7/udiskie.egg-info/SOURCES.txt 2019-02-17 19:42:25.000000000 +0100
++++ udiskie-1.7.7a/udiskie.egg-info/SOURCES.txt 2019-10-29 14:40:09.333315287 +0100
+@@ -24,7 +24,6 @@
+ test/test_cache.py
+ test/test_match.py
+ udiskie/__init__.py
+-udiskie/appindicator.py
+ udiskie/async_.py
+ udiskie/automount.py
+ udiskie/cache.py
+@@ -46,4 +45,4 @@
+ udiskie.egg-info/dependency_links.txt
+ udiskie.egg-info/entry_points.txt
+ udiskie.egg-info/requires.txt
+-udiskie.egg-info/top_level.txt
+\ Pas de fin de ligne à la fin du fichier
++udiskie.egg-info/top_level.txt
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:36:03 GMT) Full text and rfc822 format available.Message #38 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Subject: [PATCH 010/197] services: ntp: Ensure no double quotes are output to config file. Date: Fri, 8 Nov 2019 11:33:38 +0100
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
* gnu/services/networking.scm (ntp-server->string): Use the textual
representation of the values as printed by 'display' rather than 'write', to
avoid inserting double quotes in the generated config.
* tests/networking.scm (%ntp-server-sample): Add a comment and make one of the
options a string, to exercise the fix.
("ntp-server->string"): Move the expected value to the first argument.
("ntp configuration servers deprecated form"): Likewise.
("openntpd generated config string ends with a newline"): Likewise.
---
gnu/services/networking.scm | 2 +-
tests/networking.scm | 19 ++++++++++---------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 93d9b6a15e..841fbd741e 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -345,7 +345,7 @@ Protocol (DHCP) client, on all the non-loopback network interfaces."
(res '()))
(if (list? x)
(fold loop res x)
- (cons (format #f "~s" x) res)))))
+ (cons (format #f "~a" x) res)))))
(match ntp-server
(($ <ntp-server> type address options)
diff --git a/tests/networking.scm b/tests/networking.scm
index 439cca5ffc..c494a48067 100644
--- a/tests/networking.scm
+++ b/tests/networking.scm
@@ -36,22 +36,23 @@
(ntp-server
(type 'server)
(address "some.ntp.server.org")
- (options `(iburst (version 3) (maxpoll 16) prefer))))
+ ;; Using either strings or symbols for option names is accepted.
+ (options `("iburst" (version 3) (maxpoll 16) prefer))))
(test-equal "ntp-server->string"
- (ntp-server->string %ntp-server-sample)
- "server some.ntp.server.org iburst version 3 maxpoll 16 prefer")
+ "server some.ntp.server.org iburst version 3 maxpoll 16 prefer"
+ (ntp-server->string %ntp-server-sample))
(test-equal "ntp configuration servers deprecated form"
+ (ntp-configuration-servers
+ (ntp-configuration
+ (servers (list "example.pool.ntp.org"))))
(ntp-configuration-servers
(ntp-configuration
(servers (list (ntp-server
(type 'server)
(address "example.pool.ntp.org")
- (options '()))))))
- (ntp-configuration-servers
- (ntp-configuration
- (servers (list "example.pool.ntp.org")))))
+ (options '())))))))
;;;
@@ -106,8 +107,8 @@ the sanity check:\n~a~%" config)
#t))))
(test-equal "openntpd generated config string ends with a newline"
+ "\n"
(let ((config (openntpd-configuration->string %openntpd-conf-sample)))
- (string-take-right config 1))
- "\n")
+ (string-take-right config 1)))
(test-end "networking")
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:36:04 GMT) Full text and rfc822 format available.Message #41 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Marius Bakke <mbakke <at> fastmail.com> Subject: [PATCH 011/197] gnu: pingus: Update source URI. Date: Fri, 8 Nov 2019 11:33:39 +0100
From: Marius Bakke <mbakke <at> fastmail.com>
* gnu/packages/games.scm (pingus)[source](uri): Change to current repository.
---
gnu/packages/games.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index d0a5d28f04..04b06c88ee 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -1438,7 +1438,7 @@ fight Morgoth, the Lord of Darkness.")
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Pingus/pingus.git")
+ (url "https://gitlab.com/pingus/pingus.git")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:36:04 GMT) Full text and rfc822 format available.Message #44 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Marius Bakke <mbakke <at> fastmail.com> Subject: [PATCH 012/197] gnu: pingus: Adjust for GCC 7. Date: Fri, 8 Nov 2019 11:33:40 +0100
From: Marius Bakke <mbakke <at> fastmail.com>
Fixes <https://bugs.gnu.org/37946>.
* gnu/packages/games.scm (pingus)[source](modules, snippet): New fields.
---
gnu/packages/games.scm | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 04b06c88ee..a2917a5f23 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -1445,7 +1445,16 @@ fight Morgoth, the Lord of Darkness.")
(base32
"0wp06kcmknsnxz7bjnsndb8x062z7r23fb3yrnbfnj68qhz18y74"))
(patches (search-patches "pingus-boost-headers.patch"
- "pingus-sdl-libs-config.patch"))))
+ "pingus-sdl-libs-config.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (substitute* "src/pingus/screens/demo_session.cpp"
+ (("#include <iostream>")
+ ;; std::function moved to <functional> with C++ 11.
+ ;; Remove this for versions newer than 0.7.6.
+ "#include <iostream>\n#include <functional>"))
+ #t))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)
("scons-python2" ,scons-python2)))
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:36:05 GMT) Full text and rfc822 format available.Message #47 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Marius Bakke <mbakke <at> fastmail.com> Subject: [PATCH 013/197] gnu: Remove python2-feather-format. Date: Fri, 8 Nov 2019 11:33:41 +0100
From: Marius Bakke <mbakke <at> fastmail.com>
This trivial package fails to build and has no reverse dependencies.
* gnu/packages/serialization.scm (python2-feather-format): Remove variable.
---
gnu/packages/serialization.scm | 3 ---
1 file changed, 3 deletions(-)
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 249b6f1af5..9c4952793f 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -524,6 +524,3 @@ game development and other performance-critical applications.")
(description "This package provides a Python wrapper library to the
Apache Arrow-based Feather binary columnar serialization data frame format.")
(license license:asl2.0)))
-
-(define-public python2-feather-format
- (package-with-python2 python-feather-format))
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:36:07 GMT) Full text and rfc822 format available.Message #50 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Marius Bakke <mbakke <at> fastmail.com> Subject: [PATCH 014/197] gnu: u-boot: Remove redundant GCC input. Date: Fri, 8 Nov 2019 11:33:42 +0100
From: Marius Bakke <mbakke <at> fastmail.com>
* gnu/packages/bootloaders.scm (make-u-boot-package)[native-inputs]: Do not
explicitly add GCC 7.
---
gnu/packages/bootloaders.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 438f404e1a..156e4c4cdd 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -554,9 +554,9 @@ board-independent tools.")))
"_" "-")))
(native-inputs
`(,@(if (not (same-arch?))
- `(("cross-gcc" ,(cross-gcc triplet #:xgcc gcc-7))
+ `(("cross-gcc" ,(cross-gcc triplet))
("cross-binutils" ,(cross-binutils triplet)))
- `(("gcc-7" ,gcc-7)))
+ `())
,@(package-native-inputs u-boot)))
(arguments
`(#:modules ((ice-9 ftw)
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:36:08 GMT) Full text and rfc822 format available.Message #53 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Marius Bakke <mbakke <at> fastmail.com>, Ivan Gankevich <i.gankevich <at> spbu.ru> Subject: [PATCH 015/197] gnu: pocl: Update to 1.4. Date: Fri, 8 Nov 2019 11:33:43 +0100
From: Ivan Gankevich <i.gankevich <at> spbu.ru>
* gnu/packages/opencl.scm (pocl): Update to 1.4.
[inputs]: Change from LLVM to LLVM-8.
Signed-off-by: Marius Bakke <mbakke <at> fastmail.com>
---
gnu/packages/opencl.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm
index fc9c11caa5..81e5bab9db 100644
--- a/gnu/packages/opencl.scm
+++ b/gnu/packages/opencl.scm
@@ -296,7 +296,7 @@ back-end for the LLVM compiler framework.")
(define-public pocl
(package
(name "pocl")
- (version "1.2")
+ (version "1.4")
(source
(origin
(method git-fetch)
@@ -304,7 +304,7 @@ back-end for the LLVM compiler framework.")
(url "https://github.com/pocl/pocl.git")
(commit (string-append "v" version))))
(sha256
- (base32 "0fyiwd9nrqhl0jsac0bx17p9acpfzhyxp50mmp28mzn7psb9qidg"))
+ (base32 "1c4y69zks6hkq5fqh9waxgb8g4ka7y6h3vacmsm720kba0h57g8a"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(native-inputs
@@ -313,7 +313,7 @@ back-end for the LLVM compiler framework.")
(inputs
`(("clang" ,clang)
("hwloc" ,hwloc-2.0 "lib")
- ("llvm" ,llvm)
+ ("llvm" ,llvm-8)
("ocl-icd" ,ocl-icd)))
(arguments
`(#:configure-flags
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:36:08 GMT) Full text and rfc822 format available.Message #56 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Mark H Weaver <mhw <at> netris.org> Subject: [PATCH 016/197] gnu: icecat: Update to 68.2.0-guix0-preview3. Date: Fri, 8 Nov 2019 11:33:44 +0100
From: Mark H Weaver <mhw <at> netris.org>
* gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update.
(icecat-source): Update to the latest upstream commit on '68' branch.
* gnu/packages/patches/icecat-gnuzilla-fixes.patch: Remove changes
that have been incorporated upstream, and add new pending changes,
notably the addition of several IceCat-specific preferences.
* gnu/packages/patches/icecat-makeicecat.patch: Adapt to changes in
icecat-gnuzilla-fixes.patch.
---
gnu/packages/gnuzilla.scm | 14 +-
.../patches/icecat-gnuzilla-fixes.patch | 727 +++++++++++++-----
gnu/packages/patches/icecat-makeicecat.patch | 2 +-
3 files changed, 525 insertions(+), 218 deletions(-)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 16d3fe5db9..fa8086671f 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -550,8 +550,8 @@ from forcing GEXP-PROMISE."
#:system system
#:guile-for-build guile)))
-(define %icecat-version "68.2.0-guix0-preview2")
-(define %icecat-build-id "20191028000000") ;must be of the form YYYYMMDDhhmmss
+(define %icecat-version "68.2.0-guix0-preview3")
+(define %icecat-build-id "20191031000000") ;must be of the form YYYYMMDDhhmmss
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
@@ -575,19 +575,21 @@ from forcing GEXP-PROMISE."
(base32
"0f3gf5gwhxabm6xs29nlxmfqdw3fs7v458vq1fydrglfyvmc5wc5"))))
- (upstream-icecat-base-version "68.1.0") ; maybe older than base-version
+ (upstream-icecat-base-version "68.2.0") ; maybe older than base-version
;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))
- (gnuzilla-commit "aa7ab9483a64c43e77736917dd83841ccc437300")
+ (gnuzilla-commit "930298e1efff3e40721659d8fd7118cdd2477bd4")
(gnuzilla-source
(origin
(method git-fetch)
(uri (git-reference
(url "git://git.savannah.gnu.org/gnuzilla.git")
(commit gnuzilla-commit)))
- (file-name (git-file-name "gnuzilla" upstream-icecat-base-version))
+ (file-name (git-file-name "gnuzilla"
+ ;;upstream-icecat-base-version
+ (string-take gnuzilla-commit 8)))
(sha256
(base32
- "03jygq1zna621y0ba6370cff4v2g9l57g3015y3vxbahnmzn9msa"))))
+ "14g57b0262qq5s0w8b1lrk8wkvg7m068dfi0ilvhg2q5jrxk3cd0"))))
(gnuzilla-fixes-patch
(local-file (search-patch "icecat-gnuzilla-fixes.patch")))
diff --git a/gnu/packages/patches/icecat-gnuzilla-fixes.patch b/gnu/packages/patches/icecat-gnuzilla-fixes.patch
index 41f0d2e3a3..e8e0946f57 100644
--- a/gnu/packages/patches/icecat-gnuzilla-fixes.patch
+++ b/gnu/packages/patches/icecat-gnuzilla-fixes.patch
@@ -1,241 +1,546 @@
-From 2676d4e1eb64e18d2e4722c0ea0babdc1f716fa4 Mon Sep 17 00:00:00 2001
+From 2abca7767c461a022317bf18fbec51e8b3ce6a92 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw <at> netris.org>
-Date: Mon, 28 Oct 2019 01:54:19 -0400
-Subject: [PATCH 1/4] Update to 68.2.0-gnu1.
+Date: Thu, 31 Oct 2019 03:59:46 -0400
+Subject: [PATCH 1/2] Branding: fix patching of trademarkInfo within l10n
+ directory.
-* makeicecat: Update to FFMINOR to 2, and update the expected
-sha256sum of the firefox source tarball.
+This is a followup to commit 930298e1efff3e40721659d8fd7118cdd2477bd4.
+
+* makeicecat: Patch in the IceCat logo copyright notice in all
+brand.dtd files within l10n directory.
---
- makeicecat | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ makeicecat | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/makeicecat b/makeicecat
-index 97ee473..1bcf465 100644
+index 3ff2ead..4ff3e64 100755
--- a/makeicecat
+++ b/makeicecat
-@@ -21,7 +21,7 @@
- set -euxo pipefail
+@@ -226,7 +226,7 @@ cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in
+
+ # Custom legal about pages
- FFMAJOR=68
--FFMINOR=1
-+FFMINOR=2
- FFSUB=0
- GNUVERSION=1
- FFVERSION=$FFMAJOR.$FFMINOR.$FFSUB
-@@ -43,7 +43,7 @@ wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr
- wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc
- gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353
- gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc
--echo -n f56f5fa5a4744be0b9acf259cb991254d708a50b9a0a12d1d846ffa5a6c409ac firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
-+echo -n 85f1c2eaf68ebedcbc0b78a342f6d16ef0865dedd426a1bba94b75c85f716f38 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
+-find l10n -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
++find l10n -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version.">/' -i
+ find l10n -wholename '*/brand.ftl' |xargs /bin/sed 's/^trademarkInfo = .*/trademarkInfo = The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version./' -i
- echo Extracting Firefox tarball
- tar -xf firefox-${FFVERSION}esr.source.tar.xz
+ for STRING in rights.intro-point3-unbranded rights.intro-point4a-unbranded rights.intro-point4b-unbranded rights.intro-point4c-unbranded
--
2.23.0
-From c3a7b761f11c75d3764779e731a7c7e86b072d2f Mon Sep 17 00:00:00 2001
+From 150af5dd8b502b66f325b9fe8bd0b2ae553326a4 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw <at> netris.org>
-Date: Mon, 28 Oct 2019 04:18:26 -0400
-Subject: [PATCH 2/4] Disable MOZ_SERVICES_HEALTHREPORT and MOZ_DATA_REPORTING.
+Date: Wed, 30 Oct 2019 18:34:44 -0400
+Subject: [PATCH 2/2] Add first batch of IceCat-specific preferences.
-* data/patches/fix-data-reporting-check.patch: New file.
-* data/patches/legacy-profiles.patch: Rename to ...
-* data/patches/moz-configure-changes.patch: ... this,
-and set MOZ_SERVICES_HEALTHREPORT to False.
+* makeicecat: Add code to add IceCat-specific messages to l10n directory.
+* data/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl,
+data/files-to-append/l10n/es-AR/browser/browser/preferences/preferences.ftl,
+data/files-to-append/l10n/es-CL/browser/browser/preferences/preferences.ftl,
+data/files-to-append/l10n/es-ES/browser/browser/preferences/preferences.ftl,
+data/files-to-append/l10n/es-MX/browser/browser/preferences/preferences.ftl,
+data/files-to-append/l10n/fr/browser/browser/preferences/preferences.ftl,
+data/files-to-append/l10n/it/browser/browser/preferences/preferences.ftl,
+data/patches/icecat-preferences.patch: New files.
---
- data/patches/fix-data-reporting-check.patch | 22 +++++++++++++++++++++
- data/patches/legacy-profiles.patch | 11 -----------
- data/patches/moz-configure-changes.patch | 14 +++++++++++++
- 3 files changed, 36 insertions(+), 11 deletions(-)
- create mode 100644 data/patches/fix-data-reporting-check.patch
- delete mode 100644 data/patches/legacy-profiles.patch
- create mode 100644 data/patches/moz-configure-changes.patch
+ .../en-US/browser/preferences/preferences.ftl | 36 ++++
+ .../browser/preferences/preferences.ftl | 36 ++++
+ .../browser/preferences/preferences.ftl | 36 ++++
+ .../browser/preferences/preferences.ftl | 36 ++++
+ .../browser/preferences/preferences.ftl | 36 ++++
+ .../browser/preferences/preferences.ftl | 36 ++++
+ .../browser/preferences/preferences.ftl | 36 ++++
+ data/patches/icecat-preferences.patch | 155 ++++++++++++++++++
+ makeicecat | 13 ++
+ 9 files changed, 420 insertions(+)
+ create mode 100644 data/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl
+ create mode 100644 data/files-to-append/l10n/es-AR/browser/browser/preferences/preferences.ftl
+ create mode 100644 data/files-to-append/l10n/es-CL/browser/browser/preferences/preferences.ftl
+ create mode 100644 data/files-to-append/l10n/es-ES/browser/browser/preferences/preferences.ftl
+ create mode 100644 data/files-to-append/l10n/es-MX/browser/browser/preferences/preferences.ftl
+ create mode 100644 data/files-to-append/l10n/fr/browser/browser/preferences/preferences.ftl
+ create mode 100644 data/files-to-append/l10n/it/browser/browser/preferences/preferences.ftl
+ create mode 100644 data/patches/icecat-preferences.patch
-diff --git a/data/patches/fix-data-reporting-check.patch b/data/patches/fix-data-reporting-check.patch
+diff --git a/data/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl b/data/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl
new file mode 100644
-index 0000000..d586dc5
+index 0000000..2f90bcd
--- /dev/null
-+++ b/data/patches/fix-data-reporting-check.patch
-@@ -0,0 +1,22 @@
-+--- a/old-configure.in.orig 1980-01-01 18:59:51.000000000 -0500
-++++ b/old-configure.in 2019-10-28 04:13:17.343606008 -0400
-+@@ -3116,7 +3116,7 @@
-+ dnl If we have any service that uploads data (and requires data submission
-+ dnl policy alert), set MOZ_DATA_REPORTING.
-+ dnl We need SUBST for build system and DEFINE for xul preprocessor.
-+-if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER"; then
-++if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1; then
-+ MOZ_DATA_REPORTING=1
-+ AC_DEFINE(MOZ_DATA_REPORTING)
-+ AC_SUBST(MOZ_DATA_REPORTING)
-+--- a/old-configure.orig 1980-01-01 18:59:51.000000000 -0500
-++++ b/old-configure 2019-10-28 04:15:41.772322191 -0400
-+@@ -12150,7 +12150,7 @@
-+
-+
-+
-+-if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER"; then
-++if test "$MOZ_TELEMETRY_REPORTING" = 1 || test "$MOZ_SERVICES_HEALTHREPORT" = 1 || test "$MOZ_CRASHREPORTER" = 1; then
-+ MOZ_DATA_REPORTING=1
-+ cat >> confdefs.pytmp <<\EOF
-+ (''' MOZ_DATA_REPORTING ''', ' 1 ')
-diff --git a/data/patches/legacy-profiles.patch b/data/patches/legacy-profiles.patch
-deleted file mode 100644
-index 33e9e99..0000000
---- a/data/patches/legacy-profiles.patch
-+++ /dev/null
-@@ -1,11 +0,0 @@
----- a/browser/moz.configure.orig 1980-01-01 18:59:51.000000000 -0500
--+++ b/browser/moz.configure 2019-10-26 21:58:37.719617701 -0400
--@@ -7,7 +7,7 @@
-- imply_option('MOZ_PLACES', True)
-- imply_option('MOZ_SERVICES_HEALTHREPORT', True)
-- imply_option('MOZ_SERVICES_SYNC', True)
---imply_option('MOZ_DEDICATED_PROFILES', True)
--+imply_option('MOZ_DEDICATED_PROFILES', False)
-- imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True)
--
-- with only_when(target_is_linux & compile_environment):
-diff --git a/data/patches/moz-configure-changes.patch b/data/patches/moz-configure-changes.patch
++++ b/data/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl
+@@ -0,0 +1,36 @@
++
++## IceCat-specific privacy settings
++
++icecat-privacy-group-header = IceCat-specific privacy settings
++
++disable-javascript-option =
++ .label = Disable JavaScript
++disable-javascript-description = Disabling Javascript greatly improves privacy, security and <a href=\"https://www.gnu.org/philosophy/javascript-trap.html\">freedom</a>, but it will break many sites.
++
++disable-custom-fonts-option =
++ .label = Do not load custom fonts
++disable-custom-fonts-description = Custom fonts can be used for <a href=\"https://en.wikipedia.org/wiki/Device_fingerprint\">fingerprinting</a>. Disabling them improves privacy but may make some sites look wrong.
++
++isolate-request-first-party-option =
++ .label = Isolate requests to First Party domains
++isolate-request-first-party-description = This <a href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-linkability\">improves privacy</a>, but it may interfere with login into some sites.
++
++auto-update-extensions-option =
++ .label = Automatically update extensions
++auto-update-extensions-description = Enabling automated updates is good for security, but would start Internet connections in the background.
++
++spoof-referers-option =
++ .label = Spoof Referers
++spoof-referers-description = <a href=\"https://en.wikipedia.org/wiki/HTTP_referer\">Referers</a> tell sites what link brought you there. This feature greatly improves your privacy, but it may break functionality on some sites.
++
++detect-captive-portal-option =
++ .label = Detect captive portal
++detect-captive-portal-description = <a href=\"https://en.wikipedia.org/wiki/Captive_portal\">Captive portals</a> are the sites that control access to public wireless networks in hotels, airports, cafes, etc. The detection service is useful if you connect to such netwoks, but it will start connections automatically.
++
++geolocation-option =
++ .label = Enable Geolocation
++geolocation-description = This is commonly used for maps, weather sites, and some stores. It is better to keep it off unless you really need it.
++
++webgl-option =
++ .label = Enable WebGL
++webgl-description = Needed to visualize 3D graphics, but it may expose you to security threats. Enable it only if you really use it.
+diff --git a/data/files-to-append/l10n/es-AR/browser/browser/preferences/preferences.ftl b/data/files-to-append/l10n/es-AR/browser/browser/preferences/preferences.ftl
+new file mode 100644
+index 0000000..ad052b3
+--- /dev/null
++++ b/data/files-to-append/l10n/es-AR/browser/browser/preferences/preferences.ftl
+@@ -0,0 +1,36 @@
++
++## IceCat-specific privacy settings
++
++icecat-privacy-group-header = Ajustes de privacidad de IceCat
++
++disable-javascript-option =
++ .label = Desactivar JavaScript
++disable-javascript-description = Desactivar JavaScript mejora enormemente la privacidad, la seguridad en Internet y la <a href=\"https://www.gnu.org/philosophy/javascript-trap.es.html\">libertad</a> en su equipo, pero afectará a la funcionalidad de muchas páginas.
++
++disable-custom-fonts-option =
++ .label = No cargar fuentes personalizadas
++disable-custom-fonts-description = Las fuentes personalizadas pueden usarse para <a href=\"https://en.wikipedia.org/wiki/Device_fingerprint\">rastrear</a> al usuario. Desactivarlas mejora la privacidad pero puede afectar al aspecto visual de algunas páginas.
++
++isolate-request-first-party-option =
++ .label = Aislar las solicitudes a los Dominios Primarios
++isolate-request-first-party-description = Este ajuste <a href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-linkability\">mejora la privacidad</a>, pero puede interferir con el inicio de sesión en algunas webs.
++
++auto-update-extensions-option =
++ .label = Actualizar las extensiones automáticamente
++auto-update-extensions-description = Activar las actualizaciones automáticas es bueno para la seguridad, pero precisa del establecimiento de conexiones a otros servidores en segundo plano.
++
++spoof-referers-option =
++ .label = Modificar los referers HTTP
++spoof-referers-description = Los <a href=\"https://es.wikipedia.org/wiki/Referer_(Cabecera_HTTP)\">referers</a> son cabeceras HTTP que informan a una página acerca de nuestro enlace de origen. Activar esta característica mejora enormemente su privacidad, pero puede afectar a la funcionalidad de algunas páginas.
++
++detect-captive-portal-option =
++ .label = Detectar los portales cautivos
++detect-captive-portal-description = Los <a href=\"https://es.wikipedia.org/wiki/Portal_cautivo\">portales cautivos</a> son las webs que registran y controlan el acceso a redes inalámbricas públicas en hoteles, aeropuertos, cafés y similares. El servicio que los detecta es práctico si se ve a menudo en la necesidad de usarlos, pero implica el establecimiento de conexiones en segundo plano.
++
++geolocation-option =
++ .label = Activar Geolocalización
++geolocation-description = Esta característica se usa habitualmente en mapas, páginas del tiempo y algunas tiendas. Es mejor desactivarla si realmente no necesita que identifiquen su ubicación.
++
++webgl-option =
++ .label = Activar WebGL
++webgl-description = Esta función necesaria para mostrar ciertos gráficos 3D en el navegador puede exponerle a ciertos riesgos de seguridad. Actívela solamente si va a usarla.
+diff --git a/data/files-to-append/l10n/es-CL/browser/browser/preferences/preferences.ftl b/data/files-to-append/l10n/es-CL/browser/browser/preferences/preferences.ftl
+new file mode 100644
+index 0000000..ad052b3
+--- /dev/null
++++ b/data/files-to-append/l10n/es-CL/browser/browser/preferences/preferences.ftl
+@@ -0,0 +1,36 @@
++
++## IceCat-specific privacy settings
++
++icecat-privacy-group-header = Ajustes de privacidad de IceCat
++
++disable-javascript-option =
++ .label = Desactivar JavaScript
++disable-javascript-description = Desactivar JavaScript mejora enormemente la privacidad, la seguridad en Internet y la <a href=\"https://www.gnu.org/philosophy/javascript-trap.es.html\">libertad</a> en su equipo, pero afectará a la funcionalidad de muchas páginas.
++
++disable-custom-fonts-option =
++ .label = No cargar fuentes personalizadas
++disable-custom-fonts-description = Las fuentes personalizadas pueden usarse para <a href=\"https://en.wikipedia.org/wiki/Device_fingerprint\">rastrear</a> al usuario. Desactivarlas mejora la privacidad pero puede afectar al aspecto visual de algunas páginas.
++
++isolate-request-first-party-option =
++ .label = Aislar las solicitudes a los Dominios Primarios
++isolate-request-first-party-description = Este ajuste <a href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-linkability\">mejora la privacidad</a>, pero puede interferir con el inicio de sesión en algunas webs.
++
++auto-update-extensions-option =
++ .label = Actualizar las extensiones automáticamente
++auto-update-extensions-description = Activar las actualizaciones automáticas es bueno para la seguridad, pero precisa del establecimiento de conexiones a otros servidores en segundo plano.
++
++spoof-referers-option =
++ .label = Modificar los referers HTTP
++spoof-referers-description = Los <a href=\"https://es.wikipedia.org/wiki/Referer_(Cabecera_HTTP)\">referers</a> son cabeceras HTTP que informan a una página acerca de nuestro enlace de origen. Activar esta característica mejora enormemente su privacidad, pero puede afectar a la funcionalidad de algunas páginas.
++
++detect-captive-portal-option =
++ .label = Detectar los portales cautivos
++detect-captive-portal-description = Los <a href=\"https://es.wikipedia.org/wiki/Portal_cautivo\">portales cautivos</a> son las webs que registran y controlan el acceso a redes inalámbricas públicas en hoteles, aeropuertos, cafés y similares. El servicio que los detecta es práctico si se ve a menudo en la necesidad de usarlos, pero implica el establecimiento de conexiones en segundo plano.
++
++geolocation-option =
++ .label = Activar Geolocalización
++geolocation-description = Esta característica se usa habitualmente en mapas, páginas del tiempo y algunas tiendas. Es mejor desactivarla si realmente no necesita que identifiquen su ubicación.
++
++webgl-option =
++ .label = Activar WebGL
++webgl-description = Esta función necesaria para mostrar ciertos gráficos 3D en el navegador puede exponerle a ciertos riesgos de seguridad. Actívela solamente si va a usarla.
+diff --git a/data/files-to-append/l10n/es-ES/browser/browser/preferences/preferences.ftl b/data/files-to-append/l10n/es-ES/browser/browser/preferences/preferences.ftl
new file mode 100644
-index 0000000..aa6f1a5
+index 0000000..ad052b3
--- /dev/null
-+++ b/data/patches/moz-configure-changes.patch
-@@ -0,0 +1,14 @@
-+--- a/browser/moz.configure.orig 1980-01-01 18:59:51.000000000 -0500
-++++ b/browser/moz.configure 2019-10-28 01:36:13.132873871 -0400
-+@@ -5,9 +5,9 @@
-+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
++++ b/data/files-to-append/l10n/es-ES/browser/browser/preferences/preferences.ftl
+@@ -0,0 +1,36 @@
++
++## IceCat-specific privacy settings
++
++icecat-privacy-group-header = Ajustes de privacidad de IceCat
++
++disable-javascript-option =
++ .label = Desactivar JavaScript
++disable-javascript-description = Desactivar JavaScript mejora enormemente la privacidad, la seguridad en Internet y la <a href=\"https://www.gnu.org/philosophy/javascript-trap.es.html\">libertad</a> en su equipo, pero afectará a la funcionalidad de muchas páginas.
++
++disable-custom-fonts-option =
++ .label = No cargar fuentes personalizadas
++disable-custom-fonts-description = Las fuentes personalizadas pueden usarse para <a href=\"https://en.wikipedia.org/wiki/Device_fingerprint\">rastrear</a> al usuario. Desactivarlas mejora la privacidad pero puede afectar al aspecto visual de algunas páginas.
++
++isolate-request-first-party-option =
++ .label = Aislar las solicitudes a los Dominios Primarios
++isolate-request-first-party-description = Este ajuste <a href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-linkability\">mejora la privacidad</a>, pero puede interferir con el inicio de sesión en algunas webs.
++
++auto-update-extensions-option =
++ .label = Actualizar las extensiones automáticamente
++auto-update-extensions-description = Activar las actualizaciones automáticas es bueno para la seguridad, pero precisa del establecimiento de conexiones a otros servidores en segundo plano.
++
++spoof-referers-option =
++ .label = Modificar los referers HTTP
++spoof-referers-description = Los <a href=\"https://es.wikipedia.org/wiki/Referer_(Cabecera_HTTP)\">referers</a> son cabeceras HTTP que informan a una página acerca de nuestro enlace de origen. Activar esta característica mejora enormemente su privacidad, pero puede afectar a la funcionalidad de algunas páginas.
++
++detect-captive-portal-option =
++ .label = Detectar los portales cautivos
++detect-captive-portal-description = Los <a href=\"https://es.wikipedia.org/wiki/Portal_cautivo\">portales cautivos</a> son las webs que registran y controlan el acceso a redes inalámbricas públicas en hoteles, aeropuertos, cafés y similares. El servicio que los detecta es práctico si se ve a menudo en la necesidad de usarlos, pero implica el establecimiento de conexiones en segundo plano.
++
++geolocation-option =
++ .label = Activar Geolocalización
++geolocation-description = Esta característica se usa habitualmente en mapas, páginas del tiempo y algunas tiendas. Es mejor desactivarla si realmente no necesita que identifiquen su ubicación.
++
++webgl-option =
++ .label = Activar WebGL
++webgl-description = Esta función necesaria para mostrar ciertos gráficos 3D en el navegador puede exponerle a ciertos riesgos de seguridad. Actívela solamente si va a usarla.
+diff --git a/data/files-to-append/l10n/es-MX/browser/browser/preferences/preferences.ftl b/data/files-to-append/l10n/es-MX/browser/browser/preferences/preferences.ftl
+new file mode 100644
+index 0000000..ad052b3
+--- /dev/null
++++ b/data/files-to-append/l10n/es-MX/browser/browser/preferences/preferences.ftl
+@@ -0,0 +1,36 @@
++
++## IceCat-specific privacy settings
++
++icecat-privacy-group-header = Ajustes de privacidad de IceCat
++
++disable-javascript-option =
++ .label = Desactivar JavaScript
++disable-javascript-description = Desactivar JavaScript mejora enormemente la privacidad, la seguridad en Internet y la <a href=\"https://www.gnu.org/philosophy/javascript-trap.es.html\">libertad</a> en su equipo, pero afectará a la funcionalidad de muchas páginas.
++
++disable-custom-fonts-option =
++ .label = No cargar fuentes personalizadas
++disable-custom-fonts-description = Las fuentes personalizadas pueden usarse para <a href=\"https://en.wikipedia.org/wiki/Device_fingerprint\">rastrear</a> al usuario. Desactivarlas mejora la privacidad pero puede afectar al aspecto visual de algunas páginas.
++
++isolate-request-first-party-option =
++ .label = Aislar las solicitudes a los Dominios Primarios
++isolate-request-first-party-description = Este ajuste <a href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-linkability\">mejora la privacidad</a>, pero puede interferir con el inicio de sesión en algunas webs.
++
++auto-update-extensions-option =
++ .label = Actualizar las extensiones automáticamente
++auto-update-extensions-description = Activar las actualizaciones automáticas es bueno para la seguridad, pero precisa del establecimiento de conexiones a otros servidores en segundo plano.
++
++spoof-referers-option =
++ .label = Modificar los referers HTTP
++spoof-referers-description = Los <a href=\"https://es.wikipedia.org/wiki/Referer_(Cabecera_HTTP)\">referers</a> son cabeceras HTTP que informan a una página acerca de nuestro enlace de origen. Activar esta característica mejora enormemente su privacidad, pero puede afectar a la funcionalidad de algunas páginas.
++
++detect-captive-portal-option =
++ .label = Detectar los portales cautivos
++detect-captive-portal-description = Los <a href=\"https://es.wikipedia.org/wiki/Portal_cautivo\">portales cautivos</a> son las webs que registran y controlan el acceso a redes inalámbricas públicas en hoteles, aeropuertos, cafés y similares. El servicio que los detecta es práctico si se ve a menudo en la necesidad de usarlos, pero implica el establecimiento de conexiones en segundo plano.
++
++geolocation-option =
++ .label = Activar Geolocalización
++geolocation-description = Esta característica se usa habitualmente en mapas, páginas del tiempo y algunas tiendas. Es mejor desactivarla si realmente no necesita que identifiquen su ubicación.
++
++webgl-option =
++ .label = Activar WebGL
++webgl-description = Esta función necesaria para mostrar ciertos gráficos 3D en el navegador puede exponerle a ciertos riesgos de seguridad. Actívela solamente si va a usarla.
+diff --git a/data/files-to-append/l10n/fr/browser/browser/preferences/preferences.ftl b/data/files-to-append/l10n/fr/browser/browser/preferences/preferences.ftl
+new file mode 100644
+index 0000000..4008883
+--- /dev/null
++++ b/data/files-to-append/l10n/fr/browser/browser/preferences/preferences.ftl
+@@ -0,0 +1,36 @@
++
++## IceCat-specific privacy settings
++
++icecat-privacy-group-header = Vie privée de IceCat
++
++disable-javascript-option =
++ .label = Disable JavaScript
++disable-javascript-description = Désactiver JavaScript améliore grandement le respect de la vie privée, la sécurité et <a href=\"https://www.gnu.org/philosophy/javascript-trap.fr.html\">la liberté</a>, mais cela risque de rendre beaucoup de sites web inutilisables.
++
++disable-custom-fonts-option =
++ .label = Ne pas charger de polices personnalisées
++disable-custom-fonts-description = Les polices personnalisées peuvent être utilisées pour vous <a href=\"https://fr.wikipedia.org/wiki/Empreinte_digitale_d%27appareil\">identifier</a>. Les désactiver améliore le respect de la vie privée mais peut détérorier le rendu de certains sites.
++
++isolate-request-first-party-option =
++ .label = Isoler les requêtes vers les domaines de premier niveau
++isolate-request-first-party-description = Améliore <a href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-linkability\">le respect de la vie privée</a>, mais peut interférer avec la page de login de certains sites web.
++
++auto-update-extensions-option =
++ .label = Mettre à jour les extensions automatiquement
++auto-update-extensions-description = Activer les mises à jour automatiques améliore votre sécurité, mais cela va ouvrir des connexions internet en arrière-plan.
++
++spoof-referers-option =
++ .label = Usurper l'identité des Referers
++spoof-referers-description = <a href=\"https://fr.wikipedia.org/wiki/R%C3%A9f%C3%A9rent_(informatique)\">Les Referers</a> indiquent aux sites web quel lien vous y a amené. Cette fonctionnalité améliore grandement le respect de la vie privée, mais peut entraîner la perte de fonctionnalités sur certains sites.
++
++detect-captive-portal-option =
++ .label = Détecter les portails captifs
++detect-captive-portal-description = <a href=\"https://fr.wikipedia.org/wiki/Portail_captif\">Les portails captifs</a> sont les sites qui contrôlent l'accès aux réseaux sans fils publics dans les hôtels, les aéroports, les bars, etc. Ce service de détection est utile si vous vous connectez à ce type de réseaux, mais cela entraîne l'ouverture automatique de connexions.
++
++geolocation-option =
++ .label = Activer la géolocalisation
++geolocation-description = Elle est utilisée couramment pour les cartes, les sites de prévisions météo, et certaines boutiques en ligne. Il vaut mieux la désactivez à moins d'en avoir réellement besoin.
++
++webgl-option =
++ .label = Activer WebGL
++webgl-description = Nécessaire afin de visualiser les graphisme en 3D, mais peut vous exposer à des menaces de sécurité. Activer WebGL seulement si vous l'utilisez réellement.
+diff --git a/data/files-to-append/l10n/it/browser/browser/preferences/preferences.ftl b/data/files-to-append/l10n/it/browser/browser/preferences/preferences.ftl
+new file mode 100644
+index 0000000..a1fe1b7
+--- /dev/null
++++ b/data/files-to-append/l10n/it/browser/browser/preferences/preferences.ftl
+@@ -0,0 +1,36 @@
++
++## IceCat-specific privacy settings
++
++icecat-privacy-group-header = Impostazioni sulla privacy di IceCat
++
++disable-javascript-option =
++ .label = Disabilita JavaScript
++disable-javascript-description = Disabilitare Javascript migliora notevolmente la privacy, la sicurezza e la <a href=\"https://www.gnu.org/philosophy/javascript-trap.it.html\">libertà</a>, ma compromette la funzionalità molti siti.
++
++disable-custom-fonts-option =
++ .label = Non caricare caratteri personalizzati
++disable-custom-fonts-description = I caratteri personalizzati possono essere utilizzati per il <a href=\"https://it.wikipedia.org/wiki/Device_fingerprint\">fingerprinting</a>. Disabilitarli migliora la privacy ma potrebbe far compromettere la visibilità di alcuni siti.
++
++isolate-request-first-party-option =
++ .label = Isolare le richieste ai domini proprietari
++isolate-request-first-party-description = Questo <a href=\"https://www.torproject.org/projects/torbrowser/design/#identifier-linkability\">migliora la privacy</a>, ma potrebbe interferire con il login in alcuni siti.
++
++auto-update-extensions-option =
++ .label = Aggiorna automaticamente le estensioni
++auto-update-extensions-description = Abilitare gli aggiornamenti automatici è positivo per la sicurezza, ma avvierebbe connessioni Internet in background.
++
++spoof-referers-option =
++ .label = Spoof Referers
++spoof-referers-description = <a href=\"https://it.wikipedia.org/wiki/Referer\">I referer</a> dicono ai siti quale link ti ha portato lì. Questa funzione migliora notevolmente la privacy, ma potrebbe compromettere la funzionalità di alcuni siti.
++
++detect-captive-portal-option =
++ .label = Rileva il captive portal
++detect-captive-portal-description = <a href=\"https://it.wikipedia.org/wiki/Captive_portal\">I captive portal</a> sono i siti che controllano l'accesso alle reti wireless pubbliche negli hotel, negli aeroporti, nei bar, ecc. Il servizio di rilevamento è utile se ci si connette a tali reti, ma avvierà automaticamente le connessioni.
++
++geolocation-option =
++ .label = Abilita geolocalizzazione
++geolocation-description = Questo è comunemente usato per mappe, siti meteo e alcuni negozi online. È meglio tenerlo spento a meno che non se ne abbia veramente bisogno.
++
++webgl-option =
++ .label = Abilita WebGL
++webgl-description = Necessario per visualizzare la grafica 3D, ma potrebbe esporre a minacce alla sicurezza. Abilitare solo in caso di necessità.
+diff --git a/data/patches/icecat-preferences.patch b/data/patches/icecat-preferences.patch
+new file mode 100644
+index 0000000..86fdd06
+--- /dev/null
++++ b/data/patches/icecat-preferences.patch
+@@ -0,0 +1,155 @@
++--- a/browser/components/preferences/in-content/privacy.xul.orig 2019-10-16 15:29:49.000000000 -0400
+++++ b/browser/components/preferences/in-content/privacy.xul 2019-10-30 23:54:53.591633131 -0400
++@@ -594,6 +594,79 @@
++ data-l10n-id="addressbar-suggestions-settings"/>
++ </groupbox>
+
-+ imply_option('MOZ_PLACES', True)
-+-imply_option('MOZ_SERVICES_HEALTHREPORT', True)
-++imply_option('MOZ_SERVICES_HEALTHREPORT', False)
-+ imply_option('MOZ_SERVICES_SYNC', True)
-+-imply_option('MOZ_DEDICATED_PROFILES', True)
-++imply_option('MOZ_DEDICATED_PROFILES', False)
-+ imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True)
+++<!-- IceCat-specific privacy group -->
+++<groupbox id="iceCatPrivacyGroup"
+++ data-category="panePrivacy"
+++ hidden="true">
+++ <label><html:h2 data-l10n-id="icecat-privacy-group-header"/></label>
+++ <vbox>
+++ <checkbox id="disableJavaScript" data-l10n-id="disable-javascript-option"
+++ preference="javascript.enabled"
+++ onsyncfrompreference="return gPrivacyPane.readDisableJavaScriptOption();"
+++ onsynctopreference="return gPrivacyPane.writeDisableJavaScriptOption();"/>
+++ <vbox class="indent">
+++ <label data-l10n-id="disable-javascript-description"/>
+++ </vbox>
+++ </vbox>
+++ <vbox>
+++ <checkbox id="disableCustomFonts" data-l10n-id="disable-custom-fonts-option"
+++ preference="browser.display.use_document_fonts"
+++ onsyncfrompreference="return gPrivacyPane.readDisableCustomFontsOption();"
+++ onsynctopreference="return gPrivacyPane.writeDisableCustomFontsOption();"/>
+++ <vbox class="indent">
+++ <label data-l10n-id="disable-custom-fonts-description"/>
+++ </vbox>
+++ </vbox>
+++ <vbox>
+++ <checkbox id="isolateRequestFirstParty" data-l10n-id="isolate-request-first-party-option"
+++ preference="privacy.firstparty.isolate"/>
+++ <vbox class="indent">
+++ <label data-l10n-id="isolate-request-first-party-description"/>
+++ </vbox>
+++ </vbox>
+++ <vbox>
+++ <checkbox id="autoUpdateExtensions" data-l10n-id="auto-update-extensions-option"
+++ preference="extensions.update.enabled"/>
+++ <vbox class="indent">
+++ <label data-l10n-id="auto-update-extensions-description"/>
+++ </vbox>
+++ </vbox>
+++ <vbox>
+++ <checkbox id="spoofReferrers" data-l10n-id="spoof-referers-option"
+++ preference="network.http.referer.spoofSource"/>
+++ <vbox class="indent">
+++ <label data-l10n-id="spoof-referers-description"/>
+++ </vbox>
+++ </vbox>
+++ <vbox>
+++ <checkbox id="detectCaptivePortal" data-l10n-id="detect-captive-portal-option"
+++ preference="captivedetect.canonicalURL"
+++ onsyncfrompreference="return gPrivacyPane.readDetectCaptiveOption();"
+++ onsynctopreference="return gPrivacyPane.writeDetectCaptiveOption();"/>
+++ <vbox class="indent">
+++ <label data-l10n-id="detect-captive-portal-description"/>
+++ </vbox>
+++ </vbox>
+++ <vbox>
+++ <checkbox id="geolocation" data-l10n-id="geolocation-option"
+++ preference="browser.search.geoip.url"
+++ onsyncfrompreference="return gPrivacyPane.readGeolocationOption();"
+++ onsynctopreference="return gPrivacyPane.writeGeolocationOption();"/>
+++ <vbox class="indent">
+++ <label data-l10n-id="geolocation-description"/>
+++ </vbox>
+++ </vbox>
+++ <vbox>
+++ <checkbox id="webgl" data-l10n-id="webgl-option"
+++ preference="webgl.disabled"
+++ onsyncfrompreference="return gPrivacyPane.readWebGLOption();"
+++ onsynctopreference="return gPrivacyPane.writeWebGLOption();"/>
+++ <vbox class="indent">
+++ <label data-l10n-id="webgl-description"/>
+++ </vbox>
+++ </vbox>
+++</groupbox>
+++
++ <hbox id="permissionsCategory"
++ class="subcategory"
++ hidden="true"
++--- a/browser/components/preferences/in-content/privacy.js.orig 2019-10-16 15:29:49.000000000 -0400
+++++ b/browser/components/preferences/in-content/privacy.js 2019-10-31 00:08:05.819561577 -0400
++@@ -93,6 +93,16 @@
++ { id: "browser.urlbar.suggest.history", type: "bool" },
++ { id: "browser.urlbar.suggest.openpage", type: "bool" },
+
-+ with only_when(target_is_linux & compile_environment):
---
-2.23.0
-
-From 62f50f15abc91483c6aa7a2ac7ebb972e6f9affd Mon Sep 17 00:00:00 2001
-From: Mark H Weaver <mhw <at> netris.org>
-Date: Mon, 28 Oct 2019 13:05:28 -0400
-Subject: [PATCH 3/4] Disable MOZ_BLOCK_PROFILE_DOWNGRADE.
-
-It would be desirable to prevent downgrades from one major version of
-IceCat to another. However, as MOZ_BLOCK_PROFILE_DOWNGRADE is
-currently implemented, it prevents downgrades from one build of
-IceCat-68.2 to an earlier build of IceCat-68.2. Until we can find a
-satisfactory solution, we disable this functionality entirely.
-
-* data/patches/moz-configure-changes.patch: Set
-MOZ_BLOCK_PROFILE_DOWNGRADE to 'False'.
----
- data/patches/moz-configure-changes.patch | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/data/patches/moz-configure-changes.patch b/data/patches/moz-configure-changes.patch
-index aa6f1a5..53091a4 100644
---- a/data/patches/moz-configure-changes.patch
-+++ b/data/patches/moz-configure-changes.patch
-@@ -1,6 +1,6 @@
- --- a/browser/moz.configure.orig 1980-01-01 18:59:51.000000000 -0500
--+++ b/browser/moz.configure 2019-10-28 01:36:13.132873871 -0400
--@@ -5,9 +5,9 @@
-++++ b/browser/moz.configure 2019-10-28 13:04:11.469562089 -0400
-+@@ -5,10 +5,10 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
- imply_option('MOZ_PLACES', True)
-@@ -8,7 +8,9 @@
- +imply_option('MOZ_SERVICES_HEALTHREPORT', False)
- imply_option('MOZ_SERVICES_SYNC', True)
- -imply_option('MOZ_DEDICATED_PROFILES', True)
-+-imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True)
- +imply_option('MOZ_DEDICATED_PROFILES', False)
-- imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True)
-++imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', False)
-
- with only_when(target_is_linux & compile_environment):
-+ option(env='MOZ_NO_PIE_COMPAT',
---
-2.23.0
-
-From 036f74092d223976054f9eafd8caa056f5975c54 Mon Sep 17 00:00:00 2001
-From: Mark H Weaver <mhw <at> netris.org>
-Date: Mon, 28 Oct 2019 19:57:37 -0400
-Subject: [PATCH 4/4] Improve branding for version 68 ESR.
-
-* data/branding/icecat/locales/en-US/brand.dtd: Add brandProductName.
-* data/branding/icecat/locales/en-US/brand.ftl: Add
-brand-shorter-name, brand-full-name, brand-product-name,
-vendor-short-name, and trademarkInfo.
-* data/branding/icecat/locales/en-US/brand.properties: Add
-brandProductName.
-* makeicecat: Limit replacement of trademarkInfo.part1 of brand.dtd
-files to only be done within l10n directory. Replace trademarkInfo of
-brand.ftl files within l10n directory.
----
- data/branding/icecat/locales/en-US/brand.dtd | 1 +
- data/branding/icecat/locales/en-US/brand.ftl | 5 +++++
- data/branding/icecat/locales/en-US/brand.properties | 1 +
- makeicecat | 3 ++-
- 4 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/data/branding/icecat/locales/en-US/brand.dtd b/data/branding/icecat/locales/en-US/brand.dtd
-index 3788266..475ce7d 100644
---- a/data/branding/icecat/locales/en-US/brand.dtd
-+++ b/data/branding/icecat/locales/en-US/brand.dtd
-@@ -5,5 +5,6 @@
- <!ENTITY brandShorterName "IceCat">
- <!ENTITY brandShortName "IceCat">
- <!ENTITY brandFullName "GNU IceCat">
-+<!ENTITY brandProductName "IceCat">
- <!ENTITY vendorShortName "GNU">
- <!ENTITY trademarkInfo.part1 "The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version.">
-diff --git a/data/branding/icecat/locales/en-US/brand.ftl b/data/branding/icecat/locales/en-US/brand.ftl
-index bd7fbe0..7c9fcc8 100644
---- a/data/branding/icecat/locales/en-US/brand.ftl
-+++ b/data/branding/icecat/locales/en-US/brand.ftl
-@@ -2,4 +2,9 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-+-brand-shorter-name = IceCat
- -brand-short-name = IceCat
-+-brand-full-name = GNU IceCat
-+-brand-product-name = IceCat
-+-vendor-short-name = GNU
-+trademarkInfo = The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version.
-diff --git a/data/branding/icecat/locales/en-US/brand.properties b/data/branding/icecat/locales/en-US/brand.properties
-index 85e2894..9b9cf97 100644
---- a/data/branding/icecat/locales/en-US/brand.properties
-+++ b/data/branding/icecat/locales/en-US/brand.properties
-@@ -5,6 +5,7 @@
- brandShorterName=IceCat
- brandShortName=IceCat
- brandFullName=IceCat
-+brandProductName=IceCat
- vendorShortName=GNU
-
- syncBrandShortName=Sync
+++ // IceCat-specific
+++ { id: "javascript.enabled", type: "bool" },
+++ { id: "browser.display.use_document_fonts", type: "int" },
+++ { id: "privacy.firstparty.isolate", type: "bool" },
+++ { id: "extensions.update.enabled", type: "bool" },
+++ { id: "network.http.referer.spoofSource", type: "bool" },
+++ { id: "webgl.disabled", type: "bool" },
+++ { id: "captivedetect.canonicalURL", type: "string" },
+++ { id: "browser.search.geoip.url", type: "string" },
+++
++ // History
++ { id: "places.history.enabled", type: "bool" },
++ { id: "browser.formfill.enable", type: "bool" },
++@@ -587,6 +597,53 @@
++ SiteDataManager.updateSites();
++ },
++
+++ // ICECAT PREFERENCES
+++
+++ readDisableJavaScriptOption() {
+++ let pref = Preferences.get("javascript.enabled");
+++ return !pref.value;
+++ },
+++ writeDisableJavaScriptOption() {
+++ let checkbox = document.getElementById("disableJavaScript");
+++ return !checkbox.checked;
+++ },
+++
+++ readDisableCustomFontsOption() {
+++ let pref = Preferences.get("browser.display.use_document_fonts");
+++ return pref.value == 0;
+++ },
+++ writeDisableCustomFontsOption() {
+++ let checkbox = document.getElementById("disableCustomFonts");
+++ return checkbox.checked ? 0 : 1;
+++ },
+++
+++ readDetectCaptiveOption() {
+++ let pref = Preferences.get("captivedetect.canonicalURL");
+++ return pref.value !== "";
+++ },
+++ writeDetectCaptiveOption() {
+++ let checkbox = document.getElementById("detectCaptivePortal");
+++ return checkbox.checked ? "http://detectportal.firefox.com/success.txt" : "";
+++ },
+++
+++ readGeolocationOption() {
+++ let pref = Preferences.get("browser.search.geoip.url");
+++ return pref.value !== "";
+++ },
+++ writeGeolocationOption() {
+++ let checkbox = document.getElementById("geolocation");
+++ return checkbox.checked ? "https://location.services.mozilla.com/v1/country?key=%MOZILLA_API_KEY%" : "";
+++ },
+++
+++ readWebGLOption() {
+++ let pref = Preferences.get("webgl.disabled");
+++ return !pref.value;
+++ },
+++ writeWebGLOption() {
+++ let checkbox = document.getElementById("webgl");
+++ return !checkbox.checked;
+++ },
+++
++ // CONTENT BLOCKING
++
++ /**
diff --git a/makeicecat b/makeicecat
-index 1bcf465..3ff2ead 100644
+index 4ff3e64..493d946 100755
--- a/makeicecat
+++ b/makeicecat
-@@ -226,7 +226,8 @@ cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in
+@@ -87,6 +87,19 @@ for patch in $DATA/patches/*.patch; do
+ done
+ shopt -u nullglob
- # Custom legal about pages
++for file_to_append in $(cd $DATA/files-to-append; find . -type f -print); do
++ echo Appending new data to the end of file: $file_to_append
++ cat $DATA/files-to-append/$file_to_append >> $file_to_append
++done
++
++for dir in l10n/*; do
++ if [[ $dir != l10n/compare-locales ]]; then
++ if [[ ! -e $DATA/files-to-append/$dir/browser/browser/preferences/preferences.ftl ]]; then
++ cat $DATA/files-to-append/browser/locales/en-US/browser/preferences/preferences.ftl >> $dir/browser/browser/preferences/preferences.ftl
++ fi
++ fi
++done
++
+ cp $DATA/Changelog.IceCat $DATA/README.IceCat .
--find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
-+find l10n -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
-+find l10n -wholename '*/brand.ftl' |xargs /bin/sed 's/^trademarkInfo = .*/trademarkInfo = The IceCat logo is Copyright 2008-2015 Free Software Foundation, released under the terms of the GNU Lesser General Public License, version 3 or any later version./' -i
-
- for STRING in rights.intro-point3-unbranded rights.intro-point4a-unbranded rights.intro-point4b-unbranded rights.intro-point4c-unbranded
- do
+ ###############################################################################
--
2.23.0
diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch
index 90a79eebc9..66816070aa 100644
--- a/gnu/packages/patches/icecat-makeicecat.patch
+++ b/gnu/packages/patches/icecat-makeicecat.patch
@@ -98,7 +98,7 @@ index b04c731..06d1f3f 100644
shopt -s nullglob
for patch in $DATA/patches/*.patch; do
-@@ -598,6 +598,6 @@ sed 's/777/755/;' -i toolkit/crashreporter/google-breakpad/Makefile.in
+@@ -611,6 +611,6 @@ sed 's/777/755/;' -i toolkit/crashreporter/google-breakpad/Makefile.in
# Fix CVE-2012-3386
/bin/sed 's/chmod a+w/chmod u+w/' -i ./js/src/ctypes/libffi/Makefile.in ./toolkit/crashreporter/google-breakpad/Makefile.in ./toolkit/crashreporter/google-breakpad/src/third_party/glog/Makefile.in || true
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:36:09 GMT) Full text and rfc822 format available.Message #59 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Marius Bakke <mbakke <at> fastmail.com>, Ekaitz at ElenQ Technology <ekaitz <at> elenq.tech> Subject: [PATCH 017/197] gnu: Chibi-Scheme: Update to 0.8. Date: Fri, 8 Nov 2019 11:33:45 +0100
From: Ekaitz at ElenQ Technology <ekaitz <at> elenq.tech>
* gnu/packages/scheme.scm (chibi-scheme): Update to 0.8.
Signed-off-by: Marius Bakke <mbakke <at> fastmail.com>
---
gnu/packages/scheme.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 5753035643..349dfe56de 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -590,14 +590,14 @@ mixed.")
(define-public chibi-scheme
(package
(name "chibi-scheme")
- (version "0.7.3")
+ (version "0.8")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/ashinn/chibi-scheme/archive/"
version ".tar.gz"))
(sha256
- (base32 "16wppf4qzr0748iyp0m89gidsfgq9s6x3gw4xggym91waw4fh742"))
+ (base32 "0mi73543m1gap3bwvivq77vhqk7yn28v6g947h96q893n5cph1wa"))
(file-name (string-append "chibi-scheme-" version ".tar.gz"))))
(build-system gnu-build-system)
(arguments
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:36:09 GMT) Full text and rfc822 format available.Message #62 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Marius Bakke <mbakke <at> fastmail.com> Subject: [PATCH 018/197] gnu: Chibi-Scheme: Do not use unstable tarball. Date: Fri, 8 Nov 2019 11:33:46 +0100
From: Marius Bakke <mbakke <at> fastmail.com>
* gnu/packages/scheme.scm (chibi-scheme)[source]: Change to GIT-FETCH.
---
gnu/packages/scheme.scm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 349dfe56de..cc69c54703 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -591,14 +591,15 @@ mixed.")
(package
(name "chibi-scheme")
(version "0.8")
+ (home-page "https://github.com/ashinn/chibi-scheme")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://github.com/ashinn/chibi-scheme/archive/"
- version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference (url home-page) (commit version)))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0mi73543m1gap3bwvivq77vhqk7yn28v6g947h96q893n5cph1wa"))
- (file-name (string-append "chibi-scheme-" version ".tar.gz"))))
+ (base32
+ "0269d5fhaz7nqjb41vh7yz63mp5s4z08fn4sspwc06z32xksigw9"))))
(build-system gnu-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
@@ -610,7 +611,6 @@ mixed.")
(list (string-append "PREFIX=" out)
(string-append "LDFLAGS=-Wl,-rpath=" out "/lib")))
#:test-target "test"))
- (home-page "https://github.com/ashinn/chibi-scheme")
(synopsis "Small embeddable Scheme implementation")
(description
"Chibi-Scheme is a very small library with no external dependencies
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:36:10 GMT) Full text and rfc822 format available.Message #65 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Guillaume Le Vaillant <glv <at> posteo.net>, Marius Bakke <mbakke <at> fastmail.com> Subject: [PATCH 019/197] gnu: bitcoin-abc: Update to 0.20.4. Date: Fri, 8 Nov 2019 11:33:47 +0100
From: Guillaume Le Vaillant <glv <at> posteo.net>
* gnu/packages/finance.scm (bitcoin-abc): Update to 0.20.4.
[source]: Fix uri.
[inputs]: Use bdb-5.3 (bdb-4.8 is not supported).
[arguments]: Add 'fix-tests' phase.
Signed-off-by: Marius Bakke <mbakke <at> fastmail.com>
---
gnu/packages/finance.scm | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index bbd1aa947c..d8190dadaf 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1133,15 +1133,35 @@ Trezor wallet.")
(package
(inherit bitcoin-core)
(name "bitcoin-abc")
- (version "0.19.8")
+ (version "0.20.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.bitcoinabc.org/"
- version "/linux/src/bitcoin-abc-"
+ version "/src/bitcoin-abc-"
version ".tar.gz"))
(sha256
(base32
- "0ndvkxv5m8346bdhfqzgdiz1k9wyjycj05jp7daf9pml3cw79sz5"))))
+ "0fld54z3l7z7k5n35rrjichjnx37j9xp0rv8i69m3x4qfj1xk2np"))))
+ (inputs
+ `(("bdb" ,bdb-5.3)
+ ("boost" ,boost)
+ ("libevent" ,libevent)
+ ("miniupnpc" ,miniupnpc)
+ ("openssl" ,openssl)
+ ("protobuf" ,protobuf)
+ ("qtbase" ,qtbase)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments bitcoin-core)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'unpack 'fix-tests
+ ;; Disable 'check-devtools' test which tries to run a
+ ;; python script that doesn't exist.
+ (lambda _
+ (substitute* "Makefile.in"
+ (("^check-local: check-devtools")
+ "check-local:"))
+ #t))))))
(home-page "https://www.bitcoinabc.org/")
(synopsis "Bitcoin ABC peer-to-peer full node for the Bitcoin Cash protocol")
(description
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:36:10 GMT) Full text and rfc822 format available.Message #68 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Subject: [PATCH 020/197] services: ntp: Fix a crash when using legacy configuration. Date: Fri, 8 Nov 2019 11:33:48 +0100
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Fixes issue #37504 (see: https://bugs.gnu.org/37504).
The bug was caused by the fact that destructuring an <ntp-configuration>
record using match would bind the 'servers' field without using the
compatibility accessor.
* gnu/services/networking.scm (ntp-shepherd-service): Replace `match-lambda'
by distinct `lambda' and `match' calls, so that the 'servers' field can be
generated by applying the `ntp-configuration-servers' procedure to the
configuration object.
---
gnu/services/networking.scm | 45 +++++++++++++++++++------------------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 841fbd741e..a1c1aad9f6 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -394,15 +394,16 @@ deprecated. Please use <ntp-server> records instead.\n")
ntp-servers))))
(define ntp-shepherd-service
- (match-lambda
- (($ <ntp-configuration> ntp servers allow-large-adjustment?)
- (let ()
- ;; TODO: Add authentication support.
- (define config
- (string-append "driftfile /var/run/ntpd/ntp.drift\n"
- (string-join (map ntp-server->string servers)
- "\n")
- "
+ (lambda (config)
+ (match config
+ (($ <ntp-configuration> ntp servers allow-large-adjustment?)
+ (let ((servers (ntp-configuration-servers config)))
+ ;; TODO: Add authentication support.
+ (define config
+ (string-append "driftfile /var/run/ntpd/ntp.drift\n"
+ (string-join (map ntp-server->string servers)
+ "\n")
+ "
# Disable status queries as a workaround for CVE-2013-5211:
# <http://support.ntp.org/bin/view/Main/SecurityNotice#DRDoS_Amplification_Attack_using>.
restrict default kod nomodify notrap nopeer noquery limited
@@ -416,20 +417,20 @@ restrict -6 ::1
# option by default, as documented in the 'ntp.conf' manual.
restrict source notrap nomodify noquery\n"))
- (define ntpd.conf
- (plain-file "ntpd.conf" config))
+ (define ntpd.conf
+ (plain-file "ntpd.conf" config))
- (list (shepherd-service
- (provision '(ntpd))
- (documentation "Run the Network Time Protocol (NTP) daemon.")
- (requirement '(user-processes networking))
- (start #~(make-forkexec-constructor
- (list (string-append #$ntp "/bin/ntpd") "-n"
- "-c" #$ntpd.conf "-u" "ntpd"
- #$@(if allow-large-adjustment?
- '("-g")
- '()))))
- (stop #~(make-kill-destructor))))))))
+ (list (shepherd-service
+ (provision '(ntpd))
+ (documentation "Run the Network Time Protocol (NTP) daemon.")
+ (requirement '(user-processes networking))
+ (start #~(make-forkexec-constructor
+ (list (string-append #$ntp "/bin/ntpd") "-n"
+ "-c" #$ntpd.conf "-u" "ntpd"
+ #$@(if allow-large-adjustment?
+ '("-g")
+ '()))))
+ (stop #~(make-kill-destructor)))))))))
(define %ntp-accounts
(list (user-account
--
2.21.0
guix-patches <at> gnu.org:bug#38122; Package guix-patches.
(Fri, 08 Nov 2019 10:36:11 GMT) Full text and rfc822 format available.Message #71 received at 38122 <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> crazy-compilers.com> To: 38122 <at> debbugs.gnu.org Cc: Nicolas Goaziou <mail <at> nicolasgoaziou.fr> Subject: [PATCH 021/197] gnu: musescore: Update to 3.3. Date: Fri, 8 Nov 2019 11:33:49 +0100
From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
* gnu/packages/music.scm (musescore): Update to 3.3.
[arguments]: Remove "-DBUILD_CRASH_REPORTER=OFF" configure flag, which is OFF
by default anyway.
---
gnu/packages/music.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 463f7fd9ef..516b92e26c 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3774,7 +3774,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke
(define-public musescore
(package
(name "musescore")
- (version "3.2.3")
+ (version "3.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3783,7 +3783,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke
(file-name (git-file-name name version))
(sha256
(base32
- "17wx1wl8ns2k31qvrr888dxnrsa13vazg04zh2sn2q4vzd869a7v"))
+ "15ckjwvp3xigjkzmp1ddzvlm4d0vlk9i1axyfxg3hr2sia84yxvi"))
(modules '((guix build utils)))
(snippet
;; Un-bundle OpenSSL and remove unused libraries.
@@ -3801,8 +3801,7 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke
(build-system cmake-build-system)
(arguments
`(#:configure-flags
- `("-DBUILD_CRASH_REPORTER=OFF"
- "-DBUILD_WEBENGINE=OFF"
+ `("-DBUILD_WEBENGINE=OFF"
"-DDOWNLOAD_SOUNDFONT=OFF"
"-DUSE_SYSTEM_FREETYPE=ON")
;; There are tests, but no simple target to run. The command used to
--
2.21.0
Hartmut Goebel <h.goebel <at> goebel-consult.de>:Hartmut Goebel <h.goebel <at> crazy-compilers.com>:Message #76 received at 38122-close <at> debbugs.gnu.org (full text, mbox):
From: Hartmut Goebel <h.goebel <at> goebel-consult.de> To: 38122-close <at> debbugs.gnu.org Subject: Faulty patchset Date: Fri, 8 Nov 2019 11:36:17 +0100
[Message part 1 (text/plain, inline)]
Sorry, this patchset was faulty. Will resend
[0x7B752811BF773B65.asc (application/pgp-keys, attachment)]
[smime.p7s (application/pkcs7-signature, attachment)]
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Fri, 06 Dec 2019 12:24:06 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.