New commits:
commit f6a8f8e7e5d2eb53d47b9469f893e16803d793d4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
improve cmake builds, allow choice of prefix
prepare for kde5 frameworks/plasma/apps
commit d4cc18d89954ecc1d1bfbc38c306cf335ed822c0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
sqlalchemy: => 1.0.2
commit 242bf3da5005b4e56ab7c41157291aca0400edaf
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
mesalib: => 10.5.4
commit ba8552e1937ed7d9c6fba62ce0c8a17a59f66c25
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xf86-input-libinput: => 0.9.0
commit 57f559b54c0fa7f81a596c89ca6094876d8c9e79
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
xorg-server tweaks
commit c6d51f84e4bf96d832dc1d62831c0747b8fe3184
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qpdf: => 5.1.2
commit 04a41781264374e3f011b0052dbf31db7d86b58e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
leptonica: => 1.71
diff --git a/CMAKE_CONFIGURE b/CMAKE_CONFIGURE
new file mode 100755
index 0000000..73089ce
--- /dev/null
+++ b/CMAKE_CONFIGURE
@@ -0,0 +1,4 @@
+config_query_list CM_BUILD_TYPE 'which build type?' Release Debug
RelWithDebInfo
+#if is_depends_enabled $SPELL extra-cmake-modules;then
+ config_query_option CM_TESTS 'build tests?' n "-DBUILD_TESTING=1"
"-DBUILD_TESTING=0"
+#fi
diff --git a/ChangeLog b/ChangeLog
index 99ccb48..2608235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
2015-04-25 Thomas Orgis <sobukus AT sourcemage.org>
* audio-creation/musescore: new spell, for writing music scores
+2015-04-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * FUNCTIONS: allow alternate prefix for cmake builds
+ add qt5_cmake_build
+ improve qt5_build
+ * CMAKE_CONFIGURE, KDE5_DEPENDS, KDE5_FUNCTIONS:
+ for forthcoming kde5 frameworks/apps
+
2015-04-23 Thomas Orgis <sobukus AT sourcemage.org>
* utils/numactl: new spell, NUMA support
* FUNCTIONS: make waf_build more robust with differing versions of waf
diff --git a/FUNCTIONS b/FUNCTIONS
index 5a9d3c5..0fc1d49 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -3,16 +3,22 @@
. $GRIMOIRE/config_query_multi.function
QT5DIR=$INSTALL_ROOT/opt/qt5
+
qt5_build() {
- export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
- cd $SOURCE_DIRECTORY &&
- QMAKEPATH="$QT5DIR/bin"
-# in some cases, we set a symlink to python in the source directory
- PATH="$QMAKEPATH:$SOURCE_DIRECTORY:$PATH"
- qmake PREFIX=$QT5DIR $OPTS *.pro &&
+ cd $SOURCE_DIRECTORY &&
+ PATH="$QT5DIR/bin:$PATH"
+ qmake PREFIX=$QT5DIR LIBDIR=$QT5DIR/lib \
+ $OPTS $SRC/*.pro &&
make
}
+2015-04-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * UP_TRIGGERS: remove things which do not depend on xorg-server
+ * DEPENDS: libxinerama is optional
+
2015-02-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: UDEV -> DEVICE-MANAGER
diff --git a/xorg-xserver/xorg-server/UP_TRIGGERS
b/xorg-xserver/xorg-server/UP_TRIGGERS
index 734d31c..d5b34ef 100755
--- a/xorg-xserver/xorg-server/UP_TRIGGERS
+++ b/xorg-xserver/xorg-server/UP_TRIGGERS
@@ -7,8 +7,7 @@ case "$(installed_version $SPELL)" in
esac &&
for each in synaptics $(gaze -q -g "$(gaze -q grimoires | tr " " "\n" | \
- grep -Ex "test|stable(-rc|-[0-9]+\.[0-9]+)?")" section xorg-driver) \
- xkbutils xkbcomp xkbprint xkbevd xkeyboard-config setxkbmap; do
+ grep -Ex "test|stable(-rc|-[0-9]+\.[0-9]+)?")" section xorg-driver);do
if spell_ok $each; then
if [[ $epicfail == y ]]; then
up_trigger $each cast_self
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (f6a8f8e7e5d2eb53d47b9469f893e16803d793d4),
Treeve Jelbert, 04/25/2015