From 2451c709617277cabc58ed0dc9925b155cfeb302 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 05:13:17 +0000 Subject: [PATCH 1/5] chore: bump ipc-channel from 0.18.3 to 0.19.0 in /src/rust Bumps [ipc-channel](https://github.com/servo/ipc-channel) from 0.18.3 to 0.19.0. - [Release notes](https://github.com/servo/ipc-channel/releases) - [Commits](https://github.com/servo/ipc-channel/commits) --- updated-dependencies: - dependency-name: ipc-channel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/rust/Cargo.lock | 4 ++-- src/rust/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock index baee88fb9..94faa65c7 100644 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@ -1049,9 +1049,9 @@ dependencies = [ [[package]] name = "ipc-channel" -version = "0.18.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f4c80f2df4fc64fb7fc2cff69fc034af26e6e6617ea9f1313131af464b9ca0" +checksum = "6fb8251fb7bcd9ccd3725ed8deae9fe7db8e586495c9eb5b0c52e6233e5e75ea" dependencies = [ "bincode", "crossbeam-channel", diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml index 0c115bc95..7f77a7d4e 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -42,7 +42,7 @@ extendr-api = { git = "https://github.com/extendr/extendr", rev = "1895bfc8ee223 ] } flume = "0.11.0" indenter = "0.3.3" -ipc-channel = "0.18.3" +ipc-channel = "0.19.0" once_cell = "1.20.2" rayon = "1.10.0" serde = { version = "1.0.210", features = ["derive"] } From 356ee7085f87ea7fe7bcc829d85d49550ba30bb1 Mon Sep 17 00:00:00 2001 From: etiennebacher Date: Thu, 17 Oct 2024 11:25:43 +0200 Subject: [PATCH 2/5] try fix windows --- src/Makevars.win | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makevars.win b/src/Makevars.win index e8fc98e2d..875dec133 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -6,7 +6,7 @@ LIBNAME = libr_polars.a TARGET_DIR = $(CURDIR)/rust/target LIBDIR = $(TARGET_DIR)/$(TARGET)/$(LIBR_POLARS_PROFILE) STATLIB = $(LIBDIR)/$(LIBNAME) -PKG_LIBS = -L$(LIBDIR) -lr_polars -lws2_32 -lncrypt -lcrypt32 -ladvapi32 -luserenv -lbcrypt -lole32 -lntdll -lpsapi -liphlpapi -lpdh -lpowrprof -loleaut32 -lnetapi32 -lsecur32 -lsynchronization -lpropsys -lruntimeobject -t +PKG_LIBS = -L$(LIBDIR) -lr_polars -lws2_32 -lncrypt -lcrypt32 -ladvapi32 -luserenv -lbcrypt -lole32 -lntdll -lpsapi -liphlpapi -lpdh -lpowrprof -loleaut32 -lnetapi32 -lsecur32 -lsynchronization -lpropsys -lruntimeobject -lhandleapi -t # Rtools42 doesn't have the linker in the location that cargo expects, so we # need to overwrite it via configuration. From cbc66b2e1d0b0b61856f93575f4683ba2f78038e Mon Sep 17 00:00:00 2001 From: etiennebacher Date: Thu, 17 Oct 2024 12:36:24 +0200 Subject: [PATCH 3/5] another try --- src/Makevars.win | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makevars.win b/src/Makevars.win index 875dec133..2559c5154 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -6,7 +6,7 @@ LIBNAME = libr_polars.a TARGET_DIR = $(CURDIR)/rust/target LIBDIR = $(TARGET_DIR)/$(TARGET)/$(LIBR_POLARS_PROFILE) STATLIB = $(LIBDIR)/$(LIBNAME) -PKG_LIBS = -L$(LIBDIR) -lr_polars -lws2_32 -lncrypt -lcrypt32 -ladvapi32 -luserenv -lbcrypt -lole32 -lntdll -lpsapi -liphlpapi -lpdh -lpowrprof -loleaut32 -lnetapi32 -lsecur32 -lsynchronization -lpropsys -lruntimeobject -lhandleapi -t +PKG_LIBS = -L$(LIBDIR) -lr_polars -lws2_32 -lncrypt -lcrypt32 -ladvapi32 -luserenv -lbcrypt -lole32 -lntdll -lpsapi -liphlpapi -lpdh -lpowrprof -loleaut32 -lnetapi32 -lsecur32 -lsynchronization -lpropsys -lruntimeobject -lkernel32 -luser32 -t # Rtools42 doesn't have the linker in the location that cargo expects, so we # need to overwrite it via configuration. From 9094f031992eb6906b05bbf5d166fcbada7f7b46 Mon Sep 17 00:00:00 2001 From: eitsupi <50911393+eitsupi@users.noreply.github.com> Date: Thu, 17 Oct 2024 22:03:22 +0900 Subject: [PATCH 4/5] try to fix --- src/Makevars.win | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makevars.win b/src/Makevars.win index 2559c5154..896e5a7f7 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -6,7 +6,7 @@ LIBNAME = libr_polars.a TARGET_DIR = $(CURDIR)/rust/target LIBDIR = $(TARGET_DIR)/$(TARGET)/$(LIBR_POLARS_PROFILE) STATLIB = $(LIBDIR)/$(LIBNAME) -PKG_LIBS = -L$(LIBDIR) -lr_polars -lws2_32 -lncrypt -lcrypt32 -ladvapi32 -luserenv -lbcrypt -lole32 -lntdll -lpsapi -liphlpapi -lpdh -lpowrprof -loleaut32 -lnetapi32 -lsecur32 -lsynchronization -lpropsys -lruntimeobject -lkernel32 -luser32 -t +PKG_LIBS = -L$(LIBDIR) -lr_polars -lws2_32 -lncrypt -lcrypt32 -ladvapi32 -luserenv -lbcrypt -lole32 -lntdll -lpsapi -liphlpapi -lpdh -lpowrprof -loleaut32 -lnetapi32 -lsecur32 -lsynchronization -lpropsys -lruntimeobject -lkernelbase -t # Rtools42 doesn't have the linker in the location that cargo expects, so we # need to overwrite it via configuration. From e42c576047c30aac83bf3367c7f2467f2951b9d1 Mon Sep 17 00:00:00 2001 From: eitsupi <50911393+eitsupi@users.noreply.github.com> Date: Thu, 17 Oct 2024 22:10:26 +0900 Subject: [PATCH 5/5] try to fix --- src/Makevars.win | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makevars.win b/src/Makevars.win index 896e5a7f7..498f33598 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -6,7 +6,7 @@ LIBNAME = libr_polars.a TARGET_DIR = $(CURDIR)/rust/target LIBDIR = $(TARGET_DIR)/$(TARGET)/$(LIBR_POLARS_PROFILE) STATLIB = $(LIBDIR)/$(LIBNAME) -PKG_LIBS = -L$(LIBDIR) -lr_polars -lws2_32 -lncrypt -lcrypt32 -ladvapi32 -luserenv -lbcrypt -lole32 -lntdll -lpsapi -liphlpapi -lpdh -lpowrprof -loleaut32 -lnetapi32 -lsecur32 -lsynchronization -lpropsys -lruntimeobject -lkernelbase -t +PKG_LIBS = -L$(LIBDIR) -lr_polars -lws2_32 -lncrypt -lcrypt32 -ladvapi32 -luserenv -lbcrypt -lole32 -lntdll -lpsapi -liphlpapi -lpdh -lpowrprof -loleaut32 -lnetapi32 -lsecur32 -lsynchronization -lpropsys -lruntimeobject -lonecore -t # Rtools42 doesn't have the linker in the location that cargo expects, so we # need to overwrite it via configuration.