Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (73552eab2cd315c39a905246f7ce3b219d79940b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (73552eab2cd315c39a905246f7ce3b219d79940b)
  • Date: Sat, 25 Apr 2015 05:25:55 -0500

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

qt5/qtbase/CONFLICTS | 1 +
qt5/qtbase/HISTORY | 3 +++
xorg-lib/libxi/DEPENDS | 2 ++
xorg-lib/libxi/HISTORY | 3 +++
4 files changed, 9 insertions(+)

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

diff --git a/xorg-lib/libxi/DEPENDS b/xorg-lib/libxi/DEPENDS
index 95e7a26..29ea233 100755
--- a/xorg-lib/libxi/DEPENDS
+++ b/xorg-lib/libxi/DEPENDS
@@ -7,7 +7,9 @@ depends libxau &&
depends libxcb &&
depends libxdmcp &&
depends libxext &&
+depends libxfixes &&
depends pkgconfig &&
depends util-macros &&
depends xextproto &&
depends xproto
+
diff --git a/xorg-lib/libxi/HISTORY b/xorg-lib/libxi/HISTORY
index 2acae34..8cc7ad6 100644
--- a/xorg-lib/libxi/HISTORY
+++ b/xorg-lib/libxi/HISTORY
@@ -1,3 +1,6 @@
+2015-04-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: libxfixes
+
2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: missing dependencies




  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (73552eab2cd315c39a905246f7ce3b219d79940b), Vlad Glagolev, 04/25/2015

Archive powered by MHonArc 2.6.24.

Top of Page