Skip to content

Replace various *proto packages with xorgproto #609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 18, 2025
Merged

Replace various *proto packages with xorgproto #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions cpython-unix/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,6 @@ $(OUTDIR)/bzip2-$(BZIP2_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(
$(OUTDIR)/expat-$(EXPAT_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-expat.sh
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) expat

$(OUTDIR)/inputproto-$(INPUTPROTO_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-inputproto.sh
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) inputproto

$(OUTDIR)/kbproto-$(KBPROTO_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-kbproto.sh
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) kbproto

$(OUTDIR)/libffi-3.3-$(LIBFFI_3.3_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-libffi-3.3.sh
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) libffi-3.3

Expand All @@ -135,10 +129,6 @@ $(OUTDIR)/libpthread-stubs-$(LIBPTHREAD_STUBS_VERSION)-$(PACKAGE_SUFFIX).tar: $(
LIBX11_DEPENDS = \
$(PYTHON_DEP_DEPENDS) \
$(HERE)/build-libX11.sh \
$(OUTDIR)/xproto-$(XPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
$(OUTDIR)/xextproto-$(XEXTPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
$(OUTDIR)/kbproto-$(KBPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
$(OUTDIR)/inputproto-$(INPUTPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
$(OUTDIR)/libxcb-$(LIBXCB_VERSION)-$(PACKAGE_SUFFIX).tar \
$(OUTDIR)/xtrans-$(XTRANS_VERSION)-$(PACKAGE_SUFFIX).tar \
$(OUTDIR)/xorgproto-$(XORGPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
Expand All @@ -151,7 +141,7 @@ LIBXAU_DEPENDS = \
$(PYTHON_DEP_DEPENDS) \
$(HERE)/build-libXau.sh \
$(OUTDIR)/x11-util-macros-$(X11_UTIL_MACROS_VERSION)-$(PACKAGE_SUFFIX).tar \
$(OUTDIR)/xproto-$(XPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
$(OUTDIR)/xorgproto-$(XORGPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
$(NULL)

$(OUTDIR)/libXau-$(LIBXAU_VERSION)-$(PACKAGE_SUFFIX).tar: $(LIBXAU_DEPENDS)
Expand All @@ -163,7 +153,7 @@ LIBXCB_DEPENDS = \
$(OUTDIR)/image-$(DOCKER_IMAGE_XCB).tar \
$(OUTDIR)/xcb-proto-$(XCB_PROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
$(OUTDIR)/libXau-$(LIBXAU_VERSION)-$(PACKAGE_SUFFIX).tar \
$(OUTDIR)/xproto-$(XPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
$(OUTDIR)/xorgproto-$(XORGPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
$(OUTDIR)/libpthread-stubs-$(LIBPTHREAD_STUBS_VERSION)-$(PACKAGE_SUFFIX).tar \
$(NULL)

Expand Down Expand Up @@ -231,15 +221,9 @@ $(OUTDIR)/x11-util-macros-$(X11_UTIL_MACROS_VERSION)-$(PACKAGE_SUFFIX).tar: $(PY
$(OUTDIR)/xcb-proto-$(XCB_PROTO_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-xcb-proto.sh
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_XCB) xcb-proto

$(OUTDIR)/xextproto-$(XEXTPROTO_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-xextproto.sh
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) xextproto

$(OUTDIR)/xorgproto-$(XORGPROTO_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-xorgproto.sh
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) xorgproto

$(OUTDIR)/xproto-$(XPROTO_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-xproto.sh
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) xproto

$(OUTDIR)/xtrans-$(XTRANS_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-xtrans.sh
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) xtrans

Expand Down
24 changes: 0 additions & 24 deletions cpython-unix/build-inputproto.sh
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions cpython-unix/build-kbproto.sh
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions cpython-unix/build-xextproto.sh
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions cpython-unix/build-xproto.sh
View file
Open in desktop

This file was deleted.

12 changes: 2 additions & 10 deletions cpython-unix/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1135,8 +1135,6 @@ def main():
"bdb",
"bzip2",
"expat",
"inputproto",
"kbproto",
"libffi-3.3",
"libffi",
"libpthread-stubs",
Expand All @@ -1150,9 +1148,7 @@ def main():
"tcl",
"uuid",
"x11-util-macros",
"xextproto",
"xorgproto",
"xproto",
"xtrans",
"xz",
"zlib",
Expand Down Expand Up @@ -1182,15 +1178,11 @@ def main():
build_options=build_options,
dest_archive=dest_archive,
extra_archives={
"inputproto",
"kbproto",
"libpthread-stubs",
"libXau",
"libxcb",
"x11-util-macros",
"xextproto",
"xorgproto",
"xproto",
"xtrans",
},
)
Expand All @@ -1205,7 +1197,7 @@ def main():
target_triple=target_triple,
build_options=build_options,
dest_archive=dest_archive,
extra_archives={"x11-util-macros", "xproto"},
extra_archives={"x11-util-macros", "xorgproto"},
)

elif action == "xcb-proto":
Expand All @@ -1230,7 +1222,7 @@ def main():
target_triple=target_triple,
build_options=build_options,
dest_archive=dest_archive,
extra_archives={"libpthread-stubs", "libXau", "xcb-proto", "xproto"},
extra_archives={"libpthread-stubs", "libXau", "xcb-proto", "xorgproto"},
)

elif action == "tix":
Expand Down
24 changes: 0 additions & 24 deletions pythonbuild/downloads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,24 +99,12 @@
"licenses": ["MIT"],
"license_file": "LICENSE.expat.txt",
},
"inputproto": {
"url": "https://www.x.org/archive/individual/proto/inputproto-2.3.2.tar.gz",
"size": 244334,
"sha256": "10eaadd531f38f7c92ab59ef0708ca195caf3164a75c4ed99f0c04f2913f6ef3",
"version": "2.3.2",
},
"jom-windows-bin": {
"url": "http://download.qt.io/official_releases/jom/jom_1_1_4.zip",
"size": 1696930,
"sha256": "d533c1ef49214229681e90196ed2094691e8c4a0a0bef0b2c901debcb562682b",
"version": "1.1.4",
},
"kbproto": {
"url": "https://www.x.org/archive/individual/proto/kbproto-1.0.7.tar.gz",
"size": 325858,
"sha256": "828cb275b91268b1a3ea950d5c0c5eb076c678fdf005d517411f89cc8c3bb416",
"version": "1.0.7",
},
"libedit": {
"url": "https://thrysoee.dk/editline/libedit-20240808-3.1.tar.gz",
"size": 538611,
Expand Down Expand Up @@ -397,12 +385,6 @@
"sha256": "85cd21e9d9fbc341d0dbf11eace98d55d7db89fda724b0e598855fcddf0944fd",
"version": "1.14.1",
},
"xextproto": {
"url": "https://www.x.org/archive/individual/proto/xextproto-7.3.0.tar.gz",
"size": 290814,
"sha256": "1b1bcdf91221e78c6c33738667a57bd9aaa63d5953174ad8ed9929296741c9f5",
"version": "7.3.0",
},
# Newer versions from at least 2023 have build failures for reasons we haven't
# fully investigated.
"xorgproto": {
Expand All @@ -411,12 +393,6 @@
"sha256": "38ad1d8316515785d53c5162b4b7022918e03c11d72a5bd9df0a176607f42bca",
"version": "2019.1",
},
"xproto": {
"url": "https://www.x.org/archive/individual/proto/xproto-7.0.31.tar.gz",
"size": 367979,
"sha256": "6d755eaae27b45c5cc75529a12855fed5de5969b367ed05003944cf901ed43c7",
"version": "7.0.31",
},
"xtrans": {
"url": "https://www.x.org/archive/individual/lib/xtrans-1.5.0.tar.gz",
"size": 230197,
Expand Down