summaryrefslogtreecommitdiffstats
path: root/xorg/xorgproto
diff options
context:
space:
mode:
authorThomas Orgis2019-01-10 11:53:11 +0100
committerThomas Orgis2019-01-10 11:55:18 +0100
commit9b18906a47b6a76c490bb091326d26f9d987a8e7 (patch)
tree4e7d4b3935cab1e2df7248b8d62520db64482fce /xorg/xorgproto
parent4021d65f9344730dc43cf4fda907a44faacff347 (diff)
xorgproto: does not conflict with printproto
Printproto is nothing anyone uses, but it's needed to build some things. It is neglected by upstream, but still existing, independently.
Diffstat (limited to 'xorg/xorgproto')
-rwxr-xr-xxorg/xorgproto/CONFLICTS1
-rw-r--r--xorg/xorgproto/HISTORY3
2 files changed, 3 insertions, 1 deletions
diff --git a/xorg/xorgproto/CONFLICTS b/xorg/xorgproto/CONFLICTS
index 3ccbb9415f..d69b038455 100755
--- a/xorg/xorgproto/CONFLICTS
+++ b/xorg/xorgproto/CONFLICTS
@@ -14,7 +14,6 @@ conflicts inputproto y
conflicts kbproto y
conflicts lg3dproto y
conflicts presentproto y
-conflicts printproto y
conflicts randrproto y
conflicts recordproto y
conflicts renderproto y
diff --git a/xorg/xorgproto/HISTORY b/xorg/xorgproto/HISTORY
index ffa05cc429..7984db51d3 100644
--- a/xorg/xorgproto/HISTORY
+++ b/xorg/xorgproto/HISTORY
@@ -1,3 +1,6 @@
+2019-01-02 Thomas Orgis <sobukus@sourcemage.org>
+ * CONFLICTS: remove printproto, not installed from here
+
2018-03-08 Treeve Jelbert <treeve@sourcemage.org>
* CONFLICTS: xproxymngproto => xproxymanagementprotocol