From c5959f40a3890cdb22c6894e162ff8f4e3e3028f Mon Sep 17 00:00:00 2001 From: Anthony Bilinski Date: Fri, 1 May 2020 15:37:47 -0700 Subject: [PATCH] chore(deps): update c-toxcore to v0.2.12 (cherry picked from commit 728621f62722534019b6816ee217af361c549cb7) --- .travis/build-ubuntu-16-04.sh | 2 +- INSTALL.fa.md | 2 +- INSTALL.md | 2 +- bootstrap.sh | 2 +- docker/Dockerfile.debian | 2 +- docker/Dockerfile.ubuntu | 2 +- flatpak/io.github.qtox.qTox.json | 4 +- osx/qTox-Mac-Deployer-ULTIMATE.sh | 2 +- windows/qtox64.nsi | 96 +++++++++++++++---------------- 9 files changed, 57 insertions(+), 57 deletions(-) diff --git a/.travis/build-ubuntu-16-04.sh b/.travis/build-ubuntu-16-04.sh index b45fcf50c..5333a63e8 100755 --- a/.travis/build-ubuntu-16-04.sh +++ b/.travis/build-ubuntu-16-04.sh @@ -127,7 +127,7 @@ sudo checkinstall --install --pkgname libsodium --pkgversion 1.0.8 --nodoc -y sudo ldconfig cd .. # toxcore -git clone --branch v0.2.11 --depth=1 https://github.com/toktok/c-toxcore.git toxcore +git clone --branch v0.2.12 --depth=1 https://github.com/toktok/c-toxcore.git toxcore cd toxcore autoreconf -if CC="ccache $CC" CXX="ccache $CXX" ./configure diff --git a/INSTALL.fa.md b/INSTALL.fa.md index c2c1427f6..de1c78d34 100644 --- a/INSTALL.fa.md +++ b/INSTALL.fa.md @@ -632,7 +632,7 @@ cd .. ```bash git clone https://github.com/toktok/c-toxcore.git toxcore cd toxcore -git checkout v0.2.11 +git checkout v0.2.12 autoreconf -if ./configure make -j$(nproc) diff --git a/INSTALL.md b/INSTALL.md index 3214de01f..2a004d440 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -487,7 +487,7 @@ Provided that you have all required dependencies installed, you can simply run: ```bash git clone https://github.com/toktok/c-toxcore.git toxcore cd toxcore -git checkout v0.2.11 +git checkout v0.2.12 cmake . -DBOOTSTRAP_DAEMON=OFF make -j$(nproc) sudo make install diff --git a/bootstrap.sh b/bootstrap.sh index d704b9061..59da1bc87 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -48,7 +48,7 @@ readonly INSTALL_DIR=libs readonly BASE_DIR="${SCRIPT_DIR}/${INSTALL_DIR}" # versions of libs to checkout -readonly TOXCORE_VERSION="v0.2.11" +readonly TOXCORE_VERSION="v0.2.12" readonly SQLCIPHER_VERSION="v4.3.0" # directory names of cloned repositories diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index 24893ba53..72f386ab0 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -50,7 +50,7 @@ RUN apt-get update && \ RUN git clone https://github.com/toktok/c-toxcore.git /toxcore WORKDIR /toxcore -RUN git checkout v0.2.11 && \ +RUN git checkout v0.2.12 && \ cmake . && \ cmake --build . && \ make install && \ diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index 320907faf..2a1283293 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -47,7 +47,7 @@ RUN apt-get update && \ RUN git clone https://github.com/toktok/c-toxcore.git /toxcore WORKDIR /toxcore -RUN git checkout v0.2.11 && \ +RUN git checkout v0.2.12 && \ cmake . && \ cmake --build . && \ make install && \ diff --git a/flatpak/io.github.qtox.qTox.json b/flatpak/io.github.qtox.qTox.json index a659b93a5..591b41f4d 100644 --- a/flatpak/io.github.qtox.qTox.json +++ b/flatpak/io.github.qtox.qTox.json @@ -111,8 +111,8 @@ { "type": "git", "url": "https://github.com/toktok/c-toxcore", - "tag": "v0.2.11", - "commit": "30b9369b01859e7c57687129ba2a481aa2bc48b8" + "tag": "v0.2.12", + "commit": "9be4dbb4335bf7d893c8d00566d3276ab6dedd14" } ] }, diff --git a/osx/qTox-Mac-Deployer-ULTIMATE.sh b/osx/qTox-Mac-Deployer-ULTIMATE.sh index 4315acce3..5688ca589 100755 --- a/osx/qTox-Mac-Deployer-ULTIMATE.sh +++ b/osx/qTox-Mac-Deployer-ULTIMATE.sh @@ -145,7 +145,7 @@ install() { git pull else fcho "Cloning Toxcore git ... " - git clone --branch v0.2.11 --depth=1 https://github.com/toktok/c-toxcore "$TOXCORE_DIR" + git clone --branch v0.2.12 --depth=1 https://github.com/toktok/c-toxcore "$TOXCORE_DIR" fi # qTox if [[ $TRAVIS = true ]] diff --git a/windows/qtox64.nsi b/windows/qtox64.nsi index db1f81d62..7b751a265 100755 --- a/windows/qtox64.nsi +++ b/windows/qtox64.nsi @@ -36,72 +36,72 @@ VIAddVersionKey "FileVersion" "${VERSION}" !macro AddItem Path FileWrite $UninstLog "${Path}$\r$\n" !macroend - + ;File macro !macro File FileName IfFileExists "$OUTDIR\${FileName}" +2 FileWrite $UninstLog "$OUTDIR\${FileName}$\r$\n" File "${FileName}" !macroend - + ;CreateShortcut macro !macro CreateShortcut FilePath FilePointer Pamameters Icon IconIndex FileWrite $UninstLog "${FilePath}$\r$\n" CreateShortcut "${FilePath}" "${FilePointer}" "${Pamameters}" "${Icon}" "${IconIndex}" !macroend - + ;Copy files macro !macro CopyFiles SourcePath DestPath IfFileExists "${DestPath}" +2 FileWrite $UninstLog "${DestPath}$\r$\n" CopyFiles "${SourcePath}" "${DestPath}" !macroend - + ;Rename macro !macro Rename SourcePath DestPath IfFileExists "${DestPath}" +2 FileWrite $UninstLog "${DestPath}$\r$\n" Rename "${SourcePath}" "${DestPath}" !macroend - + ;CreateDirectory macro !macro CreateDirectory Path CreateDirectory "${Path}" FileWrite $UninstLog "${Path}$\r$\n" !macroend - + ;SetOutPath macro !macro SetOutPath Path SetOutPath "${Path}" FileWrite $UninstLog "${Path}$\r$\n" !macroend - + ;WriteUninstaller macro !macro WriteUninstaller Path WriteUninstaller "${Path}" FileWrite $UninstLog "${Path}$\r$\n" !macroend - + ;WriteIniStr macro !macro WriteIniStr IniFile SectionName EntryName NewValue IfFileExists "${IniFile}" +2 FileWrite $UninstLog "${IniFile}$\r$\n" WriteIniStr "${IniFile}" "${SectionName}" "${EntryName}" "${NewValue}" !macroend - + ;WriteRegStr macro !macro WriteRegStr RegRoot UnInstallPath Key Value FileWrite $UninstLog "${RegRoot} ${UnInstallPath}$\r$\n" WriteRegStr "${RegRoot}" "${UnInstallPath}" "${Key}" "${Value}" !macroend - - + + ;WriteRegDWORD macro !macro WriteRegDWORD RegRoot UnInstallPath Key Value FileWrite $UninstLog "${RegRoot} ${UnInstallPath}$\r$\n" WriteRegDWORD "${RegRoot}" "${UnInstallPath}" "${Key}" "${Value}" !macroend - + ;BackupFile macro !macro BackupFile FILE_DIR FILE BACKUP_TO IfFileExists "${BACKUP_TO}\*.*" +2 @@ -109,13 +109,13 @@ VIAddVersionKey "FileVersion" "${VERSION}" IfFileExists "${FILE_DIR}\${FILE}" 0 +2 Rename "${FILE_DIR}\${FILE}" "${BACKUP_TO}\${FILE}" !macroend - + ;RestoreFile macro !macro RestoreFile BUP_DIR FILE RESTORE_TO IfFileExists "${BUP_DIR}\${FILE}" 0 +2 Rename "${BUP_DIR}\${FILE}" "${RESTORE_TO}\${FILE}" !macroend - + ;BackupFiles macro !macro BackupFiles FILE_DIR FILE BACKUP_TO IfFileExists "${BACKUP_TO}\*.*" +2 @@ -128,7 +128,7 @@ VIAddVersionKey "FileVersion" "${VERSION}" SetOutPath "${FILE_DIR}" File "${FILE}" #After the Original file is backed up write the new file. !macroend - + ;RestoreFiles macro !macro RestoreFiles BUP_FILE RESTORE_FILE IfFileExists "${BUP_FILE}" 0 +2 @@ -141,52 +141,52 @@ VIAddVersionKey "FileVersion" "${VERSION}" ;Set the name of the uninstall log !define UninstLog "uninstall.log" Var UninstLog - + ;Uninstall log file missing. LangString UninstLogMissing ${LANG_ENGLISH} "${UninstLog} not found!$\r$\nUninstallation cannot proceed!" - + ;AddItem macro !define AddItem "!insertmacro AddItem" - + ;BackupFile macro - !define BackupFile "!insertmacro BackupFile" - + !define BackupFile "!insertmacro BackupFile" + ;BackupFiles macro - !define BackupFiles "!insertmacro BackupFiles" - + !define BackupFiles "!insertmacro BackupFiles" + ;Copy files macro !define CopyFiles "!insertmacro CopyFiles" - + ;CreateDirectory macro !define CreateDirectory "!insertmacro CreateDirectory" - + ;CreateShortcut macro !define CreateShortcut "!insertmacro CreateShortcut" - + ;File macro !define File "!insertmacro File" - + ;Rename macro !define Rename "!insertmacro Rename" - + ;RestoreFile macro - !define RestoreFile "!insertmacro RestoreFile" - + !define RestoreFile "!insertmacro RestoreFile" + ;RestoreFiles macro !define RestoreFiles "!insertmacro RestoreFiles" - + ;SetOutPath macro !define SetOutPath "!insertmacro SetOutPath" - + ;WriteRegDWORD macro - !define WriteRegDWORD "!insertmacro WriteRegDWORD" - + !define WriteRegDWORD "!insertmacro WriteRegDWORD" + ;WriteRegStr macro !define WriteRegStr "!insertmacro WriteRegStr" - + ;WriteUninstaller macro !define WriteUninstaller "!insertmacro WriteUninstaller" - + Section -openlogfile CreateDirectory "$INSTDIR" IfFileExists "$INSTDIR\${UninstLog}" +3 @@ -243,7 +243,7 @@ FunctionEnd !insertmacro MUI_UNPAGE_FINISH !insertmacro MUI_LANGUAGE "English" - + ################# #INSTALL ################# @@ -252,16 +252,16 @@ Section "Install" # Install files ${SetOutPath} "$INSTDIR" ${WriteUninstaller} "uninstall.exe" - + ${CreateDirectory} "$INSTDIR\bin" ${SetOutPath} "$INSTDIR\bin" ${File} "qtox\*.*" - + ${CreateDirectory} "$INSTDIR\bin\imageformats" ${SetOutPath} "$INSTDIR\bin\imageformats" File /nonfatal "qtox\imageformats\*.*" ${SetOutPath} "$INSTDIR\bin" - + ${CreateDirectory} "$INSTDIR\bin\platforms" ${SetOutPath} "$INSTDIR\bin\platforms" File /nonfatal "qtox\platforms\*.*" @@ -304,28 +304,28 @@ Section Uninstall ;If there's no uninstall log, we'll try anyway to clean what we can IfFileExists "$INSTDIR\${UninstLog}" +3 Goto noLog - + Push $R0 Push $R1 Push $R2 SetFileAttributes "$INSTDIR\${UninstLog}" NORMAL FileOpen $UninstLog "$INSTDIR\${UninstLog}" r StrCpy $R1 -1 - + GetLineCount: ClearErrors FileRead $UninstLog $R0 IntOp $R1 $R1 + 1 StrCpy $R0 $R0 -2 - Push $R0 + Push $R0 IfErrors 0 GetLineCount - + Pop $R0 - + LoopRead: StrCmp $R1 0 LoopDone Pop $R0 - + IfFileExists "$R0\*.*" 0 +3 RMDir $R0 #is dir Goto +9 @@ -337,7 +337,7 @@ Section Uninstall Goto +3 StrCmp $R0 "${REG_ROOT} ${UNINSTALL_PATH}" 0 +2 DeleteRegKey ${REG_ROOT} "${UNINSTALL_PATH}" #is Reg Element - + IntOp $R1 $R1 - 1 Goto LoopRead LoopDone: @@ -350,10 +350,10 @@ Section Uninstall Pop $R2 Pop $R1 Pop $R0 - + ;Remove start menu entries RMDir /r /REBOOTOK "$SMPROGRAMS\qTox" - + ;Remove registry keys SetRegView 64 DeleteRegKey ${REG_ROOT} "${REG_APP_PATH}"