StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

chore(deps): update c-toxcore to v0.2.12

Browse Source
This commit is contained in:
Anthony Bilinski 2020-05-01 15:37:47 -07:00
parent 6105af8279
commit 728621f627
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
9 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis/build-ubuntu-16-04.sh
View File

@ -127,7 +127,7 @@ sudo checkinstall --install --pkgname libsodium --pkgversion 1.0.8 --nodoc -y
sudo ldconfig sudo ldconfig
cd .. cd ..
# toxcore # 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 cd toxcore
autoreconf -if autoreconf -if
CC="ccache $CC" CXX="ccache $CXX" ./configure CC="ccache $CC" CXX="ccache $CXX" ./configure

2
INSTALL.fa.md
View File

@ -632,7 +632,7 @@ cd ..
```bash ```bash
git clone https://github.com/toktok/c-toxcore.git toxcore git clone https://github.com/toktok/c-toxcore.git toxcore
cd toxcore cd toxcore
git checkout v0.2.11 git checkout v0.2.12
autoreconf -if autoreconf -if
./configure ./configure
make -j$(nproc) make -j$(nproc)

2
INSTALL.md
View File

@ -412,7 +412,7 @@ Provided that you have all required dependencies installed, you can simply run:
```bash ```bash
git clone https://github.com/toktok/c-toxcore.git toxcore git clone https://github.com/toktok/c-toxcore.git toxcore
cd toxcore cd toxcore
git checkout v0.2.11 git checkout v0.2.12
cmake . -DBOOTSTRAP_DAEMON=OFF cmake . -DBOOTSTRAP_DAEMON=OFF
make -j$(nproc) make -j$(nproc)
sudo make install sudo make install

2
bootstrap.sh
View File

@ -48,7 +48,7 @@ readonly INSTALL_DIR=libs
readonly BASE_DIR="${SCRIPT_DIR}/${INSTALL_DIR}" readonly BASE_DIR="${SCRIPT_DIR}/${INSTALL_DIR}"
# versions of libs to checkout # versions of libs to checkout
readonly TOXCORE_VERSION="v0.2.11" readonly TOXCORE_VERSION="v0.2.12"
readonly SQLCIPHER_VERSION="v4.3.0" readonly SQLCIPHER_VERSION="v4.3.0"
# directory names of cloned repositories # directory names of cloned repositories

2
docker/Dockerfile.debian
View File

@ -50,7 +50,7 @@ RUN apt-get update && \
RUN git clone https://github.com/toktok/c-toxcore.git /toxcore RUN git clone https://github.com/toktok/c-toxcore.git /toxcore
WORKDIR /toxcore WORKDIR /toxcore
RUN git checkout v0.2.11 && \ RUN git checkout v0.2.12 && \
cmake . && \ cmake . && \
cmake --build . && \ cmake --build . && \
make install && \ make install && \

2
docker/Dockerfile.ubuntu
View File

@ -47,7 +47,7 @@ RUN apt-get update && \
RUN git clone https://github.com/toktok/c-toxcore.git /toxcore RUN git clone https://github.com/toktok/c-toxcore.git /toxcore
WORKDIR /toxcore WORKDIR /toxcore
RUN git checkout v0.2.11 && \ RUN git checkout v0.2.12 && \
cmake . && \ cmake . && \
cmake --build . && \ cmake --build . && \
make install && \ make install && \

4
flatpak/io.github.qtox.qTox.json
View File

@ -112,8 +112,8 @@
{ {
"type": "git", "type": "git",
"url": "https://github.com/toktok/c-toxcore", "url": "https://github.com/toktok/c-toxcore",
"tag": "v0.2.11", "tag": "v0.2.12",
"commit": "30b9369b01859e7c57687129ba2a481aa2bc48b8" "commit": "9be4dbb4335bf7d893c8d00566d3276ab6dedd14"
} }
] ]
}, },

2
osx/qTox-Mac-Deployer-ULTIMATE.sh
View File

