New commits:
commit 73552eab2cd315c39a905246f7ce3b219d79940b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
qtbase: conflict with itself, like the others
Story: On icu update, the installed qtbase causes the build to
fail, trying to find the old icu library. We need a proper fix
to isolate these braindead self-conflicting builds!
(cherry picked from commit 930ce79816b1de31b641c50c048323664dda8474)
Conflicts:
qt5/qtbase/HISTORY
commit 672289b287e5b6fcfd20d60a8f01ac9466e35f76
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libxi: depends libxfixes
(cherry picked from commit 8f3b14212c5d01acff30c135c6779cc2879e6cce)
diff --git a/qt5/qtbase/CONFLICTS b/qt5/qtbase/CONFLICTS
new file mode 100755
index 0000000..5556dab
--- /dev/null
+++ b/qt5/qtbase/CONFLICTS
@@ -0,0 +1 @@
+conflicts qtbase y
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 8b8f55c..c202f9b 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,6 @@
+2015-04-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFLICTS: added, conflicts with itself during build
+
2015-02-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: UDEV -> DEVICE-MANAGER