Update bundled deps

3 years ago · eb3ff097d5
parent 9c1c3eb10d
commit eb3ff097d5
3 changed files with 44 additions and 37 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -6,32 +6,24 @@ variables:

 build-gcc7:
  stage: build
-  image: ubuntu:16.04
+  image: ubuntu:20.04
  tags: [docker]
  variables:
-    CXX: g++-7
-    CC: gcc-7
    QT_PKG: 515
    TRAVIS_OS_NAME: linux
  before_script:
    - apt-get update
    - apt-get install -y software-properties-common
    - add-apt-repository ppa:ubuntu-toolchain-r/test -y
-    - add-apt-repository ppa:beineri/opt-qt-5.15.2-xenial -y
-    - apt-get update && apt-get -y install --no-install-recommends g++-7 build-essential ninja-build qt${QT_PKG}{base,declarative,tools,multimedia,script,quickcontrols2,svg} liblmdb-dev libgl1-mesa-dev libssl-dev git ccache
+    - add-apt-repository ppa:beineri/opt-qt-5.15.2-focal -y
+    - apt-get update && apt-get -y install --no-install-recommends build-essential ninja-build qt${QT_PKG}{base,declarative,tools,multimedia,script,quickcontrols2,svg} liblmdb-dev libgl1-mesa-dev libssl-dev git ccache pkg-config libsecret-1-dev cmake
    # need recommended deps for wget
    - apt-get -y install wget
-    - wget https://github.com/Kitware/CMake/releases/download/v3.19.0/cmake-3.19.0-Linux-x86_64.sh && sh cmake-3.19.0-Linux-x86_64.sh  --skip-license  --prefix=/usr/local
    - /usr/sbin/update-ccache-symlinks
-    - update-alternatives --install /usr/bin/gcc gcc "/usr/bin/${CC}" 10
-    - update-alternatives --install /usr/bin/g++ g++ "/usr/bin/${CXX}" 10
-    - update-alternatives --set gcc "/usr/bin/${CC}"
-    - update-alternatives --set g++ "/usr/bin/${CXX}"
    - rm -rf ../.hunter &&  mv .hunter ../.hunter || true
  script:
    - export PATH="/usr/lib/ccache:${PATH}"
    - export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l)
-    - export PATH="/usr/local/bin/:${PATH}"
    - . "/opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh" || true
    - cmake -GNinja -H. -Bbuild
        -DCMAKE_INSTALL_PREFIX=.deps/usr
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -174,7 +174,7 @@ if (USE_BUNDLED_QTKEYCHAIN)
 	FetchContent_Declare(
 		qt5keychain
 		GIT_REPOSITORY https://github.com/frankosterfeld/qtkeychain.git
-		GIT_TAG        v0.12.0
+		GIT_TAG        v0.13.1
 		)
 	if (BUILD_SHARED_LIBS)
 		set(QTKEYCHAIN_STATIC OFF CACHE INTERNAL "")
@ -388,7 +388,7 @@ if(USE_BUNDLED_MTXCLIENT)
 	FetchContent_Declare(
 		MatrixClient
 		GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
-		GIT_TAG        bacb7e524ff0f38591b88b248d8d8409b7fd49a0
+		GIT_TAG        v0.6.0
 		)
 	set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
 	set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")
@ -401,7 +401,7 @@ if(USE_BUNDLED_OLM)
 	FetchContent_Declare(
 		Olm
 		GIT_REPOSITORY https://gitlab.matrix.org/matrix-org/olm.git
-		GIT_TAG        3.2.4
+		GIT_TAG        3.2.6
 		)
 	set(OLM_TESTS OFF CACHE INTERNAL "")
 	FetchContent_MakeAvailable(Olm)
@ -423,14 +423,14 @@ if(USE_BUNDLED_CMARK)
 	FetchContent_Declare(
 		cmark
 		GIT_REPOSITORY https://github.com/commonmark/cmark.git
-		GIT_TAG        242e277a661ec7e51f34dcaf86c1925d550b1498 #0.29.0 << doesn't work with fetch content yet
+		GIT_TAG        0.30.2
 		CMAKE_ARGS     "CMARK_STATIC=ON CMARK_SHARED=OFF CMARK_TESTS=OFF CMARK_TESTS=OFF"
 		)
 	FetchContent_MakeAvailable(cmark)
 	if (MSVC)
-		add_library(cmark::cmark ALIAS libcmark)
+		add_library(cmark::cmark ALIAS cmark)
 	else()
-		add_library(cmark::cmark ALIAS libcmark_static)
+		add_library(cmark::cmark ALIAS cmark_static)
 	endif()
 else()
 	find_package(cmark REQUIRED 0.29.0)
@ -691,7 +691,7 @@ if(USE_BUNDLED_COEURL)
 	FetchContent_Declare(
 		coeurl
 		GIT_REPOSITORY https://nheko.im/Nheko-Reborn/coeurl.git
-		GIT_TAG        3901507db25cf3f9364b58cd8c7880640900c992
+		GIT_TAG        v0.1.0
 		)
 	FetchContent_MakeAvailable(coeurl)
 	target_link_libraries(nheko PUBLIC coeurl::coeurl)
--- a/io.github.NhekoReborn.Nheko.yaml
+++ b/io.github.NhekoReborn.Nheko.yaml
@ -59,9 +59,9 @@ modules:
      - -DCMAKE_BUILD_TYPE=Release
      - -DCMARK_TESTS=OFF
    sources:
