From c69959f0545e5383a8caab53944c86abc5dfeeed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Jun 2019 17:24:24 +0200 Subject: gnu: Replace uses of 'cmake' with 'cmake-minimal'. This follows up commit 2f33a7321e5e37d37f57c229c8079cb4ffd10834 which introduced a new CMAKE-MINIMAL variant for use in package inputs. * gnu/packages/databases.scm (python-pyarrow)[native-inputs]: Replace CMAKE with CMAKE-MINIMAL. * gnu/packages/emacs-xyz.scm (emacs-scel)[native-inputs]: Likewise. * gnu/packages/firmware.scm (ath9k-htc-firmware)[native-inputs]: Likewise. * gnu/packages/games.scm (0ad, the-butterfly-effect)[native-inputs]: Likewise. * gnu/packages/gnome.scm (deja-dup)[native-inputs]: Likewise. * gnu/packages/ibus.scm (ibus-rime)[native-inputs]: Likewise. * gnu/packages/rust.scm (rust-1.19)[native-inputs]: Likewise. * gnu/packages/simulation.scm (fenics)[native-inputs]: Likewise. * gnu/packages/squirrel.scm (squirrel)[native-inputs]: Likewise. * gnu/packages/video.scm (handbrake)[native-inputs]: Likewise. * gnu/packages/virtualization.scm (xen)[native-inputs]: Likewise. * gnu/packages/vulkan.scm (shaderc)[native-inputs]: Likewise. --- gnu/packages/ibus.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/ibus.scm') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index f652cca1c2..eab35dbadd 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -677,7 +677,7 @@ Method Engine.") ("librime" ,librime) ("rime-data" ,rime-data))) (native-inputs - `(("cmake" ,cmake) + `(("cmake" ,cmake-minimal) ("pkg-config" ,pkg-config))) (home-page "https://rime.im/") (synopsis "Rime Input Method Engine for IBus") -- cgit 1.4.1 From ca49d732256fd768941b91b3e92404430832de27 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 15:01:40 +0200 Subject: gnu: librime: Update to 1.5.3. * gnu/packages/ibus.scm (librime): Update to 1.5.3. [arguments]: Add <#:configure-flags>. --- gnu/packages/ibus.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ibus.scm') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index eab35dbadd..9291a74394 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -305,7 +305,7 @@ Japanese language input in most graphical applications.") (define-public librime (package (name "librime") - (version "1.4.0") + (version "1.5.3") (source (origin (method git-fetch) @@ -315,7 +315,7 @@ Japanese language input in most graphical applications.") (file-name (git-file-name name version)) (sha256 (base32 - "1zkx1wfbd94v55gfycyd2b94jxclfyk2zl7yw35pyjx63qdlb6sd")) + "0xskhdhk7dgpc71r39pfzxi5vrlzy90aqj1gzv8nnapq91p2awhv")) (modules '((guix build utils))) (snippet '(begin @@ -325,7 +325,9 @@ Japanese language input in most graphical applications.") #t)))) (build-system cmake-build-system) (arguments - '(#:phases + '(;; XXX: Work around . + #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON") + #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source (lambda _ -- cgit 1.4.1 From 51d4c79dc28c70cde61348eb52775f45125a2ee7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 31 Jul 2019 14:54:59 +0200 Subject: gnu: Remove workarounds for . These are no longer needed since 941ef1a1e54893ca917ebbaa4b8cc14b5ce9b75c. * gnu/packages/compression.scm (innoextract)[arguments]: Remove "-DBoost_NO_BOOST_CMAKE=ON" from <#:configure-flags>. * gnu/packages/game-development.scm (openmw)[arguments]: Likewise. * gnu/packages/games.scm (supertux, colobot, leela-zero)[arguments]: Likewise. * gnu/packages/graphics.scm (openimageio)[arguments]: Likewise. * gnu/packages/ibus.scm (librime)[arguments]: Likewise. --- gnu/packages/compression.scm | 3 --- gnu/packages/game-development.scm | 3 +-- gnu/packages/games.scm | 8 +------- gnu/packages/graphics.scm | 5 +---- gnu/packages/ibus.scm | 4 +--- 5 files changed, 4 insertions(+), 19 deletions(-) (limited to 'gnu/packages/ibus.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index da9e646f5f..774abad5c9 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1822,9 +1822,6 @@ single-member files which can't be decompressed in parallel.") (build-system cmake-build-system) (arguments `(#:tests? #f - ;; XXX: Work around a problem with the CMake support in Boost 1.70: - ;; . - #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON") #:phases (modify-phases %standard-phases (add-before 'configure 'glibc-is-already-a-system-library (lambda _ diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 5a4b81a988..7eac935a69 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1116,8 +1116,7 @@ of use.") (arguments `(#:tests? #f ; No test target #:configure-flags - (list "-DDESIRED_QT_VERSION=5" - "-DBoost_NO_BOOST_CMAKE=ON"))) ;work around + (list "-DDESIRED_QT_VERSION=5"))) (native-inputs `(("boost" ,boost) ("doxygen" ,doxygen) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4e7fb2e428..66b642ebd2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3516,8 +3516,6 @@ with the \"Stamp\" tool within Tux Paint.") (arguments '(#:tests? #f #:configure-flags '("-DINSTALL_SUBDIR_BIN=bin" - ;; XXX: Work around . - "-DBoost_NO_BOOST_CMAKE=ON" "-DUSE_SYSTEM_PHYSFS=ON") #:phases (modify-phases %standard-phases @@ -5390,8 +5388,6 @@ Github or Gitlab.") (build-system cmake-build-system) (arguments `(#:tests? #f ;no test - ;; XXX: Work around . - #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON") #:phases (modify-phases %standard-phases (add-after 'unpack 'make-git-checkout-writable @@ -7616,9 +7612,7 @@ remake of that series or any other game.") ("qtbase" ,qtbase) ("zlib" ,zlib))) (arguments - '(#:configure-flags '("-DUSE_BLAS=YES" - ;; XXX: Work around . - "-DBoost_NO_BOOST_CMAKE=ON") + '(#:configure-flags '("-DUSE_BLAS=YES") #:phases (modify-phases %standard-phases (add-before 'configure 'fix-tests (lambda* (#:key outputs #:allow-other-keys) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 66d47fdb84..f4f9228a07 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -467,10 +467,7 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.") ;; third party sources have to be present. For details see ;; https://github.com/OpenImageIO/oiio/blob/master/INSTALL (arguments - `(#:tests? #f - ;; XXX: Work around a problem with Boost 1.70 and CMake 3.14. See - ;; for details. - #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON"))) + `(#:tests? #f)) (native-inputs `(("pkg-config" ,pkg-config))) (inputs diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 9291a74394..96fded0f4e 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -325,9 +325,7 @@ Japanese language input in most graphical applications.") #t)))) (build-system cmake-build-system) (arguments - '(;; XXX: Work around . - #:configure-flags '("-DBoost_NO_BOOST_CMAKE=ON") - #:phases + '(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-source (lambda _ -- cgit 1.4.1