Skip to content

Commit

Permalink
#3807 KISS: just make the pxd match the pyx
Browse files Browse the repository at this point in the history
no need for a patch, or autopatch in setup.py
  • Loading branch information
totaam committed Mar 29, 2023
1 parent 73cc28b commit 9cbd272
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 30 deletions.
21 changes: 0 additions & 21 deletions packaging/debian/xpra/patches/cython0.patch

This file was deleted.

7 changes: 0 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,6 @@ def has_header_file(name, isdir=False):
bundle_tests_ENABLED = False
tests_ENABLED = False
rebuild_ENABLED = not skip_build
autopatch_ENABLED = True


#allow some of these flags to be modified on the command line:
Expand Down Expand Up @@ -1997,12 +1996,6 @@ def add_cython_ext(*_args, **_kwargs): # pylint: disable=function-redefined
#*******************************************************************************
if cython_ENABLED:
add_packages("xpra.buffers")
if autopatch_ENABLED and cython_version==0:
cmd = ["patch", "-p1", "-f", "--quiet", "-i", "./packaging/debian/xpra/patches/cython0.patch"]
r = subprocess.Popen(cmd).wait(30)
if r:
print("Warning: autopatch error")
print(" '%s' returned %s" % (" ".join(cmd), r))
buffers_pkgconfig = pkgconfig(optimize=3)
import platform
#this may well be sub-optimal:
Expand Down
2 changes: 1 addition & 1 deletion xpra/buffers/xxh.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@

from libc.stdint cimport uint64_t

cdef uint64_t xxh3(const void* input, size_t length) noexcept nogil
cdef uint64_t xxh3(const void* input, size_t length) nogil
2 changes: 1 addition & 1 deletion xpra/buffers/xxh.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ cdef extern from "xxhash.h":
ctypedef uint64_t XXH64_hash_t
XXH64_hash_t XXH3_64bits(const void* data, size_t len) nogil

cdef uint64_t xxh3(const void* input, size_t length) noexcept nogil:
cdef uint64_t xxh3(const void* input, size_t length) nogil:
return XXH3_64bits(input, length)

0 comments on commit 9cbd272

Please sign in to comment.