treewide: remove unreferenced patch files (#308127)
Found with `fd \\.patch$ pkgs/ -x bash -c 'rg -F "{/}" pkgs/ -q || echo {}'`
This commit is contained in:
Peder Bergebakken Sundt
GitHub
parent
79f4b5b105
commit
db15bbc3d5
20 changed files with 0 additions and 1969 deletions
|
|
@ -1,42 +0,0 @@
|
||||||
Shows build and link errors in configure for ease of debugging which
|
|
||||||
options require what.
|
|
||||||
diff --git a/scripts/checks.sh b/scripts/checks.sh
|
|
||||||
index 64cbbf3..fab4d9b 100644
|
|
||||||
--- a/scripts/checks.sh
|
|
||||||
+++ b/scripts/checks.sh
|
|
||||||
@@ -425,7 +425,7 @@ try_compile()
|
|
||||||
echo "$1" > $__src || exit 1
|
|
||||||
shift
|
|
||||||
__cmd="$CC -c $CFLAGS $@ $__src -o $__obj"
|
|
||||||
- $CC -c $CFLAGS "$@" $__src -o $__obj 2>/dev/null
|
|
||||||
+ $CC -c $CFLAGS "$@" $__src -o $__obj
|
|
||||||
;;
|
|
||||||
cxx)
|
|
||||||
__src=`tmp_file prog.cc`
|
|
||||||
@@ -433,7 +433,7 @@ try_compile()
|
|
||||||
echo "$1" > $__src || exit 1
|
|
||||||
shift
|
|
||||||
__cmd="$CXX -c $CXXFLAGS $@ $__src -o $__obj"
|
|
||||||
- $CXX -c $CXXFLAGS "$@" $__src -o $__obj 2>/dev/null
|
|
||||||
+ $CXX -c $CXXFLAGS "$@" $__src -o $__obj
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
return $?
|
|
||||||
@@ -451,7 +451,7 @@ try_compile_link()
|
|
||||||
echo "$1" > $__src || exit 1
|
|
||||||
shift
|
|
||||||
__cmd="$CC $__src -o $__exe $CFLAGS $LDFLAGS $@"
|
|
||||||
- $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" 2>/dev/null
|
|
||||||
+ $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@"
|
|
||||||
;;
|
|
||||||
cxx)
|
|
||||||
__src=`tmp_file prog.cc`
|
|
||||||
@@ -459,7 +459,7 @@ try_compile_link()
|
|
||||||
echo "$1" > $__src || exit 1
|
|
||||||
shift
|
|
||||||
__cmd="$CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS $@"
|
|
||||||
- $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" 2>/dev/null
|
|
||||||
+ $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
return $?
|
|
||||||
|
|
@ -1,58 +0,0 @@
|
||||||
diff --git a/src/sage/libs/linbox/conversion.pxd b/src/sage/libs/linbox/conversion.pxd
|
|
||||||
index 7794c9edc3..1753277b1f 100644
|
|
||||||
--- a/src/sage/libs/linbox/conversion.pxd
|
|
||||||
+++ b/src/sage/libs/linbox/conversion.pxd
|
|
||||||
@@ -177,9 +177,8 @@ cdef inline Vector_integer_dense new_sage_vector_integer_dense(P, DenseVector_in
|
|
||||||
- v -- linbox vector
|
|
||||||
"""
|
|
||||||
cdef Vector_integer_dense res = P()
|
|
||||||
- cdef cppvector[Integer] * vec = &v.refRep()
|
|
||||||
cdef size_t i
|
|
||||||
for i in range(<size_t> res._degree):
|
|
||||||
- mpz_set(res._entries[i], vec[0][i].get_mpz_const())
|
|
||||||
+ mpz_set(res._entries[i], v.getEntry(i).get_mpz_const())
|
|
||||||
|
|
||||||
return res
|
|
||||||
diff --git a/src/sage/libs/linbox/linbox.pxd b/src/sage/libs/linbox/linbox.pxd
|
|
||||||
index 9112d151f8..dcc482960c 100644
|
|
||||||
--- a/src/sage/libs/linbox/linbox.pxd
|
|
||||||
+++ b/src/sage/libs/linbox/linbox.pxd
|
|
||||||
@@ -32,7 +32,7 @@ cdef extern from "linbox/matrix/dense-matrix.h":
|
|
||||||
ctypedef Modular_double Field
|
|
||||||
ctypedef double Element
|
|
||||||
DenseMatrix_Modular_double(Field F, size_t m, size_t n)
|
|
||||||
- DenseMatrix_Modular_double(Field F, Element*, size_t m, size_t n)
|
|
||||||
+ DenseMatrix_Modular_double(Field F, size_t m, size_t n, Element*)
|
|
||||||
void setEntry(size_t i, size_t j, Element& a)
|
|
||||||
Element &getEntry(size_t i, size_t j)
|
|
||||||
|
|
||||||
@@ -42,7 +42,7 @@ cdef extern from "linbox/matrix/dense-matrix.h":
|
|
||||||
ctypedef Modular_float Field
|
|
||||||
ctypedef float Element
|
|
||||||
DenseMatrix_Modular_float(Field F, size_t m, size_t n)
|
|
||||||
- DenseMatrix_Modular_float(Field F, Element*, size_t m, size_t n)
|
|
||||||
+ DenseMatrix_Modular_float(Field F, size_t m, size_t n, Element*)
|
|
||||||
void setEntry(size_t i, size_t j, Element& a)
|
|
||||||
Element &getEntry(size_t i, size_t j)
|
|
||||||
|
|
||||||
@@ -101,7 +101,6 @@ cdef extern from "linbox/vector/vector.h":
|
|
||||||
DenseVector_integer (Field &F)
|
|
||||||
DenseVector_integer (Field &F, long& m)
|
|
||||||
DenseVector_integer (Field &F, cppvector[Integer]&)
|
|
||||||
- cppvector[Element]& refRep()
|
|
||||||
size_t size()
|
|
||||||
void resize(size_t)
|
|
||||||
void resize(size_t n, const Element&)
|
|
||||||
diff --git a/src/sage/matrix/matrix_modn_dense_template.pxi b/src/sage/matrix/matrix_modn_dense_template.pxi
|
|
||||||
index 010365d76f..3d60726ff9 100644
|
|
||||||
--- a/src/sage/matrix/matrix_modn_dense_template.pxi
|
|
||||||
+++ b/src/sage/matrix/matrix_modn_dense_template.pxi
|
|
||||||
@@ -219,7 +219,7 @@ cdef inline linbox_echelonize_efd(celement modulus, celement* entries, Py_ssize_
|
|
||||||
return 0,[]
|
|
||||||
|
|
||||||
cdef ModField *F = new ModField(<long>modulus)
|
|
||||||
- cdef DenseMatrix *A = new DenseMatrix(F[0], <ModField.Element*>entries,<Py_ssize_t>nrows, <Py_ssize_t>ncols)
|
|
||||||
+ cdef DenseMatrix *A = new DenseMatrix(F[0], <Py_ssize_t>nrows, <Py_ssize_t>ncols, <ModField.Element*>entries)
|
|
||||||
cdef Py_ssize_t r = reducedRowEchelonize(A[0])
|
|
||||||
cdef Py_ssize_t i,j
|
|
||||||
for i in range(nrows):
|
|
||||||
|
|
@ -1,75 +0,0 @@
|
||||||
diff --unified --recursive a/src/gui/TopologyTools.cc b/src/gui/TopologyTools.cc
|
|
||||||
--- a/src/gui/TopologyTools.cc 2021-07-05 05:11:47.000000000 +0200
|
|
||||||
+++ b/src/gui/TopologyTools.cc 2022-12-07 22:35:20.444054124 +0100
|
|
||||||
@@ -3448,7 +3448,7 @@
|
|
||||||
std::find_if(
|
|
||||||
d_visible_boundary_section_seq.begin(),
|
|
||||||
d_visible_boundary_section_seq.end(),
|
|
||||||
- boost::bind(&VisibleSection::d_section_info_index, _1) ==
|
|
||||||
+ boost::bind(&VisibleSection::d_section_info_index, boost::placeholders::_1) ==
|
|
||||||
boost::cref(section_index));
|
|
||||||
|
|
||||||
if (visible_section_iter == d_visible_boundary_section_seq.end())
|
|
||||||
@@ -3467,7 +3467,7 @@
|
|
||||||
std::find_if(
|
|
||||||
d_visible_interior_section_seq.begin(),
|
|
||||||
d_visible_interior_section_seq.end(),
|
|
||||||
- boost::bind(&VisibleSection::d_section_info_index, _1) ==
|
|
||||||
+ boost::bind(&VisibleSection::d_section_info_index, boost::placeholders::_1) ==
|
|
||||||
boost::cref(section_index));
|
|
||||||
|
|
||||||
if (visible_section_iter == d_visible_interior_section_seq.end())
|
|
||||||
diff --unified --recursive a/src/presentation/ReconstructionGeometryRenderer.cc b/src/presentation/ReconstructionGeometryRenderer.cc
|
|
||||||
--- a/src/presentation/ReconstructionGeometryRenderer.cc 2021-07-05 05:11:50.000000000 +0200
|
|
||||||
+++ b/src/presentation/ReconstructionGeometryRenderer.cc 2022-12-07 22:36:11.117884262 +0100
|
|
||||||
@@ -274,7 +274,7 @@
|
|
||||||
GPlatesPresentation::ReconstructionGeometryRenderer::RenderParamsPopulator::visit_reconstruct_visual_layer_params(
|
|
||||||
const ReconstructVisualLayerParams ¶ms)
|
|
||||||
{
|
|
||||||
- d_render_params.show_vgp = boost::bind(&ReconstructVisualLayerParams::show_vgp, ¶ms, _1, _2);
|
|
||||||
+ d_render_params.show_vgp = boost::bind(&ReconstructVisualLayerParams::show_vgp, ¶ms, boost::placeholders::_1, boost::placeholders::_2);
|
|
||||||
d_render_params.vgp_draw_circular_error = params.get_vgp_draw_circular_error();
|
|
||||||
d_render_params.fill_polygons = params.get_fill_polygons();
|
|
||||||
d_render_params.fill_polylines = params.get_fill_polylines();
|
|
||||||
diff --unified --recursive a/src/presentation/VisualLayerRegistry.cc b/src/presentation/VisualLayerRegistry.cc
|
|
||||||
--- a/src/presentation/VisualLayerRegistry.cc 2021-07-05 05:11:50.000000000 +0200
|
|
||||||
+++ b/src/presentation/VisualLayerRegistry.cc 2022-12-07 22:38:12.950877614 +0100
|
|
||||||
@@ -448,7 +448,7 @@
|
|
||||||
&GPlatesQtWidgets::ReconstructScalarCoverageLayerOptionsWidget::create,
|
|
||||||
boost::bind(
|
|
||||||
&ReconstructScalarCoverageVisualLayerParams::create,
|
|
||||||
- _1),
|
|
||||||
+ boost::placeholders::_1),
|
|
||||||
true);
|
|
||||||
|
|
||||||
registry.register_visual_layer_type(
|
|
||||||
@@ -498,7 +498,7 @@
|
|
||||||
// NOTE: We pass in ViewState and not the GlobeAndMapWidget, obtained from
|
|
||||||
// ViewportWindow, because ViewportWindow is not yet available (a reference to
|
|
||||||
// it not yet been initialised inside ViewState) so accessing it would crash...
|
|
||||||
- _1, boost::ref(view_state)),
|
|
||||||
+ boost::placeholders::_1, boost::ref(view_state)),
|
|
||||||
true);
|
|
||||||
|
|
||||||
// DERIVED_DATA group.
|
|
||||||
@@ -549,7 +549,7 @@
|
|
||||||
&GPlatesQtWidgets::VelocityFieldCalculatorLayerOptionsWidget::create,
|
|
||||||
boost::bind(
|
|
||||||
&VelocityFieldCalculatorVisualLayerParams::create,
|
|
||||||
- _1, boost::cref(view_state.get_rendered_geometry_parameters())),
|
|
||||||
+ boost::placeholders::_1, boost::cref(view_state.get_rendered_geometry_parameters())),
|
|
||||||
true);
|
|
||||||
|
|
||||||
using namespace GPlatesUtils;
|
|
||||||
diff --unified --recursive a/src/qt-widgets/ViewportWindow.cc b/src/qt-widgets/ViewportWindow.cc
|
|
||||||
--- a/src/qt-widgets/ViewportWindow.cc 2021-08-05 05:44:01.000000000 +0200
|
|
||||||
+++ b/src/qt-widgets/ViewportWindow.cc 2022-12-07 22:39:20.487981302 +0100
|
|
||||||
@@ -326,7 +326,7 @@
|
|
||||||
*d_geometry_operation_state_ptr,
|
|
||||||
*d_modify_geometry_state,
|
|
||||||
*d_measure_distance_state_ptr,
|
|
||||||
- boost::bind(&canvas_tool_status_message, boost::ref(*this), _1),
|
|
||||||
+ boost::bind(&canvas_tool_status_message, boost::ref(*this), boost::placeholders::_1),
|
|
||||||
get_view_state(),
|
|
||||||
*this);
|
|
||||||
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
diff --git a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc
|
|
||||||
index ca353c4099..499be0a986 100644
|
|
||||||
--- a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc
|
|
||||||
+++ b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc
|
|
||||||
@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
|
|
||||||
// SIGSTKSZ may be too small to prevent the signal handlers from overrunning
|
|
||||||
// the alternative stack. Ensure that the size of the alternative stack is
|
|
||||||
// large enough.
|
|
||||||
- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
|
|
||||||
+ const unsigned kSigStackSize = std::max<unsigned>(16384, SIGSTKSZ);
|
|
||||||
|
|
||||||
// Only set an alternative stack if there isn't already one, or if the current
|
|
||||||
// one is too small.
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,42 +0,0 @@
|
||||||
From a5a4a77dd77ed5c997bec6519adf7b6be3108af2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David McFarland <corngood@gmail.com>
|
|
||||||
Date: Sun, 31 Dec 2023 01:48:31 -0400
|
|
||||||
Subject: [PATCH 2/2] record downloaded packages
|
|
||||||
|
|
||||||
---
|
|
||||||
.../buildBootstrapPreviouslySB.csproj | 6 +++++
|
|
||||||
repo-projects/Directory.Build.targets | 27 +++++++++++++++++++
|
|
||||||
2 files changed, 33 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/eng/bootstrap/buildBootstrapPreviouslySB.csproj
|
|
||||||
index d85e32ca76..280c9eaf89 100644
|
|
||||||
--- a/eng/bootstrap/buildBootstrapPreviouslySB.csproj
|
|
||||||
+++ b/eng/bootstrap/buildBootstrapPreviouslySB.csproj
|
|
||||||
@@ -102,6 +102,12 @@
|
|
||||||
</ItemGroup>
|
|
||||||
</Target>
|
|
||||||
|
|
||||||
+ <Target Name="NuGetToNix" AfterTargets="Restore">
|
|
||||||
+ <Exec
|
|
||||||
+ Command="nuget-to-nix $(RestorePackagesPath) >$(ArchiveDir)deps.nix 2>&1"
|
|
||||||
+ WorkingDirectory="$(MSBuildProjectDirectory)"/>
|
|
||||||
+ </Target>
|
|
||||||
+
|
|
||||||
<Target Name="BuildBoostrapPreviouslySourceBuilt"
|
|
||||||
AfterTargets="Restore"
|
|
||||||
DependsOnTargets="GetPackagesToDownload">
|
|
||||||
diff --git a/repo-projects/Directory.Build.targets b/repo-projects/Directory.Build.targets
|
|
||||||
index 3fa15da862..afd7b87088 100644
|
|
||||||
--- a/repo-projects/Directory.Build.targets
|
|
||||||
+++ b/repo-projects/Directory.Build.targets
|
|
||||||
@@ -471,6 +497,7 @@
|
|
||||||
<ItemGroup>
|
|
||||||
<LogFilesToCopy Include="$(ProjectDirectory)artifacts/**/*.log" />
|
|
||||||
<LogFilesToCopy Include="$(ProjectDirectory)artifacts/**/*.binlog" />
|
|
||||||
+ <LogFilesToCopy Include="$(ProjectDirectory)artifacts/**/deps.nix" />
|
|
||||||
<ObjFilesToCopy Include="$(ProjectDirectory)artifacts/**/project.assets.json" />
|
|
||||||
</ItemGroup>
|
|
||||||
<MakeDir Directories="$(BuildLogsDir)" Condition="Exists('$(ProjectDirectory)artifacts')"/>
|
|
||||||
--
|
|
||||||
2.40.1
|
|
||||||
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
Starting from go1.14, go verifes that vendor/modules.txt matches the requirements
|
|
||||||
and replacements listed in the main module go.mod file, and it is a hard failure if
|
|
||||||
vendor/modules.txt is missing.
|
|
||||||
|
|
||||||
Relax module consistency checks and switch back to pre go1.14 behaviour if
|
|
||||||
vendor/modules.txt is missing regardless of go version requirement in go.mod.
|
|
||||||
|
|
||||||
This has been ported from FreeBSD: https://reviews.freebsd.org/D24122
|
|
||||||
See https://github.com/golang/go/issues/37948 for discussion.
|
|
||||||
|
|
||||||
diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go
|
|
||||||
index d8fd91f1fe..8bc08e6fed 100644
|
|
||||||
--- a/src/cmd/go/internal/modload/vendor.go
|
|
||||||
+++ b/src/cmd/go/internal/modload/vendor.go
|
|
||||||
@@ -133,7 +133,7 @@ func checkVendorConsistency() {
|
|
||||||
readVendorList()
|
|
||||||
|
|
||||||
pre114 := false
|
|
||||||
- if semver.Compare(index.goVersionV, "v1.14") < 0 {
|
|
||||||
+ if semver.Compare(index.goVersionV, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) {
|
|
||||||
// Go versions before 1.14 did not include enough information in
|
|
||||||
// vendor/modules.txt to check for consistency.
|
|
||||||
// If we know that we're on an earlier version, relax the consistency check.
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
From ce73c82ebadeb2e358e1a8e244eef723ffa96c76 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nick Cao <nickcao@nichi.co>
|
|
||||||
Date: Tue, 20 Sep 2022 18:42:31 +0800
|
|
||||||
Subject: [PATCH 1/2] skip building doc
|
|
||||||
|
|
||||||
---
|
|
||||||
Makefile | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index 94df626014..418f6ff268 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -229,7 +229,7 @@ define stringreplace
|
|
||||||
endef
|
|
||||||
|
|
||||||
|
|
||||||
-install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html
|
|
||||||
+install: $(build_depsbindir)/stringreplace
|
|
||||||
ifeq ($(BUNDLE_DEBUG_LIBS),1)
|
|
||||||
@$(MAKE) $(QUIET_MAKE) all
|
|
||||||
else
|
|
||||||
--
|
|
||||||
2.38.1
|
|
||||||
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp
|
|
||||||
index 37ec73468570..b73e75aa6e59 100644
|
|
||||||
--- a/lib/Driver/ToolChains/CommonArgs.cpp
|
|
||||||
+++ b/lib/Driver/ToolChains/CommonArgs.cpp
|
|
||||||
@@ -370,8 +370,8 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args,
|
|
||||||
#endif
|
|
||||||
|
|
||||||
SmallString<1024> Plugin;
|
|
||||||
- llvm::sys::path::native(Twine(ToolChain.getDriver().Dir) +
|
|
||||||
- "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" +
|
|
||||||
+ llvm::sys::path::native(Twine("@libllvmLibdir@"
|
|
||||||
+ "/LLVMgold") +
|
|
||||||
Suffix,
|
|
||||||
Plugin);
|
|
||||||
CmdArgs.push_back(Args.MakeArgString(Plugin));
|
|
||||||
|
|
@ -1,80 +0,0 @@
|
||||||
https://github.com/llvm/llvm-project/commit/68d5235cb58f988c71b403334cd9482d663841ab.patch
|
|
||||||
https://reviews.llvm.org/D102059
|
|
||||||
--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
|
|
||||||
+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
|
|
||||||
@@ -370,15 +370,6 @@ static void ioctl_table_fill() {
|
|
||||||
|
|
||||||
#if SANITIZER_GLIBC
|
|
||||||
// _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
|
|
||||||
- _(CYGETDEFTHRESH, WRITE, sizeof(int));
|
|
||||||
- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
|
|
||||||
- _(CYGETMON, WRITE, struct_cyclades_monitor_sz);
|
|
||||||
- _(CYGETTHRESH, WRITE, sizeof(int));
|
|
||||||
- _(CYGETTIMEOUT, WRITE, sizeof(int));
|
|
||||||
- _(CYSETDEFTHRESH, NONE, 0);
|
|
||||||
- _(CYSETDEFTIMEOUT, NONE, 0);
|
|
||||||
- _(CYSETTHRESH, NONE, 0);
|
|
||||||
- _(CYSETTIMEOUT, NONE, 0);
|
|
||||||
_(EQL_EMANCIPATE, WRITE, struct_ifreq_sz);
|
|
||||||
_(EQL_ENSLAVE, WRITE, struct_ifreq_sz);
|
|
||||||
_(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz);
|
|
||||||
--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
|
||||||
+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
|
||||||
@@ -143,7 +143,6 @@ typedef struct user_fpregs elf_fpregset_t;
|
|
||||||
# include <sys/procfs.h>
|
|
||||||
#endif
|
|
||||||
#include <sys/user.h>
|
|
||||||
-#include <linux/cyclades.h>
|
|
||||||
#include <linux/if_eql.h>
|
|
||||||
#include <linux/if_plip.h>
|
|
||||||
#include <linux/lp.h>
|
|
||||||
@@ -460,7 +459,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
|
|
||||||
|
|
||||||
#if SANITIZER_GLIBC
|
|
||||||
unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
|
|
||||||
- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
|
|
||||||
#if EV_VERSION > (0x010000)
|
|
||||||
unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry);
|
|
||||||
#else
|
|
||||||
@@ -824,15 +822,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
|
|
||||||
#endif // SANITIZER_LINUX
|
|
||||||
|
|
||||||
#if SANITIZER_LINUX && !SANITIZER_ANDROID
|
|
||||||
- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
|
|
||||||
- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
|
|
||||||
- unsigned IOCTL_CYGETMON = CYGETMON;
|
|
||||||
- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH;
|
|
||||||
- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT;
|
|
||||||
- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH;
|
|
||||||
- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT;
|
|
||||||
- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH;
|
|
||||||
- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT;
|
|
||||||
unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE;
|
|
||||||
unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE;
|
|
||||||
unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG;
|
|
||||||
--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h
|
|
||||||
+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
|
|
||||||
@@ -983,7 +983,6 @@ extern unsigned struct_vt_mode_sz;
|
|
||||||
|
|
||||||
#if SANITIZER_LINUX && !SANITIZER_ANDROID
|
|
||||||
extern unsigned struct_ax25_parms_struct_sz;
|
|
||||||
-extern unsigned struct_cyclades_monitor_sz;
|
|
||||||
extern unsigned struct_input_keymap_entry_sz;
|
|
||||||
extern unsigned struct_ipx_config_data_sz;
|
|
||||||
extern unsigned struct_kbdiacrs_sz;
|
|
||||||
@@ -1328,15 +1327,6 @@ extern unsigned IOCTL_VT_WAITACTIVE;
|
|
||||||
#endif // SANITIZER_LINUX
|
|
||||||
|
|
||||||
#if SANITIZER_LINUX && !SANITIZER_ANDROID
|
|
||||||
-extern unsigned IOCTL_CYGETDEFTHRESH;
|
|
||||||
-extern unsigned IOCTL_CYGETDEFTIMEOUT;
|
|
||||||
-extern unsigned IOCTL_CYGETMON;
|
|
||||||
-extern unsigned IOCTL_CYGETTHRESH;
|
|
||||||
-extern unsigned IOCTL_CYGETTIMEOUT;
|
|
||||||
-extern unsigned IOCTL_CYSETDEFTHRESH;
|
|
||||||
-extern unsigned IOCTL_CYSETDEFTIMEOUT;
|
|
||||||
-extern unsigned IOCTL_CYSETTHRESH;
|
|
||||||
-extern unsigned IOCTL_CYSETTIMEOUT;
|
|
||||||
extern unsigned IOCTL_EQL_EMANCIPATE;
|
|
||||||
extern unsigned IOCTL_EQL_ENSLAVE;
|
|
||||||
extern unsigned IOCTL_EQL_GETMASTRCFG;
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 4138acf..41b4763 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -362,6 +362,7 @@ if (NOT LIBCXXABI_ENABLE_THREADS)
|
|
||||||
" is also set to ON.")
|
|
||||||
endif()
|
|
||||||
add_definitions(-D_LIBCXXABI_HAS_NO_THREADS)
|
|
||||||
+ add_definitions(-D_LIBCPP_HAS_NO_THREADS)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (LIBCXXABI_HAS_EXTERNAL_THREAD_API)
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
From aed233638604b46c9a0c51e08d096d47303375ca Mon Sep 17 00:00:00 2001
|
|
||||||
From: Douglas Katzman <dougk@google.com>
|
|
||||||
Date: Tue, 2 Jan 2024 09:20:48 -0500
|
|
||||||
Subject: [PATCH] Fix multiple def error
|
|
||||||
|
|
||||||
reported by Hraban Luyat
|
|
||||||
---
|
|
||||||
src/runtime/gc-common.c | 1 +
|
|
||||||
src/runtime/gc.h | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/runtime/gc-common.c b/src/runtime/gc-common.c
|
|
||||||
index 51963b8ff..07536f628 100644
|
|
||||||
--- a/src/runtime/gc-common.c
|
|
||||||
+++ b/src/runtime/gc-common.c
|
|
||||||
@@ -2999,6 +2999,7 @@ void recompute_gen_bytes_allocated() {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef LISP_FEATURE_DARWIN_JIT
|
|
||||||
+_Atomic(char) *page_execp;
|
|
||||||
#include "sys_mmap.inc"
|
|
||||||
#include <errno.h>
|
|
||||||
/* darwin-jit has another reason to remap besides just zeroing, namely,
|
|
||||||
diff --git a/src/runtime/gc.h b/src/runtime/gc.h
|
|
||||||
index 804e6fce2..5fdc215c2 100644
|
|
||||||
--- a/src/runtime/gc.h
|
|
||||||
+++ b/src/runtime/gc.h
|
|
||||||
@@ -151,7 +151,7 @@ extern void prepare_pages(bool commit, page_index_t start, page_index_t end,
|
|
||||||
* squeeze a bit into the 'type' field of the page table, but it's clearer to
|
|
||||||
* have this externally so that page type 0 remains as "free" */
|
|
||||||
#ifdef LISP_FEATURE_DARWIN_JIT
|
|
||||||
-_Atomic(char) *page_execp;
|
|
||||||
+extern _Atomic(char) *page_execp;
|
|
||||||
static inline void set_page_executable(page_index_t i, bool val) { page_execp[i] = val; }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
--
|
|
||||||
2.42.0
|
|
||||||
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
From 8d9ab4b6ed24a97e8af0cc338a52aacdcf438b8c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Pavel Sobolev <paveloom@riseup.net>
|
|
||||||
Date: Tue, 21 Nov 2023 20:53:33 +0300
|
|
||||||
Subject: [PATCH] Force-unwrap file handles.
|
|
||||||
|
|
||||||
---
|
|
||||||
Sources/TSCBasic/FileSystem.swift | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Sources/TSCBasic/FileSystem.swift b/Sources/TSCBasic/FileSystem.swift
|
|
||||||
index 3a63bdf..a1f3d9d 100644
|
|
||||||
--- a/Sources/TSCBasic/FileSystem.swift
|
|
||||||
+++ b/Sources/TSCBasic/FileSystem.swift
|
|
||||||
@@ -425,7 +425,7 @@ private class LocalFileSystem: FileSystem {
|
|
||||||
if fp == nil {
|
|
||||||
throw FileSystemError(errno: errno, path)
|
|
||||||
}
|
|
||||||
- defer { fclose(fp) }
|
|
||||||
+ defer { fclose(fp!) }
|
|
||||||
|
|
||||||
// Read the data one block at a time.
|
|
||||||
let data = BufferedOutputByteStream()
|
|
||||||
@@ -455,7 +455,7 @@ private class LocalFileSystem: FileSystem {
|
|
||||||
if fp == nil {
|
|
||||||
throw FileSystemError(errno: errno, path)
|
|
||||||
}
|
|
||||||
- defer { fclose(fp) }
|
|
||||||
+ defer { fclose(fp!) }
|
|
||||||
|
|
||||||
// Write the data in one chunk.
|
|
||||||
var contents = bytes.contents
|
|
||||||
--
|
|
||||||
2.42.0
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
diff --git a/avogadro/qtplugins/templatetool/CMakeLists.txt b/avogadro/qtplugins/templatetool/CMakeLists.txt
|
|
||||||
index 3f68e6dd..822de4e5 100644
|
|
||||||
--- a/avogadro/qtplugins/templatetool/CMakeLists.txt
|
|
||||||
+++ b/avogadro/qtplugins/templatetool/CMakeLists.txt
|
|
||||||
@@ -24,7 +24,7 @@ avogadro_plugin(TemplateTool
|
|
||||||
)
|
|
||||||
|
|
||||||
# Install the fragments
|
|
||||||
-set(_fragments "${AvogadroLibs_SOURCE_DIR}/../fragments")
|
|
||||||
+set(_fragments "${AvogadroLibs_SOURCE_DIR}/fragments")
|
|
||||||
|
|
||||||
# Look in parallel directory for the molecule fragment repository
|
|
||||||
if(NOT EXISTS "${_fragments}")
|
|
||||||
|
|
@ -1,143 +0,0 @@
|
||||||
diff --git a/eventlet/hubs/hub.py b/eventlet/hubs/hub.py
|
|
||||||
index db55958..c27b81f 100644
|
|
||||||
--- a/eventlet/hubs/hub.py
|
|
||||||
+++ b/eventlet/hubs/hub.py
|
|
||||||
@@ -21,7 +21,7 @@ else:
|
|
||||||
|
|
||||||
import eventlet.hubs
|
|
||||||
from eventlet.hubs import timer
|
|
||||||
-from eventlet.support import greenlets as greenlet, clear_sys_exc_info
|
|
||||||
+from eventlet.support import greenlets as greenlet
|
|
||||||
try:
|
|
||||||
from monotonic import monotonic
|
|
||||||
except ImportError:
|
|
||||||
@@ -309,7 +309,6 @@ class BaseHub(object):
|
|
||||||
cur.parent = self.greenlet
|
|
||||||
except ValueError:
|
|
||||||
pass # gets raised if there is a greenlet parent cycle
|
|
||||||
- clear_sys_exc_info()
|
|
||||||
return self.greenlet.switch()
|
|
||||||
|
|
||||||
def squelch_exception(self, fileno, exc_info):
|
|
||||||
@@ -397,13 +396,11 @@ class BaseHub(object):
|
|
||||||
if self.debug_exceptions:
|
|
||||||
traceback.print_exception(*exc_info)
|
|
||||||
sys.stderr.flush()
|
|
||||||
- clear_sys_exc_info()
|
|
||||||
|
|
||||||
def squelch_timer_exception(self, timer, exc_info):
|
|
||||||
if self.debug_exceptions:
|
|
||||||
traceback.print_exception(*exc_info)
|
|
||||||
sys.stderr.flush()
|
|
||||||
- clear_sys_exc_info()
|
|
||||||
|
|
||||||
def add_timer(self, timer):
|
|
||||||
scheduled_time = self.clock() + timer.seconds
|
|
||||||
@@ -478,7 +475,6 @@ class BaseHub(object):
|
|
||||||
raise
|
|
||||||
except:
|
|
||||||
self.squelch_timer_exception(timer, sys.exc_info())
|
|
||||||
- clear_sys_exc_info()
|
|
||||||
|
|
||||||
# for debugging:
|
|
||||||
|
|
||||||
diff --git a/eventlet/hubs/kqueue.py b/eventlet/hubs/kqueue.py
|
|
||||||
index bad4a87..8438805 100644
|
|
||||||
--- a/eventlet/hubs/kqueue.py
|
|
||||||
+++ b/eventlet/hubs/kqueue.py
|
|
||||||
@@ -109,4 +109,3 @@ class Hub(hub.BaseHub):
|
|
||||||
raise
|
|
||||||
except:
|
|
||||||
self.squelch_exception(fileno, sys.exc_info())
|
|
||||||
- support.clear_sys_exc_info()
|
|
||||||
diff --git a/eventlet/hubs/poll.py b/eventlet/hubs/poll.py
|
|
||||||
index 1bbd401..d3f9c6a 100644
|
|
||||||
--- a/eventlet/hubs/poll.py
|
|
||||||
+++ b/eventlet/hubs/poll.py
|
|
||||||
@@ -113,7 +113,6 @@ class Hub(hub.BaseHub):
|
|
||||||
raise
|
|
||||||
except:
|
|
||||||
self.squelch_exception(fileno, sys.exc_info())
|
|
||||||
- support.clear_sys_exc_info()
|
|
||||||
|
|
||||||
if self.debug_blocking:
|
|
||||||
self.block_detect_post()
|
|
||||||
diff --git a/eventlet/hubs/selects.py b/eventlet/hubs/selects.py
|
|
||||||
index 0ead5b8..0386a1e 100644
|
|
||||||
--- a/eventlet/hubs/selects.py
|
|
||||||
+++ b/eventlet/hubs/selects.py
|
|
||||||
@@ -61,4 +61,3 @@ class Hub(hub.BaseHub):
|
|
||||||
raise
|
|
||||||
except:
|
|
||||||
self.squelch_exception(fileno, sys.exc_info())
|
|
||||||
- support.clear_sys_exc_info()
|
|
||||||
diff --git a/eventlet/support/__init__.py b/eventlet/support/__init__.py
|
|
||||||
index 43bac91..b1c1607 100644
|
|
||||||
--- a/eventlet/support/__init__.py
|
|
||||||
+++ b/eventlet/support/__init__.py
|
|
||||||
@@ -30,15 +30,6 @@ def get_errno(exc):
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
-if sys.version_info[0] < 3 and not greenlets.preserves_excinfo:
|
|
||||||
- from sys import exc_clear as clear_sys_exc_info
|
|
||||||
-else:
|
|
||||||
- def clear_sys_exc_info():
|
|
||||||
- """No-op In py3k.
|
|
||||||
- Exception information is not visible outside of except statements.
|
|
||||||
- sys.exc_clear became obsolete and removed."""
|
|
||||||
- pass
|
|
||||||
-
|
|
||||||
if sys.version_info[0] < 3:
|
|
||||||
def bytes_to_str(b, encoding='ascii'):
|
|
||||||
return b
|
|
||||||
diff --git a/eventlet/support/greenlets.py b/eventlet/support/greenlets.py
|
|
||||||
index d4e1793..b939328 100644
|
|
||||||
--- a/eventlet/support/greenlets.py
|
|
||||||
+++ b/eventlet/support/greenlets.py
|
|
||||||
@@ -1,8 +1,4 @@
|
|
||||||
-import distutils.version
|
|
||||||
-
|
|
||||||
import greenlet
|
|
||||||
getcurrent = greenlet.greenlet.getcurrent
|
|
||||||
GreenletExit = greenlet.greenlet.GreenletExit
|
|
||||||
-preserves_excinfo = (distutils.version.LooseVersion(greenlet.__version__)
|
|
||||||
- >= distutils.version.LooseVersion('0.3.2'))
|
|
||||||
greenlet = greenlet.greenlet
|
|
||||||
diff --git a/setup.py b/setup.py
|
|
||||||
index a8f4684..9b927e0 100644
|
|
||||||
--- a/setup.py
|
|
||||||
+++ b/setup.py
|
|
||||||
@@ -19,7 +19,7 @@ setuptools.setup(
|
|
||||||
packages=setuptools.find_packages(exclude=['benchmarks', 'tests', 'tests.*']),
|
|
||||||
install_requires=(
|
|
||||||
'dnspython >= 1.15.0',
|
|
||||||
- 'greenlet >= 0.3',
|
|
||||||
+ 'greenlet >= 1.0',
|
|
||||||
'monotonic >= 1.4;python_version<"3.5"',
|
|
||||||
'six >= 1.10.0',
|
|
||||||
),
|
|
||||||
diff --git a/tests/hub_test.py b/tests/hub_test.py
|
|
||||||
index a531b75..05c0024 100644
|
|
||||||
--- a/tests/hub_test.py
|
|
||||||
+++ b/tests/hub_test.py
|
|
||||||
@@ -194,7 +194,6 @@ class TestExceptionInMainloop(tests.LimitedTestCase):
|
|
||||||
|
|
||||||
class TestExceptionInGreenthread(tests.LimitedTestCase):
|
|
||||||
|
|
||||||
- @skip_unless(greenlets.preserves_excinfo)
|
|
||||||
def test_exceptionpreservation(self):
|
|
||||||
# events for controlling execution order
|
|
||||||
gt1event = eventlet.Event()
|
|
||||||
diff --git a/tests/test__refcount.py b/tests/test__refcount.py
|
|
||||||
index 1090a1f..5c1c002 100644
|
|
||||||
--- a/tests/test__refcount.py
|
|
||||||
+++ b/tests/test__refcount.py
|
|
||||||
@@ -57,7 +57,6 @@ def run_interaction(run_client):
|
|
||||||
|
|
||||||
def run_and_check(run_client):
|
|
||||||
w = run_interaction(run_client=run_client)
|
|
||||||
- # clear_sys_exc_info()
|
|
||||||
gc.collect()
|
|
||||||
fd = w()
|
|
||||||
print('run_and_check: weakref fd:', fd)
|
|
||||||
|
|
@ -1,71 +0,0 @@
|
||||||
From 0d0476328a1a2e3dd3e96340bd4ddd04d98c067b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ralf Gommers <ralf.gommers@gmail.com>
|
|
||||||
Date: Thu, 26 Oct 2023 16:57:03 +0200
|
|
||||||
Subject: [PATCH] BLD: remove last usage of `distutils` in
|
|
||||||
`_core/code_generators/`
|
|
||||||
|
|
||||||
---
|
|
||||||
numpy/core/code_generators/genapi.py | 9 ---------
|
|
||||||
numpy/core/code_generators/generate_numpy_api.py | 7 +------
|
|
||||||
numpy/core/code_generators/generate_ufunc_api.py | 7 +------
|
|
||||||
3 files changed, 2 insertions(+), 21 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/numpy/core/code_generators/genapi.py b/numpy/core/code_generators/genapi.py
|
|
||||||
index 2cdaba52d..d9d7862b2 100644
|
|
||||||
--- a/numpy/core/code_generators/genapi.py
|
|
||||||
+++ b/numpy/core/code_generators/genapi.py
|
|
||||||
@@ -304,15 +304,6 @@ def find_functions(filename, tag='API'):
|
|
||||||
fo.close()
|
|
||||||
return functions
|
|
||||||
|
|
||||||
-def should_rebuild(targets, source_files):
|
|
||||||
- from distutils.dep_util import newer_group
|
|
||||||
- for t in targets:
|
|
||||||
- if not os.path.exists(t):
|
|
||||||
- return True
|
|
||||||
- sources = API_FILES + list(source_files) + [__file__]
|
|
||||||
- if newer_group(sources, targets[0], missing='newer'):
|
|
||||||
- return True
|
|
||||||
- return False
|
|
||||||
|
|
||||||
def write_file(filename, data):
|
|
||||||
"""
|
|
||||||
diff --git a/numpy/core/code_generators/generate_numpy_api.py b/numpy/core/code_generators/generate_numpy_api.py
|
|
||||||
index ae38c4efc..640bae9e5 100644
|
|
||||||
--- a/numpy/core/code_generators/generate_numpy_api.py
|
|
||||||
+++ b/numpy/core/code_generators/generate_numpy_api.py
|
|
||||||
@@ -148,12 +148,7 @@ def generate_api(output_dir, force=False):
|
|
||||||
targets = (h_file, c_file)
|
|
||||||
|
|
||||||
sources = numpy_api.multiarray_api
|
|
||||||
-
|
|
||||||
- if (not force and not genapi.should_rebuild(targets, [numpy_api.__file__, __file__])):
|
|
||||||
- return targets
|
|
||||||
- else:
|
|
||||||
- do_generate_api(targets, sources)
|
|
||||||
-
|
|
||||||
+ do_generate_api(targets, sources)
|
|
||||||
return targets
|
|
||||||
|
|
||||||
def do_generate_api(targets, sources):
|
|
||||||
diff --git a/numpy/core/code_generators/generate_ufunc_api.py b/numpy/core/code_generators/generate_ufunc_api.py
|
|
||||||
index e03299a52..3734cbd6a 100644
|
|
||||||
--- a/numpy/core/code_generators/generate_ufunc_api.py
|
|
||||||
+++ b/numpy/core/code_generators/generate_ufunc_api.py
|
|
||||||
@@ -125,12 +125,7 @@ def generate_api(output_dir, force=False):
|
|
||||||
targets = (h_file, c_file)
|
|
||||||
|
|
||||||
sources = ['ufunc_api_order.txt']
|
|
||||||
-
|
|
||||||
- if (not force and not genapi.should_rebuild(targets, sources + [__file__])):
|
|
||||||
- return targets
|
|
||||||
- else:
|
|
||||||
- do_generate_api(targets, sources)
|
|
||||||
-
|
|
||||||
+ do_generate_api(targets, sources)
|
|
||||||
return targets
|
|
||||||
|
|
||||||
def do_generate_api(targets, sources):
|
|
||||||
--
|
|
||||||
2.42.0
|
|
||||||
|
|
||||||
|
|
@ -1,47 +0,0 @@
|
||||||
diff -r c2c7f37b1afb src/core/gui/irc/ircdock.cpp
|
|
||||||
--- a/src/core/gui/irc/ircdock.cpp Tue Mar 06 00:14:23 2018 +0100
|
|
||||||
+++ b/src/core/gui/irc/ircdock.cpp Sat Jul 28 16:53:04 2018 -0700
|
|
||||||
@@ -32,6 +32,7 @@
|
|
||||||
#include <QInputDialog>
|
|
||||||
#include <QMessageBox>
|
|
||||||
#include <QToolBar>
|
|
||||||
+#include <QTabBar>
|
|
||||||
|
|
||||||
DClass<IRCDock> : public Ui::IRCDock
|
|
||||||
{
|
|
||||||
diff -r c2c7f37b1afb src/core/gui/logdock.cpp
|
|
||||||
--- a/src/core/gui/logdock.cpp Tue Mar 06 00:14:23 2018 +0100
|
|
||||||
+++ b/src/core/gui/logdock.cpp Sat Jul 28 16:53:04 2018 -0700
|
|
||||||
@@ -21,6 +21,8 @@
|
|
||||||
// Copyright (C) 2009 "Zalewa" <zalewapl@gmail.com>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
+#include <QAction>
|
|
||||||
+
|
|
||||||
#include "clipboard.h"
|
|
||||||
#include "logdock.h"
|
|
||||||
#include "log.h"
|
|
||||||
diff -r c2c7f37b1afb src/core/gui/serverdetailsdock.cpp
|
|
||||||
--- a/src/core/gui/serverdetailsdock.cpp Tue Mar 06 00:14:23 2018 +0100
|
|
||||||
+++ b/src/core/gui/serverdetailsdock.cpp Sat Jul 28 16:53:04 2018 -0700
|
|
||||||
@@ -21,6 +21,7 @@
|
|
||||||
// Copyright (C) 2014 Braden "Blzut3" Obrzut <admin@maniacsvault.net>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
+#include <QAction>
|
|
||||||
#include <QBoxLayout>
|
|
||||||
|
|
||||||
#include "serverdetailsdock.h"
|
|
||||||
diff -r c2c7f37b1afb src/core/gui/serverfilterdock.cpp
|
|
||||||
--- a/src/core/gui/serverfilterdock.cpp Tue Mar 06 00:14:23 2018 +0100
|
|
||||||
+++ b/src/core/gui/serverfilterdock.cpp Sat Jul 28 16:53:04 2018 -0700
|
|
||||||
@@ -20,6 +20,9 @@
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
// Copyright (C) 2011 "Zalewa" <zalewapl@gmail.com>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
+
|
|
||||||
+#include <QAction>
|
|
||||||
+
|
|
||||||
#include "serverfilterdock.h"
|
|
||||||
#include "ui_serverfilterdock.h"
|
|
||||||
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
|
|
||||||
index 3fee4259af9..53cc3107f46 100644
|
|
||||||
--- a/lib/discourse_js_processor.rb
|
|
||||||
+++ b/lib/discourse_js_processor.rb
|
|
||||||
@@ -111,8 +111,6 @@ class DiscourseJsProcessor
|
|
||||||
|
|
||||||
def self.generate_js_processor
|
|
||||||
Discourse::Utils.execute_command(
|
|
||||||
- "yarn",
|
|
||||||
- "--silent",
|
|
||||||
"esbuild",
|
|
||||||
"--log-level=warning",
|
|
||||||
"--bundle",
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
diff --git a/lib/discourse.rb b/lib/discourse.rb
|
|
||||||
index ea2a3cbafd..66454d9157 100644
|
|
||||||
--- a/lib/discourse.rb
|
|
||||||
+++ b/lib/discourse.rb
|
|
||||||
@@ -62,7 +62,7 @@ module Discourse
|
|
||||||
fd.fsync()
|
|
||||||
end
|
|
||||||
|
|
||||||
- File.rename(temp_destination, destination)
|
|
||||||
+ FileUtils.mv(temp_destination, destination)
|
|
||||||
|
|
||||||
nil
|
|
||||||
end
|
|
||||||
@@ -76,7 +76,7 @@ module Discourse
|
|
||||||
FileUtils.mkdir_p(File.join(Rails.root, 'tmp'))
|
|
||||||
temp_destination = File.join(Rails.root, 'tmp', SecureRandom.hex)
|
|
||||||
execute_command('ln', '-s', source, temp_destination)
|
|
||||||
- File.rename(temp_destination, destination)
|
|
||||||
+ FileUtils.mv(temp_destination, destination)
|
|
||||||
|
|
||||||
nil
|
|
||||||
end
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
||||||
diff --git a/gam/__init__.py b/gam/__init__.py
|
|
||||||
index 1c187ce..b2de793 100755
|
|
||||||
--- a/gam/__init__.py
|
|
||||||
+++ b/gam/__init__.py
|
|
||||||
@@ -549,22 +549,16 @@ def SetGlobalVariables():
|
|
||||||
_getOldEnvVar(GC_TLS_MIN_VERSION, 'GAM_TLS_MIN_VERSION')
|
|
||||||
_getOldEnvVar(GC_TLS_MAX_VERSION, 'GAM_TLS_MAX_VERSION')
|
|
||||||
_getOldEnvVar(GC_CA_FILE, 'GAM_CA_FILE')
|
|
||||||
- _getOldSignalFile(GC_DEBUG_LEVEL,
|
|
||||||
- 'debug.gam',
|
|
||||||
- filePresentValue=4,
|
|
||||||
- fileAbsentValue=0)
|
|
||||||
- _getOldSignalFile(GC_NO_BROWSER, 'nobrowser.txt')
|
|
||||||
- _getOldSignalFile(GC_NO_TDEMAIL, 'notdemail.txt')
|
|
||||||
- _getOldSignalFile(GC_OAUTH_BROWSER, 'oauthbrowser.txt')
|
|
||||||
+ _getOldEnvVar(GC_DEBUG_LEVEL, 'GAM_DEBUG')
|
|
||||||
+ _getOldEnvVar(GC_NO_BROWSER, 'GAM_NO_BROWSER')
|
|
||||||
+ _getOldEnvVar(GC_NO_TDEMAIL, 'GAM_NO_TDEMAIL')
|
|
||||||
+ _getOldEnvVar(GC_OAUTH_BROWSER, 'GAM_OAUTH_BROWSER')
|
|
||||||
# _getOldSignalFile(GC_NO_CACHE, u'nocache.txt')
|
|
||||||
# _getOldSignalFile(GC_CACHE_DISCOVERY_ONLY, u'allcache.txt', filePresentValue=False, fileAbsentValue=True)
|
|
||||||
- _getOldSignalFile(GC_NO_CACHE,
|
|
||||||
- 'allcache.txt',
|
|
||||||
- filePresentValue=False,
|
|
||||||
- fileAbsentValue=True)
|
|
||||||
- _getOldSignalFile(GC_NO_SHORT_URLS, 'noshorturls.txt')
|
|
||||||
- _getOldSignalFile(GC_NO_UPDATE_CHECK, 'noupdatecheck.txt')
|
|
||||||
- _getOldSignalFile(GC_ENABLE_DASA, FN_ENABLEDASA_TXT)
|
|
||||||
+ _getOldEnvVar(GC_NO_CACHE, 'GAM_NO_CACHE')
|
|
||||||
+ _getOldEnvVar(GC_NO_SHORT_URLS, 'GAM_NO_SHORT_URLS')
|
|
||||||
+ GC_Defaults[GC_NO_UPDATE_CHECK] = True
|
|
||||||
+ _getOldEnvVar(GC_ENABLE_DASA, FN_ENABLEDASA_TXT)
|
|
||||||
# Assign directories first
|
|
||||||
for itemName in GC_VAR_INFO:
|
|
||||||
if GC_VAR_INFO[itemName][GC_VAR_TYPE] == GC_TYPE_DIRECTORY:
|
|
||||||
--
|
|
||||||
2.36.0
|
|
||||||
|
|
||||||
Loading…
Reference in a new issue