unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org>
To: 70855@debbugs.gnu.org
Cc: ngraves@ngraves.fr
Subject: [bug#70855] [PATCH 15/92] gnu: python-xcffib: Move to (gnu packages xorg).
Date: Fri, 10 May 2024 00:53:10 +0200	[thread overview]
Message-ID: <20240509225530.24649-15-ngraves@ngraves.fr> (raw)
In-Reply-To: <20240509225530.24649-1-ngraves@ngraves.fr>

* /gnu/packages/python-xyz.scm (python-xcffib): Move from here…
* gnu/packages/xorg.scm (python-xcffib): …to here.

The package's build is fully rewritten and updated to version 1.5.0.

Change-Id: Ia77b9fc2160dacd77c3eaf4199278046a52515d7
---
 gnu/packages/python-xyz.scm | 44 -------------------------------------
 gnu/packages/xorg.scm       | 41 ++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e1e8ef7caa0..b34af56a1db 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11139,50 +11139,6 @@ (define-public python-manimpango
 ManimPango is internally used in Manim to render (non-LaTeX) text.")
     (license license:expat)))
 
-(define-public python-xcffib
-  (package
-    (name "python-xcffib")
-    (version "0.11.1")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (pypi-uri "xcffib" version))
-      (sha256
-       (base32
-        "0nkglsm9nbhv238iagmmsjcz6lf1yfdvp5kmspphdj385vz9r50j"))))
-    (build-system python-build-system)
-    (inputs
-     (list libxcb))
-    (propagated-inputs
-     (list python-cffi ; used at run time
-           python-six))
-    (arguments
-     `(;; FIXME: Tests need more work. See ".travis.yml" in the repository.
-       #:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-libxcb-path
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((libxcb (assoc-ref inputs "libxcb")))
-               (substitute* '("xcffib/__init__.py")
-                 (("soname = ctypes.util.find_library.*xcb.*")
-                  (string-append "soname = \"" libxcb "/lib/libxcb.so\"\n")))
-               #t)))
-         (add-after 'install 'install-doc
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((doc (string-append (assoc-ref outputs "out") "/share"
-                                       "/doc/" ,name "-" ,version)))
-               (mkdir-p doc)
-               (copy-file "README.md"
-                          (string-append doc "/README.md"))
-               #t))))))
-    (home-page "https://github.com/tych0/xcffib")
-    (synopsis "XCB Python bindings")
-    (description
-     "Xcffib is a replacement for xpyb, an XCB Python bindings.  It adds
-support for Python 3 and PyPy.  It is based on cffi.")
-    (license license:expat)))
-
 (define-public python-cairocffi
   (package
     (name "python-cairocffi")
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index fbe6375818f..2bc6946599c 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -65,6 +65,7 @@ (define-module (gnu packages xorg)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system pyproject)
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages aidc)
@@ -92,6 +93,7 @@ (define-module (gnu packages xorg)
   #:use-module (gnu packages image)
   #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages libedit)
+  #:use-module (gnu packages libffi)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages m4)
@@ -1706,6 +1708,45 @@ (define xcffibgen
 generate code for the @code{python-xcbffib} package.")
     (license license:expat)))
 
+(define-public python-xcffib
+  (package
+    (name "python-xcffib")
+    (version "1.5.0")
+    (source (package-source xcffibgen))
+    (build-system pyproject-build-system)
+    (native-inputs
+     (list pkg-config which xcb-proto xcffibgen))
+    (inputs
+     (list libxcb))
+    (propagated-inputs
+     (list python-cffi ; used at run time
+           python-six))
+    (arguments
+     (list
+      ;; Tests seem to require version 3.12 of Python.
+      #:tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'generate-bindings
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "Makefile"
+                (("^GEN=.*")
+                 (format #f "GEN=~a~%"
+                         (search-input-file inputs "/bin/xcffibgen"))))
+              (invoke "make" "xcffib")))
+          (add-before 'build 'fix-libxcb-path
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "xcffib/__init__.py"
+                (("ctypes\\.util\\.find_library\\(\"xcb\"\\)")
+                 (format #f "~s"
+                         (search-input-file inputs "/lib/libxcb.so.1")))))))))
+    (home-page "https://github.com/tych0/xcffib")
+    (synopsis "XCB Python bindings")
+    (description
+     "Xcffib is a replacement for xpyb, an XCB Python bindings.  It adds
+support for Python 3 and PyPy.  It is based on cffi.")
+    (license license:expat)))
+
 (define-public randrproto
   (package
     (name "randrproto")
-- 
2.41.0





  parent reply	other threads:[~2024-05-09 23:27 UTC|newest]

Thread overview: 94+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-09 22:40 [bug#70855] [PATCH 00/92] python-team patches Nicolas Graves via Guix-patches via
2024-05-09 22:52 ` [bug#70855] [PATCH 01/92] gnu: python-seaborn: Correct dependencies Nicolas Graves via Guix-patches via
2024-05-09 22:52   ` [bug#70855] [PATCH 02/92] gnu: python-transient: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:52   ` [bug#70855] [PATCH 03/92] gnu: python-black: " Nicolas Graves via Guix-patches via
2024-05-09 22:52   ` [bug#70855] [PATCH 04/92] gnu: python-isort: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 05/92] gnu: python-codespell: Improve package style Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 06/92] gnu: python-mutagen: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 07/92] gnu: python-http-ece: Update to 1.2.0 Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 08/92] gnu: python-zope-i18nmessageid: Update to 5.1.1 Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 09/92] gnu: python-aionotify: Update to 0.3.0 Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 10/92] gnu: vdirsyncer: Move to pyproject-build-system and enable tests Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 11/92] gnu: python-django-localflavor: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 12/92] gnu: python-docker-pycreds: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 13/92] gnu: Add xcffibgen Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 14/92] gnu: Add ghc-language-python Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` Nicolas Graves via Guix-patches via [this message]
2024-05-09 22:53   ` [bug#70855] [PATCH 16/92] gnu: qtile: Update to 0.23.0 Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 17/92] gnu: qtile: Improve package style Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 18/92] gnu: sshuttle: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 19/92] gnu: python-apiron: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 20/92] gnu: python-alembic: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 21/92] gnu: conda: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 22/92] gnu: conda: Reindent Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 23/92] gnu: python-conda-package-handling: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 24/92] gnu: python-scikit-rf: Fix tests Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 25/92] gnu: gunicorn: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 26/92] gnu: python-arrow: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 27/92] gnu: dynaconf: Improve package style Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 28/92] gnu: zulip-term: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 29/92] gnu: python-pypujs: Improve package style Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 30/92] gnu: python-dateutil: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 31/92] gnu: python-nbval: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 32/92] gnu: python-asdf-astropy: Fix build Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 33/92] gnu: python-pytest-runner: Improve package style Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 34/92] gnu: gunicorn: Update to 21.2.0 Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 35/92] gnu: python-unidecode: Update to 1.3.8 Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 36/92] gnu: python-cbor2: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 37/92] gnu: python-tinycss: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 38/92] gnu: behave: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 39/92] gnu: python-cucumber-tag-expressions: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 40/92] gnu: python-flask-login: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 41/92] gnu: python-parse-type: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 42/92] gnu: python-amqp: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 43/92] gnu: python-cbor: Update home-page Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 44/92] gnu: python-sphinx: Ignore failing tests Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 45/92] gnu: python-sphinx-autodoc-typehints: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 46/92] gnu: abjad: Update to 3.19 Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 47/92] gnu: abjad-ext-rmakers: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 48/92] gnu: abjad-ext-nauert: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 49/92] gnu: python-pytest-remotedata: Ignore failing test Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 50/92] gnu: python-pytest-toolbox: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 51/92] gnu: python-cairosvg: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 52/92] gnu: python-docspec-python: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 53/92] gnu: python-jaraco-classes: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 54/92] gnu: python-jaraco-context: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 55/92] gnu: python-jaraco-functools: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 56/92] gnu: python-jaraco-packaging: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 57/92] gnu: python-jaraco-test: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 58/92] gnu: python-nbstripout: " Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 59/92] gnu: Add ghc-xcb-types Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 60/92] gnu: python-sparse: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 61/92] gnu: python-pytest-enabler: Break dependency cycle Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 62/92] gnu: python-pint: Disable benchmark tests Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 63/92] gnu: python-apprise: Improve package style Nicolas Graves via Guix-patches via
2024-05-09 22:53   ` [bug#70855] [PATCH 64/92] gnu: python-autoflake: Update to 2.3.1 Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 65/92] gnu: python-orderedmultidict: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 66/92] gnu: python-shtab: " Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 67/92] gnu: python-flake8-isort: " Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 68/92] gnu: python-xmltodict: " Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 69/92] gnu: python-rich: Update to 13.7.1 Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 70/92] gnu: python-cmd2: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 71/92] gnu: Add python-sphinx-autodoc-typehints-5 Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 72/92] gnu: python-uqbar: Improve package style Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 73/92] gnu: python-uqbar: Upgrade to python-team branch Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 74/92] gnu: python-uqbar: Update to 0.6.9 Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 75/92] gnu: python-typeguard-4: Ignore failing tests Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 76/92] gnu: python-zope-i18nmessageid: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 77/92] gnu: python-funsor: Ignore flaky test Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 78/92] gnu: borgmatic: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 79/92] gnu: tuir: " Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 80/92] gnu: python-pytest-trio: " Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 81/92] gnu: python-fenics-dijitso: " Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 82/92] gnu: python-pyan3: " Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 83/92] gnu: python-numpydoc: Move to pyproject-build-sytem Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 84/92] gnu: python-multidict: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 85/92] gnu: python-warcio: " Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 86/92] gnu: python-certauth: " Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 87/92] gnu: python-matplotlib: Ignore failing tests Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 88/92] gnu: python-qemu-qmp: Improve package style Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 89/92] gnu: python-qemu-qmp: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 90/92] gnu: python-cssselect2: " Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 91/92] gnu: python-notebook: Add python-jupyter-server native-input Nicolas Graves via Guix-patches via
2024-05-09 22:54   ` [bug#70855] [PATCH 92/92] build-system/pyproject: Add missing native-inputs Nicolas Graves via Guix-patches via
2024-05-23 21:17 ` bug#70855: [PATCH 00/92] python-team patches Nicolas Goaziou via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240509225530.24649-15-ngraves@ngraves.fr \
    --to=guix-patches@gnu.org \
    --cc=70855@debbugs.gnu.org \
    --cc=ngraves@ngraves.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).