guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#54311] [PATCH v2] gnu: tint2: Update to 17.0.2.


From: Wamm K. D
Subject: [bug#54311] [PATCH v2] gnu: tint2: Update to 17.0.2.
Date: Sat, 2 Apr 2022 22:01:28 -0500

---
Here we go, Maxime; I've switched the ~fetch~ method to =git=.

I think you're absolutely right about the =fix-installation-prefix= phase not
being necessary as "etc" isn't even in the =CMakeLists.txt= file, anymore; I had
no issues building with the phase removed, as well.

Removing not–running-tests, however, did result in a "make: *** No rule to make
target 'test'.  Stop." error, however, so I'm guessing that, while the files in
that directory are used for testing, they are not incorporated as part of the
build process and there still is no target so I've left that in.

Hopefully this addresses everything and thanks a ton for looking over this!

 gnu/packages/xdisorg.scm | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index d2caee85ec..a7738aac47 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -54,6 +54,7 @@
 ;;; Copyright © 2021 jgart <jgart@dismail.de>
 ;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
+;;; Copyright © 2022 Wamm K. D. <jaft.r@outlook.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1790,27 +1791,20 @@ (define-public rofi-calc
 (define-public tint2
   (package
     (name "tint2")
-    (version "0.14.6")
+    (version "17.0.2")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://gitlab.com/o9000/"; name
-                                  "/repository/archive.tar.gz?ref=" version))
-              (file-name (string-append name "-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url (string-append "https://gitlab.com/o9000/"; name "/"))
+                    (commit version)))
               (sha256
                (base32
-                "1kwzwxy4myagybm3rc7dgynfgp75742n348qibn1p2an9ggyivda"))))
+                "123apmgs6x2zfv1q57dyl4mwqf0vsw5ndh5jsg6p3fvhr66l1aja"))))
     (build-system cmake-build-system)
     (arguments
-     '(#:tests? #f                      ;no test target
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-installation-prefix
-           (lambda _
-             (substitute* "CMakeLists.txt"
-               (("/etc") "${CMAKE_INSTALL_PREFIX}/etc"))
-             #t)))))
+     '(#:tests? #f))                      ;no test target
     (inputs
-     (list gtk+-2
+     (list gtk+
            imlib2
            librsvg
            libxcomposite
-- 
2.34.0






reply via email to

[Prev in Thread] Current Thread [Next in Thread]