-      - sha256: 2558ace3cbeff85610de3bda32858f722b359acdadf0c4691851865bb84924a6
+      - sha256: 6c7d2bcaea1433d977d8fed0b55b71c9d045a7cdf616e3cd2dce9007da753db3
        type: archive
-        url: https://github.com/commonmark/cmark/archive/0.29.0.tar.gz
+        url: https://github.com/commonmark/cmark/archive/0.30.2.tar.gz
  - name: spdlog
    buildsystem: cmake-ninja
    config-opts:
@ -78,11 +78,23 @@ modules:
    buildsystem: cmake-ninja
    name: olm
    sources:
-      - commit: 64afab93645957846d936a19b8501dbd3f2cc4a1
+      - commit: 8656f1463c4e16366335fb468453a9455a366c78
        disable-shallow-clone: true
-        tag: 3.2.4
+        tag: 3.2.6
        type: git
        url: https://gitlab.matrix.org/matrix-org/olm.git
+  - buildsystem: meson
+    name: libsecret
+    config-opts:
+      - -Dmanpage=false
+      - -Dvapi=false
+      - -Dgtk_doc=false
+      - -Dintrospection=false
+    sources:
+      - commit: 3fe635e64efd4b8dbc9ec3548b0bc8034c7665c4
+        tag: 0.20.4
+        type: git
+        url: https://gitlab.gnome.org/GNOME/libsecret.git
  - config-opts:
      - -DCMAKE_BUILD_TYPE=Release
      - -DBUILD_TEST_APPLICATION=OFF
@ -90,8 +102,8 @@ modules:
    buildsystem: cmake-ninja
    name: QtKeychain
    sources:
-      - commit: 815fe610353ff8ad7e2f1121c368a74df8db5eb7
-        tag: v0.12.0
+      - commit: f59ac26be709fd2d8d7a062fab1cf1e67a93806c
+        tag: v0.13.1
        type: git
        url: https://github.com/frankosterfeld/qtkeychain.git
  - config-opts:
@ -99,14 +111,14 @@ modules:
    buildsystem: cmake
    name: nlohmann
    sources:
-      - sha256: d51a3a8d3efbb1139d7608e28782ea9efea7e7933157e8ff8184901efd8ee760
+      - sha256: 1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3
        type: archive
-        url: https://github.com/nlohmann/json/archive/v3.7.0.tar.gz
+        url: https://github.com/nlohmann/json/archive/v3.10.4.tar.gz
  - buildsystem: meson
    name: gstreamer
    sources:
-      - commit: a42fe476d3ee5576921f67a331464065ec33b9a4
-        tag: 1.18.3
+      - commit: 71c213f99ad5c8fc8f36a26238483f2bdf7d846a
+        tag: 1.18.5
        type: git
        url: https://gitlab.freedesktop.org/gstreamer/gstreamer.git
  - config-opts:
@ -115,8 +127,8 @@ modules:
    buildsystem: meson
    name: gstreamer-plugins-base
    sources:
-      - commit: 2cc319ee13f6b72df3d432b7c75aca81feb260e5
-        tag: 1.18.3
+      - commit: 57fb883b3f8c6d7a397afc0dfc4a7c2e5af05579
+        tag: 1.18.5
        type: git
        url: https://gitlab.freedesktop.org/gstreamer/gst-plugins-base.git
  - config-opts:
@ -128,8 +140,8 @@ modules:
    buildsystem: meson
    name: gstreamer-plugins-good
    sources:
-      - commit: e816c6cd73c9e0676828c9e227a049ebad3d019f
-        tag: 1.18.3
+      - commit: 56dec037a80266add6853e4b06e2dc379de757d1
+        tag: 1.18.5
        type: git
        url: https://gitlab.freedesktop.org/gstreamer/gst-plugins-good.git
  - config-opts:
@ -143,8 +155,8 @@ modules:
    buildsystem: meson
    name: gstreamer-plugins-bad
    sources:
-      - commit: 382e373d9be363f1e21b12990a4d12f1ecb6df41
-        tag: 1.18.3
+      - commit: d3af58d5b31941caa26c3ded85d7a7b84a91f0cc
+        tag: 1.18.5
        type: git
        url: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git
  - buildsystem: qmake
@ -154,7 +166,8 @@ modules:
      - mkdir -p /app/bin/
      - cp libqtjdenticon.so /app/bin/
    sources:
-      - commit: 77eb0d62441e03bbbfc2b1d2057c4045ac87fb85
+      - commit: e58c14369dfbf008c63f43a4556b2e52232e0265
+        tag: v0.1.0
        type: git
        url: https://github.com/Nheko-Reborn/qt-jdenticon.git
  - buildsystem: meson
@ -162,7 +175,8 @@ modules:
      - -Ddefault_library=static
    name: coeurl
    sources:
-      - commit: 3901507db25cf3f9364b58cd8c7880640900c992
+      - commit: a08f619adaa1ccd34eb6315d6578eddae0d1cc9b
+        tag: v0.1.0
        type: git
        url: https://nheko.im/nheko-reborn/coeurl.git
  - config-opts:
@ -173,7 +187,8 @@ modules:
    buildsystem: cmake-ninja
    name: mtxclient
    sources:
-      - commit: bacb7e524ff0f38591b88b248d8d8409b7fd49a0
+      - commit: eecc4e93f2137c658014f17cefd62ad569063769
+        tag: v0.6.0
        type: git
        url: https://github.com/Nheko-Reborn/mtxclient.git
  - config-opts: