mirror of
https://github.com/Nheko-Reborn/nheko.git
synced 2024-11-23 19:38:48 +03:00
Compare commits
7 commits
4789cc683b
...
9364d36827
Author | SHA1 | Date | |
---|---|---|---|
|
9364d36827 | ||
|
a3219c71d7 | ||
|
80b82f2261 | ||
|
18f13f187c | ||
|
bca05d38c4 | ||
|
da91f83178 | ||
|
c1ef49ac54 |
3 changed files with 5 additions and 52 deletions
|
@ -15,6 +15,8 @@ export PATH
|
||||||
CMAKE_PREFIX_PATH="${QT_BASEPATH}/lib/cmake"
|
CMAKE_PREFIX_PATH="${QT_BASEPATH}/lib/cmake"
|
||||||
export CMAKE_PREFIX_PATH
|
export CMAKE_PREFIX_PATH
|
||||||
|
|
||||||
|
export CMAKE_BUILD_PARALLEL_LEVEL="$(sysctl -n hw.ncpu)"
|
||||||
|
|
||||||
cmake -GNinja -S. -Bbuild \
|
cmake -GNinja -S. -Bbuild \
|
||||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||||
-DCMAKE_INSTALL_PREFIX="nheko.temp" \
|
-DCMAKE_INSTALL_PREFIX="nheko.temp" \
|
||||||
|
@ -31,7 +33,7 @@ cmake --install build
|
||||||
git clone https://github.com/Nheko-Reborn/qt-jdenticon.git
|
git clone https://github.com/Nheko-Reborn/qt-jdenticon.git
|
||||||
( cd qt-jdenticon
|
( cd qt-jdenticon
|
||||||
qmake
|
qmake
|
||||||
make -j 4
|
make -j "$CMAKE_BUILD_PARALLEL_LEVEL"
|
||||||
cp libqtjdenticon.dylib ../../nheko.temp/nheko.app/Contents/MacOS
|
cp libqtjdenticon.dylib ../../nheko.temp/nheko.app/Contents/MacOS
|
||||||
)
|
)
|
||||||
# "$(brew --prefix qt6)/bin/macdeployqt" nheko.app -always-overwrite -qmldir=../resources/qml/
|
# "$(brew --prefix qt6)/bin/macdeployqt" nheko.app -always-overwrite -qmldir=../resources/qml/
|
||||||
|
|
|
@ -266,18 +266,10 @@ build-macos:
|
||||||
|
|
||||||
build-macos-as:
|
build-macos-as:
|
||||||
extends: build-macos
|
extends: build-macos
|
||||||
image: ghcr.io/cirruslabs/macos-ventura-xcode:14.3
|
image: ghcr.io/cirruslabs/macos-sequoia-xcode:16.1
|
||||||
tags: [macos-tart]
|
tags: [macos-tart]
|
||||||
before_script:
|
before_script:
|
||||||
# The following update-reset is a workaround for this issue: https://github.com/Homebrew/homebrew-bundle/issues/1179
|
|
||||||
- brew update-reset
|
|
||||||
- brew upgrade
|
|
||||||
- brew bundle --file .ci/macos/Brewfile
|
- brew bundle --file .ci/macos/Brewfile
|
||||||
### CMake 3.29 issue with re2 workaround.
|
|
||||||
- brew uninstall cmake
|
|
||||||
- curl "https://raw.githubusercontent.com/Homebrew/homebrew-core/9ae2628ed1337f342960fd6c2598ae69cf057615/Formula/c/cmake.rb" -o /tmp/cmake.rb
|
|
||||||
- brew install -s /tmp/cmake.rb
|
|
||||||
### End Cmake 3.29 issue with re2 workaround.
|
|
||||||
- pipx install aqtinstall
|
- pipx install aqtinstall
|
||||||
- pipx ensurepath
|
- pipx ensurepath
|
||||||
- . ~/.zshrc
|
- . ~/.zshrc
|
||||||
|
@ -303,7 +295,6 @@ build-macos-as:
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- artifacts/nheko-${CI_COMMIT_SHORT_SHA}-${PLAT}.dmg
|
- artifacts/nheko-${CI_COMMIT_SHORT_SHA}-${PLAT}.dmg
|
||||||
- /tmp/notarize*
|
|
||||||
name: nheko-${CI_COMMIT_SHORT_SHA}-macos
|
name: nheko-${CI_COMMIT_SHORT_SHA}-macos
|
||||||
|
|
||||||
codesign-macos-intel:
|
codesign-macos-intel:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
id: im.nheko.Nheko
|
id: im.nheko.Nheko
|
||||||
command: im.nheko.Nheko
|
command: im.nheko.Nheko
|
||||||
runtime: org.kde.Platform
|
runtime: org.kde.Platform
|
||||||
runtime-version: '6.7'
|
runtime-version: '6.8'
|
||||||
sdk: org.kde.Sdk
|
sdk: org.kde.Sdk
|
||||||
finish-args:
|
finish-args:
|
||||||
# needed for webcams, see https://github.com/Nheko-Reborn/nheko/issues/517
|
# needed for webcams, see https://github.com/Nheko-Reborn/nheko/issues/517
|
||||||
|
@ -118,46 +118,6 @@ modules:
|
||||||
tag: 0.21.4
|
tag: 0.21.4
|
||||||
type: git
|
type: git
|
||||||
url: https://gitlab.gnome.org/GNOME/libsecret.git
|
url: https://gitlab.gnome.org/GNOME/libsecret.git
|
||||||
- name: libavif
|
|
||||||
config-opts:
|
|
||||||
- -DCMAKE_BUILD_TYPE=Release
|
|
||||||
- -DAVIF_CODEC_AOM=ON
|
|
||||||
- -DBUILD_SHARED_LIBS=OFF
|
|
||||||
buildsystem: cmake-ninja
|
|
||||||
sources:
|
|
||||||
- sha256: dc56708c83a4b934a8af2b78f67f866ba2fb568605c7cf94312acf51ee57d146
|
|
||||||
type: archive
|
|
||||||
url: https://github.com/AOMediaCodec/libavif/archive/refs/tags/v1.0.4.tar.gz
|
|
||||||
- name: libde265
|
|
||||||
config-opts:
|
|
||||||
- -DCMAKE_BUILD_TYPE=Release
|
|
||||||
- -DENABLE_DECODER=OFF
|
|
||||||
buildsystem: cmake-ninja
|
|
||||||
sources:
|
|
||||||
- sha256: 00251986c29d34d3af7117ed05874950c875dd9292d016be29d3b3762666511d
|
|
||||||
type: archive
|
|
||||||
url: https://github.com/strukturag/libde265/releases/download/v1.0.15/libde265-1.0.15.tar.gz
|
|
||||||
- name: libheif
|
|
||||||
config-opts:
|
|
||||||
- -DCMAKE_BUILD_TYPE=Release
|
|
||||||
- -DWITH_EXAMPLES=OFF
|
|
||||||
- -DWITH_AOM_DECODER=OFF
|
|
||||||
- -DWITH_AOM_ENCODER=OFF
|
|
||||||
buildsystem: cmake-ninja
|
|
||||||
sources:
|
|
||||||
- sha256: 8390baf4913eda0a183e132cec62b875fb2ef507ced5ddddc98dfd2f17780aee
|
|
||||||
type: archive
|
|
||||||
url: https://github.com/strukturag/libheif/releases/download/v1.17.6/libheif-1.17.6.tar.gz
|
|
||||||
- name: KImageFormats
|
|
||||||
config-opts:
|
|
||||||
- -DCMAKE_BUILD_TYPE=Release
|
|
||||||
- -DKIMAGEFORMATS_HEIF=ON
|
|
||||||
buildsystem: cmake-ninja
|
|
||||||
sources:
|
|
||||||
- commit: 6c1a7ad33924764e8d1efff61919efebc31f5e5a
|
|
||||||
tag: v6.3.0
|
|
||||||
type: git
|
|
||||||
url: https://invent.kde.org/frameworks/kimageformats.git
|
|
||||||
- name: QtKeychain
|
- name: QtKeychain
|
||||||
config-opts:
|
config-opts:
|
||||||
- -DCMAKE_BUILD_TYPE=Release
|
- -DCMAKE_BUILD_TYPE=Release
|
||||||
|
|
Loading…
Reference in a new issue