From patchwork Sun Feb 16 08:45:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 38718 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9CB1627BBEA; Sun, 16 Feb 2025 08:46:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 133CF27BBE2 for ; Sun, 16 Feb 2025 08:46:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tjaHv-0001U1-4j; Sun, 16 Feb 2025 03:46:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tjaHr-0001Tl-VI for guix-patches@gnu.org; Sun, 16 Feb 2025 03:46:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tjaHq-0004Lj-6M for guix-patches@gnu.org; Sun, 16 Feb 2025 03:46:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=9AlhkoMYneTw7S6nhDUVIcp20B9bN1w11RS6FhD+kZ0=; b=Zj8wZfXNTD+ooaNkXabIH2J175L5gWBe+/ZqXgsCpXZIgDU+1orLxy89g2m5SvnNyLIZQA8keOb/QrXu3Xn2aUlL+ERiIoKFs/C9c7LCwpxocHUiZkvMO1WFnq3AjbhtjTNN5mlRikwb4QyQDxcw9nP9PPqylRexLxetoaFS01L8/kexdit7ujHaJPao+KgfpNxW9I3Gd0mZ2B7S6LYociT6EO3bgs+gDzoOFJrU1LxPMxpQfJ+DMTDcoocLfSWGWJWkCX92eNz6+ccbEPe+BQ7t30VfivXvzsq5a3F/a6iN0cJo06iSgwAeIHj7jQhbHtrG6945aE9NhAgeRj8pSQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tjaHq-0000ew-0o for guix-patches@gnu.org; Sun, 16 Feb 2025 03:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76326] [PATCH 1/2] gnu: gpick: Improve the package style. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Feb 2025 08:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76326 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76326@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 76326-submit@debbugs.gnu.org id=B76326.173969554532699 (code B ref 76326); Sun, 16 Feb 2025 08:46:01 +0000 Received: (at 76326) by debbugs.gnu.org; 16 Feb 2025 08:45:45 +0000 Received: from localhost ([127.0.0.1]:59997 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tjaHY-0008UI-A6 for submit@debbugs.gnu.org; Sun, 16 Feb 2025 03:45:44 -0500 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]:38442) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tjaHV-0008AA-K5 for 76326@debbugs.gnu.org; Sun, 16 Feb 2025 03:45:42 -0500 Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-54531538067so162361e87.2 for <76326@debbugs.gnu.org>; Sun, 16 Feb 2025 00:45:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739695535; x=1740300335; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9AlhkoMYneTw7S6nhDUVIcp20B9bN1w11RS6FhD+kZ0=; b=WruXaR9VwUstgsmx3S6JR2W2cLDL71gqPqUXFiUJ6cfOzlasfCdUlrF4xRZSUwLDLn e/6LFasL8mC4fRHw7Tn89sFiCCxAUiK8UVBbLRW96urwOwppfireNrY0RFXlpQeL7YjO q+lVQN7MPOI6EbLyR0ZyKrAXjeQWuj7ISlTc6G3m4CXCg2vh+27+8403nVYpkiGiko92 KbykcoOvunr1kK+T9Z6uekkU2OuBJRjqBQWfz7V1LZn9KOedHuT56uMI1M4AfhQibgeU hsOWBLSTmCKpmygC7ijmHPUTOFweGFzVrO7UyOnvI2cyolpsb4+WkiEZUuyGyzJSwJLv VG/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739695535; x=1740300335; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9AlhkoMYneTw7S6nhDUVIcp20B9bN1w11RS6FhD+kZ0=; b=lcovsnTYyjxMBFzIC+3DNq+eoCj8p9h426BSJ4zIIhwwNoaalFRg39m/l+oCXbOBb/ jST+wMF+T30RSRV2oW3sBjACCcEm74PtD+hbMvOM3UqSPs1pYijD0wbjiwsziD9xGoUd JZ2tBW4tFnTq9RX4R80q9Mlez5sU1joQaAOFYqhwSc0MXO245oKmf1ld3DROemmD/DKy 1demoResXKCjcGk+nzTCyPK/jiGv3qHH50A0nqGYc27PxKRqCg4JNhgQrXgPcYIo8c5W Nj675r8k6xWGztGn48pnBmesu9Y/FRS80Ex1SapH5aPx9LiQzh7grBDw/4Mppf2tqj5h eD1g== X-Gm-Message-State: AOJu0YzJX3dH6vpLO8r2+BLNpz/qCQnmzP/qyVDW/2q/mlbBotgMizbc JlahBY53aXuJ5FLQacOHFv3/nGVueIeVXbehfwdpoM4AtdbFHutxLiDws3b+q7lNjw== X-Gm-Gg: ASbGncty0Elu+BtnlD7jYZ/9Qdx5HD905fIIAtLcgPOwPmcZcdShEmyufDzZL+HC6XU p8dSqkuRDq4NugPR9hze4wqzuPBfj4wxw8VqNfU0Ghg8s/DI9BS3ixw5dShu0v95NdHa+XW/sys 6r7tD6erBG8/1zqTU+KBlon7/5VxvtKNFmi1PQR/qm2b9dW8bT09f9opAisL7ElvW9JFyTzdKmR u+SN6YzZmw+s4l5iUqSKcBLETJPfa0uwGLQN+Sp0aANAyDSLPnHge+LZTZ6KawpiXXbl1p79+wy myhkFnfdd3D9NLx0 X-Google-Smtp-Source: AGHT+IGVkpMkPBxn+PSDxJQ8861PdU5r4AXwANFBv/EI7TkqAmP0Y6rtDevRibohq17375600V43dg== X-Received: by 2002:a05:6512:b0a:b0:545:2d03:d100 with SMTP id 2adb3069b0e04-5452fe8fdcfmr454052e87.12.1739695534817; Sun, 16 Feb 2025 00:45:34 -0800 (PST) Received: from elephant.. ([5.164.217.35]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5461dd84631sm121217e87.167.2025.02.16.00.45.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2025 00:45:33 -0800 (PST) From: "Artyom V. Poptsov" Date: Sun, 16 Feb 2025 11:45:15 +0300 Message-ID: <818b72d701f2bd4ed0349e6d7579e0e59d436029.1739695296.git.poptsov.artyom@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/image.scm (gpick): Improve the package style. [native-inputs, inputs]: Remove input labels. [arguments]: Use GEXPs. Change-Id: I7917381255ab5cd129e6c6133246579fb071a03f --- gnu/packages/image.scm | 50 +++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 99face4546..282b6582e8 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2044,36 +2044,30 @@ (define-public gpick (package (name "gpick") (version "0.2.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/thezbyg/gpick") - (commit (string-append name "-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0nl89gca5nmbyycv5rl5bm6k7facapdk4pab9pl949aa3cjw9bk7")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/thezbyg/gpick") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nl89gca5nmbyycv5rl5bm6k7facapdk4pab9pl949aa3cjw9bk7")))) (build-system scons-build-system) - (native-inputs - `(("boost" ,boost) - ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("ragel" ,ragel))) - (inputs - `(("expat" ,expat) - ("gtk2" ,gtk+-2) - ("lua" ,lua-5.2))) + (native-inputs (list boost gettext-minimal pkg-config ragel)) + (inputs (list expat gtk+-2 lua-5.2)) (arguments - `(#:tests? #f - #:scons ,scons-python2 - #:scons-flags (list (string-append "DESTDIR=" %output)) - #:phases - (modify-phases %standard-phases - (add-before 'build 'fix-lua-reference - (lambda _ - (substitute* "SConscript" - (("lua5.2") "lua-5.2")) - #t))))) + (list + #:tests? #f + #:scons scons-python2 + #:scons-flags #~(list (string-append "DESTDIR=" #$output)) + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'fix-lua-reference + (lambda _ + (substitute* "SConscript" + (("lua5.2") + "lua-5.2"))))))) (home-page "http://www.gpick.org/") (synopsis "Color picker") (description "Gpick is an advanced color picker and palette editing tool.") From patchwork Sun Feb 16 08:45:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 38717 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2555227BBEA; Sun, 16 Feb 2025 08:46:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9B36027BBE2 for ; Sun, 16 Feb 2025 08:46:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tjaHw-0001UB-81; Sun, 16 Feb 2025 03:46:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tjaHr-0001Tm-VJ for guix-patches@gnu.org; Sun, 16 Feb 2025 03:46:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tjaHq-0004Ll-Jm for guix-patches@gnu.org; Sun, 16 Feb 2025 03:46:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=VHxIK8tNjnR1P0v/7PNJXQxvaSWvSuiZp6cZ8M9W6HE=; b=PqxNBlYyeAE+MAOjWk2R4pCvp76Xc6tmWBK8e/8wqu2dGGsXzJ66U3JAhXyNhP12jlXKyZbd+YfWgYl8pUNixJVqQVC9/YFIDYQDD4D/0mpZ+7vQddw25LIHr0dv41mVM1UI5R79S06uUamxBuDmm74MZAi9/9nKHOVfYVdlkeUtqqy/x0qHMpTLDje/eNiLtPyDm9ob1177+sCPPowvBuJ0F27TPARWWNBmE/Nhi6CRV0S8k7aiCxXPfdzmYSVEwZUQgVTeF6QUsDIc4YOzsusomQnzfE7IzX3sOv1lVJG/7kjk7k4UFHDpE3uTTpTAcJtZSnD3qw16VitTgrqy0w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tjaHq-0000g8-Fn for guix-patches@gnu.org; Sun, 16 Feb 2025 03:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76326] [PATCH 2/2] gnu: gpick: Update to 0.3-1.365f605. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Feb 2025 08:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76326 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76326@debbugs.gnu.org Cc: "Artyom V. Poptsov" Received: via spool by 76326-submit@debbugs.gnu.org id=B76326.17396955531309 (code B ref 76326); Sun, 16 Feb 2025 08:46:02 +0000 Received: (at 76326) by debbugs.gnu.org; 16 Feb 2025 08:45:53 +0000 Received: from localhost ([127.0.0.1]:60000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tjaHf-0000If-U7 for submit@debbugs.gnu.org; Sun, 16 Feb 2025 03:45:53 -0500 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]:38444) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tjaHd-0008S0-6K for 76326@debbugs.gnu.org; Sun, 16 Feb 2025 03:45:50 -0500 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-54531538067so162369e87.2 for <76326@debbugs.gnu.org>; Sun, 16 Feb 2025 00:45:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739695543; x=1740300343; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VHxIK8tNjnR1P0v/7PNJXQxvaSWvSuiZp6cZ8M9W6HE=; b=aqVQmWIAsNGDFTc7zyr9FHuMQKHV1snDMXUV4b/VpYc+YJ9xCM2FOVmi0lagedrtGW BYktfeensl4FjjhnzK+yDx1D/MUHqfRhS6oYk9/xtsdbZtUUry9vyhvvWiPS3xOj7Cy5 lrrbCcvtYjaJcbAdyX9f0PE7T3H8Lk3HYuI1D2wJpPAhBKYAHXUuHaXe6ObZkeHvbnO+ qHI3LIUWQ4rBRip4VxXeBY0cValCx+EU9nV83oyDNqmbw4WzV57u8DXMgarzZ1akVe5V i6IcL2/kfXQ+6bNNTgMR9x/NeKpzgM0cKzHtHD8oreCsQqgx9VoBZsWZKd4fQWSVSgI9 O3kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739695543; x=1740300343; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VHxIK8tNjnR1P0v/7PNJXQxvaSWvSuiZp6cZ8M9W6HE=; b=ioVgd9IKgJ7A3Q5bPT6KfX/ESo/vY+pdYsmkEmTlcQsWo+o/76wL8E2WvvnKu1YxJw qegGK76UjzRQQjEU8bC2uZtQ55kOnpyC9MIH45tApF+wcp3Occd6U8XXWJXsPKec7v0W 9HjAOu5Ki4expuxV1Q6pKpUuIDuaPefChBw8P1dKH8pb7sIi4LePybdykLJ9fF2JhIzJ b+LWqdT2Q8CDHEd1pX1g3zRDO0sEs729hEMAcTN10fuOQ+8mpfvNLZf9eMALtYt7gP2G jZDLW5xzE6yytFVxveRt4gxjmHCFs1g9n8rl40yS+xq3OCcj4KBXcFAPDndwkW/LMBXg TdCA== X-Gm-Message-State: AOJu0Yxh9jH9D5Yw2x5WRYqHQ3JFMN6n9U+C5WbjIit2smYWkTBjuP7U 6uWiKOif41K5oSCyx6cmyRf2ba6S3V2OxXmmDIKr03oV+PvWRvCIhfWhN7VVJ3QxtQ== X-Gm-Gg: ASbGnct23nH8YNHhsat3n9BikQj+uPUOhfUoELLdLiLy+v84D+1U+7kM4JigZjxxhny oj4eicb4/t1s0hjrRWYa4qfilymm33Y2PMs/aQsXqCjwxm4KOnaXPP8m4etRAZ5k1Jdg11Pia79 AKIkhmPFZIaWDO39RyxTDwgny+Bh+GNvvBb3FzFnbLqfDLR1RzB1DBkBMpqHDf+2Df/ndAwRHTT 9a7Pdfvk/8g9izdhp0Rm1o+Y/okUonL7Pu2oKWbfLQzpRyPkAY8Agnvz5HZsLyApwrEgIm1Qs0L yjQg5iRuSkPhHTwO X-Google-Smtp-Source: AGHT+IGw+31Yzdoj3sFfcUeidV+/v0OBP7ICCnWW7rMa0mA2+BKtQYWUX/xlH5/eE3YWDhY5HPXmDQ== X-Received: by 2002:a05:6512:ba6:b0:545:c51:4a1e with SMTP id 2adb3069b0e04-5452fe82d62mr536023e87.9.1739695542116; Sun, 16 Feb 2025 00:45:42 -0800 (PST) Received: from elephant.. ([5.164.217.35]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5461dd84631sm121217e87.167.2025.02.16.00.45.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2025 00:45:40 -0800 (PST) From: "Artyom V. Poptsov" Date: Sun, 16 Feb 2025 11:45:16 +0300 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/image.scm (gpick): Update to 0.3-1.365f605. [source]: Apply the patch from . [inputs]: Use gtk+ and lua. [arguments]<#:scons-flags>: Set "LUA_TYPE". <#:phases>: Add 'generate-version-file' phase. Use lua-5.3 in "fix-lua-reference" phase. * gnu/packages/patches/gpick-fix-segfault-on-start.patch: New file. * gnu/local.mk (dist_patch_DATA): Register the patch. Change-Id: I18e5e9dea1b43a3f4f641e2c52b95a17a17429b7 --- gnu/local.mk | 1 + gnu/packages/image.scm | 77 ++++++---- .../patches/gpick-fix-segfault-on-start.patch | 141 ++++++++++++++++++ 3 files changed, 188 insertions(+), 31 deletions(-) create mode 100644 gnu/packages/patches/gpick-fix-segfault-on-start.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9690bbe647..7bfcb43a1e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1511,6 +1511,7 @@ dist_patch_DATA = \ %D%/packages/patches/go-skip-gc-test.patch \ %D%/packages/patches/gourmet-sqlalchemy-compat.patch \ %D%/packages/patches/gpaste-fix-paths.patch \ + %D%/packages/patches/gpick-fix-segfault-on-start.patch \ %D%/packages/patches/gpm-glibc-2.26.patch \ %D%/packages/patches/gpodder-disable-updater.patch \ %D%/packages/patches/grantlee-fix-i586-precision.patch \ diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 282b6582e8..04824f23ad 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2041,37 +2041,52 @@ (define-public picket (license license:gpl3+))) (define-public gpick - (package - (name "gpick") - (version "0.2.6") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/thezbyg/gpick") - (commit (string-append name "-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0nl89gca5nmbyycv5rl5bm6k7facapdk4pab9pl949aa3cjw9bk7")))) - (build-system scons-build-system) - (native-inputs (list boost gettext-minimal pkg-config ragel)) - (inputs (list expat gtk+-2 lua-5.2)) - (arguments - (list - #:tests? #f - #:scons scons-python2 - #:scons-flags #~(list (string-append "DESTDIR=" #$output)) - #:phases - #~(modify-phases %standard-phases - (add-before 'build 'fix-lua-reference - (lambda _ - (substitute* "SConscript" - (("lua5.2") - "lua-5.2"))))))) - (home-page "http://www.gpick.org/") - (synopsis "Color picker") - (description "Gpick is an advanced color picker and palette editing tool.") - (license license:bsd-3))) + (let ((commit "365f605d187cb57dc86d3feb166c4636f262ae31") + (revision "1") + (version "0.3")) + (package + (name "gpick") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/thezbyg/gpick") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1p60pa85mgcbzgd85pvyishw8jr49ciphq6z07yw6v9j97j80iax")) + ;; See this pull request: + ;; + (patches (search-patches "gpick-fix-segfault-on-start.patch")))) + (build-system scons-build-system) + (native-inputs (list boost gettext-minimal pkg-config ragel)) + (inputs (list expat gtk+ lua)) + (arguments + (list + #:tests? #f + #:scons scons + #:scons-flags #~(list (string-append "DESTDIR=" #$output) + "LUA_TYPE=C") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'generate-version-file + (lambda _ + (with-output-to-file ".version" + (lambda () + (format #t "0.3~%") + (format #t "~a~%" #$revision) + (format #t "~a~%" #$commit) + (format #t "2023-06-09~%"))))) + (add-before 'build 'fix-lua-reference + (lambda _ + (substitute* "SConscript" + (("lua5.3") + "lua-5.3"))))))) + (home-page "http://www.gpick.org/") + (synopsis "Color picker") + (description "Gpick is an advanced color picker and palette editing tool.") + (license license:bsd-3)))) (define-public libiptcdata (package diff --git a/gnu/packages/patches/gpick-fix-segfault-on-start.patch b/gnu/packages/patches/gpick-fix-segfault-on-start.patch new file mode 100644 index 0000000000..1ecc6012db --- /dev/null +++ b/gnu/packages/patches/gpick-fix-segfault-on-start.patch @@ -0,0 +1,141 @@ +From a55129f534a62e179ae7facd58b75a61b500e387 Mon Sep 17 00:00:00 2001 +From: Trantarius +Date: Sat, 18 Nov 2023 19:01:18 -0500 +Subject: [PATCH] fix segfault on start + +--- + source/GlobalState.cpp | 13 ++++-- + source/common/Span.h | 1 + + source/gtk/ColorComponent.cpp | 78 +++++++++++++++++------------------ + 3 files changed, 49 insertions(+), 43 deletions(-) + +diff --git a/source/GlobalState.cpp b/source/GlobalState.cpp +index 50b3c2a..146c53e 100644 +--- a/source/GlobalState.cpp ++++ b/source/GlobalState.cpp +@@ -50,9 +50,16 @@ struct ConverterOptions: public Converter::Options, public IEventHandler { + } + void update() { + auto options = m_settings.getMap("gpick.options"); +- upperCaseHex = options->getString("hex_case", "upper") == "upper"; +- cssPercentages = options->getBool("css_percentages", false); +- cssAlphaPercentage = options->getBool("css_alpha_percentage", false); ++ if(options){ ++ upperCaseHex = options->getString("hex_case", "upper") == "upper"; ++ cssPercentages = options->getBool("css_percentages", false); ++ cssAlphaPercentage = options->getBool("css_alpha_percentage", false); ++ } ++ else{ ++ upperCaseHex=true; ++ cssPercentages=false; ++ cssAlphaPercentage=false; ++ } + } + virtual ~ConverterOptions() { + } +diff --git a/source/common/Span.h b/source/common/Span.h +index f5b0552..67c7bde 100644 +--- a/source/common/Span.h ++++ b/source/common/Span.h +@@ -19,6 +19,7 @@ + #ifndef GPICK_COMMON_SPAN_H_ + #define GPICK_COMMON_SPAN_H_ + #include ++#include + #include + namespace common { + template +diff --git a/source/gtk/ColorComponent.cpp b/source/gtk/ColorComponent.cpp +index 7d59fdc..aa626d5 100644 +--- a/source/gtk/ColorComponent.cpp ++++ b/source/gtk/ColorComponent.cpp +@@ -550,51 +550,49 @@ static gboolean onDraw(GtkWidget *widget, cairo_t *cr) { + cairo_set_source_rgb(cr, 0, 0, 0); + cairo_set_line_width(cr, 1); + cairo_stroke(cr); +- if (ns->text[i] || ns->label[i]) { +- PangoLayout *layout; +- PangoFontDescription *font_description; +- font_description = pango_font_description_new(); +- layout = pango_cairo_create_layout(cr); +- pango_font_description_set_family(font_description, "sans"); +- pango_font_description_set_weight(font_description, PANGO_WEIGHT_NORMAL); +- pango_font_description_set_absolute_size(font_description, 12 * PANGO_SCALE); +- pango_layout_set_font_description(layout, font_description); +- pango_layout_set_wrap(layout, PANGO_WRAP_WORD); +- pango_layout_set_single_paragraph_mode(layout, true); ++ PangoLayout *layout; ++ PangoFontDescription *font_description; ++ font_description = pango_font_description_new(); ++ layout = pango_cairo_create_layout(cr); ++ pango_font_description_set_family(font_description, "sans"); ++ pango_font_description_set_weight(font_description, PANGO_WEIGHT_NORMAL); ++ pango_font_description_set_absolute_size(font_description, 12 * PANGO_SCALE); ++ pango_layout_set_font_description(layout, font_description); ++ pango_layout_set_wrap(layout, PANGO_WRAP_WORD); ++ pango_layout_set_single_paragraph_mode(layout, true); + #if GTK_MAJOR_VERSION >= 3 +- //TODO: GTK3 font color ++ //TODO: GTK3 font color + #else +- gdk_cairo_set_source_color(cr, &widget->style->text[0]); ++ gdk_cairo_set_source_color(cr, &widget->style->text[0]); + #endif +- int width, height; +- if (ns->text[i]) { +- pango_layout_set_text(layout, ns->text[i], -1); +- pango_layout_set_width(layout, 40 * PANGO_SCALE); +- pango_layout_set_height(layout, 16 * PANGO_SCALE); +- pango_layout_set_alignment(layout, PANGO_ALIGN_RIGHT); +- pango_cairo_update_layout(cr, layout); +- pango_layout_get_pixel_size(layout, &width, &height); +- cairo_move_to(cr, 200 + offset_x - 5, i * 16); +- pango_cairo_show_layout(cr, layout); +- } +- if (ns->label[i][0] && ns->label[i][1] && offset_x > 10) { +- if (offset_x > 50) { +- pango_layout_set_text(layout, ns->label[i][1], -1); +- } else { +- pango_layout_set_text(layout, ns->label[i][0], -1); +- } +- pango_layout_set_width(layout, (offset_x - 10) * PANGO_SCALE); +- pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END); +- pango_layout_set_height(layout, 16 * PANGO_SCALE); +- pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT); +- pango_cairo_update_layout(cr, layout); +- pango_layout_get_pixel_size(layout, &width, &height); +- cairo_move_to(cr, 5, i * 16); +- pango_cairo_show_layout(cr, layout); ++ int width, height; ++ if (ns->text[i]) { ++ pango_layout_set_text(layout, ns->text[i], -1); ++ pango_layout_set_width(layout, 40 * PANGO_SCALE); ++ pango_layout_set_height(layout, 16 * PANGO_SCALE); ++ pango_layout_set_alignment(layout, PANGO_ALIGN_RIGHT); ++ pango_cairo_update_layout(cr, layout); ++ pango_layout_get_pixel_size(layout, &width, &height); ++ cairo_move_to(cr, 200 + offset_x - 5, i * 16); ++ pango_cairo_show_layout(cr, layout); ++ } ++ if (ns->label[i][0] && ns->label[i][1] && offset_x > 10) { ++ if (offset_x > 50) { ++ pango_layout_set_text(layout, ns->label[i][1], -1); ++ } else { ++ pango_layout_set_text(layout, ns->label[i][0], -1); + } +- g_object_unref(layout); +- pango_font_description_free(font_description); ++ pango_layout_set_width(layout, (offset_x - 10) * PANGO_SCALE); ++ pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END); ++ pango_layout_set_height(layout, 16 * PANGO_SCALE); ++ pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT); ++ pango_cairo_update_layout(cr, layout); ++ pango_layout_get_pixel_size(layout, &width, &height); ++ cairo_move_to(cr, 5, i * 16); ++ pango_cairo_show_layout(cr, layout); + } ++ g_object_unref(layout); ++ pango_font_description_free(font_description); + } + return TRUE; + }