New commits:
commit 6f7075635efad869f0085a526b07e0fdcb4c0d87
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
FUNCTIONS remove borken hack
commit f0d0b1b2d75c16d668f273e114752b8e85ce39d0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
setuptools: => 20.3.1
commit 58c56c40f1252dea3da26d197b87231e27216b7b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libinput: => 1.2.2
commit c236f8a37666f02dad7f1af4d025ad8a3ed7c281
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qt-creator: => 3.6.1
diff --git a/ChangeLog b/ChangeLog
index 4fec6cf..02a104d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-03-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * FUNCTIONS: remove qt5_build hack, it breaks qt-creator
+
2016-03-17 Eric Sandall <sandalle AT sourcemage.org>
* graphics/povray: Moved from z-rejected, now AGPL3 license (FSF
friendly)
diff --git a/FUNCTIONS b/FUNCTIONS
index bd075d8..97c8898 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -8,15 +8,6 @@ QT5DIR=$INSTALL_ROOT/opt/qt5
qt5_build() {
PATH="$QT5DIR/bin:$PATH"
export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
- # Nasty hack to ensure that locally built libs are always
- # used first to avoid conflict with installed old version.
- # Issues of this kind crop up regularily since years.
- # Supposedly, Qt 5.6 could fix this. My life is to short to
- # wait for and test this.
- # But see https://bugreports.qt.io/browse/QTBUG-50921 and
- # decide about removing this hack once it is resolved.
- sed -i "1s:^:LIBS+= -L$SOURCE_DIRECTORY/lib\n:" \
- $(find . -name '*.pro') &&
qmake PREFIX=$QT5DIR LIBDIR=$QT5DIR/lib \
$OPTS *.pro &&
make
diff --git a/python-pypi/setuptools/DETAILS b/python-pypi/setuptools/DETAILS
index 7db92e2..6a7a59f 100755
--- a/python-pypi/setuptools/DETAILS
+++ b/python-pypi/setuptools/DETAILS
@@ -1,6 +1,6 @@
SPELL=setuptools
- VERSION=20.2.2
-
SOURCE_HASH=sha512:e74004e5755e1abd9e6efb94887c9124a36e67651e6e626424e96575cf8e84a258d48ee6fa8f0389f15de3bddcbcb0a690810dd46c358f85659ad6f20f905a2d
+ VERSION=20.3.1
+
SOURCE_HASH=sha512:694258290c27cc2edbc83958de5ea4d8ebd3f96a3708012260438188fc4fd3b30a427ef87bfd418a188a74077acefb9d6e50bcf189c98a9380277f0087cce83b
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://pypi.python.org/packages/source/s/$SPELL/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/setuptools/HISTORY b/python-pypi/setuptools/HISTORY
index d441bbd..c410d9e 100644
--- a/python-pypi/setuptools/HISTORY
+++ b/python-pypi/setuptools/HISTORY
@@ -1,3 +1,6 @@
+2016-03-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 20.3.1
+
2016-03-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20.2.2