diff -Nru sqlitebrowser-3.12.1/BUILDING.md sqlitebrowser-3.12.2/BUILDING.md --- sqlitebrowser-3.12.1/BUILDING.md 2021-05-23 14:19:23.000000000 +0000 +++ sqlitebrowser-3.12.2/BUILDING.md 2021-05-24 19:46:08.000000000 +0000 @@ -3,10 +3,7 @@ DB Browser for SQLite requires Qt as well as SQLite. For more information on Qt please consult http://www.qt.io and for SQLite please see https://sqlite.org/. -Please note that all versions after 3.12.1 will require: -* A C++ compiler with support for C++14 or later - -All versions after 3.9.1 will require: +Please note that all versions after 3.9.1 will require: * Qt 5.5 or later, however we advise you to use 5.7 or later * A C++ compiler with support for C++11 or later @@ -54,7 +51,7 @@ (including other Unix systems with X11.) -### Ubuntu / Debian Linux +### Ubuntu Linux ```bash $ sudo apt install build-essential git-core cmake libsqlite3-dev qt5-default qttools5-dev-tools \ @@ -68,8 +65,6 @@ $ sudo make install ``` -**Note** - Use `cmake -DFORCE_INTERNAL_QSCINTILLA=ON -Dsqlcipher=1 -Wno-dev ..` if you're using Debian and meet errors during compiling. - This should complete without errors, giving you a binary file called 'sqlitebrowser'. Done. :) @@ -81,10 +76,6 @@ **Note 2** - On CentOS 7.x, you need to replace the `qwt-qt5-devel` package name with `qt5-qtbase-devel` in the `dnf install` line below. - -**Note 3** - On CentOS 8 (Stream), you need to replace the `qt-devel` package name with -`qt5-devel` in the `dnf install` line below. Make sure the `PowerTools` repo is enabled. - ``` $ sudo dnf install cmake gcc-c++ git qt-devel qt5-linguist qwt-qt5-devel \ sqlite-devel @@ -134,10 +125,9 @@ It requires SQLite and Qt 5.x to be installed first. These are the [Homebrew](http://brew.sh) steps, though other package managers should work: - $ brew tap sqlitebrowser/sqlite3 - $ brew install sqlitefts5 + $ brew install sqlite --with-functions --with-json1 --without-readline $ brew install qt - $ brew link sqlitefts5 --force + $ brew link sqlite3 --force Then it's just a matter of getting the source: @@ -149,9 +139,9 @@ And compiling it: $ cd sqlitebrowser - $ qmake CONFIG+="c++14" + $ qmake $ make - $ brew unlink sqlitefts5 + $ brew unlink sqlite3 $ mv src/DB\ Browser\ for\ SQLite.app /Applications/ An icon for "DB Browser for SQLite" should now be in your main OSX Applications @@ -162,11 +152,11 @@ 'make' step complaining about no targets. This seems to be solvable by running: - $ qmake -spec macx-g++ CONFIG+="c++14" + $ qmake -spec macx-g++ or: - $ qmake -spec macx-llvm CONFIG+="c++14" + $ qmake -spec macx-llvm (before the 'make' step) @@ -230,7 +220,7 @@ $ make -If you additionally want an NSIS installer: +If you additionaly want an NSIS installer: $ make package @@ -245,7 +235,7 @@ Before compiling make sure you have the necessary SQLCipher development files installed. On Linux this can usually be accomplished by just installing the correct package (e.g. 'libsqlcipher-dev' on Debian-based distributions). On -macOS the easiest way is to install it via Homebrew ('brew install +MacOS X the easiest way is to install it via Homebrew ('brew install sqlcipher'). On Windows unfortunately it's a bit more difficult: You'll have to download and compile the code as described on the [SQLCipher website](https://www.zetetic.net/sqlcipher/) before you can proceed. diff -Nru sqlitebrowser-3.12.1/CMakeLists.txt sqlitebrowser-3.12.2/CMakeLists.txt --- sqlitebrowser-3.12.1/CMakeLists.txt 2021-05-23 14:19:23.000000000 +0000 +++ sqlitebrowser-3.12.2/CMakeLists.txt 2021-05-24 19:46:08.000000000 +0000 @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 2.8.12.2) project(sqlitebrowser) +cmake_minimum_required(VERSION 2.8.12.2) # BUILD_VERSION is the current date in YYYYMMDD format. It is only # used by the nightly version to add the date of the build. @@ -24,8 +24,8 @@ set(CMAKE_BUILD_TYPE "Release") endif() -add_definitions(-std=c++14) -set(CMAKE_CXX_STANDARD 14) +add_definitions(-std=c++11) +set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED True) # Fix behavior of CMAKE_CXX_STANDARD when targeting macOS. @@ -145,7 +145,6 @@ src/sqltextedit.h src/docktextedit.h src/DbStructureModel.h - src/dbstructureqitemviewfacade.h src/Application.h src/CipherDialog.h src/ExportSqlDialog.h @@ -171,11 +170,9 @@ src/ProxyDialog.h src/SelectItemsPopup.h src/TableBrowser.h - src/ImageViewer.h src/RemoteLocalFilesModel.h src/RemoteCommitsModel.h src/RemoteNetwork.h - src/TableBrowserDock.h ) set(SQLB_SRC @@ -203,7 +200,6 @@ src/docktextedit.cpp src/csvparser.cpp src/DbStructureModel.cpp - src/dbstructureqitemviewfacade.cpp src/main.cpp src/Application.cpp src/CipherDialog.cpp @@ -235,11 +231,9 @@ src/sql/parser/ParserDriver.cpp src/sql/parser/sqlite3_lexer.cpp src/sql/parser/sqlite3_parser.cpp - src/ImageViewer.cpp src/RemoteLocalFilesModel.cpp src/RemoteCommitsModel.cpp src/RemoteNetwork.cpp - src/TableBrowserDock.cpp ) set(SQLB_FORMS @@ -266,7 +260,6 @@ src/ProxyDialog.ui src/SelectItemsPopup.ui src/TableBrowser.ui - src/ImageViewer.ui ) set(SQLB_RESOURCES @@ -274,8 +267,7 @@ src/translations/flags/flags.qrc src/translations/translations.qrc src/certs/CaCerts.qrc - src/qdarkstyle/dark/darkstyle.qrc - src/qdarkstyle/light/lightstyle.qrc + src/qdarkstyle/style.qrc ) set(SQLB_MISC @@ -302,7 +294,6 @@ "${CMAKE_SOURCE_DIR}/src/translations/sqlb_it.ts" "${CMAKE_SOURCE_DIR}/src/translations/sqlb_ja.ts" "${CMAKE_SOURCE_DIR}/src/translations/sqlb_nl.ts" - "${CMAKE_SOURCE_DIR}/src/translations/sqlb_sv.ts" ) # Windows image format plugin files @@ -365,7 +356,7 @@ set(LPTHREAD pthread) endif(WIN32) -#enable version check for macOS +#enable version check for MacOS if(APPLE) add_definitions(-DCHECKNEWVERSION) endif(APPLE) @@ -509,10 +500,6 @@ install(FILES src/icons/${PROJECT_NAME}.png DESTINATION share/icons/hicolor/256x256/apps/) - install(FILES images/logo.svg - DESTINATION share/icons/hicolor/scalable/apps/ - RENAME ${PROJECT_NAME}.svg) - install(FILES distri/${PROJECT_NAME}.desktop DESTINATION share/applications/) @@ -534,7 +521,6 @@ ${QT5_BIN_PATH}/Qt5PrintSupportd.dll ${QT5_BIN_PATH}/Qt5Widgetsd.dll ${QT5_BIN_PATH}/Qt5Concurrentd.dll - ${QT5_BIN_PATH}/Qt5Svgd.dll DESTINATION "/" CONFIGURATIONS Debug) # The Qt5 Release configuration files don't have a postfix @@ -545,7 +531,6 @@ ${QT5_BIN_PATH}/Qt5PrintSupport.dll ${QT5_BIN_PATH}/Qt5Widgets.dll ${QT5_BIN_PATH}/Qt5Concurrent.dll - ${QT5_BIN_PATH}/Qt5Svg.dll DESTINATION "/" CONFIGURATIONS Release) # The files below are common to all configurations diff -Nru sqlitebrowser-3.12.1/currentrelease sqlitebrowser-3.12.2/currentrelease --- sqlitebrowser-3.12.1/currentrelease 2021-05-23 14:19:23.000000000 +0000 +++ sqlitebrowser-3.12.2/currentrelease 2021-05-24 19:46:08.000000000 +0000 @@ -1,3 +1,3 @@ -3.12.2 -https://sqlitebrowser.org/blog/version-3-12-2-released +3.11.2 +https://sqlitebrowser.org/blog/version-3-11-2-released diff -Nru sqlitebrowser-3.12.1/debian/changelog sqlitebrowser-3.12.2/debian/changelog --- sqlitebrowser-3.12.1/debian/changelog 2021-05-23 14:19:43.000000000 +0000 +++ sqlitebrowser-3.12.2/debian/changelog 2021-05-24 19:46:38.000000000 +0000 @@ -1,8 +1,8 @@ -sqlitebrowser (3.12.1-3~3064~202105231419~ubuntu16.04.1) xenial; urgency=low +sqlitebrowser (3.12.2-0~2876~202105241946~ubuntu16.04.1) xenial; urgency=low * Auto build. - -- Gajj GNDU Sun, 23 May 2021 14:19:43 +0000 + -- Gajj GNDU Mon, 24 May 2021 19:46:38 +0000 sqlitebrowser (3.11.299) UNRELEASED; urgency=medium diff -Nru sqlitebrowser-3.12.1/debian/git-build-recipe.manifest sqlitebrowser-3.12.2/debian/git-build-recipe.manifest --- sqlitebrowser-3.12.1/debian/git-build-recipe.manifest 2021-05-23 14:19:43.000000000 +0000 +++ sqlitebrowser-3.12.2/debian/git-build-recipe.manifest 2021-05-24 19:46:38.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version 3.12.1-3~3064~202105231419 -lp:~linuxgndu/sqlitebrowser-recipe/+git/sqlitebrowser git-commit:6cde3f51adbc924a2b1a32f17b3ef6044c9e4ab4 +# git-build-recipe format 0.4 deb-version 3.12.2-0~2876~202105241946 +lp:~linuxgndu/sqlitebrowser-recipe/+git/sqlitebrowser git-commit:1955cb13b483fa66849bce152f302fe6817bfadc nest-part packaging lp:~linuxgndu/sqlitebrowser-recipe/+git/sqlitebrowser-deb-packaging debian debian git-commit:819f0eaa87610f3c27fff1e5e8e060287cf10e4f diff -Nru sqlitebrowser-3.12.1/distri/sqlitebrowser.desktop sqlitebrowser-3.12.2/distri/sqlitebrowser.desktop --- sqlitebrowser-3.12.1/distri/sqlitebrowser.desktop 2021-05-23 14:19:23.000000000 +0000 +++ sqlitebrowser-3.12.2/distri/sqlitebrowser.desktop 2021-05-24 19:46:08.000000000 +0000 @@ -10,4 +10,4 @@ X-MultipleArgs=false Type=Application Categories=Development;Utility;Database; -MimeType=application/vnd.db4s-project+xml;application/sqlitebrowser;application/x-sqlitebrowser;application/vnd.sqlite3;application/geopackage+sqlite3;application/x-sqlite2;application/x-sqlite3;text/csv; +MimeType=application/vnd.db4s-project+xml;application/sqlitebrowser;application/x-sqlitebrowser;application/vnd.sqlite3;application/geopackage+sqlite3;application/x-sqlite2;application/x-sqlite3; diff -Nru sqlitebrowser-3.12.1/distri/sqlitebrowser.desktop.appdata.xml sqlitebrowser-3.12.2/distri/sqlitebrowser.desktop.appdata.xml --- sqlitebrowser-3.12.1/distri/sqlitebrowser.desktop.appdata.xml 2021-05-23 14:19:23.000000000 +0000 +++ sqlitebrowser-3.12.2/distri/sqlitebrowser.desktop.appdata.xml 2021-05-24 19:46:08.000000000 +0000 @@ -22,7 +22,6 @@
  • Examine a log of all SQL commands issued by the application
  • - https://raw.githubusercontent.com/sqlitebrowser/db4s-screenshots/master/v3.3/gnome3_2-execute.png @@ -43,7 +42,4 @@ https://sqlitebrowser.org/ https://github.com/sqlitebrowser/sqlitebrowser/issues - - - diff -Nru sqlitebrowser-3.12.1/.github/ISSUE_TEMPLATE/Bug_report.md sqlitebrowser-3.12.2/.github/ISSUE_TEMPLATE/Bug_report.md --- sqlitebrowser-3.12.1/.github/ISSUE_TEMPLATE/Bug_report.md 2021-05-23 14:19:23.000000000 +0000 +++ sqlitebrowser-3.12.2/.github/ISSUE_TEMPLATE/Bug_report.md 2021-05-24 19:46:08.000000000 +0000 @@ -8,7 +8,6 @@ --- + Describe the new feature -------------------------- diff -Nru sqlitebrowser-3.12.1/.github/ISSUE_TEMPLATE.md sqlitebrowser-3.12.2/.github/ISSUE_TEMPLATE.md --- sqlitebrowser-3.12.1/.github/ISSUE_TEMPLATE.md 1970-01-01 00:00:00.000000000 +0000 +++ sqlitebrowser-3.12.2/.github/ISSUE_TEMPLATE.md 2021-05-24 19:46:08.000000000 +0000 @@ -0,0 +1,42 @@ +### Details for the issue + + + + + +### Useful extra information + + + +#### I'm opening this issue because: + +- [ ] DB4S is crashing +- [ ] DB4S has a bug +- [ ] DB4S needs a feature +- [ ] DB4S has another problem + +#### I'm using DB4S on: + +- [ ] Windows: ( _version:_ ___ ) +- [ ] Linux: ( _distro:_ ___ ) +- [ ] Mac OS: ( _version:_ ___ ) +- [ ] Other: ___ + +#### I'm using DB4S version: + +- [ ] 3.11.2 +- [ ] 3.11.1 +- [ ] 3.10.1 +- [ ] Other: ___ + +#### I have also: + +- [ ] Tried out the latest nightly version: https://github.com/sqlitebrowser/sqlitebrowser#nightly-builds +- [ ] Searched for an existing similar issue: https://github.com/sqlitebrowser/sqlitebrowser/issues?utf8=%E2%9C%93&q=is%3Aissue%20 diff -Nru sqlitebrowser-3.12.1/installer/macos/build_sqlitebrowser_nightly.sh sqlitebrowser-3.12.2/installer/macos/build_sqlitebrowser_nightly.sh --- sqlitebrowser-3.12.1/installer/macos/build_sqlitebrowser_nightly.sh 2021-05-23 14:19:23.000000000 +0000 +++ sqlitebrowser-3.12.2/installer/macos/build_sqlitebrowser_nightly.sh 2021-05-24 19:46:08.000000000 +0000 @@ -3,17 +3,17 @@ # Builds and uploads DB Browser for SQLite nightlies, # after updating the Homebrew dependencies -QTVER="5.15.2" +QTVER="5.12.8" BRANCH="master" BREW="/usr/local/bin/brew" BUILD_TYPE="release" DATE=`date "+%Y%m%d"` LOG="$HOME/db4s_nightlies/nightly-$DATE.log" -LRELEASE="$HOME/Qt/${QTVER}/clang_64/bin/lrelease" -LUPDATE="$HOME/Qt/${QTVER}/clang_64/bin/lupdate" -MACDEPLOYQT="$HOME/Qt/${QTVER}/clang_64/bin/macdeployqt" +LRELEASE="$HOME/Qt/${QTVER}/${QTVER}/clang_64/bin/lrelease" +LUPDATE="$HOME/Qt/${QTVER}/${QTVER}/clang_64/bin/lupdate" +MACDEPLOYQT="$HOME/Qt/${QTVER}/${QTVER}/clang_64/bin/macdeployqt" PATH="$PATH:/usr/local/bin:/usr/sbin" -QMAKE="$HOME/Qt/${QTVER}/clang_64/bin/qmake" +QMAKE="$HOME/Qt/${QTVER}/${QTVER}/clang_64/bin/qmake" # Add the sensitive values we don't want to store in this script file source ~/.db4s_secure @@ -60,7 +60,7 @@ # Remove any existing Homebrew installed packages echo Remove any existing Homebrew installed packages >>$LOG 2>&1 -$BREW remove `$BREW list --formula` --force >>$LOG 2>&1 +$BREW remove `$BREW list` --force >>$LOG 2>&1 # Install SQLite3 # Note - `brew tap sqlitebrowser/homebrew-sqlite3` needs to have been run at least once (manually) first @@ -86,15 +86,15 @@ # Build and package standard sqlitebrowser nightly echo Build and package standard sqlitebrowser nightly >>$LOG 2>&1 if [ "${BUILD_TYPE}" = "debug" ]; then - $QMAKE sqlitebrowser.pro -r -spec macx-clang CONFIG+=debug CONFIG+=x86_64 CONFIG+="c++14" >>$LOG 2>&1 + $QMAKE sqlitebrowser.pro -r -spec macx-clang CONFIG+=debug CONFIG+=x86_64 >>$LOG 2>&1 else - $QMAKE sqlitebrowser.pro -r -spec macx-clang CONFIG+=x86_64 CONFIG+="c++14" >>$LOG 2>&1 + $QMAKE sqlitebrowser.pro -r -spec macx-clang CONFIG+=x86_64 >>$LOG 2>&1 fi make -j3 >>$LOG 2>&1 make -j3 >>$LOG 2>&1 # Seems to need a 2nd time now, due to language files needing initialisation or something # Include the depencencies in the .app bundle -$MACDEPLOYQT src/DB\ Browser\ for\ SQLite.app -verbose=2 -sign-for-notarization="${DEV_ID}">>$LOG 2>&1 +$MACDEPLOYQT src/DB\ Browser\ for\ SQLite.app -verbose=2 >>$LOG 2>&1 # Add the extensions to the .dmg echo Add the extensions to the .dmg >>$LOG 2>&1 @@ -114,34 +114,32 @@ # Copy the translation files to the .dmg mkdir -p src/DB\ Browser\ for\ SQLite.app/Contents/translations >>$LOG 2>&1 for i in ar zh_CN zh_TW cs en fr de it ko pl pt ru es uk; do - cp -v $HOME/Qt/${QTVER}/clang_64/translations/qt_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 - cp -v $HOME/Qt/${QTVER}/clang_64/translations/qtbase_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 - cp -v $HOME/Qt/${QTVER}/clang_64/translations/qtmultimedia_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 - cp -v $HOME/Qt/${QTVER}/clang_64/translations/qtquick1_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 - cp -v $HOME/Qt/${QTVER}/clang_64/translations/qtscript_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 - cp -v $HOME/Qt/${QTVER}/clang_64/translations/qtxmlpatterns_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 + cp -v $HOME/Qt/${QTVER}/${QTVER}/clang_64/translations/qt_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 + cp -v $HOME/Qt/${QTVER}/${QTVER}/clang_64/translations/qtbase_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 + cp -v $HOME/Qt/${QTVER}/${QTVER}/clang_64/translations/qtmultimedia_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 + cp -v $HOME/Qt/${QTVER}/${QTVER}/clang_64/translations/qtquick1_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 + cp -v $HOME/Qt/${QTVER}/${QTVER}/clang_64/translations/qtscript_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 + cp -v $HOME/Qt/${QTVER}/${QTVER}/clang_64/translations/qtxmlpatterns_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 done # Unlock the local security keychain, so signing can be done security unlock-keychain -p "${KEYCHAIN_PASSWORD}" "${HOME}/Library/Keychains/login.keychain" -# Sign the added libraries -codesign --sign "${DEV_ID}" --verbose --deep --force --keychain "/Library/Keychains/System.keychain" --options runtime --timestamp src/DB\ Browser\ for\ SQLite.app/Contents/Extensions/fileio.dylib >>$LOG 2>&1 -codesign --sign "${DEV_ID}" --verbose --deep --force --keychain "/Library/Keychains/System.keychain" --options runtime --timestamp src/DB\ Browser\ for\ SQLite.app/Contents/Extensions/formats.dylib >>$LOG 2>&1 -codesign --sign "${DEV_ID}" --verbose --deep --force --keychain "/Library/Keychains/System.keychain" --options runtime --timestamp src/DB\ Browser\ for\ SQLite.app/Contents/Extensions/math.dylib >>$LOG 2>&1 +# Sign the .app +codesign --sign "${DEV_ID}" --verbose --deep --keychain "/Library/Keychains/System.keychain" src/DB\ Browser\ for\ SQLite.app >>$LOG 2>&1 # Make a .dmg file from the .app mv src/DB\ Browser\ for\ SQLite.app $HOME/appdmg/ >>$LOG 2>&1 cd $HOME/appdmg >>$LOG 2>&1 appdmg --quiet nightly.json DB\ Browser\ for\ SQLite_${DATE}.dmg >>$LOG 2>&1 -codesign --sign "${DEV_ID}" --verbose --deep --keychain "/Library/Keychains/System.keychain" --options runtime --timestamp DB\ Browser\ for\ SQLite_${DATE}.dmg >>$LOG 2>&1 +codesign --sign "${DEV_ID}" --verbose --deep --keychain "/Library/Keychains/System.keychain" DB\ Browser\ for\ SQLite_${DATE}.dmg >>$LOG 2>&1 mv DB\ Browser\ for\ SQLite_${DATE}.dmg $HOME/db4s_nightlies/ >>$LOG 2>&1 rm -rf $HOME/appdmg/DB\ Browser\ for\ SQLite.app >>$LOG 2>&1 ### Build SQLCipher version # Remove any existing Homebrew installed packages echo Remove any existing Homebrew installed packages >>$LOG 2>&1 -$BREW remove `$BREW list --formula` --force >>$LOG 2>&1 +$BREW remove `$BREW list` --force >>$LOG 2>&1 # Install SQLCipher echo Install SQLCipher >>$LOG 2>&1 @@ -164,18 +162,15 @@ # Build and package sqlitebrowser with SQLCipher support echo Build and package sqlitebrowser with SQLCipher support >>$LOG 2>&1 if [ "${BUILD_TYPE}" = "debug" ]; then - $QMAKE sqlitebrowser.pro -r -spec macx-clang CONFIG+=debug CONFIG+=x86_64 CONFIG+=sqlcipher CONFIG+="c++14" >>$LOG 2>&1 + $QMAKE sqlitebrowser.pro -r -spec macx-clang CONFIG+=debug CONFIG+=x86_64 CONFIG+=sqlcipher >>$LOG 2>&1 else - $QMAKE sqlitebrowser.pro -r -spec macx-clang CONFIG+=x86_64 CONFIG+=sqlcipher CONFIG+="c++14" >>$LOG 2>&1 + $QMAKE sqlitebrowser.pro -r -spec macx-clang CONFIG+=x86_64 CONFIG+=sqlcipher >>$LOG 2>&1 fi make -j3 >>$LOG 2>&1 make -j3 >>$LOG 2>&1 # Seems to need a 2nd time now, due to language files needing initialisation or something -# Unlock the local security keychain, so signing can be done -security unlock-keychain -p "${KEYCHAIN_PASSWORD}" "${HOME}/Library/Keychains/login.keychain" - # Include the depencencies in the .app bundle -$MACDEPLOYQT src/DB\ Browser\ for\ SQLite.app -verbose=2 -sign-for-notarization="${DEV_ID}">>$LOG 2>&1 +$MACDEPLOYQT src/DB\ Browser\ for\ SQLite.app -verbose=2 >>$LOG 2>&1 # Add the extensions to the .dmg echo Add the extensions to the .dmg >>$LOG 2>&1 @@ -195,27 +190,25 @@ # Copy the translation files to the .dmg mkdir -p src/DB\ Browser\ for\ SQLite.app/Contents/translations >>$LOG 2>&1 for i in ar zh_CN zh_TW cs en fr de it ko pl pt ru es uk; do - cp -v $HOME/Qt/${QTVER}/clang_64/translations/qt_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 - cp -v $HOME/Qt/${QTVER}/clang_64/translations/qtbase_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 - cp -v $HOME/Qt/${QTVER}/clang_64/translations/qtmultimedia_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 - cp -v $HOME/Qt/${QTVER}/clang_64/translations/qtquick1_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 - cp -v $HOME/Qt/${QTVER}/clang_64/translations/qtscript_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 - cp -v $HOME/Qt/${QTVER}/clang_64/translations/qtxmlpatterns_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 + cp -v $HOME/Qt/${QTVER}/${QTVER}/clang_64/translations/qt_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 + cp -v $HOME/Qt/${QTVER}/${QTVER}/clang_64/translations/qtbase_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 + cp -v $HOME/Qt/${QTVER}/${QTVER}/clang_64/translations/qtmultimedia_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 + cp -v $HOME/Qt/${QTVER}/${QTVER}/clang_64/translations/qtquick1_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 + cp -v $HOME/Qt/${QTVER}/${QTVER}/clang_64/translations/qtscript_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 + cp -v $HOME/Qt/${QTVER}/${QTVER}/clang_64/translations/qtxmlpatterns_${i}.qm src/DB\ Browser\ for\ SQLite.app/Contents/translations/ >>$LOG 2>&1 done # Unlock the local security keychain, so signing can be done security unlock-keychain -p "${KEYCHAIN_PASSWORD}" "${HOME}/Library/Keychains/login.keychain" # Sign the .app -codesign --sign "${DEV_ID}" --verbose --deep --force --keychain "/Library/Keychains/System.keychain" --options runtime --timestamp src/DB\ Browser\ for\ SQLite.app/Contents/Extensions/fileio.dylib >>$LOG 2>&1 -codesign --sign "${DEV_ID}" --verbose --deep --force --keychain "/Library/Keychains/System.keychain" --options runtime --timestamp src/DB\ Browser\ for\ SQLite.app/Contents/Extensions/formats.dylib >>$LOG 2>&1 -codesign --sign "${DEV_ID}" --verbose --deep --force --keychain "/Library/Keychains/System.keychain" --options runtime --timestamp src/DB\ Browser\ for\ SQLite.app/Contents/Extensions/math.dylib >>$LOG 2>&1 +codesign --sign "${DEV_ID}" --verbose --deep --keychain "/Library/Keychains/System.keychain" src/DB\ Browser\ for\ SQLite.app >>$LOG 2>&1 # Make a .dmg file from the .app mv src/DB\ Browser\ for\ SQLite.app $HOME/appdmg/ >>$LOG 2>&1 cd $HOME/appdmg >>$LOG 2>&1 appdmg --quiet nightly.json DB\ Browser\ for\ SQLite-sqlcipher_${DATE}.dmg >>$LOG 2>&1 -codesign --sign "${DEV_ID}" --verbose --deep --keychain "/Library/Keychains/System.keychain" --options runtime --timestamp DB\ Browser\ for\ SQLite-sqlcipher_${DATE}.dmg >>$LOG 2>&1 +codesign --sign "${DEV_ID}" --verbose --deep --keychain "/Library/Keychains/System.keychain" DB\ Browser\ for\ SQLite-sqlcipher_${DATE}.dmg >>$LOG 2>&1 mv DB\ Browser\ for\ SQLite-sqlcipher_${DATE}.dmg $HOME/db4s_nightlies/ >>$LOG 2>&1 rm -rf $HOME/appdmg/DB\ Browser\ for\ SQLite.app >>$LOG 2>&1 diff -Nru sqlitebrowser-3.12.1/installer/windows/nightly_build_scripts/win32build.bat sqlitebrowser-3.12.2/installer/windows/nightly_build_scripts/win32build.bat --- sqlitebrowser-3.12.1/installer/windows/nightly_build_scripts/win32build.bat 2021-05-23 14:19:23.000000000 +0000 +++ sqlitebrowser-3.12.2/installer/windows/nightly_build_scripts/win32build.bat 2021-05-24 19:46:08.000000000 +0000 @@ -5,7 +5,7 @@ SET ZIP_EXE="C:\Program Files\7-Zip\7z.exe" SET SQLITE_DIR=C:\\dev\\SQLite-Win32 SET SQLCIPHER_DIR=C:\\git_repos\\SQLCipher-Win32 -SET SQLCIPHER_TAG=v4.4.2 +SET SQLCIPHER_TAG=v4.3.0 :: You need to change the date format in Windows settings to YYYY-MM-DD :: before this will work properly. ;) diff -Nru sqlitebrowser-3.12.1/installer/windows/nightly_build_scripts/win64build.bat sqlitebrowser-3.12.2/installer/windows/nightly_build_scripts/win64build.bat --- sqlitebrowser-3.12.1/installer/windows/nightly_build_scripts/win64build.bat 2021-05-23 14:19:23.000000000 +0000 +++ sqlitebrowser-3.12.2/installer/windows/nightly_build_scripts/win64build.bat 2021-05-24 19:46:08.000000000 +0000 @@ -5,7 +5,7 @@ SET ZIP_EXE="C:\Program Files\7-Zip\7z.exe" SET SQLITE_DIR=C:\\dev\\SQLite-Win64 SET SQLCIPHER_DIR=C:\\git_repos\\SQLCipher-Win64 -SET SQLCIPHER_TAG=v4.4.2 +SET SQLCIPHER_TAG=v4.3.0 :: You need to change the date format in Windows settings to YYYY-MM-DD :: before this will work properly. ;) diff -Nru sqlitebrowser-3.12.1/installer/windows/product.wxs sqlitebrowser-3.12.2/installer/windows/product.wxs --- sqlitebrowser-3.12.1/installer/windows/product.wxs 2021-05-23 14:19:23.000000000 +0000 +++ sqlitebrowser-3.12.2/installer/windows/product.wxs 2021-05-24 19:46:08.000000000 +0000 @@ -93,7 +93,6 @@ - @@ -195,7 +194,6 @@ - diff -Nru sqlitebrowser-3.12.1/installer/windows/variables.wxi sqlitebrowser-3.12.2/installer/windows/variables.wxi --- sqlitebrowser-3.12.1/installer/windows/variables.wxi 2021-05-23 14:19:23.000000000 +0000 +++ sqlitebrowser-3.12.2/installer/windows/variables.wxi 2021-05-24 19:46:08.000000000 +0000 @@ -3,7 +3,7 @@ - +