From: Frank Brehm Date: Wed, 1 Jul 2015 07:34:34 +0000 (+0200) Subject: Current state X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=3d9e2543868bb5cd14458ddb4bc75929ad34e652;p=config%2Fsamara%2Fetc.git Current state --- diff --git a/X11/xinit/xinitrc.d/90-xcursor-theme-gnome b/X11/xinit/xinitrc.d/90-xcursor-theme-gnome new file mode 100755 index 0000000..13bc453 --- /dev/null +++ b/X11/xinit/xinitrc.d/90-xcursor-theme-gnome @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then + XCURSOR_THEME=`dconf read /org/gnome/desktop/interface/cursor-theme` 2> /dev/null + if [ x"$XCURSOR_THEME" = "x" ]; then + export XCURSOR_THEME="Adwaita" + else + # 'dconf read' wraps string output in single quotes + eval export "XCURSOR_THEME=$XCURSOR_THEME" + fi +fi diff --git a/config-archive/etc/fuse.conf b/config-archive/etc/fuse.conf new file mode 100644 index 0000000..1617ea6 --- /dev/null +++ b/config-archive/etc/fuse.conf @@ -0,0 +1,9 @@ +# Set the maximum number of FUSE mounts allowed to non-root users. +# The default is 1000. +# +#mount_max = 1000 + +# Allow non-root users to specify the 'allow_other' or 'allow_root' +# mount options. +# +user_allow_other diff --git a/config-archive/etc/fuse.conf.dist.new b/config-archive/etc/fuse.conf.dist.new new file mode 100644 index 0000000..cb6c631 --- /dev/null +++ b/config-archive/etc/fuse.conf.dist.new @@ -0,0 +1,9 @@ +# Set the maximum number of FUSE mounts allowed to non-root users. +# The default is 1000. +# +#mount_max = 1000 + +# Allow non-root users to specify the 'allow_other' or 'allow_root' +# mount options. +# +#user_allow_other diff --git a/cups/cups-browsed.conf b/cups/cups-browsed.conf index b90f1de..48aa300 100644 --- a/cups/cups-browsed.conf +++ b/cups/cups-browsed.conf @@ -44,6 +44,21 @@ BrowseRemoteProtocols DNSSD,CUPS # CreateIPPPrinterQueues Yes +# If cups-browsed is automatically creating print queues for native +# IPP network printers ("CreateIPPPrinterQueues Yes"), the type of +# queue to be created can be selected by the "IPPPrinterQueueType" +# directive. The "PPD" setting makes always queues with PPD file +# being created and no queue if the printer does not supply sufficient +# information for creating a PPD. With "NoPPD" the queue is always +# created with a System V interface script as filter, also when +# creatig a PPD would be possible. "Auto" (the default) lets a PPD +# being created if the printer supplies sufficient information and a +# System V interface script otherwise. + +# IPPPrinterQueueType Auto +# IPPPrinterQueueType PPD +# IPPPrinterQueueType NoPPD + # The AutoShutdown directive specifies whether cups-browsed should # automatically terminate when it has no local raw queues set up # pointing to any discovered remote printers (auto shutdown diff --git a/dconf/db/ibus.d/00-upstream-settings b/dconf/db/ibus.d/00-upstream-settings index b54a74f..30a8030 100644 --- a/dconf/db/ibus.d/00-upstream-settings +++ b/dconf/db/ibus.d/00-upstream-settings @@ -8,32 +8,36 @@ [desktop/ibus/general] dconf-preserve-name-prefixes=['/desktop/ibus/engine/pinyin', '/desktop/ibus/engine/bopomofo', '/desktop/ibus/engine/hangul'] +use-system-keyboard-layout=false embed-preedit-text=true enable-by-default=false -engines-order=@as [] -preload-engines=@as [] -switcher-delay-time=400 use-global-engine=true -use-system-keyboard-layout=false +use-xmodmap=true +switcher-delay-time=400 version='' +engines-order=@as [] +preload-engines=@as [] +xkb-latin-layouts=['ara', 'bg', 'cz', 'dev', 'gr', 'gur', 'in', 'jp(kana)', 'mal', 'mkd', 'ru', 'ua'] [desktop/ibus/general/hotkey] +next-engine=['Alt+Shift_L'] disable-unconditional=@as [] enable-unconditional=@as [] -next-engine=['Alt+Shift_L'] -next-engine-in-menu=['Alt+Shift_L'] -prev-engine=@as [] -previous-engine=@as [] trigger=['Control+space', 'Zenkaku_Hankaku', 'Alt+Kanji', 'Alt+grave', 'Hangul', 'Alt+Release+Alt_R'] +previous-engine=@as [] +prev-engine=@as [] +next-engine-in-menu=['Alt+Shift_L'] triggers=['space'] [desktop/ibus/panel] +x=-1 +y=-1 +lookup-table-orientation=1 +show=0 +xkb-icon-rgba='#415099' auto-hide-timeout=10000 +show-im-name=false +follow-input-cursor-when-always-shown=false custom-font='Sans 10' -lookup-table-orientation=1 -show=1 show-icon-on-systray=true -show-im-name=false use-custom-font=false -x=-1 -y=-1 diff --git a/env.d/44qca2 b/env.d/44qca2 deleted file mode 100644 index 429425f..0000000 --- a/env.d/44qca2 +++ /dev/null @@ -1 +0,0 @@ -LDPATH="/usr/lib64/qca2" diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 7f15761..5df2d98 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -16910,14 +16910,39 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + + + + #415099 + + XKB icon shows the layout string and the string is + rendered with the RGBA value. The RGBA value can be + 1. a color name from X11, 2. a hex value in form '#rrggbb' + where 'r', 'g' and 'b' are hex digits of the red, green, + and blue, 3. a RGB color in form 'rgb(r,g,b)' or + 4. a RGBA color in form 'rgba(r,g,b,a)' where 'r', + 'g', and 'b' are either integers in the range 0 to 255 + or precentage values in the range 0% to 100%, and + 'a' is a floating point value in the range 0 to 1 + of the alpha. + + + + + + If true, the panel follows the input cursor in case the + panel is always shown. If false, the panel is shown at + a fixed location. + + + The milliseconds to show property panel after focus-in or properties are changed. - + Sans 10 @@ -16925,49 +16950,101 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Custom font name for language panel - + Use custom font name for language panel - + Show input method name on language bar - + Show icon on system tray - + Orientation of lookup table. 0 = Horizontal, 1 = Vertical - + - + - + - + The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always show - + + + + Run xmodmap if .xmodmap or .Xmodmap exists when + ibus engines are switched. + + + + + +
  • + ara +
    • +
  • + bg +
    • +
  • + cz +
    • +
  • + dev +
    • +
  • + gr +
    • +
  • + gur +
    • +
  • + in +
    • +
  • + jp(kana) +
    • +
  • + mal +
    • +
  • + mkd +
    • +
  • + ru +
    • +
  • + ua +
    • +     + US layout is appended to the latin layouts. variant can be + omitted. + +     +     + @@ -16978,7 +17055,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -16994,32 +17071,32 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Prefixes of DConf keys to stop name conversion - + Enable input method by default when the application gets input focus - + Share the same input method among all applications - + Embed Preedit Text in Application Window - + Use system keyboard (XKB) layout - + Set popup delay milliseconds to show IME switcher window. @@ -17030,14 +17107,14 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Saved engines order in input method list - + @@ -17045,21 +17122,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + The shortcut keys for switching to the previous input method - + The shortcut keys for switching to the previous input method - +
  • @@ -17069,7 +17146,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The shortcut keys for switching to the next input method in the list - +
  • @@ -17079,21 +17156,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The shortcut keys for switching to the next input method in the list - + The shortcut keys for turning input method off - + The shortcut keys for turning input method on - +
  • @@ -17103,7 +17180,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The shortcut keys for turning input method on or off - +
  • @@ -21360,35 +21437,39 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - - - - - - - - - + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + diff --git a/gconf/schemas/ibus.schemas b/gconf/schemas/ibus.schemas index 7aff781..719e7da 100644 --- a/gconf/schemas/ibus.schemas +++ b/gconf/schemas/ibus.schemas @@ -9,8 +9,8 @@ [] string - Preload engines - Preload engines during ibus starts up + Preload engines + Preload engines during ibus starts up @@ -100,6 +100,32 @@ Сохраненный номер версии используется для сравнения предыдущей версии ibus с текущей. + + /schemas/desktop/ibus/general/xkb-latin-layouts + /desktop/ibus/general/xkb-latin-layouts + ibus + list + string + [ara,bg,cz,dev,gr,gur,in,jp(kana),mal,mkd,ru,ua] + + Latin layouts which have no ASCII + US layout is appended to the latin layouts. variant can be + omitted. + + + + + /schemas/desktop/ibus/general/use-xmodmap + /desktop/ibus/general/use-xmodmap + ibus + bool + true + + Use xmodmap + Run xmodmap if .xmodmap or .Xmodmap exists when + ibus engines are switched. + + /schemas/desktop/ibus/general/hotkey/trigger /desktop/ibus/general/hotkey/trigger @@ -326,7 +352,7 @@ /desktop/ibus/panel/show ibus int - 1 + 0 Auto hide The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always show @@ -419,6 +445,19 @@ --> + + /schemas/desktop/ibus/panel/follow-input-cursor-when-always-shown + /desktop/ibus/panel/follow-input-cursor-when-always-shown + ibus + bool + false + + Follow the input cursor in case the panel is always shown + If true, the panel follows the input cursor in case the + panel is always shown. If false, the panel is shown at + a fixed location. + + /schemas/desktop/ibus/panel/auto-hide-timeout /desktop/ibus/panel/auto-hide-timeout @@ -509,6 +548,26 @@ Показывать название метода ввода на языковой панели + + /schemas/desktop/ibus/panel/xkb-icon-rgba + /desktop/ibus/panel/xkb-icon-rgba + ibus + string + #415099 + + RGBA value of XKB icon + XKB icon shows the layout string and the string is + rendered with the RGBA value. The RGBA value can be + 1. a color name from X11, 2. a hex value in form '#rrggbb' + where 'r', 'g' and 'b' are hex digits of the red, green, + and blue, 3. a RGB color in form 'rgb(r,g,b)' or + 4. a RGBA color in form 'rgba(r,g,b,a)' where 'r', + 'g', and 'b' are either integers in the range 0 to 255 + or precentage values in the range 0% to 100%, and + 'a' is a floating point value in the range 0 to 1 + of the alpha. + + /schemas/desktop/ibus/general/use_system_keyboard_layout /desktop/ibus/general/use_system_keyboard_layout diff --git a/init.d/memcached b/init.d/memcached index dd181eb..9293781 100755 --- a/init.d/memcached +++ b/init.d/memcached @@ -4,7 +4,7 @@ CONF="${SVCNAME#*.}" CONFBASE="/etc/conf.d/memcached" [ -z "${PIDBASE}" ] && PIDBASE="/run/memcached/memcached" -[ "${CONF}" == "memcached" ] && CONF='' +[ "${CONF}" = "memcached" ] && CONF='' if [ -n "${CONF}" ]; then PIDFILE="${PIDBASE}.${CONF}.pid" @@ -20,9 +20,6 @@ else fi depend() { - if [ -z "${SOCKET}" ]; then - need net - fi # per bug #269022, accurate time is important for memcached! # We include the full list of ways it might be set on boot. after ntp-client ntpd rdate openrdate adjtimex hwclock diff --git a/init.d/virtlockd b/init.d/virtlockd index 2c80af6..bfa37a5 100755 --- a/init.d/virtlockd +++ b/init.d/virtlockd @@ -1,13 +1,24 @@ #!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/files/virtlockd.init,v 1.1 2013/10/25 20:06:42 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/files/virtlockd.init-r1,v 1.1 2015/05/24 21:05:42 tamiko Exp $ description="libvirt virtual machine lock manager" command="/usr/sbin/virtlockd" command_args="-d" pidfile="/var/run/virtlockd.pid" +extra_started_commands="reload" +description_reload="re-exec the daemon, while maintaining locks and clients" + + depend() { after ntp-client ntpd nfs nfsmount corosync } + +reload() { + ebegin "re-exec() virtlockd" + + start-stop-daemon --signal SIGUSR1 \ + --exec "${command}" --pidfile "${pidfile}" +} diff --git a/ld.so.conf b/ld.so.conf index ca657fe..6a0a880 100644 --- a/ld.so.conf +++ b/ld.so.conf @@ -12,7 +12,6 @@ include ld.so.conf.d/*.conf /usr/lib32/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib -/usr/lib64/qca2 /usr/lib32/qt4 /usr/lib64/qt4 /usr/lib/postgresql diff --git a/portage/package.use b/portage/package.use index e485950..186669e 100644 --- a/portage/package.use +++ b/portage/package.use @@ -230,6 +230,7 @@ media-libs/libmp4v2 utils media-libs/libpng apng media-libs/libquicktime lame media-libs/libvorbis aotuv +media-libs/libvpx postproc media-libs/libwmf -expat media-libs/mediastreamer g726 g729 ilbc -silk media-libs/mesa g3dvl gbm gles gles1 gles2 llvm shared-dricore xa xvmc diff --git a/profile.d/vte.sh b/profile.d/vte.sh index 3b57f83..95d20c7 100644 --- a/profile.d/vte.sh +++ b/profile.d/vte.sh @@ -50,7 +50,9 @@ __vte_osc7 () { } __vte_prompt_command() { - printf "\033]0;%s@%s:%s\007%s" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}" "$(__vte_osc7)" + local pwd='~' + [ "$PWD" != "$HOME" ] && pwd=${PWD/#$HOME\//\~\/} + printf "\033]0;%s@%s:%s\007%s" "${USER}" "${HOSTNAME%%.*}" "${pwd}" "$(__vte_osc7)" } case "$TERM" in diff --git a/sysctl.d/libvirtd.conf b/sysctl.d/libvirtd.conf deleted file mode 100644 index 275482c..0000000 --- a/sysctl.d/libvirtd.conf +++ /dev/null @@ -1,8 +0,0 @@ -# The kernel allocates aio memory on demand, and this number limits the -# number of parallel aio requests; the only drawback of a larger limit is -# that a malicious guest could issue parallel requests to cause the kernel -# to set aside memory. Set this number at least as large as -# 128 * (number of virtual disks on the host) -# Libvirt uses a default of 1M requests to allow 8k disks, with at most -# 64M of kernel memory if all disks hit an aio request at the same time. -fs.aio-max-nr = 1048576 diff --git a/xdg/autostart/tracker-extract.desktop b/xdg/autostart/tracker-extract.desktop index 300cfab..bd5b5f3 100644 --- a/xdg/autostart/tracker-extract.desktop +++ b/xdg/autostart/tracker-extract.desktop @@ -20,4 +20,4 @@ OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=tracker X-GNOME-Bugzilla-Component=Extractor -X-GNOME-Bugzilla-Version=1.2.5 +X-GNOME-Bugzilla-Version=1.2.6 diff --git a/xdg/autostart/tracker-miner-apps.desktop b/xdg/autostart/tracker-miner-apps.desktop index 4e25679..af033b4 100644 --- a/xdg/autostart/tracker-miner-apps.desktop +++ b/xdg/autostart/tracker-miner-apps.desktop @@ -20,4 +20,4 @@ OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=tracker X-GNOME-Bugzilla-Component=Miners -X-GNOME-Bugzilla-Version=1.2.5 +X-GNOME-Bugzilla-Version=1.2.6 diff --git a/xdg/autostart/tracker-miner-fs.desktop b/xdg/autostart/tracker-miner-fs.desktop index 2ec46be..80b4f25 100644 --- a/xdg/autostart/tracker-miner-fs.desktop +++ b/xdg/autostart/tracker-miner-fs.desktop @@ -22,4 +22,4 @@ OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=tracker X-GNOME-Bugzilla-Component=Miners -X-GNOME-Bugzilla-Version=1.2.5 +X-GNOME-Bugzilla-Version=1.2.6 diff --git a/xdg/autostart/tracker-miner-user-guides.desktop b/xdg/autostart/tracker-miner-user-guides.desktop index 6dcea8c..8d967a3 100644 --- a/xdg/autostart/tracker-miner-user-guides.desktop +++ b/xdg/autostart/tracker-miner-user-guides.desktop @@ -20,4 +20,4 @@ OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=tracker X-GNOME-Bugzilla-Component=Miners -X-GNOME-Bugzilla-Version=1.2.5 +X-GNOME-Bugzilla-Version=1.2.6 diff --git a/xdg/autostart/tracker-store.desktop b/xdg/autostart/tracker-store.desktop index 3ccee34..f2c294d 100644 --- a/xdg/autostart/tracker-store.desktop +++ b/xdg/autostart/tracker-store.desktop @@ -21,4 +21,4 @@ OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=tracker X-GNOME-Bugzilla-Component=Store -X-GNOME-Bugzilla-Version=1.2.5 +X-GNOME-Bugzilla-Version=1.2.6