From patchwork Thu May 1 18:43:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 42230 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 4795627BC4A; Thu, 1 May 2025 19:44:36 +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=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED 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 61FBC27BC49 for ; Thu, 1 May 2025 19:44:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYtC-0003M3-A0; Thu, 01 May 2025 14:44: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 1uAYt9-0003LK-IP for guix-patches@gnu.org; Thu, 01 May 2025 14:44:04 -0400 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 1uAYt9-0000zx-8v for guix-patches@gnu.org; Thu, 01 May 2025 14:44:03 -0400 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=MGIWKoVZRMgm6BDh9Oll+c4JZvnDZlaB9jjJHbUvicY=; b=FcA7EuLxe90032qU6sfIO21pWLk4vuehrJPu48sgNyVTDBTH1YkUG9D0tE5sbgta0ZvwXHREMeQqShQpBTJtgzyazw6OcgIpce67vWklDlT7ggmv1xreJkEfNB7PCkF3ngfaiLU97KjlruVW1zfXhVhKRE8lsmzfe/Zv7UnST3zqUHme/YdU/Lb56FfCV1uSshlVpo+VHu0NB14+3ifxPVthflFwjFZ+vgIu7GPgYXB4Z2yUYXP9INPD8U/2kC8vYuFfOfH+w/5QMy2yDH3Sqbb0Z+u0yc47BL9QkZ2dLv0w96vL0MRl5BhmyBh+R/h3hATRGUWLjkE/CKaP6JrnXA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uAYt8-00049B-My; Thu, 01 May 2025 14:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78198] [PATCH 2/3] gnu: Remove kdelibs4support. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: sughosha@disroot.org, z572@z572.online, guix-patches@gnu.org Resent-Date: Thu, 01 May 2025 18:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78198 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78198@debbugs.gnu.org Cc: Sughosha , Zheng Junjie X-Debbugs-Original-Xcc: Sughosha , Zheng Junjie Received: via spool by 78198-submit@debbugs.gnu.org id=B78198.174612503515900 (code B ref 78198); Thu, 01 May 2025 18:44:02 +0000 Received: (at 78198) by debbugs.gnu.org; 1 May 2025 18:43:55 +0000 Received: from localhost ([127.0.0.1]:53208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uAYt0-00048M-Af for submit@debbugs.gnu.org; Thu, 01 May 2025 14:43:54 -0400 Received: from mail.z572.online ([88.99.160.180]:36052) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uAYsw-00047q-Sw for 78198@debbugs.gnu.org; Thu, 01 May 2025 14:43:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me; t=1746125438; 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=MGIWKoVZRMgm6BDh9Oll+c4JZvnDZlaB9jjJHbUvicY=; b=ConkXLgUDMU6u2Wos4bk1u1EtN/DE3mDmEN1cswZxyH98mJ0QoZ2AB932ya3q84vN/lAni gG4Krxik+JUuj0aA68tkzjoBpu1NJ2YURCe816wlkR+CUj0FaVWeRbJhts79YL4VOayosy qXGuaiIac9jxrorZRVKBTv8KI5GEO7c= Received: from m.tailaa68d.ts.net (mail1.85362086.com [107.174.64.25]) by mail.z572.online (OpenSMTPD) with ESMTPSA id 1c40b197 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <78198@debbugs.gnu.org>; Thu, 1 May 2025 18:50:37 +0000 (UTC) From: Zheng Junjie Date: Fri, 2 May 2025 02:43:37 +0800 Message-ID: X-Mailer: git-send-email 2.49.0 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/kde-frameworks.scm (kdelibs4support): Delete variable. Change-Id: I7e68e6bec9ac0fbdecde53a3bde8e18c0cd81af1 --- gnu/packages/kde-frameworks.scm | 125 -------------------------------- 1 file changed, 125 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index b3dec5f4aa4..069b3e14c72 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -5334,131 +5334,6 @@ (define-public kde-frameworkintegration ;; from kdelibs 4 to KDE Frameworks 5. Code should aim to port away from this ;; framework, new projects should avoid using these libraries. -(define-public kdelibs4support - (package - (name "kdelibs4support") - (version "5.114.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://kde/stable/frameworks/" - (version-major+minor version) "/portingAids/" - name "-" version ".tar.xz")) - (sha256 - (base32 "17473him2fjfcw5f88diarqac815wsakfyb9fka82a4qqh9l41mc")) - (modules '((guix build utils))) - (snippet - '(substitute* "autotests/kmimetypetest.cpp" - ;; Adjust the test for shared-mime-info changes: - ;; https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/202 - ;; https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/255 - (("empty document") "Empty document") - (("Bzip archive") "Bzip2 archive") - (("<< \"application/x-bzip") "<< \"application/x-bzip2"))))) - (build-system cmake-build-system) - (native-inputs - (list dbus - docbook-xml-4.4 ; optional - extra-cmake-modules - kdoctools - perl - perl-uri - pkg-config - qttools - shared-mime-info - kjobwidgets ;; required for running the tests - strace - tzdata-for-tests)) - (propagated-inputs - ;; These are required to be installed along with this package, see - ;; lib64/cmake/KF5KDELibs4Support/KF5KDELibs4SupportConfig.cmake - (list karchive - kauth - kconfigwidgets - kcoreaddons - kcrash - kdbusaddons - kdesignerplugin - kdoctools - kemoticons - kguiaddons - kiconthemes - kinit - kitemmodels - knotifications - kparts - ktextwidgets - kunitconversion - kwindowsystem - qtbase-5)) - (inputs - (list kcompletion - kconfig - kded - kglobalaccel - ki18n - kio - kservice - kwidgetsaddons - kxmlgui - libsm - networkmanager-qt - openssl - qtsvg-5 - qttools-5 - qtx11extras)) - ;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and - ;; share/kf5/kssl/ca-bundle.crt - ;; TODO: NixOS has nix-kde-include-dir.patch to change std-dir "include" - ;; into "@dev@/include/". Think about whether this is needed for us, too. - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-cmake-to-find-docbook - (lambda _ - (substitute* "cmake/FindDocBookXML4.cmake" - (("^.*xml/docbook/schema/dtd.*$") - "xml/dtd/docbook\n")))) - (delete 'check) - (add-after 'install 'check-post-install - (lambda* (#:key inputs tests? #:allow-other-keys) - (setenv "HOME" (getcwd)) - (setenv "TZDIR" ; KDateTimeTestsome needs TZDIR - (search-input-directory inputs - "share/zoneinfo")) - ;; Make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - ;; enable debug output - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; enable debug output - (setenv "DBUS_FATAL_WARNINGS" "0") - ;; Make kstandarddirstest pass (see https://bugs.kde.org/381098) - (mkdir-p ".kde-unit-test/xdg/config") - (with-output-to-file ".kde-unit-test/xdg/config/foorc" - (lambda () #t)) ;; simply touch the file - ;; Blacklist a test-function (failing at build.kde.org, too). - (with-output-to-file "autotests/BLACKLIST" - (lambda _ - (display "[testSmb]\n*\n"))) - (invoke "dbus-launch" "ctest" - "-E" "kstandarddirstest")))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "KDE Frameworks 5 porting aid from KDELibs4") - (description "This framework provides code and utilities to ease the -transition from kdelibs 4 to KDE Frameworks 5. This includes CMake macros and -C++ classes whose functionality has been replaced by code in CMake, Qt and -other frameworks. - -Code should aim to port away from this framework eventually. The API -documentation of the classes in this framework and the notes at -http://community.kde.org/Frameworks/Porting_Notes should help with this.") - ;; Most files are distributed under LGPL2+, but the package includes code - ;; under a variety of licenses. - (license (list license:lgpl2.1+ license:lgpl2.0 license:lgpl2.0+ - license:gpl2 license:gpl2+ - license:expat license:bsd-2 license:bsd-3 - license:public-domain)))) - (define-public khtml (package (name "khtml")