Changes to build R client on Fedora. (#4492)

deephaven · Sep 14, 2023 · 0328e4c · 0328e4c
1 parent a00fa05
commit 0328e4c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/R/rdeephaven/DESCRIPTION b/R/rdeephaven/DESCRIPTION
@@ -13,7 +13,7 @@ Description: The `rdeephaven` package provides an R API for communicating with t
  and bind it to a server-side variable so you can access it from any Deephaven client. Finally, you can run Python or Groovy
  scripts on the Deephaven server, so long as your server is equipped with that capability.
 License: Apache License (== 2.0)
-Depends: R (>= 4.1.2), Rcpp (>= 1.0.10), arrow (>= 12.0.0), R6 (>= 2.5.0), dplyr (>= 1.1.0)
+Depends: R (>= 3.5.3), Rcpp (>= 1.0.10), arrow (>= 12.0.0), R6 (>= 2.5.0), dplyr (>= 1.1.0)
 Imports: Rcpp (>= 1.0.10), R6 (>= 2.5.0), dplyr (>= 1.1.0)
 LinkingTo: Rcpp
 Suggests: testthat (>= 3.0.0)

diff --git a/R/rdeephaven/src/Makevars b/R/rdeephaven/src/Makevars
@@ -22,7 +22,7 @@ PROTOBUF_LIB = `[ -f \${DHCPP}/local/lib/libprotobufd.so ] && echo -lprotobufd |
 
 DEPENDENCY_LIBS = \
  $(PROTOBUF_LIB) \
- -larrow_flight -larrow -larrow_bundled_dependencies \
+ -larrow \
  `PKG_CONFIG_PATH=\${DHCPP}/local/lib/pkgconfig pkg-config --libs grpc++`
 
 # tells the compiler where to look for additional include directories

diff --git a/R/rdeephaven/src/client.cpp b/R/rdeephaven/src/client.cpp
@@ -7,6 +7,7 @@
 #include <iostream>
 #include <memory>
 #include <stdexcept>
+#include <cstddef>
 #include <string>
 #include <utility>
 #include <vector>
@@ -256,7 +257,7 @@ class TableHandleWrapper {
  abs_sort = std::vector<bool>(cols.size(), abs_sort[0]);
  }
 
- for(int i = 0; i < cols.size(); i++) {
+ for(std::size_t i = 0; i < cols.size(); i++) {
  if (!descending[i]) {
  sort_pairs.push_back(deephaven::client::SortPair::Ascending(cols[i], abs_sort[i]));
  } else {