Skip to content

Commit

Permalink
Merge pull request #38 from cpatulea/master
Browse files Browse the repository at this point in the history
Build fixes
  • Loading branch information
totaam authored Feb 9, 2024
2 parents ce1ae9f + cb664b5 commit 9545789
Show file tree
Hide file tree
Showing 7 changed files with 142 additions and 11 deletions.
18 changes: 15 additions & 3 deletions modulesets-stable/bootstrap.modules
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,26 @@
repo="ftp.gnu.org" />
</autotools>
<!---->
<autotools id="libiconv"
autogen-sh="configure"
autogenargs="--disable-debug --disable-dependency-tracking --enable-extra-encodings">

<branch module="libiconv/libiconv-1.17.tar.gz"
version="1.17"
repo="ftp.gnu.org" />
</autotools>

<autotools id="gettext"
autogen-sh="configure"
autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp --with-included-glib --with-included-libcroco">

<branch module="gettext/gettext-0.22.tar.xz"
version="0.22"
hash="sha256:0e60393a47061567b46875b249b7d2788b092d6457d656145bb0e7e6a3e26d93"
<branch module="gettext/gettext-0.22.3.tar.xz"
version="0.22.3"
hash="sha256:b838228b3f8823a6c1eddf07297197c4db13f7e1b173b9ef93f3f945a63080b6"
repo="ftp.gnu.org" />
<dependencies>
<dep package="libiconv" />
</dependencies>
</autotools>
<!--
cmakes ./configure is picky about invalid flags so we manually set it
Expand Down
3 changes: 2 additions & 1 deletion modulesets-stable/gtk-osx.modules
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
<dependencies>
<dep package="libffi" />
<dep package="libpcre2" />
<dep package="libxml2" />
</dependencies>
</meson>
<!--
Expand Down Expand Up @@ -164,7 +165,7 @@
</meson>
<!---->
<cmake id="freetype"
cmakeargs="-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">
cmakeargs="-DFT_DISABLE_BROTLI=ON -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE -D BUILD_SHARED_LIBS=true -D CMAKE_BUILD_TYPE=Release">

<branch module="freetype/freetype-2.13.2.tar.xz"
version="2.13.2"
Expand Down
16 changes: 16 additions & 0 deletions patches/cryptography-setup-py.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
commit 61401d62c557246600b45d09d471450e97b8c6f0
Author: Catalin Patulea <[email protected]>
Date: Sat Jan 27 11:32:52 2024 +0000

Add skeleton setup.py.

diff --git a/setup.py b/setup.py
new file mode 100755
index 0000000..851cb3f
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,3 @@
+#!/usr/bin/env python3
+from setuptools import setup
+setup()
\ No newline at end of file
62 changes: 62 additions & 0 deletions patches/dnspython-setup-py.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
commit 16e7070b64e4fe20d87c12ee806eb9201daba29d
Author: Catalin Patulea <[email protected]>
Date: Sat Jan 27 11:22:24 2024 +0000

Revert "Delete setup.py."

This reverts commit c9bb83f85c340aff02b87746a665375927cede2c.

diff --git a/setup.py b/setup.py
new file mode 100755
index 0000000..cbbbecb
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
+#
+# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
+#
+# Permission to use, copy, modify, and distribute this software and its
+# documentation for any purpose with or without fee is hereby granted,
+# provided that the above copyright notice and this permission notice
+# appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+import sys
+
+from setuptools import setup
+
+try:
+ sys.argv.remove("--cython-compile")
+except ValueError:
+ compile_cython = False
+else:
+ compile_cython = True
+ from Cython.Build import cythonize
+
+ ext_modules = cythonize(
+ [
+ "dns/*.py",
+ "dns/dnssecalgs/*.py",
+ "dns/quic/*.py",
+ "dns/rdtypes/*.py",
+ "dns/rdtypes/*/*.py",
+ ],
+ language_level="3",
+ )
+
+kwargs = {
+ "ext_modules": ext_modules if compile_cython else None,
+ "zip_safe": False if compile_cython else None,
+}
+
+setup(**kwargs)
16 changes: 16 additions & 0 deletions patches/idna-setup-py.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
commit 61401d62c557246600b45d09d471450e97b8c6f0
Author: Catalin Patulea <[email protected]>
Date: Sat Jan 27 11:32:52 2024 +0000

