From unknown Mon Jun 23 15:00:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45704] [PATCH] gnu: Remove QT 4. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Jan 2021 20:00:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45704 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45704@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16099631466556 (code B ref -1); Wed, 06 Jan 2021 20:00:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jan 2021 19:59:06 +0000 Received: from localhost ([127.0.0.1]:45640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kxExW-0001hg-EO for submit@debbugs.gnu.org; Wed, 06 Jan 2021 14:59:06 -0500 Received: from lists.gnu.org ([209.51.188.17]:46930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kxExU-0001hY-EF for submit@debbugs.gnu.org; Wed, 06 Jan 2021 14:59:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxExU-00006P-4k for guix-patches@gnu.org; Wed, 06 Jan 2021 14:59:04 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:51821) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxExM-0004Wo-Ll for guix-patches@gnu.org; Wed, 06 Jan 2021 14:59:00 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id CF46A5C00ED; Wed, 6 Jan 2021 14:58:55 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Wed, 06 Jan 2021 14:58:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=mesmtp; bh=mM2y9awmNVYKXXNvLx+wl47 VhJahCE/YlNePi7AcCBk=; b=omAG4aMSu6mSktVTcFraZLSmb12t4CU4hI9MAyR 9NNG6HGJ5826fv5lAOY+WjRrAP7MdmNESBVwgVc759twrBbFv7vbEXIbFk9k1eoU /rSt5GOCpyyPsPrBDWRcBf+ETabIoHbsFPrOTtwGOLPCoYsoTiC/G4B5y/Tc42oX bJGQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=mM2y9a wmNVYKXXNvLx+wl47VhJahCE/YlNePi7AcCBk=; b=m/322amN2+M4Bb6jqfGywO WimpB7pptAnVtl6yp5HYI91QpmfLbqhtYZk9PQeZU0SjFCa1rdLzR4aiT5hYnriQ ObcCGuBPvCuHGoEvc62HWHWfj7dQ8T5Rn2twi/JmrNFybzJqZHlLo96zQ9oDCKEY izNfub4Lyneu9uvvVWkZ5QhzqHjT2zZk0YI4IR2AVV31mIPtImilHWucihk8JHho 8p+8dVQtWznrD/gktLZsgCW7L2f+mQCvpTdHiyhH1srobV9esqrzhchZIbyf725f bsjQT97VSdKR7wNPNob8M/F8G3k/RSrj4osz7GgiFoGgHScAJxkEjEyEfqJ+zt/A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvdegtddgfeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucgoufhushhpvggtthffohhmrghinhculdegledmne gfrhhlucfvnfffucdlhedmnecujfgurhephffvufffkffogggtgfesthhqredtredtjeen ucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrg hmvgeqnecuggftrfgrthhtvghrnhepieevtefgudetudfffeeigedukedugeehudefkedu hfffgfehvdekheelueehgeetnecuffhomhgrihhnpehgnhhurdhorhhgpdhgihhthhhusg drtghomhdprghvohhgrggurhhordgttgdpthhiphhpuddtrdgtohhmpdhsohhurhgtvghf ohhrghgvrdhnvghtpdhgihhthhhusgdrihhopdgsihhtmhgvshhsrghgvgdrohhrghdpkh gvvghprghsshigrdhorhhgpdguvggsihgrnhdrnhgvthdpqhhtqdhprhhojhgvtghtrdho rhhgpdhqthdrihhonecukfhppeejfedrudeguddruddvjedrudegieenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghr ihdrnhgrmhgv X-ME-Proxy: Received: from jasmine.lan (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id 0D7E21080059 for ; Wed, 6 Jan 2021 14:58:55 -0500 (EST) From: Leo Famulari Date: Wed, 6 Jan 2021 14:58:37 -0500 Message-Id: X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=66.111.4.25; envelope-from=leo@famulari.name; helo=out1-smtp.messagingengine.com X-Spam_score_int: -7 X-Spam_score: -0.8 X-Spam_bar: / X-Spam_report: (-0.8 / 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.999, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" This package has been unsupported upstream for several years: https://lists.gnu.org/archive/html/guix-devel/2016-02/msg00596.html I suggest we apply this patch as part of a major update =E2=80=94 either a = core-updates merge, or a new release. We should notify the people who contributed or maintained the affected pack= ages so that they have ample time to update the packages and avoid their removal. What do you think? * gnu/packages/qt.scm (qt-4, python2-pyqt-4): Remove variables. * gnu/packages/chemistry.scm (avogadro): Remove variable. * gnu/packages/education.scm (tipp10): Remove variable. * gnu/packages/engineering.scm (qucs, qucs-s): Remove variables. * gnu/packages/messaging.scm (pybitmessage): Remove variable. * gnu/packages/password-utils.scm (keepassx): Remove variable. * gnu/packages/pdf.scm (poppler-qt4): Remove variable. * gnu/packages/patches/avogadro-boost148.patch, gnu/packages/patches/avogadro-eigen3-update.patch, gnu/packages/patches/avogadro-python-eigen-lib.patch, gnu/packages/patches/tipp10-fix-compiling.patch, gnu/packages/patches/tipp10-remove-license-code.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 5 - gnu/packages/chemistry.scm | 85 --- gnu/packages/education.scm | 53 -- gnu/packages/engineering.scm | 250 -------- gnu/packages/messaging.scm | 93 --- gnu/packages/password-utils.scm | 31 - gnu/packages/patches/avogadro-boost148.patch | 69 -- .../patches/avogadro-eigen3-update.patch | 603 ------------------ .../patches/avogadro-python-eigen-lib.patch | 161 ----- .../patches/tipp10-fix-compiling.patch | 212 ------ .../patches/tipp10-remove-license-code.patch | 332 ---------- gnu/packages/pdf.scm | 7 - gnu/packages/qt.scm | 251 -------- 13 files changed, 2152 deletions(-) delete mode 100644 gnu/packages/patches/avogadro-boost148.patch delete mode 100644 gnu/packages/patches/avogadro-eigen3-update.patch delete mode 100644 gnu/packages/patches/avogadro-python-eigen-lib.patch delete mode 100644 gnu/packages/patches/tipp10-fix-compiling.patch delete mode 100644 gnu/packages/patches/tipp10-remove-license-code.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1151d4642e..0a03a4e3a7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -820,9 +820,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/audiofile-function-signature.patch \ %D%/packages/patches/automake-skip-amhello-tests.patch \ %D%/packages/patches/avahi-localstatedir.patch \ - %D%/packages/patches/avogadro-boost148.patch \ - %D%/packages/patches/avogadro-eigen3-update.patch \ - %D%/packages/patches/avogadro-python-eigen-lib.patch \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ @@ -1663,8 +1660,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/thefuck-test-environ.patch \ %D%/packages/patches/tidy-CVE-2015-5522+5523.patch \ %D%/packages/patches/tinyxml-use-stl.patch \ - %D%/packages/patches/tipp10-fix-compiling.patch \ - %D%/packages/patches/tipp10-remove-license-code.patch \ %D%/packages/patches/tk-find-library.patch \ %D%/packages/patches/transcode-ffmpeg.patch \ %D%/packages/patches/transmission-honor-localedir.patch \ diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index ddbf5ca098..4f79ce29e6 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -49,91 +49,6 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python)) =20 -(define-public avogadro - (package - (name "avogadro") - (version "1.2.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cryos/avogadro") - (commit version))) - (sha256 - (base32 "0258py3lkba85qhs5ynancinyym61vlp0zaq9yrfs3hhnhpzv9n2")) - (file-name (git-file-name name version)) - (patches - (search-patches "avogadro-eigen3-update.patch" - "avogadro-python-eigen-lib.patch" - "avogadro-boost148.patch")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f - #:configure-flags - (list "-DENABLE_GLSL=3DON" - (string-append "-DPYTHON_LIBRARIES=3D" - (assoc-ref %build-inputs "python") - "/lib") - (string-append "-DPYTHON_INCLUDE_DIRS=3D" - (assoc-ref %build-inputs "python") - "/include/python" - ,(version-major+minor - (package-version python)))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-python-lib-path - (lambda* (#:key outputs #:allow-other-keys) - ;; This is necessary to install the Python module in the corr= ect - ;; directory. - (substitute* "libavogadro/src/python/CMakeLists.txt" - (("^EXECUTE_PROCESS.*$") "") - (("^.*from sys import stdout.*$") "") - (("^.*OUTPUT_VARIABLE.*") - (string-append "set(PYTHON_LIB_PATH \"" - (assoc-ref outputs "out") - "/lib/python" - ,(version-major+minor - (package-version python)) - "/site-packages\")"))) - #t)) - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Make sure 'avogadro' runs with the correct PYTHONPATH. - (let* ((out (assoc-ref outputs "out"))) - (setenv "PYTHONPATH" - (string-append - (assoc-ref outputs "out") - "/lib/python" - ,(version-major+minor - (package-version python)) - "/site-packages:" - (getenv "PYTHONPATH"))) - (wrap-program (string-append out "/bin/avogadro") - `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))) - #t))))) - (native-inputs - `(("doxygen" ,doxygen) - ("pkg-config" ,pkg-config))) - (inputs - `(("boost" ,boost) - ("eigen" ,eigen) - ("glew" ,glew) - ("openbabel" ,openbabel) - ("python" ,python-2) - ("python-numpy" ,python2-numpy) - ("python-pyqt" ,python2-pyqt-4) - ("python-sip" ,python2-sip) - ("qt" ,qt-4) - ("zlib" ,zlib))) - (home-page "https://avogadro.cc") - (synopsis "Advanced molecule editor") - (description - "Avogadro is an advanced molecule editor and visualizer designed for = use -in computational chemistry, molecular modeling, bioinformatics, materials -science, and related areas. It offers flexible high quality rendering and= a -powerful plugin architecture.") - (license license:gpl2+))) - (define-public domainfinder (package (name "domainfinder") diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 07862291a7..f212b22ba3 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -217,59 +217,6 @@ Currently available boards include: (license (list license:silofl1.1 ; bundled fonts license:gpl3+)))) =20 -(define-public tipp10 - (package - (name "tipp10") - (version "2.1.0") - (source (origin - (method url-fetch) - ;; guix download is not able to handle the download links on= the - ;; home-page, which use '' - (uri (string-append "mirror://debian/pool/main/" - "t/tipp10/tipp10_2.1.0.orig.tar.gz")) - (sha256 - (base32 - "0d387b404j88gsv6kv0rb7wxr23v5g5vl6s5l7602x8pxf7slbbx")) - (patches (search-patches "tipp10-fix-compiling.patch" - "tipp10-remove-license-code.patch")= ))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; packages has no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-new-version-check - (lambda _ - ;; Make new version check to default to false. - ;; TODO: Remove the checkbox from the dialog and the check it= self - (substitute* '("widget/settingspages.cpp" "widget/mainwindow.= cpp") - (("settings.value(\"check_new_version\", true)") - "settings.value(\"check_new_version\", false)")) - #t)) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; Make program honor $PREFIX - (substitute* "tipp10.pro" - (("\\.path =3D /usr/") (string-append ".path =3D " out "/= "))) - (substitute* "def/defines.h" - (("\"/usr/") (string-append "\"" out "/"))) - ;; Recreate Makefile - (invoke "qmake"))))))) - (inputs - `(("qt4" ,qt-4) - ("sqlite" ,sqlite))) - (home-page "https://www.tipp10.com/") - (synopsis "Touch typing tutor") - (description "Tipp10 is a touch typing tutor. The ingenious thing abo= ut -the software is its intelligence feature: characters that are mistyped are -repeated more frequently. Beginners will find their way around right away= so -they can start practicing without a hitch. - -Useful support functions and an extensive progress tracker, topical lessons -and the ability to create your own practice lessons make learning to type -easy.") - (license license:gpl2))) - (define-public snap (package (name "snap") diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5166a4635c..b80a946bab 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1986,256 +1986,6 @@ parallel computing platforms. It also supports ser= ial execution.") (license (list license:gpl2+ license:lgpl2.0+)))) ; freehdl's libraries =20 -(define-public qucs - ;; Qucs 0.0.19 segfaults when using glibc-2.26. Temporarily build from g= it. - ;; TODO: When qucs-0.0.20 is released, revert the commit that introduced= this - ;; comment and update the package. - (let ((commit "b4f27d9222568066cd59e4c387c51a35056c99d8") - (revision "0")) - (package - (name "qucs") - (version (git-version "0.0.19" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Qucs/qucs") - (commit commit))) - (sha256 - (base32 "10bclay9xhkffmsh4j4l28kj1qpxx0pnxja5vx6305cllnq4= r3gb")) - (file-name (string-append name "-" version "-checkout")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'patch-bootstrap - (lambda _ - (for-each patch-shebang - '("bootstrap" - "qucs/bootstrap" - "qucs-doc/bootstrap" - "qucs-core/bootstrap")) - #t)) - (add-before 'configure 'patch-configure - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "qucs/configure" - (("\\$QTDIR") (assoc-ref inputs "qt4"))) - #t)) - (add-after 'patch-configure 'patch-scripts - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* '("qucs/qucs/qucsdigi" - "qucs/qucs/qucsdigilib" - "qucs/qucs/qucsveri") - (("\\$BINDIR") - (string-append (assoc-ref outputs "out") "/bin")) - (("freehdl-config") - (string-append (assoc-ref inputs "freehdl") "/bin/freehd= l-config")) - (("freehdl-v2cc") - (string-append (assoc-ref inputs "freehdl") "/bin/freehd= l-v2cc")) - (("cp ") - (string-append (assoc-ref inputs "coreutils") "/bin/cp "= )) - (("glibtool") - (string-append (assoc-ref inputs "libtool") "/bin/libtoo= l")) - (("sed") - (string-append (assoc-ref inputs "sed") "/bin/sed")) - (("iverilog") - (string-append (assoc-ref inputs "iverilog") "/bin/iveri= log")) - (("vvp") - (string-append (assoc-ref inputs "iverilog") "/bin/vvp")= )) - #t)) - (add-before 'check 'pre-check - (lambda _ - ;; The test suite requires a running X server. - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - #t)) - (add-after 'install 'make-wrapper - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; 'qucs' directly invokes gcc, hence this wrapping. - (wrap-program (string-append out "/bin/qucs") - `("CPLUS_INCLUDE_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/include"))) - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/bin"))) - `("LIBRARY_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/lib"))) - `("ADMSXMLBINDIR" ":" prefix - (,(string-append (assoc-ref inputs "adms") "/bin"))) - `("ASCOBINDIR" ":" prefix - (,(string-append (assoc-ref inputs "asco") "/bin"))) - `("QUCS_OCTAVE" ":" prefix - (,(string-append (assoc-ref inputs "octave") "/bin/oc= tave"))))) - #t))) - #:parallel-build? #f ; race condition - #:configure-flags '("--disable-doc"))) ; we need octave-epstk - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("bison" ,bison) - ("flex" ,flex) - ("gperf" ,gperf) - ("libtool-native" ,libtool) - ("pkg-config" ,pkg-config) - ("python" ,python-2) ; for tests - ("matplotlib" ,python2-matplotlib) ; for tests - ("numpy" ,python2-numpy) ; for tests - ("xorg-server" ,xorg-server-for-tests))) ; for tests - (inputs - `(("adms" ,adms) - ("asco" ,asco) - ("coreutils" ,coreutils) - ("freehdl" ,freehdl) - ("gcc-toolchain" ,gcc-toolchain) - ("iverilog" ,iverilog) - ("libtool" ,libtool) - ("octave" ,octave-cli) - ("qt4" ,qt-4) - ("sed" ,sed))) - (home-page "http://qucs.sourceforge.net/") - (synopsis "Circuit simulator with graphical user interface") - (description - "Qucs is a circuit simulator with graphical user interface. The so= ftware -aims to support all kinds of circuit simulation types---e.g. DC, AC, -S-parameter, transient, noise and harmonic balance analysis. Pure digital -simulations are also supported.") - (license license:gpl2+)))) - -(define-public qucs-s - (package - (name "qucs-s") - (version "0.0.21") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ra3xdh/qucs_s/archiv= e/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "12m1jwhb9qwvb141qzyskbxnw3wn1x22d02z4b4862p7xvccl5h7")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-scripts - (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("qucs/qucsdigi" - "qucs/qucsdigilib" - "qucs/qucsveri") - (("\\$BINDIR") - (string-append (assoc-ref inputs "qucs") "/bin")) - (("freehdl-config") - (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-= config")) - (("freehdl-v2cc") - (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-= v2cc")) - (("cp ") - (string-append (assoc-ref inputs "coreutils") "/bin/cp ")) - (("glibtool") - (string-append (assoc-ref inputs "libtool") "/bin/libtool"= )) - (("sed") - (string-append (assoc-ref inputs "sed") "/bin/sed")) - (("iverilog") - (string-append (assoc-ref inputs "iverilog") "/bin/iverilo= g")) - (("vvp") - (string-append (assoc-ref inputs "iverilog") "/bin/vvp"))) - #t)) - (add-after 'patch-scripts 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "qucs/main.cpp" - (((string-append "QucsSettings\\.Qucsator =3D QucsSettings\= \.BinDir " - "\\+ \"qucsator\" \\+ executableSuffix")) - (string-append "}{ QucsSettings.Qucsator =3D \"" - (assoc-ref inputs "qucs") "/bin/qucsator\""= )) - (((string-append "QucsSettings\\.XyceExecutable =3D " - "\"/usr/local/Xyce-Release-6.8.0-OPENSOURC= E/bin/Xyce")) - (string-append "}{ QucsSettings.XyceExecutable =3D \"" - (assoc-ref inputs "xyce-serial") "/bin/Xyce= ")) - (((string-append "else QucsSettings\\.XyceParExecutable =3D= " - "\"mpirun -np %p /usr/local" - "/Xyce-Release-6.8.0-OPENMPI-OPENSOURCE/bi= n/Xyce")) - (string-append "QucsSettings.XyceParExecutable =3D \"" - (assoc-ref inputs "mpi") "/bin/mpirun -np %= p " - (assoc-ref inputs "xyce-parallel") "/bin/Xy= ce")) - (("else QucsSettings\\.NgspiceExecutable =3D \"ngspice\"") - (string-append "QucsSettings.NgspiceExecutable =3D " "\"" - (assoc-ref inputs "ngspice") "/bin/ngspice\= ""))) - (substitute* "qucs/extsimkernels/ngspice.cpp" - (("share/qucs/xspice_cmlib") "share/qucs-s/xspice_cmlib")) - (substitute* "qucs/qucs_actions.cpp" - (("qucstrans") - (string-append (assoc-ref inputs "qucs") "/bin/qucstrans")) - (("qucsattenuator") - (string-append (assoc-ref inputs "qucs") "/bin/qucsattenua= tor")) - (("qucsrescodes") - (string-append (assoc-ref inputs "qucs") "/bin/qucsrescode= s"))) - #t)) - (add-after 'install 'install-scripts - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each - (lambda (script) - (let ((file (string-append "../qucs_s-" ,version - "/qucs/" script)) - (out (assoc-ref outputs "out"))) - (install-file file (string-append out "/bin")) - (chmod (string-append out "/bin/" script) #o555))) - '("qucsdigi" "qucsdigilib" "qucsveri")) - #t)) - (add-after 'install-scripts 'make-wrapper - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (file (string-append out "/bin/qucs-s")) - (qucs (assoc-ref inputs "qucs")) - (qucsator (string-append qucs "/bin/qucsator"))) - (wrap-program file - `("CPLUS_INCLUDE_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/include"))) - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/bin"))) - `("LIBRARY_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/lib"))) - `("QUCSATOR" ":" prefix (,qucsator)) - `("QUCSCONV" ":" prefix (,(string-append qucsator "/bin/q= ucsconv"))) - `("ADMSXMLBINDIR" ":" prefix (,(string-append (assoc-ref = inputs "adms") - "/bin"))) - `("ASCOBINDIR" ":" prefix (,(string-append (assoc-ref inp= uts "asco") - "/bin"))) - `("QUCS_OCTAVE" ":" prefix (,(string-append (assoc-ref in= puts "octave") - "/bin/octave"= )))) - (symlink qucsator (string-append out "/bin/qucsator")) - #t)))))) - (native-inputs - `(("libtool-native" ,libtool))) - (inputs - `(("adms" ,adms) - ("asco" ,asco) - ("coreutils" ,coreutils) - ("freehdl" ,freehdl) - ("gcc-toolchain" ,gcc-toolchain) - ("iverilog" ,iverilog) - ("libtool" ,libtool) - ("mpi" ,openmpi) - ("ngspice" ,ngspice) - ("octave" ,octave-cli) - ("qt4" ,qt-4) - ("qucs" ,qucs) - ("sed" ,sed) - ("xyce-serial" ,xyce-serial) - ("xyce-parallel" ,xyce-parallel))) - (home-page "https://ra3xdh.github.io/") - (synopsis "Circuit simulator with graphical user interface") - (description - "Qucs-S is a spin-off of the Qucs cross-platform circuit simulator. -The S letter indicates SPICE. The purpose of the Qucs-S subproject is to = use -free SPICE circuit simulation kernels with the Qucs GUI. It provides the -simulator backends @code{Qucsator}, @code{ngspice} and @code{Xyce}.") - (license license:gpl2+))) - (define-public librepcb (package (name "librepcb") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 89d7b8ca83..54a953c741 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1551,99 +1551,6 @@ guidelines. It provides an easy to use application = that allows you to connect with friends and family without anyone else listening in.") (license license:gpl3+))) =20 -(define-public pybitmessage - (package - (name "pybitmessage") - (version "0.6.3.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Bitmessage/PyBitmessage") - (commit version))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35")))) - (propagated-inputs - ;; TODO: - ;; Package "pyopencl", required in addition to numpy for OpenCL suppo= rt. - ;; Package "gst123", required in addition to alsa-utils and - ;; mpg123 for sound support. - `(("python2-msgpack" ,python2-msgpack) - ("python2-pythondialog" ,python2-pythondialog) - ("python2-pyqt-4" ,python2-pyqt-4) - ("python2-sip" ,python2-sip) - ("python2-pysqlite" ,python2-pysqlite) - ("python2-pyopenssl" ,python2-pyopenssl))) - (native-inputs - `(("openssl" ,openssl))) - (build-system python-build-system) - (arguments - `(#:modules ((guix build python-build-system) - (guix build utils)) - #:tests? #f ;no test target - #:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-unmatched-python-shebangs - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/bitmessagemain.py" - (("#!/usr/bin/env python2.7") - (string-append "#!" (which "python")))) - (substitute* "src/bitmessagecli.py" - (("#!/usr/bin/env python2.7.x") - (string-append "#!" (which "python")))) - #t)) - (add-after 'unpack 'fix-depends - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/depends.py" - (("libcrypto.so") - (string-append (assoc-ref inputs "openssl") - "/lib/libcrypto.so"))) - #t)) - (add-after 'unpack 'fix-local-files-in-paths - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "src/proofofwork.py" - (("bitmsghash.so") - (string-append (assoc-ref outputs "out") - "/lib/bitmsghash.so"))) - #t)) - (add-after 'unpack 'fix-pyelliptic - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/pyelliptic/openssl.py" - (("libcrypto.so") - (string-append (assoc-ref inputs "openssl") - "/lib/libcrypto.so")) - (("libssl.so") - (string-append (assoc-ref inputs "openssl") - "/lib/libssl.so"))) - #t)) - (add-after 'unpack 'noninteractive-build - ;; This applies upstream commit 4c597d3f7cf9f83a763472aa165a1a4= 292019f20 - (lambda _ - (substitute* "setup.py" - (("except NameError") - "except EOFError, NameError")) - #t)) - ;; XXX: python setup.py does not build and install bitmsghash, - ;; without it PyBitmessage tries to compile it at first run - ;; in the store, which due to obvious reasons fails. Do it - ;; and place it in /lib. - (add-after 'unpack 'build-and-install-bitmsghash - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion "src/bitmsghash" - (system* "make") - (install-file "bitmsghash.so" - (string-append (assoc-ref outputs "out") "/li= b"))) - #t))))) - (license license:expat) - (description - "Distributed and trustless peer-to-peer communications protocol -for sending encrypted messages to one person or many subscribers.") - (synopsis "Distributed peer-to-peer communication") - (home-page "https://bitmessage.org/"))) - (define-public ytalk (package (name "ytalk") diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.= scm index bd411f59d0..2324c1affc 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -177,37 +177,6 @@ algorithms AES or Twofish.") ;; the combined work falls under the GPLv3. (license license:gpl3))) =20 -(define-public keepassx - (package - (name "keepassx") - (version "2.0.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.keepassx.org/releases/" version - "/keepassx-" version ".tar.gz")) - (sha256 - (base32 - "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3")))) - (build-system cmake-build-system) - (inputs - `(("libgcrypt" ,libgcrypt) - ("libxi" ,libxi) - ("libxtst" ,libxtst) - ("qt" ,qt-4))) - (native-inputs - `(("zlib" ,zlib))) - (home-page "https://www.keepassx.org") - (synopsis "Password manager") - (description "KeePassX is a password manager or safe which helps you to -manage your passwords in a secure way. You can put all your passwords in = one -database, which is locked with one master key or a key-file which can be s= tored -on an external storage device. The databases are encrypted using the -algorithms AES or Twofish.") - ;; Non functional parts use various licences. - (license license:gpl3) - (properties `((superseded . ,keepassxc))))) - (define-public pwsafe (package (name "pwsafe") diff --git a/gnu/packages/patches/avogadro-boost148.patch b/gnu/packages/pa= tches/avogadro-boost148.patch deleted file mode 100644 index f244f14674..0000000000 --- a/gnu/packages/patches/avogadro-boost148.patch +++ /dev/null @@ -1,69 +0,0 @@ -Index: avogadro-1.2.0/libavogadro/src/pythonengine_p.h -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- avogadro-1.2.0.orig/libavogadro/src/pythonengine_p.h -+++ avogadro-1.2.0/libavogadro/src/pythonengine_p.h -@@ -31,7 +31,9 @@ -=20 - #include - #include -+#ifndef Q_MOC_RUN - #include -+#endif -=20 - namespace Avogadro { -=20 -Index: avogadro-1.2.0/libavogadro/src/pythonextension_p.h -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- avogadro-1.2.0.orig/libavogadro/src/pythonextension_p.h -+++ avogadro-1.2.0/libavogadro/src/pythonextension_p.h -@@ -33,7 +33,9 @@ - #include - #include - #include -+#ifndef Q_MOC_RUN - #include -+#endif -=20 - #include - #include -Index: avogadro-1.2.0/libavogadro/src/pythontool_p.h -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- avogadro-1.2.0.orig/libavogadro/src/pythontool_p.h -+++ avogadro-1.2.0/libavogadro/src/pythontool_p.h -@@ -31,7 +31,9 @@ -=20 - #include - #include -+#ifndef Q_MOC_RUN - #include -+#endif -=20 - #include - #include -Index: avogadro-1.2.0/libavogadro/src/pythoninterpreter.h -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- avogadro-1.2.0.orig/libavogadro/src/pythoninterpreter.h -+++ avogadro-1.2.0/libavogadro/src/pythoninterpreter.h -@@ -26,7 +26,9 @@ - #define PYTHONINTERPRETER_H -=20 - #include -+#ifndef Q_MOC_RUN - #include -+#endif - #include - #include -=20 -Index: avogadro-1.2.0/libavogadro/src/pythonscript.h -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- avogadro-1.2.0.orig/libavogadro/src/pythonscript.h -+++ avogadro-1.2.0/libavogadro/src/pythonscript.h -@@ -27,6 +27,8 @@ - #define PYTHONSCRIPT_H -=20 - #include -+#ifndef Q_MOC_RUN - #include -+#endif -=20 - #include "pythonerror.h" diff --git a/gnu/packages/patches/avogadro-eigen3-update.patch b/gnu/packag= es/patches/avogadro-eigen3-update.patch deleted file mode 100644 index a5f669292f..0000000000 --- a/gnu/packages/patches/avogadro-eigen3-update.patch +++ /dev/null @@ -1,603 +0,0 @@ -From 43af3c117b0b3220b15c2fe2895b94bbd83d3a60 Mon Sep 17 00:00:00 2001 -From: Claudio Fernandes -Date: Sun, 15 Jan 2017 21:23:39 -0200 -Subject: [PATCH] Adapt Avogadro to Eigen 3.3 - ---- - CMakeLists.txt | 9 +------ - avogadro/src/mainwindow.cpp | 5 ++-- - libavogadro/src/camera.cpp | 10 ++++---- - libavogadro/src/camera.h | 14 +++++------ - libavogadro/src/engines/wireengine.cpp | 4 ++-- - .../crystallography/crystallographyextension.cpp | 2 +- - .../crystallography/ui/ceviewoptionswidget.cpp | 2 +- - .../src/extensions/orca/orcaanalysedialog.cpp | 1 - - .../src/extensions/orca/orcainputdialog.cpp | 1 - - .../src/extensions/qtaim/qtaimmathutilities.cpp | 1 + - .../qtaim/qtaimwavefunctionevaluator.cpp | 28 +++++++++++------= ----- - .../extensions/surfaces/openqube/gamessukout.cpp | 1 + - .../src/extensions/surfaces/openqube/slaterset.cpp | 6 +++-- - libavogadro/src/glpainter_p.cpp | 14 +++++------ - libavogadro/src/glwidget.cpp | 4 ++-- - libavogadro/src/molecule.cpp | 26 +++++++++++++++++= +-- - libavogadro/src/navigate.cpp | 2 +- - libavogadro/src/tools/bondcentrictool.cpp | 28 +++++++++++------= ----- - libavogadro/src/tools/manipulatetool.cpp | 17 +++++++------ - libavogadro/src/tools/navigatetool.cpp | 3 ++- - libavogadro/src/tools/skeletontree.cpp | 7 +++--- - libavogadro/src/tools/skeletontree.h | 2 +- - 22 files changed, 102 insertions(+), 85 deletions(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -231,14 +231,7 @@ if(NOT Linguist_FOUND) - message(WARNING " Qt4 Linguist not found, please install it if you want= Avogadro translations") - endif() -=20 --find_package(Eigen3) # find and setup Eigen3 if available --if(NOT EIGEN3_FOUND) -- message(STATUS "Cannot find Eigen3, trying Eigen2") -- find_package(Eigen2 REQUIRED) # Some version is required --else() --# Use Stage10 Eigen3 support -- set (EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API TRUE) --endif() -+find_package(Eigen3 REQUIRED) # find and setup Eigen3 if available -=20 - find_package(ZLIB REQUIRED) - find_package(OpenBabel2 REQUIRED) # find and setup OpenBabel ---- a/avogadro/src/mainwindow.cpp -+++ b/avogadro/src/mainwindow.cpp -@@ -115,7 +115,6 @@ - #include -=20 - #include --#include - #define USEQUAT - // This is a "hidden" exported Qt function on the Mac for Qt-4.x. - #ifdef Q_WS_MAC -@@ -2775,7 +2774,7 @@ protected: - linearGoal.row(1) =3D linearGoal.row(2).cross(linearGoal.row(0)); -=20 - // calculate the translation matrix -- Transform3d goal(linearGoal); -+ Projective3d goal(linearGoal); -=20 - goal.pretranslate(- 3.0 * (d->glWidget->radius() + CAMERA_NEAR_DISTAN= CE) * Vector3d::UnitZ()); -=20 -@@ -2840,7 +2839,7 @@ protected: - Matrix3d linearGoal =3D Matrix3d::Identity(); -=20 - // calculate the translation matrix -- Transform3d goal(linearGoal); -+ Projective3d goal(linearGoal); -=20 - goal.pretranslate(- 3.0 * (d->glWidget->radius() + CAMERA_NEAR_DISTAN= CE) * Vector3d::UnitZ()); -=20 ---- a/libavogadro/src/camera.cpp -+++ b/libavogadro/src/camera.cpp -@@ -47,7 +47,7 @@ namespace Avogadro -=20 - CameraPrivate() {}; -=20 -- Eigen::Transform3d modelview, projection; -+ Eigen::Projective3d modelview, projection; - const GLWidget *parent; - double angleOfViewY; - double orthoScale; -@@ -169,20 +169,20 @@ namespace Avogadro -=20 - double Camera::distance(const Eigen::Vector3d & point) const - { -- return ( d->modelview * point ).norm(); -+ return ( d->modelview * point.homogeneous() ).head<3>().norm(); - } -=20 -- void Camera::setModelview(const Eigen::Transform3d &matrix) -+ void Camera::setModelview(const Eigen::Projective3d &matrix) - { - d->modelview =3D matrix; - } -=20 -- const Eigen::Transform3d & Camera::modelview() const -+ const Eigen::Projective3d & Camera::modelview() const - { - return d->modelview; - } -=20 -- Eigen::Transform3d & Camera::modelview() -+ Eigen::Projective3d & Camera::modelview() - { - return d->modelview; - } ---- a/libavogadro/src/camera.h -+++ b/libavogadro/src/camera.h -@@ -101,16 +101,16 @@ namespace Avogadro { - double angleOfViewY() const; - /** Sets 4x4 "modelview" matrix representing the camera orientation= and position. - * @param matrix the matrix to copy from -- * @sa Eigen::Transform3d & modelview(), applyModelview() */ -- void setModelview(const Eigen::Transform3d &matrix); -+ * @sa Eigen::Projective3d & modelview(), applyModelview() */ -+ void setModelview(const Eigen::Projective3d &matrix); - /** @return a constant reference to the 4x4 "modelview" matrix repr= esenting - * the camera orientation and position -- * @sa setModelview(), Eigen::Transform3d & modelview() */ -- const Eigen::Transform3d & modelview() const; -+ * @sa setModelview(), Eigen::Projective3d & modelview() */ -+ const Eigen::Projective3d & modelview() const; - /** @return a non-constant reference to the 4x4 "modelview" matrix = representing - * the camera orientation and position -- * @sa setModelview(), const Eigen::Transform3d & modelview() cons= t */ -- Eigen::Transform3d & modelview(); -+ * @sa setModelview(), const Eigen::Projective3d & modelview() con= st */ -+ Eigen::Projective3d & modelview(); - /** Calls gluPerspective() or glOrtho() with parameters automatical= ly chosen - * for rendering the GLWidget's molecule with this camera. Should = be called - * only in GL_PROJECTION matrix mode. Example code is given -@@ -342,7 +342,7 @@ namespace Avogadro { - * @return {x/w, y/w, z/w} vector - */ - Eigen::Vector3d V4toV3DivW(const Eigen::Vector4d & v4) { -- return v4.start<3>()/v4.w(); -+ return v4.head<3>()/v4.w(); - } - }; -=20 ---- a/libavogadro/src/engines/wireengine.cpp -+++ b/libavogadro/src/engines/wireengine.cpp -@@ -109,7 +109,7 @@ namespace Avogadro { - const Camera *camera =3D pd->camera(); -=20 - // perform a rough form of frustum culling -- Eigen::Vector3d transformedPos =3D pd->camera()->modelview() * v; -+ Eigen::Vector3d transformedPos =3D (pd->camera()->modelview() * v.hom= ogeneous()).head<3>(); - double dot =3D transformedPos.z() / transformedPos.norm(); - if(dot > -0.8) - return true; -@@ -167,7 +167,7 @@ namespace Avogadro { - map =3D pd->colorMap(); // fall back to global color map -=20 - // perform a rough form of frustum culling -- Eigen::Vector3d transformedEnd1 =3D pd->camera()->modelview() * v1; -+ Eigen::Vector3d transformedEnd1 =3D (pd->camera()->modelview() * v1.h= omogeneous()).head<3>(); - double dot =3D transformedEnd1.z() / transformedEnd1.norm(); - if(dot > -0.8) - return true; // i.e., don't bother rendering ---- a/libavogadro/src/extensions/crystallography/crystallographyextension.= cpp -+++ b/libavogadro/src/extensions/crystallography/crystallographyextension.= cpp -@@ -1989,7 +1989,7 @@ namespace Avogadro - // fix coordinates - // Apply COB matrix: - Eigen::Matrix3d invCob; -- cob.computeInverse(&invCob); -+ invCob =3D cob.inverse(); - for (QList::iterator - it =3D fcoords.begin(), - it_end =3D fcoords.end(); ---- a/libavogadro/src/extensions/crystallography/ui/ceviewoptionswidget.cpp -+++ b/libavogadro/src/extensions/crystallography/ui/ceviewoptionswidget.cpp -@@ -139,7 +139,7 @@ namespace Avogadro - { - // View into a Miller plane - Camera *camera =3D m_glWidget->camera(); -- Eigen::Transform3d modelView; -+ Eigen::Projective3d modelView; - modelView.setIdentity(); -=20 - // OK, so we want to rotate to look along the normal at the plane ---- a/libavogadro/src/extensions/orca/orcaanalysedialog.cpp -+++ b/libavogadro/src/extensions/orca/orcaanalysedialog.cpp -@@ -41,7 +41,6 @@ - #include -=20 - #include --#include -=20 - #include -=20 ---- a/libavogadro/src/extensions/orca/orcainputdialog.cpp -+++ b/libavogadro/src/extensions/orca/orcainputdialog.cpp -@@ -33,7 +33,6 @@ - #include -=20 - #include --#include -=20 - #include -=20 ---- a/libavogadro/src/extensions/qtaim/qtaimmathutilities.cpp -+++ b/libavogadro/src/extensions/qtaim/qtaimmathutilities.cpp -@@ -28,6 +28,7 @@ -=20 - #include - #include -+#include -=20 - namespace Avogadro { - namespace QTAIMMathUtilities { ---- a/libavogadro/src/extensions/qtaim/qtaimwavefunctionevaluator.cpp -+++ b/libavogadro/src/extensions/qtaim/qtaimwavefunctionevaluator.cpp -@@ -35,21 +35,21 @@ namespace Avogadro - m_nprim=3Dwfn.numberOfGaussianPrimitives(); - m_nnuc=3Dwfn.numberOfNuclei(); -=20 -- m_nucxcoord=3DMap >(wfn.xNuclearCoordinates()= ,m_nnuc); -- m_nucycoord=3DMap >(wfn.yNuclearCoordinates()= ,m_nnuc); -- m_nuczcoord=3DMap >(wfn.zNuclearCoordinates()= ,m_nnuc); -- m_nucz=3DMap >(wfn.nuclearCharges(),m_nnuc); -- m_X0=3DMap >(wfn.xGaussianPrimitiveCenterCoor= dinates(),m_nprim,1); -- m_Y0=3DMap >(wfn.yGaussianPrimitiveCenterCoor= dinates(),m_nprim,1); -- m_Z0=3DMap >(wfn.zGaussianPrimitiveCenterCoor= dinates(),m_nprim,1); -- m_xamom=3DMap >(wfn.xGaussianPrimitiveAngula= rMomenta(),m_nprim,1); -- m_yamom=3DMap >(wfn.yGaussianPrimitiveAngula= rMomenta(),m_nprim,1); -- m_zamom=3DMap >(wfn.zGaussianPrimitiveAngula= rMomenta(),m_nprim,1); -- m_alpha=3DMap >(wfn.gaussianPrimitiveExponent= Coefficients(),m_nprim,1); -+ m_nucxcoord=3DMap >(const_cast(wfn.xN= uclearCoordinates()),m_nnuc); -+ m_nucycoord=3DMap >(const_cast(wfn.yN= uclearCoordinates()),m_nnuc); -+ m_nuczcoord=3DMap >(const_cast(wfn.zN= uclearCoordinates()),m_nnuc); -+ m_nucz=3DMap >(const_cast(wfn.nucle= arCharges()),m_nnuc); -+ m_X0=3DMap >(const_cast(wfn.xGaussian= PrimitiveCenterCoordinates()),m_nprim,1); -+ m_Y0=3DMap >(const_cast(wfn.yGaussian= PrimitiveCenterCoordinates()),m_nprim,1); -+ m_Z0=3DMap >(const_cast(wfn.zGaussian= PrimitiveCenterCoordinates()),m_nprim,1); -+ m_xamom=3DMap >(const_cast(wfn.xGau= ssianPrimitiveAngularMomenta()),m_nprim,1); -+ m_yamom=3DMap >(const_cast(wfn.yGau= ssianPrimitiveAngularMomenta()),m_nprim,1); -+ m_zamom=3DMap >(const_cast(wfn.zGau= ssianPrimitiveAngularMomenta()),m_nprim,1); -+ m_alpha=3DMap >(const_cast(wfn.gaussi= anPrimitiveExponentCoefficients()),m_nprim,1); - // TODO Implement screening for unoccupied molecular orbitals. -- m_occno=3DMap >(wfn.molecularOrbitalOccupatio= nNumbers(),m_nmo,1); -- m_orbe=3DMap >(wfn.molecularOrbitalEigenvalue= s(),m_nmo,1); -- m_coef=3DMap >(wfn.molecularOr= bitalCoefficients(),m_nmo,m_nprim); -+ m_occno=3DMap >(const_cast(wfn.molecu= larOrbitalOccupationNumbers()),m_nmo,1); -+ m_orbe=3DMap >(const_cast(wfn.molecul= arOrbitalEigenvalues()),m_nmo,1); -+ m_coef=3DMap >(const_cast(wfn.molecularOrbitalCoefficients()),m_nmo,m_nprim); - m_totalEnergy=3Dwfn.totalEnergy(); - m_virialRatio=3Dwfn.virialRatio(); -=20 ---- a/libavogadro/src/extensions/surfaces/openqube/gamessukout.cpp -+++ b/libavogadro/src/extensions/surfaces/openqube/gamessukout.cpp -@@ -19,6 +19,7 @@ - using Eigen::Vector3d; - using std::vector; -=20 -+#include - #include -=20 - namespace OpenQube ---- a/libavogadro/src/extensions/surfaces/openqube/slaterset.cpp -+++ b/libavogadro/src/extensions/surfaces/openqube/slaterset.cpp -@@ -25,9 +25,9 @@ -=20 - #include "cube.h" -=20 --#include - #include - #include -+#include -=20 - #include -=20 -@@ -250,7 +250,9 @@ bool SlaterSet::initialize() -=20 - SelfAdjointEigenSolver s(m_overlap); - MatrixXd p =3D s.eigenvectors(); -- MatrixXd m =3D p * s.eigenvalues().cwise().inverse().cwise().sqrt().asD= iagonal() * p.inverse(); -+ // TODO check if this is correct -+ MatrixXd m1 =3D (s.eigenvalues().array().inverse().sqrt()); -+ MatrixXd m =3D p.array()*(m1.diagonal().array())*p.inverse().array(); - m_normalized =3D m * m_eigenVectors; -=20 - if (!(m_overlap*m*m).isIdentity()) ---- a/libavogadro/src/glpainter_p.cpp -+++ b/libavogadro/src/glpainter_p.cpp -@@ -789,13 +789,13 @@ namespace Avogadro - } else { - points[theta-1] =3D Eigen::AngleAxisd(theta * (M_PI / 180.0) / = 2, n) * u; - } -- points[theta-1] =3D d->widget->camera()->modelview() * (origin + = points[theta-1]); -+ points[theta-1] =3D (d->widget->camera()->modelview() * (origin += points[theta-1]).homogeneous()).head<3>(); - } -=20 - // Get vectors representing the points' positions in terms of the mod= el view. -- Eigen::Vector3d _origin =3D d->widget->camera()->modelview() * origin; -- Eigen::Vector3d _direction1 =3D d->widget->camera()->modelview() * (o= rigin+u); -- Eigen::Vector3d _direction2 =3D d->widget->camera()->modelview() * (o= rigin+v); -+ Eigen::Vector3d _origin =3D (d->widget->camera()->modelview() * origi= n.homogeneous()).head<3>(); -+ Eigen::Vector3d _direction1 =3D (d->widget->camera()->modelview() * (= origin+u).homogeneous()).head<3>(); -+ Eigen::Vector3d _direction2 =3D (d->widget->camera()->modelview() * (= origin+v).homogeneous()).head<3>(); -=20 - glPushAttrib(GL_ALL_ATTRIB_BITS); - glPushMatrix(); -@@ -880,12 +880,12 @@ namespace Avogadro - } else { - points[theta-1] =3D Eigen::AngleAxisd(theta * (M_PI / 180.0) / = 2, n) * u; - } -- points[theta-1] =3D d->widget->camera()->modelview() * (origin + = points[theta-1]); -+ points[theta-1] =3D (d->widget->camera()->modelview() * (origin += points[theta-1]).homogeneous()).head<3>(); - } -=20 - // Get vectors representing the points' positions in terms of the mod= el view. -- Eigen::Vector3d _direction1 =3D d->widget->camera()->modelview() * (o= rigin + u); -- Eigen::Vector3d _direction2 =3D d->widget->camera()->modelview() * (o= rigin + v); -+ Eigen::Vector3d _direction1 =3D (d->widget->camera()->modelview() * (= origin + u).homogeneous()).head<3>(); -+ Eigen::Vector3d _direction2 =3D (d->widget->camera()->modelview() * (= origin + v).homogeneous()).head<3>(); -=20 - glPushAttrib(GL_ALL_ATTRIB_BITS); - glPushMatrix(); ---- a/libavogadro/src/glwidget.cpp -+++ b/libavogadro/src/glwidget.cpp -@@ -765,7 +765,7 @@ namespace Avogadro { - GLfloat fogColor[4]=3D {static_cast(d->background.redF()),= static_cast(d->background.greenF()), - static_cast(d->background.blueF()), = static_cast(d->background.alphaF())}; - glFogfv(GL_FOG_COLOR, fogColor); -- Vector3d distance =3D camera()->modelview() * d->center; -+ Vector3d distance =3D (camera()->modelview() * d->center.homogeneou= s()).head<3>(); - double distanceToCenter =3D distance.norm(); - glFogf(GL_FOG_DENSITY, 1.0); - glHint(GL_FOG_HINT, GL_NICEST); -@@ -1711,7 +1711,7 @@ namespace Avogadro { -=20 - if (d->renderModelViewDebug) { - // Model view matrix: -- const Eigen::Transform3d &modelview =3D d->camera->modelview(); -+ const Eigen::Projective3d &modelview =3D d->camera->modelview(); - y +=3D d->pd->painter()->drawText - (x, y, tr("ModelView row 1: %L1 %L2 %L3 %L4") - .arg(modelview(0, 0), 6, 'f', 2, ' ') ---- a/libavogadro/src/molecule.cpp -+++ b/libavogadro/src/molecule.cpp -@@ -38,7 +38,7 @@ - #include "zmatrix.h" -=20 - #include --#include -+#include -=20 - #include -=20 -@@ -1907,7 +1907,29 @@ namespace Avogadro{ - } - d->center /=3D static_cast(nAtoms); - Eigen::Hyperplane planeCoeffs; -- Eigen::fitHyperplane(numAtoms(), atomPositions, &planeCoeffs); -+ //Eigen::fitHyperplane(numAtoms(), atomPositions, &planeCoeffs); -+ -+ // TODO check if this is OK -+ /************************/ -+ typedef Eigen::Matrix CovMatrixType; -+ typedef Eigen::Vector3d VectorType; -+=20=20=20=20=20=20=20=20 -+ VectorType mean =3D d->center; -+ int size=3D3; -+ int numPoints=3DnumAtoms(); -+ VectorType ** points=3DatomPositions; -+ CovMatrixType covMat =3D CovMatrixType::Zero(size, size); -+ VectorType remean =3D VectorType::Zero(size); -+ for(int i =3D 0; i < numPoints; ++i) -+ { -+ VectorType diff =3D (*(points[i]) - mean).conjugate(); -+ covMat +=3D diff * diff.adjoint(); -+ } -+ Eigen::SelfAdjointEigenSolver eig(covMat); -+ planeCoeffs.normal() =3D eig.eigenvectors().col(0); -+ /************************/ -+ -+ - delete[] atomPositions; - d->normalVector =3D planeCoeffs.normal(); - } ---- a/libavogadro/src/navigate.cpp -+++ b/libavogadro/src/navigate.cpp -@@ -40,7 +40,7 @@ namespace Avogadro { - void Navigate::zoom(GLWidget *widget, const Eigen::Vector3d &goal, - double delta) - { -- Vector3d transformedGoal =3D widget->camera()->modelview() * goal; -+ Vector3d transformedGoal =3D (widget->camera()->modelview() * goal.ho= mogeneous()).head<3>(); - double distanceToGoal =3D transformedGoal.norm(); -=20 - double t =3D ZOOM_SPEED * delta; ---- a/libavogadro/src/tools/bondcentrictool.cpp -+++ b/libavogadro/src/tools/bondcentrictool.cpp -@@ -578,8 +578,8 @@ namespace Avogadro { -=20 - Vector3d clicked =3D *m_clickedAtom->pos(); -=20 -- Vector3d axis =3D Vector3d(0, 0, ((widget->camera()->modelview(= ) * other).z() >=3D -- (widget->camera()->modelview() * center).z() ? -1 : 1)); -+ Vector3d axis =3D Vector3d(0, 0, ((widget->camera()->modelview(= ) * other.homogeneous()).z() >=3D -+ (widget->camera()->modelview() * center.homogeneous()).z(= ) ? -1 : 1)); -=20 - Vector3d centerProj =3D widget->camera()->project(center); - centerProj -=3D Vector3d(0,0,centerProj.z()); -@@ -673,8 +673,8 @@ namespace Avogadro { -=20 - Vector3d clicked =3D *m_clickedAtom->pos(); -=20 -- Vector3d axis =3D Vector3d(0, 0, ((widget->camera()->modelview(= ) * other).z() >=3D -- (widget->camera()->modelview() * center).z() ? -1 : 1)); -+ Vector3d axis =3D Vector3d(0, 0, ((widget->camera()->modelview(= ) * other.homogeneous()).z() >=3D -+ (widget->camera()->modelview() * center.homogeneous()).z(= ) ? -1 : 1)); -=20 - Vector3d centerProj =3D widget->camera()->project(center); - centerProj -=3D Vector3d(0,0,centerProj.z()); -@@ -1362,10 +1362,10 @@ namespace Avogadro { -=20 - planeVec =3D length * (planeVec / planeVec.norm()); -=20 -- Vector3d topLeft =3D widget->camera()->modelview() * (left + planeVec= ); -- Vector3d topRight =3D widget->camera()->modelview() * (right + planeV= ec); -- Vector3d botRight =3D widget->camera()->modelview() * (right - planeV= ec); -- Vector3d botLeft =3D widget->camera()->modelview() * (left - planeVec= ); -+ Vector3d topLeft =3D (widget->camera()->modelview() * (left + planeVe= c).homogeneous()).head<3>(); -+ Vector3d topRight =3D (widget->camera()->modelview() * (right + plane= Vec).homogeneous()).head<3>(); -+ Vector3d botRight =3D (widget->camera()->modelview() * (right - plane= Vec).homogeneous()).head<3>(); -+ Vector3d botLeft =3D (widget->camera()->modelview() * (left - planeVe= c).homogeneous()).head<3>(); -=20 - float alpha =3D 0.4; - double lineWidth =3D 1.5; -@@ -1444,10 +1444,10 @@ namespace Avogadro { - C =3D D + ((C-D).normalized() * minWidth); - } -=20 -- Vector3d topLeft =3D widget->camera()->modelview() * D; -- Vector3d topRight =3D widget->camera()->modelview() * C; -- Vector3d botRight =3D widget->camera()->modelview() * B; -- Vector3d botLeft =3D widget->camera()->modelview() * A; -+ Vector3d topLeft =3D (widget->camera()->modelview() * D.homogeneous()= ).head<3>(); -+ Vector3d topRight =3D (widget->camera()->modelview() * C.homogeneous(= )).head<3>(); -+ Vector3d botRight =3D (widget->camera()->modelview() * B.homogeneous(= )).head<3>(); -+ Vector3d botLeft =3D (widget->camera()->modelview() * A.homogeneous()= ).head<3>(); -=20 - float alpha =3D 0.4; - double lineWidth =3D 1.5; -@@ -1506,12 +1506,12 @@ namespace Avogadro { - Vector3d positionVector) - { - //Rotate skeleton around a particular axis and center point -- Eigen::Transform3d rotation; -+ Eigen::Projective3d rotation; - rotation =3D Eigen::AngleAxisd(angle, rotationVector); - rotation.pretranslate(centerVector); - rotation.translate(-centerVector); -=20 -- return rotation*positionVector; -+ return (rotation*positionVector.homogeneous()).head<3>(); - } -=20 - // ########## showAnglesChanged ########## ---- a/libavogadro/src/tools/manipulatetool.cpp -+++ b/libavogadro/src/tools/manipulatetool.cpp -@@ -40,7 +40,6 @@ - #include -=20 - using Eigen::Vector3d; --using Eigen::Transform3d; - using Eigen::AngleAxisd; -=20 - namespace Avogadro { -@@ -138,7 +137,7 @@ namespace Avogadro { - double yRotate =3D m_settingsWidget->yRotateSpinBox->value() * DEG_TO= _RAD; - double zRotate =3D m_settingsWidget->zRotateSpinBox->value() * DEG_TO= _RAD; -=20 -- Eigen::Transform3d rotation; -+ Eigen::Projective3d rotation; - rotation.matrix().setIdentity(); - rotation.translation() =3D center; - rotation.rotate(AngleAxisd(xRotate, Vector3d::UnitX()) -@@ -152,12 +151,12 @@ namespace Avogadro { - if (p->type() =3D=3D Primitive::AtomType) { - Atom *atom =3D static_cast(p); - tempPos =3D translate + *(atom->pos()); -- atom->setPos(rotation * tempPos); -+ atom->setPos((rotation * tempPos.homogeneous()).head<3>()); - } - } else { - foreach(Atom *atom, widget->molecule()->atoms()) { - tempPos =3D translate + *(atom->pos()); -- atom->setPos(rotation * tempPos); -+ atom->setPos((rotation * tempPos.homogeneous()).head<3>()); - } - } -=20 -@@ -199,7 +198,7 @@ namespace Avogadro { - widget->setCursor(Qt::SizeVerCursor); -=20 - // Move the selected atom(s) in to or out of the screen -- Vector3d transformedGoal =3D widget->camera()->modelview() * *goal; -+ Vector3d transformedGoal =3D (widget->camera()->modelview() * goal->h= omogeneous()).head<3>(); - double distanceToGoal =3D transformedGoal.norm(); -=20 - double t =3D ZOOM_SPEED * delta; -@@ -255,7 +254,7 @@ namespace Avogadro { -=20 - // Rotate the selected atoms about the center - // rotate only selected primitives -- Transform3d fragmentRotation; -+ Eigen::Projective3d fragmentRotation; - fragmentRotation.matrix().setIdentity(); - fragmentRotation.translation() =3D *center; - fragmentRotation.rotate( -@@ -266,7 +265,7 @@ namespace Avogadro { -=20 - foreach(Primitive *p, widget->selectedPrimitives()) - if (p->type() =3D=3D Primitive::AtomType) -- static_cast(p)->setPos(fragmentRotation * *static_cast(p)->pos()); -+ static_cast(p)->setPos((fragmentRotation * static_cast(p)->pos()->homogeneous()).head<3>()); - widget->molecule()->update(); - } -=20 -@@ -274,7 +273,7 @@ namespace Avogadro { - double delta) const - { - // Tilt the selected atoms about the center -- Transform3d fragmentRotation; -+ Eigen::Projective3d fragmentRotation; - fragmentRotation.matrix().setIdentity(); - fragmentRotation.translation() =3D *center; - fragmentRotation.rotate(AngleAxisd(delta * ROTATION_SPEED, widget->ca= mera()->backTransformedZAxis())); -@@ -282,7 +281,7 @@ namespace Avogadro { -=20 - foreach(Primitive *p, widget->selectedPrimitives()) - if (p->type() =3D=3D Primitive::AtomType) -- static_cast(p)->setPos(fragmentRotation * *static_cast(p)->pos()); -+ static_cast(p)->setPos((fragmentRotation * static_cast(p)->pos()->homogeneous()).head<3>()); - widget->molecule()->update(); - } -=20 ---- a/libavogadro/src/tools/navigatetool.cpp -+++ b/libavogadro/src/tools/navigatetool.cpp -@@ -92,7 +92,8 @@ namespace Avogadro { - double sumOfWeights =3D 0.; - QList atoms =3D widget->molecule()->atoms(); - foreach (Atom *atom, atoms) { -- Vector3d transformedAtomPos =3D widget->camera()->modelview() * *= atom->pos(); -+ Vector3d transformedAtomPos =3D (widget->camera()->modelview() * -+ atom->pos()->homogeneous()).head<3= >(); - double atomDistance =3D transformedAtomPos.norm(); - double dot =3D transformedAtomPos.z() / atomDistance; - double weight =3D exp(-30. * (1. + dot)); ---- a/libavogadro/src/tools/skeletontree.cpp -+++ b/libavogadro/src/tools/skeletontree.cpp -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include -=20 - using namespace Eigen; - using namespace std; -@@ -221,7 +222,7 @@ namespace Avogadro { - { - if (m_rootNode) { - //Rotate skeleton around a particular axis and center point -- Eigen::Transform3d rotation; -+ Eigen::Projective3d rotation; - rotation =3D Eigen::AngleAxisd(angle, rotationAxis); - rotation.pretranslate(centerVector); - rotation.translate(-centerVector); -@@ -248,11 +249,11 @@ namespace Avogadro { - // ########## recursiveRotate ########## -=20 - void SkeletonTree::recursiveRotate(Node* n, -- const Eigen::Transform3d &rotationMa= trix) -+ const Eigen::Projective3d &rotationM= atrix) - { - // Update the root node with the new position - Atom* a =3D n->atom(); -- a->setPos(rotationMatrix * (*a->pos())); -+ a->setPos((rotationMatrix * (*a->pos()).homogeneous()).head<3>()); - a->update(); -=20 - // Now update the children ---- a/libavogadro/src/tools/skeletontree.h -+++ b/libavogadro/src/tools/skeletontree.h -@@ -230,6 +230,6 @@ namespace Avogadro { - * @param centerVector Center location to rotate around. - */ - void recursiveRotate(Node* n, -- const Eigen::Transform3d &rotationMatrix); -+ const Eigen::Projective3d &rotationMatrix); -=20 - }; - } // End namespace Avogadro \ No newline at end of file diff --git a/gnu/packages/patches/avogadro-python-eigen-lib.patch b/gnu/pac= kages/patches/avogadro-python-eigen-lib.patch deleted file mode 100644 index ac9f2e30af..0000000000 --- a/gnu/packages/patches/avogadro-python-eigen-lib.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 2d4be7ede177a8df7340fe3b209698d591ee8a04 Mon Sep 17 00:00:00 2001 -From: Claudio Fernandes -Date: Mon, 16 Jan 2017 19:48:23 -0200 -Subject: [PATCH] Adapt libavogadro/python to Eigen 3.3 - ---- - libavogadro/src/python/camera.cpp | 2 +- - libavogadro/src/python/eigen.cpp | 60 +++++++++++++++++++---------------= ----- - 2 files changed, 31 insertions(+), 31 deletions(-) - -diff --git a/libavogadro/src/python/camera.cpp b/libavogadro/src/python/ca= mera.cpp -index 69ca87bf8..30b32af7d 100644 ---- a/libavogadro/src/python/camera.cpp -+++ b/libavogadro/src/python/camera.cpp -@@ -10,7 +10,7 @@ using namespace Avogadro; - void export_Camera() - { -=20 -- const Eigen::Transform3d& (Camera::*modelview_ptr)() const =3D &Camera:= :modelview; -+ const Eigen::Projective3d& (Camera::*modelview_ptr)() const =3D &Camera= ::modelview; - Eigen::Vector3d (Camera::*unProject_ptr1)(const Eigen::Vector3d&) const= =3D &Camera::unProject; - Eigen::Vector3d (Camera::*unProject_ptr2)(const QPoint&, const Eigen::V= ector3d&) const =3D &Camera::unProject; - Eigen::Vector3d (Camera::*unProject_ptr3)(const QPoint&) const =3D &Cam= era::unProject; -diff --git a/libavogadro/src/python/eigen.cpp b/libavogadro/src/python/eig= en.cpp -index c1faedbcc..20b4e719d 100644 ---- a/libavogadro/src/python/eigen.cpp -+++ b/libavogadro/src/python/eigen.cpp -@@ -305,9 +305,9 @@ template <> struct ScalarTraits - struct innerclass - { - // -- // Eigen::Transform3d --> python array (4x4) -+ // Eigen::Projective3d --> python array (4x4) - // -- static PyObject* convert(Eigen::Transform3d const &trans) -+ static PyObject* convert(Eigen::Projective3d const &trans) - { - npy_intp dims[2] =3D { 4, 4 }; - PyObject *result =3D PyArray_SimpleNew(2, dims, PyArray_DOUBLE); -@@ -321,9 +321,9 @@ template <> struct ScalarTraits - return incref(result); - } - // -- // Eigen::Transform3d* --> python array (4x4) -+ // Eigen::Projective3d* --> python array (4x4) - // -- static PyObject* convert(Eigen::Transform3d *trans) -+ static PyObject* convert(Eigen::Projective3d *trans) - { - npy_intp dims[2] =3D { 4, 4 }; - PyObject *result =3D PyArray_SimpleNew(2, dims, PyArray_DOUBLE); -@@ -337,9 +337,9 @@ template <> struct ScalarTraits - return incref(result); - } - // -- // const Eigen::Transform3d* --> python array (4x4) -+ // const Eigen::Projective3d* --> python array (4x4) - // -- static PyObject* convert(const Eigen::Transform3d *trans) -+ static PyObject* convert(const Eigen::Projective3d *trans) - { - npy_intp dims[2] =3D { 4, 4 }; - PyObject *result =3D PyArray_SimpleNew(2, dims, PyArray_DOUBLE); -@@ -358,10 +358,10 @@ template <> struct ScalarTraits - Transform3d_to_python_array() - { - #ifndef WIN32 -- to_python_converter(); -+ to_python_converter(); - #endif -- to_python_converter(); -- to_python_converter(); -+ to_python_converter(); -+ to_python_converter(); - } -=20 - }; -@@ -373,17 +373,17 @@ template <> struct ScalarTraits - // Insert an rvalue from_python converter at the tail of the - // chain. Used for implicit conversions - // -- // python array --> Eigen::Transform3d -+ // python array --> Eigen::Projective3d - // - // used for: - // -- // void function(Eigen::Transform3d vec) -- // void function(Eigen::Transform3d & vec) -- // void function(const Eigen::Transform3d & vec) -+ // void function(Eigen::Projective3d vec) -+ // void function(Eigen::Projective3d & vec) -+ // void function(const Eigen::Projective3d & vec) - // -- converter::registry::push_back( &convertible, &construct, type_id() ); -+ converter::registry::push_back( &convertible, &construct, type_id() ); -=20=20=20=20=20=20=20 -- converter::registry::insert( &convert, type_id(= ) ); -+ converter::registry::insert( &convert, type_id= () ); - } -=20 - static void* convert(PyObject *obj_ptr) -@@ -401,7 +401,7 @@ template <> struct ScalarTraits - throw_error_already_set(); // the 1D array does not have exactly = 3 elements -=20 - double *values =3D reinterpret_cast(array->data); -- Eigen::Transform3d *c_obj =3D new Eigen::Transform3d(); -+ Eigen::Projective3d *c_obj =3D new Eigen::Projective3d(); - double *dataPtr =3D c_obj->data(); -=20 - for (int i =3D 0; i < 16; ++i) -@@ -432,7 +432,7 @@ template <> struct ScalarTraits - // I think this is a better way to get at the double array, where i= s this - // deleted though? Does Boost::Python do it? - double *values =3D reinterpret_cast(array->data); -- Eigen::Transform3d *storage =3D new Eigen::Transform3d(); -+ Eigen::Projective3d *storage =3D new Eigen::Projective3d(); - double *dataPtr =3D storage->data(); -=20 - for (int i =3D 0; i < 16; ++i) -@@ -467,21 +467,21 @@ class EigenUnitTestHelper - void set_vector3d_ptr(Eigen::Vector3d* vec) { m_vecto= r3d =3D *vec; } - void set_const_vector3d_ptr(const Eigen::Vector3d* const vec) { m_vec= tor3d =3D *vec; } -=20 -- //Eigen::Transform3d transform3d() { return = m_transform3d; } -- //Eigen::Transform3d& transform3d_ref() { return = m_transform3d; } -- const Eigen::Transform3d& const_transform3d_ref() { return m_= transform3d; } -- Eigen::Transform3d* transform3d_ptr() { return &m= _transform3d; } -- const Eigen::Transform3d* const_transform3d_ptr() { return &m= _transform3d; } -- -- //void set_transform3d(Eigen::Transform3d vec) {= m_transform3d =3D vec; } -- //void set_transform3d_ref(Eigen::Transform3d& vec) {= m_transform3d =3D vec; } -- void set_const_transform3d_ref(const Eigen::Transform3d& vec) { m= _transform3d =3D vec; } -- void set_transform3d_ptr(Eigen::Transform3d* vec) { m= _transform3d =3D *vec; } -- void set_const_transform3d_ptr(const Eigen::Transform3d* const vec) {= m_transform3d =3D *vec; } -+ //Eigen::Projective3d transform3d() { return= m_transform3d; } -+ //Eigen::Projective3d& transform3d_ref() { return= m_transform3d; } -+ const Eigen::Projective3d& const_transform3d_ref() { return m= _transform3d; } -+ Eigen::Projective3d* transform3d_ptr() { return &= m_transform3d; } -+ const Eigen::Projective3d* const_transform3d_ptr() { return &= m_transform3d; } -+ -+ //void set_transform3d(Eigen::Projective3d vec) = { m_transform3d =3D vec; } -+ //void set_transform3d_ref(Eigen::Projective3d& vec) = { m_transform3d =3D vec; } -+ void set_const_transform3d_ref(const Eigen::Projective3d& vec) { = m_transform3d =3D vec; } -+ void set_transform3d_ptr(Eigen::Projective3d* vec) { = m_transform3d =3D *vec; } -+ void set_const_transform3d_ptr(const Eigen::Projective3d* const vec) = { m_transform3d =3D *vec; } -=20=20 - private: - Eigen::Vector3d m_vector3d; -- Eigen::Transform3d m_transform3d; -+ Eigen::Projective3d m_transform3d; -=20 - }; - #endif -@@ -529,6 +529,6 @@ void export_Eigen() - Vector3x_to_python_array(); - Vector3x_from_python_array(); -=20 -- // Eigen::Transform3d -+ // Eigen::Projective3d - Transform3d_to_python_array(); - Transform3d_from_python_array(); diff --git a/gnu/packages/patches/tipp10-fix-compiling.patch b/gnu/packages= /patches/tipp10-fix-compiling.patch deleted file mode 100644 index 3a34a98b22..0000000000 --- a/gnu/packages/patches/tipp10-fix-compiling.patch +++ /dev/null @@ -1,212 +0,0 @@ -Description: Debian patches to make tipp10 compile -Author: Christoph Martin -Last-Update: 2016-07-20 - -https://sources.debian.net/data/main/t/tipp10/2.1.0-2/debian/patches/0001-= FixCompiling - ---- a/widget/tickerboard.cpp -+++ b/widget/tickerboard.cpp -@@ -97,7 +97,8 @@ void TickerBoard::startTicker(bool wasPa - =0D - if (tickerSpeed =3D=3D 50) {=0D - scrollOffset =3D 290;=0D -- scroll(-290, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());=0D -+ const QRect qr =3D QRect(10, 15, 590, 35);=0D -+ scroll(-290, 0, qr); //contentsRect());=0D - }=0D - =0D - startFlag =3D true;=0D -@@ -153,7 +154,8 @@ void TickerBoard::changeChar() { - scrollOffset =3D 0;=0D - } else {=0D - scrollOffset =3D 290;=0D -- scroll(-290, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());=0D -+ const QRect qr =3D QRect(10, 15, 590, 35);=0D -+ scroll(-290, 0, qr); //contentsRect());=0D - }=0D - splitLesson();=0D - }=0D -@@ -242,7 +244,8 @@ void TickerBoard::progress() { - =0D - // Move ticker 1 pixel to left=0D - scrollOffset++;=0D -- scroll(-1, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());=0D -+ const QRect qr =3D QRect(10, 15, 590, 35);=0D -+ scroll(-1, 0, qr); //contentsRect());=0D - =0D - if ((lessonOffset - scrollOffset) <=3D 30) {=0D - setSpeed(tickerSpeed);=0D -@@ -265,14 +268,16 @@ void TickerBoard::progress() { - // 160 pixels overage (because the user must see at least the next wor= d)=0D - if ((lessonOffset - scrollOffset) > 200) {=0D - scrollOffset +=3D (lessonOffset - scrollOffset) - 200;=0D -- scroll(-((lessonOffset - scrollOffset) - 200), 0, QRect::QRect(10, 15= , 590, 35)); //contentsRect());=0D -+ const QRect qr =3D QRect(10, 15, 590, 35);=0D -+ scroll(-((lessonOffset - scrollOffset) - 200), 0, qr); //contentsRect= ());=0D - }=0D - } else {=0D - // If the user types faster than the ticker, move ticker faster after= =0D - // 160 pixels overage (because the user must see at least the next wor= d)=0D - if ((lessonOffset - scrollOffset) > 280) {=0D - scrollOffset +=3D 570;=0D -- scroll(-570, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());=0D -+ const QRect qr =3D QRect(10, 15, 590, 35);=0D -+ scroll(-570, 0, qr); //contentsRect());=0D - }=0D - =0D - }=0D ---- a/widget/settingspages.cpp -+++ b/widget/settingspages.cpp -@@ -501,7 +501,7 @@ void DatabasePage::writeSettings() { - QSettings settings;=0D - #endif=0D - settings.beginGroup("database");=0D -- settings.setValue("pathpro", lineDatabasePath->text() + "/" + QString::Q= String(APP_USER_DB));=0D -+ settings.setValue("pathpro", lineDatabasePath->text() + "/" + QString(AP= P_USER_DB));=0D - settings.endGroup();=0D - }=0D - =0D ---- a/widget/lessondialog.cpp -+++ b/widget/lessondialog.cpp -@@ -89,7 +89,7 @@ void LessonDialog::updateContent() { - *lessonData =3D lineLessonContent->toPlainText().split("\n", QString::= SkipEmptyParts);=0D - // Delete empty lines=0D - for (int i =3D 0; i < lessonData->size(); i++) {=0D -- if (QString::QString(lessonData->at(i).toLocal8Bit().constData()).sim= plified() =3D=3D "") {=0D -+ if (QString(lessonData->at(i).toLocal8Bit().constData()).simplified()= =3D=3D "") {=0D - lessonData->removeAt(i);=0D - }=0D - }=0D -@@ -259,7 +259,7 @@ void LessonDialog::clickSave() { - contentList =3D lineLessonContent->toPlainText().split("\n", QString::Sk= ipEmptyParts);=0D - // Delete empty lines=0D - for (i =3D 0; i < contentList.size(); i++) {=0D -- if (QString::QString(contentList.at(i).toLocal8Bit().constData()).simpl= ified() =3D=3D "") {=0D -+ if (QString(contentList.at(i).toLocal8Bit().constData()).simplified() = =3D=3D "") {=0D - contentList.removeAt(i);=0D - }=0D - }=0D ---- a/sql/chartablesql.cpp -+++ b/sql/chartablesql.cpp -@@ -57,7 +57,7 @@ QVariant CharSqlModel::data(const QModel - // Read the unicode value=0D - unicode =3D value.toInt();=0D - // Convert unicode to a char=0D -- unicodeToChar =3D QString::QString(QChar(unicode)); //"\'" + QString::= QString(QChar(unicode)) + "\'";=0D -+ unicodeToChar =3D QString(QChar(unicode)); //"\'" + QString::QString(Q= Char(unicode)) + "\'";=0D - return unicodeToChar;=0D - } else {=0D - // Last column (error weight)=0D ---- a/sql/startsql.cpp -+++ b/sql/startsql.cpp -@@ -344,7 +344,7 @@ bool StartSql::updateOwnLesson(QString l - for (i =3D 0; i < content.size(); i++) {=0D - //simplifiedContent =3D QString::QString(=0D - // content.at(i)).replace(QChar(0x27), "''", Qt::CaseSensitive).simpli= fied();=0D -- simplifiedContent =3D trim(QString::QString(=0D -+ simplifiedContent =3D trim(QString(=0D - content.at(i)).replace(QChar(0x27), "''", Qt::CaseSensitive));=0D - =0D - if (!query.exec("INSERT INTO own_content VALUES(NULL,'" +=0D ---- a/def/defines.h -+++ b/def/defines.h -@@ -27,9 +27,9 @@ Foundation, Inc., 51 Franklin Street, Fi - #define DEFINES_H=0D - =0D - // OS constants=0D --#define APP_WIN true=0D -+#define APP_WIN false=0D - #define APP_MAC false=0D --#define APP_X11 false=0D -+#define APP_X11 true=0D - #define APP_PORTABLE false //at least one of the 3 OS must be true too= !=0D - =0D - // Languages=0D -@@ -47,6 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fi - #define APP_URL "http://www.tipp10.com"=0D - #define APP_DB "tipp10v2.template"=0D - #define APP_USER_DB "tipp10v2.db"=0D -+#define APP_SHARE_DIR "/usr/share/tipp10"=0D - =0D - // Update constants=0D - #define UPDATE_URL "www.tipp10.com"=0D ---- a/tipp10.pro -+++ b/tipp10.pro -@@ -88,3 +88,15 @@ SOURCES +=3D main.cpp \ - sql/startsql.cpp \=0D - games/abcrainwidget.cpp \=0D - games/charball.cpp=0D -+=0D -+target.path =3D /usr/bin/=0D -+INSTALLS +=3D target=0D -+share.path =3D /usr/share/tipp10/=0D -+share.files =3D release/* *wav=0D -+INSTALLS +=3D share=0D -+desktop.path =3D /usr/share/applications/=0D -+desktop.files =3D tipp10.desktop=0D -+INSTALLS +=3D desktop=0D -+pixmap.path =3D /usr/share/pixmaps/=0D -+pixmap.files =3D tipp10.png=0D -+INSTALLS +=3D pixmap=0D ---- a/sql/connection.h -+++ b/sql/connection.h -@@ -179,11 +179,13 @@ static bool createConnection() { - CANCEL_NO, "Betroffener Pfad:\n" + dbPath);*/=0D - // Try to create new databae in user path=0D - // Exist a database in the program dir?=0D -- if (QFile::exists(QCoreApplication::applicationDirPath() + "/" + dbNam= eTemplate)) {=0D -+ // if (QFile::exists(QCoreApplication::applicationDirPath() + "/" + db= NameTemplate)) {=0D -+ if (QFile::exists(QString(APP_SHARE_DIR) + "/" + dbNameTemplate)) {= =0D - //if (QFile::exists(":/" + dbNameTemplate)) {=0D - // A database exist in the program dir=0D - // -> copy database to user home dir=0D -- QFile file(QCoreApplication::applicationDirPath() + "/" + dbNameTempl= ate);=0D -+ // QFile file(QCoreApplication::applicationDirPath() + "/" + dbNameTe= mplate);=0D -+ QFile file(QString(APP_SHARE_DIR) + "/" + dbNameTemplate);=0D - //QFile file(":/" + dbNameTemplate);=0D - if (file.copy(dbPath)) {=0D - QFile::setPermissions(dbPath, QFile::permissions(dbPath) | QFile::Wr= iteUser);=0D -@@ -229,7 +231,8 @@ static bool createConnection() { - // Exist a database in user's home dir?=0D - if (!QFile::exists(dbPath)) {=0D - // Exist a database template in the program dir?=0D -- dbPath =3D QCoreApplication::applicationDirPath() + "/" + dbNameTempla= te;=0D -+ // dbPath =3D QCoreApplication::applicationDirPath() + "/" + dbNameTem= plate;=0D -+ dbPath =3D QString(APP_SHARE_DIR) + "/" + dbNameTemplate;=0D - //dbPath =3D ":/" + dbNameTemplate;=0D - if (QFile::exists(dbPath)) {=0D - // A database template exist in the program dir=0D ---- a/widget/helpbrowser.cpp -+++ b/widget/helpbrowser.cpp -@@ -52,13 +52,15 @@ HelpBrowser::HelpBrowser(QString link, Q - textBrowser->setOpenExternalLinks(true);=0D - =0D - textBrowser->setSource(QString("file:///") + =0D -- QCoreApplication::applicationDirPath() + =0D -+ // QCoreApplication::applicationDirPath() + =0D -+ APP_SHARE_DIR + =0D - QString("/help/") + language + QString("/index.html"));=0D - =0D - if (link !=3D "") {=0D - =0D - textBrowser->setSource(QString("file:///") + =0D -- QCoreApplication::applicationDirPath() + =0D -+ // QCoreApplication::applicationDirPath() + =0D -+ APP_SHARE_DIR + =0D - QString("/help/") + language + QString("/content/") + link);=0D - =0D - }=0D ---- a/tipp10.desktop -+++ b/tipp10.desktop -@@ -1,10 +1,10 @@ - [Desktop Entry] --Encoding=3DUTF-8 - Name=3DTIPP10 - Comment=3DTouch Typing Tutor - Comment[de]=3D10-Finger-Schreibtrainer - Exec=3Dtipp10 - Icon=3Dtipp10.png - Terminal=3Dfalse - Type=3DApplication - Categories=3DEducation; -+Keywords=3Dlearning;touchtyping diff --git a/gnu/packages/patches/tipp10-remove-license-code.patch b/gnu/pa= ckages/patches/tipp10-remove-license-code.patch deleted file mode 100644 index 4b7487e726..0000000000 --- a/gnu/packages/patches/tipp10-remove-license-code.patch +++ /dev/null @@ -1,332 +0,0 @@ -Description: Remove license dialog and license key checking - -https://sources.debian.net/data/main/t/tipp10/2.1.0-2/debian/patches/0002-= RemoveLicenseCode - ---- a/main.cpp -+++ b/main.cpp -@@ -33,7 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fi - #include "def/defines.h"=0D - #include "sql/connection.h"=0D - #include "widget/mainwindow.h"=0D --#include "widget/licensedialog.h"=0D - #include "widget/illustrationdialog.h"=0D - =0D - int main(int argc, char *argv[]) {=0D -@@ -59,7 +58,7 @@ int main(int argc, char *argv[]) { - QSettings settings;=0D - #endif=0D - =0D -- // Read/write language, license key and show illustration flag=0D -+ // Read/write language and show illustration flag=0D - settings.beginGroup("general");=0D - QString languageGui =3D settings.value("language_gui",=0D - QLocale::system().name()).toString();=0D -@@ -101,7 +100,6 @@ int main(int argc, char *argv[]) { - QString languageLesson =3D settings.value("language_lesson",=0D - "").toString();=0D - =0D -- QString licenseKey =3D settings.value("licensekey", "").toString();=0D - bool showIllustration =3D settings.value("check_illustration", true).toB= ool();=0D - bool useNativeStyle =3D settings.value("check_native_style", false).toBo= ol();=0D - settings.endGroup();=0D ---- a/tipp10.pro -+++ b/tipp10.pro -@@ -43,7 +43,6 @@ HEADERS +=3D def/defines.h \ - widget/helpbrowser.h \=0D - widget/companylogo.h \=0D - widget/errormessage.h \=0D -- widget/licensedialog.h \=0D - widget/txtmessagedialog.h \=0D - widget/checkversion.h \=0D - sql/connection.h \=0D -@@ -78,7 +77,6 @@ SOURCES +=3D main.cpp \ - widget/helpbrowser.cpp \=0D - widget/companylogo.cpp \=0D - widget/errormessage.cpp \=0D -- widget/licensedialog.cpp \=0D - widget/txtmessagedialog.cpp \=0D - widget/checkversion.cpp \=0D - sql/lessontablesql.cpp \=0D ---- a/widget/licensedialog.cpp -+++ /dev/null -@@ -1,168 +0,0 @@ --/*=0D --Copyright (c) 2006-2009, Tom Thielicke IT Solutions=0D --=0D --This program is free software; you can redistribute it and/or=0D --modify it under the terms of the GNU General Public License=0D --as published by the Free Software Foundation; either version 2=0D --of the License.=0D --=0D --This program is distributed in the hope that it will be useful,=0D --but WITHOUT ANY WARRANTY; without even the implied warranty of=0D --MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the=0D --GNU General Public License for more details.=0D --=0D --You should have received a copy of the GNU General Public License=0D --along with this program; if not, write to the Free Software=0D --Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA=0D --02110-1301, USA.=0D --*/=0D --=0D --/****************************************************************=0D --**=0D --** Implementation of the LicenseDialog class=0D --** File name: licensedialog.cpp=0D --**=0D --****************************************************************/=0D --=0D --#include =0D --#include =0D --#include =0D --#include =0D --#include =0D --=0D --#include "licensedialog.h"=0D --#include "def/defines.h"=0D --=0D --LicenseDialog::LicenseDialog(QWidget *parent) : QDialog(parent) {=0D --=0D -- setWindowFlags(windowFlags() ^ Qt::WindowContextHelpButtonHint);=0D --=0D -- setWindowTitle(tr("Lizenznummer"));=0D -- setWindowIcon(QIcon(":/img/" + QString(ICON_FILENAME)));=0D --=0D -- // Create texbox=0D -- createLineEdit();=0D --=0D -- // Create buttons=0D -- createButtons();=0D --=0D -- // Set the layout of all widgets created above=0D -- createLayout();=0D --=0D -- lineLicensing->setFocus();=0D --}=0D --=0D --void LicenseDialog::createButtons() {=0D -- //Buttons=0D -- buttonOk =3D new QPushButton(this);=0D -- buttonDemo =3D new QPushButton(this);=0D --=0D -- buttonOk->setText(tr("&Ok"));=0D -- buttonDemo->setText(tr("&Demo starten"));=0D -- buttonDemo->setToolTip(tr("Im Demo-Modus koennen pro Lektion nur\n"=0D -- "10 Schriftzeichen eingegeben werden"));=0D --=0D -- buttonOk->setDefault(true);=0D -- // Widget connections=0D -- connect(buttonOk, SIGNAL(clicked()), this, SLOT(clickOk()));=0D -- connect(buttonDemo, SIGNAL(clicked()), this, SLOT(clickDemo()));=0D --}=0D --=0D --void LicenseDialog::createLineEdit() {=0D --=0D -- lineLicensing =3D new QLineEdit();=0D -- lineLicensing->setInputMask(">NNNNNNNNNNNNNN");=0D --=0D -- labelLicensing =3D new QLabel(tr("Bitte geben Sie Ihre Lizenznummer "=0D -- "(ohne Leerzeichen) ein, "=0D -- "die Sie im Arbeitsbuch (Schulbuch) auf Seite 3 finden:"));=0D --=0D -- labelLicensing->setWordWrap(true);=0D --}=0D --=0D --void LicenseDialog::createLayout() {=0D -- // Button layout horizontal=0D -- QHBoxLayout *buttonLayoutHorizontal =3D new QHBoxLayout;=0D -- buttonLayoutHorizontal->addStretch(1);=0D -- buttonLayoutHorizontal->addWidget(buttonDemo);=0D -- buttonLayoutHorizontal->addWidget(buttonOk);=0D -- // Full layout of all widgets vertical=0D -- QVBoxLayout *mainLayout =3D new QVBoxLayout;=0D -- mainLayout->addSpacing(1);=0D -- mainLayout->addWidget(labelLicensing);=0D -- mainLayout->addSpacing(1);=0D -- mainLayout->addWidget(lineLicensing);=0D -- mainLayout->addSpacing(1);=0D -- mainLayout->addLayout(buttonLayoutHorizontal);=0D -- mainLayout->setMargin(15);=0D -- mainLayout->setSpacing(15);=0D -- // Pass layout to parent widget (this)=0D -- this->setLayout(mainLayout);=0D --}=0D --=0D --void LicenseDialog::clickOk() {=0D --=0D -- // Check license key=0D -- if (!checkLicenseKey(lineLicensing->text())) {=0D --=0D -- // License key is wrong=0D --=0D -- // Message to the user=0D -- QMessageBox::information(0, APP_NAME,=0D -- tr("Die eingegebene Lizenznummer ist leider nicht "=0D -- "korrekt.\nBitte ueberpruefen Sie die Schreibweise."));=0D --=0D -- lineLicensing->setFocus();=0D --=0D -- } else {=0D --=0D -- // License key is ok=0D -- writeSettings();=0D -- accept();=0D -- }=0D --}=0D --=0D --void LicenseDialog::clickDemo() {=0D -- accept();=0D --}=0D --=0D --bool LicenseDialog::checkLicenseKey(QString licenseKey) {=0D -- if (licenseKey.size() =3D=3D 14 &&=0D -- licenseKey[0].isLetter() &&=0D -- licenseKey[1].isLetter() &&=0D -- (licenseKey.mid(2, 2) =3D=3D "39" ||=0D -- licenseKey.mid(2, 2) =3D=3D "41" ||=0D -- licenseKey.mid(2, 2) =3D=3D "43" ||=0D -- licenseKey.mid(2, 2) =3D=3D "49" ||=0D -- licenseKey.mid(2, 2) =3D=3D "99") &&=0D -- licenseKey[4].isDigit() &&=0D -- licenseKey[5].isDigit() &&=0D -- licenseKey[6].isDigit() &&=0D -- licenseKey[7].isLetter() &&=0D -- licenseKey[8].isDigit() &&=0D -- licenseKey[9].isDigit() &&=0D -- licenseKey[10].isDigit() &&=0D -- licenseKey[11].isDigit() &&=0D -- licenseKey[12].isLetter() &&=0D -- licenseKey[13].isLetter()) {=0D --=0D -- return true;=0D -- }=0D -- return false;=0D --}=0D --=0D --void LicenseDialog::writeSettings() {=0D -- // Saves settings of the startwiget=0D -- // (uses the default constructor of QSettings, passing=0D -- // the application and company name see main function)=0D -- #if APP_PORTABLE=0D -- QSettings settings(QCoreApplication::applicationDirPath() +=0D -- "/portable/settings.ini", QSettings::IniFormat);=0D -- #else=0D -- QSettings settings;=0D -- #endif=0D --=0D -- settings.beginGroup("general");=0D -- settings.setValue("licensekey", lineLicensing->text());=0D -- settings.endGroup();=0D --}=0D ---- a/widget/licensedialog.h -+++ /dev/null -@@ -1,85 +0,0 @@ --/*=0D --Copyright (c) 2006-2009, Tom Thielicke IT Solutions=0D --=0D --This program is free software; you can redistribute it and/or=0D --modify it under the terms of the GNU General Public License=0D --as published by the Free Software Foundation; either version 2=0D --of the License.=0D --=0D --This program is distributed in the hope that it will be useful,=0D --but WITHOUT ANY WARRANTY; without even the implied warranty of=0D --MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the=0D --GNU General Public License for more details.=0D --=0D --You should have received a copy of the GNU General Public License=0D --along with this program; if not, write to the Free Software=0D --Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA=0D --02110-1301, USA.=0D --*/=0D --=0D --/****************************************************************=0D --**=0D --** Definition of the LicenseDialog class=0D --** File name: licensedialog.h=0D --**=0D --****************************************************************/=0D --=0D --#ifndef LICENSEDIALOG_H=0D --#define LICENSEDIALOG_H=0D --=0D --#include =0D --#include =0D --#include =0D --#include =0D --#include =0D --#include =0D --=0D --//! The LicenseDialog class provides a license input widget.=0D --/*!=0D -- The LicenseDialog class shows a dialog to enter a license key.=0D --=0D -- @author Tom Thielicke, s712715=0D -- @version 0.0.1=0D -- @date 09.09.2008=0D --*/=0D --class LicenseDialog : public QDialog {=0D -- Q_OBJECT=0D --=0D -- public:=0D --=0D -- //! Constructor, creates two table objects and provide it in two tabs.= =0D -- LicenseDialog(QWidget *parent =3D 0);=0D --=0D -- bool checkLicenseKey(QString licenseKey);=0D --=0D -- public slots:=0D --=0D -- private slots:=0D --=0D -- //! Start button pressed=0D -- void clickOk();=0D --=0D -- //! Demo button pressed=0D -- void clickDemo();=0D --=0D -- private:=0D --=0D -- //! Creates a cancel and a ok button.=0D -- void createButtons();=0D --=0D -- //! Creates a textbox.=0D -- void createLineEdit();=0D --=0D -- //! Creates the layout of the complete class.=0D -- void createLayout();=0D --=0D -- //! Writes user settings=0D -- void writeSettings();=0D --=0D -- QPushButton *buttonOk;=0D -- QPushButton *buttonDemo;=0D -- QLabel *labelLicensing;=0D -- QLineEdit *lineLicensing;=0D --};=0D --=0D --#endif //LICENSEDIALOG_H=0D ---- a/widget/mainwindow.cpp -+++ b/widget/mainwindow.cpp -@@ -116,11 +116,6 @@ void MainWindow::closeEvent(QCloseEvent - }=0D - }=0D - =0D --bool MainWindow::checkLicenseKey(QString licenseKey) {=0D --=0D -- return false;=0D --}=0D --=0D - void MainWindow::createMenu() {=0D - //Mac-Version:=0D - //-----------=0D ---- a/widget/mainwindow.h -+++ b/widget/mainwindow.h -@@ -39,7 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fi - #include "trainingwidget.h"=0D - #include "evaluationwidget.h"=0D - #include "illustrationdialog.h"=0D --#include "licensedialog.h"=0D - #include "games/abcrainwidget.h"=0D - #include "helpbrowser.h"=0D - =0D diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 224bd792bd..cf601c4af1 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -251,13 +251,6 @@ When present, Poppler is able to correctly render CJK = and Cyrillic text.") (license (list license:bsd-3 license:gpl2)))) =20 -(define-public poppler-qt4 - (package/inherit poppler - (name "poppler-qt4") - (inputs `(("qt-4" ,qt-4) - ,@(package-inputs poppler))) - (synopsis "Qt4 frontend for the Poppler PDF rendering library"))) - (define-public poppler-qt5 (package/inherit poppler (name "poppler-qt5") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 79d41b3e73..d87dd63b76 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -139,210 +139,6 @@ other text such as code. The syntax uses the syntax = of the Django template system, and the core design of Django is reused in Grantlee.") (license license:lgpl2.1+))) =20 -(define-public qt-4 - (package - (name "qt") - (version "4.8.7") - (source (origin - (method url-fetch) - (uri (string-append "http://download.qt-project.org/archive/q= t/" - (string-copy version 0 (string-rindex ver= sion #\.)) - "/" version - "/qt-everywhere-opensource-src-" - version ".tar.gz")) - (sha256 - (base32 - "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272")) - (patches (search-patches "qt4-ldflags.patch")) - (modules '((guix build utils))) - (snippet - ;; Remove webkit module, which is not built. - '(begin (delete-file-recursively "src/3rdparty/webkit") - #t)))) - (build-system gnu-build-system) - (propagated-inputs - `(("mesa" ,mesa))) - (inputs - `(("alsa-lib" ,alsa-lib) - ("bluez" ,bluez) - ("cups" ,cups) - ("dbus" ,dbus) - ("double-conversion" ,double-conversion) - ("expat" ,expat) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) - ("icu4c" ,icu4c) - ("jasper" ,jasper) - ("libinput" ,libinput-minimal) - ("libmng" ,libmng) - ("libpci" ,pciutils) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("libwebp" ,libwebp) - ("libx11" ,libx11) - ("libxcomposite" ,libxcomposite) - ("libxcursor" ,libxcursor) - ("libxext" ,libxext) - ("libxfixes" ,libxfixes) - ("libxi" ,libxi) - ("libxinerama" ,libxinerama) - ("libxkbcommon" ,libxkbcommon) - ("libxml2" ,libxml2) - ("libxrandr" ,libxrandr) - ("libxrender" ,libxrender) - ("libxslt" ,libxslt) - ("libxtst" ,libxtst) - ("mtdev" ,mtdev) - ("mariadb-dev" ,mariadb "dev") - ("nss" ,nss) - ("postgresql" ,postgresql) - ("pulseaudio" ,pulseaudio) - ("pcre2" ,pcre2) - ("sqlite" ,sqlite) - ("udev" ,eudev) - ("unixodbc" ,unixodbc) - ("wayland" ,wayland) - ("xcb-util" ,xcb-util) - ("xcb-util-image" ,xcb-util-image) - ("xcb-util-keysyms" ,xcb-util-keysyms) - ("xcb-util-renderutil" ,xcb-util-renderutil) - ("xcb-util-wm" ,xcb-util-wm) - ("zlib" ,zlib) - ("libjpeg" ,libjpeg-turbo) - ("libsm" ,libsm) - ("openssl" ,openssl-1.0))) - (native-inputs - `(;; XXX: The JavaScriptCore engine does not build with the C++11 sta= ndard. - ;; We could build it with -std=3Dgnu++98, but then we'll get in tro= uble with - ;; ICU later. Just keep using GCC 5 for now. - ("gcc@5" ,gcc-5) - ("bison" ,bison) - ("flex" ,flex) - ("gperf" ,gperf) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-2) - ("ruby" ,ruby) - ("which" ,(@ (gnu packages base) which)))) - ;; Note: there are 37 MiB of examples and a '-exampledir' configure fl= ags, - ;; but we can't make them a separate output because "out" and "example= s" - ;; would refer to each other. - (outputs '("out" ;112MiB core + 37MiB exam= ples - "doc")) ;280MiB of HTML + code - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'set-paths 'hide-default-gcc - (lambda* (#:key inputs #:allow-other-keys) - (let ((gcc (assoc-ref inputs "gcc"))) - ;; Remove the default GCC from CPLUS_INCLUDE_PATH to prevent - ;; conflicts with the GCC 5 input. - (setenv "CPLUS_INCLUDE_PATH" - (string-join - (delete (string-append gcc "/include/c++") - (string-split (getenv "CPLUS_INCLUDE_PATH"= ) #\:)) - ":")) - #t))) - (replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (substitute* '("configure") - (("/bin/pwd") (which "pwd"))) - (substitute* "src/corelib/global/global.pri" - (("/bin/ls") (which "ls"))) - - (invoke - "./configure" - "-verbose" - "-prefix" out - "-nomake" "examples demos" - ;; Note: Don't pass '-docdir' since 'qmake' and - ;; libQtCore would record its value, thereby defeating - ;; the whole point of having a separate output. - "-datadir" (string-append out "/share/qt-" ,version - "/data") - "-importdir" (string-append out "/lib/qt-4" - "/imports") - "-plugindir" (string-append out "/lib/qt-4" - "/plugins") - "-translationdir" (string-append out "/share/qt-" ,version - "/translations") - "-demosdir" (string-append out "/share/qt-" ,version - "/demos") - "-examplesdir" (string-append out "/share/qt-" ,version - "/examples") - "-opensource" - "-confirm-license" - ;; explicitly link with dbus instead of dlopening it - "-dbus-linked" - ;; Skip the webkit module; it fails to build on armhf - ;; and, apart from that, may pose security risks. - "-no-webkit" - ;; don't use the precompiled headers - "-no-pch" - ;; drop special machine instructions not supported - ;; on all instances of the target - ,@(if (string-prefix? "x86_64" - (or (%current-target-system) - (%current-system))) - '() - '("-no-mmx" - "-no-3dnow" - "-no-sse" - "-no-sse2")) - "-no-sse3" - "-no-ssse3" - "-no-sse4.1" - "-no-sse4.2" - "-no-avx")))) - (add-after - 'install 'move-doc - (lambda* (#:key outputs #:allow-other-keys) - ;; Because of qt4-documentation-path.patch, documentation ends= up - ;; being installed in OUT. Move it to the right place. - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (olddoc (string-append out "/doc")) - (docdir (string-append doc "/share/doc/qt-" ,version))) - (mkdir-p (dirname docdir)) - - ;; Note: We can't use 'rename-file' here because OUT and DOC= are - ;; different "devices" due to bind-mounts. - (copy-recursively olddoc docdir) - (delete-file-recursively olddoc) - #t)))))) - (native-search-paths - (list (search-path-specification - (variable "QMAKEPATH") - (files '("lib/qt5"))) - (search-path-specification - (variable "QML2_IMPORT_PATH") - (files '("lib/qt5/qml"))) - (search-path-specification - (variable "QT_PLUGIN_PATH") - (files '("lib/qt5/plugins"))) - (search-path-specification - (variable "XDG_DATA_DIRS") - (files '("share"))) - (search-path-specification - (variable "XDG_CONFIG_DIRS") - (files '("etc/xdg"))))) - (home-page "https://www.qt.io/") - (synopsis "Cross-platform GUI library") - (description "Qt is a cross-platform application and UI framework for -developers using C++ or QML, a CSS & JavaScript like language.") - (license (list license:lgpl2.1 license:lgpl3)) - - ;; Qt 4: 'QBasicAtomicPointer' leads to build failures on MIPS; - ;; see . - ;; Qt 5: assembler error; see . - (supported-systems (delete "mips64el-linux" %supported-systems)))) - (define-public qtbase (package (name "qtbase") @@ -2223,53 +2019,6 @@ itself.") ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))))) =20 -(define-public python2-pyqt-4 - (package (inherit python-pyqt) - (name "python2-pyqt") - (version "4.12.3") - (source - (origin - (method url-fetch) - (uri - (string-append "mirror://sourceforge/pyqt/PyQt4/" - "PyQt-" version "/PyQt4_gpl_x11-" - version ".tar.gz")) - (sha256 - (base32 - "0wnlasg62rm5d39nq1yw4namcx2ivxgzl93r5f2vb9s0yaz5l3x0")))) - (native-inputs - `(("qt" ,qt-4))) - (inputs `(("python" ,python-2))) - (propagated-inputs - `(("python-sip" ,python2-sip))) - (arguments - `(#:tests? #f ; no check target - #:modules ((srfi srfi-1) - ,@%gnu-build-system-modules) - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (sip (string-append out "/share/sip")) - (python (assoc-ref inputs "python")) - (python-version - (last (string-split python #\-))) - (python-major+minor - (string-join - (take (string-split python-version #\.) 2) - ".")) - (lib (string-append out "/lib/python" - python-major+minor - "/site-packages"))) - (invoke "python" "configure.py" - "--confirm-license" - "--bindir" bin - "--destdir" lib - "--sipdir" sip))))))) - (license (list license:gpl2 license:gpl3)))) ; choice of either license - (define-public python-qtpy (package (name "python-qtpy") --=20 2.30.0 From unknown Mon Jun 23 15:00:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45704] [PATCH] gnu: Remove QT 4. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Jan 2021 12:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45704 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: 45704@debbugs.gnu.org Received: via spool by 45704-submit@debbugs.gnu.org id=B45704.161028326415026 (code B ref 45704); Sun, 10 Jan 2021 12:55:02 +0000 Received: (at 45704) by debbugs.gnu.org; 10 Jan 2021 12:54:24 +0000 Received: from localhost ([127.0.0.1]:53384 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyaEi-0003uG-Ez for submit@debbugs.gnu.org; Sun, 10 Jan 2021 07:54:24 -0500 Received: from flashner.co.il ([178.62.234.194]:44738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyaEg-0003tw-AQ for 45704@debbugs.gnu.org; Sun, 10 Jan 2021 07:54:22 -0500 Received: from localhost (unknown [5.102.238.249]) by flashner.co.il (Postfix) with ESMTPSA id 6A44B4000F; Sun, 10 Jan 2021 12:54:15 +0000 (UTC) Date: Sun, 10 Jan 2021 14:53:40 +0200 From: Efraim Flashner Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="UU/aIxYG6M1utHHF" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --UU/aIxYG6M1utHHF Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jan 06, 2021 at 02:58:37PM -0500, Leo Famulari wrote: > This package has been unsupported upstream for several years: >=20 > https://lists.gnu.org/archive/html/guix-devel/2016-02/msg00596.html >=20 > I suggest we apply this patch as part of a major update =E2=80=94 either = a core-updates > merge, or a new release. >=20 > We should notify the people who contributed or maintained the affected pa= ckages > so that they have ample time to update the packages and avoid their remov= al. >=20 > What do you think? I've added some in-line notes > * gnu/packages/qt.scm (qt-4, python2-pyqt-4): Remove variables. qt-4 when nothing depends on it, python2-pyqt-4 whenever > * gnu/packages/chemistry.scm (avogadro): Remove variable. I hear this has been superseded by development of avogadro2, but someone using it might want to let us know. > * gnu/packages/education.scm (tipp10): Remove variable. Debian has built this with qt-5 (https://sources.debian.org/src/tipp10/2.1.0-5/debian/) > * gnu/packages/engineering.scm (qucs, qucs-s): Remove variables. I don't know anything about this > * gnu/packages/messaging.scm (pybitmessage): Remove variable. I believe first introduced by Nikita, I don't know if they still use it, and I'm disappointed by the stable release being years old and still using qt4 and python2. I hear there is no concrete plans upstream for the next release still. > * gnu/packages/password-utils.scm (keepassx): Remove variable. IMO superseded by keepassxc > * gnu/packages/pdf.scm (poppler-qt4): Remove variable. Apparently nothing depends on this, so probably free to go. I'd like to hear from someone with regards to avogadro, perhaps also qucs. I'd also like to remind everyone that guix time-machine can be used to go back to before these will be removed :) --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --UU/aIxYG6M1utHHF Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl/6+NIACgkQQarn3Mo9 g1F7Iw/+PxipAP1EKswH1uK0kkON4SrTvJX8hlm9GUBt+tyxyPoqr2coA1eRg6ro T+ip864pfbC5PoEwtSxlX/wLYVHmbfyt3pLkWEWlz66Z1O/AugLyi2nU0aaHHD3Y PuZ4Ri6kIeIuR40nyimsVebD8k2rBvquSG6NuVGyTdANybrafEztr9j/l5NyqxqG nunrSge8XiDzwNG+18uALTHsdZB1+3Ek8/GppAW4QcwT7mBWev45OswC3z14ZDQJ UxLmEyOpEdtHRSlUmPQfZOTh9YOsD8L2R9+TzhmNI9CY1RAzaF/kkP0TJ556yQ75 xNxO9tzJjp2uaZgNw3/FnNsJK1J99abSP7qbiKqEHNAPmwPhEOYc9mX0tSr8MMfG U2vRD0FiReL3xPIkkV9xWjBZ15iTp4Y0/P04ENmlqXKEHX2R7XJmUbP4DfVAsk79 q1kk5f7KV2whODDQTcxpihxD4Hc0+5g7DMDKNDtfCPHykt1WPsvssJGj7GOKPigw z02Y3emcYiVcfPJJYVz6IdKimZzn0BY/WbWlMU9CXrA9w4XGWJ47uzXmeL1A7mDA qS/UtSf4JLi9JUX2e6fLohr+dv45S8VHFmgA91pDr4lcdjCSK82nrWFc38TmH9OT 2zw51Y2XX04pcNWDTnFPThp26Bg4FvZrouQp63b68yM3/TmLtKA= =bLpz -----END PGP SIGNATURE----- --UU/aIxYG6M1utHHF-- From unknown Mon Jun 23 15:00:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45704] [PATCH] gnu: Remove QT 4. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Jan 2021 13:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45704 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner Cc: 45704@debbugs.gnu.org, leo@famulari.name X-Debbugs-Original-Cc: 45704@debbugs.gnu.org, guix-patches@gnu.org, Leo Famulari Received: via spool by submit@debbugs.gnu.org id=B.16102849061850 (code B ref -1); Sun, 10 Jan 2021 13:22:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Jan 2021 13:21:46 +0000 Received: from localhost ([127.0.0.1]:53430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyafC-0000Tj-0z for submit@debbugs.gnu.org; Sun, 10 Jan 2021 08:21:46 -0500 Received: from lists.gnu.org ([209.51.188.17]:50038) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyaf0-0000T0-GT for submit@debbugs.gnu.org; Sun, 10 Jan 2021 08:21:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kyaf0-0005wW-98 for guix-patches@gnu.org; Sun, 10 Jan 2021 08:21:34 -0500 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21173) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kyaey-0004I4-Cf for guix-patches@gnu.org; Sun, 10 Jan 2021 08:21:33 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1610284887; cv=none; d=zohomail.com; s=zohoarc; b=W8eGqpCP5f/GY2M5SxcfMuSLT5BXpZwPwq45i9UMwlV7RELRKkiP63U2ColGzGpZJbgNLzy8KwOox7GtU9tISE1Bpd3E0MqHpGOhDFYVeeB3Myf7Y6nZ1u948H/FWlfEhUu5evXvn7N/kNqpcfUXbjmF264wBjTpr86KV4v8oyI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610284887; h=Content-Type:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=9d9au5OekOhPAt6xGwWghlqs3mE61pKEEivXK/hVqck=; b=nMA/IMoR1p2hoCGrVOM6v2IQLpl5gG7rjyG6SyxfJq6saAJqOoFnSojoTdgZ5EDxZgZuOK7cnuf3tpJ56yjsxhd7qy73naLG7j79hwXZJVd2RZLM1hUspDckfiJFfr15r7KkZJrTA/FHc6TihZDJCGUQkkiZ8kppSxmdmoudFMQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1610284887; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:To:Cc:Subject:In-reply-to:Date:Message-ID:MIME-Version:Content-Type; bh=9d9au5OekOhPAt6xGwWghlqs3mE61pKEEivXK/hVqck=; b=MxF+YHrL9w2VaPidEgphN6156hAWAPx66EVAGHczBY6vQlQ8SVCbHBv8Pp3yY7zW wNElPVq/6sVVCCTDcA9WRnYNixNBFNqGPiiutCr8EcXAUkFyFJF1kUEndD1sIwo1IFe YnPUEtPtBwz7UTiNH8GxMinZ2SbUVpdWr/8mTKS4= Received: from localhost (p54ad46ed.dip0.t-ipconnect.de [84.173.70.237]) by mx.zohomail.com with SMTPS id 1610284885980177.03934431947357; Sun, 10 Jan 2021 05:21:25 -0800 (PST) References: User-agent: mu4e 1.4.13; emacs 27.1 From: Ricardo Wurmus In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Sun, 10 Jan 2021 14:21:22 +0100 Message-ID: <87lfd1dj1p.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain X-ZohoMailClient: External Received-SPF: pass client-ip=136.143.188.51; envelope-from=rekado@elephly.net; helo=sender4-of-o51.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Efraim Flashner writes: >> * gnu/packages/password-utils.scm (keepassx): Remove variable. > > IMO superseded by keepassxc Should we define a deprecation replacement for keepassx then? -- Ricardo From unknown Mon Jun 23 15:00:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45704] [PATCH] gnu: Remove QT 4. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Jan 2021 18:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45704 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ricardo Wurmus Cc: Efraim Flashner , 45704@debbugs.gnu.org Received: via spool by 45704-submit@debbugs.gnu.org id=B45704.161030250432628 (code B ref 45704); Sun, 10 Jan 2021 18:16:01 +0000 Received: (at 45704) by debbugs.gnu.org; 10 Jan 2021 18:15:04 +0000 Received: from localhost ([127.0.0.1]:54918 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyfF1-0008UC-Vp for submit@debbugs.gnu.org; Sun, 10 Jan 2021 13:15:04 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:37029) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyfF0-0008TM-3R for 45704@debbugs.gnu.org; Sun, 10 Jan 2021 13:15:02 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id DF9F82C11; Sun, 10 Jan 2021 13:14:55 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sun, 10 Jan 2021 13:14:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=H1cw7l7IhqObg49yAczC4FYz O8y1WovM56Pv75aXa7U=; b=C6BJnfJAQmOjIKef3sOTFo8qz17MhZoWl0+a+im0 7enDogQqTPnLgYgoYrzfi7LatwubdeauTkjZNPcL3xIeLtmptFESUonusOIe0k2E DrL57Y6rv/AOc4usmrvnsJReWShLXl9d0K3eMzmvYWnNUqBeBsyUp0wyrcvZQY6m Q/c= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=H1cw7l 7IhqObg49yAczC4FYzO8y1WovM56Pv75aXa7U=; b=OVCkkI1/Q+P7t8zm1+Z8t9 bBo5yRT2I2I9hmluPL+u2OI0oNtKm3cuC0vC8Lc7iEKAnVR3YZjl87rcMdRR0oHP LuIbZwtl+kr4ws6uMcmE2DQir+jl9QoPJudf7dEPYcY/37Iak6+QIzdaHFQQH1Rz y1PsgH/bqMy5XBQytJcJA5U/nw07NC3WB5FbeTAPg4+6evoGA0Djy/uzzrphL5ZH Ss7/E1p5qvjBJ84HvhlDhBk/U0FNEF9FUK6gX2Rnr/BNgy4Q/4xVHr1udxhfV31P 96Q9WuprL6+E8R1f/nGb3GLC2vB62IniHbH+SNztJxiq/nNPy2xxlx+tS5PP7ZHw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvdegledgudduvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepnfgvohcu hfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrth htvghrnhepueekkedtffdvtddugeejgedtvefhueefiedvjeeitdeigedtveejvdejheff vefgnecukfhppeejfedrudeguddruddvjedrudegieenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id 0F59B108005C; Sun, 10 Jan 2021 13:14:55 -0500 (EST) Date: Sun, 10 Jan 2021 13:14:53 -0500 From: Leo Famulari Message-ID: References: <87lfd1dj1p.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87lfd1dj1p.fsf@elephly.net> X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sun, Jan 10, 2021 at 02:21:22PM +0100, Ricardo Wurmus wrote: > > Efraim Flashner writes: > > >> * gnu/packages/password-utils.scm (keepassx): Remove variable. > > > > IMO superseded by keepassxc > > Should we define a deprecation replacement for keepassx then? It was marked as "superseded" by keepassxc in commit b7ac10e6da6e2199aa379fdfa19bd43ca8fddc4d, in 2017. From unknown Mon Jun 23 15:00:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45704] [PATCH] gnu: Remove QT 4. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Jan 2021 20:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45704 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner Cc: 45704@debbugs.gnu.org, Leo Famulari Received: via spool by 45704-submit@debbugs.gnu.org id=B45704.16111741112526 (code B ref 45704); Wed, 20 Jan 2021 20:22:01 +0000 Received: (at 45704) by debbugs.gnu.org; 20 Jan 2021 20:21:51 +0000 Received: from localhost ([127.0.0.1]:56335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2JzC-0000eg-Oo for submit@debbugs.gnu.org; Wed, 20 Jan 2021 15:21:51 -0500 Received: from mout02.posteo.de ([185.67.36.66]:51135) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2JzA-0000eN-Lm for 45704@debbugs.gnu.org; Wed, 20 Jan 2021 15:21:49 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 1FBF32400FE for <45704@debbugs.gnu.org>; Wed, 20 Jan 2021 21:21:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1611174102; bh=blfBhrPWo9spmnSqOKw0+31b/rrbD0fUdZTsgZjti88=; h=From:To:Cc:Subject:Date:From; b=rWCW8f/mF/wmuyVydgNtAm3A5obUV3xzXptQH8EBtsx97XxV12dwe1qg2wk/HOfll 47P2jjugw4cGsWMXc5rRK11f3tAoIJm53IaXUL2/JaS67d+aujDtI7PgNlUXwhZeAk C8c3i4qYU9Z5CDi+mU9bMyn2cbD/Otp1T3Y5+Jm/1PlfTz+pKgHbTJAnpW+kBC63+0 XI+w8HGLsL5V7tRSxUDx9JjELxmTS9EuoIw3qt+rWAxCzPh0+8FpaVctTTDu5XzIGh Ve5dBGm0jSac5cF3mZZwbBhekRfnGVoMVhfjRxP8olnk+qoHiIGZ5CReOZPaoFYLfS ZrhZsDYhdG++w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4DLcPH0W4xz9rxK; Wed, 20 Jan 2021 21:21:38 +0100 (CET) From: Kei Kebreau References: Date: Wed, 20 Jan 2021 15:21:36 -0500 In-Reply-To: (Efraim Flashner's message of "Sun, 10 Jan 2021 14:53:40 +0200") Message-ID: <87o8hj741b.fsf_-_@posteo.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Efraim Flashner writes: > On Wed, Jan 06, 2021 at 02:58:37PM -0500, Leo Famulari wrote: ... > I'd like to hear from someone with regards to avogadro, perhaps also > qucs. Good thing I happened to see this message! I packaged Avogadro, and it looks like Avogadro 2 uses QT 5 as its default GUI toolkit [0]. I can add packaging Avogadro 2 to my Guix to-do list to make the removal of the original avogadro package a non-issue. Thanks, Kei [0]: https://github.com/OpenChemistry/avogadrolibs/blob/master/CMakeLists.txt#L54 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAmAIkNAACgkQ5qXuPBlG eg3iAA/9ECyZNQt0rklqtnTC75ipfbpBxbCnAbQ5wPjqgIV1wveo1vOrGSC418kF beJtNIrPl/dBTs3/qLSsWQ9co8slLr3owZKgeGURGPZqpnYnHJR8w4Os3vge1ay/ drtcdcteGtu6gdTV6E8wSTyk3XTSYkvxCcaPn4Xx2EYDXMezTAFTUIictTUO0i2e ojqShZdD+no5mOXESUfY9pzzTA65EsVMRXzX/5rT7jAEWoDfBlJ1xAKkH8pCw+NV ppU5TXb7tea6my77d5haxBBhTAbHdeWYZXxcqDts9+5GEz7TSPynBwQtzlL1jD/V xknBqLMM9BZQCPYryUVEIDWo3RVaaZLPMKje39mcORJSLaa3LteniiUbx1+Hpv4X dxMwlWGSaYdjZg0cHAXP7jTbJGqMNVSCUAUvvKBPReGWlOtKfxSQqeuSP/JGEDe9 4ytSMB5M480UQ0WLMQiGsG0jaaIeorCxjvVUTiaLJBBr9cnCCze54i82sqKKZ634 xXW3xEf8Aq+DSGx2oyxWpXq+/JPlsY9l4Y0Y9EQb8vCofbAndLseSmZE0tL9HOLX j3m4IEwJDd9HLZmdrO/fieUn7YTNYALQcBh67OYtvjjowSfJ+GqZ4Zpn63568y69 zyFt+EVtiaF7omrgoduRx/inI/8Lz41AEd1iHLbqKxV+2bVn2VA= =J1oT -----END PGP SIGNATURE----- --=-=-=-- From unknown Mon Jun 23 15:00:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45704] [PATCH] gnu: Remove QT 4. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Jan 2021 21:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45704 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Kei Kebreau Cc: Efraim Flashner , 45704@debbugs.gnu.org Received: via spool by 45704-submit@debbugs.gnu.org id=B45704.16111797853312 (code B ref 45704); Wed, 20 Jan 2021 21:57:02 +0000 Received: (at 45704) by debbugs.gnu.org; 20 Jan 2021 21:56:25 +0000 Received: from localhost ([127.0.0.1]:56394 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2LSi-0000rM-SR for submit@debbugs.gnu.org; Wed, 20 Jan 2021 16:56:25 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:45917) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2LSg-0000r7-BH for 45704@debbugs.gnu.org; Wed, 20 Jan 2021 16:56:23 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id E8B201B12; Wed, 20 Jan 2021 16:56:15 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 20 Jan 2021 16:56:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=bpf2ZGxuhtpWDtktoRWXl0H5 oY7PCJyNmCcA4MxyHS0=; b=wdFE7SrkacoyMtd91r+HtacAIG30ZWSOh+9SdRhg 8Lzuh48SMcfvwb2Th7wWgW568Cf8oNHW9Fo/s+Zj7vGK8Wb832pmfPMuwende7mR fx+tQ/ovoWoGnrW2oMM39+Dq3PME7Y4Eo/oW0hTpwbzzM+nLZ8fTP5p8QeI+RtXO mAk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=bpf2ZG xuhtpWDtktoRWXl0H5oY7PCJyNmCcA4MxyHS0=; b=WWqUxkwlj6iluP7S78CdK7 VdpygXBHu+XBk5XmLB1Ft0Dx7G79hnXWsgAXHAplJzWV4E+ZU6/XJBA71m7MWxib S49cTPBTfOm0qdySQxGqJIbA7dfFu90Bux9JgmhNeVg5o5sNNCtkTfO6SghehJPj WbI43irEplNwPmqjknkCYMJH3SlG/4R7q0hfueaztpyTatzXRUEMADWWPQJWMsbF YUKbmm4uaTTm7vGKrGoG0iatrSO3jsPOcv9Zv/VaT/ZH3wk3PBNCrYZk8EyfOidh IYcJ+QQiNNiETbyX6chvRf16/uqgHKNkPa4Ok/vtt0wD/Ro0nVgazAhxnWXSqDcA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddvgdduheeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefnvghoucfh rghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtth gvrhhnpeeukeektdffvddtudegjeegtdevhfeufeeivdejiedtieegtdevjedvjeehffev gfenucfkphepuddttddruddurdduieelrdduudeknecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (pool-100-11-169-118.phlapa.fios.verizon.net [100.11.169.118]) by mail.messagingengine.com (Postfix) with ESMTPA id 3019D24005A; Wed, 20 Jan 2021 16:56:15 -0500 (EST) Date: Wed, 20 Jan 2021 16:56:13 -0500 From: Leo Famulari Message-ID: References: <87o8hj741b.fsf_-_@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87o8hj741b.fsf_-_@posteo.net> X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Wed, Jan 20, 2021 at 03:21:36PM -0500, Kei Kebreau wrote: > Good thing I happened to see this message! I packaged Avogadro, and it > looks like Avogadro 2 uses QT 5 as its default GUI toolkit [0]. I can > add packaging Avogadro 2 to my Guix to-do list to make the removal of > the original avogadro package a non-issue. Okay, let us know how it goes! My plan is to contact the people that added or maintained packages depending on Qt 4, giving them a few months to chime in. From unknown Mon Jun 23 15:00:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45704] [PATCH] gnu: Remove QT 4. Resent-From: Kei Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jan 2021 21:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45704 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: Efraim Flashner , 45704@debbugs.gnu.org Received: via spool by 45704-submit@debbugs.gnu.org id=B45704.16116100166011 (code B ref 45704); Mon, 25 Jan 2021 21:27:02 +0000 Received: (at 45704) by debbugs.gnu.org; 25 Jan 2021 21:26:56 +0000 Received: from localhost ([127.0.0.1]:40198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l49Nw-0001Yr-Jf for submit@debbugs.gnu.org; Mon, 25 Jan 2021 16:26:56 -0500 Received: from mout02.posteo.de ([185.67.36.66]:35897) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l49Nu-0001Ye-Dc for 45704@debbugs.gnu.org; Mon, 25 Jan 2021 16:26:55 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 381902400FB for <45704@debbugs.gnu.org>; Mon, 25 Jan 2021 22:26:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1611610008; bh=1JGNIrEymIN3Am4D33h8KDpuXRcb8TflNy2cz8HBFsw=; h=Subject:From:To:Cc:Date:From; b=Sas/jI0A8r4R4Ns/Z0G4IE+0kxOmIA2q3t89oRyc0EC0/6zighown3eKlfPSVSFcC 4wAZNBvvzyO54/TSANNQFFrhOmH7dxsZMByvma1Oj/I9eqluVV33xL7H1nYLdOUYAU JILe+cSRwhvhpcKgwDKy7uLx5cTzLp6jsmUxcOy7Iy3sQDxnYRjpzwobdC1n6qqx+E wUeA97d4qc1fw35cpDCLCC2NvWACj21bTlg6XdraMCl1K2LuULePpKpkN+vKwn0XJX yoroGIlN+l8v8VSJ5Z6sc5gaU7eDge54ITEdBLnIOLZ2kIU+Biv+uGmJduhcnC/FND wDYBPqZOzT9/A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4DPjc5296mz9rxL; Mon, 25 Jan 2021 22:26:45 +0100 (CET) Message-ID: From: Kei Date: Mon, 25 Jan 2021 16:26:41 -0500 In-Reply-To: References: <87o8hj741b.fsf_-_@posteo.net> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) On Wed, 2021-01-20 at 16:56 -0500, Leo Famulari wrote: > On Wed, Jan 20, 2021 at 03:21:36PM -0500, Kei Kebreau wrote: > > Good thing I happened to see this message! I packaged Avogadro, and it > > looks like Avogadro 2 uses QT 5 as its default GUI toolkit [0]. I can > > add packaging Avogadro 2 to my Guix to-do list to make the removal of > > the original avogadro package a non-issue. > > Okay, let us know how it goes! > > My plan is to contact the people that added or maintained packages > depending on Qt 4, giving them a few months to chime in. Hello all, Please see Guix issue 46107 for a draft of the Avogadro 2 package! http://issues.guix.info/46107 Thanks, Kei From unknown Mon Jun 23 15:00:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45704] Proposed removal of qucs and qucs-s from Guix due to Qt 4 removal References: In-Reply-To: Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Jan 2021 00:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45704 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Theodoros Foradis Cc: 45704@debbugs.gnu.org Received: via spool by 45704-submit@debbugs.gnu.org id=B45704.161188182514626 (code B ref 45704); Fri, 29 Jan 2021 00:58:02 +0000 Received: (at 45704) by debbugs.gnu.org; 29 Jan 2021 00:57:05 +0000 Received: from localhost ([127.0.0.1]:50646 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l5I5w-0003np-O5 for submit@debbugs.gnu.org; Thu, 28 Jan 2021 19:57:04 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:44651) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l5I5r-0003nI-Tm for 45704@debbugs.gnu.org; Thu, 28 Jan 2021 19:57:03 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id CAAB112EC; Thu, 28 Jan 2021 19:56:53 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Thu, 28 Jan 2021 19:56:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=mesmtp; bh=5WmIGIC9UpP/zxcnkdD1xeVbss0M0TOF+libs116RlI=; b=Uu e1sohtUW+4vvQ7AsJVyHknEGQJwjgCt9KIfyahVTuFWT2ccMpFqJo+YZy9yb1H0k S9msIMwufOZjOrRgtyJbH86cn+Qa4+pSfJ9XddmaZMCv+keatoXBEGXS4uiRLmK1 /CS9RfK+lfy/TX1UZi+cuQsWzlCSuBRqOvy+lLUuA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=5WmIGIC9UpP/zxcnkdD1xeVbss0M0 TOF+libs116RlI=; b=E7UJd4Srl59MrK8xebezeXOHxxRyxHA6Km8a2g1Bjv9Kd qdEmG6DAwGOjXdKXueURBZpMlf8o04LyCZrtGLbLgI9ii7J5XcE37W18w0mw0fix WvCQvf2RBESiagwBH1T8TXVKSUL2tQI+9t6aT1/y4WMXAgjuROlc6oMPcrm1kgiy uCGCg7/Rg8PKDK7XTZcf6eqwhKo6bA8xcVCoPfQbc031r8XhmpGlZSzE5YujDSFy 0fkwHblLPKRduTAteo1YfBsMmKQBznEeZA/QK5h9EGZTmBRqe/Z5iXrihq+5q3zK OGMoXxhhVg8La54vXi38wjx9Q4swjJt4ZdjqxCigA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrfedugddvgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkgggtugesthdtredttddtvdenucfhrhhomhepnfgvohcuhfgrmhhu lhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvghrnh epueeiudeijeduffdvhfejvdegvdehgffgjedvveekfeefleefkeeuieejudevtedunecu ffhomhgrihhnpehgnhhurdhorhhgnecukfhppedutddtrdduuddrudeiledruddukeenuc evlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehf rghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (pool-100-11-169-118.phlapa.fios.verizon.net [100.11.169.118]) by mail.messagingengine.com (Postfix) with ESMTPA id 0A79F108005B; Thu, 28 Jan 2021 19:56:53 -0500 (EST) Date: Thu, 28 Jan 2021 19:56:51 -0500 From: Leo Famulari Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, This message is to notify you that some packages you contributed to Guix (qucs and qucs-s) are going to be removed in the near-ish future due to proposed removal of their dependency, Qt 4: We hope that it will not be too difficult to update these packages to work with Qt 5. Sincerely, Leo From unknown Mon Jun 23 15:00:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45704] Proposed removal of pybitmessage from Guix due to Qt 4 removal References: In-Reply-To: Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Jan 2021 01:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45704 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: nikita Cc: 45704@debbugs.gnu.org Received: via spool by 45704-submit@debbugs.gnu.org id=B45704.161188201314993 (code B ref 45704); Fri, 29 Jan 2021 01:01:01 +0000 Received: (at 45704) by debbugs.gnu.org; 29 Jan 2021 01:00:13 +0000 Received: from localhost ([127.0.0.1]:50651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l5I8z-0003tl-8N for submit@debbugs.gnu.org; Thu, 28 Jan 2021 20:00:13 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:44353) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l5I8x-0003tV-LK for 45704@debbugs.gnu.org; Thu, 28 Jan 2021 20:00:12 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id AC13F12F9; Thu, 28 Jan 2021 20:00:05 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 28 Jan 2021 20:00:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=mesmtp; bh=bMmDCWX3IMBxBfmIl7A9UsznkrybIhwSs5RzvlgH3h4=; b=11 Q4sG6XS2pbbMcR015O80EG9agCVR0+OxC1m2Swf/XPI/S5ZVePlaowIcL8MoYOtV yUhFemMBxUMtaBJSD7NKWPlJIuPhNBLFjS+4L6Ui4YSm4qJNupFl13Qv5aK3o/IR M9tU0fRtbsl7B+5pEHyS7O8N/QdQRYOol0BCy1QiQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=bMmDCWX3IMBxBfmIl7A9UsznkrybI hwSs5RzvlgH3h4=; b=lf9D7hq1Bt7ecbngoPhLx0GcYiKYNZBibk6etgyrfRVqv jYQALwq9B6jIVnNODLCzYMeMxphpjnEjMLj54LZSUcf3qqZkY13vjsMXOzQwmR7Y fsTdHWc/A9EWbLUUm+0w+KzS3f4698FhfcJPWz8ro27LhhApFrUc7wIaDp3j+DTe n9Jq1zJb5wszybxItfNxdKzp8XeGPsMD2Pav09FauylQFXsn6nIPLvVX6Ntn6toa MhgGcRFQ/AGtQsV++l/PDV+BYgZOhGzg0OnxTtsicRKNsprI7XSizZ12i+j0/7Mz NNZrfklLE5paGQmsiKTQQmYxWSKLDKKbQcqmFrPCA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrfedugddvhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepfffhvffukfggtggusehttdertddttd dvnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdr nhgrmhgvqeenucggtffrrghtthgvrhhnpeeuieduieejudffvdfhjedvgedvhefggfejvd evkeeffeelfeekueeijeduveetudenucffohhmrghinhepghhnuhdrohhrghenucfkphep uddttddruddurdduieelrdduudeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrg hmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (pool-100-11-169-118.phlapa.fios.verizon.net [100.11.169.118]) by mail.messagingengine.com (Postfix) with ESMTPA id 523B624005A; Thu, 28 Jan 2021 20:00:04 -0500 (EST) Date: Thu, 28 Jan 2021 20:00:02 -0500 From: Leo Famulari Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello, This message is to notify you that a package you contributed to Guix (pybitmessage) is going to be removed in the near-ish future due to proposed removal of its dependency, python2-pyqt-4. Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [64.147.123.21 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [64.147.123.21 listed in wl.mailspike.net] 2.0 PDS_TONAME_EQ_TOLOCAL_SHORT Short body with To: name matches everything in local email X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) Hello, This message is to notify you that a package you contributed to Guix (pybitmessage) is going to be removed in the near-ish future due to proposed removal of its dependency, python2-pyqt-4. We hope that it will not be too difficult to update this package to work with Qt 5. Sincerely, Leo From unknown Mon Jun 23 15:00:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45704] [PATCH] gnu: Remove QT 4. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Jan 2021 01:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45704 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner Cc: guix-maintainers@gnu.org, 45704@debbugs.gnu.org Received: via spool by 45704-submit@debbugs.gnu.org id=B45704.161188225715344 (code B ref 45704); Fri, 29 Jan 2021 01:05:02 +0000 Received: (at 45704) by debbugs.gnu.org; 29 Jan 2021 01:04:17 +0000 Received: from localhost ([127.0.0.1]:50656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l5ICu-0003zQ-SR for submit@debbugs.gnu.org; Thu, 28 Jan 2021 20:04:17 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:39227) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l5ICs-0003z9-1R for 45704@debbugs.gnu.org; Thu, 28 Jan 2021 20:04:15 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 274C713B3; Thu, 28 Jan 2021 20:04:08 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 28 Jan 2021 20:04:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=u5y2XEPETv6IxxvhqI+tSiDa /IRf33TttqXT8vbO4aw=; b=X3ntHhhzmshxyYnrasfcPgSbdgvxQeECVuIsxODr H4QCeljVssDiovdtFJ8fmfoWsVa0z7XRId9mqyQkiX/wqMqPGWKIJdbxcwgeikuc z6o95Y12/r/pFRIdhqVf0HnvM053oHhKhC/cZdKgF3Ehn2OuyioKMwzCg7NnVEmV s/o= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=u5y2XE PETv6IxxvhqI+tSiDa/IRf33TttqXT8vbO4aw=; b=fNnRI7jALG3CX21vzF8/E0 FhpMZ8bEoO+GeaU5uFi/k3D1f1LN1GhCU7RS9jivfsVSHDSpj9BHZP1VKUwfIWuq Wiizvb7Go9/gSv6l2qhGV2BJWkDAolLIYcFxP1pPERk86eDIXjSFc9FGVxiCvV+C r3vXbRGi2wtfRK9iXRNMah4VTh6J4WLMe3H/6CQLUnTsI3pxYRhPu3W4X8Gm5Gvm 4XI1kBdiH9Telm0Yyp8sDtwwAIJnVbSDI813iHa2eRYT6b2jcHqRT/+OXHB/RKyw lG6QqqDrlPcJC3ZPFsqRHSMqmpjagxjJIpxv7vp7wEf5e6zjfmIZlAPp3wH/MFpA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrfedugddvhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepnfgvohcuhfgr mhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvg hrnhepheevtdehkedthedvheffvdelleefleevffevffehvdevgeeiffeugfdvkeetveet necuffhomhgrihhnpeguvggsihgrnhdrohhrghenucfkphepuddttddruddurdduieelrd duudeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhep lhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (pool-100-11-169-118.phlapa.fios.verizon.net [100.11.169.118]) by mail.messagingengine.com (Postfix) with ESMTPA id AA92B240057; Thu, 28 Jan 2021 20:04:06 -0500 (EST) Date: Thu, 28 Jan 2021 20:04:05 -0500 From: Leo Famulari Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sun, Jan 10, 2021 at 02:53:40PM +0200, Efraim Flashner wrote: > > * gnu/packages/education.scm (tipp10): Remove variable. > > Debian has built this with qt-5 > (https://sources.debian.org/src/tipp10/2.1.0-5/debian/) Thanks for updating this package to use Qt 5, Efraim! The only packages remaining without replacements are qucs / qucs-s and pybitmessage, and I've CC-ed their authors to this thread. I propose we remove Qt 4 in the next release (CC-ing the maintainers). Leo From unknown Mon Jun 23 15:00:55 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#45704] [PATCH] gnu: Remove QT 4. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 06 Mar 2021 23:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45704 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch Cc: 45704@debbugs.gnu.org Received: via spool by 45704-submit@debbugs.gnu.org id=B45704.161507305120851 (code B ref 45704); Sat, 06 Mar 2021 23:25:02 +0000 Received: (at 45704) by debbugs.gnu.org; 6 Mar 2021 23:24:11 +0000 Received: from localhost ([127.0.0.1]:38523 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lIgHB-0005Pn-Hv for submit@debbugs.gnu.org; Sat, 06 Mar 2021 18:24:11 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:58899) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lIgH6-0005PV-D2 for 45704@debbugs.gnu.org; Sat, 06 Mar 2021 18:23:59 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 8FECB1B6B; Sat, 6 Mar 2021 18:23:50 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sat, 06 Mar 2021 18:23:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=qPlndslfA0h8WVp93qkZ01Kg Pja+IB1cdDe/E94it/k=; b=UeXZ43PGr2RRggS9ke19bFkEPFeQjdDMQxXD1BfR KjDPprhk1EpfBJ98WzFopo0hfo+bgfQhiyzCPXp8UmOHOmu+zO1/N7XfWy+ayig8 716XEJakV2IexV4Aojx3ZUn7JS7+Xrbf8XzQRmPONUC0RvIkRChm+qh/w7wybclL tm8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=qPlnds lfA0h8WVp93qkZ01KgPja+IB1cdDe/E94it/k=; b=wZZoPn2QI9I9nb6x6pV54p q5mAYoSdQ+c36WTVQCe61Vbzqdr3l2MYPE46JL9bQLDmK5U/lLo7ZflBWcZi8pv9 U3W0HXmdqwIlGqwnvEpa/jRrukiw+RNv1w98xFVd3ZdkrJVtovYFeYDLyg3ZTLM/ K/eQ66Kt+ABiAzfDQK0liN/VLh315fLA/ybjQxHrHXGCg8PKg3LSi/l3HAe3KNg2 8NFP4i5XxblzDq0olUwYDMt0IhNnMhCDYF5lUjkY0I6Tg7nncTcn56eDNJcdIwaQ ola1qdd5dfQ2OwdNf47QZItbnmU3IOoe9cZbrEFJXyZLATvTIiT5tnFRZRDqH7Iw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddtledguddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenuchmihhsshhinhhgucfvqfcufhhivghlugculdeftd dmnecujfgurhepfffhuffkfhggtggujgesghdtreertddtvdenucfhrhhomhepnfgvohcu hfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrth htvghrnhepvdekhfejiedvieduheelhfeuteevgffhffevtefhgeffgeehfeejveduvefg ffdunecukfhppedutddtrdduuddrudeiledruddukeenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (pool-100-11-169-118.phlapa.fios.verizon.net [100.11.169.118]) by mail.messagingengine.com (Postfix) with ESMTPA id C2773240054 for <45704@debbugs.gnu.org>; Sat, 6 Mar 2021 18:23:49 -0500 (EST) Date: Sat, 6 Mar 2021 18:23:48 -0500 From: Leo Famulari Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="oNhYWJf9vHcdfqGT" Content-Disposition: inline In-Reply-To: X-Spam-Score: 0.5 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) --oNhYWJf9vHcdfqGT Content-Type: multipart/mixed; boundary="ieK6m9MsdB8QIkgW" Content-Disposition: inline --ieK6m9MsdB8QIkgW Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Jan 28, 2021 at 08:04:05PM -0500, Leo Famulari wrote: > I propose we remove Qt 4 in the next release (CC-ing the maintainers). I've pushed an updated Qt 4 removal patch (attached) to the wip-next-release branch. --ieK6m9MsdB8QIkgW Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-Remove-QT-4.patch" Content-Transfer-Encoding: quoted-printable =46rom 2d977b43f333dec1e82703ceae4e692d46a5a2fb Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari Date: Sat, 6 Mar 2021 18:06:21 -0500 Subject: [PATCH] gnu: Remove QT 4. * gnu/packages/qt.scm (qt-4, python2-pyqt-4): Remove variables. * gnu/packages/engineering.scm (qucs, qucs-s): Remove variables. * gnu/packages/language.scm (nimf): Remove variable. * gnu/packages/password-utils.scm (keepassx): Remove variable. * gnu/packages/pdf.scm (poppler-qt4): Remove variable. * gnu/packages/telegram.scm (telegram-desktop): Remove variable. --- gnu/packages/engineering.scm | 250 -------------------------- gnu/packages/language.scm | 132 -------------- gnu/packages/password-utils.scm | 31 ---- gnu/packages/pdf.scm | 7 - gnu/packages/qt.scm | 251 -------------------------- gnu/packages/telegram.scm | 309 -------------------------------- 6 files changed, 980 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f560a15aa9..52680f0b65 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2015,256 +2015,6 @@ parallel computing platforms. It also supports ser= ial execution.") (license (list license:gpl2+ license:lgpl2.0+)))) ; freehdl's libraries =20 -(define-public qucs - ;; Qucs 0.0.19 segfaults when using glibc-2.26. Temporarily build from g= it. - ;; TODO: When qucs-0.0.20 is released, revert the commit that introduced= this - ;; comment and update the package. - (let ((commit "b4f27d9222568066cd59e4c387c51a35056c99d8") - (revision "0")) - (package - (name "qucs") - (version (git-version "0.0.19" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Qucs/qucs") - (commit commit))) - (sha256 - (base32 "10bclay9xhkffmsh4j4l28kj1qpxx0pnxja5vx6305cllnq4= r3gb")) - (file-name (string-append name "-" version "-checkout")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'patch-bootstrap - (lambda _ - (for-each patch-shebang - '("bootstrap" - "qucs/bootstrap" - "qucs-doc/bootstrap" - "qucs-core/bootstrap")) - #t)) - (add-before 'configure 'patch-configure - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "qucs/configure" - (("\\$QTDIR") (assoc-ref inputs "qt4"))) - #t)) - (add-after 'patch-configure 'patch-scripts - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* '("qucs/qucs/qucsdigi" - "qucs/qucs/qucsdigilib" - "qucs/qucs/qucsveri") - (("\\$BINDIR") - (string-append (assoc-ref outputs "out") "/bin")) - (("freehdl-config") - (string-append (assoc-ref inputs "freehdl") "/bin/freehd= l-config")) - (("freehdl-v2cc") - (string-append (assoc-ref inputs "freehdl") "/bin/freehd= l-v2cc")) - (("cp ") - (string-append (assoc-ref inputs "coreutils") "/bin/cp "= )) - (("glibtool") - (string-append (assoc-ref inputs "libtool") "/bin/libtoo= l")) - (("sed") - (string-append (assoc-ref inputs "sed") "/bin/sed")) - (("iverilog") - (string-append (assoc-ref inputs "iverilog") "/bin/iveri= log")) - (("vvp") - (string-append (assoc-ref inputs "iverilog") "/bin/vvp")= )) - #t)) - (add-before 'check 'pre-check - (lambda _ - ;; The test suite requires a running X server. - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - #t)) - (add-after 'install 'make-wrapper - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; 'qucs' directly invokes gcc, hence this wrapping. - (wrap-program (string-append out "/bin/qucs") - `("CPLUS_INCLUDE_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/include"))) - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/bin"))) - `("LIBRARY_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/lib"))) - `("ADMSXMLBINDIR" ":" prefix - (,(string-append (assoc-ref inputs "adms") "/bin"))) - `("ASCOBINDIR" ":" prefix - (,(string-append (assoc-ref inputs "asco") "/bin"))) - `("QUCS_OCTAVE" ":" prefix - (,(string-append (assoc-ref inputs "octave") "/bin/oc= tave"))))) - #t))) - #:parallel-build? #f ; race condition - #:configure-flags '("--disable-doc"))) ; we need octave-epstk - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("bison" ,bison) - ("flex" ,flex) - ("gperf" ,gperf) - ("libtool-native" ,libtool) - ("pkg-config" ,pkg-config) - ("python" ,python-2) ; for tests - ("matplotlib" ,python2-matplotlib) ; for tests - ("numpy" ,python2-numpy) ; for tests - ("xorg-server" ,xorg-server-for-tests))) ; for tests - (inputs - `(("adms" ,adms) - ("asco" ,asco) - ("coreutils" ,coreutils) - ("freehdl" ,freehdl) - ("gcc-toolchain" ,gcc-toolchain) - ("iverilog" ,iverilog) - ("libtool" ,libtool) - ("octave" ,octave-cli) - ("qt4" ,qt-4) - ("sed" ,sed))) - (home-page "http://qucs.sourceforge.net/") - (synopsis "Circuit simulator with graphical user interface") - (description - "Qucs is a circuit simulator with graphical user interface. The so= ftware -aims to support all kinds of circuit simulation types---e.g. DC, AC, -S-parameter, transient, noise and harmonic balance analysis. Pure digital -simulations are also supported.") - (license license:gpl2+)))) - -(define-public qucs-s - (package - (name "qucs-s") - (version "0.0.21") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ra3xdh/qucs_s/archiv= e/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "12m1jwhb9qwvb141qzyskbxnw3wn1x22d02z4b4862p7xvccl5h7")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-scripts - (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("qucs/qucsdigi" - "qucs/qucsdigilib" - "qucs/qucsveri") - (("\\$BINDIR") - (string-append (assoc-ref inputs "qucs") "/bin")) - (("freehdl-config") - (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-= config")) - (("freehdl-v2cc") - (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-= v2cc")) - (("cp ") - (string-append (assoc-ref inputs "coreutils") "/bin/cp ")) - (("glibtool") - (string-append (assoc-ref inputs "libtool") "/bin/libtool"= )) - (("sed") - (string-append (assoc-ref inputs "sed") "/bin/sed")) - (("iverilog") - (string-append (assoc-ref inputs "iverilog") "/bin/iverilo= g")) - (("vvp") - (string-append (assoc-ref inputs "iverilog") "/bin/vvp"))) - #t)) - (add-after 'patch-scripts 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "qucs/main.cpp" - (((string-append "QucsSettings\\.Qucsator =3D QucsSettings\= \.BinDir " - "\\+ \"qucsator\" \\+ executableSuffix")) - (string-append "}{ QucsSettings.Qucsator =3D \"" - (assoc-ref inputs "qucs") "/bin/qucsator\""= )) - (((string-append "QucsSettings\\.XyceExecutable =3D " - "\"/usr/local/Xyce-Release-6.8.0-OPENSOURC= E/bin/Xyce")) - (string-append "}{ QucsSettings.XyceExecutable =3D \"" - (assoc-ref inputs "xyce-serial") "/bin/Xyce= ")) - (((string-append "else QucsSettings\\.XyceParExecutable =3D= " - "\"mpirun -np %p /usr/local" - "/Xyce-Release-6.8.0-OPENMPI-OPENSOURCE/bi= n/Xyce")) - (string-append "QucsSettings.XyceParExecutable =3D \"" - (assoc-ref inputs "mpi") "/bin/mpirun -np %= p " - (assoc-ref inputs "xyce-parallel") "/bin/Xy= ce")) - (("else QucsSettings\\.NgspiceExecutable =3D \"ngspice\"") - (string-append "QucsSettings.NgspiceExecutable =3D " "\"" - (assoc-ref inputs "ngspice") "/bin/ngspice\= ""))) - (substitute* "qucs/extsimkernels/ngspice.cpp" - (("share/qucs/xspice_cmlib") "share/qucs-s/xspice_cmlib")) - (substitute* "qucs/qucs_actions.cpp" - (("qucstrans") - (string-append (assoc-ref inputs "qucs") "/bin/qucstrans")) - (("qucsattenuator") - (string-append (assoc-ref inputs "qucs") "/bin/qucsattenua= tor")) - (("qucsrescodes") - (string-append (assoc-ref inputs "qucs") "/bin/qucsrescode= s"))) - #t)) - (add-after 'install 'install-scripts - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each - (lambda (script) - (let ((file (string-append "../qucs_s-" ,version - "/qucs/" script)) - (out (assoc-ref outputs "out"))) - (install-file file (string-append out "/bin")) - (chmod (string-append out "/bin/" script) #o555))) - '("qucsdigi" "qucsdigilib" "qucsveri")) - #t)) - (add-after 'install-scripts 'make-wrapper - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (file (string-append out "/bin/qucs-s")) - (qucs (assoc-ref inputs "qucs")) - (qucsator (string-append qucs "/bin/qucsator"))) - (wrap-program file - `("CPLUS_INCLUDE_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/include"))) - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/bin"))) - `("LIBRARY_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/lib"))) - `("QUCSATOR" ":" prefix (,qucsator)) - `("QUCSCONV" ":" prefix (,(string-append qucsator "/bin/q= ucsconv"))) - `("ADMSXMLBINDIR" ":" prefix (,(string-append (assoc-ref = inputs "adms") - "/bin"))) - `("ASCOBINDIR" ":" prefix (,(string-append (assoc-ref inp= uts "asco") - "/bin"))) - `("QUCS_OCTAVE" ":" prefix (,(string-append (assoc-ref in= puts "octave") - "/bin/octave"= )))) - (symlink qucsator (string-append out "/bin/qucsator")) - #t)))))) - (native-inputs - `(("libtool-native" ,libtool))) - (inputs - `(("adms" ,adms) - ("asco" ,asco) - ("coreutils" ,coreutils) - ("freehdl" ,freehdl) - ("gcc-toolchain" ,gcc-toolchain) - ("iverilog" ,iverilog) - ("libtool" ,libtool) - ("mpi" ,openmpi) - ("ngspice" ,ngspice) - ("octave" ,octave-cli) - ("qt4" ,qt-4) - ("qucs" ,qucs) - ("sed" ,sed) - ("xyce-serial" ,xyce-serial) - ("xyce-parallel" ,xyce-parallel))) - (home-page "https://ra3xdh.github.io/") - (synopsis "Circuit simulator with graphical user interface") - (description - "Qucs-S is a spin-off of the Qucs cross-platform circuit simulator. -The S letter indicates SPICE. The purpose of the Qucs-S subproject is to = use -free SPICE circuit simulation kernels with the Qucs GUI. It provides the -simulator backends @code{Qucsator}, @code{ngspice} and @code{Xyce}.") - (license license:gpl2+))) - (define-public librepcb (package (name "librepcb") diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 576a1c14ab..7264cb4e73 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -66,138 +66,6 @@ #:use-module (guix git-download) #:use-module (guix utils)) =20 -(define-public nimf - (package - (name "nimf") - (version "1.2") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/hamonikr/nimf.git") - (commit - (string-append "nimf-" version)))) - (file-name - (git-file-name name version)) - (sha256 - (base32 "01qi7flmaqrn2fk03sa42r0caks9d8lsv88s0bgxahhxwk1x76gc")))) - (build-system glib-or-gtk-build-system) - (outputs '("out" "doc")) - (arguments - `(#:imported-modules - (,@%glib-or-gtk-build-system-modules - (guix build cmake-build-system) - (guix build qt-build-system)) - #:modules - ((guix build glib-or-gtk-build-system) - ((guix build qt-build-system) - #:prefix qt:) - (guix build utils)) - #:configure-flags - (list - "--with-im-config-data" - "--with-imsettings-data" - (string-append "--with-html-dir=3D" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-flags - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "configure.ac" - (("-Werror") - "-Wno-error")) - #t)) - (add-after 'patch-flags 'patch-docbook-xml - (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion "docs" - (substitute* "nimf-docs.xml" - (("http://www.oasis-open.org/docbook/xml/4.3/") - (string-append (assoc-ref inputs "docbook-xml-4.3") - "/xml/dtd/docbook/")))) - #t)) - (add-after 'patch-docbook-xml 'patch-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "configure.ac" - (("/usr/share/anthy/anthy.dic") - (string-append (assoc-ref inputs "anthy") - "/share/anthy/anthy.dic"))) - (substitute* "configure.ac" - (("/usr/bin:\\$GTK3_LIBDIR/libgtk-3-0") - (string-append (assoc-ref inputs "gtk+:bin") - "/bin:$GTK3_LIBDIR/libgtk-3-0")) - (("/usr/bin:\\$GTK2_LIBDIR/libgtk2.0-0") - (string-append (assoc-ref inputs "gtk+-2:bin") - "/bin:$GTK2_LIBDIR/libgtk2.0-0"))) - (substitute* "modules/clients/gtk/Makefile.am" - (("\\$\\(GTK3_LIBDIR\\)") - (string-append (assoc-ref outputs "out") - "/lib")) - (("\\$\\(GTK2_LIBDIR\\)") - (string-append (assoc-ref outputs "out") - "/lib"))) - (substitute* "modules/clients/qt4/Makefile.am" - (("\\$\\(QT4_LIB_DIR\\)") - (string-append (assoc-ref outputs "out") - "/lib"))) - (substitute* "modules/clients/qt5/Makefile.am" - (("\\$\\(QT5_IM_MODULE_DIR\\)") - (string-append (assoc-ref outputs "out") - "/lib/qt5/plugins/inputmethods"))) - (substitute* '("bin/nimf-settings/Makefile.am" - "data/apparmor-abstractions/Makefile.am" - "data/Makefile.am" "data/im-config/Makefile.am" - "data/imsettings/Makefile.am") - (("/etc") - (string-append (assoc-ref outputs "out") - "/etc")) - (("/usr/share") - (string-append (assoc-ref outputs "out") - "/share"))) - #t)) - (add-after 'install 'qt-wrap - (assoc-ref qt:%standard-phases 'qt-wrap))))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("docbook-xml-4.3" ,docbook-xml-4.3) - ("gettext" ,gettext-minimal) - ("gobject-introspection" ,gobject-introspection) - ("gtk+-2:bin" ,gtk+-2 "bin") - ("gtk+:bin" ,gtk+ "bin") - ("gtk-doc" ,gtk-doc) - ("intltool" ,intltool) - ("libtool" ,libtool) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("which" ,which))) - (inputs - `(("anthy" ,anthy) - ("appindicator" ,libappindicator) - ("gtk+-2" ,gtk+-2) - ("gtk+" ,gtk+) - ("hangul" ,libhangul) - ("m17n-db" ,m17n-db) - ("m17n-lib" ,m17n-lib) - ("qt-4" ,qt-4) - ("qtbase" ,qtbase) - ("rime" ,librime) - ("rsvg" ,librsvg) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) - ("x11" ,libx11) - ("xkbcommon" ,libxkbcommon) - ("xklavier" ,libxklavier))) - (propagated-inputs - `(("glib" ,glib))) - (synopsis "Lightweight input method framework") - (description "Nimf is a lightweight, fast and extensible input method -framework. This package provides a fork of the original nimf project, that -focusses especially on Korean input (Hangul, Hanja, ...).") - (home-page "https://github.com/hamonikr/nimf/") - (license license:lgpl3+))) - (define-public hime (package (name "hime") diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.= scm index 92c483f14b..8febe176c3 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -179,37 +179,6 @@ algorithms AES or Twofish.") ;; the combined work falls under the GPLv3. (license license:gpl3))) =20 -(define-public keepassx - (package - (name "keepassx") - (version "2.0.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.keepassx.org/releases/" version - "/keepassx-" version ".tar.gz")) - (sha256 - (base32 - "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3")))) - (build-system cmake-build-system) - (inputs - `(("libgcrypt" ,libgcrypt) - ("libxi" ,libxi) - ("libxtst" ,libxtst) - ("qt" ,qt-4))) - (native-inputs - `(("zlib" ,zlib))) - (home-page "https://www.keepassx.org") - (synopsis "Password manager") - (description "KeePassX is a password manager or safe which helps you to -manage your passwords in a secure way. You can put all your passwords in = one -database, which is locked with one master key or a key-file which can be s= tored -on an external storage device. The databases are encrypted using the -algorithms AES or Twofish.") - ;; Non functional parts use various licences. - (license license:gpl3) - (properties `((superseded . ,keepassxc))))) - (define-public pwsafe (package (name "pwsafe") diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index e81c3caf87..ecc6d4d845 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -299,13 +299,6 @@ When present, Poppler is able to correctly render CJK = and Cyrillic text.") (license (list license:bsd-3 license:gpl2)))) =20 -(define-public poppler-qt4 - (package/inherit poppler - (name "poppler-qt4") - (inputs `(("qt-4" ,qt-4) - ,@(package-inputs poppler))) - (synopsis "Qt4 frontend for the Poppler PDF rendering library"))) - (define-public poppler-qt5 (package/inherit poppler (name "poppler-qt5") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 11e69ff5db..f609d77254 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -244,210 +244,6 @@ other text such as code. The syntax uses the syntax = of the Django template system, and the core design of Django is reused in Grantlee.") (license license:lgpl2.1+))) =20 -(define-public qt-4 - (package - (name "qt") - (version "4.8.7") - (source (origin - (method url-fetch) - (uri (string-append "http://download.qt-project.org/archive/q= t/" - (string-copy version 0 (string-rindex ver= sion #\.)) - "/" version - "/qt-everywhere-opensource-src-" - version ".tar.gz")) - (sha256 - (base32 - "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272")) - (patches (search-patches "qt4-ldflags.patch")) - (modules '((guix build utils))) - (snippet - ;; Remove webkit module, which is not built. - '(begin (delete-file-recursively "src/3rdparty/webkit") - #t)))) - (build-system gnu-build-system) - (propagated-inputs - `(("mesa" ,mesa))) - (inputs - `(("alsa-lib" ,alsa-lib) - ("bluez" ,bluez) - ("cups" ,cups) - ("dbus" ,dbus) - ("double-conversion" ,double-conversion) - ("expat" ,expat) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) - ("icu4c" ,icu4c) - ("jasper" ,jasper) - ("libinput" ,libinput-minimal) - ("libmng" ,libmng) - ("libpci" ,pciutils) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("libwebp" ,libwebp) - ("libx11" ,libx11) - ("libxcomposite" ,libxcomposite) - ("libxcursor" ,libxcursor) - ("libxext" ,libxext) - ("libxfixes" ,libxfixes) - ("libxi" ,libxi) - ("libxinerama" ,libxinerama) - ("libxkbcommon" ,libxkbcommon) - ("libxml2" ,libxml2) - ("libxrandr" ,libxrandr) - ("libxrender" ,libxrender) - ("libxslt" ,libxslt) - ("libxtst" ,libxtst) - ("mtdev" ,mtdev) - ("mariadb-dev" ,mariadb "dev") - ("nss" ,nss) - ("postgresql" ,postgresql) - ("pulseaudio" ,pulseaudio) - ("pcre2" ,pcre2) - ("sqlite" ,sqlite) - ("udev" ,eudev) - ("unixodbc" ,unixodbc) - ("wayland" ,wayland) - ("xcb-util" ,xcb-util) - ("xcb-util-image" ,xcb-util-image) - ("xcb-util-keysyms" ,xcb-util-keysyms) - ("xcb-util-renderutil" ,xcb-util-renderutil) - ("xcb-util-wm" ,xcb-util-wm) - ("zlib" ,zlib) - ("libjpeg" ,libjpeg-turbo) - ("libsm" ,libsm) - ("openssl" ,openssl-1.0))) - (native-inputs - `(;; XXX: The JavaScriptCore engine does not build with the C++11 sta= ndard. - ;; We could build it with -std=3Dgnu++98, but then we'll get in tro= uble with - ;; ICU later. Just keep using GCC 5 for now. - ("gcc@5" ,gcc-5) - ("bison" ,bison) - ("flex" ,flex) - ("gperf" ,gperf) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-2) - ("ruby" ,ruby) - ("which" ,(@ (gnu packages base) which)))) - ;; Note: there are 37 MiB of examples and a '-exampledir' configure fl= ags, - ;; but we can't make them a separate output because "out" and "example= s" - ;; would refer to each other. - (outputs '("out" ;112MiB core + 37MiB exam= ples - "doc")) ;280MiB of HTML + code - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'set-paths 'hide-default-gcc - (lambda* (#:key inputs #:allow-other-keys) - (let ((gcc (assoc-ref inputs "gcc"))) - ;; Remove the default GCC from CPLUS_INCLUDE_PATH to prevent - ;; conflicts with the GCC 5 input. - (setenv "CPLUS_INCLUDE_PATH" - (string-join - (delete (string-append gcc "/include/c++") - (string-split (getenv "CPLUS_INCLUDE_PATH"= ) #\:)) - ":")) - #t))) - (replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (substitute* '("configure") - (("/bin/pwd") (which "pwd"))) - (substitute* "src/corelib/global/global.pri" - (("/bin/ls") (which "ls"))) - - (invoke - "./configure" - "-verbose" - "-prefix" out - "-nomake" "examples demos" - ;; Note: Don't pass '-docdir' since 'qmake' and - ;; libQtCore would record its value, thereby defeating - ;; the whole point of having a separate output. - "-datadir" (string-append out "/share/qt-" ,version - "/data") - "-importdir" (string-append out "/lib/qt-4" - "/imports") - "-plugindir" (string-append out "/lib/qt-4" - "/plugins") - "-translationdir" (string-append out "/share/qt-" ,version - "/translations") - "-demosdir" (string-append out "/share/qt-" ,version - "/demos") - "-examplesdir" (string-append out "/share/qt-" ,version - "/examples") - "-opensource" - "-confirm-license" - ;; explicitly link with dbus instead of dlopening it - "-dbus-linked" - ;; Skip the webkit module; it fails to build on armhf - ;; and, apart from that, may pose security risks. - "-no-webkit" - ;; don't use the precompiled headers - "-no-pch" - ;; drop special machine instructions not supported - ;; on all instances of the target - ,@(if (string-prefix? "x86_64" - (or (%current-target-system) - (%current-system))) - '() - '("-no-mmx" - "-no-3dnow" - "-no-sse" - "-no-sse2")) - "-no-sse3" - "-no-ssse3" - "-no-sse4.1" - "-no-sse4.2" - "-no-avx")))) - (add-after - 'install 'move-doc - (lambda* (#:key outputs #:allow-other-keys) - ;; Because of qt4-documentation-path.patch, documentation ends= up - ;; being installed in OUT. Move it to the right place. - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (olddoc (string-append out "/doc")) - (docdir (string-append doc "/share/doc/qt-" ,version))) - (mkdir-p (dirname docdir)) - - ;; Note: We can't use 'rename-file' here because OUT and DOC= are - ;; different "devices" due to bind-mounts. - (copy-recursively olddoc docdir) - (delete-file-recursively olddoc) - #t)))))) - (native-search-paths - (list (search-path-specification - (variable "QMAKEPATH") - (files '("lib/qt5"))) - (search-path-specification - (variable "QML2_IMPORT_PATH") - (files '("lib/qt5/qml"))) - (search-path-specification - (variable "QT_PLUGIN_PATH") - (files '("lib/qt5/plugins"))) - (search-path-specification - (variable "XDG_DATA_DIRS") - (files '("share"))) - (search-path-specification - (variable "XDG_CONFIG_DIRS") - (files '("etc/xdg"))))) - (home-page "https://www.qt.io/") - (synopsis "Cross-platform GUI library") - (description "Qt is a cross-platform application and UI framework for -developers using C++ or QML, a CSS & JavaScript like language.") - (license (list license:lgpl2.1 license:lgpl3)) - - ;; Qt 4: 'QBasicAtomicPointer' leads to build failures on MIPS; - ;; see . - ;; Qt 5: assembler error; see . - (supported-systems (delete "mips64el-linux" %supported-systems)))) - (define (qt5-urls component version) "Return a list of URLs for VERSION of the Qt5 COMPONENT." ;; We can't use a mirror:// scheme because these URLs are not exact copi= es: @@ -2253,53 +2049,6 @@ itself.") ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))))) =20 -(define-public python2-pyqt-4 - (package (inherit python-pyqt) - (name "python2-pyqt") - (version "4.12.3") - (source - (origin - (method url-fetch) - (uri - (string-append "mirror://sourceforge/pyqt/PyQt4/" - "PyQt-" version "/PyQt4_gpl_x11-" - version ".tar.gz")) - (sha256 - (base32 - "0wnlasg62rm5d39nq1yw4namcx2ivxgzl93r5f2vb9s0yaz5l3x0")))) - (native-inputs - `(("qt" ,qt-4))) - (inputs `(("python" ,python-2))) - (propagated-inputs - `(("python-sip" ,python2-sip))) - (arguments - `(#:tests? #f ; no check target - #:modules ((srfi srfi-1) - ,@%gnu-build-system-modules) - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (sip (string-append out "/share/sip")) - (python (assoc-ref inputs "python")) - (python-version - (last (string-split python #\-))) - (python-major+minor - (string-join - (take (string-split python-version #\.) 2) - ".")) - (lib (string-append out "/lib/python" - python-major+minor - "/site-packages"))) - (invoke "python" "configure.py" - "--confirm-license" - "--bindir" bin - "--destdir" lib - "--sipdir" sip))))))) - (license (list license:gpl2 license:gpl3)))) ; choice of either license - (define-public python-qtpy (package (name "python-qtpy") diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 82d1dc463c..e0e5282f22 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -261,315 +261,6 @@ Telegram project, for its use in telegram desktop cli= ent.") ("libtool" ,libtool) ("pkg-config" ,pkg-config))))))) =20 -(define-public telegram-desktop - (package - (name "telegram-desktop") - (version "2.5.9") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/telegramdesktop/tdesktop.git") - (commit - (string-append "v" version)))) - (file-name - (git-file-name name version)) - (sha256 - (base32 "1lqs06scqvzg37a2py8jk7nnlvk42jjifcpnhdd5rgd5biw70nyx")) - (modules '((guix build utils) - (ice-9 ftw) - (srfi srfi-1))) - (snippet - `(begin - (let ((keep - '( ;; Not available in Guix. - "SPMediaKeyTap" "statusnotifieritem" "tgcalls"))) - (with-directory-excursion "Telegram/ThirdParty" - (for-each delete-file-recursively - (lset-difference string=3D? - (scandir ".") - (cons* "." ".." keep)))) - #t))))) - (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) - (ice-9 match)) - #:configure-flags - (list - ;; Client applications must provide their own API-ID and API-HASH, - ;; see also . - ;; In case, that the credentials below fail to work, contact - ;; Raghav Gururajan - "-DTDESKTOP_API_ID=3D2791056" - "-DTDESKTOP_API_HASH=3D582d6d0b44f7a2de949e99271fd8b3f2" - ;; Use bundled fonts as fallback. - "-DDESKTOP_APP_USE_PACKAGED_FONTS=3DOFF") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-writable - (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) - (add-after 'make-writable 'copy-inputs - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each - (match-lambda - ((dst src) - (copy-recursively src dst) - (for-each make-file-writable (find-files dst)))) - `(("cmake" ,(assoc-ref inputs "cmake-helpers")) - ("Telegram/codegen" ,(assoc-ref inputs "codegen-source")) - ("Telegram/lib_base" ,(assoc-ref inputs "lib-base-source")) - ("Telegram/lib_crl" ,(assoc-ref inputs "lib-crl-source")) - ("Telegram/lib_lottie" - ,(assoc-ref inputs "lib-lottie-source")) - ("Telegram/lib_qr" ,(assoc-ref inputs "lib-qr-source")) - ("Telegram/lib_rlottie" - ,(assoc-ref inputs "lib-rlottie-source")) - ("Telegram/lib_rpl" ,(assoc-ref inputs "lib-rpl-source")) - ("Telegram/lib_spellcheck" - ,(assoc-ref inputs "lib-spellcheck-source")) - ("Telegram/lib_storage" - ,(assoc-ref inputs "lib-storage-source")) - ("Telegram/lib_tl" ,(assoc-ref inputs "lib-tl-source")) - ("Telegram/lib_ui" ,(assoc-ref inputs "lib-ui-source")) - ("Telegram/lib_webrtc" ,(assoc-ref inputs "lib-webrtc-sour= ce")) - ("Telegram/ThirdParty/tgcalls" - ,(assoc-ref inputs "tgcalls-source")))) - #t)) - (add-before 'configure 'patch-cxx-flags - (lambda _ - (substitute* "cmake/options_linux.cmake" - (("class-memaccess") "all")) - #t)) - (add-after 'install 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-sc= hemas)) - (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) - (native-inputs - `(("cmake-helpers" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "695fabda6830b58bdc02d09db70531d5dececcd0"))) - (file-name - (git-file-name "cmake-helpers-for-telegram-desktop" version)) - (sha256 - (base32 "1j3ppgfmihcjl22w5jk8jhwif10i9wbycq5zqnssn6pnhnj7di5i"= )))) - ("cmake-shared" ,cmake-shared) - ("extra-cmake-modules" ,extra-cmake-modules) - ("gcc" ,gcc-9) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk+:bin" ,gtk+ "bin") - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("qttools" ,qttools))) - (inputs - `(("alsa" ,alsa-lib) - ("c++-gsl" ,c++-gsl) - ("catch" ,catch-framework2) - ("codegen-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/codegen.git") - (commit "127968de8129e8ccfa6ac50721c70415a5a087c3"))) - (file-name - (git-file-name "codegen" version)) - (sha256 - (base32 "036hzjrsk134ky62192nra43rsln5kh5gz20q1920s922661zky2"= )))) - ("expected" ,libexpected) - ("fcitx-qt5" ,fcitx-qt5) - ("fcitx5-qt" ,fcitx5-qt) - ("ffmpeg" ,ffmpeg) - ("glib" ,glib) - ("gtk+" ,gtk+) - ("hime" ,hime) - ("hunspell" ,hunspell) - ("iconv" ,libiconv) - ("kwayland" ,kwayland) - ("lib-base-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_base.git") - (commit "f1e4168081428fa451d2f50eee7b1c448268c43a"))) - (file-name - (git-file-name "lib-base-for-telegram-desktop" version)) - (sha256 - (base32 "0piqp7llwi7sfy4c15g0p8ihr90rz1qps6q5fkl1iasrf5ysw8qc"= )))) - ("lib-crl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_crl.git") - (commit "16150bf71d79382738114b913f137ec1a1a7630c"))) - (file-name - (git-file-name "lib-crl-for-telegram-desktop" version)) - (sha256 - (base32 "0qhagdr26aqb9w7wnchcmk1j7ln28x3wbkkkm06b8h0mybksbj7q"= )))) - ("lib-lottie-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_lottie.git") - (commit "fb40f379d82ffa1fc7506e9a8dddcf48847715ae"))) - (file-name - (git-file-name "lib-lottie-for-telegram-desktop" version)) - (sha256 - (base32 "1vq0mqxcrrv7akcqk9cl4mm61zw6dcfmy8adl0pcp49kynm64saw"= )))) - ("lib-qr-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_qr.git") - (commit "92ce41a690a463eb462089a4eb1e51e019308018"))) - (file-name - (git-file-name "lib-qr-for-telegram-desktop" version)) - (sha256 - (base32 "182939nv7xs9b3bgah3gl5y9hx5r59mabd2jw3z6717vc96qi2pj"= )))) - ("lib-rlottie-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_rlottie.git") - (commit "0671bf70547381effcf442ec9618e04502a8adbc"))) - (file-name - (git-file-name "lib-rlottie-for-telegram-desktop" version)) - (sha256 - (base32 "05qnza7j15356s8jq16pkbyp4zr586lssmd86lz5jq23lcb3raxv"= )))) - ("lib-rpl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_rpl.git") - (commit "e1b96399d9031c4ef0354631e6bb375029d29d9f"))) - (file-name - (git-file-name "lib-rpl-for-telegram-desktop" version)) - (sha256 - (base32 "1wvqazljd2kq1fxlj250jhjrig529499bym9p81dx33kh1l9dgss"= )))) - ("lib-spellcheck-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_spellcheck.git") - (commit "1b540b38ed78e9a3cba93e9ba4ce4525ab692277"))) - (file-name - (git-file-name "lib-spellcheck-for-telegram-desktop" version)) - (sha256 - (base32 "0a7042h5zrdvgs7v153ral2dh1zj84di5yjcmgcry5k4s1im9di7"= )))) - ("lib-storage-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_storage.git") - (commit "cbe51722b73cfa9ff27bd59294b08aa5ee33c936"))) - (file-name - (git-file-name "lib-storage-for-telegram-desktop" version)) - (sha256 - (base32 "045l5xsyagyz17gbhmmvl2miss4nb92p0dmza7yfs9pkg9gs0f87"= )))) - ("lib-tl-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_tl.git") - (commit "404c83d77e5edb8a39f8e9f56a6340960fe5070e"))) - (file-name - (git-file-name "lib-tl-for-telegram-desktop" version)) - (sha256 - (base32 "1k34nkvvcjqw5q81n1qmklid60cvzjk4lmn9qjimk437m6wbii7f"= )))) - ("lib-ui-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_ui.git") - (commit "e14bc4681d69c1b538b8c5af51501077ae5a8a86"))) - (file-name - (git-file-name "lib-ui-for-telegram-desktop" version)) - (sha256 - (base32 "04b1x4bswk3bxqrwpv5g7w4frkprrwf0px6aibh6z4drinv08wsv"= )))) - ("lib-webrtc-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "60d5c43daf882a6c03944a3e6198b5f35b654a0e"))) - (file-name - (git-file-name "lib-webrtc-for-telegram-desktop" version)) - (sha256 - (base32 "0mxmbw8i37axllg9h976p6np2gcfyci6xwwl9hc9mhs49vwwsw5s"= )))) - ("libdbusmenu-qt" ,libdbusmenu-qt) - ("libjpeg" ,libjpeg-turbo) - ("libtgvoip" ,libtgvoip-for-telegram-desktop) - ("lz4" ,lz4) - ("materialdecoration" ,materialdecoration) - ("minizip" ,minizip) - ("nimf" ,nimf) - ("openal" ,openal) - ("openssl" ,openssl) - ("opus" ,opus) - ("pulseaudio" ,pulseaudio) - ("qrcodegen" ,qrcodegen-cpp) - ("qt" ,qtbase) - ("qt5ct" ,qt5ct) - ("qtimageformats" ,qtimageformats) - ("qtwayland" ,qtwayland) - ("range-v3" ,range-v3) - ("rlottie" ,rlottie-for-telegram-desktop) - ("tgcalls-source" - ,(origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "71addf5b41cb6bb6844f75e977edae0020938930"))) - (file-name - (git-file-name "tgcalls-for-telegram-desktop" version)) - (sha256 - (base32 "1zrjxf03n3ad8b95gwjarmq4gj5i5cwhlg93qcjv2232kksh29iy"= )))) - ("webrtc" ,webrtc-for-telegram-desktop) - ("x11" ,libx11) - ("xcb" ,libxcb) - ("xcb-keysyms" ,xcb-util-keysyms) - ("xxhash" ,xxhash) - ("zlib" ,zlib))) - (propagated-inputs - `(("dconf" ,dconf))) - (synopsis "Telegram Desktop") - (description "Telegram desktop is the official desktop version of the -Telegram instant messenger.") - (home-page "https://desktop.telegram.org/") - (license - (list - ;; ThirdParty - license:lgpl2.1+ - ;; Others - license:gpl3+)))) - (define-public tl-parser (let ((commit "1933e76f8f4fb74311be723b432e4c56e3a5ec06") (revision "21")) --=20 2.30.1 --ieK6m9MsdB8QIkgW-- --oNhYWJf9vHcdfqGT Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAmBEDwMACgkQJkb6MLrK fwjrgxAAjxrX3QejW507u6lZKLVOuz6SDi5U/1eekM3ancxsPn5R6rlAtc4bOvsv kr2fqp3bpTOZ8cco0kj34Csi82AL0qSR13z3N8+HC9WVcKcXVl+2vuM00Lu1bHpB JiHdTkx9G9xdB7n3GCS2b9qSjHmEUSNdsLSNDrYZw8V5beV3AlKQ2oJr2Se2Wg80 gbapztHwWMX9OVzKM1fmjcXvPNy5m8sJBOvkLOIOs8eOnLOIQtV91eMCgI7KbXP2 BDlK1MUU/TgJUZln/FmuM6V8UVU+T5gcDSowP/AVnfzj+AqfPlzKXe6romPRx6kK ZDuh7EmkT3+xnjIo5lmSR/Td7FGy9gduqWS/UPkmJxXFYTUEf81QGIi8gkw62227 Xh6pz2+WkR5FddWW/IsI5Owaq4oZZUnXkjDWakqbsoQGSdJ3x7U1H1986RRVt0CR UJGmMx87MofbLv9wQtiAeVhANOptQpse5RGn8sxgTMHYLmnT/HdaezM3fg6hf++w TjsEQDoc2V2R0P7TPz0/rq9qmVCA1qoncSV+ir/1bzQmUzIzLuMlivrH29gYLHkQ xZt2QZxF/d8/nYCkn2H+bRnXgL1/QtqDFSoZrPkkyF2E27xSWI3Nf9AMjGsT0/kf X3uKr4iUfHJchckBOyi4xqc9K/8iY225It5ES6lpytq660q3Tu0= =g8/m -----END PGP SIGNATURE----- --oNhYWJf9vHcdfqGT-- From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 21 13:41:35 2021 Received: (at control) by debbugs.gnu.org; 21 Mar 2021 17:41:35 +0000 Received: from localhost ([127.0.0.1]:55433 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lO251-0000zM-MD for submit@debbugs.gnu.org; Sun, 21 Mar 2021 13:41:35 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:32831) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lO24z-0000z9-T0 for control@debbugs.gnu.org; Sun, 21 Mar 2021 13:41:34 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id BF6325C0090; Sun, 21 Mar 2021 13:41:28 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sun, 21 Mar 2021 13:41:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:message-id:mime-version:content-type; s=mesmtp; bh=eZBHPIW6j0sVH3BrALk1XJceEOPbPfH2tEvgIR4+9kY=; b=gl8/IuYOsInQ M0aDKiPU7OESQKBKwGWUXhMKNRois+19WA6b3yYmUNsL6Agiv5m9W4Mi5fxM0y/4 wV/u9ta03UpVvDuo7m8SeD4JDV0aKg/ZwBZwHvt7gApFotoP50slYG0CAhZ9wEEz wyE3I8rtH/z8WTNjS0Uimml1lKS2krw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=eZBHPIW6j0sVH3BrALk1XJceEOPbPfH2tEvgIR4+9 kY=; b=T9uPt2nuRUxM5ulVXXPNoZGPn1I9UOosql6JSBqtQtHQnSrrG7JNYi3Cb LgOlqvkE1YnarFQQZontPjbehG5IPr2kO+z+oSDkVP+KsPJr2CpLQgtWywaiFXfl MeP0BcIk21woVpmTth9ZY9O7w52H137TG8at8HwwtWVsE/wd5kfUhpPpQBdfduP4 IylgM+neXO0ycEMlQBoCXTQjHwNoG0+Rm9YitMx7KtfY/baAs34GuccBm3Xxepya IajK5l3rumwwpRATrfhdLw87JnkHUVzqIQrD+etGARWdf9ke4okH880a3ERGY82y CvREFaDbs/v2uqhs8wLmj6PLhC5AQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudegvddguddtgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecugfhmphhthicushhusghjvggtthculddutddmne cujfgurhepfffhvffkgggtugesthdtrodttddtvdenucfhrhhomhepnfgvohcuhfgrmhhu lhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrthhtvghrnh epveeiueegvdehuefgteevfeejgfdtgfevgeevhfeiteehteeufedtieefgefgieehnecu kfhppedutddtrdduuddrudeiledruddukeenucevlhhushhtvghrufhiiigvpedtnecurf grrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (pool-100-11-169-118.phlapa.fios.verizon.net [100.11.169.118]) by mail.messagingengine.com (Postfix) with ESMTPA id 19735108005C for ; Sun, 21 Mar 2021 13:41:28 -0400 (EDT) Date: Sun, 21 Mar 2021 13:41:26 -0400 From: Leo Famulari To: control@debbugs.gnu.org Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Score: 2.2 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: block 47297 with 46871 block 47297 with 45704 Content analysis details: (2.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [66.111.4.28 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [66.111.4.28 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.8 MISSING_SUBJECT Missing Subject: header 0.2 NO_SUBJECT Extra score for no subject 1.0 BODY_EMPTY No body text in message X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: block 47297 with 46871 block 47297 with 45704 Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [66.111.4.28 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [66.111.4.28 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.8 MISSING_SUBJECT Missing Subject: header 0.2 NO_SUBJECT Extra score for no subject 1.0 BODY_EMPTY No body text in message block 47297 with 46871 block 47297 with 45704 From unknown Mon Jun 23 15:00:55 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Leo Famulari Subject: bug#45704: closed (Re: [bug#45704] [PATCH] gnu: Remove QT 4.) Message-ID: References: X-Gnu-PR-Message: they-closed 45704 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 45704@debbugs.gnu.org Date: Thu, 25 Mar 2021 23:22:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1616714522-23635-1" This is a multi-part message in MIME format... ------------=_1616714522-23635-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #45704: [PATCH] gnu: Remove QT 4. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 45704@debbugs.gnu.org. --=20 45704: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D45704 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1616714522-23635-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 45704-done) by debbugs.gnu.org; 25 Mar 2021 23:21:24 +0000 Received: from localhost ([127.0.0.1]:39860 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPZI4-000688-FH for submit@debbugs.gnu.org; Thu, 25 Mar 2021 19:21:24 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:60759) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPZI2-00067u-Tj for 45704-done@debbugs.gnu.org; Thu, 25 Mar 2021 19:21:23 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id C6D265C0178; Thu, 25 Mar 2021 19:21:16 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 25 Mar 2021 19:21:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=gvfkKKmX/pN+NjYw2F/TIv3H IvKyv5vTQoal63E8Ad4=; b=Z7C8cjXeH7uW3TfZyWIShrsMGcbduXcd1Lo/LKLp 2i9LlsXwNb7qt0SOZELzDp9sjv0N9uJ6d2jGnGjEZ+SbZI+HLdboGvh4HsQp/1qC ygVG8hQvF9V/JqcSd095/Mh5m0urNWSJY0/g81gKLyUQAse+nOmHq1CzDz5WsgqW /dc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=gvfkKK mX/pN+NjYw2F/TIv3HIvKyv5vTQoal63E8Ad4=; b=XKyzSCxPaGKzQ8wOFIpgZG VhNSZbZfGUzPuXm93RbEL2MWO+Xtj8suaGYQNLnwvuDLqbozxnJ9IFlh87ZqXm0a HlqTqfczJ3AaHyfjh79hIrkg75aP+DPqOImJKo777x6J+cpFs98C6+JKg4j01y8q xGzNgjDJ7/DKkxGvFH8fvUKn+a2wXXyja/jPsFGkdxfZ30JKVt7uppg9w8bhwAUR VtcA1+svBmXBMKg2km3h43HfmVa6uKehaDvaRfwmMnXfeWVwkI15389V7uySUxaX NXaSR342+DJElaC/5XDVx1/lrWOTYHbfl+DpEeCkhSpDR5AEP0funKArXc7x6cKg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudehuddgtdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkfhggtggujgesghdtre ertddtvdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnhepudekveegteekleetgfeitdejgfejke ffudethedvhfeukeduleeikeejfeehffetnecukfhppedutddtrdduuddrudeiledruddu keenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvg hosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (pool-100-11-169-118.phlapa.fios.verizon.net [100.11.169.118]) by mail.messagingengine.com (Postfix) with ESMTPA id 4217124005D for <45704-done@debbugs.gnu.org>; Thu, 25 Mar 2021 19:21:16 -0400 (EDT) Date: Thu, 25 Mar 2021 19:20:58 -0400 From: Leo Famulari To: 45704-done@debbugs.gnu.org Subject: Re: [bug#45704] [PATCH] gnu: Remove QT 4. Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ll9Y9QoSZx0dc2cP" Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 45704-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --ll9Y9QoSZx0dc2cP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Mar 06, 2021 at 06:23:48PM -0500, Leo Famulari wrote: > On Thu, Jan 28, 2021 at 08:04:05PM -0500, Leo Famulari wrote: > > I propose we remove Qt 4 in the next release (CC-ing the maintainers). >=20 > I've pushed an updated Qt 4 removal patch (attached) to the > wip-next-release branch. > From 2d977b43f333dec1e82703ceae4e692d46a5a2fb Mon Sep 17 00:00:00 2001 > From: Leo Famulari > Date: Sat, 6 Mar 2021 18:06:21 -0500 > Subject: [PATCH] gnu: Remove QT 4. Pushed as a801c7379a534a2896a03a1a6f8b47eb92691b00 --ll9Y9QoSZx0dc2cP Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIyBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAmBdGtoACgkQJkb6MLrK fwg+2w/4wccb75CS5wVoUhSt3A0fBRwMYVS5yITlGSV6V4FFagYcw7UH8SaxDLM7 oopMlzZFUaw+00SstREMzEKhY8TUGkLS76bcC6cBwqx4YzhA3BJ1nDrAYVBDrItR /HDxcwhzVL8MCyFQp3o382V1trYz4TXGWdqP0kkK64sZ8QnSyiifYES7jWsJMz5D dgB7mfGSEHEx4ggp4G8AJYB9GuPMgxmeYGsPco+d2vpEKzGJ5QnfWYz5xQNxW0ef 0Qyb0Ko7Fu0OI/9n5A+Q9yYNz/x47a0h0cGhPhSTnRNl0JZ3DIndagioxZ4NUn0w PDDbhV86ugIGQC6MKaHXg+fJZwvZnCxe08G/Bm4oUMdXSxwmjBKN5sLPhtj7DETq FhRPEY+vallpM3sQMcONfPk+rCWU3Q36OqNpLP9HosvHe/7J2zC6PNbZfdAlQaNY glp84DPP/qld6DrfF/8GhQqkp0W6jkulEmXkuLlxo+HPRCE19tUmJRnMV2yH+enc PUsyCBCjeuIHAjM17ha0GWYdgys1LNxVq2blxIzn+jS+gklk8uBzxHWf2kvubcMr qfAhlnlGEva+mcrjAIdyMTr+4oSaugrkgZzc0pC9ZvGYL2jH7R5LApyxqvAAAMR+ bUfcykIzb+M9W/pkS0kmNMIMaQzgC0yCEFdZxWUNFLgnF0YlMg== =9fIY -----END PGP SIGNATURE----- --ll9Y9QoSZx0dc2cP-- ------------=_1616714522-23635-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 6 Jan 2021 19:59:06 +0000 Received: from localhost ([127.0.0.1]:45640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kxExW-0001hg-EO for submit@debbugs.gnu.org; Wed, 06 Jan 2021 14:59:06 -0500 Received: from lists.gnu.org ([209.51.188.17]:46930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kxExU-0001hY-EF for submit@debbugs.gnu.org; Wed, 06 Jan 2021 14:59:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxExU-00006P-4k for guix-patches@gnu.org; Wed, 06 Jan 2021 14:59:04 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:51821) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxExM-0004Wo-Ll for guix-patches@gnu.org; Wed, 06 Jan 2021 14:59:00 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id CF46A5C00ED; Wed, 6 Jan 2021 14:58:55 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Wed, 06 Jan 2021 14:58:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=mesmtp; bh=mM2y9awmNVYKXXNvLx+wl47 VhJahCE/YlNePi7AcCBk=; b=omAG4aMSu6mSktVTcFraZLSmb12t4CU4hI9MAyR 9NNG6HGJ5826fv5lAOY+WjRrAP7MdmNESBVwgVc759twrBbFv7vbEXIbFk9k1eoU /rSt5GOCpyyPsPrBDWRcBf+ETabIoHbsFPrOTtwGOLPCoYsoTiC/G4B5y/Tc42oX bJGQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=mM2y9a wmNVYKXXNvLx+wl47VhJahCE/YlNePi7AcCBk=; b=m/322amN2+M4Bb6jqfGywO WimpB7pptAnVtl6yp5HYI91QpmfLbqhtYZk9PQeZU0SjFCa1rdLzR4aiT5hYnriQ ObcCGuBPvCuHGoEvc62HWHWfj7dQ8T5Rn2twi/JmrNFybzJqZHlLo96zQ9oDCKEY izNfub4Lyneu9uvvVWkZ5QhzqHjT2zZk0YI4IR2AVV31mIPtImilHWucihk8JHho 8p+8dVQtWznrD/gktLZsgCW7L2f+mQCvpTdHiyhH1srobV9esqrzhchZIbyf725f bsjQT97VSdKR7wNPNob8M/F8G3k/RSrj4osz7GgiFoGgHScAJxkEjEyEfqJ+zt/A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvdegtddgfeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucgoufhushhpvggtthffohhmrghinhculdegledmne gfrhhlucfvnfffucdlhedmnecujfgurhephffvufffkffogggtgfesthhqredtredtjeen ucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrg hmvgeqnecuggftrfgrthhtvghrnhepieevtefgudetudfffeeigedukedugeehudefkedu hfffgfehvdekheelueehgeetnecuffhomhgrihhnpehgnhhurdhorhhgpdhgihhthhhusg drtghomhdprghvohhgrggurhhordgttgdpthhiphhpuddtrdgtohhmpdhsohhurhgtvghf ohhrghgvrdhnvghtpdhgihhthhhusgdrihhopdgsihhtmhgvshhsrghgvgdrohhrghdpkh gvvghprghsshigrdhorhhgpdguvggsihgrnhdrnhgvthdpqhhtqdhprhhojhgvtghtrdho rhhgpdhqthdrihhonecukfhppeejfedrudeguddruddvjedrudegieenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghr ihdrnhgrmhgv X-ME-Proxy: Received: from jasmine.lan (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id 0D7E21080059 for ; Wed, 6 Jan 2021 14:58:55 -0500 (EST) From: Leo Famulari To: guix-patches@gnu.org Subject: [PATCH] gnu: Remove QT 4. Date: Wed, 6 Jan 2021 14:58:37 -0500 Message-Id: X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=66.111.4.25; envelope-from=leo@famulari.name; helo=out1-smtp.messagingengine.com X-Spam_score_int: -7 X-Spam_score: -0.8 X-Spam_bar: / X-Spam_report: (-0.8 / 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.999, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" This package has been unsupported upstream for several years: https://lists.gnu.org/archive/html/guix-devel/2016-02/msg00596.html I suggest we apply this patch as part of a major update =E2=80=94 either a = core-updates merge, or a new release. We should notify the people who contributed or maintained the affected pack= ages so that they have ample time to update the packages and avoid their removal. What do you think? * gnu/packages/qt.scm (qt-4, python2-pyqt-4): Remove variables. * gnu/packages/chemistry.scm (avogadro): Remove variable. * gnu/packages/education.scm (tipp10): Remove variable. * gnu/packages/engineering.scm (qucs, qucs-s): Remove variables. * gnu/packages/messaging.scm (pybitmessage): Remove variable. * gnu/packages/password-utils.scm (keepassx): Remove variable. * gnu/packages/pdf.scm (poppler-qt4): Remove variable. * gnu/packages/patches/avogadro-boost148.patch, gnu/packages/patches/avogadro-eigen3-update.patch, gnu/packages/patches/avogadro-python-eigen-lib.patch, gnu/packages/patches/tipp10-fix-compiling.patch, gnu/packages/patches/tipp10-remove-license-code.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 5 - gnu/packages/chemistry.scm | 85 --- gnu/packages/education.scm | 53 -- gnu/packages/engineering.scm | 250 -------- gnu/packages/messaging.scm | 93 --- gnu/packages/password-utils.scm | 31 - gnu/packages/patches/avogadro-boost148.patch | 69 -- .../patches/avogadro-eigen3-update.patch | 603 ------------------ .../patches/avogadro-python-eigen-lib.patch | 161 ----- .../patches/tipp10-fix-compiling.patch | 212 ------ .../patches/tipp10-remove-license-code.patch | 332 ---------- gnu/packages/pdf.scm | 7 - gnu/packages/qt.scm | 251 -------- 13 files changed, 2152 deletions(-) delete mode 100644 gnu/packages/patches/avogadro-boost148.patch delete mode 100644 gnu/packages/patches/avogadro-eigen3-update.patch delete mode 100644 gnu/packages/patches/avogadro-python-eigen-lib.patch delete mode 100644 gnu/packages/patches/tipp10-fix-compiling.patch delete mode 100644 gnu/packages/patches/tipp10-remove-license-code.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1151d4642e..0a03a4e3a7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -820,9 +820,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/audiofile-function-signature.patch \ %D%/packages/patches/automake-skip-amhello-tests.patch \ %D%/packages/patches/avahi-localstatedir.patch \ - %D%/packages/patches/avogadro-boost148.patch \ - %D%/packages/patches/avogadro-eigen3-update.patch \ - %D%/packages/patches/avogadro-python-eigen-lib.patch \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ @@ -1663,8 +1660,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/thefuck-test-environ.patch \ %D%/packages/patches/tidy-CVE-2015-5522+5523.patch \ %D%/packages/patches/tinyxml-use-stl.patch \ - %D%/packages/patches/tipp10-fix-compiling.patch \ - %D%/packages/patches/tipp10-remove-license-code.patch \ %D%/packages/patches/tk-find-library.patch \ %D%/packages/patches/transcode-ffmpeg.patch \ %D%/packages/patches/transmission-honor-localedir.patch \ diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index ddbf5ca098..4f79ce29e6 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -49,91 +49,6 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python)) =20 -(define-public avogadro - (package - (name "avogadro") - (version "1.2.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cryos/avogadro") - (commit version))) - (sha256 - (base32 "0258py3lkba85qhs5ynancinyym61vlp0zaq9yrfs3hhnhpzv9n2")) - (file-name (git-file-name name version)) - (patches - (search-patches "avogadro-eigen3-update.patch" - "avogadro-python-eigen-lib.patch" - "avogadro-boost148.patch")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f - #:configure-flags - (list "-DENABLE_GLSL=3DON" - (string-append "-DPYTHON_LIBRARIES=3D" - (assoc-ref %build-inputs "python") - "/lib") - (string-append "-DPYTHON_INCLUDE_DIRS=3D" - (assoc-ref %build-inputs "python") - "/include/python" - ,(version-major+minor - (package-version python)))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-python-lib-path - (lambda* (#:key outputs #:allow-other-keys) - ;; This is necessary to install the Python module in the corr= ect - ;; directory. - (substitute* "libavogadro/src/python/CMakeLists.txt" - (("^EXECUTE_PROCESS.*$") "") - (("^.*from sys import stdout.*$") "") - (("^.*OUTPUT_VARIABLE.*") - (string-append "set(PYTHON_LIB_PATH \"" - (assoc-ref outputs "out") - "/lib/python" - ,(version-major+minor - (package-version python)) - "/site-packages\")"))) - #t)) - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Make sure 'avogadro' runs with the correct PYTHONPATH. - (let* ((out (assoc-ref outputs "out"))) - (setenv "PYTHONPATH" - (string-append - (assoc-ref outputs "out") - "/lib/python" - ,(version-major+minor - (package-version python)) - "/site-packages:" - (getenv "PYTHONPATH"))) - (wrap-program (string-append out "/bin/avogadro") - `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))) - #t))))) - (native-inputs - `(("doxygen" ,doxygen) - ("pkg-config" ,pkg-config))) - (inputs - `(("boost" ,boost) - ("eigen" ,eigen) - ("glew" ,glew) - ("openbabel" ,openbabel) - ("python" ,python-2) - ("python-numpy" ,python2-numpy) - ("python-pyqt" ,python2-pyqt-4) - ("python-sip" ,python2-sip) - ("qt" ,qt-4) - ("zlib" ,zlib))) - (home-page "https://avogadro.cc") - (synopsis "Advanced molecule editor") - (description - "Avogadro is an advanced molecule editor and visualizer designed for = use -in computational chemistry, molecular modeling, bioinformatics, materials -science, and related areas. It offers flexible high quality rendering and= a -powerful plugin architecture.") - (license license:gpl2+))) - (define-public domainfinder (package (name "domainfinder") diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 07862291a7..f212b22ba3 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -217,59 +217,6 @@ Currently available boards include: (license (list license:silofl1.1 ; bundled fonts license:gpl3+)))) =20 -(define-public tipp10 - (package - (name "tipp10") - (version "2.1.0") - (source (origin - (method url-fetch) - ;; guix download is not able to handle the download links on= the - ;; home-page, which use '' - (uri (string-append "mirror://debian/pool/main/" - "t/tipp10/tipp10_2.1.0.orig.tar.gz")) - (sha256 - (base32 - "0d387b404j88gsv6kv0rb7wxr23v5g5vl6s5l7602x8pxf7slbbx")) - (patches (search-patches "tipp10-fix-compiling.patch" - "tipp10-remove-license-code.patch")= ))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; packages has no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-new-version-check - (lambda _ - ;; Make new version check to default to false. - ;; TODO: Remove the checkbox from the dialog and the check it= self - (substitute* '("widget/settingspages.cpp" "widget/mainwindow.= cpp") - (("settings.value(\"check_new_version\", true)") - "settings.value(\"check_new_version\", false)")) - #t)) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; Make program honor $PREFIX - (substitute* "tipp10.pro" - (("\\.path =3D /usr/") (string-append ".path =3D " out "/= "))) - (substitute* "def/defines.h" - (("\"/usr/") (string-append "\"" out "/"))) - ;; Recreate Makefile - (invoke "qmake"))))))) - (inputs - `(("qt4" ,qt-4) - ("sqlite" ,sqlite))) - (home-page "https://www.tipp10.com/") - (synopsis "Touch typing tutor") - (description "Tipp10 is a touch typing tutor. The ingenious thing abo= ut -the software is its intelligence feature: characters that are mistyped are -repeated more frequently. Beginners will find their way around right away= so -they can start practicing without a hitch. - -Useful support functions and an extensive progress tracker, topical lessons -and the ability to create your own practice lessons make learning to type -easy.") - (license license:gpl2))) - (define-public snap (package (name "snap") diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5166a4635c..b80a946bab 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1986,256 +1986,6 @@ parallel computing platforms. It also supports ser= ial execution.") (license (list license:gpl2+ license:lgpl2.0+)))) ; freehdl's libraries =20 -(define-public qucs - ;; Qucs 0.0.19 segfaults when using glibc-2.26. Temporarily build from g= it. - ;; TODO: When qucs-0.0.20 is released, revert the commit that introduced= this - ;; comment and update the package. - (let ((commit "b4f27d9222568066cd59e4c387c51a35056c99d8") - (revision "0")) - (package - (name "qucs") - (version (git-version "0.0.19" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Qucs/qucs") - (commit commit))) - (sha256 - (base32 "10bclay9xhkffmsh4j4l28kj1qpxx0pnxja5vx6305cllnq4= r3gb")) - (file-name (string-append name "-" version "-checkout")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'patch-bootstrap - (lambda _ - (for-each patch-shebang - '("bootstrap" - "qucs/bootstrap" - "qucs-doc/bootstrap" - "qucs-core/bootstrap")) - #t)) - (add-before 'configure 'patch-configure - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "qucs/configure" - (("\\$QTDIR") (assoc-ref inputs "qt4"))) - #t)) - (add-after 'patch-configure 'patch-scripts - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* '("qucs/qucs/qucsdigi" - "qucs/qucs/qucsdigilib" - "qucs/qucs/qucsveri") - (("\\$BINDIR") - (string-append (assoc-ref outputs "out") "/bin")) - (("freehdl-config") - (string-append (assoc-ref inputs "freehdl") "/bin/freehd= l-config")) - (("freehdl-v2cc") - (string-append (assoc-ref inputs "freehdl") "/bin/freehd= l-v2cc")) - (("cp ") - (string-append (assoc-ref inputs "coreutils") "/bin/cp "= )) - (("glibtool") - (string-append (assoc-ref inputs "libtool") "/bin/libtoo= l")) - (("sed") - (string-append (assoc-ref inputs "sed") "/bin/sed")) - (("iverilog") - (string-append (assoc-ref inputs "iverilog") "/bin/iveri= log")) - (("vvp") - (string-append (assoc-ref inputs "iverilog") "/bin/vvp")= )) - #t)) - (add-before 'check 'pre-check - (lambda _ - ;; The test suite requires a running X server. - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - #t)) - (add-after 'install 'make-wrapper - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; 'qucs' directly invokes gcc, hence this wrapping. - (wrap-program (string-append out "/bin/qucs") - `("CPLUS_INCLUDE_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/include"))) - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/bin"))) - `("LIBRARY_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/lib"))) - `("ADMSXMLBINDIR" ":" prefix - (,(string-append (assoc-ref inputs "adms") "/bin"))) - `("ASCOBINDIR" ":" prefix - (,(string-append (assoc-ref inputs "asco") "/bin"))) - `("QUCS_OCTAVE" ":" prefix - (,(string-append (assoc-ref inputs "octave") "/bin/oc= tave"))))) - #t))) - #:parallel-build? #f ; race condition - #:configure-flags '("--disable-doc"))) ; we need octave-epstk - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("bison" ,bison) - ("flex" ,flex) - ("gperf" ,gperf) - ("libtool-native" ,libtool) - ("pkg-config" ,pkg-config) - ("python" ,python-2) ; for tests - ("matplotlib" ,python2-matplotlib) ; for tests - ("numpy" ,python2-numpy) ; for tests - ("xorg-server" ,xorg-server-for-tests))) ; for tests - (inputs - `(("adms" ,adms) - ("asco" ,asco) - ("coreutils" ,coreutils) - ("freehdl" ,freehdl) - ("gcc-toolchain" ,gcc-toolchain) - ("iverilog" ,iverilog) - ("libtool" ,libtool) - ("octave" ,octave-cli) - ("qt4" ,qt-4) - ("sed" ,sed))) - (home-page "http://qucs.sourceforge.net/") - (synopsis "Circuit simulator with graphical user interface") - (description - "Qucs is a circuit simulator with graphical user interface. The so= ftware -aims to support all kinds of circuit simulation types---e.g. DC, AC, -S-parameter, transient, noise and harmonic balance analysis. Pure digital -simulations are also supported.") - (license license:gpl2+)))) - -(define-public qucs-s - (package - (name "qucs-s") - (version "0.0.21") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ra3xdh/qucs_s/archiv= e/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "12m1jwhb9qwvb141qzyskbxnw3wn1x22d02z4b4862p7xvccl5h7")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-scripts - (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("qucs/qucsdigi" - "qucs/qucsdigilib" - "qucs/qucsveri") - (("\\$BINDIR") - (string-append (assoc-ref inputs "qucs") "/bin")) - (("freehdl-config") - (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-= config")) - (("freehdl-v2cc") - (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-= v2cc")) - (("cp ") - (string-append (assoc-ref inputs "coreutils") "/bin/cp ")) - (("glibtool") - (string-append (assoc-ref inputs "libtool") "/bin/libtool"= )) - (("sed") - (string-append (assoc-ref inputs "sed") "/bin/sed")) - (("iverilog") - (string-append (assoc-ref inputs "iverilog") "/bin/iverilo= g")) - (("vvp") - (string-append (assoc-ref inputs "iverilog") "/bin/vvp"))) - #t)) - (add-after 'patch-scripts 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "qucs/main.cpp" - (((string-append "QucsSettings\\.Qucsator =3D QucsSettings\= \.BinDir " - "\\+ \"qucsator\" \\+ executableSuffix")) - (string-append "}{ QucsSettings.Qucsator =3D \"" - (assoc-ref inputs "qucs") "/bin/qucsator\""= )) - (((string-append "QucsSettings\\.XyceExecutable =3D " - "\"/usr/local/Xyce-Release-6.8.0-OPENSOURC= E/bin/Xyce")) - (string-append "}{ QucsSettings.XyceExecutable =3D \"" - (assoc-ref inputs "xyce-serial") "/bin/Xyce= ")) - (((string-append "else QucsSettings\\.XyceParExecutable =3D= " - "\"mpirun -np %p /usr/local" - "/Xyce-Release-6.8.0-OPENMPI-OPENSOURCE/bi= n/Xyce")) - (string-append "QucsSettings.XyceParExecutable =3D \"" - (assoc-ref inputs "mpi") "/bin/mpirun -np %= p " - (assoc-ref inputs "xyce-parallel") "/bin/Xy= ce")) - (("else QucsSettings\\.NgspiceExecutable =3D \"ngspice\"") - (string-append "QucsSettings.NgspiceExecutable =3D " "\"" - (assoc-ref inputs "ngspice") "/bin/ngspice\= ""))) - (substitute* "qucs/extsimkernels/ngspice.cpp" - (("share/qucs/xspice_cmlib") "share/qucs-s/xspice_cmlib")) - (substitute* "qucs/qucs_actions.cpp" - (("qucstrans") - (string-append (assoc-ref inputs "qucs") "/bin/qucstrans")) - (("qucsattenuator") - (string-append (assoc-ref inputs "qucs") "/bin/qucsattenua= tor")) - (("qucsrescodes") - (string-append (assoc-ref inputs "qucs") "/bin/qucsrescode= s"))) - #t)) - (add-after 'install 'install-scripts - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each - (lambda (script) - (let ((file (string-append "../qucs_s-" ,version - "/qucs/" script)) - (out (assoc-ref outputs "out"))) - (install-file file (string-append out "/bin")) - (chmod (string-append out "/bin/" script) #o555))) - '("qucsdigi" "qucsdigilib" "qucsveri")) - #t)) - (add-after 'install-scripts 'make-wrapper - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (file (string-append out "/bin/qucs-s")) - (qucs (assoc-ref inputs "qucs")) - (qucsator (string-append qucs "/bin/qucsator"))) - (wrap-program file - `("CPLUS_INCLUDE_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/include"))) - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/bin"))) - `("LIBRARY_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/lib"))) - `("QUCSATOR" ":" prefix (,qucsator)) - `("QUCSCONV" ":" prefix (,(string-append qucsator "/bin/q= ucsconv"))) - `("ADMSXMLBINDIR" ":" prefix (,(string-append (assoc-ref = inputs "adms") - "/bin"))) - `("ASCOBINDIR" ":" prefix (,(string-append (assoc-ref inp= uts "asco") - "/bin"))) - `("QUCS_OCTAVE" ":" prefix (,(string-append (assoc-ref in= puts "octave") - "/bin/octave"= )))) - (symlink qucsator (string-append out "/bin/qucsator")) - #t)))))) - (native-inputs - `(("libtool-native" ,libtool))) - (inputs - `(("adms" ,adms) - ("asco" ,asco) - ("coreutils" ,coreutils) - ("freehdl" ,freehdl) - ("gcc-toolchain" ,gcc-toolchain) - ("iverilog" ,iverilog) - ("libtool" ,libtool) - ("mpi" ,openmpi) - ("ngspice" ,ngspice) - ("octave" ,octave-cli) - ("qt4" ,qt-4) - ("qucs" ,qucs) - ("sed" ,sed) - ("xyce-serial" ,xyce-serial) - ("xyce-parallel" ,xyce-parallel))) - (home-page "https://ra3xdh.github.io/") - (synopsis "Circuit simulator with graphical user interface") - (description - "Qucs-S is a spin-off of the Qucs cross-platform circuit simulator. -The S letter indicates SPICE. The purpose of the Qucs-S subproject is to = use -free SPICE circuit simulation kernels with the Qucs GUI. It provides the -simulator backends @code{Qucsator}, @code{ngspice} and @code{Xyce}.") - (license license:gpl2+))) - (define-public librepcb (package (name "librepcb") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 89d7b8ca83..54a953c741 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1551,99 +1551,6 @@ guidelines. It provides an easy to use application = that allows you to connect with friends and family without anyone else listening in.") (license license:gpl3+))) =20 -(define-public pybitmessage - (package - (name "pybitmessage") - (version "0.6.3.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Bitmessage/PyBitmessage") - (commit version))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35")))) - (propagated-inputs - ;; TODO: - ;; Package "pyopencl", required in addition to numpy for OpenCL suppo= rt. - ;; Package "gst123", required in addition to alsa-utils and - ;; mpg123 for sound support. - `(("python2-msgpack" ,python2-msgpack) - ("python2-pythondialog" ,python2-pythondialog) - ("python2-pyqt-4" ,python2-pyqt-4) - ("python2-sip" ,python2-sip) - ("python2-pysqlite" ,python2-pysqlite) - ("python2-pyopenssl" ,python2-pyopenssl))) - (native-inputs - `(("openssl" ,openssl))) - (build-system python-build-system) - (arguments - `(#:modules ((guix build python-build-system) - (guix build utils)) - #:tests? #f ;no test target - #:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-unmatched-python-shebangs - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/bitmessagemain.py" - (("#!/usr/bin/env python2.7") - (string-append "#!" (which "python")))) - (substitute* "src/bitmessagecli.py" - (("#!/usr/bin/env python2.7.x") - (string-append "#!" (which "python")))) - #t)) - (add-after 'unpack 'fix-depends - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/depends.py" - (("libcrypto.so") - (string-append (assoc-ref inputs "openssl") - "/lib/libcrypto.so"))) - #t)) - (add-after 'unpack 'fix-local-files-in-paths - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "src/proofofwork.py" - (("bitmsghash.so") - (string-append (assoc-ref outputs "out") - "/lib/bitmsghash.so"))) - #t)) - (add-after 'unpack 'fix-pyelliptic - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/pyelliptic/openssl.py" - (("libcrypto.so") - (string-append (assoc-ref inputs "openssl") - "/lib/libcrypto.so")) - (("libssl.so") - (string-append (assoc-ref inputs "openssl") - "/lib/libssl.so"))) - #t)) - (add-after 'unpack 'noninteractive-build - ;; This applies upstream commit 4c597d3f7cf9f83a763472aa165a1a4= 292019f20 - (lambda _ - (substitute* "setup.py" - (("except NameError") - "except EOFError, NameError")) - #t)) - ;; XXX: python setup.py does not build and install bitmsghash, - ;; without it PyBitmessage tries to compile it at first run - ;; in the store, which due to obvious reasons fails. Do it - ;; and place it in /lib. - (add-after 'unpack 'build-and-install-bitmsghash - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion "src/bitmsghash" - (system* "make") - (install-file "bitmsghash.so" - (string-append (assoc-ref outputs "out") "/li= b"))) - #t))))) - (license license:expat) - (description - "Distributed and trustless peer-to-peer communications protocol -for sending encrypted messages to one person or many subscribers.") - (synopsis "Distributed peer-to-peer communication") - (home-page "https://bitmessage.org/"))) - (define-public ytalk (package (name "ytalk") diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.= scm index bd411f59d0..2324c1affc 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -177,37 +177,6 @@ algorithms AES or Twofish.") ;; the combined work falls under the GPLv3. (license license:gpl3))) =20 -(define-public keepassx - (package - (name "keepassx") - (version "2.0.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.keepassx.org/releases/" version - "/keepassx-" version ".tar.gz")) - (sha256 - (base32 - "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3")))) - (build-system cmake-build-system) - (inputs - `(("libgcrypt" ,libgcrypt) - ("libxi" ,libxi) - ("libxtst" ,libxtst) - ("qt" ,qt-4))) - (native-inputs - `(("zlib" ,zlib))) - (home-page "https://www.keepassx.org") - (synopsis "Password manager") - (description "KeePassX is a password manager or safe which helps you to -manage your passwords in a secure way. You can put all your passwords in = one -database, which is locked with one master key or a key-file which can be s= tored -on an external storage device. The databases are encrypted using the -algorithms AES or Twofish.") - ;; Non functional parts use various licences. - (license license:gpl3) - (properties `((superseded . ,keepassxc))))) - (define-public pwsafe (package (name "pwsafe") diff --git a/gnu/packages/patches/avogadro-boost148.patch b/gnu/packages/pa= tches/avogadro-boost148.patch deleted file mode 100644 index f244f14674..0000000000 --- a/gnu/packages/patches/avogadro-boost148.patch +++ /dev/null @@ -1,69 +0,0 @@ -Index: avogadro-1.2.0/libavogadro/src/pythonengine_p.h -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- avogadro-1.2.0.orig/libavogadro/src/pythonengine_p.h -+++ avogadro-1.2.0/libavogadro/src/pythonengine_p.h -@@ -31,7 +31,9 @@ -=20 - #include - #include -+#ifndef Q_MOC_RUN - #include -+#endif -=20 - namespace Avogadro { -=20 -Index: avogadro-1.2.0/libavogadro/src/pythonextension_p.h -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- avogadro-1.2.0.orig/libavogadro/src/pythonextension_p.h -+++ avogadro-1.2.0/libavogadro/src/pythonextension_p.h -@@ -33,7 +33,9 @@ - #include - #include - #include -+#ifndef Q_MOC_RUN - #include -+#endif -=20 - #include - #include -Index: avogadro-1.2.0/libavogadro/src/pythontool_p.h -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- avogadro-1.2.0.orig/libavogadro/src/pythontool_p.h -+++ avogadro-1.2.0/libavogadro/src/pythontool_p.h -@@ -31,7 +31,9 @@ -=20 - #include - #include -+#ifndef Q_MOC_RUN - #include -+#endif -=20 - #include - #include -Index: avogadro-1.2.0/libavogadro/src/pythoninterpreter.h -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- avogadro-1.2.0.orig/libavogadro/src/pythoninterpreter.h -+++ avogadro-1.2.0/libavogadro/src/pythoninterpreter.h -@@ -26,7 +26,9 @@ - #define PYTHONINTERPRETER_H -=20 - #include -+#ifndef Q_MOC_RUN - #include -+#endif - #include - #include -=20 -Index: avogadro-1.2.0/libavogadro/src/pythonscript.h -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- avogadro-1.2.0.orig/libavogadro/src/pythonscript.h -+++ avogadro-1.2.0/libavogadro/src/pythonscript.h -@@ -27,6 +27,8 @@ - #define PYTHONSCRIPT_H -=20 - #include -+#ifndef Q_MOC_RUN - #include -+#endif -=20 - #include "pythonerror.h" diff --git a/gnu/packages/patches/avogadro-eigen3-update.patch b/gnu/packag= es/patches/avogadro-eigen3-update.patch deleted file mode 100644 index a5f669292f..0000000000 --- a/gnu/packages/patches/avogadro-eigen3-update.patch +++ /dev/null @@ -1,603 +0,0 @@ -From 43af3c117b0b3220b15c2fe2895b94bbd83d3a60 Mon Sep 17 00:00:00 2001 -From: Claudio Fernandes -Date: Sun, 15 Jan 2017 21:23:39 -0200 -Subject: [PATCH] Adapt Avogadro to Eigen 3.3 - ---- - CMakeLists.txt | 9 +------ - avogadro/src/mainwindow.cpp | 5 ++-- - libavogadro/src/camera.cpp | 10 ++++---- - libavogadro/src/camera.h | 14 +++++------ - libavogadro/src/engines/wireengine.cpp | 4 ++-- - .../crystallography/crystallographyextension.cpp | 2 +- - .../crystallography/ui/ceviewoptionswidget.cpp | 2 +- - .../src/extensions/orca/orcaanalysedialog.cpp | 1 - - .../src/extensions/orca/orcainputdialog.cpp | 1 - - .../src/extensions/qtaim/qtaimmathutilities.cpp | 1 + - .../qtaim/qtaimwavefunctionevaluator.cpp | 28 +++++++++++------= ----- - .../extensions/surfaces/openqube/gamessukout.cpp | 1 + - .../src/extensions/surfaces/openqube/slaterset.cpp | 6 +++-- - libavogadro/src/glpainter_p.cpp | 14 +++++------ - libavogadro/src/glwidget.cpp | 4 ++-- - libavogadro/src/molecule.cpp | 26 +++++++++++++++++= +-- - libavogadro/src/navigate.cpp | 2 +- - libavogadro/src/tools/bondcentrictool.cpp | 28 +++++++++++------= ----- - libavogadro/src/tools/manipulatetool.cpp | 17 +++++++------ - libavogadro/src/tools/navigatetool.cpp | 3 ++- - libavogadro/src/tools/skeletontree.cpp | 7 +++--- - libavogadro/src/tools/skeletontree.h | 2 +- - 22 files changed, 102 insertions(+), 85 deletions(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -231,14 +231,7 @@ if(NOT Linguist_FOUND) - message(WARNING " Qt4 Linguist not found, please install it if you want= Avogadro translations") - endif() -=20 --find_package(Eigen3) # find and setup Eigen3 if available --if(NOT EIGEN3_FOUND) -- message(STATUS "Cannot find Eigen3, trying Eigen2") -- find_package(Eigen2 REQUIRED) # Some version is required --else() --# Use Stage10 Eigen3 support -- set (EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API TRUE) --endif() -+find_package(Eigen3 REQUIRED) # find and setup Eigen3 if available -=20 - find_package(ZLIB REQUIRED) - find_package(OpenBabel2 REQUIRED) # find and setup OpenBabel ---- a/avogadro/src/mainwindow.cpp -+++ b/avogadro/src/mainwindow.cpp -@@ -115,7 +115,6 @@ - #include -=20 - #include --#include - #define USEQUAT - // This is a "hidden" exported Qt function on the Mac for Qt-4.x. - #ifdef Q_WS_MAC -@@ -2775,7 +2774,7 @@ protected: - linearGoal.row(1) =3D linearGoal.row(2).cross(linearGoal.row(0)); -=20 - // calculate the translation matrix -- Transform3d goal(linearGoal); -+ Projective3d goal(linearGoal); -=20 - goal.pretranslate(- 3.0 * (d->glWidget->radius() + CAMERA_NEAR_DISTAN= CE) * Vector3d::UnitZ()); -=20 -@@ -2840,7 +2839,7 @@ protected: - Matrix3d linearGoal =3D Matrix3d::Identity(); -=20 - // calculate the translation matrix -- Transform3d goal(linearGoal); -+ Projective3d goal(linearGoal); -=20 - goal.pretranslate(- 3.0 * (d->glWidget->radius() + CAMERA_NEAR_DISTAN= CE) * Vector3d::UnitZ()); -=20 ---- a/libavogadro/src/camera.cpp -+++ b/libavogadro/src/camera.cpp -@@ -47,7 +47,7 @@ namespace Avogadro -=20 - CameraPrivate() {}; -=20 -- Eigen::Transform3d modelview, projection; -+ Eigen::Projective3d modelview, projection; - const GLWidget *parent; - double angleOfViewY; - double orthoScale; -@@ -169,20 +169,20 @@ namespace Avogadro -=20 - double Camera::distance(const Eigen::Vector3d & point) const - { -- return ( d->modelview * point ).norm(); -+ return ( d->modelview * point.homogeneous() ).head<3>().norm(); - } -=20 -- void Camera::setModelview(const Eigen::Transform3d &matrix) -+ void Camera::setModelview(const Eigen::Projective3d &matrix) - { - d->modelview =3D matrix; - } -=20 -- const Eigen::Transform3d & Camera::modelview() const -+ const Eigen::Projective3d & Camera::modelview() const - { - return d->modelview; - } -=20 -- Eigen::Transform3d & Camera::modelview() -+ Eigen::Projective3d & Camera::modelview() - { - return d->modelview; - } ---- a/libavogadro/src/camera.h -+++ b/libavogadro/src/camera.h -@@ -101,16 +101,16 @@ namespace Avogadro { - double angleOfViewY() const; - /** Sets 4x4 "modelview" matrix representing the camera orientation= and position. - * @param matrix the matrix to copy from -- * @sa Eigen::Transform3d & modelview(), applyModelview() */ -- void setModelview(const Eigen::Transform3d &matrix); -+ * @sa Eigen::Projective3d & modelview(), applyModelview() */ -+ void setModelview(const Eigen::Projective3d &matrix); - /** @return a constant reference to the 4x4 "modelview" matrix repr= esenting - * the camera orientation and position -- * @sa setModelview(), Eigen::Transform3d & modelview() */ -- const Eigen::Transform3d & modelview() const; -+ * @sa setModelview(), Eigen::Projective3d & modelview() */ -+ const Eigen::Projective3d & modelview() const; - /** @return a non-constant reference to the 4x4 "modelview" matrix = representing - * the camera orientation and position -- * @sa setModelview(), const Eigen::Transform3d & modelview() cons= t */ -- Eigen::Transform3d & modelview(); -+ * @sa setModelview(), const Eigen::Projective3d & modelview() con= st */ -+ Eigen::Projective3d & modelview(); - /** Calls gluPerspective() or glOrtho() with parameters automatical= ly chosen - * for rendering the GLWidget's molecule with this camera. Should = be called - * only in GL_PROJECTION matrix mode. Example code is given -@@ -342,7 +342,7 @@ namespace Avogadro { - * @return {x/w, y/w, z/w} vector - */ - Eigen::Vector3d V4toV3DivW(const Eigen::Vector4d & v4) { -- return v4.start<3>()/v4.w(); -+ return v4.head<3>()/v4.w(); - } - }; -=20 ---- a/libavogadro/src/engines/wireengine.cpp -+++ b/libavogadro/src/engines/wireengine.cpp -@@ -109,7 +109,7 @@ namespace Avogadro { - const Camera *camera =3D pd->camera(); -=20 - // perform a rough form of frustum culling -- Eigen::Vector3d transformedPos =3D pd->camera()->modelview() * v; -+ Eigen::Vector3d transformedPos =3D (pd->camera()->modelview() * v.hom= ogeneous()).head<3>(); - double dot =3D transformedPos.z() / transformedPos.norm(); - if(dot > -0.8) - return true; -@@ -167,7 +167,7 @@ namespace Avogadro { - map =3D pd->colorMap(); // fall back to global color map -=20 - // perform a rough form of frustum culling -- Eigen::Vector3d transformedEnd1 =3D pd->camera()->modelview() * v1; -+ Eigen::Vector3d transformedEnd1 =3D (pd->camera()->modelview() * v1.h= omogeneous()).head<3>(); - double dot =3D transformedEnd1.z() / transformedEnd1.norm(); - if(dot > -0.8) - return true; // i.e., don't bother rendering ---- a/libavogadro/src/extensions/crystallography/crystallographyextension.= cpp -+++ b/libavogadro/src/extensions/crystallography/crystallographyextension.= cpp -@@ -1989,7 +1989,7 @@ namespace Avogadro - // fix coordinates - // Apply COB matrix: - Eigen::Matrix3d invCob; -- cob.computeInverse(&invCob); -+ invCob =3D cob.inverse(); - for (QList::iterator - it =3D fcoords.begin(), - it_end =3D fcoords.end(); ---- a/libavogadro/src/extensions/crystallography/ui/ceviewoptionswidget.cpp -+++ b/libavogadro/src/extensions/crystallography/ui/ceviewoptionswidget.cpp -@@ -139,7 +139,7 @@ namespace Avogadro - { - // View into a Miller plane - Camera *camera =3D m_glWidget->camera(); -- Eigen::Transform3d modelView; -+ Eigen::Projective3d modelView; - modelView.setIdentity(); -=20 - // OK, so we want to rotate to look along the normal at the plane ---- a/libavogadro/src/extensions/orca/orcaanalysedialog.cpp -+++ b/libavogadro/src/extensions/orca/orcaanalysedialog.cpp -@@ -41,7 +41,6 @@ - #include -=20 - #include --#include -=20 - #include -=20 ---- a/libavogadro/src/extensions/orca/orcainputdialog.cpp -+++ b/libavogadro/src/extensions/orca/orcainputdialog.cpp -@@ -33,7 +33,6 @@ - #include -=20 - #include --#include -=20 - #include -=20 ---- a/libavogadro/src/extensions/qtaim/qtaimmathutilities.cpp -+++ b/libavogadro/src/extensions/qtaim/qtaimmathutilities.cpp -@@ -28,6 +28,7 @@ -=20 - #include - #include -+#include -=20 - namespace Avogadro { - namespace QTAIMMathUtilities { ---- a/libavogadro/src/extensions/qtaim/qtaimwavefunctionevaluator.cpp -+++ b/libavogadro/src/extensions/qtaim/qtaimwavefunctionevaluator.cpp -@@ -35,21 +35,21 @@ namespace Avogadro - m_nprim=3Dwfn.numberOfGaussianPrimitives(); - m_nnuc=3Dwfn.numberOfNuclei(); -=20 -- m_nucxcoord=3DMap >(wfn.xNuclearCoordinates()= ,m_nnuc); -- m_nucycoord=3DMap >(wfn.yNuclearCoordinates()= ,m_nnuc); -- m_nuczcoord=3DMap >(wfn.zNuclearCoordinates()= ,m_nnuc); -- m_nucz=3DMap >(wfn.nuclearCharges(),m_nnuc); -- m_X0=3DMap >(wfn.xGaussianPrimitiveCenterCoor= dinates(),m_nprim,1); -- m_Y0=3DMap >(wfn.yGaussianPrimitiveCenterCoor= dinates(),m_nprim,1); -- m_Z0=3DMap >(wfn.zGaussianPrimitiveCenterCoor= dinates(),m_nprim,1); -- m_xamom=3DMap >(wfn.xGaussianPrimitiveAngula= rMomenta(),m_nprim,1); -- m_yamom=3DMap >(wfn.yGaussianPrimitiveAngula= rMomenta(),m_nprim,1); -- m_zamom=3DMap >(wfn.zGaussianPrimitiveAngula= rMomenta(),m_nprim,1); -- m_alpha=3DMap >(wfn.gaussianPrimitiveExponent= Coefficients(),m_nprim,1); -+ m_nucxcoord=3DMap >(const_cast(wfn.xN= uclearCoordinates()),m_nnuc); -+ m_nucycoord=3DMap >(const_cast(wfn.yN= uclearCoordinates()),m_nnuc); -+ m_nuczcoord=3DMap >(const_cast(wfn.zN= uclearCoordinates()),m_nnuc); -+ m_nucz=3DMap >(const_cast(wfn.nucle= arCharges()),m_nnuc); -+ m_X0=3DMap >(const_cast(wfn.xGaussian= PrimitiveCenterCoordinates()),m_nprim,1); -+ m_Y0=3DMap >(const_cast(wfn.yGaussian= PrimitiveCenterCoordinates()),m_nprim,1); -+ m_Z0=3DMap >(const_cast(wfn.zGaussian= PrimitiveCenterCoordinates()),m_nprim,1); -+ m_xamom=3DMap >(const_cast(wfn.xGau= ssianPrimitiveAngularMomenta()),m_nprim,1); -+ m_yamom=3DMap >(const_cast(wfn.yGau= ssianPrimitiveAngularMomenta()),m_nprim,1); -+ m_zamom=3DMap >(const_cast(wfn.zGau= ssianPrimitiveAngularMomenta()),m_nprim,1); -+ m_alpha=3DMap >(const_cast(wfn.gaussi= anPrimitiveExponentCoefficients()),m_nprim,1); - // TODO Implement screening for unoccupied molecular orbitals. -- m_occno=3DMap >(wfn.molecularOrbitalOccupatio= nNumbers(),m_nmo,1); -- m_orbe=3DMap >(wfn.molecularOrbitalEigenvalue= s(),m_nmo,1); -- m_coef=3DMap >(wfn.molecularOr= bitalCoefficients(),m_nmo,m_nprim); -+ m_occno=3DMap >(const_cast(wfn.molecu= larOrbitalOccupationNumbers()),m_nmo,1); -+ m_orbe=3DMap >(const_cast(wfn.molecul= arOrbitalEigenvalues()),m_nmo,1); -+ m_coef=3DMap >(const_cast(wfn.molecularOrbitalCoefficients()),m_nmo,m_nprim); - m_totalEnergy=3Dwfn.totalEnergy(); - m_virialRatio=3Dwfn.virialRatio(); -=20 ---- a/libavogadro/src/extensions/surfaces/openqube/gamessukout.cpp -+++ b/libavogadro/src/extensions/surfaces/openqube/gamessukout.cpp -@@ -19,6 +19,7 @@ - using Eigen::Vector3d; - using std::vector; -=20 -+#include - #include -=20 - namespace OpenQube ---- a/libavogadro/src/extensions/surfaces/openqube/slaterset.cpp -+++ b/libavogadro/src/extensions/surfaces/openqube/slaterset.cpp -@@ -25,9 +25,9 @@ -=20 - #include "cube.h" -=20 --#include - #include - #include -+#include -=20 - #include -=20 -@@ -250,7 +250,9 @@ bool SlaterSet::initialize() -=20 - SelfAdjointEigenSolver s(m_overlap); - MatrixXd p =3D s.eigenvectors(); -- MatrixXd m =3D p * s.eigenvalues().cwise().inverse().cwise().sqrt().asD= iagonal() * p.inverse(); -+ // TODO check if this is correct -+ MatrixXd m1 =3D (s.eigenvalues().array().inverse().sqrt()); -+ MatrixXd m =3D p.array()*(m1.diagonal().array())*p.inverse().array(); - m_normalized =3D m * m_eigenVectors; -=20 - if (!(m_overlap*m*m).isIdentity()) ---- a/libavogadro/src/glpainter_p.cpp -+++ b/libavogadro/src/glpainter_p.cpp -@@ -789,13 +789,13 @@ namespace Avogadro - } else { - points[theta-1] =3D Eigen::AngleAxisd(theta * (M_PI / 180.0) / = 2, n) * u; - } -- points[theta-1] =3D d->widget->camera()->modelview() * (origin + = points[theta-1]); -+ points[theta-1] =3D (d->widget->camera()->modelview() * (origin += points[theta-1]).homogeneous()).head<3>(); - } -=20 - // Get vectors representing the points' positions in terms of the mod= el view. -- Eigen::Vector3d _origin =3D d->widget->camera()->modelview() * origin; -- Eigen::Vector3d _direction1 =3D d->widget->camera()->modelview() * (o= rigin+u); -- Eigen::Vector3d _direction2 =3D d->widget->camera()->modelview() * (o= rigin+v); -+ Eigen::Vector3d _origin =3D (d->widget->camera()->modelview() * origi= n.homogeneous()).head<3>(); -+ Eigen::Vector3d _direction1 =3D (d->widget->camera()->modelview() * (= origin+u).homogeneous()).head<3>(); -+ Eigen::Vector3d _direction2 =3D (d->widget->camera()->modelview() * (= origin+v).homogeneous()).head<3>(); -=20 - glPushAttrib(GL_ALL_ATTRIB_BITS); - glPushMatrix(); -@@ -880,12 +880,12 @@ namespace Avogadro - } else { - points[theta-1] =3D Eigen::AngleAxisd(theta * (M_PI / 180.0) / = 2, n) * u; - } -- points[theta-1] =3D d->widget->camera()->modelview() * (origin + = points[theta-1]); -+ points[theta-1] =3D (d->widget->camera()->modelview() * (origin += points[theta-1]).homogeneous()).head<3>(); - } -=20 - // Get vectors representing the points' positions in terms of the mod= el view. -- Eigen::Vector3d _direction1 =3D d->widget->camera()->modelview() * (o= rigin + u); -- Eigen::Vector3d _direction2 =3D d->widget->camera()->modelview() * (o= rigin + v); -+ Eigen::Vector3d _direction1 =3D (d->widget->camera()->modelview() * (= origin + u).homogeneous()).head<3>(); -+ Eigen::Vector3d _direction2 =3D (d->widget->camera()->modelview() * (= origin + v).homogeneous()).head<3>(); -=20 - glPushAttrib(GL_ALL_ATTRIB_BITS); - glPushMatrix(); ---- a/libavogadro/src/glwidget.cpp -+++ b/libavogadro/src/glwidget.cpp -@@ -765,7 +765,7 @@ namespace Avogadro { - GLfloat fogColor[4]=3D {static_cast(d->background.redF()),= static_cast(d->background.greenF()), - static_cast(d->background.blueF()), = static_cast(d->background.alphaF())}; - glFogfv(GL_FOG_COLOR, fogColor); -- Vector3d distance =3D camera()->modelview() * d->center; -+ Vector3d distance =3D (camera()->modelview() * d->center.homogeneou= s()).head<3>(); - double distanceToCenter =3D distance.norm(); - glFogf(GL_FOG_DENSITY, 1.0); - glHint(GL_FOG_HINT, GL_NICEST); -@@ -1711,7 +1711,7 @@ namespace Avogadro { -=20 - if (d->renderModelViewDebug) { - // Model view matrix: -- const Eigen::Transform3d &modelview =3D d->camera->modelview(); -+ const Eigen::Projective3d &modelview =3D d->camera->modelview(); - y +=3D d->pd->painter()->drawText - (x, y, tr("ModelView row 1: %L1 %L2 %L3 %L4") - .arg(modelview(0, 0), 6, 'f', 2, ' ') ---- a/libavogadro/src/molecule.cpp -+++ b/libavogadro/src/molecule.cpp -@@ -38,7 +38,7 @@ - #include "zmatrix.h" -=20 - #include --#include -+#include -=20 - #include -=20 -@@ -1907,7 +1907,29 @@ namespace Avogadro{ - } - d->center /=3D static_cast(nAtoms); - Eigen::Hyperplane planeCoeffs; -- Eigen::fitHyperplane(numAtoms(), atomPositions, &planeCoeffs); -+ //Eigen::fitHyperplane(numAtoms(), atomPositions, &planeCoeffs); -+ -+ // TODO check if this is OK -+ /************************/ -+ typedef Eigen::Matrix CovMatrixType; -+ typedef Eigen::Vector3d VectorType; -+=20=20=20=20=20=20=20=20 -+ VectorType mean =3D d->center; -+ int size=3D3; -+ int numPoints=3DnumAtoms(); -+ VectorType ** points=3DatomPositions; -+ CovMatrixType covMat =3D CovMatrixType::Zero(size, size); -+ VectorType remean =3D VectorType::Zero(size); -+ for(int i =3D 0; i < numPoints; ++i) -+ { -+ VectorType diff =3D (*(points[i]) - mean).conjugate(); -+ covMat +=3D diff * diff.adjoint(); -+ } -+ Eigen::SelfAdjointEigenSolver eig(covMat); -+ planeCoeffs.normal() =3D eig.eigenvectors().col(0); -+ /************************/ -+ -+ - delete[] atomPositions; - d->normalVector =3D planeCoeffs.normal(); - } ---- a/libavogadro/src/navigate.cpp -+++ b/libavogadro/src/navigate.cpp -@@ -40,7 +40,7 @@ namespace Avogadro { - void Navigate::zoom(GLWidget *widget, const Eigen::Vector3d &goal, - double delta) - { -- Vector3d transformedGoal =3D widget->camera()->modelview() * goal; -+ Vector3d transformedGoal =3D (widget->camera()->modelview() * goal.ho= mogeneous()).head<3>(); - double distanceToGoal =3D transformedGoal.norm(); -=20 - double t =3D ZOOM_SPEED * delta; ---- a/libavogadro/src/tools/bondcentrictool.cpp -+++ b/libavogadro/src/tools/bondcentrictool.cpp -@@ -578,8 +578,8 @@ namespace Avogadro { -=20 - Vector3d clicked =3D *m_clickedAtom->pos(); -=20 -- Vector3d axis =3D Vector3d(0, 0, ((widget->camera()->modelview(= ) * other).z() >=3D -- (widget->camera()->modelview() * center).z() ? -1 : 1)); -+ Vector3d axis =3D Vector3d(0, 0, ((widget->camera()->modelview(= ) * other.homogeneous()).z() >=3D -+ (widget->camera()->modelview() * center.homogeneous()).z(= ) ? -1 : 1)); -=20 - Vector3d centerProj =3D widget->camera()->project(center); - centerProj -=3D Vector3d(0,0,centerProj.z()); -@@ -673,8 +673,8 @@ namespace Avogadro { -=20 - Vector3d clicked =3D *m_clickedAtom->pos(); -=20 -- Vector3d axis =3D Vector3d(0, 0, ((widget->camera()->modelview(= ) * other).z() >=3D -- (widget->camera()->modelview() * center).z() ? -1 : 1)); -+ Vector3d axis =3D Vector3d(0, 0, ((widget->camera()->modelview(= ) * other.homogeneous()).z() >=3D -+ (widget->camera()->modelview() * center.homogeneous()).z(= ) ? -1 : 1)); -=20 - Vector3d centerProj =3D widget->camera()->project(center); - centerProj -=3D Vector3d(0,0,centerProj.z()); -@@ -1362,10 +1362,10 @@ namespace Avogadro { -=20 - planeVec =3D length * (planeVec / planeVec.norm()); -=20 -- Vector3d topLeft =3D widget->camera()->modelview() * (left + planeVec= ); -- Vector3d topRight =3D widget->camera()->modelview() * (right + planeV= ec); -- Vector3d botRight =3D widget->camera()->modelview() * (right - planeV= ec); -- Vector3d botLeft =3D widget->camera()->modelview() * (left - planeVec= ); -+ Vector3d topLeft =3D (widget->camera()->modelview() * (left + planeVe= c).homogeneous()).head<3>(); -+ Vector3d topRight =3D (widget->camera()->modelview() * (right + plane= Vec).homogeneous()).head<3>(); -+ Vector3d botRight =3D (widget->camera()->modelview() * (right - plane= Vec).homogeneous()).head<3>(); -+ Vector3d botLeft =3D (widget->camera()->modelview() * (left - planeVe= c).homogeneous()).head<3>(); -=20 - float alpha =3D 0.4; - double lineWidth =3D 1.5; -@@ -1444,10 +1444,10 @@ namespace Avogadro { - C =3D D + ((C-D).normalized() * minWidth); - } -=20 -- Vector3d topLeft =3D widget->camera()->modelview() * D; -- Vector3d topRight =3D widget->camera()->modelview() * C; -- Vector3d botRight =3D widget->camera()->modelview() * B; -- Vector3d botLeft =3D widget->camera()->modelview() * A; -+ Vector3d topLeft =3D (widget->camera()->modelview() * D.homogeneous()= ).head<3>(); -+ Vector3d topRight =3D (widget->camera()->modelview() * C.homogeneous(= )).head<3>(); -+ Vector3d botRight =3D (widget->camera()->modelview() * B.homogeneous(= )).head<3>(); -+ Vector3d botLeft =3D (widget->camera()->modelview() * A.homogeneous()= ).head<3>(); -=20 - float alpha =3D 0.4; - double lineWidth =3D 1.5; -@@ -1506,12 +1506,12 @@ namespace Avogadro { - Vector3d positionVector) - { - //Rotate skeleton around a particular axis and center point -- Eigen::Transform3d rotation; -+ Eigen::Projective3d rotation; - rotation =3D Eigen::AngleAxisd(angle, rotationVector); - rotation.pretranslate(centerVector); - rotation.translate(-centerVector); -=20 -- return rotation*positionVector; -+ return (rotation*positionVector.homogeneous()).head<3>(); - } -=20 - // ########## showAnglesChanged ########## ---- a/libavogadro/src/tools/manipulatetool.cpp -+++ b/libavogadro/src/tools/manipulatetool.cpp -@@ -40,7 +40,6 @@ - #include -=20 - using Eigen::Vector3d; --using Eigen::Transform3d; - using Eigen::AngleAxisd; -=20 - namespace Avogadro { -@@ -138,7 +137,7 @@ namespace Avogadro { - double yRotate =3D m_settingsWidget->yRotateSpinBox->value() * DEG_TO= _RAD; - double zRotate =3D m_settingsWidget->zRotateSpinBox->value() * DEG_TO= _RAD; -=20 -- Eigen::Transform3d rotation; -+ Eigen::Projective3d rotation; - rotation.matrix().setIdentity(); - rotation.translation() =3D center; - rotation.rotate(AngleAxisd(xRotate, Vector3d::UnitX()) -@@ -152,12 +151,12 @@ namespace Avogadro { - if (p->type() =3D=3D Primitive::AtomType) { - Atom *atom =3D static_cast(p); - tempPos =3D translate + *(atom->pos()); -- atom->setPos(rotation * tempPos); -+ atom->setPos((rotation * tempPos.homogeneous()).head<3>()); - } - } else { - foreach(Atom *atom, widget->molecule()->atoms()) { - tempPos =3D translate + *(atom->pos()); -- atom->setPos(rotation * tempPos); -+ atom->setPos((rotation * tempPos.homogeneous()).head<3>()); - } - } -=20 -@@ -199,7 +198,7 @@ namespace Avogadro { - widget->setCursor(Qt::SizeVerCursor); -=20 - // Move the selected atom(s) in to or out of the screen -- Vector3d transformedGoal =3D widget->camera()->modelview() * *goal; -+ Vector3d transformedGoal =3D (widget->camera()->modelview() * goal->h= omogeneous()).head<3>(); - double distanceToGoal =3D transformedGoal.norm(); -=20 - double t =3D ZOOM_SPEED * delta; -@@ -255,7 +254,7 @@ namespace Avogadro { -=20 - // Rotate the selected atoms about the center - // rotate only selected primitives -- Transform3d fragmentRotation; -+ Eigen::Projective3d fragmentRotation; - fragmentRotation.matrix().setIdentity(); - fragmentRotation.translation() =3D *center; - fragmentRotation.rotate( -@@ -266,7 +265,7 @@ namespace Avogadro { -=20 - foreach(Primitive *p, widget->selectedPrimitives()) - if (p->type() =3D=3D Primitive::AtomType) -- static_cast(p)->setPos(fragmentRotation * *static_cast(p)->pos()); -+ static_cast(p)->setPos((fragmentRotation * static_cast(p)->pos()->homogeneous()).head<3>()); - widget->molecule()->update(); - } -=20 -@@ -274,7 +273,7 @@ namespace Avogadro { - double delta) const - { - // Tilt the selected atoms about the center -- Transform3d fragmentRotation; -+ Eigen::Projective3d fragmentRotation; - fragmentRotation.matrix().setIdentity(); - fragmentRotation.translation() =3D *center; - fragmentRotation.rotate(AngleAxisd(delta * ROTATION_SPEED, widget->ca= mera()->backTransformedZAxis())); -@@ -282,7 +281,7 @@ namespace Avogadro { -=20 - foreach(Primitive *p, widget->selectedPrimitives()) - if (p->type() =3D=3D Primitive::AtomType) -- static_cast(p)->setPos(fragmentRotation * *static_cast(p)->pos()); -+ static_cast(p)->setPos((fragmentRotation * static_cast(p)->pos()->homogeneous()).head<3>()); - widget->molecule()->update(); - } -=20 ---- a/libavogadro/src/tools/navigatetool.cpp -+++ b/libavogadro/src/tools/navigatetool.cpp -@@ -92,7 +92,8 @@ namespace Avogadro { - double sumOfWeights =3D 0.; - QList atoms =3D widget->molecule()->atoms(); - foreach (Atom *atom, atoms) { -- Vector3d transformedAtomPos =3D widget->camera()->modelview() * *= atom->pos(); -+ Vector3d transformedAtomPos =3D (widget->camera()->modelview() * -+ atom->pos()->homogeneous()).head<3= >(); - double atomDistance =3D transformedAtomPos.norm(); - double dot =3D transformedAtomPos.z() / atomDistance; - double weight =3D exp(-30. * (1. + dot)); ---- a/libavogadro/src/tools/skeletontree.cpp -+++ b/libavogadro/src/tools/skeletontree.cpp -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include -=20 - using namespace Eigen; - using namespace std; -@@ -221,7 +222,7 @@ namespace Avogadro { - { - if (m_rootNode) { - //Rotate skeleton around a particular axis and center point -- Eigen::Transform3d rotation; -+ Eigen::Projective3d rotation; - rotation =3D Eigen::AngleAxisd(angle, rotationAxis); - rotation.pretranslate(centerVector); - rotation.translate(-centerVector); -@@ -248,11 +249,11 @@ namespace Avogadro { - // ########## recursiveRotate ########## -=20 - void SkeletonTree::recursiveRotate(Node* n, -- const Eigen::Transform3d &rotationMa= trix) -+ const Eigen::Projective3d &rotationM= atrix) - { - // Update the root node with the new position - Atom* a =3D n->atom(); -- a->setPos(rotationMatrix * (*a->pos())); -+ a->setPos((rotationMatrix * (*a->pos()).homogeneous()).head<3>()); - a->update(); -=20 - // Now update the children ---- a/libavogadro/src/tools/skeletontree.h -+++ b/libavogadro/src/tools/skeletontree.h -@@ -230,6 +230,6 @@ namespace Avogadro { - * @param centerVector Center location to rotate around. - */ - void recursiveRotate(Node* n, -- const Eigen::Transform3d &rotationMatrix); -+ const Eigen::Projective3d &rotationMatrix); -=20 - }; - } // End namespace Avogadro \ No newline at end of file diff --git a/gnu/packages/patches/avogadro-python-eigen-lib.patch b/gnu/pac= kages/patches/avogadro-python-eigen-lib.patch deleted file mode 100644 index ac9f2e30af..0000000000 --- a/gnu/packages/patches/avogadro-python-eigen-lib.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 2d4be7ede177a8df7340fe3b209698d591ee8a04 Mon Sep 17 00:00:00 2001 -From: Claudio Fernandes -Date: Mon, 16 Jan 2017 19:48:23 -0200 -Subject: [PATCH] Adapt libavogadro/python to Eigen 3.3 - ---- - libavogadro/src/python/camera.cpp | 2 +- - libavogadro/src/python/eigen.cpp | 60 +++++++++++++++++++---------------= ----- - 2 files changed, 31 insertions(+), 31 deletions(-) - -diff --git a/libavogadro/src/python/camera.cpp b/libavogadro/src/python/ca= mera.cpp -index 69ca87bf8..30b32af7d 100644 ---- a/libavogadro/src/python/camera.cpp -+++ b/libavogadro/src/python/camera.cpp -@@ -10,7 +10,7 @@ using namespace Avogadro; - void export_Camera() - { -=20 -- const Eigen::Transform3d& (Camera::*modelview_ptr)() const =3D &Camera:= :modelview; -+ const Eigen::Projective3d& (Camera::*modelview_ptr)() const =3D &Camera= ::modelview; - Eigen::Vector3d (Camera::*unProject_ptr1)(const Eigen::Vector3d&) const= =3D &Camera::unProject; - Eigen::Vector3d (Camera::*unProject_ptr2)(const QPoint&, const Eigen::V= ector3d&) const =3D &Camera::unProject; - Eigen::Vector3d (Camera::*unProject_ptr3)(const QPoint&) const =3D &Cam= era::unProject; -diff --git a/libavogadro/src/python/eigen.cpp b/libavogadro/src/python/eig= en.cpp -index c1faedbcc..20b4e719d 100644 ---- a/libavogadro/src/python/eigen.cpp -+++ b/libavogadro/src/python/eigen.cpp -@@ -305,9 +305,9 @@ template <> struct ScalarTraits - struct innerclass - { - // -- // Eigen::Transform3d --> python array (4x4) -+ // Eigen::Projective3d --> python array (4x4) - // -- static PyObject* convert(Eigen::Transform3d const &trans) -+ static PyObject* convert(Eigen::Projective3d const &trans) - { - npy_intp dims[2] =3D { 4, 4 }; - PyObject *result =3D PyArray_SimpleNew(2, dims, PyArray_DOUBLE); -@@ -321,9 +321,9 @@ template <> struct ScalarTraits - return incref(result); - } - // -- // Eigen::Transform3d* --> python array (4x4) -+ // Eigen::Projective3d* --> python array (4x4) - // -- static PyObject* convert(Eigen::Transform3d *trans) -+ static PyObject* convert(Eigen::Projective3d *trans) - { - npy_intp dims[2] =3D { 4, 4 }; - PyObject *result =3D PyArray_SimpleNew(2, dims, PyArray_DOUBLE); -@@ -337,9 +337,9 @@ template <> struct ScalarTraits - return incref(result); - } - // -- // const Eigen::Transform3d* --> python array (4x4) -+ // const Eigen::Projective3d* --> python array (4x4) - // -- static PyObject* convert(const Eigen::Transform3d *trans) -+ static PyObject* convert(const Eigen::Projective3d *trans) - { - npy_intp dims[2] =3D { 4, 4 }; - PyObject *result =3D PyArray_SimpleNew(2, dims, PyArray_DOUBLE); -@@ -358,10 +358,10 @@ template <> struct ScalarTraits - Transform3d_to_python_array() - { - #ifndef WIN32 -- to_python_converter(); -+ to_python_converter(); - #endif -- to_python_converter(); -- to_python_converter(); -+ to_python_converter(); -+ to_python_converter(); - } -=20 - }; -@@ -373,17 +373,17 @@ template <> struct ScalarTraits - // Insert an rvalue from_python converter at the tail of the - // chain. Used for implicit conversions - // -- // python array --> Eigen::Transform3d -+ // python array --> Eigen::Projective3d - // - // used for: - // -- // void function(Eigen::Transform3d vec) -- // void function(Eigen::Transform3d & vec) -- // void function(const Eigen::Transform3d & vec) -+ // void function(Eigen::Projective3d vec) -+ // void function(Eigen::Projective3d & vec) -+ // void function(const Eigen::Projective3d & vec) - // -- converter::registry::push_back( &convertible, &construct, type_id() ); -+ converter::registry::push_back( &convertible, &construct, type_id() ); -=20=20=20=20=20=20=20 -- converter::registry::insert( &convert, type_id(= ) ); -+ converter::registry::insert( &convert, type_id= () ); - } -=20 - static void* convert(PyObject *obj_ptr) -@@ -401,7 +401,7 @@ template <> struct ScalarTraits - throw_error_already_set(); // the 1D array does not have exactly = 3 elements -=20 - double *values =3D reinterpret_cast(array->data); -- Eigen::Transform3d *c_obj =3D new Eigen::Transform3d(); -+ Eigen::Projective3d *c_obj =3D new Eigen::Projective3d(); - double *dataPtr =3D c_obj->data(); -=20 - for (int i =3D 0; i < 16; ++i) -@@ -432,7 +432,7 @@ template <> struct ScalarTraits - // I think this is a better way to get at the double array, where i= s this - // deleted though? Does Boost::Python do it? - double *values =3D reinterpret_cast(array->data); -- Eigen::Transform3d *storage =3D new Eigen::Transform3d(); -+ Eigen::Projective3d *storage =3D new Eigen::Projective3d(); - double *dataPtr =3D storage->data(); -=20 - for (int i =3D 0; i < 16; ++i) -@@ -467,21 +467,21 @@ class EigenUnitTestHelper - void set_vector3d_ptr(Eigen::Vector3d* vec) { m_vecto= r3d =3D *vec; } - void set_const_vector3d_ptr(const Eigen::Vector3d* const vec) { m_vec= tor3d =3D *vec; } -=20 -- //Eigen::Transform3d transform3d() { return = m_transform3d; } -- //Eigen::Transform3d& transform3d_ref() { return = m_transform3d; } -- const Eigen::Transform3d& const_transform3d_ref() { return m_= transform3d; } -- Eigen::Transform3d* transform3d_ptr() { return &m= _transform3d; } -- const Eigen::Transform3d* const_transform3d_ptr() { return &m= _transform3d; } -- -- //void set_transform3d(Eigen::Transform3d vec) {= m_transform3d =3D vec; } -- //void set_transform3d_ref(Eigen::Transform3d& vec) {= m_transform3d =3D vec; } -- void set_const_transform3d_ref(const Eigen::Transform3d& vec) { m= _transform3d =3D vec; } -- void set_transform3d_ptr(Eigen::Transform3d* vec) { m= _transform3d =3D *vec; } -- void set_const_transform3d_ptr(const Eigen::Transform3d* const vec) {= m_transform3d =3D *vec; } -+ //Eigen::Projective3d transform3d() { return= m_transform3d; } -+ //Eigen::Projective3d& transform3d_ref() { return= m_transform3d; } -+ const Eigen::Projective3d& const_transform3d_ref() { return m= _transform3d; } -+ Eigen::Projective3d* transform3d_ptr() { return &= m_transform3d; } -+ const Eigen::Projective3d* const_transform3d_ptr() { return &= m_transform3d; } -+ -+ //void set_transform3d(Eigen::Projective3d vec) = { m_transform3d =3D vec; } -+ //void set_transform3d_ref(Eigen::Projective3d& vec) = { m_transform3d =3D vec; } -+ void set_const_transform3d_ref(const Eigen::Projective3d& vec) { = m_transform3d =3D vec; } -+ void set_transform3d_ptr(Eigen::Projective3d* vec) { = m_transform3d =3D *vec; } -+ void set_const_transform3d_ptr(const Eigen::Projective3d* const vec) = { m_transform3d =3D *vec; } -=20=20 - private: - Eigen::Vector3d m_vector3d; -- Eigen::Transform3d m_transform3d; -+ Eigen::Projective3d m_transform3d; -=20 - }; - #endif -@@ -529,6 +529,6 @@ void export_Eigen() - Vector3x_to_python_array(); - Vector3x_from_python_array(); -=20 -- // Eigen::Transform3d -+ // Eigen::Projective3d - Transform3d_to_python_array(); - Transform3d_from_python_array(); diff --git a/gnu/packages/patches/tipp10-fix-compiling.patch b/gnu/packages= /patches/tipp10-fix-compiling.patch deleted file mode 100644 index 3a34a98b22..0000000000 --- a/gnu/packages/patches/tipp10-fix-compiling.patch +++ /dev/null @@ -1,212 +0,0 @@ -Description: Debian patches to make tipp10 compile -Author: Christoph Martin -Last-Update: 2016-07-20 - -https://sources.debian.net/data/main/t/tipp10/2.1.0-2/debian/patches/0001-= FixCompiling - ---- a/widget/tickerboard.cpp -+++ b/widget/tickerboard.cpp -@@ -97,7 +97,8 @@ void TickerBoard::startTicker(bool wasPa - =0D - if (tickerSpeed =3D=3D 50) {=0D - scrollOffset =3D 290;=0D -- scroll(-290, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());=0D -+ const QRect qr =3D QRect(10, 15, 590, 35);=0D -+ scroll(-290, 0, qr); //contentsRect());=0D - }=0D - =0D - startFlag =3D true;=0D -@@ -153,7 +154,8 @@ void TickerBoard::changeChar() { - scrollOffset =3D 0;=0D - } else {=0D - scrollOffset =3D 290;=0D -- scroll(-290, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());=0D -+ const QRect qr =3D QRect(10, 15, 590, 35);=0D -+ scroll(-290, 0, qr); //contentsRect());=0D - }=0D - splitLesson();=0D - }=0D -@@ -242,7 +244,8 @@ void TickerBoard::progress() { - =0D - // Move ticker 1 pixel to left=0D - scrollOffset++;=0D -- scroll(-1, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());=0D -+ const QRect qr =3D QRect(10, 15, 590, 35);=0D -+ scroll(-1, 0, qr); //contentsRect());=0D - =0D - if ((lessonOffset - scrollOffset) <=3D 30) {=0D - setSpeed(tickerSpeed);=0D -@@ -265,14 +268,16 @@ void TickerBoard::progress() { - // 160 pixels overage (because the user must see at least the next wor= d)=0D - if ((lessonOffset - scrollOffset) > 200) {=0D - scrollOffset +=3D (lessonOffset - scrollOffset) - 200;=0D -- scroll(-((lessonOffset - scrollOffset) - 200), 0, QRect::QRect(10, 15= , 590, 35)); //contentsRect());=0D -+ const QRect qr =3D QRect(10, 15, 590, 35);=0D -+ scroll(-((lessonOffset - scrollOffset) - 200), 0, qr); //contentsRect= ());=0D - }=0D - } else {=0D - // If the user types faster than the ticker, move ticker faster after= =0D - // 160 pixels overage (because the user must see at least the next wor= d)=0D - if ((lessonOffset - scrollOffset) > 280) {=0D - scrollOffset +=3D 570;=0D -- scroll(-570, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());=0D -+ const QRect qr =3D QRect(10, 15, 590, 35);=0D -+ scroll(-570, 0, qr); //contentsRect());=0D - }=0D - =0D - }=0D ---- a/widget/settingspages.cpp -+++ b/widget/settingspages.cpp -@@ -501,7 +501,7 @@ void DatabasePage::writeSettings() { - QSettings settings;=0D - #endif=0D - settings.beginGroup("database");=0D -- settings.setValue("pathpro", lineDatabasePath->text() + "/" + QString::Q= String(APP_USER_DB));=0D -+ settings.setValue("pathpro", lineDatabasePath->text() + "/" + QString(AP= P_USER_DB));=0D - settings.endGroup();=0D - }=0D - =0D ---- a/widget/lessondialog.cpp -+++ b/widget/lessondialog.cpp -@@ -89,7 +89,7 @@ void LessonDialog::updateContent() { - *lessonData =3D lineLessonContent->toPlainText().split("\n", QString::= SkipEmptyParts);=0D - // Delete empty lines=0D - for (int i =3D 0; i < lessonData->size(); i++) {=0D -- if (QString::QString(lessonData->at(i).toLocal8Bit().constData()).sim= plified() =3D=3D "") {=0D -+ if (QString(lessonData->at(i).toLocal8Bit().constData()).simplified()= =3D=3D "") {=0D - lessonData->removeAt(i);=0D - }=0D - }=0D -@@ -259,7 +259,7 @@ void LessonDialog::clickSave() { - contentList =3D lineLessonContent->toPlainText().split("\n", QString::Sk= ipEmptyParts);=0D - // Delete empty lines=0D - for (i =3D 0; i < contentList.size(); i++) {=0D -- if (QString::QString(contentList.at(i).toLocal8Bit().constData()).simpl= ified() =3D=3D "") {=0D -+ if (QString(contentList.at(i).toLocal8Bit().constData()).simplified() = =3D=3D "") {=0D - contentList.removeAt(i);=0D - }=0D - }=0D ---- a/sql/chartablesql.cpp -+++ b/sql/chartablesql.cpp -@@ -57,7 +57,7 @@ QVariant CharSqlModel::data(const QModel - // Read the unicode value=0D - unicode =3D value.toInt();=0D - // Convert unicode to a char=0D -- unicodeToChar =3D QString::QString(QChar(unicode)); //"\'" + QString::= QString(QChar(unicode)) + "\'";=0D -+ unicodeToChar =3D QString(QChar(unicode)); //"\'" + QString::QString(Q= Char(unicode)) + "\'";=0D - return unicodeToChar;=0D - } else {=0D - // Last column (error weight)=0D ---- a/sql/startsql.cpp -+++ b/sql/startsql.cpp -@@ -344,7 +344,7 @@ bool StartSql::updateOwnLesson(QString l - for (i =3D 0; i < content.size(); i++) {=0D - //simplifiedContent =3D QString::QString(=0D - // content.at(i)).replace(QChar(0x27), "''", Qt::CaseSensitive).simpli= fied();=0D -- simplifiedContent =3D trim(QString::QString(=0D -+ simplifiedContent =3D trim(QString(=0D - content.at(i)).replace(QChar(0x27), "''", Qt::CaseSensitive));=0D - =0D - if (!query.exec("INSERT INTO own_content VALUES(NULL,'" +=0D ---- a/def/defines.h -+++ b/def/defines.h -@@ -27,9 +27,9 @@ Foundation, Inc., 51 Franklin Street, Fi - #define DEFINES_H=0D - =0D - // OS constants=0D --#define APP_WIN true=0D -+#define APP_WIN false=0D - #define APP_MAC false=0D --#define APP_X11 false=0D -+#define APP_X11 true=0D - #define APP_PORTABLE false //at least one of the 3 OS must be true too= !=0D - =0D - // Languages=0D -@@ -47,6 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fi - #define APP_URL "http://www.tipp10.com"=0D - #define APP_DB "tipp10v2.template"=0D - #define APP_USER_DB "tipp10v2.db"=0D -+#define APP_SHARE_DIR "/usr/share/tipp10"=0D - =0D - // Update constants=0D - #define UPDATE_URL "www.tipp10.com"=0D ---- a/tipp10.pro -+++ b/tipp10.pro -@@ -88,3 +88,15 @@ SOURCES +=3D main.cpp \ - sql/startsql.cpp \=0D - games/abcrainwidget.cpp \=0D - games/charball.cpp=0D -+=0D -+target.path =3D /usr/bin/=0D -+INSTALLS +=3D target=0D -+share.path =3D /usr/share/tipp10/=0D -+share.files =3D release/* *wav=0D -+INSTALLS +=3D share=0D -+desktop.path =3D /usr/share/applications/=0D -+desktop.files =3D tipp10.desktop=0D -+INSTALLS +=3D desktop=0D -+pixmap.path =3D /usr/share/pixmaps/=0D -+pixmap.files =3D tipp10.png=0D -+INSTALLS +=3D pixmap=0D ---- a/sql/connection.h -+++ b/sql/connection.h -@@ -179,11 +179,13 @@ static bool createConnection() { - CANCEL_NO, "Betroffener Pfad:\n" + dbPath);*/=0D - // Try to create new databae in user path=0D - // Exist a database in the program dir?=0D -- if (QFile::exists(QCoreApplication::applicationDirPath() + "/" + dbNam= eTemplate)) {=0D -+ // if (QFile::exists(QCoreApplication::applicationDirPath() + "/" + db= NameTemplate)) {=0D -+ if (QFile::exists(QString(APP_SHARE_DIR) + "/" + dbNameTemplate)) {= =0D - //if (QFile::exists(":/" + dbNameTemplate)) {=0D - // A database exist in the program dir=0D - // -> copy database to user home dir=0D -- QFile file(QCoreApplication::applicationDirPath() + "/" + dbNameTempl= ate);=0D -+ // QFile file(QCoreApplication::applicationDirPath() + "/" + dbNameTe= mplate);=0D -+ QFile file(QString(APP_SHARE_DIR) + "/" + dbNameTemplate);=0D - //QFile file(":/" + dbNameTemplate);=0D - if (file.copy(dbPath)) {=0D - QFile::setPermissions(dbPath, QFile::permissions(dbPath) | QFile::Wr= iteUser);=0D -@@ -229,7 +231,8 @@ static bool createConnection() { - // Exist a database in user's home dir?=0D - if (!QFile::exists(dbPath)) {=0D - // Exist a database template in the program dir?=0D -- dbPath =3D QCoreApplication::applicationDirPath() + "/" + dbNameTempla= te;=0D -+ // dbPath =3D QCoreApplication::applicationDirPath() + "/" + dbNameTem= plate;=0D -+ dbPath =3D QString(APP_SHARE_DIR) + "/" + dbNameTemplate;=0D - //dbPath =3D ":/" + dbNameTemplate;=0D - if (QFile::exists(dbPath)) {=0D - // A database template exist in the program dir=0D ---- a/widget/helpbrowser.cpp -+++ b/widget/helpbrowser.cpp -@@ -52,13 +52,15 @@ HelpBrowser::HelpBrowser(QString link, Q - textBrowser->setOpenExternalLinks(true);=0D - =0D - textBrowser->setSource(QString("file:///") + =0D -- QCoreApplication::applicationDirPath() + =0D -+ // QCoreApplication::applicationDirPath() + =0D -+ APP_SHARE_DIR + =0D - QString("/help/") + language + QString("/index.html"));=0D - =0D - if (link !=3D "") {=0D - =0D - textBrowser->setSource(QString("file:///") + =0D -- QCoreApplication::applicationDirPath() + =0D -+ // QCoreApplication::applicationDirPath() + =0D -+ APP_SHARE_DIR + =0D - QString("/help/") + language + QString("/content/") + link);=0D - =0D - }=0D ---- a/tipp10.desktop -+++ b/tipp10.desktop -@@ -1,10 +1,10 @@ - [Desktop Entry] --Encoding=3DUTF-8 - Name=3DTIPP10 - Comment=3DTouch Typing Tutor - Comment[de]=3D10-Finger-Schreibtrainer - Exec=3Dtipp10 - Icon=3Dtipp10.png - Terminal=3Dfalse - Type=3DApplication - Categories=3DEducation; -+Keywords=3Dlearning;touchtyping diff --git a/gnu/packages/patches/tipp10-remove-license-code.patch b/gnu/pa= ckages/patches/tipp10-remove-license-code.patch deleted file mode 100644 index 4b7487e726..0000000000 --- a/gnu/packages/patches/tipp10-remove-license-code.patch +++ /dev/null @@ -1,332 +0,0 @@ -Description: Remove license dialog and license key checking - -https://sources.debian.net/data/main/t/tipp10/2.1.0-2/debian/patches/0002-= RemoveLicenseCode - ---- a/main.cpp -+++ b/main.cpp -@@ -33,7 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fi - #include "def/defines.h"=0D - #include "sql/connection.h"=0D - #include "widget/mainwindow.h"=0D --#include "widget/licensedialog.h"=0D - #include "widget/illustrationdialog.h"=0D - =0D - int main(int argc, char *argv[]) {=0D -@@ -59,7 +58,7 @@ int main(int argc, char *argv[]) { - QSettings settings;=0D - #endif=0D - =0D -- // Read/write language, license key and show illustration flag=0D -+ // Read/write language and show illustration flag=0D - settings.beginGroup("general");=0D - QString languageGui =3D settings.value("language_gui",=0D - QLocale::system().name()).toString();=0D -@@ -101,7 +100,6 @@ int main(int argc, char *argv[]) { - QString languageLesson =3D settings.value("language_lesson",=0D - "").toString();=0D - =0D -- QString licenseKey =3D settings.value("licensekey", "").toString();=0D - bool showIllustration =3D settings.value("check_illustration", true).toB= ool();=0D - bool useNativeStyle =3D settings.value("check_native_style", false).toBo= ol();=0D - settings.endGroup();=0D ---- a/tipp10.pro -+++ b/tipp10.pro -@@ -43,7 +43,6 @@ HEADERS +=3D def/defines.h \ - widget/helpbrowser.h \=0D - widget/companylogo.h \=0D - widget/errormessage.h \=0D -- widget/licensedialog.h \=0D - widget/txtmessagedialog.h \=0D - widget/checkversion.h \=0D - sql/connection.h \=0D -@@ -78,7 +77,6 @@ SOURCES +=3D main.cpp \ - widget/helpbrowser.cpp \=0D - widget/companylogo.cpp \=0D - widget/errormessage.cpp \=0D -- widget/licensedialog.cpp \=0D - widget/txtmessagedialog.cpp \=0D - widget/checkversion.cpp \=0D - sql/lessontablesql.cpp \=0D ---- a/widget/licensedialog.cpp -+++ /dev/null -@@ -1,168 +0,0 @@ --/*=0D --Copyright (c) 2006-2009, Tom Thielicke IT Solutions=0D --=0D --This program is free software; you can redistribute it and/or=0D --modify it under the terms of the GNU General Public License=0D --as published by the Free Software Foundation; either version 2=0D --of the License.=0D --=0D --This program is distributed in the hope that it will be useful,=0D --but WITHOUT ANY WARRANTY; without even the implied warranty of=0D --MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the=0D --GNU General Public License for more details.=0D --=0D --You should have received a copy of the GNU General Public License=0D --along with this program; if not, write to the Free Software=0D --Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA=0D --02110-1301, USA.=0D --*/=0D --=0D --/****************************************************************=0D --**=0D --** Implementation of the LicenseDialog class=0D --** File name: licensedialog.cpp=0D --**=0D --****************************************************************/=0D --=0D --#include =0D --#include =0D --#include =0D --#include =0D --#include =0D --=0D --#include "licensedialog.h"=0D --#include "def/defines.h"=0D --=0D --LicenseDialog::LicenseDialog(QWidget *parent) : QDialog(parent) {=0D --=0D -- setWindowFlags(windowFlags() ^ Qt::WindowContextHelpButtonHint);=0D --=0D -- setWindowTitle(tr("Lizenznummer"));=0D -- setWindowIcon(QIcon(":/img/" + QString(ICON_FILENAME)));=0D --=0D -- // Create texbox=0D -- createLineEdit();=0D --=0D -- // Create buttons=0D -- createButtons();=0D --=0D -- // Set the layout of all widgets created above=0D -- createLayout();=0D --=0D -- lineLicensing->setFocus();=0D --}=0D --=0D --void LicenseDialog::createButtons() {=0D -- //Buttons=0D -- buttonOk =3D new QPushButton(this);=0D -- buttonDemo =3D new QPushButton(this);=0D --=0D -- buttonOk->setText(tr("&Ok"));=0D -- buttonDemo->setText(tr("&Demo starten"));=0D -- buttonDemo->setToolTip(tr("Im Demo-Modus koennen pro Lektion nur\n"=0D -- "10 Schriftzeichen eingegeben werden"));=0D --=0D -- buttonOk->setDefault(true);=0D -- // Widget connections=0D -- connect(buttonOk, SIGNAL(clicked()), this, SLOT(clickOk()));=0D -- connect(buttonDemo, SIGNAL(clicked()), this, SLOT(clickDemo()));=0D --}=0D --=0D --void LicenseDialog::createLineEdit() {=0D --=0D -- lineLicensing =3D new QLineEdit();=0D -- lineLicensing->setInputMask(">NNNNNNNNNNNNNN");=0D --=0D -- labelLicensing =3D new QLabel(tr("Bitte geben Sie Ihre Lizenznummer "=0D -- "(ohne Leerzeichen) ein, "=0D -- "die Sie im Arbeitsbuch (Schulbuch) auf Seite 3 finden:"));=0D --=0D -- labelLicensing->setWordWrap(true);=0D --}=0D --=0D --void LicenseDialog::createLayout() {=0D -- // Button layout horizontal=0D -- QHBoxLayout *buttonLayoutHorizontal =3D new QHBoxLayout;=0D -- buttonLayoutHorizontal->addStretch(1);=0D -- buttonLayoutHorizontal->addWidget(buttonDemo);=0D -- buttonLayoutHorizontal->addWidget(buttonOk);=0D -- // Full layout of all widgets vertical=0D -- QVBoxLayout *mainLayout =3D new QVBoxLayout;=0D -- mainLayout->addSpacing(1);=0D -- mainLayout->addWidget(labelLicensing);=0D -- mainLayout->addSpacing(1);=0D -- mainLayout->addWidget(lineLicensing);=0D -- mainLayout->addSpacing(1);=0D -- mainLayout->addLayout(buttonLayoutHorizontal);=0D -- mainLayout->setMargin(15);=0D -- mainLayout->setSpacing(15);=0D -- // Pass layout to parent widget (this)=0D -- this->setLayout(mainLayout);=0D --}=0D --=0D --void LicenseDialog::clickOk() {=0D --=0D -- // Check license key=0D -- if (!checkLicenseKey(lineLicensing->text())) {=0D --=0D -- // License key is wrong=0D --=0D -- // Message to the user=0D -- QMessageBox::information(0, APP_NAME,=0D -- tr("Die eingegebene Lizenznummer ist leider nicht "=0D -- "korrekt.\nBitte ueberpruefen Sie die Schreibweise."));=0D --=0D -- lineLicensing->setFocus();=0D --=0D -- } else {=0D --=0D -- // License key is ok=0D -- writeSettings();=0D -- accept();=0D -- }=0D --}=0D --=0D --void LicenseDialog::clickDemo() {=0D -- accept();=0D --}=0D --=0D --bool LicenseDialog::checkLicenseKey(QString licenseKey) {=0D -- if (licenseKey.size() =3D=3D 14 &&=0D -- licenseKey[0].isLetter() &&=0D -- licenseKey[1].isLetter() &&=0D -- (licenseKey.mid(2, 2) =3D=3D "39" ||=0D -- licenseKey.mid(2, 2) =3D=3D "41" ||=0D -- licenseKey.mid(2, 2) =3D=3D "43" ||=0D -- licenseKey.mid(2, 2) =3D=3D "49" ||=0D -- licenseKey.mid(2, 2) =3D=3D "99") &&=0D -- licenseKey[4].isDigit() &&=0D -- licenseKey[5].isDigit() &&=0D -- licenseKey[6].isDigit() &&=0D -- licenseKey[7].isLetter() &&=0D -- licenseKey[8].isDigit() &&=0D -- licenseKey[9].isDigit() &&=0D -- licenseKey[10].isDigit() &&=0D -- licenseKey[11].isDigit() &&=0D -- licenseKey[12].isLetter() &&=0D -- licenseKey[13].isLetter()) {=0D --=0D -- return true;=0D -- }=0D -- return false;=0D --}=0D --=0D --void LicenseDialog::writeSettings() {=0D -- // Saves settings of the startwiget=0D -- // (uses the default constructor of QSettings, passing=0D -- // the application and company name see main function)=0D -- #if APP_PORTABLE=0D -- QSettings settings(QCoreApplication::applicationDirPath() +=0D -- "/portable/settings.ini", QSettings::IniFormat);=0D -- #else=0D -- QSettings settings;=0D -- #endif=0D --=0D -- settings.beginGroup("general");=0D -- settings.setValue("licensekey", lineLicensing->text());=0D -- settings.endGroup();=0D --}=0D ---- a/widget/licensedialog.h -+++ /dev/null -@@ -1,85 +0,0 @@ --/*=0D --Copyright (c) 2006-2009, Tom Thielicke IT Solutions=0D --=0D --This program is free software; you can redistribute it and/or=0D --modify it under the terms of the GNU General Public License=0D --as published by the Free Software Foundation; either version 2=0D --of the License.=0D --=0D --This program is distributed in the hope that it will be useful,=0D --but WITHOUT ANY WARRANTY; without even the implied warranty of=0D --MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the=0D --GNU General Public License for more details.=0D --=0D --You should have received a copy of the GNU General Public License=0D --along with this program; if not, write to the Free Software=0D --Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA=0D --02110-1301, USA.=0D --*/=0D --=0D --/****************************************************************=0D --**=0D --** Definition of the LicenseDialog class=0D --** File name: licensedialog.h=0D --**=0D --****************************************************************/=0D --=0D --#ifndef LICENSEDIALOG_H=0D --#define LICENSEDIALOG_H=0D --=0D --#include =0D --#include =0D --#include =0D --#include =0D --#include =0D --#include =0D --=0D --//! The LicenseDialog class provides a license input widget.=0D --/*!=0D -- The LicenseDialog class shows a dialog to enter a license key.=0D --=0D -- @author Tom Thielicke, s712715=0D -- @version 0.0.1=0D -- @date 09.09.2008=0D --*/=0D --class LicenseDialog : public QDialog {=0D -- Q_OBJECT=0D --=0D -- public:=0D --=0D -- //! Constructor, creates two table objects and provide it in two tabs.= =0D -- LicenseDialog(QWidget *parent =3D 0);=0D --=0D -- bool checkLicenseKey(QString licenseKey);=0D --=0D -- public slots:=0D --=0D -- private slots:=0D --=0D -- //! Start button pressed=0D -- void clickOk();=0D --=0D -- //! Demo button pressed=0D -- void clickDemo();=0D --=0D -- private:=0D --=0D -- //! Creates a cancel and a ok button.=0D -- void createButtons();=0D --=0D -- //! Creates a textbox.=0D -- void createLineEdit();=0D --=0D -- //! Creates the layout of the complete class.=0D -- void createLayout();=0D --=0D -- //! Writes user settings=0D -- void writeSettings();=0D --=0D -- QPushButton *buttonOk;=0D -- QPushButton *buttonDemo;=0D -- QLabel *labelLicensing;=0D -- QLineEdit *lineLicensing;=0D --};=0D --=0D --#endif //LICENSEDIALOG_H=0D ---- a/widget/mainwindow.cpp -+++ b/widget/mainwindow.cpp -@@ -116,11 +116,6 @@ void MainWindow::closeEvent(QCloseEvent - }=0D - }=0D - =0D --bool MainWindow::checkLicenseKey(QString licenseKey) {=0D --=0D -- return false;=0D --}=0D --=0D - void MainWindow::createMenu() {=0D - //Mac-Version:=0D - //-----------=0D ---- a/widget/mainwindow.h -+++ b/widget/mainwindow.h -@@ -39,7 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fi - #include "trainingwidget.h"=0D - #include "evaluationwidget.h"=0D - #include "illustrationdialog.h"=0D --#include "licensedialog.h"=0D - #include "games/abcrainwidget.h"=0D - #include "helpbrowser.h"=0D - =0D diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 224bd792bd..cf601c4af1 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -251,13 +251,6 @@ When present, Poppler is able to correctly render CJK = and Cyrillic text.") (license (list license:bsd-3 license:gpl2)))) =20 -(define-public poppler-qt4 - (package/inherit poppler - (name "poppler-qt4") - (inputs `(("qt-4" ,qt-4) - ,@(package-inputs poppler))) - (synopsis "Qt4 frontend for the Poppler PDF rendering library"))) - (define-public poppler-qt5 (package/inherit poppler (name "poppler-qt5") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 79d41b3e73..d87dd63b76 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -139,210 +139,6 @@ other text such as code. The syntax uses the syntax = of the Django template system, and the core design of Django is reused in Grantlee.") (license license:lgpl2.1+))) =20 -(define-public qt-4 - (package - (name "qt") - (version "4.8.7") - (source (origin - (method url-fetch) - (uri (string-append "http://download.qt-project.org/archive/q= t/" - (string-copy version 0 (string-rindex ver= sion #\.)) - "/" version - "/qt-everywhere-opensource-src-" - version ".tar.gz")) - (sha256 - (base32 - "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272")) - (patches (search-patches "qt4-ldflags.patch")) - (modules '((guix build utils))) - (snippet - ;; Remove webkit module, which is not built. - '(begin (delete-file-recursively "src/3rdparty/webkit") - #t)))) - (build-system gnu-build-system) - (propagated-inputs - `(("mesa" ,mesa))) - (inputs - `(("alsa-lib" ,alsa-lib) - ("bluez" ,bluez) - ("cups" ,cups) - ("dbus" ,dbus) - ("double-conversion" ,double-conversion) - ("expat" ,expat) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) - ("icu4c" ,icu4c) - ("jasper" ,jasper) - ("libinput" ,libinput-minimal) - ("libmng" ,libmng) - ("libpci" ,pciutils) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("libwebp" ,libwebp) - ("libx11" ,libx11) - ("libxcomposite" ,libxcomposite) - ("libxcursor" ,libxcursor) - ("libxext" ,libxext) - ("libxfixes" ,libxfixes) - ("libxi" ,libxi) - ("libxinerama" ,libxinerama) - ("libxkbcommon" ,libxkbcommon) - ("libxml2" ,libxml2) - ("libxrandr" ,libxrandr) - ("libxrender" ,libxrender) - ("libxslt" ,libxslt) - ("libxtst" ,libxtst) - ("mtdev" ,mtdev) - ("mariadb-dev" ,mariadb "dev") - ("nss" ,nss) - ("postgresql" ,postgresql) - ("pulseaudio" ,pulseaudio) - ("pcre2" ,pcre2) - ("sqlite" ,sqlite) - ("udev" ,eudev) - ("unixodbc" ,unixodbc) - ("wayland" ,wayland) - ("xcb-util" ,xcb-util) - ("xcb-util-image" ,xcb-util-image) - ("xcb-util-keysyms" ,xcb-util-keysyms) - ("xcb-util-renderutil" ,xcb-util-renderutil) - ("xcb-util-wm" ,xcb-util-wm) - ("zlib" ,zlib) - ("libjpeg" ,libjpeg-turbo) - ("libsm" ,libsm) - ("openssl" ,openssl-1.0))) - (native-inputs - `(;; XXX: The JavaScriptCore engine does not build with the C++11 sta= ndard. - ;; We could build it with -std=3Dgnu++98, but then we'll get in tro= uble with - ;; ICU later. Just keep using GCC 5 for now. - ("gcc@5" ,gcc-5) - ("bison" ,bison) - ("flex" ,flex) - ("gperf" ,gperf) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-2) - ("ruby" ,ruby) - ("which" ,(@ (gnu packages base) which)))) - ;; Note: there are 37 MiB of examples and a '-exampledir' configure fl= ags, - ;; but we can't make them a separate output because "out" and "example= s" - ;; would refer to each other. - (outputs '("out" ;112MiB core + 37MiB exam= ples - "doc")) ;280MiB of HTML + code - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'set-paths 'hide-default-gcc - (lambda* (#:key inputs #:allow-other-keys) - (let ((gcc (assoc-ref inputs "gcc"))) - ;; Remove the default GCC from CPLUS_INCLUDE_PATH to prevent - ;; conflicts with the GCC 5 input. - (setenv "CPLUS_INCLUDE_PATH" - (string-join - (delete (string-append gcc "/include/c++") - (string-split (getenv "CPLUS_INCLUDE_PATH"= ) #\:)) - ":")) - #t))) - (replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (substitute* '("configure") - (("/bin/pwd") (which "pwd"))) - (substitute* "src/corelib/global/global.pri" - (("/bin/ls") (which "ls"))) - - (invoke - "./configure" - "-verbose" - "-prefix" out - "-nomake" "examples demos" - ;; Note: Don't pass '-docdir' since 'qmake' and - ;; libQtCore would record its value, thereby defeating - ;; the whole point of having a separate output. - "-datadir" (string-append out "/share/qt-" ,version - "/data") - "-importdir" (string-append out "/lib/qt-4" - "/imports") - "-plugindir" (string-append out "/lib/qt-4" - "/plugins") - "-translationdir" (string-append out "/share/qt-" ,version - "/translations") - "-demosdir" (string-append out "/share/qt-" ,version - "/demos") - "-examplesdir" (string-append out "/share/qt-" ,version - "/examples") - "-opensource" - "-confirm-license" - ;; explicitly link with dbus instead of dlopening it - "-dbus-linked" - ;; Skip the webkit module; it fails to build on armhf - ;; and, apart from that, may pose security risks. - "-no-webkit" - ;; don't use the precompiled headers - "-no-pch" - ;; drop special machine instructions not supported - ;; on all instances of the target - ,@(if (string-prefix? "x86_64" - (or (%current-target-system) - (%current-system))) - '() - '("-no-mmx" - "-no-3dnow" - "-no-sse" - "-no-sse2")) - "-no-sse3" - "-no-ssse3" - "-no-sse4.1" - "-no-sse4.2" - "-no-avx")))) - (add-after - 'install 'move-doc - (lambda* (#:key outputs #:allow-other-keys) - ;; Because of qt4-documentation-path.patch, documentation ends= up - ;; being installed in OUT. Move it to the right place. - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (olddoc (string-append out "/doc")) - (docdir (string-append doc "/share/doc/qt-" ,version))) - (mkdir-p (dirname docdir)) - - ;; Note: We can't use 'rename-file' here because OUT and DOC= are - ;; different "devices" due to bind-mounts. - (copy-recursively olddoc docdir) - (delete-file-recursively olddoc) - #t)))))) - (native-search-paths - (list (search-path-specification - (variable "QMAKEPATH") - (files '("lib/qt5"))) - (search-path-specification - (variable "QML2_IMPORT_PATH") - (files '("lib/qt5/qml"))) - (search-path-specification - (variable "QT_PLUGIN_PATH") - (files '("lib/qt5/plugins"))) - (search-path-specification - (variable "XDG_DATA_DIRS") - (files '("share"))) - (search-path-specification - (variable "XDG_CONFIG_DIRS") - (files '("etc/xdg"))))) - (home-page "https://www.qt.io/") - (synopsis "Cross-platform GUI library") - (description "Qt is a cross-platform application and UI framework for -developers using C++ or QML, a CSS & JavaScript like language.") - (license (list license:lgpl2.1 license:lgpl3)) - - ;; Qt 4: 'QBasicAtomicPointer' leads to build failures on MIPS; - ;; see . - ;; Qt 5: assembler error; see . - (supported-systems (delete "mips64el-linux" %supported-systems)))) - (define-public qtbase (package (name "qtbase") @@ -2223,53 +2019,6 @@ itself.") ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))))) =20 -(define-public python2-pyqt-4 - (package (inherit python-pyqt) - (name "python2-pyqt") - (version "4.12.3") - (source - (origin - (method url-fetch) - (uri - (string-append "mirror://sourceforge/pyqt/PyQt4/" - "PyQt-" version "/PyQt4_gpl_x11-" - version ".tar.gz")) - (sha256 - (base32 - "0wnlasg62rm5d39nq1yw4namcx2ivxgzl93r5f2vb9s0yaz5l3x0")))) - (native-inputs - `(("qt" ,qt-4))) - (inputs `(("python" ,python-2))) - (propagated-inputs - `(("python-sip" ,python2-sip))) - (arguments - `(#:tests? #f ; no check target - #:modules ((srfi srfi-1) - ,@%gnu-build-system-modules) - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (sip (string-append out "/share/sip")) - (python (assoc-ref inputs "python")) - (python-version - (last (string-split python #\-))) - (python-major+minor - (string-join - (take (string-split python-version #\.) 2) - ".")) - (lib (string-append out "/lib/python" - python-major+minor - "/site-packages"))) - (invoke "python" "configure.py" - "--confirm-license" - "--bindir" bin - "--destdir" lib - "--sipdir" sip))))))) - (license (list license:gpl2 license:gpl3)))) ; choice of either license - (define-public python-qtpy (package (name "python-qtpy") --=20 2.30.0 ------------=_1616714522-23635-1--