From patchwork Sun Mar 7 08:19:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 27479 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 8D58F27BC51; Sun, 7 Mar 2021 08:20:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C8F8427BC50 for ; Sun, 7 Mar 2021 08:20:09 +0000 (GMT) Received: from localhost ([::1]:42170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lIoe1-0004wd-0m for patchwork@mira.cbaines.net; Sun, 07 Mar 2021 03:20:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIodu-0004wI-5J for guix-patches@gnu.org; Sun, 07 Mar 2021 03:20:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55557) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lIodt-0007eu-US for guix-patches@gnu.org; Sun, 07 Mar 2021 03:20:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lIodt-0004Sf-O3 for guix-patches@gnu.org; Sun, 07 Mar 2021 03:20:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46985] Psi+ Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Mar 2021 08:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46985 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 46985@debbugs.gnu.org Cc: Danny Milosavljevic X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161510517217107 (code B ref -1); Sun, 07 Mar 2021 08:20:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Mar 2021 08:19:32 +0000 Received: from localhost ([127.0.0.1]:38870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lIodM-0004Rn-2S for submit@debbugs.gnu.org; Sun, 07 Mar 2021 03:19:32 -0500 Received: from lists.gnu.org ([209.51.188.17]:43136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lIodK-0004Rf-CV for submit@debbugs.gnu.org; Sun, 07 Mar 2021 03:19:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIodJ-0004f7-Mu for guix-patches@gnu.org; Sun, 07 Mar 2021 03:19:26 -0500 Received: from out1.migadu.com ([2001:41d0:2:863f::]:22152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIodF-0007Sg-0d for guix-patches@gnu.org; Sun, 07 Mar 2021 03:19:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1615105156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=/TQmPZSSWGVfLIYXVtEF2gmcH234cp39rFkQy3x3lxg=; b=lvUUSs/LL/m2eYL/AsgRiaYbVJOdw9nR5Jp2sLsxWFskPQlX0+0JyysejhP+TpYzmtpAzv zNXRIQaucdkiEFLbPS4egfxkasCWIxntCK6KmBOUdvamAmYK83o0QgGRBRCfBTFC2XyZOf Z/mV6af63x2oCemvNT8fMdH5PE+d3L+h37CF1zd50ZeHOXurPzeGfC94pOUiYui2mua5k8 XyZUGhY1gU7KFLHex68kGYRfJoNCBo0NjObS8+mdaXduJGJZAd9m440cjLV0gSHDesIjyH s66mkx9M5YugxlnFGmqjPlRPCB/OXXIwJaLZeinBDm/7A6TD6eny61GfX1k8/g== X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. Message-ID: <80a32f2e-465b-b420-4d76-d14fb9dbdf65@raghavgururajan.name> Date: Sun, 7 Mar 2021 03:19:15 -0500 MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name Received-SPF: pass client-ip=2001:41d0:2:863f::; envelope-from=rg@raghavgururajan.name; helo=out1.migadu.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_OTHER_BAD_TLD=1.651, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches Hello Guix! Please find the attached patch-set to add Psi+ (fork of Psi), a Qt-based XMPP Client, to Guix. Thank you! Regards, RG. From 38f17832c3841e584af6cd973ea179e9c6c465d9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 7 Mar 2021 01:47:19 -0500 Subject: [PATCH 4/4] gnu: Add psi-plus. * gnu/packages/messaging.scm (psi-plus): New variable. --- gnu/packages/messaging.scm | 135 +++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 6c40545fd5..039ec52c15 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2775,4 +2775,139 @@ as phones, embedded computers or microcontrollers.") ;; Dual licensed. (license (list license:epl1.0 license:edl1.0)))) +(define-public psi-plus + (package + (name "psi-plus") + (version "1.5.1482") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/psi-plus/psi-plus-snapshots") + (commit version))) + (file-name + (git-file-name name version)) + (modules '((guix build utils))) + (snippet + `(begin + (delete-file-recursively "3rdparty"))) + (sha256 + (base32 "0lcx616hchwf492m1dm8ddb4qd2pmgf703ajnnb0y9ky99kgg8q2")))) + (build-system qt-build-system) + (arguments + `(#:tests? #f ; No target + #:imported-modules + (,@%qt-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules + ((guix build qt-build-system) + ((guix build glib-or-gtk-build-system) + #:prefix glib-or-gtk:) + (guix build utils)) + #:configure-flags + (list + "-DBUILD_PSIMEDIA=ON" ; For A/V support + "-DENABLE_PLUGINS=ON" + "-DUSE_HUNSPELL=OFF" ; Use Enchant instead + "-DUSE_ENCHANT=ON" + "-DUSE_CCACHE=OFF") ; Not required + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "CMakeLists.txt" + (("\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty/http-parser/http_parser.h") + "") + (("\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty/qhttp/qhttp.pro") + "") + (("\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty/qite/qite.pro") + "") + (("add_subdirectory\\( 3rdparty \\)") + "")) + (substitute* "src/CMakeLists.txt" + (("\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty/qite/libqite") + "") + (("\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty/http-parser") + "") + (("\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty/qhttp/src/private") + "") + (("\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty/qhttp/src") + "") + (("\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty") + "") + (("add_dependencies\\(\\$\\{PROJECT_NAME\\} qhttp\\)") + "target_link_libraries(${PROJECT_NAME} qhttp)")) + (substitute* "src/src.cmake" + (("include\\(\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty/qite/libqite/libqite.cmake\\)") + "list(APPEND EXTRA_LIBS qite)")) + (substitute* '("src/filesharingmanager.h" "src/widgets/psirichtext.cpp" + "src/filesharingmanager.cpp" "src/widgets/psitextview.cpp" + "src/chatview_te.cpp" "src/msgmle.cpp") + (("qite.h") + "qite/qite.h") + (("qiteaudio.h") + "qite/qiteaudio.h") + (("qiteaudiorecorder.h") + "qite/qiteaudiorecorder.h")) + #t)) + (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))))) + '("psi-plus"))) + #t)) + (add-after 'wrap-env 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("ruby" ,ruby))) + (inputs + `(("blake2" ,libb2) + ("dbus" ,dbus) + ("enchant" ,enchant) + ("glib" ,glib) + ("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) + ("http-parser" ,http-parser) + ("libgcrypt" ,libgcrypt) + ("libgpg-error" ,libgpg-error) + ("libidn" ,libidn) + ("libotr" ,libotr) + ("libsignal-protocol-c" ,libsignal-protocol-c) + ("libtidy" ,tidy-html) + ("openssl" ,openssl) + ("qca" ,qca) + ("qhttp" ,qhttp) + ("qite" ,qite) + ("qtbase" ,qtbase) + ("qtkeychain" ,qtkeychain) + ("qtmultimedia" ,qtmultimedia) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras) + ("usrsctp" ,usrsctp) + ("x11" ,libx11) + ("xext" ,libxext) + ("xcb" ,libxcb) + ("xss" ,libxscrnsaver) + ("zlib" ,zlib))) + (synopsis "Qt-based XMPP Client") + (description "Psi+ is a spin-off of Psi XMPP client. It is a cross-platform +powerful XMPP client designed for experienced users.") + (home-page "https://psi-plus.com/") + (license license:gpl2+))) + ;;; messaging.scm ends here -- 2.30.1