mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

[smtk-import] Move to current mdbtools github repo

Browse source 
Original mdbtools developer gave up the project some time ago, and it's
continued with his permission in a forked repo:
	https://github.com/mdbtools/mdbtools.git

There was a nasty bug in libmdb, triggered under some rare circustances,
that is solved in the new repo which is, BTW, under current
development.

Move our scripts to the new repo and set our working version to the
latest release tag, currently, "v1.0.0"

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
This commit is contained in:
Salvador Cuñat 2023-12-15 06:37:40 +01:00 committed by Michael Keller
parent 3d902864ed
commit e3a32f7e92
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/get-dep-lib.sh
View file

@ -15,7 +15,7 @@ CURRENT_LIBXML2="v2.9.4"
CURRENT_LIBFTDI="abd19b721f7e9b4d514ed319ece173ebc7b1ea72" CURRENT_LIBFTDI="abd19b721f7e9b4d514ed319ece173ebc7b1ea72"
CURRENT_KIRIGAMI="v5.76.0" CURRENT_KIRIGAMI="v5.76.0"
CURRENT_BREEZE_ICONS="4daac191fb33c8c03bba8356db9767816cb8ee02" CURRENT_BREEZE_ICONS="4daac191fb33c8c03bba8356db9767816cb8ee02"
CURRENT_MDBTOOLS="master" CURRENT_MDBTOOLS="v1.0.0"
CURRENT_QT_ANDROID_CMAKE="master" CURRENT_QT_ANDROID_CMAKE="master"
CURRENT_LIBMTP="master" CURRENT_LIBMTP="master"
@ -196,7 +196,7 @@ for package in "${PACKAGES[@]}" ; do
curl_download_library sqlite https://www.sqlite.org/2017/ sqlite-autoconf-${CURRENT_SQLITE}.tar.gz curl_download_library sqlite https://www.sqlite.org/2017/ sqlite-autoconf-${CURRENT_SQLITE}.tar.gz
;; ;;
mdbtools) mdbtools)
git_checkout_library mdbtools $CURRENT_MDBTOOLS https://github.com/brianb/mdbtools.git git_checkout_library mdbtools $CURRENT_MDBTOOLS https://github.com/mdbtools/mdbtools.git
;; ;;
qt-android-cmake) qt-android-cmake)
git_checkout_library qt-android-cmake $CURRENT_QT_ANDROID_CMAKE https://github.com/LaurentGomila/qt-android-cmake.git git_checkout_library qt-android-cmake $CURRENT_QT_ANDROID_CMAKE https://github.com/LaurentGomila/qt-android-cmake.git

5
scripts/smtk2ssrf-build.sh
View file

@ -108,15 +108,16 @@ else
cd "$BASEDIR"/mdbtools || aborting "Couldn't cd into $BASEDIR/mdbtools" cd "$BASEDIR"/mdbtools || aborting "Couldn't cd into $BASEDIR/mdbtools"
git pull --rebase || aborting "Problem downloading/updating mdbtools" git pull --rebase || aborting "Problem downloading/updating mdbtools"
else else
git clone https://github.com/brianb/mdbtools.git "$BASEDIR"/mdbtools || \ git clone https://github.com/mdbtools/mdbtools.git "$BASEDIR"/mdbtools || \
aborting "Problem downloading/updating mdbtools" aborting "Problem downloading/updating mdbtools"
fi fi
echo "----> Building mdbtools ..." echo "----> Building mdbtools ..."
echo "----> This will display a lot of errors and warnings" echo "----> This will display a lot of errors and warnings"
cd "$BASEDIR"/mdbtools || aborting "Couldn't cd into $BASEDIR/mdbtools" cd "$BASEDIR"/mdbtools || aborting "Couldn't cd into $BASEDIR/mdbtools"
git checkout "v1.0.0"
autoreconf -i -f autoreconf -i -f
./configure --prefix "$INSTALL_ROOT" --disable-man --disable-gmdb2 >/dev/null ./configure --prefix "$INSTALL_ROOT" --disable-man --without-bash-completion-dir >/dev/null
make "$JOBS">/dev/null || aborting "Building mdbtools failed" make "$JOBS">/dev/null || aborting "Building mdbtools failed"
make install make install
fi fi

2
scripts/windows/before_install.sh
View file

@ -61,7 +61,7 @@ git clone https://github.com/Subsurface/googlemaps.git
echo "Get mdbtools" echo "Get mdbtools"
cd ${TRAVIS_BUILD_DIR}/.. cd ${TRAVIS_BUILD_DIR}/..
git clone https://github.com/brianb/mdbtools.git git clone https://github.com/mdbtools/mdbtools.git
# get prebuilt mxe libraries for mdbtools and glib. # get prebuilt mxe libraries for mdbtools and glib.
# do not overwrite upstream prebuilt mxe binaries if there is any coincidence. # do not overwrite upstream prebuilt mxe binaries if there is any coincidence.