Skip to content

Commit faed480

Browse files
elpasoelpaso
committedFeb 19, 2021
mxe -> fedora mingw64 from Sourcepole
Replace MXE with fedora mingw64 cross build recipe with python. Thanks to Sandro Mani!
·
ltr-3_40final-3_20_0
1 parent ce4ce5d commit faed480

File tree

8 files changed

+362
-358
lines changed

8 files changed

+362
-358
lines changed
 

‎ms-windows/mingw/build.sh

Lines changed: 255 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,255 @@
1+
#!/bin/bash
2+
# Script to build QGIS inside the qgis-build-deps-mingw.dockerfile Docker container
3+
# Run from QGIS root dirctory with:
4+
# docker run --rm -w /QGIS -v $(pwd):/QGIS elpaso/qgis-deps-mingw:latest /QGIS/ms-windows/mingw/build.sh
5+
6+
7+
#!/bin/sh
8+
9+
ARCH=${1:-x86_64}
10+
DEBUG=false
11+
if [ "$2" == "DEBUG" ]; then
12+
DEBUG=true
13+
fi
14+
NJOBS=${3:-$(($(grep -c ^processor /proc/cpuinfo) * 3 / 2))}
15+
16+
17+
if [ "$ARCH" == "i686" ]; then
18+
bits=32
19+
elif [ "$ARCH" == "x86_64" ]; then
20+
bits=64
21+
else
22+
echo "Error: unrecognized ARCHitecture $ARCH"
23+
exit 1
24+
fi
25+
26+
# Do copies instead of links if building inside container
27+
if [ -f /.dockerenv ]; then
28+
lnk() {
29+
cp -aL "$1" "$2"
30+
}
31+
else
32+
lnk() {
33+
ln -sf "$1" "$2"
34+
}
35+
fi
36+
37+
# Note: This script is written to be used with the Fedora mingw environment
38+
MINGWROOT=/usr/$ARCH-w64-mingw32/sys-root/mingw
39+
40+
if $DEBUG; then
41+
OPTFLAGS="-O0 -g1 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-omit-frame-pointer"
42+
buildtype="DEBUG"
43+
else
44+
OPTFLAGS="-O2 -g1 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-omit-frame-pointer"
45+
buildtype="RelWithDEBUGInfo"
46+
fi
47+
pyver=$(mingw${bits}-python3 -c "import sys; print('.'.join(list(map(str, sys.version_info))[0:2]))")
48+
49+
# Halt on errors
50+
set -e
51+
52+
export MINGW32_CFLAGS="$OPTFLAGS"
53+
export MINGW32_CXXFLAGS="$OPTFLAGS"
54+
export MINGW64_CFLAGS="$OPTFLAGS"
55+
export MINGW64_CXXFLAGS="$OPTFLAGS"
56+
57+
SRCDIR="$(readlink -f "$(dirname "$(readlink -f "$0")")/../..")"
58+
if $DEBUG; then
59+
BUILDDIR="$SRCDIR/build_mingw${bits}_DEBUG"
60+
else
61+
BUILDDIR="$SRCDIR/build_mingw${bits}"
62+
fi
63+
installroot="$BUILDDIR/dist"
64+
installprefix="$installroot/usr/$ARCH-w64-mingw32/sys-root/mingw"
65+
66+
# Cleanup
67+
rm -rf "$installroot"
68+
69+
# Build
70+
mkdir -p $BUILDDIR
71+
(
72+
cd $BUILDDIR
73+
qsci_ver=$(grep -Eo '\s*([0-9]+\.[0-9]+\.[0-9]+)' $MINGWROOT/include/qt5/Qsci/qsciglobal.h)
74+
mingw$bits-cmake \
75+
-DCMAKE_CROSS_COMPILING=1 \
76+
-DCMAKE_BUILD_TYPE=$buildtype \
77+
-DNATIVE_CRSSYNC_BIN=$(readlink -f $SRCDIR)/build/output/bin/crssync \
78+
-DQSCINTILLA_VERSION_STR=$qsci_ver \
79+
-DQSCINTILLA_LIBRARY=$MINGWROOT/lib/libqscintilla2_qt5.dll.a \
80+
-DQSCI_MOD_VERSION_STR=$qsci_ver \
81+
-DQWT_INCLUDE_DIR=$MINGWROOT/include/qt5/qwt \
82+
-DQSCI_SIP_DIR=$MINGWROOT/share/sip/PyQt5/Qsci/ \
83+
-DBUILD_TESTING=OFF \
84+
-DZSTD_INCLUDE_DIR=/usr/x86_64-w64-mingw32/sys-root/mingw/include/zstd/ \
85+
-DENABLE_TESTS=OFF \
86+
-DQGIS_BIN_SUBDIR=bin \
87+
-DQGIS_CGIBIN_SUBDIR=bin \
88+
-DQGIS_LIB_SUBDIR=lib \
89+
-DQGIS_LIBEXEC_SUBDIR=lib/qgis \
90+
-DQGIS_DATA_SUBDIR=share/qgis \
91+
-DQGIS_PLUGIN_SUBDIR=lib/qgis/plugins \
92+
-DQGIS_INCLUDE_SUBDIR=include/qgis \
93+
-DQGIS_SERVER_MODULE_SUBDIR=lib/qgis/server \
94+
-DQGIS_QML_SUBDIR=lib/qt5/qml \
95+
-DBINDINGS_GLOBAL_INSTALL=ON \
96+
-DWITH_SERVER=OFF \
97+
-DTXT2TAGS_EXECUTABLE= \
98+
..
99+
)
100+
101+
# Compile native crssync
102+
# mkdir -p $BUILDDIR/native_crssync
103+
# (
104+
# cd $BUILDDIR/native_crssync
105+
# echo "Building native crssync..."
106+
# moc-qt5 $SRCDIR/src/core/qgsapplication.h > moc_qgsapplication.cpp
107+
# g++ $OPTFLAGS -fPIC -o crssync $SRCDIR/src/crssync/main.cpp $SRCDIR/src/crssync/qgscrssync.cpp moc_qgsapplication.cpp $SRCDIR/src/core/qgsapplication.cpp -DCORE_EXPORT= -DCOMPILING_CRSSYNC -I$SRCDIR/src/core/ -I$SRCDIR/src/core/geometry -I$BUILDDIR $(pkg-config --cflags --libs Qt5Widgets gdal sqlite3 proj)
108+
# )
109+
# crssync needs X at runtime
110+
# Xvfb :99 &
111+
# export DISPLAY=:99
112+
113+
mingw$bits-make -C$BUILDDIR -j$NJOBS DESTDIR="${installroot}" install VERBOSE=1
114+
115+
# Remove plugins with missing dependencies
116+
rm -rf ${installroot}/share/qgis/python/plugins/{MetaSeARCH,processing}
117+
118+
# Strip DEBUGinfo
119+
binaries=$(find $installprefix -name '*.exe' -or -name '*.dll' -or -name '*.pyd')
120+
for f in $binaries
121+
do
122+
case $(mingw-objdump -h $f 2>/dev/null | egrep -o '(DEBUG[\.a-z_]*|gnu.version)') in
123+
*DEBUGlink*) continue ;;
124+
*DEBUG*) ;;
125+
*gnu.version*)
126+
echo "WARNING: $(basename $f) is already stripped!"
127+
continue
128+
;;
129+
*) continue ;;
130+
esac
131+
132+
echo extracting DEBUG info from $f
133+
mingw-objcopy --only-keep-DEBUG $f $f.DEBUG || :
134+
pushd $(dirname $f)
135+
keep_symbols=`mktemp`
136+
mingw-nm $f.DEBUG --format=sysv --defined-only | awk -F \| '{ if ($4 ~ "Function") print $1 }' | sort > "$keep_symbols"
137+
mingw-objcopy --add-gnu-DEBUGlink=`basename $f.DEBUG` --strip-unneeded `basename $f` --keep-symbols="$keep_symbols" || :
138+
rm -f "$keep_symbols"
139+
popd
140+
done
141+
142+
# Collect dependencies
143+
function isnativedll {
144+
# If the import library exists but not the dynamic library, the dll ist most likely a native one
145+
local lower=${1,,}
146+
[ ! -e $MINGWROOT/bin/$1 ] && [ -f $MINGWROOT/lib/lib${lower/%.*/.a} ] && return 0;
147+
return 1;
148+
}
149+
150+
function linkDep {
151+
# Link the specified binary dependency and it's dependencies
152+
local indent=$3
153+
local destdir="$installprefix/${2:-bin}"
154+
local name="$(basename $1)"
155+
test -e "$destdir/$name" && return 0
156+
test -e "$destdir/qgisplugins/$name" && return 0
157+
echo "${indent}${1}"
158+
[ ! -e "$MINGWROOT/$1" ] && echo "Error: missing $MINGWROOT/$1" && return 1
159+
mkdir -p "$destdir" || return 1
160+
lnk "$MINGWROOT/$1" "$destdir/$name" || return 1
161+
echo "${2:-bin}/$name: $(rpm -qf "$MINGWROOT/$1")" >> $installprefix/origins.txt
162+
autoLinkDeps "$destdir/$name" "${indent} " || return 1
163+
[ -e "$MINGWROOT/$1.DEBUG" ] && lnk "$MINGWROOT/$1.DEBUG" "$destdir/$name.DEBUG" || ($DEBUG && echo "Warning: missing $name.DEBUG" || :)
164+
return 0
165+
}
166+
167+
function autoLinkDeps {
168+
# Collects and links the dependencies of the specified binary
169+
for dep in $(mingw-objdump -p "$1" | grep "DLL Name" | awk '{print $3}'); do
170+
if ! isnativedll "$dep"; then
171+
# HACK fix incorrect libpq case
172+
dep=${dep/LIBPQ/libpq}
173+
linkDep bin/$dep bin "$2" || return 1
174+
fi
175+
done
176+
return 0
177+
}
178+
179+
# Install python libs
180+
(
181+
cd $MINGWROOT
182+
SAVEIFS=$IFS
183+
IFS=$(echo -en "\n\b")
184+
for file in $(find lib/python${pyver} -type f); do
185+
mkdir -p "$installprefix/$(dirname $file)"
186+
lnk "$MINGWROOT/$file" "$installprefix/$file"
187+
done
188+
IFS=$SAVEIFS
189+
)
190+
191+
echo "Linking dependencies..."
192+
binaries=$(find $installprefix -name '*.exe' -or -name '*.dll' -or -name '*.pyd')
193+
for binary in $binaries; do
194+
autoLinkDeps $binary
195+
done
196+
linkDep bin/gdb.exe
197+
linkDep bin/python3.exe
198+
linkDep bin/python3w.exe
199+
200+
linkDep $(ls $MINGWROOT/bin/libssl-*.dll | sed "s|$MINGWROOT/||")
201+
linkDep $(ls $MINGWROOT/bin/libcrypto-*.dll | sed "s|$MINGWROOT/||")
202+
linkDep lib/mod_spatialite.dll bin
203+
204+
# Additional dependencies
205+
linkDep lib/qt5/plugins/imageformats/qgif.dll bin/imageformats
206+
linkDep lib/qt5/plugins/imageformats/qicns.dll bin/imageformats
207+
linkDep lib/qt5/plugins/imageformats/qico.dll bin/imageformats
208+
linkDep lib/qt5/plugins/imageformats/qjp2.dll bin/imageformats
209+
linkDep lib/qt5/plugins/imageformats/qjpeg.dll bin/imageformats
210+
linkDep lib/qt5/plugins/imageformats/qtga.dll bin/imageformats
211+
linkDep lib/qt5/plugins/imageformats/qtiff.dll bin/imageformats
212+
linkDep lib/qt5/plugins/imageformats/qwbmp.dll bin/imageformats
213+
linkDep lib/qt5/plugins/imageformats/qwebp.dll bin/imageformats
214+
linkDep lib/qt5/plugins/imageformats/qsvg.dll bin/imageformats
215+
linkDep lib/qt5/plugins/platforms/qwindows.dll bin/platforms
216+
linkDep lib/qt5/plugins/printsupport/windowsprintersupport.dll bin/printsupport
217+
linkDep lib/qt5/plugins/styles/qwindowsvistastyle.dll bin/styles
218+
linkDep lib/qt5/plugins/audio/qtaudio_windows.dll bin/audio
219+
linkDep lib/qt5/plugins/mediaservice/dsengine.dll bin/mediaservice
220+
linkDep lib/qt5/plugins/mediaservice/qtmedia_audioengine.dll bin/mediaservice
221+
linkDep lib/qt5/plugins/sqldrivers/qsqlite.dll bin/sqldrivers
222+
linkDep lib/qt5/plugins/sqldrivers/qsqlodbc.dll bin/sqldrivers
223+
linkDep lib/qt5/plugins/sqldrivers/qsqlpsql.dll bin/sqldrivers
224+
225+
linkDep lib/qt5/plugins/crypto/libqca-gcrypt.dll bin/crypto
226+
linkDep lib/qt5/plugins/crypto/libqca-logger.dll bin/crypto
227+
linkDep lib/qt5/plugins/crypto/libqca-softstore.dll bin/crypto
228+
linkDep lib/qt5/plugins/crypto/libqca-gnupg.dll bin/crypto
229+
linkDep lib/qt5/plugins/crypto/libqca-ossl.dll bin/crypto
230+
231+
mkdir -p $installprefix/share/qt5/translations/
232+
cp -a $MINGWROOT/share/qt5/translations/qt_*.qm $installprefix/share/qt5/translations
233+
cp -a $MINGWROOT/share/qt5/translations/qtbase_*.qm $installprefix/share/qt5/translations
234+
235+
# Data files
236+
mkdir -p $installprefix/share/
237+
cp -a /usr/share/gdal $installprefix/share/gdal
238+
cp -a /usr/share/proj $installprefix/share/proj
239+
240+
# Sort origins file
241+
cat $installprefix/origins.txt | sort | uniq > $installprefix/origins.new && mv $installprefix/origins.new $installprefix/origins.txt
242+
243+
# Create package
244+
DISTROOT=build_mingw64/dist/usr/x86_64-w64-mingw32/sys-root/mingw
245+
DEBUGROOT=dist_DEBUG
246+
for file in $(find $DISTROOT -name '*.DEBUG' \( -type l -or -type f \)); do
247+
dest=${file/$DISTROOT/$DEBUGROOT}
248+
mkdir -p "$(dirname $dest)"
249+
sudo mv "$file" "$dest"
250+
done
251+
252+
sudo mv $DISTROOT QGIS-Portable
253+
zip -r qgis-portable-win64.zip QGIS-Portable
254+
(cd $DEBUGROOT && zip -r - *) > qgis-portable-win64-debugsym.zip
255+

