diff --git a/desktop/toolkit/gtk/gtk3/actions.py b/desktop/toolkit/gtk/gtk3/actions.py index 90763b9448..bfc7127e4a 100644 --- a/desktop/toolkit/gtk/gtk3/actions.py +++ b/desktop/toolkit/gtk/gtk3/actions.py @@ -17,7 +17,6 @@ def setup(): --disable-silent-rules \ --disable-schemas-compile \ --enable-introspection \ - --enable-gtk2-dependency \ --disable-papi \ --disable-wayland-backend \ " @@ -59,3 +58,4 @@ def install(): for binaries in ["gtk-query-immodules-3.0"]: pisitools.domove("/_emul32/bin/%s" % binaries, "/usr/bin/", "%s-32bit" % binaries) pisitools.removeDir("/_emul32") + pisitools.rename("/usr/bin/gtk-update-icon-cache", "gtk3-update-icon-cache") diff --git a/desktop/toolkit/gtk/gtk3/pspec.xml b/desktop/toolkit/gtk/gtk3/pspec.xml index 92c758b6fb..0ad0c92885 100644 --- a/desktop/toolkit/gtk/gtk3/pspec.xml +++ b/desktop/toolkit/gtk/gtk3/pspec.xml @@ -52,9 +52,9 @@ cups pango libXi - json-glib + cairo - gobject-introspection + libXext libXrandr libXfixes @@ -124,8 +124,10 @@ gtk3 atk-devel pango-devel + libX11-devel libXi-devel cairo-devel + glib2-devel libXext-devel libepoxy-devel libXfixes-devel diff --git a/x11/im/scim/actions.py b/x11/im/scim/actions.py index 584b7b7b68..1885c746d0 100644 --- a/x11/im/scim/actions.py +++ b/x11/im/scim/actions.py @@ -25,7 +25,6 @@ def setup(): ") #--disable-panel-gtk \ #--disable-setup-ui") - # no gtk3 support in scim-anthy pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") diff --git a/x11/im/scim/pspec.xml b/x11/im/scim/pspec.xml index b7267d15bf..3bcedb10de 100644 --- a/x11/im/scim/pspec.xml +++ b/x11/im/scim/pspec.xml @@ -18,7 +18,6 @@ scim-system-global - gtk2-devel gtk3-devel libXt-devel intltool @@ -41,6 +40,11 @@ libX11 libgcc + scim-libs + gtk3 + glib2 + pango + gdk-pixbuf /etc @@ -60,7 +64,11 @@ scim-libs Libraries of SCIM + pango libX11 + gtk3 + cairo + glib2 libgcc libtool-ltdl @@ -84,33 +92,13 @@ - - scim-immodule-gtk2 - IM Module for GTK2 applications - - scim-libs - atk - gtk2 - cairo - pango - fontconfig - gdk-pixbuf - - - /usr/lib/gtk-2.0 - - - scim-immodule-gtk3 IM Module for GTK3 applications - scim-libs - atk gtk3 - cairo + glib2 pango - gdk-pixbuf /usr/lib/gtk-3.0 @@ -118,14 +106,15 @@ - scim-immodule-qt5 - IM Module for Qt5 applications + scim-immodule-gtk2 + IM Module for GTK2 applications - scim-libs - qt + gtk2 + glib2 + pango - /usr/lib/qt4/plugins/inputmethods/im-scim.so + /usr/lib/gtk-2.0