Skip to content

Instantly share code, notes, and snippets.

View dakcarto's full-sized avatar

Larry Shaffer dakcarto

  • Black Hills, South Dakota
View GitHub Profile
D, [2018-11-14T17:04:15.237274 #35579] DEBUG -- net.ssh.authentication.methods.publickey[8380e6b0]: publickey succeeded (74:5f:a4:26:e8:b9:7d:cd:e2:5a:79:a8:48:21:4f:7a)
DEBUG winssh: == Net-SSH connection debug-level log END ==
DEBUG winssh: Base SSH exec command: powershell -File C:\Windows\Temp\vagrant-ssh20181114-35579-14wzu48.ps1
DEBUG winssh: stderr: File C:\Windows\Temp\vagrant-ssh20181114-35579-14wzu48.ps1 cannot be loaded because running
DEBUG winssh: stderr: scripts is disabled on this system. For more information, see about_Execution_Policies at
DEBUG winssh: stderr: https:/go.microsoft.com/fwlink/?LinkID=135170.
diff --git a/src/customwidgets/CMakeLists.txt b/src/customwidgets/CMakeLists.txt
index c914eb11fa7..3f3c9151155 100644
--- a/src/customwidgets/CMakeLists.txt
+++ b/src/customwidgets/CMakeLists.txt
@@ -116,6 +116,7 @@ INCLUDE_DIRECTORIES(
)
INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
+ ${QSCINTILLA_INCLUDE_DIR}
${Qt5UiPlugin_INCLUDE_DIRS} # For Qt5
diff --git a/src/customwidgets/CMakeLists.txt b/src/customwidgets/CMakeLists.txt
index f0af8698fc7..0d71a3672a1 100644
--- a/src/customwidgets/CMakeLists.txt
+++ b/src/customwidgets/CMakeLists.txt
@@ -114,6 +114,7 @@ INCLUDE_DIRECTORIES(
)
INCLUDE_DIRECTORIES(SYSTEM
${GEOS_INCLUDE_DIR}
+ ${QSCINTILLA_INCLUDE_DIR}
${Qt5UiPlugin_INCLUDE_DIRS} # For Qt5
@echo off
REM LS: last successful build: 2017/01/19
REM off of master branch: 10b2a2baeb5e016d73bc3e88d188eba38466b796
call "%~dp0\o4w-build-env-64.bat"
set BUILDCONF=Release
echo "PATH: %PATH%"
diff --git a/sipgen/gencode.c b/sipgen/gencode.c
index c5707ef..7b477a8 100644
--- a/sipgen/gencode.c
+++ b/sipgen/gencode.c
@@ -5913,15 +5913,20 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd,
else if (md->slot != no_slot)
generateSlot(mod, cd, NULL, md, fp);
- /* The cast function. */
- if (needsCastFunction(cd))
# cmake_minimum_required(VERSION 2.8.11)
set(CMAKE_MODULE_PATH
"${QGIS_SRC}/cmake"
${CMAKE_MODULE_PATH}
)
set(CMAKE_FIND_LIBRARY_PREFIXES lib)
set(CMAKE_FIND_LIBRARY_SUFFIXES .dylib .so .a)
diff --git a/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
index 74f1e64..789e9ef 100644
--- a/frmts/jpeg2000/jpeg2000_vsil_io.cpp
+++ b/frmts/jpeg2000/jpeg2000_vsil_io.cpp
@@ -194,7 +194,7 @@ static void JPEG2000_VSIL_jas_stream_initbuf(jas_stream_t *stream, int bufmode,
if (!buf) {
/* The caller has not specified a buffer to employ, so allocate
one. */
- if ((stream->bufbase_ = (unsigned char*)jas_malloc(JAS_STREAM_BUFSIZE +
+ if ((stream->bufbase_ = (jas_uchar*)jas_malloc(JAS_STREAM_BUFSIZE +
From d527c8571c4a7e9ed2a671126faa0284ff436019 Mon Sep 17 00:00:00 2001
From: Matteo Ghetta <matteo.ghetta@gmail.com>
Date: Mon, 10 Oct 2016 10:48:27 +0200
Subject: [PATCH] Missing import fixed for R algorithm
---
python/plugins/processing/algs/r/RUtils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python/plugins/processing/algs/r/RUtils.py b/python/plugins/processing/algs/r/RUtils.py
@dakcarto
dakcarto / code-sign-exe.bat
Last active November 1, 2016 17:23
Win Batch script for SHA256 signing an exe using a DigiCert cert
@echo off
:: Code-sign .exe file using signtool and installed DigiCert code-signing cert/key and CA
:: Larry Shaffer lshaffer at boundlessgeo dot com, Oct 2016
::
:: See usage at bottom of script
::
:: Requirements:
:: Need Win SDK 7.0 or higher
:: Need internet connection
#TODO: g2clib and grib (said to be modified)
#TODO: Python 3 modules should be possible since 1.7
#TODO: Create script to make clean tarball
#TODO: msg needs to have PublicDecompWT.zip from EUMETSAT, which is not free;
# Building without msg therefore
#TODO: e00compr bundled?
#TODO: There are tests for bindings -- at least for Perl
#TODO: Java has a directory with test data and a build target called test
# It uses %{JAVA_RUN}; make test seems to work in the build directory
#TODO: e00compr source is the same in the package and bundled in GDAL