diff --git a/desktop/gnome/apps/evolution/actions.py b/desktop/gnome/apps/evolution/actions.py
index d9dc4c23cf..881cff6c1f 100644
--- a/desktop/gnome/apps/evolution/actions.py
+++ b/desktop/gnome/apps/evolution/actions.py
@@ -10,7 +10,7 @@ from pisi.actionsapi import pisitools
from pisi.actionsapi import get
def setup():
- pisitools.dosed("CMakeLists.txt", "webkit2gtk-4.1", "webkit2gtk-5.0")
+ # pisitools.dosed("CMakeLists.txt", "webkit2gtk-4.1", "webkit2gtk-5.0")
cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \
-DSYSCONF_INSTALL_DIR=/etc \
-DENABLE_INSTALLED_TESTS=OFF \
diff --git a/desktop/gnome/apps/evolution/pspec.xml b/desktop/gnome/apps/evolution/pspec.xml
index e19898b7c2..4f7b78fea7 100644
--- a/desktop/gnome/apps/evolution/pspec.xml
+++ b/desktop/gnome/apps/evolution/pspec.xml
@@ -26,13 +26,14 @@
itstool
docbook-xsl
cmark-devel
+ gtk3-devel
gtk4-devel
geocode-glib-devel
NetworkManager-devel
yelp-tools
libgdata-devel
webkit2gtk-devel
- webkit2gtk-5.0-devel
+ webkit2gtk-4.1-devel
enchant2-devel
libgweather4-devel
libnotify-devel
@@ -69,7 +70,7 @@
libsecret
gdk-pixbuf
webkit2gtk
- webkit2gtk-5.0
+ webkit2gtk-4.1
libcanberra
libgweather4
gnome-autoar
@@ -103,7 +104,7 @@
glib2-devel
gnome-desktop-devel
evolution-data-server-devel
- webkit2gtk-devel
+ webkit2gtk-4.1-devel
/usr/include
diff --git a/desktop/gnome/base/evolution-data-server/actions.py b/desktop/gnome/base/evolution-data-server/actions.py
index e58e14253b..3a92fab4c2 100644
--- a/desktop/gnome/base/evolution-data-server/actions.py
+++ b/desktop/gnome/base/evolution-data-server/actions.py
@@ -27,8 +27,7 @@ def setup():
-DENABLE_GTK_DOC=OFF \
-DENABLE_OAUTH2=ON \
-DENABLE_GOA=OFF \
- -DENABLE_OAUTH2_WEBKITGTK=OFF \
- -DENABLE_OAUTH2_WEBKITGTK4=ON \
+ -DENABLE_OAUTH2_WEBKITGTK=ON \
-DWITH_SYSTEMDUSERUNITDIR=NO")
def build():
diff --git a/desktop/gnome/base/evolution-data-server/pspec.xml b/desktop/gnome/base/evolution-data-server/pspec.xml
index 8e9ca2cb64..c8a2e06cec 100644
--- a/desktop/gnome/base/evolution-data-server/pspec.xml
+++ b/desktop/gnome/base/evolution-data-server/pspec.xml
@@ -18,6 +18,7 @@
glib2-devel
gperf
intltool
+ gtk3-devel
gtk4-devel
boost-devel
libical-devel
@@ -35,7 +36,7 @@
gobject-introspection-devel
vala
cmake
- webkit2gtk-5.0-devel
+ webkit2gtk-4.1-devel
@@ -66,7 +67,7 @@
libgweather4
libcanberra-gtk3
mit-kerberos
- webkit2gtk-5.0
+ webkit2gtk-4.1
/usr/libexec
diff --git a/desktop/gnome/base/gnome-online-accounts/actions.py b/desktop/gnome/base/gnome-online-accounts/actions.py
index 56ff18ab14..927390a95b 100644
--- a/desktop/gnome/base/gnome-online-accounts/actions.py
+++ b/desktop/gnome/base/gnome-online-accounts/actions.py
@@ -7,8 +7,8 @@
from pisi.actionsapi import mesontools, pisitools
def setup():
- pisitools.dosed("meson.build", "javascriptcoregtk-4.1", "javascriptcoregtk-5.0")
- pisitools.dosed("meson.build", "webkit2gtk-4.1", "webkit2gtk-5.0")
+ # pisitools.dosed("meson.build", "javascriptcoregtk-4.1", "javascriptcoregtk-5.0")
+ # pisitools.dosed("meson.build", "webkit2gtk-4.1", "webkit2gtk-5.0")
mesontools.configure()
def build():
diff --git a/desktop/gnome/base/gnome-online-accounts/pspec.xml b/desktop/gnome/base/gnome-online-accounts/pspec.xml
index f35aca17c7..3f2700ab3e 100644
--- a/desktop/gnome/base/gnome-online-accounts/pspec.xml
+++ b/desktop/gnome/base/gnome-online-accounts/pspec.xml
@@ -31,7 +31,7 @@
e2fsprogs-devel
librest-devel
telepathy-glib-devel
- webkit2gtk-5.0-devel
+ webkit2gtk-4.1-devel
@@ -52,7 +52,7 @@
libsecret
json-glib
gdk-pixbuf
- webkit2gtk-5.0
+ webkit2gtk-4.1
mit-kerberos
harfbuzz
diff --git a/desktop/gnome/base/sushi/actions.py b/desktop/gnome/base/sushi/actions.py
index 56ff18ab14..927390a95b 100644
--- a/desktop/gnome/base/sushi/actions.py
+++ b/desktop/gnome/base/sushi/actions.py
@@ -7,8 +7,8 @@
from pisi.actionsapi import mesontools, pisitools
def setup():
- pisitools.dosed("meson.build", "javascriptcoregtk-4.1", "javascriptcoregtk-5.0")
- pisitools.dosed("meson.build", "webkit2gtk-4.1", "webkit2gtk-5.0")
+ # pisitools.dosed("meson.build", "javascriptcoregtk-4.1", "javascriptcoregtk-5.0")
+ # pisitools.dosed("meson.build", "webkit2gtk-4.1", "webkit2gtk-5.0")
mesontools.configure()
def build():
diff --git a/desktop/gnome/base/sushi/pspec.xml b/desktop/gnome/base/sushi/pspec.xml
index dbc58109c9..985c6d4c3e 100644
--- a/desktop/gnome/base/sushi/pspec.xml
+++ b/desktop/gnome/base/sushi/pspec.xml
@@ -31,7 +31,7 @@
e2fsprogs-devel
librest-devel
telepathy-glib-devel
- webkit2gtk-5.0-devel
+ webkit2gtk-4.1-devel
@@ -51,7 +51,7 @@
libsecret
json-glib
gdk-pixbuf
- webkit2gtk-5.0
+ webkit2gtk-4.1
mit-kerberos
harfbuzz