Skip to content

Commit

Permalink
#1929 add patch to fix python-lz4 bundling
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@20171 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Aug 23, 2018
1 parent 254b521 commit 69bd30c
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 2 deletions.
15 changes: 15 additions & 0 deletions osx/jhbuild/patches/python-lz4-distributionnotfound.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--- a/lz4/__init__.py 2018-08-22 05:32:48.000000000 +0700
+++ b/lz4/__init__.py 2018-08-22 05:33:44.000000000 +0700
@@ -2,8 +2,9 @@
try:
__version__ = get_distribution(__name__).version
except DistributionNotFound:
- # package is not installed
- pass
+ #when packaging things,
+ #get_distribution fails, and we just don't care:
+ __version__ = "2.1.0"

VERSION = __version__


5 changes: 4 additions & 1 deletion osx/jhbuild/xpra-python.modules
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,10 @@
<branch repo="files.pythonhosted.org"
module="/packages/13/3f/8b3e574344c7ed9fb76c240f8fe96a95648762dce3bb481527d3a414670c/lz4-2.1.0.tar.gz"
hash="sha256:166aff2fbb2fee39f4ed58e8e7c1ed8a8ce72915832a100ced7a1634ac655a6f"
version="2.1.0"/>
version="2.1.0">
<!-- Warning: must update the patch with any version bump -->
<patch file="http://xpra.org/svn/Xpra/trunk/osx/jhbuild/patches/python-lz4-distributionnotfound.patch" strip="1" />
</branch>
<dependencies>
<dep package="lz4"/>
<dep package="python"/>
Expand Down
5 changes: 4 additions & 1 deletion osx/jhbuild/xpra-python3.modules
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,10 @@
<branch repo="files.pythonhosted.org"
module="/packages/13/3f/8b3e574344c7ed9fb76c240f8fe96a95648762dce3bb481527d3a414670c/lz4-2.1.0.tar.gz"
hash="sha256:166aff2fbb2fee39f4ed58e8e7c1ed8a8ce72915832a100ced7a1634ac655a6f"
version="2.1.0"/>
version="2.1.0">
<!-- Warning: must update the patch with any version bump -->
<patch file="http://xpra.org/svn/Xpra/trunk/osx/jhbuild/patches/python-lz4-distributionnotfound.patch" strip="1" />
</branch>
<dependencies>
<dep package="lz4"/>
<dep package="python3"/>
Expand Down

0 comments on commit 69bd30c

Please sign in to comment.