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 RgBQFJJOaWHcRAAAgWs5BA (envelope-from ) for ; Fri, 15 Oct 2021 11:49:06 +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 WOo/D5JOaWGNPgAAbx9fmQ (envelope-from ) for ; Fri, 15 Oct 2021 09:49:06 +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 D389384F4 for ; Fri, 15 Oct 2021 11:49:05 +0200 (CEST) Received: from localhost ([::1]:56388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mbJpn-00036e-KV for larch@yhetil.org; Fri, 15 Oct 2021 05:49:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbJZL-0004SM-Vh for guix-patches@gnu.org; Fri, 15 Oct 2021 05:32:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mbJZL-0006W7-ME for guix-patches@gnu.org; Fri, 15 Oct 2021 05:32:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mbJZL-0005eC-IU for guix-patches@gnu.org; Fri, 15 Oct 2021 05:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50862] [PATCH core-updates-frozen 02/19] gnu: libdbusmenu-qt: Move (gnu packages qt). Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 15 Oct 2021 09:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50862 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50862@debbugs.gnu.org Received: via spool by 50862-submit@debbugs.gnu.org id=B50862.163429029321519 (code B ref 50862); Fri, 15 Oct 2021 09:32:03 +0000 Received: (at 50862) by debbugs.gnu.org; 15 Oct 2021 09:31:33 +0000 Received: from localhost ([127.0.0.1]:38138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbJYr-0005au-1j for submit@debbugs.gnu.org; Fri, 15 Oct 2021 05:31:33 -0400 Received: from mout-p-102.mailbox.org ([80.241.56.152]:13556) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbJYm-0005a7-PJ for 50862@debbugs.gnu.org; Fri, 15 Oct 2021 05:31:30 -0400 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:105:465:1:3:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4HW1HG3x7LzQjmG for <50862@debbugs.gnu.org>; Fri, 15 Oct 2021 11:31:22 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1634290280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dT71RhcMu4V7lqQEMhjQnuZUqYlkGMzOqVx/as8RREM=; b=I6Jo21ALa2E/oHsRGj2uXKxplzeP+rD4tRu89IIxUygiOBnHa+juluhvPKZX6OS77ET4DC 4ouyg2rsb9/pkBlbhx/Nm+NNGhhMCCkyd3heoKarBc1PqBSlo4lh1JzwLcWaOkvRckefDd pFarJKywS1rBH0VOHMbXmhr4jbYfKvyD/HjhsrUAuWbzdAxaDMwUCU9rS1QGmd5cYDMFRI kmfPehl0w2SFK+Al+GbQ4rp7hOySU6UsOQA3NO+tLkEnoY2SNBiXrkeybJUSmzDQJYHiht QTChI91dPvoSnsKp/9j7wPC6x/KlxoT0IKPCPrvy7ydblf8j60/xg6FzxHuJsA== From: Brendan Tildesley Date: Fri, 15 Oct 2021 20:29:58 +1100 Message-Id: <20211015093015.5834-3-mail@brendan.scot> In-Reply-To: <20211015093015.5834-1-mail@brendan.scot> References: <20211015093015.5834-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 33D4726F 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1634291346; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=dT71RhcMu4V7lqQEMhjQnuZUqYlkGMzOqVx/as8RREM=; b=qa52HxTHHXpFToAq+yJ4ZImYUalAyHSGCKmw3ZNto6GbjuFucU9qvSullPjWVClrDixZPg n8BIJKYcbqCyPIDO+BewN/zLgVP5m5jr0SI/F1/bMzHuqyZD2gnUlj4pBxljcSh0rqU3aL Sqa1vTr0VwAEd8Xrd3A8/Jfg4KktZe0zB4696G9pcUcyN+fZw0E7n4degkvqyt1d35+Oth Jt9OzrZZmoQg1h5bevF8Ztep/WSmaXBu0om/UXhVG5kaqOevcOUjWrvFtzz4PSsO94O28L w+giQSbmvdUbV4rI48zVrfza4FVFF6ESIaFTe4AGKjJGyPRxv00E0VnoxLxYcQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1634291346; a=rsa-sha256; cv=none; b=MjOgVtFM5I6oBcnZT7BMlCBxEMB7WKsDkJSMyHG7i8z1iFdkyhnHzbYEvZIH4HtswwIMI/ Uk7e8YH6Q7mDwSRWIKE6TclSplQ9Dk2qjcVtBJAxuHPinn1jLGom1LKf+DivbOd9WKi4Tw pwCROtpd25tRmsL2e3v0VHskcs1+BfRvJxoZ+E5sPOMTlAtR2S29tprGHB9liZ1kW7tHwT +QKJjeeXlE8rdOUnjAHOuZbBNQDDOnE8MM/+NKuV5OLnNbWJdckJuOrTKeLrWdVP70KMpz 7bjaESKXb5iCclvabqWCgGoU0tkexRKzQJAiC/7hrhp8TYgcKjm8b9PU5+8cCg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b=I6Jo21AL; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.08 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b=I6Jo21AL; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: D389384F4 X-Spam-Score: 3.08 X-Migadu-Scanner: scn1.migadu.com X-TUID: ojSOdf4N3M6k * gnu/packages/lxqt.scm: Delete libdbusmenu-qt. * gnu/packages/qt.scm: Readd libdbusmenu-qt. This prevent amysterious module resolution issue when attempting to use libdbusmenu in KDE modules. --- gnu/packages/lxqt.scm | 32 +------------------------------- gnu/packages/qt.scm | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 391d83b7c4..4230775dd0 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -68,36 +68,6 @@ ;; Third party libraries -(define-public libdbusmenu-qt - (package - (name "libdbusmenu-qt") - (version "0.9.3+16.04.20160218-0ubuntu1") - (source - (origin - (method git-fetch) - ;; Download from github rather than launchpad because launchpad trunk - ;; tarball hash is not deterministic. - (uri (git-reference - (url "https://github.com/unity8-team/libdbusmenu-qt") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0b7ii1cvmpcyl79gqal9c3va9m55h055s4hx7fpxkhhqs9463ggg")))) - (build-system cmake-build-system) - (arguments - ;; XXX: Tests require a dbus session and some icons. - '(#:tests? #f)) - (native-inputs - `(("doxygen" ,doxygen))) - (inputs - `(("qtbase" ,qtbase-5))) - (home-page "https://launchpad.net/libdbusmenu-qt") - (synopsis "Qt implementation of the DBusMenu spec") - (description "This library provides a Qt implementation of the DBusMenu -protocol. The DBusMenu protocol makes it possible for applications to export -and import their menus over DBus.") - (license license:lgpl2.1+))) - (define-public libstatgrab (package (name "libstatgrab") @@ -1425,7 +1395,7 @@ desktop.") ("lximage-qt" ,lximage-qt) ("obconf-qt" ,obconf-qt) ("openbox" ,openbox) - ("oxygen-icons" ,oxygen-icons) + ("breeze-icons" ,breeze-icons) ("pavucontrol-qt" ,pavucontrol-qt) ("qps" ,qps) ("qterminal" ,qterminal))) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 5ce4220cb0..962fb5a252 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3101,3 +3101,33 @@ being fully customizable and easy to extend.") also compatible with SGI and TGS Open Inventor, and the API is based on the API of the InventorXt GUI component toolkit.") (license license:bsd-3)))) + +(define-public libdbusmenu-qt + (package + (name "libdbusmenu-qt") + (version "0.9.3+16.04.20160218-0ubuntu1") + (source + (origin + (method git-fetch) + ;; Download from github rather than launchpad because launchpad trunk + ;; tarball hash is not deterministic. + (uri (git-reference + (url "https://github.com/unity8-team/libdbusmenu-qt") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0b7ii1cvmpcyl79gqal9c3va9m55h055s4hx7fpxkhhqs9463ggg")))) + (build-system cmake-build-system) + (arguments + ;; XXX: Tests require a dbus session and some icons. + '(#:tests? #f)) + (native-inputs + `(("doxygen" ,doxygen))) + (inputs + `(("qtbase" ,qtbase-5))) + (home-page "https://launchpad.net/libdbusmenu-qt") + (synopsis "Qt implementation of the DBusMenu spec") + (description "This library provides a Qt implementation of the DBusMenu +protocol. The DBusMenu protocol makes it possible for applications to export +and import their menus over DBus.") + (license license:lgpl2.1+))) -- 2.33.0