From patchwork Tue Jul 4 16:31:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parnikkapore X-Patchwork-Id: 51540 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 C452B27BBE2; Tue, 4 Jul 2023 17:32:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FORGED_MSGID_YAHOO,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 2CFC127BBE9 for ; Tue, 4 Jul 2023 17:32:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGiwg-0008Rd-2l; Tue, 04 Jul 2023 12:32:06 -0400 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 1qGiwf-0008Qs-2T for guix-patches@gnu.org; Tue, 04 Jul 2023 12:32:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qGiwc-0000dV-Vo for guix-patches@gnu.org; Tue, 04 Jul 2023 12:32:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qGiwc-0000DY-Rj for guix-patches@gnu.org; Tue, 04 Jul 2023 12:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64021] [PATCH v2 2/6] gnu: gajim: Update to 1.7.3. Resent-From: Parnikkapore Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jul 2023 16:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64021 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 64021@debbugs.gnu.org Received: via spool by 64021-submit@debbugs.gnu.org id=B64021.1688488290730 (code B ref 64021); Tue, 04 Jul 2023 16:32:02 +0000 Received: (at 64021) by debbugs.gnu.org; 4 Jul 2023 16:31:30 +0000 Received: from localhost ([127.0.0.1]:36499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGiw5-0000BP-W3 for submit@debbugs.gnu.org; Tue, 04 Jul 2023 12:31:30 -0400 Received: from sonic305-20.consmr.mail.sg3.yahoo.com ([106.10.241.83]:42988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qGiw1-0000AB-RK for 64021@debbugs.gnu.org; Tue, 04 Jul 2023 12:31:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1688488277; bh=2D7ZtOzCZynQ31txx/R0988xi1A1TTBQV/oP6ZSHBnE=; h=From:To:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=Dy2xH4SVV0YMfEfqVzudsSjGNNPwFlIZ74wL7erNT9U4AvPefmmvTYGgT6q5FSl9zWClM+o9C49OhCPjX4ueqq3+R0Lv6nY7eJ80QWYnfVZzTLkV29WuoBlMfPeA5sJX3D6z1Yld7EujQMEdlevv+8Fjtn5JTMUl1v160vu/uJnsVL08iKxA0tH3J3JBdKpVXtXcIhW7m+Upl9nR2KjyZ+hHE0AudXAvcKM/Xk+W5Zm9hm9DVBDVIhOCEONTYgfhcufuXhwfErH11DoOL0EKwGCO18YCwJJhCWwDaL1QBTEBXdpLbcp13JhK9xcbpTs9gWbxb/pNUsraBX/KoumHeg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1688488277; bh=SHVnfWSqz9qj5Nm6p5Jp9jDc5pourUITD863z8Q+IBX=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=n6vOkDOEbmf0+WUt4ZOi7Z+MgmBcIrNfhxiMMPhERFVw8TVe34LcAr/8gXXrOnTcUsar+k1t5MbmIuWXz7be/g1Vwmd+Hs0vV0dxC7ADuiRRmLf2Lu7N6lwViHxjftTUK5QnymQtjjb13urityxMDE03lmOZYcZvCmf6Dqt79j687H1H8dfneMSob1OMJehvZtgAprkTq/XjTSxq543sqzIDEWBWbTwOOQ7Cxrvu8kfwfR3MkZy5wMd33iGKqIZ1aB4/G3F8V9Fdhwomjtfs3eW3E5qfSeTSqO+XH4k8am4J6H8EtosYyd3qZC6DbdGWM8xt+rDXnSjYCG+gLr2new== X-YMail-OSG: 1TjV8uwVM1nm5vsMdygwyKvQjE7bV4xf2yRwlXNHfyVyDkWt3E4pbbu2HJv3s0R u15HsTEn_iUqWc8GTTRvhx0jIlpjo.N.RX9lmrlRDhGA0XfKgMr05eR2pvinw58RfgsQ6qCOHDGP CJNomg7.gHV0E40OkSEWINyPFwot4XBxtmw83hK.WPKIaeNZLLNXQpf2FzjXTr8ZZDwN7.Xndgrl NKToRlo8pGAvCCBkaJORC4N3TkbsUh_bJs9yHv3NJ0RacNkTzKmZPJKiRHS04_U8XMggD4geO5xp Mv2Ri15.eSoQFV8y7BY1sUB6..N6lw8lsGr0w1pjC.GhBokxxb2gOG9.uaeMfv9zfAqKPuCDAWFG 63t4fY6XwZ2ZPgm_LGWgrLBKZ5hgbBHqG45fbnixQUmoqgvgdlocfZmrOK9V_XrQII5Lu9xIACVM kXc6je2233pNlsIQR5yjK_BnQnCoG79JOEIfXkZbjLIj3LtHM4quqLrVx8GD5.yef7VzFWBultRQ jgbpKRGSQG_ldCx1FdrqyPSQLgMXuki_4LNXRCNzsTU8t5IthgiibJWz0YYlQUKtNwuahVSUaFg9 svaz.hUQJBXrCyAUH1xWAV1uJdsTKESgHeQlyFeA0HAclsPNDzqIcwg.6yD6.jlJPlSUgxTfL04Y 11EMeICACQ1uYimqqxqMWTxsomkXGbUn_sG6dVBpMyyt1r5xkFBncRmDzc.Ox_b7attw4hDFdnYj a9Am5ifPG6q1Xp9Jr7KLk7Muj6zrFJ.26T2fRTFD73gkLBWzAG5Jk73QuRN623.isBuGmMhYvHXG 8TeNdCKEGnK0CwPIyVNSKOyjMHb1_600r2m1Vxk9zA.0hNiS0DCgmsdT_lrNOUR8fyHBBizHCeO_ .JAZghfLGMI00nNcHvA2VQA9Gt0RIZu_h9U_kOZIjrevFRgojjWcM0PV_EddyFxdhJtaUJS03ePq X5Yf_sda3XnWXPlOjj1ixv0A5ZSlllgASpt9ez9Kglx4P9OoLpZLpSj_7eiev9YykhoacwUqhzNp 8GvWFeEloyRjzBoekF3sTz314cB4.7p4rn8gf9EiaTbxCRChMVX2omeiWVNTaNeeQs84ahhzeuue hD2ZrbbORxdAZz098PRWDQsCIB9tO8xd1T662kNqqC_psLFracp5hEuIQEbd82znjf2po6ZAg5gn XGm6sHlLRG8urJFDTgs58Qt3Dz0IFBRlpCnXFilCpU3iFcYetW_u32ELN1F8_YGAreb.0qC7bleX np.OuTofCxRamN4NOHwAliYghpBIXiai6xPO4bGRtnHDXu0QuHh3LhcfFRNShqhxYFxr67Npfl8_ Xgk3QbjEDQpwFHMZh4Oa6YR8P5xsnjJuWPCPRzq5wQQFsrMfff.4WSpKLLlpUlNVE7e7uqdrzGJd RvvGjOKKzVwNEY4RWzSf8orNxfmatK7P35auPPbyx.1pxyFG833cRrCLuoX2KHdjm_pE5FBD651k VACl97mQTZGR3h6V6s.Uqi3BPNBV_Vp95vGkwcE8YeBdAXha3.EIDEFvc0EN_973cayJ.6PhIdLh CYYOOp9GK3hLlSqMImp1ffPexppmDJ35PQy.w2Bt0tfuzticfmPcGUvxA5EJqvHE54VV01vcp0lE EePukUHQLTv5UMnwHsS21kjLWk2IhvDUkh.6V5eZSN5ltPB0kzBmpKZH5OZF6NdwLMeAZUe78cMj dlTCljP3LQ.71CELBNa2jnSA0feD.RioP8S3sxfH1.rm854Z3m8odDfF04.4OVqzLcADScnNAYtF RXEnbp9WBR2yux4H4767zUxuB_TWQcCPLiNvZHIm968YRlk_NNUE9YtRgzH3eM48CwAYCMRFnH4U j4HbfrU1LM8F.Zi52bag6i9JTgOfWvBKgCoPGuWZ2uRWgyYQQ_PGCzYIMkEe88ztPo5bCxHnScj7 AMKNj7LG0hlodsmqYNnZ1aAWPQCCY_IMq343E0kadw_34SgFUOGBVk9kMWcANJGXdJ0ecweHg6Rc Ne.YvV2NARx1x2u65ZgtGcdgr.mF_.uLh4y511IthJsR2ONdgsR.uiz3zf933BrT2TL0IhwJMFMl TFPn0Nz4UomC5mubEw5zNTi43GTnohyySu_CWypq79yot539Ah8TxCS0MR4wAJQxiyx5Mt5s4M9i eX1S1LN2tl10c_DmI9Fvs_uybA9v_lTDkm8xyjsXHKVbDgnKt6BhMTlSuRd1ioi8U6j9y9seU1YV 3ljLvIrBO40KkvHvJeYCCcdGs9Oev0zI6PQ-- X-Sonic-MF: X-Sonic-ID: fb83a143-4dc5-4859-89f0-eab1257c3d0b Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.sg3.yahoo.com with HTTP; Tue, 4 Jul 2023 16:31:17 +0000 Received: by hermes--production-sg3-67fd64777-t6vwt (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID f9117dd229aa0947267aba0e59991f26; Tue, 04 Jul 2023 16:31:15 +0000 (UTC) Date: Tue, 4 Jul 2023 23:31:09 +0700 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: <61a27ed52288bab9945aa256a1193e6956b60616.1688488273.git.poomklao@yahoo.com> References: <61a27ed52288bab9945aa256a1193e6956b60616.1688488273.git.poomklao@yahoo.com> 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: , Reply-to: Parnikkapore X-ACL-Warn: , Parnikkapore via Guix-patches X-Patchwork-Original-From: Parnikkapore via Guix-patches via From: Parnikkapore 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/messaging.scm (gajim): Update to 1.7.3. [arguments]: Switch to "python -m build". To use pyproject-build-system, support for backend-path is needed. [arguments]: Add metadata build and install phase. [arguments]: Switch to "python -m unittest" as test method, following upstream recommendation. [arguments]: Generate gdk-pixbuf cache and include result in wrapper. Allows Gajim to run in pure environments. [native-search-paths]: Update. --- gnu/packages/messaging.scm | 62 +++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1b721e8f8e..8fc4c48e47 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1126,7 +1126,7 @@ (define-public python-nbxmpp (define-public gajim (package (name "gajim") - (version "1.4.7") + (version "1.7.3") (source (origin (method url-fetch) @@ -1135,7 +1135,7 @@ (define-public gajim (version-major+minor version) "/gajim-" version ".tar.gz")) (sha256 - (base32 "1ww46qlxr14nq0ka8wsf8qpn5qfi5dvgyksfh9411crl7azhfj0s")) + (base32 "066kvkjw3qcdanr3nczy0wgcwihk9jc9zhzfr5bwlqvcyxcv7k5p")) (patches (search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch")))) (build-system python-build-system) (arguments @@ -1148,13 +1148,27 @@ (define-public gajim #:prefix glib-or-gtk:) (guix build utils)) #:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-failing-tests + ,#~(modify-phases %standard-phases + (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file + (assoc-ref glib-or-gtk:%standard-phases + 'generate-gdk-pixbuf-loaders-cache-file)) + (add-before 'build 'build-metadata (lambda _ - ;; XXX Gajim builds fine on some (my) machines but fails elsewhere: - ;; ModuleNotFoundError: No module named 'gajim.gui.emoji_data' - ;; https://dev.gajim.org/gajim/gajim/-/issues/11041 - (delete-file "test/no_gui/test_styling.py"))) + (invoke "./pep517build/build_metadata.py" "-o" "dist/metadata"))) + ;; TODO: Change to pyproject-build-system once it supports + ;; in-tree build backends. + (replace 'build + (lambda _ + (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) + (replace 'install + (lambda _ + (apply invoke "pip" "--no-cache-dir" "--no-input" + "install" "--no-deps" "--prefix" #$output + (find-files "dist" "\\.whl$")))) + (add-after 'install 'install-metadata + (lambda _ + (invoke "./pep517build/install_metadata.py" "dist/metadata" + (string-append "--prefix=" #$output)))) (replace 'check (lambda _ ;; Tests require a running X server. @@ -1162,27 +1176,24 @@ (define-public gajim (setenv "DISPLAY" ":1") ;; For missing '/etc/machine-id'. (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "python" "./setup.py" "test"))) - ;; Loading gajim_remote require running session bus, - ;; which in-turn requires running elogind for XDG_RUNTIME_DIR; - ;; neither of which are possible inside build environment. - (delete 'sanity-check) + (invoke "dbus-launch" "python" "-m" "unittest" "discover" "-s" "test"))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'install 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) (add-after 'install 'wrap-env - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each - (lambda (name) - (let ((file (string-append out "/bin/" name)) - (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")) - (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) - (wrap-program file - `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)) - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))) - '("gajim" "gajim-remote")))))))) + (lambda _ + (for-each + (lambda (name) + (let ((file (string-append #$output "/bin/" name)) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (pixbuf-module-file (getenv "GDK_PIXBUF_MODULE_FILE"))) + (wrap-program file + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)) + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) + `("GDK_PIXBUF_MODULE_FILE" = (,pixbuf-module-file))))) + '("gajim" "gajim-remote"))))))) (native-search-paths (list (search-path-specification @@ -1201,7 +1212,7 @@ (define-public gajim ;; FIXME: Cannot use this expression as it would ;; introduce a circular dependency at the top level. ;; (version-major+minor (package-version python)) - "3.9" + "3.10" "/site-packages")))))) (native-inputs (list gettext-minimal @@ -1209,6 +1220,7 @@ (define-public gajim gobject-introspection `(,gtk+ "bin") python-distutils-extra + python-pypa-build python-setuptools xorg-server-for-tests)) (inputs