Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump.git;a=commitdiff;h=7b597f0a1cfac6d0e13d6595afbc92ef9b1e9311
commit 7b597f0a1cfac6d0e13d6595afbc92ef9b1e9311 Author: James Buren <[email protected]> Date: Thu Dec 13 22:32:15 2012 -0600 fbterm-1.7.0-3-x86_64 * add gpm to depends * fix setting background image * fix service so it starts after gpm is initialized diff --git a/source/apps-extra/fbterm/FrugalBuild b/source/apps-extra/fbterm/FrugalBuild index 2023779..45014aa 100644 --- a/source/apps-extra/fbterm/FrugalBuild +++ b/source/apps-extra/fbterm/FrugalBuild @@ -6,7 +6,7 @@ pkgver=1.7.0 pkgrel=3 pkgdesc="A terminal emulator that runs in the framebuffer." rodepends=('font-misc-misc' 'fbv') -depends=('fontconfig' 'zlib' 'libstdc++' 'ncurses') +depends=('fontconfig' 'zlib' 'libstdc++' 'ncurses' 'gpm') groups=('apps-extra') archs=('i686' 'x86_64') Finclude googlecode @@ -17,11 +17,11 @@ sha1sums=('dc7b7ff29212c1551f35bf7a50967454d3b8c67c' \ '0da2be0f941a1e344f4a2653387a67f38f70281e' \ '19f759ee18734feec4242b28eafb28fd71b9ab0d' \ 'cd0030fc3acf1209068fc738e116f86717054e27' \ - '1b1bdba6aa1634d619742cc30e77c38a6e3a3a38' \ + 'dc9853755e9bc4f00548eb1b37e6203abc1dfd3a' \ '1299878bcacfe646b438668984456e45882d2868' \ - 'de9ff5979fa441c40465fceb00ad292f83478867' \ - 'b7423c35b45720b2ec5288c39eb17d53d010ed10' \ - '8f4d8f5b8e94c096a66638b7f239d65fba282c11') + 'dbd8927abaa0d3d23bde7c0b70cd6698c2aabafa' \ + '88901c68eedfbd9d8a0a1ffaaa6b63a74faff49f' \ + '9b770f244c8130ce7149dd6f828395cd18fd6163') build() { diff --git a/source/apps-extra/fbterm/fbterm-prepare-screen b/source/apps-extra/fbterm/fbterm-prepare-screen index 0ca5dbd..a90cdfc 100644 --- a/source/apps-extra/fbterm/fbterm-prepare-screen +++ b/source/apps-extra/fbterm/fbterm-prepare-screen @@ -23,6 +23,6 @@ echo -ne "\e[?25l" < "$FBTERM_TTY" > "$FBTERM_TTY" 2>&1 if [ -f /etc/fbtermbg ]; then FBTERM_BACKGROUND=$(cat /etc/fbtermbg 2>&1) if [ -f "$FBTERM_BACKGROUND" ]; then - echo "q" 2>&1 | fbv -c -u -i -k -e -r "$FBTERM_BACKGROUND" < "$FBTERM_TTY" > "$FBTERM_TTY" 2>&1 + echo "q" 2>&1 | fbv -c -u -i -k -e -r "$FBTERM_BACKGROUND" > "$FBTERM_TTY" 2>&1 fi fi diff --git a/source/apps-extra/fbterm/fbterm-restore-screen b/source/apps-extra/fbterm/fbterm-restore-screen index 4a429aa..d313f7a 100644 --- a/source/apps-extra/fbterm/fbterm-restore-screen +++ b/source/apps-extra/fbterm/fbterm-restore-screen @@ -10,5 +10,11 @@ if [ ! -c "$FBTERM_TTY" ]; then exit 1 fi +# Clear the entire screen. +echo -ne "\e[2J" < "$FBTERM_TTY" > "$FBTERM_TTY" 2>&1 + +# Move cursor to top-left corner of screen. +echo -ne "\e[H" < "$FBTERM_TTY" > "$FBTERM_TTY" 2>&1 + # Enable cursor display. echo -ne "\e[?25h" < "$FBTERM_TTY" > "$FBTERM_TTY" 2>&1 diff --git a/source/apps-extra/fbterm/[email protected] b/source/apps-extra/fbterm/[email protected] index df04095..469c160 100644 --- a/source/apps-extra/fbterm/[email protected] +++ b/source/apps-extra/fbterm/[email protected] @@ -4,6 +4,7 @@ Documentation=man:fbterm(1) After=systemd-user-sessions.service After=plymouth-quit-wait.service After=local.service +After=gdm.service Before=getty.target IgnoreOnIsolate=yes ConditionPathExists=/dev/tty0 @@ -16,13 +17,6 @@ ExecStopPost=/usr/libexec/fbterm-restore-screen Type=idle Restart=always RestartSec=0 -TTYPath=/dev/%I -TTYReset=yes -TTYVHangup=yes -TTYVTDisallocate=yes -KillMode=process -IgnoreSIGPIPE=no -KillSignal=SIGHUP [Install] Alias=getty.target.wants/[email protected] _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
