diff options
author | Wouter Deconinck <wdconinc@gmail.com> | 2023-03-22 03:45:16 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-22 09:45:16 +0100 |
commit | 8a48f9a479802034c14c7ca9c207326b3e9c4889 (patch) | |
tree | d9668a89df02233660843ea7edb2cd832ba4410c | |
parent | 6551ad8711bc97b3df0df7ed0e84911ec7606322 (diff) | |
download | spack-8a48f9a479802034c14c7ca9c207326b3e9c4889.tar.gz spack-8a48f9a479802034c14c7ca9c207326b3e9c4889.tar.bz2 spack-8a48f9a479802034c14c7ca9c207326b3e9c4889.tar.xz spack-8a48f9a479802034c14c7ca9c207326b3e9c4889.zip |
xcb-util-*: new versions, migration to freedesktop.org (#36241)
The xcb-utils have been migrated to the gitlab.freedesktop.org, from the
previous separate location. That means that a URL change is needed to
pick up newer version
([ref](https://lists.freedesktop.org/archives/xcb/2022-October/011422.html)).
This replaces the `homepage` and `url` with the latest (to an `xz`
file), adds a `url_for_version` function to resolve past versions, and
add the latest versions. Because of the `url_for_version` I don't think
we can use the `xorg_mirror_path` approach here.
Co-authored-by: wdconinc <wdconinc@users.noreply.github.com>
7 files changed, 63 insertions, 28 deletions
diff --git a/var/spack/repos/builtin/packages/xcb-util-cursor/package.py b/var/spack/repos/builtin/packages/xcb-util-cursor/package.py index dc863d008d..d56cac093d 100644 --- a/var/spack/repos/builtin/packages/xcb-util-cursor/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-cursor/package.py @@ -6,7 +6,7 @@ from spack.package import * -class XcbUtilCursor(AutotoolsPackage): +class XcbUtilCursor(AutotoolsPackage, XorgPackage): """The XCB util modules provides a number of libraries which sit on top of libxcb, the core X protocol library, and some of the extension libraries. These experimental libraries provide convenience functions @@ -14,10 +14,15 @@ class XcbUtilCursor(AutotoolsPackage): libraries also provide client-side code which is not strictly part of the X protocol but which have traditionally been provided by Xlib.""" - homepage = "https://xcb.freedesktop.org/" - url = "https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.gz" + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor" + xorg_mirror_path = "lib/xcb-util-cursor-0.1.4.tar.xz" - version("0.1.3", sha256="a322332716a384c94d3cbf98f2d8fe2ce63c2fe7e2b26664b6cea1d411723df8") + version("0.1.4", sha256="28dcfe90bcab7b3561abe0dd58eb6832aa9cc77cfe42fcdfa4ebe20d605231fb") + version( + "0.1.3", + sha256="a322332716a384c94d3cbf98f2d8fe2ce63c2fe7e2b26664b6cea1d411723df8", + url="https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.4.tar.gz", + ) depends_on("libxcb@1.4:") depends_on("xcb-util-renderutil") diff --git a/var/spack/repos/builtin/packages/xcb-util-errors/package.py b/var/spack/repos/builtin/packages/xcb-util-errors/package.py index 5adfae0dd5..b85b63a510 100644 --- a/var/spack/repos/builtin/packages/xcb-util-errors/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-errors/package.py @@ -6,7 +6,7 @@ from spack.package import * -class XcbUtilErrors(AutotoolsPackage): +class XcbUtilErrors(AutotoolsPackage, XorgPackage): """The XCB util modules provides a number of libraries which sit on top of libxcb, the core X protocol library, and some of the extension libraries. These experimental libraries provide convenience functions @@ -14,10 +14,15 @@ class XcbUtilErrors(AutotoolsPackage): libraries also provide client-side code which is not strictly part of the X protocol but which have traditionally been provided by Xlib.""" - homepage = "https://xcb.freedesktop.org/" - url = "https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.gz" + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-errors" + xorg_mirror_path = "lib/xcb-util-errors-1.0.1.tar.xz" - version("1.0", sha256="7752a722e580efdbada30632cb23aed35c18757399ac3b547b59fd7257cf5e33") + version("1.0.1", sha256="5628c87b984259ad927bacd8a42958319c36bdf4b065887803c9d820fb80f357") + version( + "1.0", + sha256="7752a722e580efdbada30632cb23aed35c18757399ac3b547b59fd7257cf5e33", + url="https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.gz", + ) depends_on("libxcb@1.4:") diff --git a/var/spack/repos/builtin/packages/xcb-util-image/package.py b/var/spack/repos/builtin/packages/xcb-util-image/package.py index fe00a84bd7..46e7adbfd6 100644 --- a/var/spack/repos/builtin/packages/xcb-util-image/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-image/package.py @@ -6,7 +6,7 @@ from spack.package import * -class XcbUtilImage(AutotoolsPackage): +class XcbUtilImage(AutotoolsPackage, XorgPackage): """The XCB util modules provides a number of libraries which sit on top of libxcb, the core X protocol library, and some of the extension libraries. These experimental libraries provide convenience functions @@ -14,10 +14,15 @@ class XcbUtilImage(AutotoolsPackage): libraries also provide client-side code which is not strictly part of the X protocol but which have traditionally been provided by Xlib.""" - homepage = "https://xcb.freedesktop.org/" - url = "https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.gz" + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-image" + xorg_mirror_path = "lib/xcb-util-image-0.4.1.tar.xz" - version("0.4.0", sha256="cb2c86190cf6216260b7357a57d9100811bb6f78c24576a3a5bfef6ad3740a42") + version("0.4.1", sha256="ccad8ee5dadb1271fd4727ad14d9bd77a64e505608766c4e98267d9aede40d3d") + version( + "0.4.0", + sha256="cb2c86190cf6216260b7357a57d9100811bb6f78c24576a3a5bfef6ad3740a42", + url="https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.gz", + ) depends_on("libxcb@1.4:") depends_on("xcb-util") diff --git a/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py b/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py index 16d945e49f..1db444465e 100644 --- a/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py @@ -6,7 +6,7 @@ from spack.package import * -class XcbUtilKeysyms(AutotoolsPackage): +class XcbUtilKeysyms(AutotoolsPackage, XorgPackage): """The XCB util modules provides a number of libraries which sit on top of libxcb, the core X protocol library, and some of the extension libraries. These experimental libraries provide convenience functions @@ -14,10 +14,15 @@ class XcbUtilKeysyms(AutotoolsPackage): libraries also provide client-side code which is not strictly part of the X protocol but which have traditionally been provided by Xlib.""" - homepage = "https://xcb.freedesktop.org/" - url = "https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.gz" + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms" + xorg_mirror_path = "lib/xcb-util-keysyms-0.4.1.tar.xz" - version("0.4.0", sha256="0807cf078fbe38489a41d755095c58239e1b67299f14460dec2ec811e96caa96") + version("0.4.1", sha256="7c260a5294412aed429df1da2f8afd3bd07b7cba3fec772fba15a613a6d5c638") + version( + "0.4.0", + sha256="0807cf078fbe38489a41d755095c58239e1b67299f14460dec2ec811e96caa96", + url="https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.gz", + ) depends_on("libxcb@1.4:") diff --git a/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py b/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py index c287cdb402..11018a4260 100644 --- a/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py @@ -6,7 +6,7 @@ from spack.package import * -class XcbUtilRenderutil(AutotoolsPackage): +class XcbUtilRenderutil(AutotoolsPackage, XorgPackage): """The XCB util modules provides a number of libraries which sit on top of libxcb, the core X protocol library, and some of the extension libraries. These experimental libraries provide convenience functions @@ -14,10 +14,15 @@ class XcbUtilRenderutil(AutotoolsPackage): libraries also provide client-side code which is not strictly part of the X protocol but which have traditionally been provided by Xlib.""" - homepage = "https://xcb.freedesktop.org/" - url = "https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.gz" + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-renderutil" + xorg_mirror_path = "lib/xcb-util-renderutil-0.3.10.tar.xz" - version("0.3.9", sha256="55eee797e3214fe39d0f3f4d9448cc53cffe06706d108824ea37bb79fcedcad5") + version("0.3.10", sha256="3e15d4f0e22d8ddbfbb9f5d77db43eacd7a304029bf25a6166cc63caa96d04ba") + version( + "0.3.9", + sha256="55eee797e3214fe39d0f3f4d9448cc53cffe06706d108824ea37bb79fcedcad5", + url="https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.gz", + ) depends_on("libxcb@1.4:") diff --git a/var/spack/repos/builtin/packages/xcb-util-wm/package.py b/var/spack/repos/builtin/packages/xcb-util-wm/package.py index 78f06041a0..c3b7bf4773 100644 --- a/var/spack/repos/builtin/packages/xcb-util-wm/package.py +++ b/var/spack/repos/builtin/packages/xcb-util-wm/package.py @@ -6,7 +6,7 @@ from spack.package import * -class XcbUtilWm(AutotoolsPackage): +class XcbUtilWm(AutotoolsPackage, XorgPackage): """The XCB util modules provides a number of libraries which sit on top of libxcb, the core X protocol library, and some of the extension libraries. These experimental libraries provide convenience functions @@ -14,10 +14,15 @@ class XcbUtilWm(AutotoolsPackage): libraries also provide client-side code which is not strictly part of the X protocol but which have traditionally been provided by Xlib.""" - homepage = "https://xcb.freedesktop.org/" - url = "https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.gz" + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-wm" + xorg_mirror_path = "lib/xcb-util-wm-0.4.2.tar.xz" - version("0.4.1", sha256="038b39c4bdc04a792d62d163ba7908f4bb3373057208c07110be73c1b04b8334") + version("0.4.2", sha256="62c34e21d06264687faea7edbf63632c9f04d55e72114aa4a57bb95e4f888a0b") + version( + "0.4.1", + sha256="038b39c4bdc04a792d62d163ba7908f4bb3373057208c07110be73c1b04b8334", + url="https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.gz", + ) depends_on("m4", type="build") diff --git a/var/spack/repos/builtin/packages/xcb-util/package.py b/var/spack/repos/builtin/packages/xcb-util/package.py index 8c49ada53d..e96c044c46 100644 --- a/var/spack/repos/builtin/packages/xcb-util/package.py +++ b/var/spack/repos/builtin/packages/xcb-util/package.py @@ -6,7 +6,7 @@ from spack.package import * -class XcbUtil(AutotoolsPackage): +class XcbUtil(AutotoolsPackage, XorgPackage): """The XCB util modules provides a number of libraries which sit on top of libxcb, the core X protocol library, and some of the extension libraries. These experimental libraries provide convenience functions @@ -14,10 +14,15 @@ class XcbUtil(AutotoolsPackage): libraries also provide client-side code which is not strictly part of the X protocol but which have traditionally been provided by Xlib.""" - homepage = "https://xcb.freedesktop.org/" - url = "https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.gz" + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-util" + xorg_mirror_path = "lib/xcb-util-0.4.1.tar.xz" - version("0.4.0", sha256="0ed0934e2ef4ddff53fcc70fc64fb16fe766cd41ee00330312e20a985fd927a7") + version("0.4.1", sha256="5abe3bbbd8e54f0fa3ec945291b7e8fa8cfd3cccc43718f8758430f94126e512") + version( + "0.4.0", + sha256="0ed0934e2ef4ddff53fcc70fc64fb16fe766cd41ee00330312e20a985fd927a7", + url="https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.gz", + ) depends_on("libxcb@1.4:") |