* [bug#29395] [PATCH] gnu: utox: Update to 0.16.1.
@ 2017-11-22 11:24 Rutger Helling
2017-11-22 13:08 ` [bug#29395] [PATCH] gnu: utox: Update to 0.16.1. (v2) Rutger Helling
0 siblings, 1 reply; 3+ messages in thread
From: Rutger Helling @ 2017-11-22 11:24 UTC (permalink / raw)
To: 29395
[-- Attachment #1.1: Type: text/plain, Size: 26 bytes --]
Here's an update for utox.
[-- Attachment #1.2: Type: text/html, Size: 213 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-utox-Update-to-0.16.1.patch --]
[-- Type: text/x-diff; name=0001-gnu-utox-Update-to-0.16.1.patch, Size: 2476 bytes --]
From e62aed7e6dca94d53de01edc440c94d52588991a Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Wed, 22 Nov 2017 12:17:48 +0100
Subject: [PATCH] gnu: utox: Update to 0.16.1.
* gnu/packages/messaging.scm (utox): Update to 0.16.1. [inputs]: Add check,
change comment. [native-inputs]: Add pkg-config. [arguments]: Remove, no
longer needed to build.
---
gnu/packages/messaging.scm | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index b9cd80539..bf6afda8e 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -796,7 +796,7 @@ messenger protocol.")
(define-public utox
(package
(name "utox")
- (version "0.11.0")
+ (version "0.16.1")
(source
(origin
(method url-fetch)
@@ -805,37 +805,24 @@ messenger protocol.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "15s4iwjk1s0kihjqn0f07c9618clbphpr827mds3xddkiwnjz37v"))))
+ "14xl72y4w1x2kk0cvkcr9pmywllm0r9w2grjqiknwn95pw6yxz6q"))))
(build-system cmake-build-system)
- (arguments
- '(#:tests? #f ; No test phase.
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-freetype-include
- (lambda _
- (substitute* "CMakeLists.txt"
- (("/usr/include/freetype2")
- (string-append (assoc-ref %build-inputs "freetype")
- "/include/freetype2")))))
- (add-before 'install 'patch-cmake-find-utox
- (lambda _
- (substitute* "../build/cmake_install.cmake"
- (("/uTox-0.11.0/utox")
- "/build/utox")))))))
(inputs
- ;; TODO: Fix the file chooser dialog; which input does it need?
+ ;; TODO: Fix the file chooser dialog; it seems to need GTK at runtime?
`(("dbus" ,dbus)
("filteraudio" ,filteraudio)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("libsodium" ,libsodium)
("c-toxcore" ,c-toxcore)
+ ("check" ,check)
("libvpx" ,libvpx)
("libx11" ,libx11)
("libxext" ,libxext)
("libxrender" ,libxrender)
("openal" ,openal)
("v4l-utils" ,v4l-utils)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(synopsis "Lightweight Tox client")
(description
"Utox is a lightweight Tox client. Tox is a distributed and secure
--
2.15.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* [bug#29395] [PATCH] gnu: utox: Update to 0.16.1. (v2)
2017-11-22 11:24 [bug#29395] [PATCH] gnu: utox: Update to 0.16.1 Rutger Helling
@ 2017-11-22 13:08 ` Rutger Helling
2017-11-24 1:28 ` bug#29395: " Leo Famulari
0 siblings, 1 reply; 3+ messages in thread
From: Rutger Helling @ 2017-11-22 13:08 UTC (permalink / raw)
To: 29395
[-- Attachment #1.1: Type: text/plain, Size: 118 bytes --]
Here is a second version of the patch that also fixes the problem with
not being able to open the file chooser dialog.
[-- Attachment #1.2: Type: text/html, Size: 305 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-utox-Update-to-0.16.1-v2.patch --]
[-- Type: text/x-diff; name=0001-gnu-utox-Update-to-0.16.1-v2.patch, Size: 3338 bytes --]
From a3737cb0026f472ab1050e814c456130dbf2a7d7 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Wed, 22 Nov 2017 14:01:15 +0100
Subject: [PATCH] gnu: utox: Update to 0.16.1.
* gnu/packages/messaging.scm (utox): Update to 0.16.1. [inputs]: Add check,
gtk+, change comment. [native-inputs]: Add pkg-config. [arguments]: Remove
existing arguments, add arguments to allow the file chooser dialog to work.
---
gnu/packages/messaging.scm | 38 +++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index b9cd80539..988dfc288 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -796,7 +796,7 @@ messenger protocol.")
(define-public utox
(package
(name "utox")
- (version "0.11.0")
+ (version "0.16.1")
(source
(origin
(method url-fetch)
@@ -805,37 +805,41 @@ messenger protocol.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "15s4iwjk1s0kihjqn0f07c9618clbphpr827mds3xddkiwnjz37v"))))
- (build-system cmake-build-system)
+ "14xl72y4w1x2kk0cvkcr9pmywllm0r9w2grjqiknwn95pw6yxz6q"))))
(arguments
- '(#:tests? #f ; No test phase.
- #:phases
+ `(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'fix-freetype-include
- (lambda _
- (substitute* "CMakeLists.txt"
- (("/usr/include/freetype2")
- (string-append (assoc-ref %build-inputs "freetype")
- "/include/freetype2")))))
- (add-before 'install 'patch-cmake-find-utox
- (lambda _
- (substitute* "../build/cmake_install.cmake"
- (("/uTox-0.11.0/utox")
- "/build/utox")))))))
+ (add-before 'build 'patch-absolute-filename-libgtk-3
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* "../uTox-0.16.1/src/xlib/gtk.c"
+ (("libgtk-3.so")
+ (string-append (assoc-ref inputs "gtk+")
+ "/lib/libgtk-3.so")))))
+ (add-after 'install 'wrap-program
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (wrap-program (string-append (assoc-ref outputs "out")
+ "/bin/utox")
+ ;; For GtkFileChooserDialog.
+ `("GSETTINGS_SCHEMA_DIR" =
+ (,(string-append (assoc-ref inputs "gtk+")
+ "/share/glib-2.0/schemas")))))))))
+ (build-system cmake-build-system)
(inputs
- ;; TODO: Fix the file chooser dialog; which input does it need?
`(("dbus" ,dbus)
("filteraudio" ,filteraudio)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("libsodium" ,libsodium)
("c-toxcore" ,c-toxcore)
+ ("check" ,check)
+ ("gtk+" ,gtk+)
("libvpx" ,libvpx)
("libx11" ,libx11)
("libxext" ,libxext)
("libxrender" ,libxrender)
("openal" ,openal)
("v4l-utils" ,v4l-utils)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(synopsis "Lightweight Tox client")
(description
"Utox is a lightweight Tox client. Tox is a distributed and secure
--
2.15.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-24 1:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-22 11:24 [bug#29395] [PATCH] gnu: utox: Update to 0.16.1 Rutger Helling
2017-11-22 13:08 ` [bug#29395] [PATCH] gnu: utox: Update to 0.16.1. (v2) Rutger Helling
2017-11-24 1:28 ` bug#29395: " Leo Famulari
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).