Verified Commit 38f9e236 authored by Jaroslav Škarvada's avatar Jaroslav Škarvada 🙂
Browse files

Fixed Windows build through MXE on Fedora 33 2/2


Signed-off-by: Jaroslav Škarvada's avatarJaroslav Škarvada <jskarvad@redhat.com>
parent 53c61250
Pipeline #74351 passed with stage
in 37 minutes and 28 seconds
......@@ -111,8 +111,8 @@ ${MXE_BUILD_TARGETS}-cmake --build . --config RelWithDebInfo --target ext_marble
${MXE_BUILD_TARGETS}-cmake --build . --config RelWithDebInfo --target ext_kcalendarcore -- -j$CPU_CORES
# Marble install shared lib at wrong place.
mv $MXE_INSTALL_PREFIX/libastro* $MXE_INSTALL_PREFIX/bin
mv $MXE_INSTALL_PREFIX/libmarble* $MXE_INSTALL_PREFIX/bin
mv $MXE_INSTALL_PREFIX/libastro* $MXE_INSTALL_PREFIX/bin || true
mv $MXE_INSTALL_PREFIX/libmarble* $MXE_INSTALL_PREFIX/bin || true
#################################################################################################
......
......@@ -101,7 +101,9 @@ mkdir -p $BUNDLEDIR/translations
# Data files ---------------------------------------------------------------------------------
echo -e "\n---------- Marble data"
cp -r $MXE_INSTALL_PREFIX/data/* $BUNDLEDIR/data 2>/dev/null
cp -r $MXE_INSTALL_PREFIX/data/* $BUNDLEDIR/data 2>/dev/null || \
cp -r $MXE_INSTALL_PREFIX/../data/* $BUNDLEDIR/data 2>/dev/null
echo -e "\n---------- Generics data"
cp -r $MXE_INSTALL_PREFIX/share/lensfun $BUNDLEDIR/data 2>/dev/null
......@@ -208,7 +210,7 @@ fi
# Install ExifTool binary.
wget https://exiftool.org/exiftool-$DK_EXIFTOOL_VERSION.zip -P $BUNDLEDIR
unzip $BUNDLEDIR/exiftool-$DK_EXIFTOOL_VERSION.zip -o -d $BUNDLEDIR
unzip -o $BUNDLEDIR/exiftool-$DK_EXIFTOOL_VERSION.zip -d $BUNDLEDIR
mv "$BUNDLEDIR/exiftool(-k).exe" "$BUNDLEDIR/exiftool.exe"
rm -f $BUNDLEDIR/exiftool-$DK_EXIFTOOL_VERSION.zip
......
......@@ -45,7 +45,7 @@ MXE_TOOLCHAIN=${MXE_INSTALL_PREFIX}/share/cmake/mxe-conf.cmake
#-------------------------------------------------------------------------------------------
# URL to git repository to checkout digiKam source code
DK_GITURL="git@invent.kde.org:graphics/digikam.git"
DK_GITURL="https://invent.kde.org/graphics/digikam.git"
# digiKam tarball information.
DK_URL="http://download.kde.org/stable/digikam"
......
......@@ -90,6 +90,7 @@ blacklist = [
"dxgi.dll",
"dwrite.dll",
"dbghelp.dll", # blacklisted dll from DrMinGW as it use MSVC dll to show debg dialog.
"ncrypt.dll",
]
# -----------------------------------------------
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment