diff options
| author | Treeve Jelbert | 2014-09-25 18:49:15 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2014-09-25 18:49:15 +0200 |
| commit | 270abc29b86e857e7d92d0926a67cc7b97c45acc (patch) | |
| tree | 91762554b013870a249bcce9467cb921fcdfc12a /xorg-extras | |
| parent | bfb78bf3026408e88059939906f1231751703cf7 (diff) | |
| parent | accc9b812a427d80050c63a3a299089cd444a1c4 (diff) | |
Merge remote-tracking branch 'origin/master' into devel-xorg-modular
Conflicts:
xorg-driver/xf86-video-ati/DEPENDS
xorg-driver/xf86-video-ati/HISTORY
xorg-lib/libxaw/HISTORY
xorg-lib/libxcb/DEPENDS
xorg-lib/libxcb/HISTORY
xorg-lib/libxcomposite/HISTORY
xorg-lib/libxcursor/HISTORY
xorg-lib/libxdamage/HISTORY
xorg-lib/libxext/HISTORY
xorg-lib/libxfixes/HISTORY
xorg-lib/libxft/HISTORY
xorg-lib/libxi/HISTORY
xorg-lib/libxinerama/HISTORY
xorg-lib/libxkbfile/HISTORY
xorg-lib/libxmu/HISTORY
xorg-lib/libxpm/HISTORY
xorg-lib/libxrandr/HISTORY
xorg-lib/libxrender/HISTORY
xorg-lib/libxres/HISTORY
xorg-lib/libxtst/HISTORY
xorg-lib/libxv/HISTORY
xorg-lib/libxvmc/HISTORY
xorg-lib/libxxf86dga/HISTORY
xorg-lib/libxxf86vm/HISTORY
xorg-proto/kbproto/DEPENDS
xorg-xserver/xorg-server/DEPENDS
Diffstat (limited to 'xorg-extras')
| -rwxr-xr-x | xorg-extras/xterm/DEPENDS | 2 | ||||
| -rw-r--r-- | xorg-extras/xterm/HISTORY | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/xorg-extras/xterm/DEPENDS b/xorg-extras/xterm/DEPENDS index 4697753bd0..8db8ac0f61 100755 --- a/xorg-extras/xterm/DEPENDS +++ b/xorg-extras/xterm/DEPENDS @@ -1,11 +1,11 @@ depends fontconfig && -depends freetype2 && depends libice && depends libsm && depends libx11 "--with-x" && depends libxaw && depends libxext && depends libxft && +depends libxpm && depends libxmu && depends libxrender && depends libxt && diff --git a/xorg-extras/xterm/HISTORY b/xorg-extras/xterm/HISTORY index 1fb8e4cef6..a4de6598de 100644 --- a/xorg-extras/xterm/HISTORY +++ b/xorg-extras/xterm/HISTORY @@ -1,3 +1,7 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: freetype2 was both hard and optional dep + depends libxpm + 2012-12-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 287 |