Skip to content

Commit fec8f6b

Browse files
indygregindygreg
authored
Replace various *proto packages with xorgproto (#609)
As part of trying to stand up native Linux ARM builds, I ran into a failure with xproto's config.guess not recognizing ARM. That package not releasing since 2016 clued me in that it was likely not a required part of X11 any more. I looked at Debian's dependency tree and there was no xproto in sight. But there was an xorgproto. And sure enough if you install xorgproto instead of xproto in the build environment, things "just work." Clued into the potential for outdated packages, I looked at other proto packages. I pulled the thread and inputproto, kbproto, and xextproto all appeared to be dead and replaced by xorgproto. So this commit deletes inputproto, kbproto, xextproto, and xproto and effectively replaces their use with xorgproto. Good riddance.
1 parent ae06f31 commit fec8f6b

File tree

7 files changed

+4
-170
lines changed

7 files changed

+4
-170
lines changed

‎cpython-unix/Makefile

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,6 @@ $(OUTDIR)/bzip2-$(BZIP2_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(
117117
$(OUTDIR)/expat-$(EXPAT_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-expat.sh
118118
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) expat
119119

120-
$(OUTDIR)/inputproto-$(INPUTPROTO_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-inputproto.sh
121-
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) inputproto
122-
123-
$(OUTDIR)/kbproto-$(KBPROTO_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-kbproto.sh
124-
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) kbproto
125-
126120
$(OUTDIR)/libffi-3.3-$(LIBFFI_3.3_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-libffi-3.3.sh
127121
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) libffi-3.3
128122

@@ -135,10 +129,6 @@ $(OUTDIR)/libpthread-stubs-$(LIBPTHREAD_STUBS_VERSION)-$(PACKAGE_SUFFIX).tar: $(
135129
LIBX11_DEPENDS = \
136130
$(PYTHON_DEP_DEPENDS) \
137131
$(HERE)/build-libX11.sh \
138-
$(OUTDIR)/xproto-$(XPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
139-
$(OUTDIR)/xextproto-$(XEXTPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
140-
$(OUTDIR)/kbproto-$(KBPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
141-
$(OUTDIR)/inputproto-$(INPUTPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
142132
$(OUTDIR)/libxcb-$(LIBXCB_VERSION)-$(PACKAGE_SUFFIX).tar \
143133
$(OUTDIR)/xtrans-$(XTRANS_VERSION)-$(PACKAGE_SUFFIX).tar \
144134
$(OUTDIR)/xorgproto-$(XORGPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
@@ -151,7 +141,7 @@ LIBXAU_DEPENDS = \
151141
$(PYTHON_DEP_DEPENDS) \
152142
$(HERE)/build-libXau.sh \
153143
$(OUTDIR)/x11-util-macros-$(X11_UTIL_MACROS_VERSION)-$(PACKAGE_SUFFIX).tar \
154-
$(OUTDIR)/xproto-$(XPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
144+
$(OUTDIR)/xorgproto-$(XORGPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
155145
$(NULL)
156146

157147
$(OUTDIR)/libXau-$(LIBXAU_VERSION)-$(PACKAGE_SUFFIX).tar: $(LIBXAU_DEPENDS)
@@ -163,7 +153,7 @@ LIBXCB_DEPENDS = \
163153
$(OUTDIR)/image-$(DOCKER_IMAGE_XCB).tar \
164154
$(OUTDIR)/xcb-proto-$(XCB_PROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
165155
$(OUTDIR)/libXau-$(LIBXAU_VERSION)-$(PACKAGE_SUFFIX).tar \
166-
$(OUTDIR)/xproto-$(XPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
156+
$(OUTDIR)/xorgproto-$(XORGPROTO_VERSION)-$(PACKAGE_SUFFIX).tar \
167157
$(OUTDIR)/libpthread-stubs-$(LIBPTHREAD_STUBS_VERSION)-$(PACKAGE_SUFFIX).tar \
168158
$(NULL)
169159

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

234-
$(OUTDIR)/xextproto-$(XEXTPROTO_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-xextproto.sh
235-
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) xextproto
236-
237224
$(OUTDIR)/xorgproto-$(XORGPROTO_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-xorgproto.sh
238225
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) xorgproto
239226

240-
$(OUTDIR)/xproto-$(XPROTO_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-xproto.sh
241-
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) xproto
242-
243227
$(OUTDIR)/xtrans-$(XTRANS_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-xtrans.sh
244228
$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) xtrans
245229

‎cpython-unix/build-inputproto.sh

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎cpython-unix/build-kbproto.sh

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎cpython-unix/build-xextproto.sh

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎cpython-unix/build-xproto.sh

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎cpython-unix/build.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,8 +1135,6 @@ def main():
11351135
"bdb",
11361136
"bzip2",
11371137
"expat",
1138-
"inputproto",
1139-
"kbproto",
11401138
"libffi-3.3",
11411139
"libffi",
11421140
"libpthread-stubs",
@@ -1150,9 +1148,7 @@ def main():
11501148
"tcl",
11511149
"uuid",
11521150
"x11-util-macros",
1153-
"xextproto",
11541151
"xorgproto",
1155-
"xproto",
11561152
"xtrans",
11571153
"xz",
11581154
"zlib",
@@ -1182,15 +1178,11 @@ def main():
11821178
build_options=build_options,
11831179
dest_archive=dest_archive,
11841180
extra_archives={
1185-
"inputproto",
1186-
"kbproto",
11871181
"libpthread-stubs",
11881182
"libXau",
11891183
"libxcb",
11901184
"x11-util-macros",
1191-
"xextproto",
11921185
"xorgproto",
1193-
"xproto",
11941186
"xtrans",
11951187
},
11961188
)
@@ -1205,7 +1197,7 @@ def main():
12051197
target_triple=target_triple,
12061198
build_options=build_options,
12071199
dest_archive=dest_archive,
1208-
extra_archives={"x11-util-macros", "xproto"},
1200+
extra_archives={"x11-util-macros", "xorgproto"},
12091201
)
12101202

12111203
elif action == "xcb-proto":
@@ -1230,7 +1222,7 @@ def main():
12301222
target_triple=target_triple,
12311223
build_options=build_options,
12321224
dest_archive=dest_archive,
1233-
extra_archives={"libpthread-stubs", "libXau", "xcb-proto", "xproto"},
1225+
extra_archives={"libpthread-stubs", "libXau", "xcb-proto", "xorgproto"},
12341226
)
12351227

12361228
elif action == "tix":

‎pythonbuild/downloads.py

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -99,24 +99,12 @@
9999
"licenses": ["MIT"],
100100
"license_file": "LICENSE.expat.txt",
101101
},
102-
"inputproto": {
103-
"url": "https://www.x.org/archive/individual/proto/inputproto-2.3.2.tar.gz",
104-
"size": 244334,
105-
"sha256": "10eaadd531f38f7c92ab59ef0708ca195caf3164a75c4ed99f0c04f2913f6ef3",
106-
"version": "2.3.2",
107-
},
108102
"jom-windows-bin": {
109103
"url": "http://download.qt.io/official_releases/jom/jom_1_1_4.zip",
110104
"size": 1696930,
111105
"sha256": "d533c1ef49214229681e90196ed2094691e8c4a0a0bef0b2c901debcb562682b",
112106
"version": "1.1.4",
113107
},
114-
"kbproto": {
115-
"url": "https://www.x.org/archive/individual/proto/kbproto-1.0.7.tar.gz",
116-
"size": 325858,
117-
"sha256": "828cb275b91268b1a3ea950d5c0c5eb076c678fdf005d517411f89cc8c3bb416",
118-
"version": "1.0.7",
119-
},
120108
"libedit": {
121109
"url": "https://thrysoee.dk/editline/libedit-20240808-3.1.tar.gz",
122110
"size": 538611,
@@ -397,12 +385,6 @@
397385
"sha256": "85cd21e9d9fbc341d0dbf11eace98d55d7db89fda724b0e598855fcddf0944fd",
398386
"version": "1.14.1",
399387
},
400-
"xextproto": {
401-
"url": "https://www.x.org/archive/individual/proto/xextproto-7.3.0.tar.gz",
402-
"size": 290814,
403-
"sha256": "1b1bcdf91221e78c6c33738667a57bd9aaa63d5953174ad8ed9929296741c9f5",
404-
"version": "7.3.0",
405-
},
406388
# Newer versions from at least 2023 have build failures for reasons we haven't
407389
# fully investigated.
408390
"xorgproto": {
@@ -411,12 +393,6 @@
411393
"sha256": "38ad1d8316515785d53c5162b4b7022918e03c11d72a5bd9df0a176607f42bca",
412394
"version": "2019.1",
413395
},
414-
"xproto": {
415-
"url": "https://www.x.org/archive/individual/proto/xproto-7.0.31.tar.gz",
416-
"size": 367979,
417-
"sha256": "6d755eaae27b45c5cc75529a12855fed5de5969b367ed05003944cf901ed43c7",
418-
"version": "7.0.31",
419-
},
420396
"xtrans": {
421397
"url": "https://www.x.org/archive/individual/lib/xtrans-1.5.0.tar.gz",
422398
"size": 230197,

0 commit comments

Comments
 (0)