aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make package on macos 13 (#4961)

Browse source
This commit is contained in:
ebbit1q 2023-12-16 03:15:57 +01:00 committed by GitHub
parent fa727524dc
commit 1716801437
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.github/workflows/desktop-build.yml vendored
View file

@ -201,8 +201,7 @@ jobs:
- target: Debug # tests only
os: macos-latest
xcode: 14.2
qt_version: 6.5
qt_modules: "qtmultimedia qtwebsockets"
qt_version: homebrew
type: Debug
do_tests: 1
@ -215,23 +214,16 @@ jobs:
do_tests: 1
make_package: 1
use_old_protobuf: 1
qt_py7zrversion: '==0.20.*'
- target: 12_Monterey
os: macos-12
xcode: 14.0.1
- target: 13_Ventura
os: macos-13
xcode: 14.3.1
qt_version: homebrew
type: Release
do_tests: 1
make_package: 1
- target: 13_Ventura
os: macos-13
xcode: 14.3
qt_version: homebrew
type: Release
do_tests: 1
make_package: 0
name: macOS ${{matrix.target}}
needs: configure
runs-on: ${{matrix.os}}
@ -251,6 +243,7 @@ jobs:
env:
install_qt: ${{matrix.qt_version}}
use_old_protobuf: ${{matrix.use_old_protobuf}}
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
run: |
brew update
if [[ $use_old_protobuf == 1 ]]; then
@ -274,6 +267,7 @@ jobs:
setup-python: false
version: ${{matrix.qt_version}}
modules: ${{matrix.qt_modules}}
py7zrversion: ${{matrix.qt_py7zrversion}}
- name: Build on Xcode ${{matrix.xcode}}
shell: bash

6
oracle/src/zip/zipglobal.cpp
View file

@ -27,7 +27,7 @@
#include "zipglobal.h"
#if defined(Q_OS_WIN) || defined(Q_OS_WINCE) || defined(Q_OS_LINUX) || defined(Q_OS_MACX)
#if defined(Q_OS_WIN) || defined(Q_OS_WINCE) || defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
#define OSDAB_ZIP_HAS_UTC
#include <ctime>
#else
@ -36,7 +36,7 @@
#if defined(Q_OS_WIN)
#include <QtCore/qt_windows.h>
#elif defined(Q_OS_LINUX) || defined(Q_OS_MACX)
#elif defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
#include <utime.h>
#endif
@ -138,7 +138,7 @@ bool OSDAB_ZIP_MANGLE(setFileTimestamp)(const QString &fileName, const QDateTime
CloseHandle(hFile);
return success;
#elif defined(Q_OS_LINUX) || defined(Q_OS_MACX)
#elif defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
struct utimbuf t_buffer;
t_buffer.actime = t_buffer.modtime = dateTime.toSecsSinceEpoch();