Add skeleton setup.py.

diff --git a/setup.py b/setup.py
new file mode 100755
index 0000000..851cb3f
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,3 @@
+#!/usr/bin/env python3
+from setuptools import setup
+setup()
\ No newline at end of file
16 changes: 16 additions & 0 deletions patches/setuptools-rust-setup-py.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
commit 61401d62c557246600b45d09d471450e97b8c6f0
Author: Catalin Patulea <[email protected]>
Date: Sat Jan 27 11:32:52 2024 +0000

Add skeleton setup.py.

diff --git a/setup.py b/setup.py
new file mode 100755
index 0000000..851cb3f
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,3 @@
+#!/usr/bin/env python3
+from setuptools import setup
+setup()
\ No newline at end of file
22 changes: 15 additions & 7 deletions xpra-python3.modules
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,9 @@
<branch
module="s/setuptools-rust/setuptools-rust-1.8.1.tar.gz"
hash="sha256:94b1dd5d5308b3138d5b933c3a2b55e6d6927d1a22632e509fcea9ddd0f7e486"
version="1.8.1"/>
version="1.8.1">
<patch file="setuptools-rust-setup-py.patch" strip="1"/>
</branch>
<dependencies>
<dep package="python3"/>
<dep package="python3-semantic-version"/>
Expand All @@ -189,7 +191,9 @@
<branch
module="c/cryptography/cryptography-42.0.2.tar.gz"
hash="sha256:e0ec52ba3c7f1b7d813cd52649a5b3ef1fc0d433219dc8c93827c57eab6cf888"
version="42.0.2"/>
version="42.0.2">
<patch file="cryptography-setup-py.patch" strip="1"/>
</branch>
<dependencies>
<dep package="python3"/>
<dep package="openssl"/>
Expand Down Expand Up @@ -407,7 +411,9 @@
<branch
module="d/dnspython/dnspython-2.4.2.tar.gz"
hash="sha256:8dcfae8c7460a2f84b4072e26f1c9f4101ca20c071649cb7c34e8b6a93d58984"
version="2.4.2"/>
version="2.4.2">
<patch file="dnspython-setup-py.patch" strip="1"/>
</branch>
<dependencies>
<dep package="python3"/>
</dependencies>
Expand Down Expand Up @@ -672,9 +678,9 @@

<distutils id="python3-pyobjc-framework-avfoundation" python3="1">
<branch
module="p/pyobjc-framework-AVFoundation/pyobjc-framework-AVFoundation-10.0.tar.gz"
hash="sha256:40366a8c6bb964e7b7263e8cf060350f69ad365e6a5356d6ccab9f256a9987f7"
version="10.0">
module="p/pyobjc-framework-AVFoundation/pyobjc-framework-AVFoundation-10.1.tar.gz"
hash="sha256:07e065c6904fbd6afc434a79888461cdd4097b4153dd592dcbe9c8bef01ee701"
version="10.1">
<patch file="patches/pyobjc-framework-AVFoundation-xcode-version-check.patch" strip="2"/>
</branch>
<dependencies>
Expand Down Expand Up @@ -786,7 +792,9 @@
<branch
module="i/idna/idna-3.6.tar.gz"
hash="sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca"
version="3.6"/>
version="3.6">
<patch file="idna-setup-py.patch" strip="1"/>
</branch>
<dependencies>
<dep package="python3"/>
</dependencies>
Expand Down

0 comments on commit 9545789

Please sign in to comment.