From e8b409741baf3b9de30faa8683722375196dd1e9 Mon Sep 17 00:00:00 2001 From: Fis Trivial Date: Sat, 13 Jan 2018 16:59:01 -0800 Subject: gnu: Add rct. * gnu/packages/cpp.scm (rct): New variable. --- gnu/packages/cpp.scm | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) (limited to 'gnu/packages/cpp.scm') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 4fd499f5f3..8691531070 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Ethan R. Jones ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Fis Trivial ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,9 +22,15 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (gnu packages) - #:use-module (gnu packages autotools)) + #:use-module (gnu packages autotools) + #:use-module (gnu packages check) + #:use-module (gnu packages compression) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages tls)) (define-public libzen (package @@ -58,3 +65,35 @@ strings, configuration, bit streams, threading, translation, and cross-platform operating system functions.") (license license:zlib))) + +(define-public rct + (let* ((commit "b3e6f41d9844ef64420e628e0c65ed98278a843a") + (revision "1") + (version (git-version "0.0.0" revision commit))) + (package + (name "rct") + (version version) + (home-page "https://github.com/Andersbakken/rct") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (sha256 + (base32 + "1m2931jacka27ghnpgf1z1plkkr64z0pga4r4zdrfpp2d7xnrdvb")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags + '("-DWITH_TESTS=ON"))) ; To run the test suite + (native-inputs + `(("cppunit" ,cppunit) + ("openssl" ,openssl) + ("pkg-config" ,pkg-config) + ("zlib" ,zlib))) + (synopsis "C++ library providing Qt-like APIs on top of the STL") + (description "Rct is a set of C++ tools that provide nicer (more Qt-like) + APIs on top of Standard Template Library (@dfn{STL}) classes.") + (license (list license:expat ; cJSON + license:bsd-4))))) ; everything else (LICENSE.txt) -- cgit v1.3 From bad12e839c2f7823c45aa0121f7d5c9bb70905b7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 13 Jan 2018 17:21:42 -0800 Subject: gnu: rct: Re-categorize some inputs. OpenSSL and zlib are referred to by the built package, so we make them regular inputs. This is a followup to commit e8b409741baf3b9de30faa8683722375196dd1e9. * gnu/packages/cpp.scm (rct)[native-inputs]: Move openssl and zlib to ... [inputs]: ... new field. --- gnu/packages/cpp.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/cpp.scm') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 8691531070..7f711d5542 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -89,8 +89,9 @@ operating system functions.") '("-DWITH_TESTS=ON"))) ; To run the test suite (native-inputs `(("cppunit" ,cppunit) - ("openssl" ,openssl) - ("pkg-config" ,pkg-config) + ("pkg-config" ,pkg-config))) + (inputs + `(("openssl" ,openssl) ("zlib" ,zlib))) (synopsis "C++ library providing Qt-like APIs on top of the STL") (description "Rct is a set of C++ tools that provide nicer (more Qt-like) -- cgit v1.3 From a893dc2f484f89d9f0ba21d44bdac3b792872781 Mon Sep 17 00:00:00 2001 From: Fis Trivial Date: Sun, 21 Jan 2018 19:31:16 +0000 Subject: gnu: rct: Add missing headers, enable RTTI. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/patches/rct-add-missing-headers.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/cpp.scm (rct): Use the patch, enable RTTI. [source]: Use the patch to add missing headers from installation. [arguments]: Enable RTTI in configure-flags. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/cpp.scm | 6 ++- gnu/packages/patches/rct-add-missing-headers.patch | 43 ++++++++++++++++++++++ 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/rct-add-missing-headers.patch (limited to 'gnu/packages/cpp.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 240554fe4e..65369bc609 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1054,6 +1054,7 @@ dist_patch_DATA = \ %D%/packages/patches/raptor2-heap-overflow.patch \ %D%/packages/patches/ratpoison-shell.patch \ %D%/packages/patches/rcs-5.9.4-noreturn.patch \ + %D%/packages/patches/rct-add-missing-headers.patch \ %D%/packages/patches/readline-link-ncurses.patch \ %D%/packages/patches/readline-6.2-CVE-2014-2524.patch \ %D%/packages/patches/readline-7.0-mingw.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 7f711d5542..95e82fcb61 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -68,7 +68,7 @@ operating system functions.") (define-public rct (let* ((commit "b3e6f41d9844ef64420e628e0c65ed98278a843a") - (revision "1") + (revision "2") (version (git-version "0.0.0" revision commit))) (package (name "rct") @@ -82,11 +82,13 @@ operating system functions.") (sha256 (base32 "1m2931jacka27ghnpgf1z1plkkr64z0pga4r4zdrfpp2d7xnrdvb")) + (patches (search-patches "rct-add-missing-headers.patch")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments '(#:configure-flags - '("-DWITH_TESTS=ON"))) ; To run the test suite + '("-DWITH_TESTS=ON" ; To run the test suite + "-DRCT_RTTI_ENABLED=ON"))) (native-inputs `(("cppunit" ,cppunit) ("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/rct-add-missing-headers.patch b/gnu/packages/patches/rct-add-missing-headers.patch new file mode 100644 index 0000000000..4d133aa249 --- /dev/null +++ b/gnu/packages/patches/rct-add-missing-headers.patch @@ -0,0 +1,43 @@ +From: fis +Date: Sat, 20 Jan 2018 07:42:38 +0800 +Subject: [PATCH] rct.cmake: Add missing headers. + +--- + rct.cmake | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/rct.cmake b/rct.cmake +index 323e7b9..3e0ac6b 100644 +--- a/rct.cmake ++++ b/rct.cmake +@@ -339,7 +339,27 @@ if (NOT RCT_NO_INSTALL) + rct/Timer.h + rct/Value.h + rct/WriteLocker.h ++ rct/CpuUsage.h ++ rct/DataFile.h ++ rct/Date.h ++ rct/EmbeddedLinkedList.h ++ rct/FinishMessage.h ++ rct/Flags.h ++ rct/Hash.h ++ rct/LinkedList.h ++ rct/Map.h ++ rct/MemoryMappedFile.h ++ rct/OnDestruction.h ++ rct/QuitMessage.h ++ rct/ResponseMessage.h ++ rct/ScriptEngine.h ++ rct/StackBuffer.h ++ rct/WindowsUnicodeConversion.h + DESTINATION include/rct) + ++ install(FILES ++ json/json.hpp ++ DESTINATION include/rct/json) ++ + install(EXPORT "rct" DESTINATION lib/cmake) + endif () +-- +2.13.6 + -- cgit v1.3 From 2703135816c31d9bde4042da8d7863812e72fcd0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 27 Jan 2018 22:56:47 +0100 Subject: gnu: Add Dashel. * gnu/packages/cpp.scm (dashel): New variable. --- gnu/packages/cpp.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/cpp.scm') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 95e82fcb61..3e9c39df61 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 Ethan R. Jones ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial +;;; Copyright © 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -100,3 +101,26 @@ operating system functions.") APIs on top of Standard Template Library (@dfn{STL}) classes.") (license (list license:expat ; cJSON license:bsd-4))))) ; everything else (LICENSE.txt) + +(define-public dashel + (package + (name "dashel") + (version "1.3.3") + (home-page "https://github.com/aseba-community/dashel") + (source (origin + (method url-fetch) + (uri (string-append home-page "/archive/" version ".tar.gz")) + (sha256 + (base32 + "1ckzac1rsw3cxmpdpwcqv46jyp7risk5ybq6jjiizbqn7labf6dw")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system cmake-build-system) + (arguments '(#:tests? #f)) ;no tests + (native-inputs `(("pkg-config" ,pkg-config))) + (synopsis "Data stream helper encapsulation library") + (description + "Dashel is a data stream helper encapsulation C++ library. It provides a +unified access to TCP/UDP sockets, serial ports, console, and files streams. +It also allows a server application to wait for any activity on any +combination of these streams.") + (license license:bsd-3))) -- cgit v1.3