From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id cDm8Orc6MWGM4QAAgWs5BA (envelope-from ) for ; Thu, 02 Sep 2021 22:57:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id uOzPNbc6MWEbCQAAbx9fmQ (envelope-from ) for ; Thu, 02 Sep 2021 20:57:27 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9DF16EE2E for ; Thu, 2 Sep 2021 22:57:27 +0200 (CEST) Received: from localhost ([::1]:34462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLtm2-0000wV-OW for larch@yhetil.org; Thu, 02 Sep 2021 16:57:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLtlk-0000cu-Qz for guix-patches@gnu.org; Thu, 02 Sep 2021 16:57:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58889) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mLtlf-0002tV-BF for guix-patches@gnu.org; Thu, 02 Sep 2021 16:57:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mLtlf-0005W1-Ao for guix-patches@gnu.org; Thu, 02 Sep 2021 16:57:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48554] [PATCH wip-gnome v7 4/4] gnu: Update gtkmm to 4.2.0, add gtkmm@3, and adjust gtkmm@2. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Sep 2021 20:57:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48554 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 48554@debbugs.gnu.org Cc: Raghav Gururajan Received: via spool by 48554-submit@debbugs.gnu.org id=B48554.163061621921176 (code B ref 48554); Thu, 02 Sep 2021 20:57:03 +0000 Received: (at 48554) by debbugs.gnu.org; 2 Sep 2021 20:56:59 +0000 Received: from localhost ([127.0.0.1]:42198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLtla-0005VT-TX for submit@debbugs.gnu.org; Thu, 02 Sep 2021 16:56:59 -0400 Received: from out0.migadu.com ([94.23.1.103]:51375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLtlX-0005Uq-JL for 48554@debbugs.gnu.org; Thu, 02 Sep 2021 16:56:55 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1630616214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Oy0jt23LM/RW8gsU5oZdCCQQYTD/sdOcvDLEd48LBM0=; b=GZrvHLUHM25dslOUHLvPkH2N2X9//in/yTO1LjX2xouq3a/jimnW8ZUmGBI830cSHQ3zyr M4j+GO7B7WR+PYgbHovPa03nVY6YC/sVXI3fWX/k7+N8MWNTqp/JiEWT7e+Remzbh3KEZP R/9VQ+yDdXq5t0bMxM2ldJ8WJeKbjofrxuPosVhQz9nAQOJnv4uAMJ6tKdZh8aNTVfS6cm gHtZWCsVoMW/ygDu7ro6Saztr5RT2wQNEvUTXhUJYGu6nPHycwSaF8WXl4Afu+e1S1Q8ey UtVFHeQTq6fEJqW3rQv8Tikjhg10am8C6BZUEsTEnOiSvLlyvBXsdJVFtHbWew== Date: Thu, 2 Sep 2021 16:56:48 -0400 Message-Id: <20210902205648.32122-4-rg@raghavgururajan.name> In-Reply-To: <20210902205648.32122-1-rg@raghavgururajan.name> References: <20210902205648.32122-1-rg@raghavgururajan.name> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Auth-User: rg@raghavgururajan.name X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches From: Raghav Gururajan via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.00 Authentication-Results: aspmx1.migadu.com; none X-Migadu-Queue-Id: 9DF16EE2E X-Spam-Score: -4.00 X-Migadu-Scanner: scn1.migadu.com X-TUID: 2w3fk8oh73rP * gnu/packages/gtk.scm (gtkmm)[version]: Update to 4.2.0. [arguments](meson): New argument. [native-inputs]: Add glib:bin. [propagated-inputs]: Replace gtk+ with gtk. [synopsis]: Modify. [description]: Modify (gtkmm-3): New variable. (gtkmm-2)[arguments]: Strip certain inherited arguments. --- gnu/packages/gtk.scm | 48 +++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index c559ef18b1..a715c5f033 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1742,7 +1742,7 @@ library.") (define-public gtkmm (package (name "gtkmm") - (version "3.24.4") + (version "4.2.0") (source (origin (method url-fetch) @@ -1751,11 +1751,12 @@ library.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0hv7pviln4cpjvpz7m7ga5krcsbibqzixdcn0dwzpz0cx71p3swv")))) + (base32 "12x9j82y37r4v0ngs22rzp4wmw7k2bbb9d3bymcczzz7y8w4q328")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments - `(#:configure-flags '("-Dbuild-documentation=true") + `(#:meson ,meson-0.55 ;project requires meson v0.54 or higher + #:configure-flags '("-Dbuild-documentation=true") #:phases (modify-phases %standard-phases (add-before 'check 'pre-check @@ -1778,6 +1779,7 @@ library.") (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen) + ("glib:bin" ,glib "bin") ("m4" ,m4) ("mm-common" ,mm-common) ("perl" ,perl) @@ -1788,11 +1790,11 @@ library.") `(("atkmm" ,atkmm) ("cairomm" ,cairomm) ("glibmm" ,glibmm) - ("gtk+" ,gtk+) + ("gtk" ,gtk) ("pangomm" ,pangomm))) - (synopsis "C++ Interfaces for GTK+ and GNOME") + (synopsis "C++ Interfaces for GTK and GNOME") (description "GTKmm is the official C++ interface for the popular GUI -library GTK+. Highlights include typesafe callbacks, and a comprehensive set of +library GTK. Highlights include typesafe callbacks, and a comprehensive set of widgets that are easily extensible via inheritance. You can create user interfaces either in code or with the Glade User Interface designer, using libglademm. There's extensive documentation, including API reference and a @@ -1805,6 +1807,30 @@ tutorial.") ;; Tools license:gpl2+)))) +(define-public gtkmm-3 + (package + (inherit gtkmm) + (name "gtkmm") + (version "3.24.4") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0hv7pviln4cpjvpz7m7ga5krcsbibqzixdcn0dwzpz0cx71p3swv")))) + (arguments + (strip-keyword-arguments + '(#:meson) (package-arguments gtkmm))) + (propagated-inputs + `(("atkmm-2.28" ,atkmm-2.28) + ("cairomm-1.13" ,cairomm-1.13) + ("glibmm" ,glibmm) + ("gtk+" ,gtk+) + ("pangomm-2.42" ,pangomm-2.42))))) + (define-public gtkmm-2 (package (inherit gtkmm) @@ -1821,14 +1847,8 @@ tutorial.") (base32 "0wkbzvsx4kgw16f6xjdc1dz7f77ldngdila4yi5lw2zrgcxsb006")))) (build-system gnu-build-system) (arguments - (substitute-keyword-arguments (package-arguments gtkmm) - ((#:modules modules %gnu-build-system-modules) - `((srfi srfi-1) - ,@modules)) - ((#:configure-flags flags) - `(fold delete - ,flags - '("-Dbuild-documentation=true"))))) + (strip-keyword-arguments + '(#:meson #:configure-flags) (package-arguments gtkmm))) (propagated-inputs `(("atkmm" ,atkmm-2.28) ("cairomm" ,cairomm-1.13) -- 2.33.0