diff options
-rw-r--r-- | perl-install/install/gtk.pm | 2 | ||||
-rw-r--r-- | perl-install/install/share/list.xml | 33 |
2 files changed, 23 insertions, 12 deletions
diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm index dedb66af2..714a56022 100644 --- a/perl-install/install/gtk.pm +++ b/perl-install/install/gtk.pm @@ -186,7 +186,7 @@ sub update_steps_position { sub init_gtk { my ($o) = @_; - symlink("/tmp/stage2/etc/$_", "/etc/$_") foreach qw(gtk-2.0 pango fonts); + symlink("/tmp/stage2/etc/$_", "/etc/$_") foreach qw(gtk-3.0 pango fonts); if ($o->{vga16}) { #- inactivate antialias in VGA16 because it makes fonts look worse diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 360f95a6c..67ab52ca8 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -92,6 +92,20 @@ 95-dm-notify.rules </from> +<from dir="/usr/LIB/girepository-1.0"> + Atk-1.0.typelib + cairo-1.0.typelib + Gdk-3.0.typelib + GdkPixbuf-2.0.typelib + Gio-2.0.typelib + GLib-2.0.typelib + GModule-2.0.typelib + GObject-2.0.typelib + Gtk-3.0.typelib + Pango-1.0.typelib + xlib-2.0.typelib +</from> + <from dir="/usr/LIB/xorg/modules"> drivers/fbdev_drv.so drivers/vesa_drv.so @@ -142,7 +156,7 @@ */LC_MESSAGES/draksnapshot.mo */LC_MESSAGES/drakx-net.mo */LC_MESSAGES/drakx-kbd-mouse-x11.mo - */LC_MESSAGES/gtk20.mo + */LC_MESSAGES/gtk30.mo */LC_MESSAGES/urpmi.mo </from> </to> @@ -184,8 +198,8 @@ <!-- /usr/share/X11/XKeysymDB --> /etc/pango/ARCH/pango.modules /usr/LIB/libgdk_pixbuf-2.0.so.0 - /usr/LIB/gtk-2.0/*/immodules/im-cedilla.so - /usr/LIB/gtk-2.0/*/engines/liboxygen-gtk.so + /usr/LIB/gtk-3.0/*/immodules/im-cedilla.so + /usr/LIB/gtk-3.0/*/theming-engines/liboxygen-gtk.so /usr/share/mime/mime.cache /usr/lib/libDrakX/keyboard.pm @@ -271,7 +285,6 @@ /usr/share/themes/oxygen-gtk* /usr/LIB/gdk-pixbuf-2.0/*/loaders.cache /usr/LIB/gdk-pixbuf-2.0/*/loaders/libpixbufloader-png.so - /etc/gtk-2.0/gtk.immodules.* /etc/brltty/*.ttb /etc/brltty/*.txt /LIB/brltty/libbrlttyb??.so @@ -521,8 +534,9 @@ perl-Filesys-Df perl-Clone perl-Glib - perl-Gtk2 - perl-Gtk2-WebKit + perl-Glib-Object-Introspection + perl-Gtk3 + perl-Gtk3-WebKit perl-Locale-gettext perl-MDK-Common perl-Pango @@ -580,13 +594,10 @@ </to> </from> -<from dir="share"> - <to dir="/etc/gtk-2.0/"> - gtkrc - </to> +<from dir="/etc/gtk-3.0/"> + settings.ini </from> - <from dir="pixmaps"> <to dir="/usr/share"> <from expand="glob"> |