Page MenuHomeFreeBSD
Files F133505257

D32553.id97094.diff
No OneTemporary
Actions

D32553.id97094.diff
View Options

Index: Mk/Scripts/cargo-crates-git-common.awk
===================================================================
--- /dev/null
+++ Mk/Scripts/cargo-crates-git-common.awk
@@ -0,0 +1,105 @@
+# MAINTAINER: rust@FreeBSD.org
+
+BEGIN {
+ # No approval required to add a new gitlab instance here
+ gitlab_hosts["code.videolan.org"] = 1
+ gitlab_hosts["foss.heptapod.net"] = 1
+ gitlab_hosts["framagit.org"] = 1
+ gitlab_hosts["gitlab.com"] = 1
+ gitlab_hosts["gitlab.common-lisp.net"] = 1
+ gitlab_hosts["gitlab.cs.fau.de"] = 1
+ gitlab_hosts["gitlab.dune-project.org"] = 1
+ gitlab_hosts["gitlab.freedesktop.org"] = 1
+ gitlab_hosts["gitlab.gnome.org"] = 1
+ gitlab_hosts["gitlab.howett.net"] = 1
+ gitlab_hosts["gitlab.inria.fr"] = 1
+ gitlab_hosts["gitlab.isc.org"] = 1
+ gitlab_hosts["gitlab.linphone.org"] = 1
+ gitlab_hosts["gitlab.mathematik.uni-stuttgart.de"] = 1
+ gitlab_hosts["gitlab.mn.tu-dresden.de"] = 1
+ gitlab_hosts["gitlab.mpcdf.mpg.de"] = 1
+ gitlab_hosts["gitlab.redox-os.org"] = 1
+ gitlab_hosts["gitlab.torproject.org"] = 1
+ gitlab_hosts["gitlab.xfce.org"] = 1
+ gitlab_hosts["invent.kde.org"] = 1
+ gitlab_hosts["salsa.debian.org"] = 1
+ gitlab_hosts["source.puri.sm"] = 1
+}
+
+function warn(fmt, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z) {
+ printf("WARNING: " fmt "\n", a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z) >"/dev/stderr"
+}
+
+function commit_from_git_url(url) {
+ if (url["query", "tag"]) {
+ return url["query", "tag"]
+ } else {
+ return url["fragment"]
+ }
+}
+
+function split_git_url(info, git_url, url, path, account, project, commit, i, dir_ver, host) {
+ delete info
+ split_url(url, git_url)
+ url["scheme"] = tolower(url["scheme"])
+ url["host"] = tolower(url["host"])
+ if (url["scheme"] ~ /^git(\+https?)?$/) {
+ if (url["host"] == "github.com") {
+ split(url["path"], path, "/")
+ account = path[2]
+ project = path[3]
+ sub(/\.[gG][iI][tT]$/, "", project)
+ commit = commit_from_git_url(url)
+
+ delete url
+ url["scheme"] = "https"
+ url["host"] = "codeload.github.com"
+ url["path"] = sprintf("/%s/%s/tar.gz/%s", account, project, commit)
+ url["query"] = "dummy"
+ url["query", "dummy"] = "/"
+ info["site"] = join_url(url)
+
+ info["filename"] = sprintf("%s-%s-%s_GH0.tar.gz", account, project, commit)
+
+ # Per bsd.sites.mk:
+ # "GitHub silently converts tags starting with v to not have v in the filename
+ # and extraction directory. It also replaces + with -."
+ dir_ver = commit
+ sub(/^[vV]/, "", dir_ver)
+ gsub(/\+/, "-", dir_ver)
+ gsub(/--/, "-", dir_ver)
+ info["dir"] = sprintf("%s-%s", project, dir_ver)
+
+ return 1
+ } else if (gitlab_hosts[url["host"]]) {
+ split(url["path"], path, "/")
+ account = path[2]
+ for (i = 3; i < length(path); i++) {
+ account = account "/" path[i]
+ }
+ project = path[i]
+ sub(/\.[gG][iI][tT]$/, "", project)
+ commit = commit_from_git_url(url)
+
+ host = url["host"]
+ delete url
+ url["scheme"] = "https"
+ url["host"] = host
+ url["path"] = sprintf("/%s/%s/-/archive/%s.tar.gz", account, project, commit)
+ url["query"] = "dummy"
+ url["query", "dummy"] = "/"
+ info["site"] = join_url(url)
+
+ gsub(/\//, "-", account)
+ info["filename"] = sprintf("%s-%s-%s_GL0.tar.gz", account, project, commit)
+
+ info["dir"] = sprintf("%s-%s", project, commit)
+
+ return 1
+ }
+ }
+
+ warn("Do not know how to handle %s", git_url)
+ warn("If it points to a GitLab instance try adding the hostname to gitlab_hosts[] at the top of cargo-crates-git-common.awk")
+ return 0
+}
Index: Mk/Scripts/cargo-crates-git-configure.awk
===================================================================
--- /dev/null
+++ Mk/Scripts/cargo-crates-git-configure.awk
@@ -0,0 +1,137 @@
+# MAINTAINER: rust@FreeBSD.org
+
+function parse_sources( sources_len, raw_sources, i, j, k, original_crate_source, url, crate_source, crate_names, crate_name) {
+ sources_len = 0
+ split(GIT_SOURCES, raw_sources)
+ for (i = 1; i <= length(raw_sources); i++) {
+ j = index(raw_sources[i], "@")
+ if (j == 0) {
+ warn("invalid source: %s\n", raw_sources[i])
+ continue
+ }
+ original_crate_source = substr(raw_sources[i], j + 1)
+ split_url(url, original_crate_source)
+ sub(/^git\+/, "", url["scheme"])
+ delete url["fragment"]
+ delete url["query"]
+ #sub(/\.git$/, "", url["path"])
+ crate_source = join_url(url)
+
+ split(substr(raw_sources[i], 1, j - 1), crate_names, ",")
+ for (k = 1; k <= length(crate_names); k++) {
+ crate_name = crate_names[k]
+ if (!source_crates[crate_source]) {
+ sources[++sources_len] = crate_source
+ }
+ source_crates[crate_source] = source_crates[crate_source] " " crate_name
+ original_crate_sources[crate_source, crate_name] = original_crate_source
+ }
+ }
+}
+
+function get_source_dir(crate_source, crate_name, git_info, path, in_package, pattern, cmd, cargotoml, line) {
+ if (!split_git_url(git_info, original_crate_sources[crate_source, crate_name])) {
+ exit 1
+ }
+ path = WRKDIR "/" git_info["dir"]
+ # Try to find the first Cargo.toml that defines our crate
+ # We are looking for
+ # [package]
+ # name = "$crate_name"
+ in_package = 0
+ pattern = sprintf("^[ \t]*name[ \t]*=[ \t]*['\"]%s['\"]", crate_name)
+ cmd = FIND " " path " -name Cargo.toml -type f"
+ while ((cmd | getline cargotoml) > 0) {
+ while (getline line <cargotoml) {
+ if (in_package && line ~ pattern) {
+ path = cargotoml
+ sub(/\/Cargo\.toml$/, "", path)
+ close(cmd)
+ close(cargotoml)
+ return path
+ } else if (line ~ /^[ \t]*\[[ \t]*package[ \t]*\][ \t]*$/) {
+ in_package = 1
+ } else if (line ~ /^[ \t]*\[/) {
+ in_package = 0
+ }
+ }
+ close(cargotoml)
+ }
+ close(cmd)
+
+ return path
+}
+
+function find_replaced_crates(input, output, in_patch_crates_io, line, cols) {
+ delete replaced_crates
+# When Cargo.toml has constructs like this (e.g., www/miniserve, x11/wezterm )
+# [patch.crates-io]
+# mime_guess = { git = "https://github.com/svenstaro/mime_guess.git" }
+# cargo fails to find the replacements we setup. Check for this
+# and replace with our own [patch.crates-io] section.
+# Note that we need to filter out the original patch section.
+ in_patch_crates_io = 0
+ while (getline line <input) {
+ if (in_patch_crates_io) {
+ if (line ~ /[ \t]*git[ \t]*=/ && line !~ /^[ \t]*#/) {
+ split(line, cols)
+ replaced_crates[cols[1]] = 1
+ print "# " line >output
+ continue
+ }
+ } else if (line ~ /^[ \t]*\[[ \t]*patch\.crates-io[ \t]*\][ \t]*$/) {
+ in_patch_crates_io = 1
+ } else if (line ~ /^[ \t]*\[/) {
+ in_patch_crates_io = 0
+ }
+ print line >output
+ }
+ close(input)
+ close(output)
+}
+
+function add_crates_io_patches( header_printed, cmd, cargotoml, source, crates) {
+ header_printed = 0
+# --exclude-dir not supported on FreeBSD < 13
+# cmd = GREP " --include='*/Cargo.toml' --exclude-dir='" CARGO_VENDOR_DIR "' -Flr 'patch.crates-io' " WRKSRC
+ cmd = FIND " " WRKSRC " -name Cargo.toml -not -path '" CARGO_VENDOR_DIR "/*' -exec " GREP " -Flr 'patch.crates-io' {} \\\+"
+ while (cmd | getline cargotoml) {
+ if (0 != system(CP " " cargotoml " " cargotoml ".orig-cargo")) {
+ exit 1
+ }
+ find_replaced_crates(cargotoml ".orig-cargo", cargotoml)
+ if (length(replaced_crates) > 0) {
+ for (i in sources) {
+ source = sources[i]
+ split(source_crates[source], crates)
+ for (j in crates) {
+ if (replaced_crates[crates[j]]) {
+ if (!header_printed) {
+ printf("[patch.crates-io]\n")
+ header_printed = 1
+ }
+ printf("%s = { path = '%s' }\n", crates[j], get_source_dir(source, crates[j]))
+ }
+ }
+ }
+ }
+ }
+ close(cmd)
+}
+
+function add_git_patches( i, j, source, crates) {
+ for (i = 1; i <= length(sources); i++) {
+ source = sources[i]
+ split(source_crates[source], crates)
+ printf("[patch.'%s']\n", source)
+ for (j = 1; j <= length(crates); j++) {
+ printf("%s = { path = '%s' }\n", crates[j], get_source_dir(source, crates[j]))
+ }
+ }
+}
+
+END {
+ parse_sources()
+ add_crates_io_patches()
+ add_git_patches()
+}
Index: Mk/Scripts/cargo-crates-git-fetch.awk
===================================================================
--- /dev/null
+++ Mk/Scripts/cargo-crates-git-fetch.awk
@@ -0,0 +1,20 @@
+# MAINTAINER: rust@FreeBSD.org
+#
+# Return (index, site, filename, wrksrc, crates) 5-tuples from git URL specs in CARGO_CRATES
+
+END {
+ split(GIT_SOURCES, git_sources)
+ for (i = 1; i <= length(git_sources); i++) {
+ git_source = git_sources[i]
+ j = index(git_source, "@")
+ if (j == 0) {
+ warn("invalid source: %s", git_source)
+ } else {
+ crate_source = substr(git_source, j + 1)
+ crates = substr(git_source, 0, j - 1)
+ if (split_git_url(git_info, crate_source)) {
+ printf("%d %s %s %s %s\n", group++, git_info["site"], git_info["filename"], git_info["dir"], crates)
+ }
+ }
+ }
+}
Index: Mk/Scripts/cargo-crates.awk
===================================================================
--- Mk/Scripts/cargo-crates.awk
+++ Mk/Scripts/cargo-crates.awk
@@ -1,26 +1,15 @@
# MAINTAINER: rust@FreeBSD.org
BEGIN {
- gh_tuple_len = 0
- gl_tuple_len = 0
crates_len = 0
- package_name = "<unknown>"
crate_name = "<unknown>"
crate_version = "<unknown>"
crate_source = "<unknown>"
-
- gitlab_sites["https://gitlab.com"] = 1
- gitlab_sites["https://gitlab.freedesktop.org"] = 1
- gitlab_sites["https://gitlab.gnome.org"] = 1
- gitlab_sites["https://gitlab.redox-os.org"] = 1
}
/^name = ".*"/ {
crate_name = $3
gsub(/"/, "", crate_name)
-
- package_name = $3
- gsub("[^a-zA-Z_]", "", package_name)
}
/^version = ".*"/ {
@@ -38,7 +27,14 @@
}
function add_crate() {
- if (crate_source == "registry+https://github.com/rust-lang/crates.io-index") {
+ if (crate_source ~ /^git\+/) {
+ gsub(/#/, "\\#", crate_source)
+ if (git_crates[crate_source]) {
+ git_crates[crate_source] = git_crates[crate_source] "," crate_name
+ } else {
+ git_crates[crate_source] = crate_name
+ }
+ } else if (crate_source == "registry+https://github.com/rust-lang/crates.io-index") {
crates[crates_len++] = sprintf("%s-%s", crate_name, crate_version)
}
crate_name = "<unknown>"
@@ -46,50 +42,6 @@
crate_source = "<unknown>"
}
-!gh_tuple_seen[$0] && /^source = "git\+(https|http|git):\/\/.*\/.*#.*"/ {
- gh_tuple_seen[$0] = 1
- split_url(url, substr($3, 1 + length("\"git+"), length($3) - 1 - length("\"git+")))
-
- split(url["path"], path, "/")
- account = path[2]
- project = path[3]
- gsub("\.git$", "", project)
-
- if (match(url["query"], "^tag=")) {
- split(url["query"], tag_, "=")
- tag = tag_[2]
- } else {
- tag = url["fragment"]
- }
-
- added = 0
- if (url["host"] == "github.com") {
- added = 1
- gh_tuple[gh_tuple_len++] = sprintf(\
- "%s:%s:%s:%s", account, project, tag, package_name)
- } else {
- repo_site = sprintf("%s://%s", url["scheme"], url["host"])
- for (site in gitlab_sites) {
- if (repo_site != site) {
- continue
- }
- if (ENVIRON["GL_SITE"] == site) {
- gl_tuple[gl_tuple_len++] = sprintf(\
- "%s:%s:%s:%s", account, project, tag, package_name)
- } else {
- gl_tuple[gl_tuple_len++] = sprintf(\
- "%s:%s:%s:%s:%s", site, account, project, tag, package_name)
- }
- added = 1
- break
- }
- }
-
- if (!added) {
- printf "Warning: Ignoring git source on line %d: %s\n", NR, $3 > "/dev/stderr"
- }
-}
-
function print_array(start, arr, arrlen) {
end = " \\\n"
for (i = 0; i < arrlen; i++) {
@@ -103,20 +55,8 @@
END {
add_crate()
-
- if (gh_tuple_len > 0 && ENVIRON["USE_GITHUB"] == "") {
- printf "USE_GITHUB=\tnodefault\n"
- }
- print_array("GH_TUPLE=", gh_tuple, gh_tuple_len)
- if (gl_tuple_len > 0 && ENVIRON["USE_GITLAB"] == "") {
- printf "USE_GITLAB=\tnodefault\n"
+ for (crate_source in git_crates) {
+ crates[crates_len++] = git_crates[crate_source] "@" crate_source
}
- print_array("GL_TUPLE=", gl_tuple, gl_tuple_len)
print_array("CARGO_CRATES=", crates, crates_len)
- if (gh_tuple_len > 0) {
- printf "CARGO_USE_GITHUB=\tyes\n"
- }
- if (gl_tuple_len > 0) {
- printf "CARGO_USE_GITLAB=\tyes\n"
- }
}
Index: Mk/Uses/cargo.mk
===================================================================
--- Mk/Uses/cargo.mk
+++ Mk/Uses/cargo.mk
@@ -46,21 +46,58 @@
# slow grep runs for every CARGO_CRATE_EXT access.
CARGO_CRATE_EXT= ${defined(_CARGO_CRATE_EXT_CACHE):?${_CARGO_CRATE_EXT_CACHE}:${:!if ${GREP} -q '\(${CARGO_DIST_SUBDIR}/.*\.tar\.gz\)' "${DISTINFO_FILE}" 2>/dev/null; then ${ECHO_CMD} .tar.gz; else ${ECHO_CMD} .crate; fi!:_=_CARGO_CRATE_EXT_CACHE}}
.endif
+
+_CARGO_CRATES:= ${CARGO_CRATES:N*@git+*}
+_CARGO_GIT_SOURCES:= ${CARGO_CRATES:M*@git+*}
# enumerate crates for unqiue and sane distfile group names
-_CARGO_CRATES:= ${empty(CARGO_CRATES):?:${CARGO_CRATES:range:@i@$i ${CARGO_CRATES:[$i]}@}}
+_CARGO_CRATES:= ${empty(_CARGO_CRATES):?:${_CARGO_CRATES:range:@i@$i ${_CARGO_CRATES:[$i]}@}}
# split up crates into (index, crate, name, version) 4-tuples
-_CARGO_CRATES:= ${_CARGO_CRATES:C/^([-_a-zA-Z0-9]+)-([0-9].*)/\0 \1 \2/}
+_CARGO_CRATES:= ${_CARGO_CRATES:C/^([-_a-zA-Z0-9]+)-([0-9].*)/\0 \1 \2/}
+
.for _index _crate _name _version in ${_CARGO_CRATES}
# Resolving CRATESIO alias is very inefficient with many MASTER_SITES, consume MASTER_SITE_CRATESIO directly
MASTER_SITES+= ${MASTER_SITE_CRATESIO:S,%SUBDIR%,${_name}/${_version},:S,$,:_cargo_${_index},}
DISTFILES+= ${CARGO_DIST_SUBDIR}/${_crate}${CARGO_CRATE_EXT}:_cargo_${_index}
+
+# Provide pointer to the crate's extraction dir
+WRKSRC_crate_${_name}= ${CARGO_VENDOR_DIR}/${_crate}
+# ... also with version suffix in case of multiple versions of the
+# same crate
+WRKSRC_crate_${_crate}= ${CARGO_VENDOR_DIR}/${_crate}
.endfor
+_CARGO_AWK= ${AWK} -vCP="${CP}" -vFIND="${FIND}" -vGREP="${GREP}" \
+ -vCARGO_VENDOR_DIR="${CARGO_VENDOR_DIR}" \
+ -vGIT_SOURCES="${_CARGO_GIT_SOURCES}" \
+ -vWRKDIR="${WRKDIR}" -vWRKSRC="${WRKSRC}" \
+ -f${SCRIPTSDIR}/split-url.awk \
+ -f${SCRIPTSDIR}/cargo-crates-git-common.awk -f
+
+.if !empty(_CARGO_GIT_SOURCES)
+. for _index _site _filename _wrksrc _crates in ${:!${_CARGO_AWK} ${SCRIPTSDIR}/cargo-crates-git-fetch.awk /dev/null!}
+MASTER_SITES+= ${_site}:_cargo_git${_index}
+DISTFILES+= ${_filename}:_cargo_git${_index}
+. for _crate in ${_crates:S/,/ /g}
+# Make sure the build dependencies checks below can work for git sourced crates too
+_CARGO_CRATES+= @git ${_crate} ${_crate} @git
+
+# Provide pointer to the crate's extraction dir
+#
+# This might not point to the actual crate's sources since a
+# single git source can contain multiple crates. We cannot collect
+# subdir information until after the full extraction is done and we
+# cannot set make variables at that point. This is better than
+# nothing.
+WRKSRC_crate_${_crate}= ${WRKDIR}/${_wrksrc}
+. endfor
+. endfor
+.endif
+
# Build dependencies.
CARGO_BUILDDEP?= yes
.if ${CARGO_BUILDDEP:tl} == "yes"
-BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.55.0:lang/${RUST_DEFAULT}
+BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.56.0:lang/${RUST_DEFAULT}
.endif
# Location of cargo binary (default to lang/rust's Cargo binary)
@@ -106,9 +143,8 @@
.endif
# Helper to shorten cargo calls.
-CARGO_CARGO_RUN= \
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${CARGO_ENV} \
- ${CARGO_CARGO_BIN}
+_CARGO_RUN= ${SETENV} ${MAKE_ENV} ${CARGO_ENV} ${CARGO_CARGO_BIN}
+CARGO_CARGO_RUN= cd ${WRKSRC}; ${SETENV} CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE=1 ${_CARGO_RUN}
# User arguments for cargo targets.
CARGO_BUILD_ARGS?=
@@ -123,15 +159,6 @@
CARGO_INSTALL?= yes
CARGO_TEST?= yes
-# Set CARGO_USE_GIT{HUB,LAB} to yes if your application requires
-# some dependencies from git repositories hosted on GitHub or
-# GitLab instances. All Cargo.toml files will be patched to point
-# to the right offline sources based on what is defined in
-# {GH,GL}_TUPLE. This makes sure that cargo does not attempt to
-# access the network during the build.
-CARGO_USE_GITHUB?= no
-CARGO_USE_GITLAB?= no
-
# rustc stashes intermediary files in TMPDIR (default /tmp) which
# might cause issues for users that for some reason space limit
# their /tmp. WRKDIR should have plenty of space.
@@ -235,7 +262,8 @@
# the local crates directory.
@${ECHO_MSG} "===> Moving crates to ${CARGO_VENDOR_DIR}"
@${MKDIR} ${CARGO_VENDOR_DIR}
-.for _crate in ${CARGO_CRATES}
+.for _index _crate _name _version in ${_CARGO_CRATES}
+. if ${_index} != @git
@${MV} ${WRKDIR}/${_crate} ${CARGO_VENDOR_DIR}/${_crate}
@${PRINTF} '{"package":"%s","files":{}}' \
$$(${SHA256} -q ${DISTDIR}/${CARGO_DIST_SUBDIR}/${_crate}${CARGO_CRATE_EXT}) \
@@ -244,44 +272,9 @@
${MV} ${CARGO_VENDOR_DIR}/${_crate}/Cargo.toml.orig \
${CARGO_VENDOR_DIR}/${_crate}/Cargo.toml.orig-cargo; \
fi
+. endif
.endfor
-_CARGO_GIT_PATCH_CARGOTOML=
-.if ${CARGO_USE_GITHUB:tl} == "yes"
-. for _group in ${GH_TUPLE:C@^[^:]*:[^:]*:[^:]*:(([^:/]*)?)((/.*)?)@\2@}
-. if empty(CARGO_GIT_SUBDIR:M${_group}\:*)
-_CARGO_GIT_PATCH_CARGOTOML:= ${_CARGO_GIT_PATCH_CARGOTOML} \
- -e "s@git *= *['\"](https|http|git)://github.com/${GH_ACCOUNT_${_group}}/${GH_PROJECT_${_group}}(\.git)?/?[\"']@path = \"${WRKSRC_${_group}}\"@"
-. else
-. for _group2 _crate _subdir in ${CARGO_GIT_SUBDIR:M${_group}\:*:S,:, ,g}
-_CARGO_GIT_PATCH_CARGOTOML:= ${_CARGO_GIT_PATCH_CARGOTOML} \
- -e "/^${_crate} =/ s@git *= *['\"](https|http|git)://github.com/${GH_ACCOUNT_${_group}}/${GH_PROJECT_${_group}}(\.git)?/?[\"']@path = \"${WRKSRC_${_group}}/${_subdir}\"@"
-. endfor
-. endif
-. endfor
-.endif
-.if ${CARGO_USE_GITLAB:tl} == "yes"
-. for _group in ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\8@:S/^://}
-. if empty(CARGO_GIT_SUBDIR:M${_group}\:*)
-_CARGO_GIT_PATCH_CARGOTOML:= ${_CARGO_GIT_PATCH_CARGOTOML} \
- -e "s@git *= *['\"]${GL_SITE_${_group}}/${GL_ACCOUNT_${_group}}/${GL_PROJECT_${_group}}(\.git)?/?['\"]@path = \"${WRKSRC_${_group}}\"@"
-. else
-. for _group2 _crate _subdir in ${CARGO_GIT_SUBDIR:M${_group}\:*:S,:, ,g}
-_CARGO_GIT_PATCH_CARGOTOML:= ${_CARGO_GIT_PATCH_CARGOTOML} \
- -e "/^${_crate} = / s@git *= *['\"]${GL_SITE_${_group}}/${GL_ACCOUNT_${_group}}/${GL_PROJECT_${_group}}(\.git)?/?['\"]@path = \"${WRKSRC_${_group}}/${_subdir}\"@"
-. endfor
-. endif
-. endfor
-.endif
-
-.if !empty(_CARGO_GIT_PATCH_CARGOTOML)
-_USES_patch+= 600:cargo-patch-git
-
-cargo-patch-git:
- @${FIND} ${WRKDIR} -name Cargo.toml -type f -exec \
- ${SED} -i.dist -E ${_CARGO_GIT_PATCH_CARGOTOML} {} +
-.endif
-
.if ${CARGO_CONFIGURE:tl} == "yes"
_USES_configure+= 250:cargo-configure
@@ -291,17 +284,25 @@
# Check that the running kernel has COMPAT_FREEBSD11 required by lang/rust post-ino64
@${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \
${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh
+ @${ECHO_MSG} "===> Cargo config:"
@${MKDIR} ${WRKDIR}/.cargo
- @${ECHO_CMD} "[source.cargo]" > ${WRKDIR}/.cargo/config
- @${ECHO_CMD} "directory = '${CARGO_VENDOR_DIR}'" >> ${WRKDIR}/.cargo/config
- @${ECHO_CMD} "[source.crates-io]" >> ${WRKDIR}/.cargo/config
- @${ECHO_CMD} "replace-with = 'cargo'" >> ${WRKDIR}/.cargo/config
+ @: > ${WRKDIR}/.cargo/config.toml
+ @${ECHO_CMD} "[source.cargo]" >> ${WRKDIR}/.cargo/config.toml
+ @${ECHO_CMD} "directory = '${CARGO_VENDOR_DIR}'" >> ${WRKDIR}/.cargo/config.toml
+ @${ECHO_CMD} "[source.crates-io]" >> ${WRKDIR}/.cargo/config.toml
+ @${ECHO_CMD} "replace-with = 'cargo'" >> ${WRKDIR}/.cargo/config.toml
+.if !empty(_CARGO_GIT_SOURCES)
+ @${_CARGO_AWK} ${SCRIPTSDIR}/cargo-crates-git-configure.awk \
+ /dev/null >> ${WRKDIR}/.cargo/config.toml
+.endif
+ @${CAT} ${WRKDIR}/.cargo/config.toml
@if ! ${GREP} -qF '[profile.release]' ${CARGO_CARGOTOML}; then \
${ECHO_CMD} "" >> ${CARGO_CARGOTOML}; \
${ECHO_CMD} "[profile.release]" >> ${CARGO_CARGOTOML}; \
${ECHO_CMD} "opt-level = 2" >> ${CARGO_CARGOTOML}; \
${ECHO_CMD} "debug = false" >> ${CARGO_CARGOTOML}; \
fi
+ @${ECHO_MSG} "===> Updating Cargo.lock"
@${CARGO_CARGO_RUN} update \
--manifest-path ${CARGO_CARGOTOML} \
--verbose \
@@ -349,12 +350,11 @@
cargo-crates: extract
@if [ ! -r "${CARGO_CARGOLOCK}" ]; then \
${ECHO_MSG} "===> ${CARGO_CARGOLOCK} not found. Trying to generate it..."; \
- ${CARGO_CARGO_RUN} generate-lockfile \
+ cd ${WRKSRC}; ${_CARGO_RUN} generate-lockfile \
--manifest-path ${CARGO_CARGOTOML} \
--verbose; \
fi
- @${SETENV} USE_GITHUB=${USE_GITHUB} USE_GITLAB=${USE_GITLAB} GL_SITE=${GL_SITE} \
- ${AWK} -f ${SCRIPTSDIR}/split-url.awk -f ${SCRIPTSDIR}/cargo-crates.awk ${CARGO_CARGOLOCK}
+ @${_CARGO_AWK} ${SCRIPTSDIR}/cargo-crates.awk ${CARGO_CARGOLOCK}
# cargo-crates-licenses will try to grab license information from
# all downloaded crates.
Index: Mk/bsd.gecko.mk
===================================================================
--- Mk/bsd.gecko.mk
+++ Mk/bsd.gecko.mk
@@ -79,7 +79,7 @@
BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \
rust-cbindgen>=0.19.0:devel/rust-cbindgen \
- ${RUST_DEFAULT}>=1.55.0:lang/${RUST_DEFAULT} \
+ ${RUST_DEFAULT}>=1.56.0:lang/${RUST_DEFAULT} \
node:www/node
LIB_DEPENDS+= libdrm.so:graphics/libdrm
.if ${MOZILLA_VER:R:R} >= 85
@@ -101,7 +101,7 @@
.endif
# Ignore Mk/bsd.default-versions.mk but respect make.conf(5) unless LTO is enabled
.if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} || ${PORT_OPTIONS:MLTO}
-LLVM_DEFAULT= 12 # chase bundled LLVM in lang/rust for LTO
+LLVM_DEFAULT= 13 # chase bundled LLVM in lang/rust for LTO
.endif
# Require newer Clang than what's in base system unless user opted out
. if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so)
Index: Mk/bsd.sanity.mk
===================================================================
--- Mk/bsd.sanity.mk
+++ Mk/bsd.sanity.mk
@@ -202,7 +202,7 @@
INSTALLS_EGGINFO USE_DOS2UNIX NO_STAGE USE_RUBYGEMS USE_GHOSTSCRIPT \
USE_GHOSTSCRIPT_BUILD USE_GHOSTSCRIPT_RUN USE_AUTOTOOLS APACHE_PORT \
USE_FPC_RUN WANT_FPC_BASE WANT_FPC_ALL USE_QT4 USE_QT5 QT_NONSTANDARD \
- XORG_CAT
+ XORG_CAT CARGO_USE_GITHUB CARGO_USE_GITLAB CARGO_GIT_SUBDIR
SANITY_DEPRECATED= MLINKS \
USE_MYSQL WANT_MYSQL_VER \
PYDISTUTILS_INSTALLNOSINGLE \
@@ -290,6 +290,9 @@
USE_QT5_ALT= USES=qt:5 and USE_QT=${USE_QT5}
QT_NONSTANDARD_ALT= USES=qmake:no_env
XORG_CAT_ALT= USES=xorg-cat:${XORG_CAT}
+CARGO_USE_GITHUB_ALT= CARGO_CRATES \(regenerate it with make cargo-crates\)
+CARGO_USE_GITLAB_ALT= CARGO_CRATES \(regenerate it with make cargo-crates\)
+CARGO_GIT_SUBDIR_ALT= CARGO_CRATES \(regenerate it with make cargo-crates\)
.for a in ${SANITY_DEPRECATED}
.if defined(${a})
Index: accessibility/sctd/Makefile
===================================================================
--- accessibility/sctd/Makefile
+++ accessibility/sctd/Makefile
@@ -13,7 +13,6 @@
USES= cargo xorg
USE_GITHUB= yes
GH_ACCOUNT= amir
-GH_TUPLE= amir:spa-rs:fa80d0ce99d675674cf1a7cc9cf2ee2e33f501ea:spa
USE_XORG= x11 xrandr
CARGO_CRATES= ansi_term-0.11.0 \
atty-0.2.14 \
@@ -40,8 +39,8 @@
winapi-0.3.8 \
winapi-i686-pc-windows-gnu-0.4.0 \
winapi-x86_64-pc-windows-gnu-0.4.0 \
- x11-2.18.2
-CARGO_USE_GITHUB= yes
+ x11-2.18.2 \
+ spa@git+https://github.com/amir/spa-rs?branch=pub-SolarPos\#fa80d0ce99d675674cf1a7cc9cf2ee2e33f501ea
PLIST_FILES= bin/sctd
Index: audio/gnome-podcasts/Makefile
===================================================================
--- audio/gnome-podcasts/Makefile
+++ audio/gnome-podcasts/Makefile
@@ -18,11 +18,9 @@
libhandy-1.so:x11-toolkits/libhandy
USES= cargo gettext gnome meson pkgconfig python:build shebangfix sqlite ssl
-USE_GITHUB= nodefault
USE_GITLAB= yes
USE_GNOME= gdkpixbuf2 gtk30
USE_GSTREAMER1= bad good libav
-GH_TUPLE= danigm:gettext-rs:61938b9f5f1d3bdc31f9839f53fabe5ccf136a78:gettextrs
GL_SITE= https://gitlab.gnome.org
GL_ACCOUNT= World
GL_COMMIT= e93a7ddabfe8289138280c3f613038b809b5033d
@@ -89,7 +87,6 @@
futures-task-0.3.5 \
futures-util-0.3.5 \
gdk-0.13.1 \
- gettext-sys-0.19.9 \
gdk-pixbuf-0.9.0 \
gdk-pixbuf-sys-0.10.0 \
gdk-sys-0.10.0 \
@@ -290,8 +287,8 @@
ws2_32-sys-0.2.1 \
xdg-2.2.0 \
xml-rs-0.8.3 \
- xml5ever-0.16.1
-CARGO_USE_GITHUB= yes
+ xml5ever-0.16.1 \
+ gettext-rs,gettext-sys@git+https://github.com/danigm/gettext-rs?branch=no-gettext\#61938b9f5f1d3bdc31f9839f53fabe5ccf136a78
CARGO_BUILD= no
CARGO_INSTALL= no
CARGO_TEST= no
Index: audio/shortwave/Makefile
===================================================================
--- audio/shortwave/Makefile
+++ audio/shortwave/Makefile
@@ -12,18 +12,13 @@
LIB_DEPENDS= libdbus-1.so:devel/dbus
USES= cargo gettext gnome meson pkgconfig python:build shebangfix sqlite ssl
-USE_GITHUB= nodefault
USE_GITLAB= yes
USE_GNOME= gdkpixbuf2 gtk40 libadwaita
USE_GSTREAMER1= good libav soup vorbis
-GH_TUPLE= gtk-rs:gtk3-rs:1ca4fbcc30ec882f6079f26018c30ef1ceb8a2e2:gtk3 \
- gtk-rs:gtk4-rs:534f63e66a2a3883770fe110a8a556a4b40f84b3:gtk4
GL_SITE= https://gitlab.gnome.org
GL_ACCOUNT= World
GL_PROJECT= Shortwave
GL_COMMIT= 9bfc5ee2d857035cf0d3c72e211b3d76b85d7414
-GL_TUPLE= https://gitlab.freedesktop.org:gstreamer:gstreamer-rs:f00c57cd6f2a0912e04c10887cedbe95be7d5dea:gstreamer \
- bilelmoussaoui:libadwaita-rs:2d09b6b566bc0fa2497612768cf0c41f582acdd7:libadwaita
SHEBANG_FILES= build-aux/meson/postinstall.py
MAKE_ENV= ${CARGO_ENV}
GLIB_SCHEMAS= de.haeckerfelix.Shortwave.gschema.xml
@@ -275,31 +270,11 @@
winapi-util-0.1.5 \
winapi-x86_64-pc-windows-gnu-0.4.0 \
winreg-0.6.2 \
- ws2_32-sys-0.2.1
-CARGO_USE_GITHUB= yes
-CARGO_USE_GITLAB= yes
-CARGO_GIT_SUBDIR= gstreamer:gstreamer-audio:gstreamer-audio \
- gstreamer:gstreamer:gstreamer \
- gtk3:cairo-rs:cairo \
- gtk3:cairo-sys-rs:cairo/sys \
- gtk3:gdk-pixbuf-sys:gdk-pixbuf/sys \
- gtk3:gdk-pixbuf:gdk-pixbuf \
- gtk3:gdk:gdk \
- gtk3:gio-sys:gio/sys \
- gtk3:gio:gio \
- gtk3:glib-sys:glib/sys \
- gtk3:glib:glib \
- gtk3:gobject-sys:glib/gobject-sys \
- gtk3:graphene-sys:graphene/sys \
- gtk3:graphene:graphene \
- gtk3:gtk:gtk \
- gtk3:pango-sys:pango/sys \
- gtk3:pango:pango \
- gtk4:gdk-sys:gdk4/sys \
- gtk4:gdk:gdk4 \
- gtk4:gtk-sys:gtk4/sys \
- gtk4:gtk:gtk4 \
- libadwaita:adw:libadwaita
+ ws2_32-sys-0.2.1 \
+ gstreamer,gstreamer-audio,gstreamer-audio-sys,gstreamer-base,gstreamer-base-sys,gstreamer-sys@git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs\#f00c57cd6f2a0912e04c10887cedbe95be7d5dea \
+ cairo-rs,cairo-sys-rs,gdk-pixbuf,gdk-pixbuf-sys,gio,gio-sys,glib,glib-macros,glib-sys,gobject-sys,graphene-rs,graphene-sys,pango,pango-sys@git+https://github.com/gtk-rs/gtk3-rs\#1ca4fbcc30ec882f6079f26018c30ef1ceb8a2e2 \
+ gdk4,gdk4-sys,gsk4,gsk4-sys,gtk4,gtk4-macros,gtk4-sys@git+https://github.com/gtk-rs/gtk4-rs\#534f63e66a2a3883770fe110a8a556a4b40f84b3 \
+ libadwaita,libadwaita-sys@git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs\#2d09b6b566bc0fa2497612768cf0c41f582acdd7
CARGO_BUILD= no
CARGO_INSTALL= no
CARGO_TEST= no
Index: audio/shortwave/files/patch-gtk
===================================================================
--- audio/shortwave/files/patch-gtk
+++ /dev/null
@@ -1,241 +0,0 @@
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256581
-
---- ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/gstreamer/sys/Cargo.toml.orig 2021-04-23 12:28:54 UTC
-+++ ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/gstreamer/sys/Cargo.toml
-@@ -3,12 +3,8 @@ system-deps = "3"
-
- [dependencies]
- libc = "0.2"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
- [dev-dependencies]
- shell-words = "1.0.0"
---- ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/gstreamer-audio/sys/Cargo.toml.orig 2021-04-23 12:28:54 UTC
-+++ ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/gstreamer-audio/sys/Cargo.toml
-@@ -3,12 +3,8 @@ system-deps = "3"
-
- [dependencies]
- libc = "0.2"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
- [dependencies.gstreamer-base-sys]
- path = "../../gstreamer-base/sys"
---- ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/gstreamer-base/sys/Cargo.toml.orig 2021-04-23 12:28:54 UTC
-+++ ../gstreamer-rs-f00c57cd6f2a0912e04c10887cedbe95be7d5dea/gstreamer-base/sys/Cargo.toml
-@@ -3,12 +3,8 @@ system-deps = "3"
-
- [dependencies]
- libc = "0.2"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
- [dependencies.gstreamer-sys]
- path = "../../gstreamer/sys"
---- ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gdk4/sys/Cargo.toml.orig 2021-04-23 13:02:09 UTC
-+++ ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gdk4/sys/Cargo.toml
-@@ -28,27 +28,13 @@ v4_2 = []
-
- [dependencies]
- libc = "0.2"
--
--[dependencies.cairo-sys-rs]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk-pixbuf-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gio-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.graphene-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.pango-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+graphene-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
- [build-dependencies]
- system-deps = "3"
---- ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gsk4/sys/Cargo.toml.orig 2021-04-23 13:02:09 UTC
-+++ ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gsk4/sys/Cargo.toml
-@@ -28,24 +28,14 @@ v4_2 = []
-
- [dependencies]
- libc = "0.2"
-+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+graphene-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
--[dependencies.cairo-sys-rs]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
- [dependencies.gdk4-sys]
- path = "../../gdk4/sys"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.graphene-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.pango-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-
- [build-dependencies]
- system-deps = "3"
---- ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gtk4/sys/Cargo.toml.orig 2021-04-23 13:02:09 UTC
-+++ ../gtk4-rs-534f63e66a2a3883770fe110a8a556a4b40f84b3/gtk4/sys/Cargo.toml
-@@ -29,33 +29,19 @@ v4_2 = []
-
- [dependencies]
- libc = "0.2"
-+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+graphene-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
--[dependencies.cairo-sys-rs]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk-pixbuf-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
- [dependencies.gdk4-sys]
- path = "../../gdk4/sys"
-
--[dependencies.gio-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.graphene-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
- [dependencies.gsk4-sys]
- path = "../../gsk4/sys"
--
--[dependencies.pango-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-
- [build-dependencies]
- system-deps = "3"
---- ../libadwaita-rs-2d09b6b566bc0fa2497612768cf0c41f582acdd7/libadwaita/Cargo.toml.orig 2021-04-20 20:15:58 UTC
-+++ ../libadwaita-rs-2d09b6b566bc0fa2497612768cf0c41f582acdd7/libadwaita/Cargo.toml
-@@ -8,28 +8,14 @@ edition = "2018"
- libc = '0.2'
- bitflags = '1.2'
- lazy_static = '1.4'
-+glib = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk = { package = "gdk4", git = "https://github.com/gtk-rs/gtk4-rs" }
-+gtk = { package = "gtk4", git = "https://github.com/gtk-rs/gtk4-rs" }
- [lib]
- name = "libadwaita"
--
--[dependencies.glib]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gio]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk-pixbuf]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.pango]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk]
--package = "gdk4"
--git = "https://github.com/gtk-rs/gtk4-rs"
--
--[dependencies.gtk]
--package = "gtk4"
--git = "https://github.com/gtk-rs/gtk4-rs"
-
- [dependencies.ffi]
- package = "libadwaita-sys"
---- ../libadwaita-rs-2d09b6b566bc0fa2497612768cf0c41f582acdd7/libadwaita/sys/Cargo.toml.orig 2021-04-20 20:15:58 UTC
-+++ ../libadwaita-rs-2d09b6b566bc0fa2497612768cf0c41f582acdd7/libadwaita/sys/Cargo.toml
-@@ -16,29 +16,13 @@ name = "libadwaita_sys"
-
- [dependencies]
- libc = "0.2"
--
--[dependencies.gio-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk-pixbuf-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.pango-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gtk-sys]
--package = "gtk4-sys"
--git = "https://github.com/gtk-rs/gtk4-rs"
--
--[dependencies.gdk-sys]
--package = "gdk4-sys"
--git = "https://github.com/gtk-rs/gtk4-rs"
-+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gtk-sys = { package = "gtk4-sys", git = "https://github.com/gtk-rs/gtk4-rs" }
-+gdk-sys = { package = "gdk4-sys", git = "https://github.com/gtk-rs/gtk4-rs" }
-
- [build-dependencies]
- system-deps = "3"
Index: databases/redisjson/Makefile
===================================================================
--- databases/redisjson/Makefile
+++ databases/redisjson/Makefile
@@ -15,10 +15,8 @@
BUILD_DEPENDS= ${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/libclang.so:devel/llvm${LLVM_DEFAULT}
USES= cargo
-
-USE_GITHUB= nodefault
-GH_TUPLE= RedisJSON:redisjson:2d9ac84:redisjson \
- RedisJSON:jsonpath:14af7aa5435f3e676ceb3441ad78b9c8cb3ffa3a:jsonpath_lib
+USE_GITHUB= yes
+GH_TUPLE= RedisJSON:RedisJSON:2d9ac84
CARGO_CRATES= aho-corasick-0.7.15 \
ansi_term-0.11.0 \
@@ -101,11 +99,8 @@
winapi-i686-pc-windows-gnu-0.4.0 \
winapi-util-0.1.5 \
winapi-x86_64-pc-windows-gnu-0.4.0 \
- wyz-0.2.0
-
-CARGO_USE_GITHUB= yes
-
-WRKSRC= ${WRKDIR}/RedisJSON-2d9ac84
+ wyz-0.2.0 \
+ jsonpath_lib@git+https://github.com/RedisJSON/jsonpath.git?branch=generic_json_path\#14af7aa5435f3e676ceb3441ad78b9c8cb3ffa3a
PLIST_FILES= lib/librejson.so
Index: databases/redisjson/distinfo
===================================================================
--- databases/redisjson/distinfo
+++ databases/redisjson/distinfo
@@ -163,7 +163,7 @@
SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
SHA256 (rust/crates/wyz-0.2.0.crate) = 85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214
SIZE (rust/crates/wyz-0.2.0.crate) = 12926
-SHA256 (RedisJSON-redisjson-2d9ac84_GH0.tar.gz) = 74f536a516d609512c198e09637a89a203c89555cd866f36157bb647a4910ddf
-SIZE (RedisJSON-redisjson-2d9ac84_GH0.tar.gz) = 592087
+SHA256 (RedisJSON-RedisJSON-0.0.0.0.2021.10.05.01-2d9ac84_GH0.tar.gz) = 74f536a516d609512c198e09637a89a203c89555cd866f36157bb647a4910ddf
+SIZE (RedisJSON-RedisJSON-0.0.0.0.2021.10.05.01-2d9ac84_GH0.tar.gz) = 592087
SHA256 (RedisJSON-jsonpath-14af7aa5435f3e676ceb3441ad78b9c8cb3ffa3a_GH0.tar.gz) = 1d3e33b0211b36b9a35ce3a4cd3da8d4109fcceb751131e1dd4e7fc00bb4e347
SIZE (RedisJSON-jsonpath-14af7aa5435f3e676ceb3441ad78b9c8cb3ffa3a_GH0.tar.gz) = 448708
Index: deskutils/solanum/Makefile
===================================================================
--- deskutils/solanum/Makefile
+++ deskutils/solanum/Makefile
@@ -11,18 +11,13 @@
LICENSE_FILE= ${WRKSRC}/LICENSE.md
USES= cargo gettext gnome meson pkgconfig python:build shebangfix
-USE_GITHUB= nodefault
USE_GITLAB= yes
USE_GNOME= gtk40 libadwaita
USE_GSTREAMER1= bad good vorbis
-GH_TUPLE= gtk-rs:gtk3-rs:c58fab4fec1254244f598c4eac7f9310184c5996:gtk3 \
- gtk-rs:gtk4-rs:64d0e1c1344458a065ccf22dcecf105c55b902ca:gtk4
GL_SITE= https://gitlab.gnome.org
GL_ACCOUNT= World
GL_PROJECT= Solanum
GL_COMMIT= 3e69272fb31bf18a7aa74ece9d904d445c458274
-GL_TUPLE= https://gitlab.freedesktop.org:gstreamer:gstreamer-rs:0e8b95f1d029530ad3f84a3f08a20d8dfd80a089:gstreamer \
- bilelmoussaoui:libadwaita-rs:b898c11fb6776fc7a9a6b920222fa3173216a80c:libadwaita
SHEBANG_FILES= build-aux/meson/postinstall.py
MAKE_ENV= ${CARGO_ENV}
GLIB_SCHEMAS= org.gnome.Solanum.gschema.xml
@@ -93,29 +88,11 @@
version_check-0.9.2 \
winapi-0.3.9 \
winapi-i686-pc-windows-gnu-0.4.0 \
- winapi-x86_64-pc-windows-gnu-0.4.0
-CARGO_USE_GITHUB= yes
-CARGO_USE_GITLAB= yes
-CARGO_GIT_SUBDIR= gstreamer:gstreamer-player:gstreamer-player \
- gstreamer:gstreamer:gstreamer \
- gtk3:cairo-rs:cairo \
- gtk3:cairo-sys-rs:cairo/sys \
- gtk3:gdk-pixbuf-sys:gdk-pixbuf/sys \
- gtk3:gdk-pixbuf:gdk-pixbuf \
- gtk3:gio-sys:gio/sys \
- gtk3:gio:gio \
- gtk3:glib-sys:glib/sys \
- gtk3:glib:glib \
- gtk3:gobject-sys:glib/gobject-sys \
- gtk3:graphene-sys:graphene/sys \
- gtk3:graphene:graphene \
- gtk3:pango-sys:pango/sys \
- gtk3:pango:pango \
- gtk4:gdk-sys:gdk4/sys \
- gtk4:gdk:gdk4 \
- gtk4:gtk-sys:gtk4/sys \
- gtk4:gtk:gtk4 \
- libadwaita:libadwaita:libadwaita
+ winapi-x86_64-pc-windows-gnu-0.4.0 \
+ gdk4,gdk4-sys,gsk4,gsk4-sys,gtk4,gtk4-macros,gtk4-sys@git+https://github.com/gtk-rs/gtk4-rs\#64d0e1c1344458a065ccf22dcecf105c55b902ca \
+ gstreamer,gstreamer-base,gstreamer-base-sys,gstreamer-player,gstreamer-player-sys,gstreamer-sys,gstreamer-video,gstreamer-video-sys@git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs\#0e8b95f1d029530ad3f84a3f08a20d8dfd80a089 \
+ cairo-rs,cairo-sys-rs,gdk-pixbuf,gdk-pixbuf-sys,gio,gio-sys,glib,glib-macros,glib-sys,gobject-sys,graphene-rs,graphene-sys,pango,pango-sys@git+https://github.com/gtk-rs/gtk3-rs\#c58fab4fec1254244f598c4eac7f9310184c5996 \
+ libadwaita,libadwaita-sys@git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs\#b898c11fb6776fc7a9a6b920222fa3173216a80c
CARGO_BUILD= no
CARGO_INSTALL= no
CARGO_TEST= no
Index: deskutils/solanum/files/patch-gtk
===================================================================
--- deskutils/solanum/files/patch-gtk
+++ /dev/null
@@ -1,310 +0,0 @@
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256581
-
---- ../gstreamer-rs-0e8b95f1d029530ad3f84a3f08a20d8dfd80a089/gstreamer-base/sys/Cargo.toml.orig 2021-01-25 11:56:55 UTC
-+++ ../gstreamer-rs-0e8b95f1d029530ad3f84a3f08a20d8dfd80a089/gstreamer-base/sys/Cargo.toml
-@@ -3,12 +3,8 @@ system-deps = "2.0"
-
- [dependencies]
- libc = "0.2"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
- [dependencies.gstreamer-sys]
- path = "../../gstreamer/sys"
---- ../gstreamer-rs-0e8b95f1d029530ad3f84a3f08a20d8dfd80a089/gstreamer-player/sys/Cargo.toml.orig 2021-01-25 11:56:55 UTC
-+++ ../gstreamer-rs-0e8b95f1d029530ad3f84a3f08a20d8dfd80a089/gstreamer-player/sys/Cargo.toml
-@@ -3,12 +3,8 @@ system-deps = "2.0"
-
- [dependencies]
- libc = "0.2"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
- [dependencies.gstreamer-sys]
- path = "../../gstreamer/sys"
---- ../gstreamer-rs-0e8b95f1d029530ad3f84a3f08a20d8dfd80a089/gstreamer-video/sys/Cargo.toml.orig 2021-01-25 11:56:55 UTC
-+++ ../gstreamer-rs-0e8b95f1d029530ad3f84a3f08a20d8dfd80a089/gstreamer-video/sys/Cargo.toml
-@@ -3,12 +3,8 @@ system-deps = "2.0"
-
- [dependencies]
- libc = "0.2"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
- [dependencies.gstreamer-base-sys]
- path = "../../gstreamer-base/sys"
---- ../gstreamer-rs-0e8b95f1d029530ad3f84a3f08a20d8dfd80a089/gstreamer/sys/Cargo.toml.orig 2021-01-25 11:56:55 UTC
-+++ ../gstreamer-rs-0e8b95f1d029530ad3f84a3f08a20d8dfd80a089/gstreamer/sys/Cargo.toml
-@@ -3,12 +3,8 @@ system-deps = "2.0"
-
- [dependencies]
- libc = "0.2"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
- [dev-dependencies]
- shell-words = "1.0.0"
---- ../gtk4-rs-64d0e1c1344458a065ccf22dcecf105c55b902ca/gdk4/sys/Cargo.toml.orig 2021-01-25 20:09:24 UTC
-+++ ../gtk4-rs-64d0e1c1344458a065ccf22dcecf105c55b902ca/gdk4/sys/Cargo.toml
-@@ -3,24 +3,12 @@ system-deps = "2.0"
-
- [dependencies]
- libc = "0.2"
--
--[dependencies.cairo-sys-rs]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk-pixbuf-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gio-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.pango-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
- [dev-dependencies]
- shell-words = "1.0.0"
---- ../gtk4-rs-64d0e1c1344458a065ccf22dcecf105c55b902ca/gsk4/sys/Cargo.toml.orig 2021-01-25 20:09:24 UTC
-+++ ../gtk4-rs-64d0e1c1344458a065ccf22dcecf105c55b902ca/gsk4/sys/Cargo.toml
-@@ -3,24 +3,14 @@ system-deps = "2.0"
-
- [dependencies]
- libc = "0.2"
-+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+graphene-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
--[dependencies.cairo-sys-rs]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
- [dependencies.gdk4-sys]
- path = "../../gdk4/sys"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.graphene-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.pango-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-
- [dev-dependencies]
- shell-words = "1.0.0"
---- ../gtk4-rs-64d0e1c1344458a065ccf22dcecf105c55b902ca/gtk4/sys/Cargo.toml.orig 2021-01-25 20:09:24 UTC
-+++ ../gtk4-rs-64d0e1c1344458a065ccf22dcecf105c55b902ca/gtk4/sys/Cargo.toml
-@@ -3,33 +3,19 @@ system-deps = "2.0"
-
- [dependencies]
- libc = "0.2"
-+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+graphene-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
--[dependencies.cairo-sys-rs]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk-pixbuf-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
- [dependencies.gdk4-sys]
- path = "../../gdk4/sys"
-
--[dependencies.gio-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.graphene-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
- [dependencies.gsk4-sys]
- path = "../../gsk4/sys"
--
--[dependencies.pango-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-
- [dev-dependencies]
- shell-words = "1.0.0"
---- ../libadwaita-rs-b898c11fb6776fc7a9a6b920222fa3173216a80c/libadwaita/Cargo.toml.orig 2021-01-15 00:37:53 UTC
-+++ ../libadwaita-rs-b898c11fb6776fc7a9a6b920222fa3173216a80c/libadwaita/Cargo.toml
-@@ -8,28 +8,15 @@ edition = "2018"
- libc = '0.2'
- bitflags = '1.2'
- lazy_static = '1.4'
-+glib = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk = { package = "gdk4", git = "https://github.com/gtk-rs/gtk4-rs" }
-+gtk = { package = "gtk4", git = "https://github.com/gtk-rs/gtk4-rs" }
-+
- [lib]
- name = "libadwaita"
--
--[dependencies.glib]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gio]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk-pixbuf]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.pango]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk]
--package = "gdk4"
--git = "https://github.com/gtk-rs/gtk4-rs"
--
--[dependencies.gtk]
--package = "gtk4"
--git = "https://github.com/gtk-rs/gtk4-rs"
-
- [dependencies.ffi]
- package = "libadwaita-sys"
---- ../libadwaita-rs-b898c11fb6776fc7a9a6b920222fa3173216a80c/libadwaita/sys/Cargo.toml.orig 2021-01-15 00:37:53 UTC
-+++ ../libadwaita-rs-b898c11fb6776fc7a9a6b920222fa3173216a80c/libadwaita/sys/Cargo.toml
-@@ -16,29 +16,13 @@ name = "libadwaita_sys"
-
- [dependencies]
- libc = "0.2"
--
--[dependencies.gio-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk-pixbuf-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.pango-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gtk-sys]
--package = "gtk4-sys"
--git = "https://github.com/gtk-rs/gtk4-rs"
--
--[dependencies.gdk-sys]
--package = "gdk4-sys"
--git = "https://github.com/gtk-rs/gtk4-rs"
-+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gtk-sys = { package = "gtk4-sys", git = "https://github.com/gtk-rs/gtk4-rs" }
-+gdk-sys = { package = "gdk4-sys", git = "https://github.com/gtk-rs/gtk4-rs" }
-
- [build-dependencies]
- system-deps = "2.0"
---- Cargo.toml.orig 2021-02-08 23:38:19 UTC
-+++ Cargo.toml
-@@ -7,42 +7,17 @@ edition = "2018"
- once_cell = "1.4.0"
- regex = "1.3.4"
- gtk-macros = "0.2.0"
-+gtk = { package ="gtk4", git = "https://github.com/gtk-rs/gtk4-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk = { package = "gdk4", git = "https://github.com/gtk-rs/gtk4-rs" }
-+gio = { git = "https://github.com/gtk-rs/gtk3-rs", features = ["v2_60"] }
-+glib = { git = "https://github.com/gtk-rs/gtk3-rs", features = ["v2_60"] }
-+gstreamer = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
-+gstreamer-player = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
-+libadwaita = { git = "https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs" }
-+pango = { git = "https://github.com/gtk-rs/gtk3-rs", features = ["v1_44"] }
-
--[dependencies.gtk]
--git = "https://github.com/gtk-rs/gtk4-rs"
--package ="gtk4"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk]
--git = "https://github.com/gtk-rs/gtk4-rs"
--package = "gdk4"
--
--[dependencies.gio]
--git = "https://github.com/gtk-rs/gtk3-rs"
--features = ["v2_60"]
--
--[dependencies.glib]
--git = "https://github.com/gtk-rs/gtk3-rs"
--features = ["v2_60"]
--
--[dependencies.gstreamer]
--git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
--
--[dependencies.gstreamer-player]
--git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs"
--
- [dependencies.gettext-rs]
- version = "0.4.4"
- features = ["gettext-system"]
--
--[dependencies.libadwaita]
--git = "https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs"
--
--[dependencies.pango]
--git = "https://github.com/gtk-rs/gtk3-rs"
--features = ["v1_44"]
Index: devel/cargo-c/Makefile
===================================================================
--- devel/cargo-c/Makefile
+++ devel/cargo-c/Makefile
@@ -1,6 +1,7 @@
PORTNAME= cargo-c
DISTVERSION= 0.9.4
DISTVERSIONSUFFIX= +cargo-0.56
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= CRATESIO
# XXX Teach USES=cargo to have proper default
Index: devel/cargo-c/files/patch-rust-1.56.0
===================================================================
--- /dev/null
+++ devel/cargo-c/files/patch-rust-1.56.0
@@ -0,0 +1,51 @@
+https://github.com/rust-lang/cargo/commit/1e0d564ff01f
+
+--- cargo-crates/cargo-0.56.0/src/cargo/core/features.rs.orig 1970-01-01 00:00:00 UTC
++++ cargo-crates/cargo-0.56.0/src/cargo/core/features.rs
+@@ -645,7 +645,6 @@ unstable_cli_options!(
+ panic_abort_tests: bool = ("Enable support to run tests with -Cpanic=abort"),
+ host_config: bool = ("Enable the [host] section in the .cargo/config.toml file"),
+ target_applies_to_host: bool = ("Enable the `target-applies-to-host` key in the .cargo/config.toml file"),
+- patch_in_config: bool = ("Allow `[patch]` sections in .cargo/config.toml files"),
+ rustdoc_map: bool = ("Allow passing external documentation mappings to rustdoc"),
+ separate_nightlies: bool = (HIDDEN),
+ terminal_width: Option<Option<usize>> = ("Provide a terminal width to rustc for error truncation"),
+@@ -689,6 +688,8 @@ const STABILIZED_FEATURES: &str = "The new feature res
+ See https://doc.rust-lang.org/nightly/cargo/reference/features.html#feature-resolver-version-2 \
+ for more information.";
+
++const STABILIZED_PATCH_IN_CONFIG: &str = "The patch-in-config feature is now always enabled.";
++
+ fn deserialize_build_std<'de, D>(deserializer: D) -> Result<Option<Vec<String>>, D::Error>
+ where
+ D: serde::Deserializer<'de>,
+@@ -834,7 +835,6 @@ impl CliUnstable {
+ "configurable-env" => self.configurable_env = parse_empty(k, v)?,
+ "host-config" => self.host_config = parse_empty(k, v)?,
+ "target-applies-to-host" => self.target_applies_to_host = parse_empty(k, v)?,
+- "patch-in-config" => self.patch_in_config = parse_empty(k, v)?,
+ "features" => {
+ // For now this is still allowed (there are still some
+ // unstable options like "compare"). This should be removed at
+@@ -869,6 +869,7 @@ impl CliUnstable {
+ "config-profile" => stabilized_warn(k, "1.43", STABILIZED_CONFIG_PROFILE),
+ "crate-versions" => stabilized_warn(k, "1.47", STABILIZED_CRATE_VERSIONS),
+ "package-features" => stabilized_warn(k, "1.51", STABILIZED_PACKAGE_FEATURES),
++ "patch-in-config" => stabilized_warn(k, "1.56", STABILIZED_PATCH_IN_CONFIG),
+ "future-incompat-report" => self.future_incompat_report = parse_empty(k, v)?,
+ _ => bail!("unknown `-Z` flag specified: {}", k),
+ }
+--- cargo-crates/cargo-0.56.0/src/cargo/core/workspace.rs.orig 1970-01-01 00:00:00 UTC
++++ cargo-crates/cargo-0.56.0/src/cargo/core/workspace.rs
+@@ -362,11 +362,6 @@ impl<'cfg> Workspace<'cfg> {
+ BTreeMap<String, BTreeMap<String, TomlDependency<ConfigRelativePath>>>,
+ > = self.config.get("patch")?;
+
+- if config_patch.is_some() && !self.config.cli_unstable().patch_in_config {
+- self.config.shell().warn("`[patch]` in cargo config was ignored, the -Zpatch-in-config command-line flag is required".to_owned())?;
+- return Ok(HashMap::new());
+- }
+-
+ let source = SourceId::for_path(self.root())?;
+
+ let mut warnings = Vec::new();
Index: dns/dog/Makefile
===================================================================
--- dns/dog/Makefile
+++ dns/dog/Makefile
@@ -15,7 +15,6 @@
USES= cargo ssl
USE_GITHUB= yes
GH_ACCOUNT= ogham
-GH_TUPLE= llogiq:mutagen:c7abc956a10e8a3e2cc71f21279ea0a42f7b7c10:mutagen
CARGO_CRATES= addr2line-0.14.0 \
adler-0.2.3 \
@@ -89,9 +88,8 @@
winapi-0.3.9 \
winapi-i686-pc-windows-gnu-0.4.0 \
winapi-x86_64-pc-windows-gnu-0.4.0 \
- winreg-0.6.2
-CARGO_USE_GITHUB= yes
-CARGO_GIT_SUBDIR= mutagen:mutagen:mutagen
+ winreg-0.6.2 \
+ mutagen,mutagen-core,mutagen-transform@git+https://github.com/llogiq/mutagen\#c7abc956a10e8a3e2cc71f21279ea0a42f7b7c10
PORTDOCS= README.md
Index: games/abstreet/Makefile
===================================================================
--- games/abstreet/Makefile
+++ games/abstreet/Makefile
@@ -20,10 +20,6 @@
MAKE_ENV= ABST_DATA_DIR=${DATADIR} ABST_PLAYER_HOME_DIR=1
-GH_TUPLE= dabreegster:earcutr:e029a11b66fd27f2ca2fd457dd37c403485ebba1:earcutr \
- dabreegster:seattle_traffic_signals:c2b33cc7fc4b922c8d25d88a8b07fb824d235b9d:seattle_traffic_signals \
- easbar:fast_paths:192ae1997f9857791826ac5ed16892b2f692920c:fast_paths \
- michaelkirk:winit:a87ae2661263ff241e8868cbf3ce65aab205863a:michaelkirk_winit
CARGO_CRATES= RustyXML-0.1.1 \
aabb-quadtree-0.1.0 \
adler32-1.0.4 \
@@ -452,8 +448,11 @@
xmlparser-0.13.2 \
xmltree-0.10.0 \
xmlwriter-0.1.0 \
- zip-0.5.5
-CARGO_USE_GITHUB= yes
+ zip-0.5.5 \
+ seattle_traffic_signals@git+https://github.com/dabreegster/seattle_traffic_signals\#c2b33cc7fc4b922c8d25d88a8b07fb824d235b9d \
+ fast_paths@git+https://github.com/easbar/fast_paths\#192ae1997f9857791826ac5ed16892b2f692920c \
+ earcutr@git+https://github.com/dabreegster/earcutr?branch=patch-1\#e029a11b66fd27f2ca2fd457dd37c403485ebba1 \
+ winit@git+https://github.com/michaelkirk/winit?branch=mkirk/fix-stdweb-dpi\#a87ae2661263ff241e8868cbf3ce65aab205863a
BINARY_ALIAS= python3=${PYTHON_CMD}
Index: games/anki/Makefile
===================================================================
--- games/anki/Makefile
+++ games/anki/Makefile
@@ -60,12 +60,6 @@
# Translation files
GH_TUPLE= ankitects:anki-core-i18n:56d46d6:ftlrslib \
ankitects:anki-desktop-ftl:5359f84:ftlextra
-# Cargo crates
-GH_TUPLE+= ankitects:hyper-timeout:0cb6f7d14c62819e37cd221736f8b0555e823712:hypertimeout \
- ankitects:linkcheck:2f20798ce521cc594d510d4e417e76d5eac04d4b:linkcheck \
- ankitects:reqwest:7591444614de02b658ddab125efba7b2bb4e2335:reqwest \
- ankitects:tokio-io-timeout:1ee0892217e9a76bba4bb369ec5fab8854935a3c:tokioiotimeout \
- timothee-haudebourg:pct-str:4adccd8d4a222ab2672350a102f06ae832a0572d:pctstr
# Bazel Skylib framework and sets of bazel rules
GH_TUPLE+= bazelbuild:bazel-skylib:e59b620:bzlskylib \
bazelbuild:rules_cc:40548a2:bzlrcc \
@@ -403,8 +397,12 @@
winreg-0.7.0 \
wyz-0.2.0 \
xml5ever-0.16.1 \
- zip-0.5.13
-CARGO_USE_GITHUB= yes
+ zip-0.5.13 \
+ reqwest@git+https://github.com/ankitects/reqwest.git?rev=7591444614de02b658ddab125efba7b2bb4e2335\#7591444614de02b658ddab125efba7b2bb4e2335 \
+ hyper-timeout@git+https://github.com/ankitects/hyper-timeout.git?rev=0cb6f7d14c62819e37cd221736f8b0555e823712\#0cb6f7d14c62819e37cd221736f8b0555e823712 \
+ linkcheck@git+https://github.com/ankitects/linkcheck.git?rev=2f20798ce521cc594d510d4e417e76d5eac04d4b\#2f20798ce521cc594d510d4e417e76d5eac04d4b \
+ tokio-io-timeout@git+https://github.com/ankitects/tokio-io-timeout.git?rev=1ee0892217e9a76bba4bb369ec5fab8854935a3c\#1ee0892217e9a76bba4bb369ec5fab8854935a3c \
+ pct-str@git+https://github.com/timothee-haudebourg/pct-str.git?rev=4adccd8d4a222ab2672350a102f06ae832a0572d\#4adccd8d4a222ab2672350a102f06ae832a0572d
CARGO_CARGOTOML= ${WRKSRC}/pylib/rsbridge/Cargo.toml
CARGO_BUILD= no
@@ -489,8 +487,6 @@
@${MV} ${WRKSRC}/pip/pyqt5/defs.bzl ${WRKSRC}/pip/pyqt5/defs.bzl.dist
@${MV} ${WRKSRC}/pylib/rsbridge/BUILD.bazel ${WRKSRC}/pylib/rsbridge/BUILD.bazel.dist
@${MV} ${WRKSRC}/rslib/i18n/BUILD.bazel ${WRKSRC}/rslib/i18n/BUILD.bazel.dist
- # Required for a successful Rust compilation
- @${MV} ${WRKSRC}/Cargo.lock ${WRKSRC}/Cargo.lock.dist
# Copy the replacement files
@${CP} ${FILESDIR}/bazel/repos.bzl ${WRKSRC}/
@${CP} ${FILESDIR}/bazel/pyqt5.bzl ${WRKSRC}/pip/pyqt5/defs.bzl
Index: games/veloren/Makefile
===================================================================
--- games/veloren/Makefile
+++ games/veloren/Makefile
@@ -23,25 +23,8 @@
USES= cargo python:3.4+,build xorg
USE_XORG= xcb
-USE_GITHUB= nodefault
-GH_TUPLE= hasenbanck:egui_wgpu_backend:63a002c6a9b6c016e45806dd065864431caab621:egui_wgpu_backend \
- gfx-rs:gfx:27a1dae3796d33d23812f2bb8c7e3b5aea18b521:gfxauxil \
- Imberflur:iced:18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb:iced_core \
- gfx-rs:naga:057d03ad86f18e3bb3866b20901d8d4e892dd3d6:naga \
- xMAC94x:portpicker-rs:df6b37872f3586ac3b21d08b56c8ec7cd92fb172:portpicker \
- amethyst:specs:f985bec5d456f7b0dd8aae99848f9473c2cd9d46:specs \
- fdehau:tui-rs:54b841fab6cfdb38e8dc1382176e965787964b4c:tui \
- gfx-rs:wgpu:a92b8549a8e2cb9dac781bafc5ed32828f3caf46:wgpu \
- Imberflur:wgpu-profiler:b156eb145bc223386ef344860d9b33b3c181650c:wgpuprofiler \
- Frinksy:rust-xkbcommon-sys:8f615dd6cd90a4ab77c45627830dde49b592b9b5:xkbcommonsys
USE_GITLAB= yes
GL_COMMIT= e4716147a7356eb13088e7d74ace3ccdcb5cd900
-GL_TUPLE= veloren:auth:fb3dcbc4962b367253f8f2f92760ef44d2679c9a:authcommon \
- veloren:conrod:ca9fd429ca7db854e018acc6dcb2cd8abd9e070d:conrod_core \
- Frinksy:keyboard-keynames:721c8b301f8003332d0cc767ab2649fdd330e842:keyboardkeynames \
- veloren:refinery:8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e:refinery \
- veloren:specs-idvs:8be2abcddf8f524cb5876e8dd20a7e47cfaf7573:specsidvs \
- veloren:vek:df6842cc874a697dec8896c66851817e744af7e8:vek
CARGO_ENV= VELOREN_USERDATA_STRATEGY=system SHADERC_LIB_DIR="${LOCALBASE}/lib"
PLIST_FILES= bin/${PORTNAME}-server-cli \
bin/${PORTNAME}-voxygen \
@@ -661,23 +644,24 @@
xkb-0.2.1 \
xkbcommon-sys-0.7.5 \
xml-rs-0.8.3 \
- yasna-0.4.0
-CARGO_USE_GITHUB= yes
-CARGO_USE_GITLAB= yes
-CARGO_GIT_SUBDIR= authcommon:authc:authc \
- conrod_core:conrod_core:conrod_core \
- conrod_core:conrod_winit:backends/conrod_winit \
- gfxauxil:gfx-backend-dx11:src/backend/dx11 \
- gfxauxil:gfx-backend-dx12:src/backend/dx12 \
- gfxauxil:gfx-backend-empty:src/backend/empty \
- gfxauxil:gfx-backend-gl:src/backend/gl \
- gfxauxil:gfx-backend-metal:src/backend/metal \
- gfxauxil:gfx-backend-vulkan:src/backend/vulkan \
- gfxauxil:hal:src/hal \
- iced_core:iced:native \
- iced_core:iced_winit:winit \
- refinery:refinery:refinery \
- wgpu:wgpu:wgpu
+ yasna-0.4.0 \
+ wgpu-profiler@git+https://github.com/Imberflur/wgpu-profiler\#b156eb145bc223386ef344860d9b33b3c181650c \
+ tui@git+https://github.com/fdehau/tui-rs.git?branch=paragraph-scroll\#54b841fab6cfdb38e8dc1382176e965787964b4c \
+ vek@git+https://gitlab.com/veloren/vek.git?branch=fix_intrinsics2\#df6842cc874a697dec8896c66851817e744af7e8 \
+ specs-idvs@git+https://gitlab.com/veloren/specs-idvs.git?rev=8be2abcddf8f524cb5876e8dd20a7e47cfaf7573\#8be2abcddf8f524cb5876e8dd20a7e47cfaf7573 \
+ xkbcommon-sys@git+https://github.com/Frinksy/rust-xkbcommon-sys.git?rev=8f615dd6cd90a4ab77c45627830dde49b592b9b5\#8f615dd6cd90a4ab77c45627830dde49b592b9b5 \
+ conrod_core,conrod_derive,conrod_winit@git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7\#ca9fd429ca7db854e018acc6dcb2cd8abd9e070d \
+ keyboard-keynames@git+https://gitlab.com/Frinksy/keyboard-keynames.git?rev=721c8b301f8003332d0cc767ab2649fdd330e842\#721c8b301f8003332d0cc767ab2649fdd330e842 \
+ auth-common,authc@git+https://gitlab.com/veloren/auth.git?rev=fb3dcbc4962b367253f8f2f92760ef44d2679c9a\#fb3dcbc4962b367253f8f2f92760ef44d2679c9a \
+ iced_core,iced_futures,iced_graphics,iced_native,iced_style,iced_winit@git+https://github.com/Imberflur/iced\#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb \
+ specs,specs-derive@git+https://github.com/amethyst/specs.git?rev=f985bec5d456f7b0dd8aae99848f9473c2cd9d46\#f985bec5d456f7b0dd8aae99848f9473c2cd9d46 \
+ naga@git+https://github.com/gfx-rs/naga\#057d03ad86f18e3bb3866b20901d8d4e892dd3d6 \
+ gfx-auxil,gfx-backend-dx11,gfx-backend-dx12,gfx-backend-empty,gfx-backend-gl,gfx-backend-metal,gfx-backend-vulkan,gfx-hal,range-alloc@git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521\#27a1dae3796d33d23812f2bb8c7e3b5aea18b521 \
+ wgpu,wgpu-core,wgpu-types@git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46\#a92b8549a8e2cb9dac781bafc5ed32828f3caf46 \
+ refinery,refinery-core,refinery-macros@git+https://gitlab.com/veloren/refinery.git?rev=8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e\#8ecf4b4772d791e6c8c0a3f9b66a7530fad1af3e \
+ portpicker@git+https://github.com/xMAC94x/portpicker-rs?rev=df6b37872f3586ac3b21d08b56c8ec7cd92fb172\#df6b37872f3586ac3b21d08b56c8ec7cd92fb172 \
+ egui_wgpu_backend@git+https://github.com/hasenbanck/egui_wgpu_backend.git?rev=63a002c6a9b6c016e45806dd065864431caab621\#63a002c6a9b6c016e45806dd065864431caab621
+
# https://gitlab.com/veloren/veloren/issues/264
CARGO_ENV+= RUSTC_BOOTSTRAP=1
# XXX https://github.com/rust-lang/cargo/issues/4101
Index: games/veloren/files/patch-rust-1.56
===================================================================
--- /dev/null
+++ games/veloren/files/patch-rust-1.56
@@ -0,0 +1,64 @@
+https://gitlab.com/veloren/veloren/-/commit/88685cc01650
+https://gitlab.com/veloren/veloren/-/commit/2a82405df26a
+https://github.com/rust-lang/packed_simd/commit/45d5347a0d21
+
+--- cargo-crates/packed_simd_2-0.3.5/src/lib.rs.orig 1970-01-01 00:00:00 UTC
++++ cargo-crates/packed_simd_2-0.3.5/src/lib.rs
+@@ -212,7 +212,7 @@
+ //! guide](https://rust-lang-nursery.github.io/packed_simd/perf-guide/)
+
+ #![feature(
+- const_generics,
++ adt_const_params,
+ repr_simd,
+ rustc_attrs,
+ platform_intrinsics,
+--- common/net/src/lib.rs.orig 2021-09-10 20:02:36 UTC
++++ common/net/src/lib.rs
+@@ -1,8 +1,7 @@
+ #![allow(incomplete_features)]
+ #![feature(
+- const_generics,
++ generic_const_exprs,
+ const_fn_floating_point_arithmetic,
+- const_evaluatable_checked
+ )]
+ pub mod msg;
+ pub mod sync;
+--- common/src/lib.rs.orig 2021-09-10 20:02:36 UTC
++++ common/src/lib.rs
+@@ -7,7 +7,6 @@
+ arbitrary_enum_discriminant,
+ associated_type_defaults,
+ bool_to_option,
+- const_generics,
+ fundamental,
+ iter_map_while,
+ label_break_value,
+--- voxygen/anim/src/lib.rs.orig 2021-09-10 20:02:36 UTC
++++ voxygen/anim/src/lib.rs
+@@ -1,4 +1,3 @@
+-#![feature(const_generics)]
+ #![feature(generic_associated_types)]
+ #![allow(incomplete_features)]
+ #[cfg(all(feature = "be-dyn-lib", feature = "use-dyn-lib"))]
+--- voxygen/src/lib.rs.orig 2021-09-10 20:02:36 UTC
++++ voxygen/src/lib.rs
+@@ -7,7 +7,6 @@
+ array_methods,
+ array_zip,
+ bool_to_option,
+- const_generics,
+ drain_filter,
+ once_cell,
+ trait_alias
+--- world/src/lib.rs.orig 2021-09-10 20:02:36 UTC
++++ world/src/lib.rs
+@@ -10,7 +10,6 @@
+ #![feature(
+ arbitrary_enum_discriminant,
+ bool_to_option,
+- const_generics,
+ const_panic,
+ label_break_value,
+ array_map
Index: lang/rust-bootstrap/Makefile
===================================================================
--- lang/rust-bootstrap/Makefile
+++ lang/rust-bootstrap/Makefile
@@ -2,7 +2,7 @@
# to upload them to ~/public_distfiles on freefall in preparation
# for the next lang/rust update.
PORTNAME= rust
-PORTVERSION= 1.55.0
+PORTVERSION= 1.56.0
CATEGORIES= lang
MASTER_SITES= https://static.rust-lang.org/dist/
PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}-
Index: lang/rust-bootstrap/distinfo
===================================================================
--- lang/rust-bootstrap/distinfo
+++ lang/rust-bootstrap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631002417
-SHA256 (rust/rustc-1.55.0-src.tar.xz) = aec85a7c1f40b7a40818a58ae13632f8a12cfaa4d3e2a10957d0e9d16dfdd556
-SIZE (rust/rustc-1.55.0-src.tar.xz) = 117197580
+TIMESTAMP = 1634575103
+SHA256 (rust/rustc-1.56.0-src.tar.xz) = f13468889833c88e744ad579c5d8fbb7ecb53216159b54481a90e5dcdaa9e320
+SIZE (rust/rustc-1.56.0-src.tar.xz) = 121802340
Index: lang/rust/Makefile
===================================================================
--- lang/rust/Makefile
+++ lang/rust/Makefile
@@ -1,7 +1,7 @@
# Created by: Jyun-Yan You <jyyou@cs.nctu.edu.tw>
PORTNAME= rust
-PORTVERSION?= 1.55.0
+PORTVERSION?= 1.56.0
PORTREVISION?= 0
CATEGORIES= lang
MASTER_SITES= https://static.rust-lang.org/dist/:src \
@@ -52,8 +52,6 @@
OPTIONS_DEFINE= DOCS GDB SOURCES WASM
OPTIONS_DEFAULT= SOURCES WASM
-OPTIONS_EXCLUDE_armv6= DOCS
-OPTIONS_EXCLUDE_armv7= DOCS
GDB_DESC= Install ports gdb (necessary for debugging rust programs)
SOURCES_DESC= Install source files
@@ -68,10 +66,8 @@
WASM_VARS_OFF= _RUST_BUILD_WASM=false
# See WRKSRC/src/stage0.txt for the date and version values.
-BOOTSTRAPS_DATE?= 2021-07-29
-BOOTSTRAPS_DATE_powerpc?= 2021-09-09
-RUST_BOOTSTRAP_VERSION?= 1.54.0
-RUST_BOOTSTRAP_VERSION_powerpc?= 1.55.0
+BOOTSTRAPS_DATE?= 2021-09-09
+RUST_BOOTSTRAP_VERSION?= 1.55.0
BOOTSTRAPS_SUFFIX?= ${BOOTSTRAPS_SUFFIX_${ARCH}}
BOOTSTRAPS_SUFFIX_powerpc64?= -${PPC_ABI:tl}
@@ -170,7 +166,6 @@
@${ECHO_CMD} 'sysconfdir="${PREFIX}/etc"' >> ${WRKSRC}/config.toml
@${ECHO_CMD} '[rust]' >> ${WRKSRC}/config.toml
@${ECHO_CMD} 'channel="${PKGNAMESUFFIX:Ustable:S/^-//}"' >> ${WRKSRC}/config.toml
- @${ECHO_CMD} 'codegen-units=1' >> ${WRKSRC}/config.toml
@${ECHO_CMD} 'default-linker="${CC}"' >> ${WRKSRC}/config.toml
@${ECHO_CMD} 'deny-warnings=false' >> ${WRKSRC}/config.toml
@${ECHO_CMD} 'verbose-tests=true' >> ${WRKSRC}/config.toml
Index: lang/rust/distinfo
===================================================================
--- lang/rust/distinfo
+++ lang/rust/distinfo
@@ -1,57 +1,57 @@
-TIMESTAMP = 1631724657
-SHA256 (rust/rustc-1.55.0-src.tar.xz) = aec85a7c1f40b7a40818a58ae13632f8a12cfaa4d3e2a10957d0e9d16dfdd556
-SIZE (rust/rustc-1.55.0-src.tar.xz) = 117197580
-SHA256 (rust/2021-07-29/rustc-1.54.0-aarch64-unknown-freebsd.tar.xz) = 56efb59e3f7147d0c9ee2bb471737e5779cb1ea5e73234a64dc6291e666e49a3
-SIZE (rust/2021-07-29/rustc-1.54.0-aarch64-unknown-freebsd.tar.xz) = 46151160
-SHA256 (rust/2021-07-29/rust-std-1.54.0-aarch64-unknown-freebsd.tar.xz) = 9fa671383ab60de43df07e08c0b0615854e769be6dc8cacafbb1fd518aba3ea7
-SIZE (rust/2021-07-29/rust-std-1.54.0-aarch64-unknown-freebsd.tar.xz) = 18330268
-SHA256 (rust/2021-07-29/cargo-1.54.0-aarch64-unknown-freebsd.tar.xz) = c3de6774bfdad350d378e33ff1b8798018656aae7f5d07a2db4863527c580adb
-SIZE (rust/2021-07-29/cargo-1.54.0-aarch64-unknown-freebsd.tar.xz) = 4403188
-SHA256 (rust/2021-07-29/rustc-1.54.0-x86_64-unknown-freebsd.tar.xz) = 5a8ad87eac3c0b829f2c7a9b29a5f06cff07523fd2ea95e9cdb30df997b905ab
-SIZE (rust/2021-07-29/rustc-1.54.0-x86_64-unknown-freebsd.tar.xz) = 41303952
-SHA256 (rust/2021-07-29/rust-std-1.54.0-x86_64-unknown-freebsd.tar.xz) = 7735c8fc42be576cb8decbce68ce57ba585213f2d7ae3d87cc1c2504202ef2f2
-SIZE (rust/2021-07-29/rust-std-1.54.0-x86_64-unknown-freebsd.tar.xz) = 19183104
-SHA256 (rust/2021-07-29/cargo-1.54.0-x86_64-unknown-freebsd.tar.xz) = 397d2b9698c19b5777a88e72a900ea2ab2b3e44574beecb952509fff28da306e
-SIZE (rust/2021-07-29/cargo-1.54.0-x86_64-unknown-freebsd.tar.xz) = 5142356
-SHA256 (rust/2021-07-29/rustc-1.54.0-armv6-unknown-freebsd.tar.xz) = 2f59d74563a8c4009de3a8a34772d42d9e101985ba6901fe9eec6e602a70e7fa
-SIZE (rust/2021-07-29/rustc-1.54.0-armv6-unknown-freebsd.tar.xz) = 46926436
-SHA256 (rust/2021-07-29/rust-std-1.54.0-armv6-unknown-freebsd.tar.xz) = f4897bd301f9e52047084ce86825129c8d6325a6e18ff41acfc83a4ea3099983
-SIZE (rust/2021-07-29/rust-std-1.54.0-armv6-unknown-freebsd.tar.xz) = 17622324
-SHA256 (rust/2021-07-29/cargo-1.54.0-armv6-unknown-freebsd.tar.xz) = 50052a2f091bf767a4de94abc65a517ad925bd3242493c19d43d9d63304828dd
-SIZE (rust/2021-07-29/cargo-1.54.0-armv6-unknown-freebsd.tar.xz) = 4551464
-SHA256 (rust/2021-07-29/rustc-1.54.0-armv7-unknown-freebsd.tar.xz) = 3927fc48020b3b94bdbaf160720664b4a6cdeb6f96b3415d7026326873e20368
-SIZE (rust/2021-07-29/rustc-1.54.0-armv7-unknown-freebsd.tar.xz) = 46448620
-SHA256 (rust/2021-07-29/rust-std-1.54.0-armv7-unknown-freebsd.tar.xz) = bc80b15a9ba60c66250d1b31fb610941205b3a2d2787021a5bdb96e667b28d45
-SIZE (rust/2021-07-29/rust-std-1.54.0-armv7-unknown-freebsd.tar.xz) = 18206828
-SHA256 (rust/2021-07-29/cargo-1.54.0-armv7-unknown-freebsd.tar.xz) = b0d89e13cc35a943ba3da5de5247d97d6b3dac0abcd331736bc9176e413e8eee
-SIZE (rust/2021-07-29/cargo-1.54.0-armv7-unknown-freebsd.tar.xz) = 4542272
-SHA256 (rust/2021-07-29/rustc-1.54.0-i686-unknown-freebsd.tar.xz) = 6cf57c022f8f8ca41ce89ef5497d0dda7d371293be7ee4e5dccb3675ea9f72fc
-SIZE (rust/2021-07-29/rustc-1.54.0-i686-unknown-freebsd.tar.xz) = 49120788
-SHA256 (rust/2021-07-29/rust-std-1.54.0-i686-unknown-freebsd.tar.xz) = fcb2575667eaf5c1a1bd96fbd544f7d79704faae90eadcdec9229119abfdbf28
-SIZE (rust/2021-07-29/rust-std-1.54.0-i686-unknown-freebsd.tar.xz) = 19086512
-SHA256 (rust/2021-07-29/cargo-1.54.0-i686-unknown-freebsd.tar.xz) = c0fc5501eaea33ec266d1c0fa21c1fb5075896091f54fed4b70ad850836a12d7
-SIZE (rust/2021-07-29/cargo-1.54.0-i686-unknown-freebsd.tar.xz) = 5219840
+TIMESTAMP = 1634575102
+SHA256 (rust/rustc-1.56.0-src.tar.xz) = f13468889833c88e744ad579c5d8fbb7ecb53216159b54481a90e5dcdaa9e320
+SIZE (rust/rustc-1.56.0-src.tar.xz) = 121802340
+SHA256 (rust/2021-09-09/rustc-1.55.0-aarch64-unknown-freebsd.tar.xz) = 29560cf6b45b4dc9a128c17f9d901b54b4d1d3d9cad4d0bdc05aca194b41dd3f
+SIZE (rust/2021-09-09/rustc-1.55.0-aarch64-unknown-freebsd.tar.xz) = 46686528
+SHA256 (rust/2021-09-09/rust-std-1.55.0-aarch64-unknown-freebsd.tar.xz) = eec90b645eefefb3a052be28665cb737f76b660ae2db9a1393b50461ef5ce348
+SIZE (rust/2021-09-09/rust-std-1.55.0-aarch64-unknown-freebsd.tar.xz) = 18828192
+SHA256 (rust/2021-09-09/cargo-1.55.0-aarch64-unknown-freebsd.tar.xz) = 6285f42cd47a6c4ab94a43a6f46094f4a73218dd40dc678ac13d6f378975a137
+SIZE (rust/2021-09-09/cargo-1.55.0-aarch64-unknown-freebsd.tar.xz) = 4479688
+SHA256 (rust/2021-09-09/rustc-1.55.0-x86_64-unknown-freebsd.tar.xz) = 522f5639daa8b4275bbf1479c1a5b2d6c374020b048eefd9bd4b05e9802a4805
+SIZE (rust/2021-09-09/rustc-1.55.0-x86_64-unknown-freebsd.tar.xz) = 42185720
+SHA256 (rust/2021-09-09/rust-std-1.55.0-x86_64-unknown-freebsd.tar.xz) = 99fce10914ccd14f205c96eb80d102cd79a84133183834c5df2b8c5543024194
+SIZE (rust/2021-09-09/rust-std-1.55.0-x86_64-unknown-freebsd.tar.xz) = 19530980
+SHA256 (rust/2021-09-09/cargo-1.55.0-x86_64-unknown-freebsd.tar.xz) = 4b700830a5482979b201ccc6b0b14fe5e6db28a27a70780a305f5be3f452a307
+SIZE (rust/2021-09-09/cargo-1.55.0-x86_64-unknown-freebsd.tar.xz) = 5199584
+SHA256 (rust/2021-09-09/rustc-1.55.0-armv6-unknown-freebsd.tar.xz) = 18f3396cde609f353f1bdde6ae1f669581de1ec9a5a396d5868917f249643155
+SIZE (rust/2021-09-09/rustc-1.55.0-armv6-unknown-freebsd.tar.xz) = 47608836
+SHA256 (rust/2021-09-09/rust-std-1.55.0-armv6-unknown-freebsd.tar.xz) = e086292a71fc513ace373f0208affe402ac4488743e6c2929d92c4d7e0997761
+SIZE (rust/2021-09-09/rust-std-1.55.0-armv6-unknown-freebsd.tar.xz) = 17897508
+SHA256 (rust/2021-09-09/cargo-1.55.0-armv6-unknown-freebsd.tar.xz) = 23f7040f4cb4fcfacf4795449804a8b64db8aa21aac4eb4c5aa6de8adc84c159
+SIZE (rust/2021-09-09/cargo-1.55.0-armv6-unknown-freebsd.tar.xz) = 4607048
+SHA256 (rust/2021-09-09/rustc-1.55.0-armv7-unknown-freebsd.tar.xz) = d067d57b587b342680f0ca18ab1f2af100803dc4bd2b824a8033421b156b14df
+SIZE (rust/2021-09-09/rustc-1.55.0-armv7-unknown-freebsd.tar.xz) = 47647600
+SHA256 (rust/2021-09-09/rust-std-1.55.0-armv7-unknown-freebsd.tar.xz) = c6d71af3d485a67bf48e2277765a22584f52724cd9682782e052a103d816dc6d
+SIZE (rust/2021-09-09/rust-std-1.55.0-armv7-unknown-freebsd.tar.xz) = 18488040
+SHA256 (rust/2021-09-09/cargo-1.55.0-armv7-unknown-freebsd.tar.xz) = 16a16a0d670d6e6e964994a39e531d7eef9e6861806ca9de1d34a3b3ca553394
+SIZE (rust/2021-09-09/cargo-1.55.0-armv7-unknown-freebsd.tar.xz) = 4589416
+SHA256 (rust/2021-09-09/rustc-1.55.0-i686-unknown-freebsd.tar.xz) = b865fc32e5e91111fd2ad90fd893923910cd46e5ab457a8ded6397b74e610d96
+SIZE (rust/2021-09-09/rustc-1.55.0-i686-unknown-freebsd.tar.xz) = 50347892
+SHA256 (rust/2021-09-09/rust-std-1.55.0-i686-unknown-freebsd.tar.xz) = 71e460d7610592e41e8d5e326eb970b2c5584178abbf7c26d8fa215c16398f04
+SIZE (rust/2021-09-09/rust-std-1.55.0-i686-unknown-freebsd.tar.xz) = 19393280
+SHA256 (rust/2021-09-09/cargo-1.55.0-i686-unknown-freebsd.tar.xz) = 94e8f12be0f7c491055fa4f88476d42f7fe4c4775993a7465e6731e27f9b01d6
+SIZE (rust/2021-09-09/cargo-1.55.0-i686-unknown-freebsd.tar.xz) = 5271776
SHA256 (rust/2021-09-09/rustc-1.55.0-powerpc-unknown-freebsd.tar.xz) = 7c3d2cab681b09aac0711c09a8b3f8d4e178f368cfe5ba51b067b07ca830b20b
SIZE (rust/2021-09-09/rustc-1.55.0-powerpc-unknown-freebsd.tar.xz) = 49009564
SHA256 (rust/2021-09-09/rust-std-1.55.0-powerpc-unknown-freebsd.tar.xz) = c20d673c868da9c0b3fa17d6226974151efe4dd6422399b52ba4aa57707541b7
SIZE (rust/2021-09-09/rust-std-1.55.0-powerpc-unknown-freebsd.tar.xz) = 17595980
SHA256 (rust/2021-09-09/cargo-1.55.0-powerpc-unknown-freebsd.tar.xz) = a441ccfab4501d1ed2cb8d67bc2c90cacae4d98933c6c82e1ef51cb5a0b3c8c2
SIZE (rust/2021-09-09/cargo-1.55.0-powerpc-unknown-freebsd.tar.xz) = 5015316
-SHA256 (rust/2021-07-29/rustc-1.54.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = e8e053a8342f57ddbfbb3f4c214f36c00fdccbf0b2df606deb3bad1549b763c0
-SIZE (rust/2021-07-29/rustc-1.54.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 55871324
-SHA256 (rust/2021-07-29/rust-std-1.54.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = bcbf8d84580446a715ba398778f56e437d97f62ce30c8c4c59140eb8b597fff7
-SIZE (rust/2021-07-29/rust-std-1.54.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 17444940
-SHA256 (rust/2021-07-29/cargo-1.54.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 149aa51d0abcbe8774438a016df30707c58dab0fd2d788d726db209259163292
-SIZE (rust/2021-07-29/cargo-1.54.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 5025436
-SHA256 (rust/2021-07-29/rustc-1.54.0-powerpc64le-unknown-freebsd.tar.xz) = 77b45e9b81827a2aa5a70902d1529c5f44e29c176365d2ac8d66a0a0c9e2dd64
-SIZE (rust/2021-07-29/rustc-1.54.0-powerpc64le-unknown-freebsd.tar.xz) = 49194104
-SHA256 (rust/2021-07-29/rust-std-1.54.0-powerpc64le-unknown-freebsd.tar.xz) = f0442fd38bdd40e547989a897826dc0536b98cccec6f62e6e24aaab03e87733f
-SIZE (rust/2021-07-29/rust-std-1.54.0-powerpc64le-unknown-freebsd.tar.xz) = 17547780
-SHA256 (rust/2021-07-29/cargo-1.54.0-powerpc64le-unknown-freebsd.tar.xz) = 3336d8516385817977129bc287df36adb3f750da906c7fb6d3cd490795acbd69
-SIZE (rust/2021-07-29/cargo-1.54.0-powerpc64le-unknown-freebsd.tar.xz) = 4956324
-SHA256 (rust/2021-07-29/rustc-1.54.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 5d1e6e16d853ac6a2f724c556f613201a6e156da079f85d1e9f4c06feee63a10
-SIZE (rust/2021-07-29/rustc-1.54.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 47172304
-SHA256 (rust/2021-07-29/rust-std-1.54.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 6fd90639d63bce2af5240334387194117c4c78442227f90870d27ec11c29c7e2
-SIZE (rust/2021-07-29/rust-std-1.54.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 17413108
-SHA256 (rust/2021-07-29/cargo-1.54.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = bdc28cc18eb4118faaa952e89c39d6113bf1d30b8b750bd8bd52f1827a6936cd
-SIZE (rust/2021-07-29/cargo-1.54.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4714772
+SHA256 (rust/2021-09-09/rustc-1.55.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = a540d96ba3de0ef26c6a25d6dc8cd05cd8ce70cebca3e8133c3b2ecc3b5f08c0
+SIZE (rust/2021-09-09/rustc-1.55.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 56762480
+SHA256 (rust/2021-09-09/rust-std-1.55.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = b1781903a25f6b804013a6bf69cc00c8a26279335f7d81776a08db4cfd1cc16d
+SIZE (rust/2021-09-09/rust-std-1.55.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 17733272
+SHA256 (rust/2021-09-09/cargo-1.55.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 9c45a3c2e5f0aa4f70d5be85e9791e29ea953d4b2229bd8f7e94f26730f5812b
+SIZE (rust/2021-09-09/cargo-1.55.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 5060744
+SHA256 (rust/2021-09-09/rustc-1.55.0-powerpc64le-unknown-freebsd.tar.xz) = 73ffacdd8a1b41863464b273cdfaf659492325b25e72ec839c8d2f93c313d860
+SIZE (rust/2021-09-09/rustc-1.55.0-powerpc64le-unknown-freebsd.tar.xz) = 49886844
+SHA256 (rust/2021-09-09/rust-std-1.55.0-powerpc64le-unknown-freebsd.tar.xz) = 4d1dd307b6e632c26ccbf2cdfc18ff38a88e4bc4c9bc517b659b20e48304bb86
+SIZE (rust/2021-09-09/rust-std-1.55.0-powerpc64le-unknown-freebsd.tar.xz) = 17887308
+SHA256 (rust/2021-09-09/cargo-1.55.0-powerpc64le-unknown-freebsd.tar.xz) = 9e6c36063fcf4da9e0725207c569189ab1897403be6e6037f80bda03c16e5c12
+SIZE (rust/2021-09-09/cargo-1.55.0-powerpc64le-unknown-freebsd.tar.xz) = 4994980
+SHA256 (rust/2021-09-09/rustc-1.55.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 6811bd7329e9f9a37c33e0e1a213190c5b6c26cb4c573555172d029468f032e7
+SIZE (rust/2021-09-09/rustc-1.55.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 47847012
+SHA256 (rust/2021-09-09/rust-std-1.55.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 892debb299bb150b8798478627ba3652d8c1f8f02b8b720f21697cda9d4af3a4
+SIZE (rust/2021-09-09/rust-std-1.55.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 17689860
+SHA256 (rust/2021-09-09/cargo-1.55.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 1c6ae90f873104cb43be4173cce78d5b354d451fcb37a8dac0538f1e504890d3
+SIZE (rust/2021-09-09/cargo-1.55.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4747664
Index: lang/rust/files/patch-src_bootstrap_install.rs
===================================================================
--- lang/rust/files/patch-src_bootstrap_install.rs
+++ lang/rust/files/patch-src_bootstrap_install.rs
@@ -6,12 +6,12 @@
--- src/bootstrap/install.rs.orig 2021-03-22 17:05:25 UTC
+++ src/bootstrap/install.rs
-@@ -138,7 +138,7 @@ macro_rules! install {
+@@ -133,7 +133,7 @@ macro_rules! install {
}
install!((self, builder, _config),
- Docs, "src/doc", _config.docs, only_hosts: false, {
+ Docs, "src/doc", _config.docs, only_hosts: true, {
- if let Some(tarball) = builder.ensure(dist::Docs { host: self.target }) {
- install_sh(builder, "docs", self.compiler.stage, Some(self.target), &tarball);
- } else {
+ let tarball = builder.ensure(dist::Docs { host: self.target }).expect("missing docs");
+ install_sh(builder, "docs", self.compiler.stage, Some(self.target), &tarball);
+ };
Index: lang/rust/files/patch-src_tools_cargo_src_cargo_util_toml_mod.rs
===================================================================
--- lang/rust/files/patch-src_tools_cargo_src_cargo_util_toml_mod.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-Revert https://github.com/rust-lang/cargo/commit/6f214ac7520d71c480dbe93e3874f14cfdaf594b
-since it break CARGO_USE_GITHUB ports.
-
---- src/tools/cargo/src/cargo/util/toml/mod.rs.orig 2021-09-06 18:42:51 UTC
-+++ src/tools/cargo/src/cargo/util/toml/mod.rs
-@@ -1780,11 +1780,12 @@ impl<P: ResolveToPath> DetailedTomlDependency<P> {
-
- for &(key, key_name) in &git_only_keys {
- if key.is_some() {
-- bail!(
-- "key `{}` is ignored for dependency ({}).",
-- key_name,
-- name_in_toml
-+ let msg = format!(
-+ "key `{}` is ignored for dependency ({}). \
-+ This will be considered an error in future versions",
-+ key_name, name_in_toml
- );
-+ cx.warnings.push(msg)
- }
- }
- }
Index: lang/rust/files/powerpc/patch-compiler_rustc__target_src_spec_mod.rs
===================================================================
--- lang/rust/files/powerpc/patch-compiler_rustc__target_src_spec_mod.rs
+++ /dev/null
@@ -1,10 +0,0 @@
---- compiler/rustc_target/src/spec/mod.rs.orig 2020-09-30 18:06:16.613040000 -0500
-+++ compiler/rustc_target/src/spec/mod.rs 2021-04-23 18:06:47.040460000 -0500
-@@ -765,6 +765,7 @@ fn $module() {
- ("armv6-unknown-freebsd", armv6_unknown_freebsd),
- ("armv7-unknown-freebsd", armv7_unknown_freebsd),
- ("i686-unknown-freebsd", i686_unknown_freebsd),
-+ ("powerpc-unknown-freebsd", powerpc_unknown_freebsd),
- ("powerpc64-unknown-freebsd", powerpc64_unknown_freebsd),
- ("x86_64-unknown-freebsd", x86_64_unknown_freebsd),
-
Index: lang/rust/files/powerpc/patch-compiler_rustc__target_src_spec_powerpc__unknown__freebsd.rs
===================================================================
--- lang/rust/files/powerpc/patch-compiler_rustc__target_src_spec_powerpc__unknown__freebsd.rs
+++ /dev/null
@@ -1,27 +0,0 @@
---- /dev/null 2021-04-24 17:00:30.889028000 -0500
-+++ compiler/rustc_target/src/spec/powerpc_unknown_freebsd.rs 2021-04-24 17:00:25.903298000 -0500
-@@ -0,0 +1,24 @@
-+use crate::abi::Endian;
-+use crate::spec::{LinkerFlavor, RelocModel, Target, TargetOptions};
-+
-+pub fn target() -> Target {
-+ let mut base = super::freebsd_base::opts();
-+ base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("-m32".to_string());
-+ // Extra hint to linker that we are generating secure-PLT code.
-+ base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("--target=powerpc-unknown-freebsd13.0".to_string());
-+ base.max_atomic_width = Some(32);
-+
-+ Target {
-+ llvm_target: "powerpc-unknown-freebsd13.0".to_string(),
-+ pointer_width: 32,
-+ data_layout: "E-m:e-p:32:32-i64:64-n32".to_string(),
-+ arch: "powerpc".to_string(),
-+ options: TargetOptions {
-+ endian: Endian::Big,
-+ features: "+secure-plt".to_string(),
-+ relocation_model: RelocModel::Pic,
-+ mcount: "_mcount".to_string(),
-+ ..base
-+ },
-+ }
-+}
Index: lang/rust/files/powerpc/patch-src_bootstrap_native.rs
===================================================================
--- lang/rust/files/powerpc/patch-src_bootstrap_native.rs
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/bootstrap/native.rs.orig 2021-05-03 20:57:16.000000000 +0000
-+++ src/bootstrap/native.rs 2021-05-06 20:37:55.448200000 +0000
-@@ -118,6 +118,10 @@ impl Step for Llvm {
- let idx = target.triple.find('-').unwrap();
-
- format!("riscv{}{}", &target.triple[5..7], &target.triple[idx..])
-+ } else if self.target.starts_with("powerpc") && self.target.ends_with("freebsd") {
-+ // FreeBSD 13 had incompatible ABI changes on all PowerPC platforms.
-+ // Set the version suffix to 13.0 so the correct target details are used.
-+ format!("{}{}", self.target, "13.0")
- } else {
- target.to_string()
- };
-@@ -274,6 +278,11 @@ impl Step for Llvm {
- if num_linkers > 0 {
- cfg.define("LLVM_PARALLEL_LINK_JOBS", num_linkers.to_string());
- }
-+ }
-+
-+ // Workaround for ppc32 lld limitation
-+ if target == "powerpc-unknown-freebsd" {
-+ cfg.define("CMAKE_EXE_LINKER_FLAGS", "-fuse-ld=bfd");
- }
-
- // http://llvm.org/docs/HowToCrossCompileLLVM.html
Index: lang/rust/files/powerpc/patch-vendor_libc-0.2.93_src_unix_bsd_freebsdlike_freebsd_mod.rs
===================================================================
--- lang/rust/files/powerpc/patch-vendor_libc-0.2.93_src_unix_bsd_freebsdlike_freebsd_mod.rs
+++ /dev/null
@@ -1,12 +0,0 @@
---- vendor/libc-0.2.93/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2020-03-17 20:35:43 UTC
-+++ vendor/libc-0.2.93/src/unix/bsd/freebsdlike/freebsd/mod.rs
-@@ -1486,6 +1486,9 @@ cfg_if! {
- } else if #[cfg(target_arch = "powerpc64")] {
- mod powerpc64;
- pub use self::powerpc64::*;
-+ } else if #[cfg(target_arch = "powerpc")] {
-+ mod powerpc;
-+ pub use self::powerpc::*;
- } else {
- // Unknown target_arch
- }
Index: lang/rust/files/powerpc/patch-vendor_libc-0.2.93_src_unix_bsd_freebsdlike_freebsd_powerpc.rs
===================================================================
--- lang/rust/files/powerpc/patch-vendor_libc-0.2.93_src_unix_bsd_freebsdlike_freebsd_powerpc.rs
+++ /dev/null
@@ -1,50 +0,0 @@
---- vendor/libc-0.2.93/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.orig 2021-06-23 22:40:24 UTC
-+++ vendor/libc-0.2.93/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
-@@ -0,0 +1,47 @@
-+pub type c_char = u8;
-+pub type c_long = i32;
-+pub type c_ulong = u32;
-+pub type wchar_t = i32;
-+pub type time_t = i64;
-+pub type suseconds_t = i32;
-+pub type register_t = i32;
-+
-+s! {
-+ pub struct stat {
-+ pub st_dev: ::dev_t,
-+ pub st_ino: ::ino_t,
-+ pub st_mode: ::mode_t,
-+ pub st_nlink: ::nlink_t,
-+ pub st_uid: ::uid_t,
-+ pub st_gid: ::gid_t,
-+ pub st_rdev: ::dev_t,
-+ pub st_atime: ::time_t,
-+ pub st_atime_nsec: ::c_long,
-+ pub st_mtime: ::time_t,
-+ pub st_mtime_nsec: ::c_long,
-+ pub st_ctime: ::time_t,
-+ pub st_ctime_nsec: ::c_long,
-+ pub st_size: ::off_t,
-+ pub st_blocks: ::blkcnt_t,
-+ pub st_blksize: ::blksize_t,
-+ pub st_flags: ::fflags_t,
-+ pub st_gen: u32,
-+ pub st_lspare: i32,
-+ pub st_birthtime: ::time_t,
-+ pub st_birthtime_nsec: ::c_long,
-+ }
-+}
-+
-+// should be pub(crate), but that requires Rust 1.18.0
-+cfg_if! {
-+ if #[cfg(libc_const_size_of)] {
-+ #[doc(hidden)]
-+ pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1;
-+ } else {
-+ #[doc(hidden)]
-+ pub const _ALIGNBYTES: usize = 4 - 1;
-+ }
-+}
-+
-+pub const MAP_32BIT: ::c_int = 0x00080000;
-+pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4
Index: lang/rust/files/powerpc/patch-vendor_openssl__src_src_lib.rs
===================================================================
--- lang/rust/files/powerpc/patch-vendor_openssl__src_src_lib.rs
+++ /dev/null
@@ -1,10 +0,0 @@
---- vendor/openssl-src/src/lib.rs.orig 2021-04-23 22:26:56.124321000 -0500
-+++ vendor/openssl-src/src/lib.rs 2021-04-23 22:27:38.643235000 -0500
-@@ -194,6 +194,7 @@ impl Build {
- "mips64el-unknown-linux-gnuabi64" => "linux64-mips64",
- "mipsel-unknown-linux-gnu" => "linux-mips32",
- "mipsel-unknown-linux-musl" => "linux-mips32",
-+ "powerpc-unknown-freebsd" => "BSD-generic32",
- "powerpc-unknown-linux-gnu" => "linux-ppc",
- "powerpc64-unknown-freebsd" => "BSD-generic64",
- "powerpc64-unknown-linux-gnu" => "linux-ppc64",
Index: math/kalker/Makefile
===================================================================
--- math/kalker/Makefile
+++ math/kalker/Makefile
@@ -15,11 +15,7 @@
USES= cargo
USE_GITHUB= yes
-
GH_ACCOUNT= PaddiM8
-USE_GITLAB= nodefault
-GMP_REV= 21966f4bfb56c87d407eb14c72e92ef4e55856aa
-GL_TUPLE= https://gitlab.com:tspiteri:gmp-mpfr-sys:${GMP_REV}:gmpmpfrsys
CARGO_CRATES= aho-corasick-0.7.15 \
ansi_term-0.12.1 \
atty-0.2.14 \
@@ -81,13 +77,13 @@
winapi-0.3.9 \
winapi-i686-pc-windows-gnu-0.4.0 \
winapi-x86_64-pc-windows-gnu-0.4.0 \
- winres-0.1.11
-CARGO_USE_GITLAB= yes
+ winres-0.1.11 \
+ gmp-mpfr-sys@git+https://gitlab.com/tspiteri/gmp-mpfr-sys.git\#21966f4bfb56c87d407eb14c72e92ef4e55856aa
CARGO_CARGOTOML= ${WRKSRC}/cli/Cargo.toml
CARGO_INSTALL_PATH= ./cli
PLIST_FILES= bin/kalker
post-patch:
- ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' ${WRKDIR}/gmp-mpfr-sys-${GMP_REV}/build.rs
+ ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' ${WRKSRC_crate_gmp-mpfr-sys}/build.rs
.include <bsd.port.mk>
Index: misc/xd-rust/Makefile
===================================================================
--- misc/xd-rust/Makefile
+++ misc/xd-rust/Makefile
@@ -13,8 +13,6 @@
USES= cargo
-USE_GITHUB= nodefault
-GH_TUPLE= nix-rust:nix:5d2a8c221af121abe73e313bdfce8ae2f4372a83:nix
CARGO_CRATES= addr2line-0.14.0 \
adler-0.2.3 \
aho-corasick-0.7.15 \
@@ -95,7 +93,6 @@
winapi-i686-pc-windows-gnu-0.4.0 \
winapi-util-0.1.5 \
winapi-x86_64-pc-windows-gnu-0.4.0
-CARGO_USE_GITHUB= yes
BB_ACCOUNT= delan
BB_PROJECT= ${PORTNAME}
Index: misc/xd-rust/distinfo
===================================================================
--- misc/xd-rust/distinfo
+++ misc/xd-rust/distinfo
@@ -161,5 +161,3 @@
SIZE (rust/crates/winapi-util-0.1.5.tar.gz) = 10164
SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998
-SHA256 (nix-rust-nix-5d2a8c221af121abe73e313bdfce8ae2f4372a83_GH0.tar.gz) = 8dac2f3bba943a1ab3139be573c72bcadf83c5b9dc6f262ee757039b6dd1ae63
-SIZE (nix-rust-nix-5d2a8c221af121abe73e313bdfce8ae2f4372a83_GH0.tar.gz) = 218767
Index: multimedia/gstreamer1-plugins-rust/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-rust/Makefile
+++ multimedia/gstreamer1-plugins-rust/Makefile
@@ -16,12 +16,9 @@
BUILD_DEPENDS= cargo-cbuild:devel/cargo-c
USES= cargo gnome meson pkgconfig ssl
-USE_GITHUB= nodefault
USE_GITLAB= yes
USE_GNOME= glib20
USE_GSTREAMER1= yes
-GH_TUPLE= rust-av:flavors:ceb65b8ce94e183c4cf4011da0a40e3a4892c2c0:flavors \
- fengalin:tokio:2fd1551867c145cabe4548da2e37adc3bdf457a4:tokio
GL_SITE= https://gitlab.freedesktop.org
GL_ACCOUNT= gstreamer
GL_PROJECT= gst-plugins-rs
@@ -396,9 +393,9 @@
ws2_32-sys-0.2.1 \
wyz-0.2.0 \
xml-rs-0.8.4 \
- zeroize-1.4.1
-CARGO_USE_GITHUB= yes
-CARGO_GIT_SUBDIR= tokio:tokio:tokio
+ zeroize-1.4.1 \
+ tokio,tokio-macros@git+https://github.com/fengalin/tokio\#2fd1551867c145cabe4548da2e37adc3bdf457a4 \
+ flavors@git+https://github.com/rust-av/flavors\#ceb65b8ce94e183c4cf4011da0a40e3a4892c2c0
CARGO_BUILD= no
CARGO_INSTALL= no
CARGO_TEST= no
Index: net-im/conduit/Makefile
===================================================================
--- net-im/conduit/Makefile
+++ net-im/conduit/Makefile
@@ -27,8 +27,6 @@
USE_GITLAB= yes
GL_ACCOUNT= famedly
GL_COMMIT= 0d6ae2e1e74ee33fbc8dfcec01a8902e0a4d65d3
-USE_GITHUB= nodefault
-GH_TUPLE= timokoesters:heed:f6f825da7fb2c758867e05ad973ef800a6fe1d5d:heed
CARGO_CRATES= adler32-1.2.0 \
ahash-0.7.4 \
aho-corasick-0.7.18 \
@@ -361,12 +359,10 @@
zeroize_derive-1.1.0 \
zstd-0.5.4+zstd.1.4.7 \
zstd-safe-2.0.6+zstd.1.4.7 \
- zstd-sys-1.4.18+zstd.1.4.7
-CARGO_USE_GITHUB= yes
+ zstd-sys-1.4.18+zstd.1.4.7 \
+ heed,heed-traits,heed-types@git+https://github.com/timokoesters/heed.git?rev=f6f825da7fb2c758867e05ad973ef800a6fe1d5d\#f6f825da7fb2c758867e05ad973ef800a6fe1d5d
post-patch:
- @${REINPLACE_CMD} -E -e '/^heed = /s,(path = "[^"]+),\1/heed,' \
- ${CARGO_CARGOTOML}
@${REINPLACE_CMD} -e 's,/etc/conduit.toml,${PREFIX}/etc/conduit.toml,' \
${WRKSRC}/src/main.rs
@${REINPLACE_CMD} -e 's,/var/lib/conduit,${DBDIR},' \
Index: net-im/libsignal-client/Makefile
===================================================================
--- net-im/libsignal-client/Makefile
+++ net-im/libsignal-client/Makefile
@@ -14,7 +14,6 @@
USES= cargo ssl
USE_GITHUB= yes
GH_ACCOUNT= signalapp
-GH_TUPLE= signalapp:curve25519-dalek:2694ad3b789635f90f941648ae952f58d59ffc73:curvedalek
USE_LDCONFIG= yes
CARGO_CRATES= addr2line-0.14.1 \
@@ -233,8 +232,8 @@
winapi-x86_64-pc-windows-gnu-0.4.0 \
x25519-dalek-1.1.0 \
zeroize-1.3.0 \
- zeroize_derive-1.0.1
-CARGO_USE_GITHUB= yes
+ zeroize_derive-1.0.1 \
+ curve25519-dalek@git+https://github.com/signalapp/curve25519-dalek.git?branch=3.0.0-lizard2\#2694ad3b789635f90f941648ae952f58d59ffc73
CARGO_BUILD_ARGS= --package libsignal-jni
MAKE_ENV= CARGO_PROFILE_RELEASE_LTO=thin \
OPENSSL_INCLUDE_DIR=${OPENSSLINC} \
Index: net-im/zkgroup/Makefile
===================================================================
--- net-im/zkgroup/Makefile
+++ net-im/zkgroup/Makefile
@@ -12,8 +12,6 @@
USES= cargo
USE_GITHUB= yes
GH_ACCOUNT= signalapp
-GH_TUPLE= signalapp:curve25519-dalek:477356e017c7cc2aa168f956786b34690870768f:curvedalek \
- signalapp:poksho:8bb8c61c18e7bbe93c094ed91be52b9f96c1c5cd:poksho
USE_JAVA= yes
JAVA_VERSION= 11+
USE_LDCONFIG= yes
@@ -127,8 +125,9 @@
winapi-i686-pc-windows-gnu-0.4.0 \
winapi-util-0.1.5 \
winapi-x86_64-pc-windows-gnu-0.4.0 \
- zeroize-1.3.0
-CARGO_USE_GITHUB= yes
+ zeroize-1.3.0 \
+ poksho@git+https://github.com/signalapp/poksho.git\#8bb8c61c18e7bbe93c094ed91be52b9f96c1c5cd \
+ curve25519-dalek@git+https://github.com/signalapp/curve25519-dalek.git?branch=lizard2\#477356e017c7cc2aa168f956786b34690870768f
PLIST_FILES= lib/lib${PORTNAME}.so
Index: net-mgmt/bandwhich/Makefile
===================================================================
--- net-mgmt/bandwhich/Makefile
+++ net-mgmt/bandwhich/Makefile
@@ -14,7 +14,6 @@
USE_GITHUB= yes
GH_ACCOUNT= imsnif
-GH_TUPLE= tailhook:resolv-conf:83c0f25ebcb0615550488692c5213ca1ae4acd8f:resolvconf
CARGO_CRATES= adler-0.2.3 \
adler32-1.2.0 \
aho-corasick-0.7.6 \
@@ -257,8 +256,8 @@
winreg-0.6.2 \
ws2_32-sys-0.2.1 \
yaml-rust-0.4.3 \
- zip-0.5.6
-CARGO_USE_GITHUB= yes
+ zip-0.5.6 \
+ resolv-conf@git+https://github.com/tailhook/resolv-conf?rev=83c0f25ebcb0615550488692c5213ca1ae4acd8f\#83c0f25ebcb0615550488692c5213ca1ae4acd8f
PLIST_FILES= bin/bandwhich \
man/man1/bandwhich.1.gz
Index: net-p2p/openethereum/Makefile
===================================================================
--- net-p2p/openethereum/Makefile
+++ net-p2p/openethereum/Makefile
@@ -19,8 +19,6 @@
CARGO_FEATURES= final
CARGO_TEST= yes
-CARGO_GIT_SUBDIR= rethutil:reth-util:crates/util
-
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
Index: net-p2p/openethereum/Makefile.crates
===================================================================
--- net-p2p/openethereum/Makefile.crates
+++ net-p2p/openethereum/Makefile.crates
@@ -1,9 +1,3 @@
-GH_TUPLE= openethereum:app-dirs-rs:0b37f9481ce29e9d5174ad185bca695b206368eb:app_dirs \
- paritytech:bn:6079255e65793038b9a6e5292203eab482737cc2:bn \
- paritytech:rust-ctrlc:b523017108bb2d571a7a69bd97bc406e63bc7a9d:ctrlc \
- paritytech:rust-secp256k1:9791e79f21a5309dcb6e0bd254b1ef88fca2f1f4:ethsecpk \
- matter-labs:eip1962:ece6cbabc41948db4200e41f0bfdab7ab94c7af8:eth_pairings \
- gnosis:reth:573e128487d5651f301e21faa97fc8e80f91dee8:rethutil
CARGO_CRATES= addr2line-0.14.1 \
adler-1.0.2 \
adler32-1.2.0 \
@@ -435,5 +429,10 @@
xdg-2.2.0 \
xml-rs-0.7.0 \
xmltree-0.7.0 \
- zeroize-1.2.0
-CARGO_USE_GITHUB= yes
+ zeroize-1.2.0 \
+ eth_pairings,eth_pairings_repr_derive,fixed_width_field,fixed_width_group_and_loop,simple_uint@git+https://github.com/matter-labs/eip1962.git?rev=ece6cbabc41948db4200e41f0bfdab7ab94c7af8\#ece6cbabc41948db4200e41f0bfdab7ab94c7af8 \
+ eth-secp256k1@git+https://github.com/paritytech/rust-secp256k1?rev=9791e79f21a5309dcb6e0bd254b1ef88fca2f1f4\#9791e79f21a5309dcb6e0bd254b1ef88fca2f1f4 \
+ reth-util@git+https://github.com/gnosis/reth.git?rev=573e128\#573e128487d5651f301e21faa97fc8e80f91dee8 \
+ app_dirs@git+https://github.com/openethereum/app-dirs-rs\#0b37f9481ce29e9d5174ad185bca695b206368eb \
+ bn@git+https://github.com/paritytech/bn\#6079255e65793038b9a6e5292203eab482737cc2 \
+ ctrlc@git+https://github.com/paritytech/rust-ctrlc.git\#b523017108bb2d571a7a69bd97bc406e63bc7a9d
Index: net/findomain/Makefile
===================================================================
--- net/findomain/Makefile
+++ net/findomain/Makefile
@@ -12,8 +12,6 @@
USES= cargo ssl
USE_GITHUB= yes
GH_ACCOUNT= Findomain
-GH_TUPLE= Edu4rdSHL:rust-headless-chrome:54ae12d9d33ed41f9f4b60b489e706d501d4f58a:headless_chrome \
- Edu4rdSHL:trust-dns:451a00fbe3c0972adb4cdbd9d2e2f2a39a44da0e:dns_resolver
CARGO_CRATES= addr2line-0.16.0 \
adler-1.0.2 \
@@ -256,9 +254,9 @@
winreg-0.6.2 \
winreg-0.7.0 \
yaml-rust-0.3.5 \
- yaml-rust-0.4.5
-CARGO_USE_GITHUB= yes
-CARGO_GIT_SUBDIR= dns_resolver:trust-dns-resolver:crates/resolver
+ yaml-rust-0.4.5 \
+ trust-dns-proto,trust-dns-resolver@git+https://github.com/Edu4rdSHL/trust-dns?branch=main\#451a00fbe3c0972adb4cdbd9d2e2f2a39a44da0e \
+ headless_chrome@git+https://github.com/Edu4rdSHL/rust-headless-chrome\#54ae12d9d33ed41f9f4b60b489e706d501d4f58a
WRKSRC= ${WRKDIR}/Findomain-${DISTVERSION}
Index: security/authenticator/Makefile
===================================================================
--- security/authenticator/Makefile
+++ security/authenticator/Makefile
@@ -17,19 +17,13 @@
libzbar.so:graphics/zbar
USES= cargo gettext gnome meson pkgconfig python:build shebangfix sqlite ssl
-USE_GITHUB= nodefault
USE_GITLAB= yes
USE_GNOME= gtk40 libadwaita
USE_GSTREAMER1= gl gtk4 zbar
-GH_TUPLE= bilelmoussaoui:ashpd:d7ec2103565301b8476d6706ef34090e197b021c:ashpd \
- gtk-rs:gtk3-rs:6e3c8739f9f5b8dc0a234f4a485e254574af5953:gtk3 \
- gtk-rs:gtk4-rs:13a8317a2ef8738362b9fa7f55a29dd5d3dbc459:gtk4
GL_SITE= https://gitlab.gnome.org
GL_ACCOUNT= World
GL_PROJECT= Authenticator
GL_COMMIT= ba1894159358275be2765bc42ef89782a2d1d45d
-GL_TUPLE= https://gitlab.freedesktop.org:gstreamer:gstreamer-rs:762450bb5335d8c79cc29a6111874d89bd3b5c00:gstreamer \
- bilelmoussaoui:libadwaita-rs:6ae4d3670565064acc9da2f51434eca0a0c51ac9:libadwaita
SHEBANG_FILES= build-aux/meson_post_install.py
CARGO_ENV= ZBAR_INCLUDE_DIRS="${LOCALBASE}/include" ZBAR_LIB_DIRS="${LOCALBASE}/lib"
MAKE_ENV= ${CARGO_ENV}
@@ -342,33 +336,12 @@
zbus-1.8.0 \
zbus_macros-1.8.0 \
zvariant-2.6.0 \
- zvariant_derive-2.6.0
-CARGO_USE_GITHUB= yes
-CARGO_USE_GITLAB= yes
-CARGO_GIT_SUBDIR= gstreamer:gst_base:gstreamer-base \
- gstreamer:gst:gstreamer \
- gtk3:cairo-rs:cairo \
- gtk3:cairo-sys-rs:cairo/sys \
- gtk3:gdk-pixbuf-sys:gdk-pixbuf/sys \
- gtk3:gdk-pixbuf:gdk-pixbuf \
- gtk3:gio-sys:gio/sys \
- gtk3:gio:gio \
- gtk3:glib-sys:glib/sys \
- gtk3:glib:glib \
- gtk3:gobject-sys:glib/gobject-sys \
- gtk3:graphene-sys:graphene/sys \
- gtk3:graphene:graphene \
- gtk3:pango-sys:pango/sys \
- gtk3:pango:pango \
- gtk4:gdk-sys:gdk4/sys \
- gtk4:gdk4:gdk4 \
- gtk4:gdk4wayland:gdk4-wayland \
- gtk4:gdk4x11:gdk4-x11 \
- gtk4:gdk:gdk4 \
- gtk4:gtk-sys:gtk4/sys \
- gtk4:gtk4:gtk4 \
- gtk4:gtk:gtk4 \
- libadwaita:adw:libadwaita
+ zvariant_derive-2.6.0 \
+ gstreamer,gstreamer-base,gstreamer-base-sys,gstreamer-sys@git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs\#762450bb5335d8c79cc29a6111874d89bd3b5c00 \
+ gdk4,gdk4-sys,gdk4-wayland,gdk4-wayland-sys,gdk4-x11,gdk4-x11-sys,gsk4,gsk4-sys,gtk4,gtk4-macros,gtk4-sys@git+https://github.com/gtk-rs/gtk4-rs\#13a8317a2ef8738362b9fa7f55a29dd5d3dbc459 \
+ libadwaita,libadwaita-sys@git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs\#6ae4d3670565064acc9da2f51434eca0a0c51ac9 \
+ ashpd@git+https://github.com/bilelmoussaoui/ashpd\#d7ec2103565301b8476d6706ef34090e197b021c \
+ cairo-rs,cairo-sys-rs,gdk-pixbuf,gdk-pixbuf-sys,gio,gio-sys,glib,glib-macros,glib-sys,gobject-sys,graphene-rs,graphene-sys,pango,pango-sys@git+https://github.com/gtk-rs/gtk3-rs\#6e3c8739f9f5b8dc0a234f4a485e254574af5953
CARGO_BUILD= no
CARGO_INSTALL= no
CARGO_TEST= no
Index: security/authenticator/files/patch-gtk
===================================================================
--- security/authenticator/files/patch-gtk
+++ /dev/null
@@ -1,283 +0,0 @@
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256581
-
---- ../gstreamer-rs-762450bb5335d8c79cc29a6111874d89bd3b5c00/gstreamer-base/sys/Cargo.toml.orig 2021-03-25 18:12:51 UTC
-+++ ../gstreamer-rs-762450bb5335d8c79cc29a6111874d89bd3b5c00/gstreamer-base/sys/Cargo.toml
-@@ -3,12 +3,8 @@ system-deps = "3"
-
- [dependencies]
- libc = "0.2"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
- [dependencies.gstreamer-sys]
- path = "../../gstreamer/sys"
---- ../gstreamer-rs-762450bb5335d8c79cc29a6111874d89bd3b5c00/gstreamer/sys/Cargo.toml.orig 2021-03-25 18:12:51 UTC
-+++ ../gstreamer-rs-762450bb5335d8c79cc29a6111874d89bd3b5c00/gstreamer/sys/Cargo.toml
-@@ -3,12 +3,8 @@ system-deps = "3"
-
- [dependencies]
- libc = "0.2"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
- [dev-dependencies]
- shell-words = "1.0.0"
---- ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4-wayland/Cargo.toml.orig 2021-03-24 16:58:30 UTC
-+++ ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4-wayland/Cargo.toml
-@@ -21,12 +21,8 @@ git = "https://github.com/gtk-rs/lgpl-docs"
- [dependencies]
- libc = "0.2"
- wayland-client = { version = "0.28", features = ["use_system_lib"] }
--
--[dependencies.glib]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gio]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+glib = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
- [dependencies.gdk]
- path = "../gdk4"
---- ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4-wayland/sys/Cargo.toml.orig 2021-03-24 16:58:30 UTC
-+++ ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4-wayland/sys/Cargo.toml
-@@ -15,9 +15,7 @@ name = "gdk4_wayland_sys"
-
- [dependencies]
- libc = "0.2"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs.git"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs.git" }
-
- [build-dependencies]
- system-deps = "3"
---- ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4-x11/Cargo.toml.orig 2021-03-24 16:58:30 UTC
-+++ ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4-x11/Cargo.toml
-@@ -21,12 +21,8 @@ git = "https://github.com/gtk-rs/lgpl-docs"
- [dependencies]
- libc = "0.2"
- x11 = "2.18"
--
--[dependencies.glib]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gio]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+glib = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
- [dependencies.gdk]
- path = "../gdk4"
---- ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4-x11/sys/Cargo.toml.orig 2021-03-24 16:58:30 UTC
-+++ ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4-x11/sys/Cargo.toml
-@@ -16,12 +16,10 @@ name = "gdk4_x11_sys"
- [dependencies]
- libc = "0.2"
- x11 = "2.18"
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs.git" }
-
- [dependencies.gdk4-sys]
- path = "../../gdk4/sys"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs.git"
-
- [build-dependencies]
- system-deps = "3"
---- ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4/sys/Cargo.toml.orig 2021-03-24 16:58:30 UTC
-+++ ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gdk4/sys/Cargo.toml
-@@ -3,24 +3,12 @@ system-deps = "3"
-
- [dependencies]
- libc = "0.2"
--
--[dependencies.cairo-sys-rs]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk-pixbuf-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gio-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.pango-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
- [dev-dependencies]
- shell-words = "1.0.0"
---- ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gsk4/sys/Cargo.toml.orig 2021-03-24 16:58:30 UTC
-+++ ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gsk4/sys/Cargo.toml
-@@ -3,24 +3,14 @@ system-deps = "3"
-
- [dependencies]
- libc = "0.2"
-+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+graphene-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
--[dependencies.cairo-sys-rs]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
- [dependencies.gdk4-sys]
- path = "../../gdk4/sys"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.graphene-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.pango-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-
- [dev-dependencies]
- shell-words = "1.0.0"
---- ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gtk4/sys/Cargo.toml.orig 2021-03-24 16:58:30 UTC
-+++ ../gtk4-rs-13a8317a2ef8738362b9fa7f55a29dd5d3dbc459/gtk4/sys/Cargo.toml
-@@ -3,33 +3,19 @@ system-deps = "3"
-
- [dependencies]
- libc = "0.2"
-+cairo-sys-rs = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+graphene-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-
--[dependencies.cairo-sys-rs]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk-pixbuf-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
- [dependencies.gdk4-sys]
- path = "../../gdk4/sys"
-
--[dependencies.gio-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.graphene-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
- [dependencies.gsk4-sys]
- path = "../../gsk4/sys"
--
--[dependencies.pango-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
-
- [dev-dependencies]
- shell-words = "1.0.0"
---- ../libadwaita-rs-6ae4d3670565064acc9da2f51434eca0a0c51ac9/libadwaita/Cargo.toml.orig 2021-03-12 01:18:14 UTC
-+++ ../libadwaita-rs-6ae4d3670565064acc9da2f51434eca0a0c51ac9/libadwaita/Cargo.toml
-@@ -8,28 +8,14 @@ edition = "2018"
- libc = '0.2'
- bitflags = '1.2'
- lazy_static = '1.4'
-+glib = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gio = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk = { package = "gdk4", git = "https://github.com/gtk-rs/gtk4-rs" }
-+gtk = { package = "gtk4", git = "https://github.com/gtk-rs/gtk4-rs" }
- [lib]
- name = "libadwaita"
--
--[dependencies.glib]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gio]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk-pixbuf]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.pango]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk]
--package = "gdk4"
--git = "https://github.com/gtk-rs/gtk4-rs"
--
--[dependencies.gtk]
--package = "gtk4"
--git = "https://github.com/gtk-rs/gtk4-rs"
-
- [dependencies.ffi]
- package = "libadwaita-sys"
---- ../libadwaita-rs-6ae4d3670565064acc9da2f51434eca0a0c51ac9/libadwaita/sys/Cargo.toml.orig 2021-03-12 01:18:14 UTC
-+++ ../libadwaita-rs-6ae4d3670565064acc9da2f51434eca0a0c51ac9/libadwaita/sys/Cargo.toml
-@@ -16,29 +16,13 @@ name = "libadwaita_sys"
-
- [dependencies]
- libc = "0.2"
--
--[dependencies.gio-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.glib-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gdk-pixbuf-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.pango-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gobject-sys]
--git = "https://github.com/gtk-rs/gtk3-rs"
--
--[dependencies.gtk-sys]
--package = "gtk4-sys"
--git = "https://github.com/gtk-rs/gtk4-rs"
--
--[dependencies.gdk-sys]
--package = "gdk4-sys"
--git = "https://github.com/gtk-rs/gtk4-rs"
-+gio-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+glib-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gdk-pixbuf-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+pango-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gobject-sys = { git = "https://github.com/gtk-rs/gtk3-rs" }
-+gtk-sys = { package = "gtk4-sys", git = "https://github.com/gtk-rs/gtk4-rs" }
-+gdk-sys = { package = "gdk4-sys", git = "https://github.com/gtk-rs/gtk4-rs" }
-
- [build-dependencies]
- system-deps = "3"
Index: security/vaultwarden/Makefile
===================================================================
--- security/vaultwarden/Makefile
+++ security/vaultwarden/Makefile
@@ -33,16 +33,8 @@
GH_ACCOUNT= dani-garcia
CARGO_FEATURES= postgresql sqlite mysql #vendored_openssl
CARGO_ENV+= RUSTC_BOOTSTRAP=1
-CARGO_GIT_SUBDIR+= dataurl:data-url:data-url
-CARGO_GIT_SUBDIR+= devise:devise:lib
-CARGO_GIT_SUBDIR+= rocket:rocket:core/lib
-CARGO_GIT_SUBDIR+= rocket:rocket_contrib:contrib/lib
# make cargo-crates
-GH_TUPLE= servo:rust-url:eb7330b5296c0d43816d1346211b74182bb4ae37:dataurl \
- SergioBenitez:Devise:e58b3ac9afc3b6ff10a8aaf02a3e768a8f530089:devise \
- jjlin:job_scheduler:ee023418dbba2bfe1e30a5fd7d937f9e33739806:job_scheduler \
- SergioBenitez:Rocket:263e39b5b429de1913ce7e3036575a7b4d88b6d7:rocket
CARGO_CRATES= addr2line-0.15.2 \
adler-1.0.2 \
aho-corasick-0.7.18 \
@@ -387,8 +379,11 @@
wyz-0.2.0 \
xml5ever-0.16.1 \
yansi-0.5.0 \
- yubico-0.10.0
-CARGO_USE_GITHUB= yes
+ yubico-0.10.0 \
+ devise,devise_codegen,devise_core@git+https://github.com/SergioBenitez/Devise.git?rev=e58b3ac9a\#e58b3ac9afc3b6ff10a8aaf02a3e768a8f530089 \
+ rocket,rocket_codegen,rocket_contrib,rocket_http@git+https://github.com/SergioBenitez/Rocket?rev=263e39b5b429de1913ce7e3036575a7b4d88b6d7\#263e39b5b429de1913ce7e3036575a7b4d88b6d7 \
+ data-url@git+https://github.com/servo/rust-url?rev=eb7330b5296c0d43816d1346211b74182bb4ae37\#eb7330b5296c0d43816d1346211b74182bb4ae37 \
+ job_scheduler@git+https://github.com/jjlin/job_scheduler?rev=ee023418dbba2bfe1e30a5fd7d937f9e33739806\#ee023418dbba2bfe1e30a5fd7d937f9e33739806
post-install:
${MKDIR} ${STAGEDIR}/${ETCDIR}/rc.conf.d
Index: shells/ion/Makefile
===================================================================
--- shells/ion/Makefile
+++ shells/ion/Makefile
@@ -11,16 +11,10 @@
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= cargo
-USE_GITHUB= nodefault
-GH_TUPLE= alkis:decimal:972c8547a0a76c7ad9a314e28a335aa57d46a543:decimal
USE_GITLAB= yes
GL_SITE= https://gitlab.redox-os.org
GL_ACCOUNT= redox-os
GL_COMMIT= a8872014dbce730ccd00aaa722397dc394a52bf4
-GL_TUPLE= redox-os:calc:afba9c5d184ddb9db5e4e71dc357da0499e212cf:calculate \
- redox-os:liner:3f3d1d4e6058067e9d03a9b1510d8f2edac073c7:liner \
- redox-os:small:022635fcb0b0b631b3a06c79c45fa8ebaf4f64f5:small \
- redox-os:termion:c27678efc2ed14576361c7ce6d806a6bb576f1a9:termion
CARGO_CRATES= adler32-1.0.3 \
aho-corasick-0.7.4 \
@@ -250,9 +244,12 @@
x11-dl-2.18.3 \
xdg-2.2.0 \
xml-rs-0.7.0 \
- xml-rs-0.8.0
-CARGO_USE_GITHUB= yes
-CARGO_USE_GITLAB= yes
+ xml-rs-0.8.0 \
+ small@git+https://gitlab.redox-os.org/redox-os/small\#022635fcb0b0b631b3a06c79c45fa8ebaf4f64f5 \
+ liner@git+https://gitlab.redox-os.org/redox-os/liner\#3f3d1d4e6058067e9d03a9b1510d8f2edac073c7 \
+ termion@git+https://gitlab.redox-os.org/redox-os/termion\#c27678efc2ed14576361c7ce6d806a6bb576f1a9 \
+ calculate@git+https://gitlab.redox-os.org/redox-os/calc\#afba9c5d184ddb9db5e4e71dc357da0499e212cf \
+ decimal@git+https://github.com/alkis/decimal.git\#972c8547a0a76c7ad9a314e28a335aa57d46a543
CONFLICTS_INSTALL= ion
@@ -261,8 +258,8 @@
# liner-0.4.4 does not build with Rust 1.40.0. Use the newer copy
# that is also already available.
post-patch:
- @${REINPLACE_CMD} 's,^liner = .*,liner = \{ path = "${WRKSRC_liner}" \},' \
- ${WRKSRC_calculate}/Cargo.toml
+ @${REINPLACE_CMD} 's,^liner = .*,liner = \{ git = "https://gitlab.redox-os.org/redox-os/liner" \},' \
+ ${WRKSRC_crate_calculate}/Cargo.toml
post-configure:
${ECHO_CMD} ${GL_COMMIT} > ${WRKSRC}/git_revision.txt
Index: sysutils/vector/Makefile
===================================================================
--- sysutils/vector/Makefile
+++ sysutils/vector/Makefile
@@ -19,19 +19,13 @@
USES= cargo lua:53 ssl
USE_GITHUB= yes
GH_ACCOUNT= timberio
+GH_TUPLE= bytecodealliance:wasmtime:3de418630a263ca214931d69f796879be50d4f72:wasmtime \
+ bytecodealliance:sightglass:b409ba75a7a89cbf4cbf9ec44880e4ae6509a85c:sightglass \
+ WebAssembly:WASI:3fd0abd12c1f53772eeff46d3cf21d7e2475c885:wasi_lucet \
+ WebAssembly:WASI:2b027d91c29e6141a3768e638076daa23f51621c:wasi_wasmtime
PLIST_FILES= bin/vector
-GH_TUPLE= bytecodealliance:lucet:d4fc14a03bdb99ac83173d27fddf1aca48412a86:lucet \
- bytecodealliance:wasmtime:3de418630a263ca214931d69f796879be50d4f72:wasmtime \
- bytecodealliance:sightglass:b409ba75a7a89cbf4cbf9ec44880e4ae6509a85c:sightglass \
- WebAssembly:WASI:3fd0abd12c1f53772eeff46d3cf21d7e2475c885:wasi_lucet \
- WebAssembly:WASI:2b027d91c29e6141a3768e638076daa23f51621c:wasi_wasmtime \
- timberio:leveldb:64265815bcf1b69f30e6cb35bf687fbd6dd64afb:leveldb \
- timberio:leveldb-sys:bbdd99a6fab0a7444a8c6eb0cc86a1a5a75f7fa1:leveldbsys \
- kyren:rlua:25bd7e6bffef9597466a98bfca80a3056c9e6320:rlua \
- tower-rs:tower:c87fdd9c1e4c0728fdaa87d3fafe3e48da9b498a:tower \
- tokio-rs:tracing:65547d8809fcc726b8187db85b23c42e32ef5dce:tracingfutures
CARGO_CRATES= adler-0.2.3 \
ahash-0.2.18 \
aho-corasick-0.7.7 \
@@ -555,26 +549,25 @@
xml-rs-0.8.0 \
yaml-rust-0.4.3 \
zeroize-1.1.0 \
- zstd-sys-1.4.15+zstd.1.4.4
-CARGO_USE_GITHUB= yes
-CARGO_GIT_SUBDIR= tracingfutures:tracing-futures:tracing-futures \
- tracingfutures:tracing-tower:tracing-tower \
- tower:tower03:tower \
- lucet:lucetc:lucetc \
- lucet:lucet-runtime:lucet-runtime \
- lucet:lucet-wasi:lucet-wasi
+ zstd-sys-1.4.15+zstd.1.4.4 \
+ leveldb-sys@git+https://github.com/timberio/leveldb-sys?branch=v3.0.0\#bbdd99a6fab0a7444a8c6eb0cc86a1a5a75f7fa1 \
+ leveldb@git+https://github.com/timberio/leveldb\#64265815bcf1b69f30e6cb35bf687fbd6dd64afb \
+ cranelift-bforest,cranelift-codegen,cranelift-codegen-meta,cranelift-codegen-shared,cranelift-entity,cranelift-frontend,cranelift-module,cranelift-native,cranelift-object,cranelift-wasm,lucet-module,lucet-runtime,lucet-runtime-internals,lucet-runtime-macros,lucet-validate,lucet-wasi,lucet-wasi-generate,lucet-wiggle,lucet-wiggle-generate,lucet-wiggle-macro,lucetc,wasi-common,wig,wiggle,wiggle-generate,wiggle-macro,winx,witx,yanix@git+https://github.com/bytecodealliance/lucet.git?rev=d4fc14a03bdb99ac83173d27fddf1aca48412a86\#d4fc14a03bdb99ac83173d27fddf1aca48412a86 \
+ tower@git+https://github.com/tower-rs/tower\#c87fdd9c1e4c0728fdaa87d3fafe3e48da9b498a \
+ rlua@git+https://github.com/kyren/rlua\#25bd7e6bffef9597466a98bfca80a3056c9e6320 \
+ tracing-futures,tracing-tower@git+https://github.com/tokio-rs/tracing?rev=65547d8809fcc726b8187db85b23c42e32ef5dce\#65547d8809fcc726b8187db85b23c42e32ef5dce
post-extract:
${RMDIR} ${WRKSRC_wasmtime}/crates/wasi-common/WASI
${MV} ${WRKSRC_wasi_wasmtime} ${WRKSRC_wasmtime}/crates/wasi-common/WASI
- ${RMDIR} ${WRKSRC_lucet}/wasmtime ${WRKSRC_lucet}/sightglass ${WRKSRC_lucet}/wasi
- ${MV} ${WRKSRC_wasmtime} ${WRKSRC_lucet}/wasmtime
- ${MV} ${WRKSRC_sightglass} ${WRKSRC_lucet}/sightglass
- ${MV} ${WRKSRC_wasi_lucet} ${WRKSRC_lucet}/wasi
+ ${RMDIR} ${WRKSRC_crate_lucet-runtime}/wasmtime ${WRKSRC_crate_lucet-runtime}/sightglass ${WRKSRC_crate_lucet-runtime}/wasi
+ ${MV} ${WRKSRC_wasmtime} ${WRKSRC_crate_lucet-runtime}/wasmtime
+ ${MV} ${WRKSRC_sightglass} ${WRKSRC_crate_lucet-runtime}/sightglass
+ ${MV} ${WRKSRC_wasi_lucet} ${WRKSRC_crate_lucet-runtime}/wasi
post-patch:
${REINPLACE_CMD} -e 's|.probe("lua")|.probe("lua-5.3")|' \
- ${WRKSRC_rlua}/build.rs
+ ${WRKSRC_crate_rlua}/build.rs
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vector
Index: textproc/ripgrep/Makefile
===================================================================
--- textproc/ripgrep/Makefile
+++ textproc/ripgrep/Makefile
@@ -58,7 +58,7 @@
memmap2-0.3.0 \
num_cpus-1.13.0 \
once_cell-1.7.2 \
- packed_simd_2-0.3.5 \
+ packed_simd_2-0.3.6 \
pcre2-0.2.3 \
pcre2-sys-0.2.5 \
pkg-config-0.3.19 \
Index: textproc/ripgrep/distinfo
===================================================================
--- textproc/ripgrep/distinfo
+++ textproc/ripgrep/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1623830205
+TIMESTAMP = 1634590373
SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f
SIZE (rust/crates/aho-corasick-0.7.18.crate) = 112923
SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
@@ -77,8 +77,8 @@
SIZE (rust/crates/num_cpus-1.13.0.crate) = 14704
SHA256 (rust/crates/once_cell-1.7.2.crate) = af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3
SIZE (rust/crates/once_cell-1.7.2.crate) = 28250
-SHA256 (rust/crates/packed_simd_2-0.3.5.crate) = 0e64858a2d3733fdd61adfdd6da89aa202f7ff0e741d2fc7ed1e452ba9dc99d7
-SIZE (rust/crates/packed_simd_2-0.3.5.crate) = 98197
+SHA256 (rust/crates/packed_simd_2-0.3.6.crate) = 71c0c06716cfc81616fa8e22b721ce92fecd594508bc0eb3d04ae3ef35ac10c5
+SIZE (rust/crates/packed_simd_2-0.3.6.crate) = 98119
SHA256 (rust/crates/pcre2-0.2.3.crate) = 85b30f2f69903b439dd9dc9e824119b82a55bf113b29af8d70948a03c1b11ab1
SIZE (rust/crates/pcre2-0.2.3.crate) = 19605
SHA256 (rust/crates/pcre2-sys-0.2.5.crate) = dec30e5e9ec37eb8fbf1dea5989bc957fd3df56fbee5061aa7b7a99dbb37b722
Index: www/lychee/Makefile
===================================================================
--- www/lychee/Makefile
+++ www/lychee/Makefile
@@ -16,7 +16,6 @@
PLIST_FILES= bin/lychee
-GH_TUPLE= softprops:hubcaps:a9e6616ecc7b8eef0ea0eaf6055d9610c8961500:hubcaps
CARGO_INSTALL_PATH= lychee-bin
CARGO_CRATES= adler-1.0.2 \
aho-corasick-0.7.15 \
@@ -312,8 +311,8 @@
winreg-0.7.0 \
winutil-0.1.1 \
wiremock-0.5.2 \
- xml5ever-0.16.1
-CARGO_USE_GITHUB= yes
+ xml5ever-0.16.1 \
+ hubcaps@git+https://github.com/softprops/hubcaps.git\#a9e6616ecc7b8eef0ea0eaf6055d9610c8961500
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lychee
Index: www/miniserve/Makefile
===================================================================
--- www/miniserve/Makefile
+++ www/miniserve/Makefile
@@ -14,7 +14,6 @@
USES= cargo ssl:build
USE_GITHUB= yes
GH_ACCOUNT= svenstaro
-GH_TUPLE= svenstaro:mime_guess:ac76840e14bc6f2f7cbbb347052ec7e4de7e3043:mime_guess
CARGO_CRATES= actix-codec-0.4.0 \
actix-files-0.6.0-beta.6 \
actix-http-3.0.0-beta.9 \
@@ -320,8 +319,8 @@
zip-0.5.13 \
zstd-0.7.0+zstd.1.4.9 \
zstd-safe-3.1.0+zstd.1.4.9 \
- zstd-sys-1.5.0+zstd.1.4.9
-CARGO_USE_GITHUB= yes
+ zstd-sys-1.5.0+zstd.1.4.9 \
+ mime_guess@git+https://github.com/svenstaro/mime_guess.git\#ac76840e14bc6f2f7cbbb347052ec7e4de7e3043
PLIST_FILES= bin/miniserve
PORTDOCS= README.md
Index: x11/alacritty/Makefile
===================================================================
--- x11/alacritty/Makefile
+++ x11/alacritty/Makefile
@@ -212,7 +212,6 @@
xdg-2.2.0 \
xml-rs-0.8.4 \
yaml-rust-0.4.5
-CARGO_USE_GITHUB= yes
CARGO_INSTALL_PATH= alacritty
CARGO_FEATURES+= --no-default-features
Index: x11/wezterm/Makefile
===================================================================
--- x11/wezterm/Makefile
+++ x11/wezterm/Makefile
@@ -24,11 +24,7 @@
glennrp:libpng:v1.6.36-805-g8439534da:libpng/deps/freetype/libpng \
madler:zlib:v1.2.11:zlib/deps/freetype/zlib \
freetype:freetype:VER-2-10-2-80-g6a2b3e400:freetype/deps/freetype/freetype2 \
- glium:glium:aed95270f0714036003589d6e52de196e7ff75d1:glium \
- yeslogic:allsorts:3947164a201ab5e15d5f23204faaaaaad52531aa:allsorts \
- libssh2:libssh2:libssh2-1.9.0-93-g5627b82:libssh2/../ssh2-rs-c65067040c97a0cf7f96c69d6fc87764a32c34ae/libssh2-sys/libssh2 \
- wez:ssh2-rs:c65067040c97a0cf7f96c69d6fc87764a32c34ae:libsshsys \
- wez:xkbcommon-rs:01a0a0cd5663405e6e4abb1ad3add9add1496f58:xkbcommon
+ libssh2:libssh2:libssh2-1.9.0-93-g5627b82:libssh2/../ssh2-rs-c65067040c97a0cf7f96c69d6fc87764a32c34ae/libssh2-sys/libssh2
PLIST_FILES= bin/strip-ansi-escapes \
bin/${PORTNAME} \
bin/${PORTNAME}-gui \
@@ -541,8 +537,11 @@
zstd-safe-3.0.1+zstd.1.4.9 \
zstd-sys-1.4.20+zstd.1.4.9 \
zvariant-2.8.0 \
- zvariant_derive-2.8.0
-CARGO_USE_GITHUB= yes
+ zvariant_derive-2.8.0 \
+ xkbcommon@git+https://github.com/wez/xkbcommon-rs.git?rev=01a0a0cd5663405e6e4abb1ad3add9add1496f58\#01a0a0cd5663405e6e4abb1ad3add9add1496f58 \
+ glium@git+https://github.com/glium/glium.git?rev=aed95270f0714036003589d6e52de196e7ff75d1\#aed95270f0714036003589d6e52de196e7ff75d1 \
+ allsorts@git+https://github.com/yeslogic/allsorts.git?rev=3947164a201ab5e15d5f23204faaaaaad52531aa\#3947164a201ab5e15d5f23204faaaaaad52531aa \
+ libssh2-sys,ssh2@git+https://github.com/wez/ssh2-rs.git?branch=win32ssl\#c65067040c97a0cf7f96c69d6fc87764a32c34ae
# XXX https://github.com/rust-lang/cargo/issues/4101
CARGO_INSTALL_PATH= ${PLIST_FILES:Mbin/*:T}
Index: x11/wmfocus/Makefile
===================================================================
--- x11/wmfocus/Makefile
+++ x11/wmfocus/Makefile
@@ -22,7 +22,6 @@
USE_GNOME= cairo
USE_XORG= x11 xcb
GH_ACCOUNT= svenstaro
-GH_TUPLE= JayceFayne:swayipc-rs:f6b045f6dff3b8135c74c996cb95a39c874e4939:swayipc
CARGO_FEATURES= i3
PLIST_FILES= bin/${PORTNAME}
@@ -117,9 +116,8 @@
x11-2.18.2 \
xcb-0.9.0 \
xcb-util-0.3.0 \
- xkbcommon-0.4.0
-CARGO_USE_GITHUB= yes
-CARGO_GIT_SUBDIR= swayipc:swayipc:blocking
+ xkbcommon-0.4.0 \
+ swayipc,swayipc-types@git+https://github.com/JayceFayne/swayipc-rs\#f6b045f6dff3b8135c74c996cb95a39c874e4939
post-patch:
# lang/python3 cannot be used as a dependency

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 27, 6:46 AM (12 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24278251
Default Alt Text
D32553.id97094.diff (122 KB)

Event Timeline