diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-19 09:03:13 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-19 09:03:13 +0000 |
| commit | df0676cdcfb1ffaf0539717cc02223a57ebe25dc (patch) | |
| tree | 4081aaf0433f401d6765e440dafb4205fb60f985 /main | |
| parent | 59e7744fa515cec650a988774c8bf9f09eb4de09 (diff) | |
| download | aports-df0676cdcfb1ffaf0539717cc02223a57ebe25dc.tar.bz2 aports-df0676cdcfb1ffaf0539717cc02223a57ebe25dc.tar.xz | |
main/xinit: fix deps. fallback to st as terminal
Diffstat (limited to 'main')
| -rw-r--r-- | main/xinit/APKBUILD | 14 | ||||
| -rw-r--r-- | main/xinit/xinitrc | 3 |
2 files changed, 8 insertions, 9 deletions
diff --git a/main/xinit/APKBUILD b/main/xinit/APKBUILD index ba864ceb59..2a950e7fa4 100644 --- a/main/xinit/APKBUILD +++ b/main/xinit/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xinit pkgver=1.3.3 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org initialisation program " url="http://xorg.freedesktop.org/" arch="all" license="GPL" subpackages="$pkgname-doc" -depends="xauth mcookie" -makedepends="pkgconfig libx11-dev" +depends="xauth mcookie xmodmap xrdb" +makedepends="libx11-dev" source="http://xorg.freedesktop.org/releases/individual/app/xinit-$pkgver.tar.bz2 06_move_serverauthfile_into_tmp.patch xinitrc @@ -24,7 +24,7 @@ prepare() { done } -build() { +build() { cd "$srcdir"/xinit-$pkgver ./configure \ --build=$CBUILD \ @@ -46,16 +46,16 @@ package() { } md5sums="3b8da0e6237aee9828cc809c647510a7 xinit-1.3.3.tar.bz2 abd072ec435ce084cf4e89c58f83d45c 06_move_serverauthfile_into_tmp.patch -af322d72972d5722b7fc0a9e8f025b15 xinitrc +f5516933186d3a9e10a816d571877821 xinitrc 4f04d2891ea87f50fde518267b7a1154 xsession 4d29a1104997609e10206a4c1408237d xserverrc" sha256sums="74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af xinit-1.3.3.tar.bz2 a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb 06_move_serverauthfile_into_tmp.patch -d71ad12d6d60a37efc5b144d71c76c05284f1b3488dc4b602d95c0e474cdd0d9 xinitrc +8a4095f56ec4603b0bad11f5b1b9595b38759ca16c8aeb98d4e271a86341e52c xinitrc da325bbad10c1e05b61ef250c6cdada784be0a08b9f48984e691ea9a5abc9dd8 xsession ec7d71222a46e7779faa9b8bbaeed46579dcbd11384b12a421bba44bbbb0c8d2 xserverrc" sha512sums="345d9a00991e25df0a565f5b7edfbf504df9e019fc8ca2d31e4d2899e4765d7a18f0fffec0b4dda5eef99982cf8482925656a4e18576105f267393de51257d65 xinit-1.3.3.tar.bz2 2296c10a5d74bff42d9642a4787dc3f2b77492fc81174af48dc88cd3c8fa49c7f70147b790d8c82c2df6c910d9d412965999e7a342ca28697a97b5d522669edd 06_move_serverauthfile_into_tmp.patch -efd3bb8d812f68484b10594853c8fcffb7a212f0b65b5621983d49c3461ef46b1e05d5474ea9ec44984ec0ac3f53e3ab5c72fbc12fce9fd6de69739064fcdde1 xinitrc +2f36be3b581290206080e4c2e1d8001735d5c9f7d88f023cbafe69af6f82ef0ada39ee55e62aeca1a0000884ecff9e3d9565f62f73b3399596d73fcfeae84b83 xinitrc 448bc6c7987a4735b6584e307cd5c53092b1a338043293f5f110d11818dd1b80508401a3b6f09525c82a16a88f293b37011d8ca112460b0f95d26897e3e0619e xsession 91782222bf0bc95d6d8a2a850777def292884a44d0ce31c5ccc6bb90ff31d4b0d46c6beb211f64d4bde3996ca2f829440fb8e85a41fd36ca43b061b5c1cb22fb xserverrc" diff --git a/main/xinit/xinitrc b/main/xinit/xinitrc index 0055713592..424f2ac13d 100644 --- a/main/xinit/xinitrc +++ b/main/xinit/xinitrc @@ -41,9 +41,8 @@ fi # If not present, try the system default exec startxfce4 - # Fall back to fluxbox exec startfluxbox # Start only terminal as last resort -exec terminal || exec aterm +exec xfce4-terminal || exec mrxvt || exec urxvt || exec st |