depau/Purism-Calls
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/calls.git synced 2024-05-18 02:59:27 +00:00
Code Issues Releases Wiki Activity

Merge branch 'main' into 'main'

Browse source 
Draft: Fix Flatpak

See merge request GNOME/calls!713
This commit is contained in:
Julian 2024-04-18 12:46:44 +00:00
parent 0d0cd1c095 d4ee59e409
commit 2cf72f6e58
2 changed files with 152 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.gitlab-ci.yml
View file

@ -99,23 +99,7 @@ package:deb-debian-trixie:arm64:
CONFIG_OPTS: >-
-Dmanpages=false
TEST_RUN_ARGS: >-
"calls:Validate desktop file"
"calls:Validate daemon desktop file"
calls:util
calls:settings
calls:origin
calls:provider
calls:call
calls:plugins
calls:contacts
calls:ui-call
calls:manager
calls:ringer
calls:media
calls:srtp
calls:sdp-crypto
# Disable test because it fails in flatpak
#calls:sip
-Dtests=false
# Build Flatpak for x86_64
flatpak@x86_64:

246
org.gnome.Calls.json
View file

@ -36,18 +36,29 @@
"modules" : [
{
"name" : "modem-manager",
"buildsystem" : "meson",
"config-opts" : [
"--without-udev",
"--without-mbim",
"--without-qmi",
"--with-systemdsystemunitdir=/app/lib/systemd/system",
"--with-udev-base-dir=/app/lib/udev"
"-Dudev=false",
"-Dmbim=false",
"-Dqmi=false",
"-Dqrtr=false",
"-Dexamples=false",
"-Dtests=false",
"-Dman=false",
"-Dbash_completion=false",
"-Dsystemdsystemunitdir=/app/lib/systemd/system",
"-Dudevdir=/app/lib/udev"
],
"sources" : [
{
"type" : "archive",
"url" : "https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.6.tar.xz",
"sha256" : "d4f804b31cf504239c5f1d4973c62095c00cba1ee9abb503718dac6d146a470a"
"type" : "git",
"url" : "https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git",
"tag" : "1.22.0",
"commit" : "03f786ce66360d67c669f4f122f8aa458e6f01ea",
"x-checker-data": {
"type" : "git",
"tag-pattern" : "^(\\d+\\.\\d*[02468]\\.\\d+)$"
}
}
]
},
@ -63,80 +74,89 @@
],
"sources" : [
{
"type" : "archive",
"url" : "https://download.gnome.org/sources/libpeas/1.34/libpeas-1.34.0.tar.xz",
"sha256": "4305f715dab4b5ad3e8007daec316625e7065a94e63e25ef55eb1efb964a7bf0"
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/libpeas.git",
"tag" : "libpeas-1.36.0",
"commit" : "7f245fa5158204621c3469756a951b68a651c4fe",
"x-checker-data": {
"type" : "git",
"tag-pattern" : "^libpeas-([\\d.]+)$"
}
}
]
},
{
"name" : "abseil",
"buildsystem" : "cmake-ninja",
"config-opts" : [
"-DCMAKE_CXX_STANDARD=17",
"-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
"-DBUILD_SHARED_LIBS=ON",
"-DABSL_PROPAGATE_CXX_STD=ON"
],
"sources" : [
{
"type" : "git",
"url" : "https://github.com/abseil/abseil-cpp.git",
"tag" : "20240116.1",
"commit" : "2f9e432cce407ce0ae50676696666f33a77d42ac",
"x-checker-data": {
"type" : "git",
"tag-pattern" : "^([\\d.]+)$"
}
}
]
},
{
"name" : "protobuf",
"buildsystem" : "cmake-ninja",
"config-opts" : [
"-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
"-Dprotobuf_ABSL_PROVIDER=package",
"-Dprotobuf_BUILD_SHARED_LIBS=ON",
"-Dprotobuf_BUILD_TESTS=OFF"
],
"cleanup" : [
"protoc",
"/bin",
"/doc",
"/lib/plugins"
],
"sources" : [
{
"type" : "git",
"url" : "https://github.com/protocolbuffers/protobuf.git",
"tag" : "v26.1",
"commit" : "2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5",
"x-checker-data": {
"type" : "git",
"tag-pattern" : "^v([\\d.]+)$"
}
}
]
},
{
"name" : "libphonenumber",
"buildsystem" : "cmake",
"buildsystem" : "cmake-ninja",
"config-opts" : [
"-DCMAKE_CXX_STANDARD=17",
"-DREGENERATE_METADATA=OFF",
"-DUSE_BOOST=OFF"
"-DUSE_BOOST=OFF",
"-DBUILD_TESTING=OFF",
"-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
],
"sources" : [
{
"type" : "archive",
"url" : "https://github.com/google/libphonenumber/archive/refs/tags/v8.12.54.tar.gz",
"sha256" : "cf3d531a6b097cad508c475888bcf042ff15fabc6be05e3f817224ae8512ce63"
},
{
"type" : "shell",
"commands" : [
"sed -i -e 's/\${\${NAME}_BIN}-NOTFOUND/\${NAME}_BIN-NOTFOUND/' cpp/CMakeLists.txt"
]
"type" : "git",
"url" : "https://github.com/google/libphonenumber.git",
"tag" : "v8.13.33",
"commit" : "5e620bb2637fac7911244fcb53206b2ea8fd65cb",
"x-checker-data": {
"type" : "git",
"version-scheme" : "semantic"
}
}
],
"subdir" : "cpp",
"modules" : [
{
"name" : "GTest",
"buildsystem" : "cmake-ninja",
"cleanup" : ["*"],
"sources" : [
{
"type" : "archive",
"url" : "https://github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz",
"sha256" : "81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2"
}
]
},
{
"name" : "protobuf",
"cleanup" : [
"protoc",
"/bin",
"/doc",
"/lib/plugins"
],
"sources" : [
{
"type" : "archive",
"url" : "https://github.com/protocolbuffers/protobuf/releases/download/v21.6/protobuf-cpp-3.21.6.tar.gz",
"sha256" : "a3c4c104b98a21a577ce5ecc0d9b9f43a359b917d0bcf69467b70dc27416dfdc"
}
]
},
{
"name" : "abseil",
"buildsystem" : "cmake",
"config-opts" : [
"-DCMAKE_CXX_STANDARD=17",
"-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
],
"sources" : [
{
"type" : "archive",
"url" : "https://github.com/abseil/abseil-cpp/archive/refs/tags/20220623.1.tar.gz",
"sha256" : "91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8"
}
]
}
]
"subdir" : "cpp"
},
{
"name" : "libical",
@ -155,9 +175,14 @@
],
"sources" : [
{
"type" : "archive",
"url" : "https://github.com/libical/libical/releases/download/v3.0.14/libical-3.0.14.tar.gz",
"sha256" : "4284b780356f1dc6a01f16083e7b836e63d3815e27ed0eaaad684712357ccc8f"
"type" : "git",
"url" : "https://github.com/libical/libical.git",
"tag" : "v3.0.18",
"commit" : "1b28a846d2dca16e5d15a433c6011cc2483555bb",
"x-checker-data": {
"type" : "git",
"tag-pattern" : "^v([\\d.]+)$"
}
}
]
},
@ -181,27 +206,32 @@
"-DENABLE_DOT_LOCKING=OFF",
"-DENABLE_FILE_LOCKING=fcntl",
"-DENABLE_GOA=OFF",
"-DENABLE_GTK=OFF",
"-DENABLE_GTK4=ON",
"-DENABLE_OAUTH2_WEBKITGTK4=OFF",
"-DENABLE_GOOGLE=OFF",
"-DENABLE_VALA_BINDINGS=ON",
"-DENABLE_WEATHER=OFF",
"-DWITH_OPENLDAP=OFF",
"-DWITH_LIBDB=OFF",
"-DENABLE_INTROSPECTION=ON",
"-DENABLE_TESTS=OFF",
"-DENABLE_INSTALLED_TESTS=OFF",
"-DENABLE_GTK_DOC=OFF",
"-DENABLE_EXAMPLES=OFF",
"-DWITH_PHONENUMBER:PATH=/",
"-DWITH_PHONENUMBER=ON",
"-DPHONENUMBER_DEFINITIONS=",
"-DENABLE_CANBERRA=OFF",
"-DENABLE_DOT_LOCKING=OFF"
"-DENABLE_CANBERRA=OFF"
],
"sources" : [
{
"type" : "archive",
"url" : "https://download-fallback.gnome.org/sources/evolution-data-server/3.47/evolution-data-server-3.47.1.tar.xz",
"sha256" : "2c685f3a6ec4712ead8fc6c3a0f9cf54e3edbb20c1ee5833af7946301061cc31"
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/evolution-data-server.git",
"tag" : "3.52.0",
"commit" : "739d0f7c158c768f3401c8a8b4cf41da94ef219b",
"x-checker-data": {
"type" : "git",
"tag-pattern" : "^([\\d.]+)$"
}
}
]
},
@ -211,9 +241,14 @@
"config-opts" : [ "-Denable-introspection=false" ],
"sources" : [
{
"type" : "archive",
"url" : "https://download.gnome.org/sources/gom/0.4/gom-0.4.tar.xz",
"sha256" : "68d08006aaa3b58169ce7cf1839498f45686fba8115f09acecb89d77e1018a9d"
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/gom.git",
"tag" : "0.5.0",
"commit" : "de52f4fe1d317258f9c8f386d9ab82f03ac3a4fb",
"x-checker-data": {
"type" : "git",
"tag-pattern" : "^([\\d.]+)$"
}
}
]
},
@ -232,7 +267,13 @@
"sources" : [
{
"type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/folks.git"
"url" : "https://gitlab.gnome.org/GNOME/folks.git",
"tag" : "0.15.9",
"commit" : "f57424e8411bb0b005483593ed11025a838ab19f",
"x-checker-data": {
"type" : "git",
"tag-pattern" : "^([\\d.]+)$"
}
}
]
},
@ -242,9 +283,14 @@
"config-opts" : [ "-Ddaemon=false" ],
"sources" : [
{
"type" : "archive",
"url" : "https://source.puri.sm/Librem5/feedbackd/-/archive/v0.0.1/feedbackd-v0.0.1.tar.gz",
"sha256" : "95c0658698e1ba17dae89f64e03a5ba57d938b22ff9869e36f2ded07dc6ccc48"
"type" : "git",
"url" : "https://source.puri.sm/Librem5/feedbackd.git",
"tag" : "v0.2.1",
"commit" : "1104cef50acb0b18a0d545e6a09773e3feb42e5b",
"x-checker-data": {
"type" : "git",
"tag-pattern" : "semantic"
}
}
]
},
@ -253,9 +299,14 @@
"buildsystem" : "meson",
"sources" : [
{
"type" : "archive",
"url" : "https://gitlab.com/mobian1/callaudiod/-/archive/0.1.3/callaudiod-0.1.3.tar.gz",
"sha256" : "4e844539457860975fe8407f583a625cd2e696576a6977306e7904c2a0679571"
"type" : "git",
"url" : "https://gitlab.com/mobian1/callaudiod.git",
"tag" : "0.1.9",
"commit" : "50d1ac3792aac03abe0a3a88ceac77201a43bb3b",
"x-checker-data": {
"type" : "git",
"version-scheme" : "semantic"
}
}
]
},
@ -264,18 +315,23 @@
"buildsystem" : "autotools",
"sources" : [
{
"type" : "archive",
"url" : "https://github.com/freeswitch/sofia-sip/archive/refs/tags/v1.13.9.tar.gz",
"sha256" : "3e7bfe9345e7d196bb13cf2c6e758cec8d959f1b9dbbb3bd5459b004f6f65c6c"
"type" : "git",
"url" : "https://github.com/freeswitch/sofia-sip.git",
"tag" : "v1.13.17",
"commit" : "6198851a610b7889c17e2d98fb84617bc1dd7aec",
"x-checker-data": {
"type" : "git",
"version-scheme" : "semantic"
}
}
]
},
{
"name" : "calls",
"builddir" : true,
"buildsystem" : "meson",
"config-opts" : [
"-Dmanpages=false"
"-Dmanpages=false",
"-Dtests=false"
],
"sources" : [
{