diff --git a/client-gnome b/client-gnome index 721323d6877b6de6466fde1837c354d04420a3eb..5d213665a5db93b5c76540db9ef3544d8e442392 160000 --- a/client-gnome +++ b/client-gnome @@ -1 +1 @@ -Subproject commit 721323d6877b6de6466fde1837c354d04420a3eb +Subproject commit 5d213665a5db93b5c76540db9ef3544d8e442392 diff --git a/docker/Dockerfile_fedora_29 b/docker/Dockerfile_fedora_29 index d07cfbe82752a29c0831bc21a1cf4fd67bc67b9f..51b3e925c2850d166fd81a43956c025b88f0362c 100644 --- a/docker/Dockerfile_fedora_29 +++ b/docker/Dockerfile_fedora_29 @@ -5,6 +5,7 @@ RUN dnf install -y dnf-command\(builddep\) rpmdevtools RUN dnf clean all RUN dnf upgrade -y && \ + dnf install -y mesa-libgbm-devel mesa-dri-drivers && \ dnf install -y \ git \ rpm-build \ diff --git a/docs/source/dev/compiling_and_installing/gnome_client.rst b/docs/source/dev/compiling_and_installing/gnome_client.rst index f6b432348d0c5078d7ca6d49c6790213ef1a543a..ca99154bccf9e4b8745d9dac2f2ac69778b387ab 100644 --- a/docs/source/dev/compiling_and_installing/gnome_client.rst +++ b/docs/source/dev/compiling_and_installing/gnome_client.rst @@ -10,7 +10,6 @@ Requirements - Qt5 Core - X11 - gnome-icon-theme-symbolic (certain icons are used which other themes might be missing) -- libebook1.2 / evolution-data-server (3.10 or higher) - libnotify (optional, if you wish to receive desktop notifications of incoming calls, etc) - gettext (optional to compile translations) @@ -24,7 +23,7 @@ On Fedora: .. code-block:: bash - sudo yum install gcc-c++ cmake gtk3-devel qt5-qtbase-devel clutter-gtk-devel gnome-icon-theme-symbolic evolution-data-server-devel libnotify-devel gettext + sudo yum install gcc-c++ cmake gtk3-devel qt5-qtbase-devel clutter-gtk-devel gnome-icon-theme-symbolic libnotify-devel gettext Compiling ######### diff --git a/lrc b/lrc index 5366d7ed05765d51b87d81a143e945824aa6ce52..ca39ce301496bcb6a210425caf1ba8d629f4630d 160000 --- a/lrc +++ b/lrc @@ -1 +1 @@ -Subproject commit 5366d7ed05765d51b87d81a143e945824aa6ce52 +Subproject commit ca39ce301496bcb6a210425caf1ba8d629f4630d diff --git a/make-ring.py b/make-ring.py index 58ae60ecd2e1f0756d21537993a541c107edb12c..a47a9bd6a495a0182b3ae5f580a4d1cc4c16a5fc 100755 --- a/make-ring.py +++ b/make-ring.py @@ -82,7 +82,7 @@ ZYPPER_DEPENDENCIES = [ # lrc 'libQt5Core-devel', 'libQt5DBus-devel', 'libqt5-linguist-devel', # gnome client - 'gtk3-devel', 'clutter-gtk-devel', 'qrencode-devel', 'evolution-data-server-devel', + 'gtk3-devel', 'clutter-gtk-devel', 'qrencode-devel', 'gettext-tools', 'libnotify-devel', 'libappindicator3-devel', 'webkit2gtk3-devel', 'NetworkManager-devel', 'libcanberra-gtk3-devel' ] @@ -112,7 +112,7 @@ DNF_DEPENDENCIES = [ 'gcc-c++', 'which', 'alsa-lib-devel', 'systemd-devel', 'libuuid-devel', 'uuid-devel', 'gnutls-devel', 'nettle-devel', 'opus-devel', 'speexdsp-devel', 'yaml-cpp-devel', 'qt5-qtbase-devel', 'swig', 'qrencode-devel', 'jsoncpp-devel', - 'gtk3-devel', 'clutter-devel', 'clutter-gtk-devel', 'evolution-data-server-devel', + 'gtk3-devel', 'clutter-devel', 'clutter-gtk-devel', 'libnotify-devel', 'libappindicator-gtk3-devel', 'patch', 'libva-devel', 'openssl-devel', 'webkitgtk4-devel', 'NetworkManager-libnm-devel', 'libvdpau-devel', 'msgpack-devel', 'libcanberra-devel', 'sqlite-devel', 'openssl-static' @@ -137,7 +137,7 @@ PACMAN_DEPENDENCIES = [ 'ffmpeg', 'boost', 'clutter-gtk', 'cppunit', 'libdbus', 'dbus-c++', 'libe-book', 'expat', 'gtk3', 'jack', 'libnotify', 'opus', 'pcre', 'libpulse', 'speex', 'speexdsp', 'libtool', 'libupnp', 'yaml-cpp', 'qt5-base', - 'swig', 'yasm', 'qrencode', 'evolution-data-server', 'make', 'patch', 'pkg-config', + 'swig', 'yasm', 'qrencode', 'make', 'patch', 'pkg-config', 'automake', 'libva', 'webkit2gtk', 'libnm', 'libvdpau', 'libcanbera', 'openssl' ] diff --git a/packaging/rules/fedora/ring.spec b/packaging/rules/fedora/ring.spec index fa0f1b737c5eaf1ab0003135a1a68700eb762898..4b9cb4a994aa662ec702104c94356cf27468e77d 100644 --- a/packaging/rules/fedora/ring.spec +++ b/packaging/rules/fedora/ring.spec @@ -56,7 +56,6 @@ BuildRequires: clutter-gtk-devel BuildRequires: clutter-devel BuildRequires: glib2-devel BuildRequires: gtk3-devel -BuildRequires: evolution-data-server-devel BuildRequires: libnotify-devel BuildRequires: qt5-qttools-devel BuildRequires: qrencode-devel