@ -145,7 +145,7 @@ install() {
git pull git pull
else else
fcho "Cloning Toxcore git ... " 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 fi
# qTox # qTox
if [[ $TRAVIS = true ]] if [[ $TRAVIS = true ]]

96
windows/qtox64.nsi
View File

@ -36,72 +36,72 @@ VIAddVersionKey "FileVersion" "${VERSION}"
!macro AddItem Path !macro AddItem Path
FileWrite $UninstLog "${Path}$\r$\n" FileWrite $UninstLog "${Path}$\r$\n"
!macroend !macroend
;File macro ;File macro
!macro File FileName !macro File FileName
IfFileExists "$OUTDIR\${FileName}" +2 IfFileExists "$OUTDIR\${FileName}" +2
FileWrite $UninstLog "$OUTDIR\${FileName}$\r$\n" FileWrite $UninstLog "$OUTDIR\${FileName}$\r$\n"
File "${FileName}" File "${FileName}"
!macroend !macroend
;CreateShortcut macro ;CreateShortcut macro
!macro CreateShortcut FilePath FilePointer Pamameters Icon IconIndex !macro CreateShortcut FilePath FilePointer Pamameters Icon IconIndex
FileWrite $UninstLog "${FilePath}$\r$\n" FileWrite $UninstLog "${FilePath}$\r$\n"
CreateShortcut "${FilePath}" "${FilePointer}" "${Pamameters}" "${Icon}" "${IconIndex}" CreateShortcut "${FilePath}" "${FilePointer}" "${Pamameters}" "${Icon}" "${IconIndex}"
!macroend !macroend
;Copy files macro ;Copy files macro
!macro CopyFiles SourcePath DestPath !macro CopyFiles SourcePath DestPath
IfFileExists "${DestPath}" +2 IfFileExists "${DestPath}" +2
FileWrite $UninstLog "${DestPath}$\r$\n" FileWrite $UninstLog "${DestPath}$\r$\n"
CopyFiles "${SourcePath}" "${DestPath}" CopyFiles "${SourcePath}" "${DestPath}"
!macroend !macroend
;Rename macro ;Rename macro
!macro Rename SourcePath DestPath !macro Rename SourcePath DestPath
IfFileExists "${DestPath}" +2 IfFileExists "${DestPath}" +2
FileWrite $UninstLog "${DestPath}$\r$\n" FileWrite $UninstLog "${DestPath}$\r$\n"
Rename "${SourcePath}" "${DestPath}" Rename "${SourcePath}" "${DestPath}"
!macroend !macroend
;CreateDirectory macro ;CreateDirectory macro
!macro CreateDirectory Path !macro CreateDirectory Path
CreateDirectory "${Path}" CreateDirectory "${Path}"
FileWrite $UninstLog "${Path}$\r$\n" FileWrite $UninstLog "${Path}$\r$\n"
!macroend !macroend
;SetOutPath macro ;SetOutPath macro
!macro SetOutPath Path !macro SetOutPath Path
SetOutPath "${Path}" SetOutPath "${Path}"
FileWrite $UninstLog "${Path}$\r$\n" FileWrite $UninstLog "${Path}$\r$\n"
!macroend !macroend
;WriteUninstaller macro ;WriteUninstaller macro
!macro WriteUninstaller Path !macro WriteUninstaller Path
WriteUninstaller "${Path}" WriteUninstaller "${Path}"
FileWrite $UninstLog "${Path}$\r$\n" FileWrite $UninstLog "${Path}$\r$\n"
!macroend !macroend
;WriteIniStr macro ;WriteIniStr macro
!macro WriteIniStr IniFile SectionName EntryName NewValue !macro WriteIniStr IniFile SectionName EntryName NewValue
IfFileExists "${IniFile}" +2 IfFileExists "${IniFile}" +2
FileWrite $UninstLog "${IniFile}$\r$\n" FileWrite $UninstLog "${IniFile}$\r$\n"
WriteIniStr "${IniFile}" "${SectionName}" "${EntryName}" "${NewValue}" WriteIniStr "${IniFile}" "${SectionName}" "${EntryName}" "${NewValue}"
!macroend !macroend
;WriteRegStr macro ;WriteRegStr macro
!macro WriteRegStr RegRoot UnInstallPath Key Value !macro WriteRegStr RegRoot UnInstallPath Key Value
FileWrite $UninstLog "${RegRoot} ${UnInstallPath}$\r$\n" FileWrite $UninstLog "${RegRoot} ${UnInstallPath}$\r$\n"
WriteRegStr "${RegRoot}" "${UnInstallPath}" "${Key}" "${Value}" WriteRegStr "${RegRoot}" "${UnInstallPath}" "${Key}" "${Value}"
!macroend !macroend
;WriteRegDWORD macro ;WriteRegDWORD macro
!macro WriteRegDWORD RegRoot UnInstallPath Key Value !macro WriteRegDWORD RegRoot UnInstallPath Key Value
FileWrite $UninstLog "${RegRoot} ${UnInstallPath}$\r$\n" FileWrite $UninstLog "${RegRoot} ${UnInstallPath}$\r$\n"
WriteRegDWORD "${RegRoot}" "${UnInstallPath}" "${Key}" "${Value}" WriteRegDWORD "${RegRoot}" "${UnInstallPath}" "${Key}" "${Value}"
!macroend !macroend
;BackupFile macro ;BackupFile macro
!macro BackupFile FILE_DIR FILE BACKUP_TO !macro BackupFile FILE_DIR FILE BACKUP_TO
IfFileExists "${BACKUP_TO}\*.*" +2 IfFileExists "${BACKUP_TO}\*.*" +2
@ -109,13 +109,13 @@ VIAddVersionKey "FileVersion" "${VERSION}"
IfFileExists "${FILE_DIR}\${FILE}" 0 +2 IfFileExists "${FILE_DIR}\${FILE}" 0 +2
Rename "${FILE_DIR}\${FILE}" "${BACKUP_TO}\${FILE}" Rename "${FILE_DIR}\${FILE}" "${BACKUP_TO}\${FILE}"
!macroend !macroend
;RestoreFile macro ;RestoreFile macro
!macro RestoreFile BUP_DIR FILE RESTORE_TO !macro RestoreFile BUP_DIR FILE RESTORE_TO
IfFileExists "${BUP_DIR}\${FILE}" 0 +2 IfFileExists "${BUP_DIR}\${FILE}" 0 +2
Rename "${BUP_DIR}\${FILE}" "${RESTORE_TO}\${FILE}" Rename "${BUP_DIR}\${FILE}" "${RESTORE_TO}\${FILE}"
!macroend !macroend
;BackupFiles macro ;BackupFiles macro
!macro BackupFiles FILE_DIR FILE BACKUP_TO !macro BackupFiles FILE_DIR FILE BACKUP_TO
IfFileExists "${BACKUP_TO}\*.*" +2 IfFileExists "${BACKUP_TO}\*.*" +2
@ -128,7 +128,7 @@ VIAddVersionKey "FileVersion" "${VERSION}"
SetOutPath "${FILE_DIR}" SetOutPath "${FILE_DIR}"
File "${FILE}" #After the Original file is backed up write the new file. File "${FILE}" #After the Original file is backed up write the new file.
!macroend !macroend
;RestoreFiles macro ;RestoreFiles macro
!macro RestoreFiles BUP_FILE RESTORE_FILE !macro RestoreFiles BUP_FILE RESTORE_FILE
IfFileExists "${BUP_FILE}" 0 +2 IfFileExists "${BUP_FILE}" 0 +2
@ -141,52 +141,52 @@ VIAddVersionKey "FileVersion" "${VERSION}"
;Set the name of the uninstall log ;Set the name of the uninstall log
!define UninstLog "uninstall.log" !define UninstLog "uninstall.log"
Var UninstLog Var UninstLog
;Uninstall log file missing. ;Uninstall log file missing.
LangString UninstLogMissing ${LANG_ENGLISH} "${UninstLog} not found!$\r$\nUninstallation cannot proceed!" LangString UninstLogMissing ${LANG_ENGLISH} "${UninstLog} not found!$\r$\nUninstallation cannot proceed!"
;AddItem macro ;AddItem macro
!define AddItem "!insertmacro AddItem" !define AddItem "!insertmacro AddItem"
;BackupFile macro ;BackupFile macro
!define BackupFile "!insertmacro BackupFile" !define BackupFile "!insertmacro BackupFile"
;BackupFiles macro ;BackupFiles macro
!define BackupFiles "!insertmacro BackupFiles" !define BackupFiles "!insertmacro BackupFiles"
;Copy files macro ;Copy files macro
!define CopyFiles "!insertmacro CopyFiles" !define CopyFiles "!insertmacro CopyFiles"
;CreateDirectory macro ;CreateDirectory macro
!define CreateDirectory "!insertmacro CreateDirectory" !define CreateDirectory "!insertmacro CreateDirectory"
;CreateShortcut macro ;CreateShortcut macro
!define CreateShortcut "!insertmacro CreateShortcut" !define CreateShortcut "!insertmacro CreateShortcut"
;File macro ;File macro
!define File "!insertmacro File" !define File "!insertmacro File"
;Rename macro ;Rename macro
!define Rename "!insertmacro Rename" !define Rename "!insertmacro Rename"
;RestoreFile macro ;RestoreFile macro
!define RestoreFile "!insertmacro RestoreFile" !define RestoreFile "!insertmacro RestoreFile"
;RestoreFiles macro ;RestoreFiles macro
!define RestoreFiles "!insertmacro RestoreFiles" !define RestoreFiles "!insertmacro RestoreFiles"
;SetOutPath macro ;SetOutPath macro
!define SetOutPath "!insertmacro SetOutPath" !define SetOutPath "!insertmacro SetOutPath"
;WriteRegDWORD macro ;WriteRegDWORD macro
!define WriteRegDWORD "!insertmacro WriteRegDWORD" !define WriteRegDWORD "!insertmacro WriteRegDWORD"
;WriteRegStr macro ;WriteRegStr macro
!define WriteRegStr "!insertmacro WriteRegStr" !define WriteRegStr "!insertmacro WriteRegStr"
;WriteUninstaller macro ;WriteUninstaller macro
!define WriteUninstaller "!insertmacro WriteUninstaller" !define WriteUninstaller "!insertmacro WriteUninstaller"
Section -openlogfile Section -openlogfile
CreateDirectory "$INSTDIR" CreateDirectory "$INSTDIR"
IfFileExists "$INSTDIR\${UninstLog}" +3 IfFileExists "$INSTDIR\${UninstLog}" +3
@ -243,7 +243,7 @@ FunctionEnd
!insertmacro MUI_UNPAGE_FINISH !insertmacro MUI_UNPAGE_FINISH
!insertmacro MUI_LANGUAGE "English" !insertmacro MUI_LANGUAGE "English"
################# #################
#INSTALL #INSTALL
################# #################
@ -252,16 +252,16 @@ Section "Install"
# Install files # Install files
${SetOutPath} "$INSTDIR" ${SetOutPath} "$INSTDIR"
${WriteUninstaller} "uninstall.exe" ${WriteUninstaller} "uninstall.exe"
${CreateDirectory} "$INSTDIR\bin" ${CreateDirectory} "$INSTDIR\bin"
${SetOutPath} "$INSTDIR\bin" ${SetOutPath} "$INSTDIR\bin"
${File} "qtox\*.*" ${File} "qtox\*.*"
${CreateDirectory} "$INSTDIR\bin\imageformats" ${CreateDirectory} "$INSTDIR\bin\imageformats"
${SetOutPath} "$INSTDIR\bin\imageformats" ${SetOutPath} "$INSTDIR\bin\imageformats"
File /nonfatal "qtox\imageformats\*.*" File /nonfatal "qtox\imageformats\*.*"
${SetOutPath} "$INSTDIR\bin" ${SetOutPath} "$INSTDIR\bin"
${CreateDirectory} "$INSTDIR\bin\platforms" ${CreateDirectory} "$INSTDIR\bin\platforms"
${SetOutPath} "$INSTDIR\bin\platforms" ${SetOutPath} "$INSTDIR\bin\platforms"
File /nonfatal "qtox\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 ;If there's no uninstall log, we'll try anyway to clean what we can
IfFileExists "$INSTDIR\${UninstLog}" +3 IfFileExists "$INSTDIR\${UninstLog}" +3
Goto noLog Goto noLog
Push $R0 Push $R0
Push $R1 Push $R1
Push $R2 Push $R2
SetFileAttributes "$INSTDIR\${UninstLog}" NORMAL SetFileAttributes "$INSTDIR\${UninstLog}" NORMAL
FileOpen $UninstLog "$INSTDIR\${UninstLog}" r FileOpen $UninstLog "$INSTDIR\${UninstLog}" r
StrCpy $R1 -1 StrCpy $R1 -1
GetLineCount: GetLineCount:
ClearErrors ClearErrors
FileRead $UninstLog $R0 FileRead $UninstLog $R0
IntOp $R1 $R1 + 1 IntOp $R1 $R1 + 1
StrCpy $R0 $R0 -2 StrCpy $R0 $R0 -2
Push $R0 Push $R0
IfErrors 0 GetLineCount IfErrors 0 GetLineCount
Pop $R0 Pop $R0
LoopRead: LoopRead:
StrCmp $R1 0 LoopDone StrCmp $R1 0 LoopDone
Pop $R0 Pop $R0
IfFileExists "$R0\*.*" 0 +3 IfFileExists "$R0\*.*" 0 +3
RMDir $R0 #is dir RMDir $R0 #is dir
Goto +9 Goto +9
@ -337,7 +337,7 @@ Section Uninstall
Goto +3 Goto +3
StrCmp $R0 "${REG_ROOT} ${UNINSTALL_PATH}" 0 +2 StrCmp $R0 "${REG_ROOT} ${UNINSTALL_PATH}" 0 +2
DeleteRegKey ${REG_ROOT} "${UNINSTALL_PATH}" #is Reg Element DeleteRegKey ${REG_ROOT} "${UNINSTALL_PATH}" #is Reg Element
IntOp $R1 $R1 - 1 IntOp $R1 $R1 - 1
Goto LoopRead Goto LoopRead
LoopDone: LoopDone:
@ -350,10 +350,10 @@ Section Uninstall
Pop $R2 Pop $R2
Pop $R1 Pop $R1
Pop $R0 Pop $R0
;Remove start menu entries ;Remove start menu entries
RMDir /r /REBOOTOK "$SMPROGRAMS\qTox" RMDir /r /REBOOTOK "$SMPROGRAMS\qTox"
;Remove registry keys ;Remove registry keys
SetRegView 64 SetRegView 64
DeleteRegKey ${REG_ROOT} "${REG_APP_PATH}" DeleteRegKey ${REG_ROOT} "${REG_APP_PATH}"