‎ms-windows/mingw/qgis3-build-deps-mingw.dockerfile

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
# MinGW build environment for QGIS / KADAS Albireo
2+
3+
FROM fedora:rawhide
4+
5+
MAINTAINER Sandro Mani <manisandro@gmail.com>
6+
7+
RUN \
8+
echo all > /etc/rpm/macros.image-language-conf && \
9+
rm -f /etc/yum.repos.d/*modular* && \
10+
dnf install -y 'dnf-command(config-manager)' && \
11+
dnf config-manager --add-repo https://copr.fedorainfracloud.org/coprs/smani/mingw-extras/repo/fedora-rawhide/smani-mingw-extras-fedora-rawhide.repo && \
12+
dnf install -y --nogpgcheck \
13+
mingw64-dlfcn \
14+
mingw64-exiv2 \
15+
mingw64-gcc-c++ \
16+
mingw64-gdal \
17+
mingw64-gdb \
18+
mingw64-GdbCrashHandler \
19+
mingw64-GeographicLib \
20+
mingw64-geos \
21+
mingw64-gsl \
22+
mingw64-libgomp \
23+
mingw64-libzip \
24+
mingw64-osgearth-qt5 \
25+
mingw64-pacparser \
26+
mingw64-postgresql \
27+
mingw64-proj \
28+
mingw64-python3 \
29+
mingw64-python3-affine \
30+
mingw64-python3-chardet \
31+
mingw64-python3-flask \
32+
mingw64-python3-gdal \
33+
mingw64-python3-GeographicLib \
34+
mingw64-python3-homography \
35+
mingw64-python3-idna \
36+
mingw64-python3-lxml \
37+
mingw64-python3-markupsafe \
38+
mingw64-python3-numpy \
39+
mingw64-python3-opencv \
40+
mingw64-python3-OWSLib \
41+
mingw64-python3-pillow \
42+
mingw64-python3-psycopg2 \
43+
mingw64-python3-pygments \
44+
mingw64-python3-pytz \
45+
mingw64-python3-pyyaml \
46+
mingw64-python3-qscintilla-qt5 \
47+
mingw64-python3-qt5 \
48+
mingw64-python3-requests \
49+
mingw64-python3-shapely \
50+
mingw64-python3-six \
51+
mingw64-python3-urllib3 \
52+
mingw64-qca-qt5 \
53+
mingw64-qscintilla-qt5 \
54+
mingw64-qt5-qmake \
55+
mingw64-qt5-qtactiveqt \
56+
mingw64-qt5-qtbase \
57+
mingw64-qt5-qtimageformats \
58+
mingw64-qt5-qtlocation \
59+
mingw64-qt5-qtmultimedia \
60+
mingw64-qt5-qtscript \
61+
mingw64-qt5-qtserialport \
62+
mingw64-qt5-qtsvg \
63+
mingw64-qt5-qttools \
64+
mingw64-qt5-qttools-tools \
65+
mingw64-qt5-qttranslations \
66+
mingw64-qt5-qtwebkit \
67+
mingw64-qt5-qtxmlpatterns \
68+
mingw64-qtkeychain-qt5 \
69+
mingw64-quazip-qt5 \
70+
mingw64-qwt-qt5 \
71+
mingw64-sip \
72+
mingw64-spatialindex \
73+
mingw64-sqlite \
74+
mingw64-svg2svgt \
75+
mingw64-zstd \
76+
bison \
77+
cmake \
78+
findutils \
79+
flex \
80+
gcc-c++ \
81+
gdal-devel \
82+
git \
83+
make \
84+
proj-devel \
85+
python-qt5 \
86+
qt5-linguist \
87+
qt5-qtbase-devel \
88+
sqlite-devel \
89+
wget \
90+
xorg-x11-server-Xvfb \
91+
zip
92+
93+
RUN wget https://pkg.sourcepole.ch/kadas/mingw64-librsvg2-2.40.11-1.fc28.noarch.rpm
94+
RUN dnf install -y mingw64-librsvg2-2.40.11-1.fc28.noarch.rpm
95+
96+
WORKDIR /workspace
97+
VOLUME ["/workspace"]

‎ms-windows/mxe/README.md

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎ms-windows/mxe/build-mxe.sh

Lines changed: 0 additions & 134 deletions
This file was deleted.

‎ms-windows/mxe/deploy.py

Lines changed: 0 additions & 128 deletions
This file was deleted.

‎ms-windows/mxe/mxe.Dockerfile

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎python/core/auto_generated/auth/qgsauthmanager.sip.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -819,6 +819,9 @@ Clear an authentication config from its associated authentication method cache
819819

820820

821821

822+
public:
823+
protected:
824+
822825
};
823826

824827
/************************************************************************

‎src/core/auth/qgsauthmanager.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,14 @@ class CORE_EXPORT QgsAuthManager : public QObject
752752
*/
753753
static QgsAuthManager *instance() SIP_SKIP;
754754

755+
756+
#ifdef __MINGW32__
757+
public:
755758
explicit QgsAuthManager() SIP_SKIP;
759+
#else
760+
protected:
761+
explicit QgsAuthManager() SIP_SKIP;
762+
#endif
756763

757764
private:
758765

0 commit comments

Comments
 (0)
Please sign in to comment.