From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 27 00:53:15 2021 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:16 +0000 Received: from localhost ([127.0.0.1]:48122 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw7-00054r-6F for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:15 -0400 Received: from mail-qk1-f179.google.com ([209.85.222.179]:39436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw3-00053B-JN for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:12 -0400 Received: by mail-qk1-f179.google.com with SMTP id bk35so1333747qkb.6 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FZ6R87BZcE/KRoufl3MaSpjhxW1svflbiltZqUdzzi0=; b=UbeEobqnus9NjIyAfcAKr49tL8u9UcxUap6RhSRaRMwd8CojIlFQJOnGvhaYM7n+S/ sKfzlQQ3yi5yoI15QB2FTfJrTJhtBNcksc01H1BJ5kNE7PKSeNcMgiBJzQCYCxZR+SGx 7kqhYub33kiiM69Hhsk47KZAW0625OJhY2ZMilePTiWT+o40mdAlaT8QqCtmuJod4epX 6b97oq4YtSrRSJgJwKarsCgsJ9pP+hz5WCUPWRIk14Nz9yX+QXbbYeA4VoMVeEFCs6sd bhOKB6i64zTg7qO3Xg+en5pNBZCATJM60yMeq576/W6ewugLzOOTqX0t1XwVHZcqbeRv ITNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FZ6R87BZcE/KRoufl3MaSpjhxW1svflbiltZqUdzzi0=; b=c3yVd+IZDvzv98gP9UikMeHH588FUK22F5h5aEwZbXIayb0wtJkufgo2t2SNuqYjU0 0nU5gRrMyTFjeLOP6diprIC5UDu8/o3o9fi/VXSex8u7J+YLZF2DFcdxOV7Jr6g6TpsE U2h++uDwXiyyRBpxbNrlW7qZy4kDUWw2hM4whVxbY8eZtP7w8AbqD7rQfnRLpUTEx7Cn qfqywEUO76+zru0i6ANRjFrLiNEZVE5/95ZRRvCMzG8Mj/Kue6jLCxoxomjzdDD96UIx axjztzTS33IPMsGVjfJcWcWz3efGZw4a44mJUpBjxyR+w06kHLoukMeYOzs1oiiYJnCH 6Tjg== X-Gm-Message-State: AOAM533trqSV4UN9v5lgPG4PtV03y3JH8iK9AenUoBfq6Oo7qz/VX4my yFbe/rnOccH2pFsFpK06SfcxCx9NbDE= X-Google-Smtp-Source: ABdhPJxLCwRnyS94ajxiQAewh3O/2ePZp/41J/C/RRwD3ry074lD0+pmGAJ7kpIAwjXmEhS9LEhjyw== X-Received: by 2002:a05:620a:25c7:: with SMTP id y7mr14734702qko.437.1635310385836; Tue, 26 Oct 2021 21:53:05 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:05 -0700 (PDT) From: Maxim Cournoyer To: 51428@debbugs.gnu.org Subject: [PATCH core-update-frozen 07/13] gnu: json-glib-minimal: Introduce minimal variant. Date: Wed, 27 Oct 2021 00:51:38 -0400 Message-Id: <20211027045151.9889-7-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51428 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnome.scm (json-glib-minimal): New variable. [source]: Adjust URI. [outputs]: Move doc output to... (json-glib)[outputs]: ... here. Rewrite in terms of json-glib-minimal. * gnu/packages/gtk.scm (gtk+): Use json-glib-minimal to break a cycle with Inkscape. --- gnu/packages/gnome.scm | 134 ++++++++++++++++++++--------------------- gnu/packages/gtk.scm | 2 +- 2 files changed, 66 insertions(+), 70 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9532717d89..fc486a4d1e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4590,86 +4590,27 @@ (define-public dconf configuration storage systems.") (license license:lgpl2.1+))) -(define-public json-glib +(define-public json-glib-minimal (package - (name "json-glib") + (name "json-glib-minimal") (version "1.6.2") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) + (uri (string-append "mirror://gnome/sources/json-glib/" + (version-major+minor version) + "/json-glib-" version ".tar.xz")) (sha256 (base32 "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3")))) (build-system meson-build-system) - (outputs '("out" "doc")) (arguments - `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:configure-flags - (list - "-Ddocs=true" - "-Dman=true" - ,@(if (%current-target-system) - ;; If enabled, gtkdoc-scangobj will try to execute a - ;; cross-compiled binary. - '("-Dgtk_doc=disabled" - ;; Trying to build introspection data when cross-compiling - ;; causes errors during linking. - "-Dintrospection=disabled") - '())) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-docbook - ;; TODO(core-updates): Use (or native-inputs inputs) - ;; unconditionally. - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) inputs #:allow-other-keys) - (with-directory-excursion "doc" - (substitute* (find-files "." "\\.xml$") - (("http://www.oasis-open.org/docbook/xml/4\\.3/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) - "docbook-xml") - "/xml/dtd/docbook/"))) - (substitute* "meson.build" - (("http://docbook.sourceforge.net/release/xsl/current/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xsl") - "/xml/xsl/docbook-xsl-1.79.2/")))) - #t)) - ;; When cross-compiling, there are no docs to move. - ,(if (%current-target-system) - '(add-after 'install 'stub-docs - (lambda* (#:key outputs #:allow-other-keys) - ;; The daemon doesn't like empty output paths. - (mkdir (assoc-ref outputs "doc")))) - '(add-after 'install 'move-docs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (mkdir-p (string-append doc "/share")) - (rename-file - (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - #t))))))) + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas (native-inputs - `(("docbook-xml" ,docbook-xml-4.3) - ("docbook-xsl" ,docbook-xsl) - ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) - ("pkg-config" ,pkg-config) - ("xsltproc" ,libxslt))) + `(("gettext" ,gettext-minimal) + ("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal + ("pkg-config" ,pkg-config))) (inputs - ;; TODO(core-updates): Make this input unconditional. - (if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '())) + `(("bash-minimal" ,bash-minimal))) (propagated-inputs `(("glib" ,glib))) ;according to json-glib-1.0.pc (home-page "https://wiki.gnome.org/Projects/JsonGlib") @@ -4679,6 +4620,61 @@ (define-public json-glib GLib and GObject, and integrates JSON with GLib data types.") (license license:lgpl2.1+))) +(define-public json-glib + (package/inherit json-glib-minimal + (name "json-glib") + (outputs (cons "doc" (package-outputs json-glib-minimal))) + (arguments + (substitute-keyword-arguments (package-arguments json-glib-minimal) + ((#:configure-flags _) + `(list "-Ddocs=true" + "-Dman=true" + ,@(if (%current-target-system) + ;; If enabled, gtkdoc-scangobj will try to execute a + ;; cross-compiled binary. + '("-Dgtk_doc=disabled" + ;; Trying to build introspection data when cross-compiling + ;; causes errors during linking. + "-Dintrospection=disabled") + '()))) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-after 'unpack 'patch-docbook + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* (find-files "." "\\.xml$") + (("http://www.oasis-open.org/docbook/xml/4\\.3/") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml") + "/xml/dtd/docbook/"))) + (substitute* "meson.build" + (("http://docbook.sourceforge.net/release/xsl/current/") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xsl") + "/xml/xsl/docbook-xsl-1.79.2/")))))) + ;; When cross-compiling, there are no docs to move. + ,(if (%current-target-system) + '(add-after 'install 'stub-docs + (lambda* (#:key outputs #:allow-other-keys) + ;; The daemon doesn't like empty output paths. + (mkdir (assoc-ref outputs "doc")))) + '(add-after 'install 'move-docs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")))))))))) + (native-inputs + (append + `(("docbook-xml" ,docbook-xml-4.3) + ("docbook-xsl" ,docbook-xsl) + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("xsltproc" ,libxslt)) + (package-native-inputs json-glib-minimal))))) + (define-public libxklavier (package (name "libxklavier") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b67af8c051..1dd2c6c184 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1028,7 +1028,7 @@ (define-public gtk+ ("graphene" ,graphene) ("harfbuzz" ,harfbuzz) ("iso-codes" ,iso-codes) - ("json-glib" ,json-glib) + ("json-glib" ,json-glib-minimal) ("libxml2" ,libxml2) ("rest" ,rest))) (native-inputs -- 2.33.1