Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (9107f6bc93703d2f57fdaf6370d7978e46be133c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Thomas Orgis (9107f6bc93703d2f57fdaf6370d7978e46be133c)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (9107f6bc93703d2f57fdaf6370d7978e46be133c)
  • Date: Fri, 27 Nov 2015 13:06:37 +0000
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

audio-creation/traverso/BUILD | 2 +-
audio-creation/traverso/HISTORY | 3 +++
audio-players/last.fm/BUILD | 2 +-
audio-players/last.fm/HISTORY | 3 +++
audio-players/qmpdclient/BUILD | 2 +-
audio-players/qmpdclient/HISTORY | 3 +++
audio-soft/qjackctl/BUILD | 4 +---
audio-soft/qjackctl/HISTORY | 3 +++
editors/lyx/BUILD | 2 +-
editors/lyx/HISTORY | 3 +++
editors/texmaker/BUILD | 2 +-
editors/texmaker/HISTORY | 3 +++
net/webmonx/BUILD | 2 +-
net/webmonx/HISTORY | 3 +++
net/wpa_supplicant/BUILD | 2 +-
net/wpa_supplicant/HISTORY | 3 +++
python-pypi/calibre/BUILD | 2 +-
python-pypi/calibre/HISTORY | 3 +++
x11-toolkits/qscintilla-designer/BUILD | 2 +-
x11-toolkits/qscintilla-designer/HISTORY | 3 +++
20 files changed, 40 insertions(+), 12 deletions(-)

New commits:
commit 9107f6bc93703d2f57fdaf6370d7978e46be133c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

qscintilla-designer: fix qt4 path

commit f5b2d63fd133f29d504030b313566496d452818d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

calibre: fix qt4 path

commit 64e6ae6e8379f431d89ab55390f330cd5e52c7e4
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

texmaker: fix qt4 path

commit c8e4ec23a3822532ca34a987bfdadd929d0c5aaa
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

lyx: fix qt4 path

commit b493c02ead0eb35da8340ccfa3fd4dd026d8b6a7
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

qjackctl: use QT4DIR

commit 966cc521a0c3413c7e4fd585bdd8290d1337655f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

qmpdclient: fix qt4 path

commit d4de998600d3e4e9da2bb130e2a7993f22396fdb
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

last.fm: fix qt4 path

commit e79d51d7b6e13d8025fd99821ecefd22b1cf2fd5
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

fix qt4 path

commit 7fe3388776ecdd8cf869ba13a74c9df7ea804137
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

qebmonx: fix qt4 path

commit c66144cae106b905b62228bce118a584904519c6
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

wpa_supplicant: fix QT4 path

diff --git a/audio-creation/traverso/BUILD b/audio-creation/traverso/BUILD
index 04584a7..fde32e9 100755
--- a/audio-creation/traverso/BUILD
+++ b/audio-creation/traverso/BUILD
@@ -1,3 +1,3 @@
-export PATH=/usr/bin/qt4:$PATH &&
+export PATH=$QT4DIR/bin:$PATH &&
cmake . &&
make
diff --git a/audio-creation/traverso/HISTORY b/audio-creation/traverso/HISTORY
index b4cb238..1806690 100644
--- a/audio-creation/traverso/HISTORY
+++ b/audio-creation/traverso/HISTORY
@@ -1,3 +1,6 @@
+2015-08-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: fix qt4 path
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/audio-players/last.fm/BUILD b/audio-players/last.fm/BUILD
index 54db89a..91e1ec75 100755
--- a/audio-players/last.fm/BUILD
+++ b/audio-players/last.fm/BUILD
@@ -1,4 +1,4 @@
-local PATH="/usr/bin/qt4:$PATH" &&
+local PATH="$QT4DIR/bin:$PATH" &&
make_single &&
CXXFLAGS="${CXXFLAGS//-ffast-math/}" &&
default_build &&
diff --git a/audio-players/last.fm/HISTORY b/audio-players/last.fm/HISTORY
index 3e4ada5..2b8dfea 100644
--- a/audio-players/last.fm/HISTORY
+++ b/audio-players/last.fm/HISTORY
@@ -1,3 +1,6 @@
+2015-08-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: fix qt4 path
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)

diff --git a/audio-players/qmpdclient/BUILD b/audio-players/qmpdclient/BUILD
index f37ad42..31a901d 100755
--- a/audio-players/qmpdclient/BUILD
+++ b/audio-players/qmpdclient/BUILD
@@ -1,4 +1,4 @@
-PATH="/usr/bin/qt4:${PATH}" &&
+PATH="$QT4DIR/bin:${PATH}" &&
sedit 's:/usr/local:/usr:' ${SOURCE_DIRECTORY}/qmpdclient.pro &&
qmake &&
make
diff --git a/audio-players/qmpdclient/HISTORY
b/audio-players/qmpdclient/HISTORY
index 7b3e212..c55fefe 100644
--- a/audio-players/qmpdclient/HISTORY
+++ b/audio-players/qmpdclient/HISTORY
@@ -1,3 +1,6 @@
+2015-08-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: fix qt4 path
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)

diff --git a/audio-soft/qjackctl/BUILD b/audio-soft/qjackctl/BUILD
index 2cd8cd1..378de04 100755
--- a/audio-soft/qjackctl/BUILD
+++ b/audio-soft/qjackctl/BUILD
@@ -1,5 +1,3 @@
OPTS="$QJCTL_TRAY $QJCTL_JACK_MIDI $OPTS" &&
-# $INSTALL_ROOT/opt/qt4??? How can you tell?
-# INSTALL_ROOT for non-basesystem spells is rarely working anyway.
-OPTS="$OPTS --with-qt4=/opt/qt4" &&
+OPTS="$OPTS --with-qt4=$QT4DIR" &&
default_build
diff --git a/audio-soft/qjackctl/HISTORY b/audio-soft/qjackctl/HISTORY
index e66403d..6d0edd0 100644
--- a/audio-soft/qjackctl/HISTORY
+++ b/audio-soft/qjackctl/HISTORY
@@ -1,3 +1,6 @@
+2015-08-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: use QT4DIR
+
2015-08-19 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: fix build with qt4 in /opt, really
* DEPENDS: note that qt5 could also be used in future
diff --git a/editors/lyx/BUILD b/editors/lyx/BUILD
index d09f8b2..3c97051 100755
--- a/editors/lyx/BUILD
+++ b/editors/lyx/BUILD
@@ -2,6 +2,6 @@ CFLAGS=${CFLAGS/-O3/-O2} &&
CXXFLAGS=${CXXFLAGS/-O3/-O2} &&
OPTS="${OPTS} --with-frontend=qt4 \
--with-qt-libraries=/usr/lib/qt4" &&
-PATH=/usr/bin/qt4:$PATH &&
+PATH=$QT4DIR/bin:$PATH &&

default_build
diff --git a/editors/lyx/HISTORY b/editors/lyx/HISTORY
index 4447041..45fb45f 100644
--- a/editors/lyx/HISTORY
+++ b/editors/lyx/HISTORY
@@ -1,3 +1,6 @@
+2015-08-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: fix qt4 path
+
2015-01-01 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Removed SOURCE_URL[2] and SOURCE2_URL[2]
updated spell to 2.1.2.2
diff --git a/editors/texmaker/BUILD b/editors/texmaker/BUILD
index 06da184..dd4cb7a 100755
--- a/editors/texmaker/BUILD
+++ b/editors/texmaker/BUILD
@@ -1,4 +1,4 @@
-PATH=/usr/bin/qt4:${PATH}
+PATH=$QT4DIR/bin:${PATH}
LD_LIBRARY_PATH=/usr/lib/qt4:$LD_LIBRARY_PATH
DYLD_LIBRARY_PATH=/usr/lib/qt4:$DYLD_LIBRARY_PATH
qmake -unix PREFIX=${INSTALL_ROOT}/usr texmaker.pro &&
diff --git a/editors/texmaker/HISTORY b/editors/texmaker/HISTORY
index 0c38a7f..8be1b11 100644
--- a/editors/texmaker/HISTORY
+++ b/editors/texmaker/HISTORY
@@ -1,3 +1,6 @@
+2015-08-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: fix qt4 path
+
2014-09-16 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 4.3

diff --git a/net/webmonx/BUILD b/net/webmonx/BUILD
index 151e37b..87e59d2 100755
--- a/net/webmonx/BUILD
+++ b/net/webmonx/BUILD
@@ -1,3 +1,3 @@
-PATH="/usr/bin/qt4:${PATH}" &&
+PATH="$QT4DIR/bin:${PATH}" &&
qmake PREFIX=${INSTALL_ROOT}/usr &&
make
diff --git a/net/webmonx/HISTORY b/net/webmonx/HISTORY
index bc892e9..9841154 100644
--- a/net/webmonx/HISTORY
+++ b/net/webmonx/HISTORY
@@ -1,3 +1,6 @@
+2015-08-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: fix QT4 path
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/net/wpa_supplicant/BUILD b/net/wpa_supplicant/BUILD
index b2a6909..76e1c6f 100755
--- a/net/wpa_supplicant/BUILD
+++ b/net/wpa_supplicant/BUILD
@@ -26,7 +26,7 @@ done &&
make &&

if is_depends_enabled $SPELL qt4; then
- PATH=/usr/bin/qt4:$PATH make wpa_gui-qt4
+ PATH=$QT4DIR/bin:$PATH make wpa_gui-qt4
fi &&

if is_depends_enabled $SPELL qt-x11; then
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 12cfac4..eb0a4a2 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,6 +1,9 @@
2015-11-11 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Internal TLS implementation depends on libtommath

+2015-08-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: fix qt4 path
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)

diff --git a/python-pypi/calibre/BUILD b/python-pypi/calibre/BUILD
index b8cb91d..e55c864 100755
--- a/python-pypi/calibre/BUILD
+++ b/python-pypi/calibre/BUILD
@@ -1,2 +1,2 @@
-PATH="/usr/bin/qt4:$PATH" &&
+PATH="$QT4DIR/bin:$PATH" &&
default_build_python
diff --git a/python-pypi/calibre/HISTORY b/python-pypi/calibre/HISTORY
index 76cbd63..fd6729e 100644
--- a/python-pypi/calibre/HISTORY
+++ b/python-pypi/calibre/HISTORY
@@ -1,3 +1,6 @@
+2015-08-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: fix qt4 path
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/x11-toolkits/qscintilla-designer/BUILD
b/x11-toolkits/qscintilla-designer/BUILD
index 6a8bda0..63d8ca3 100755
--- a/x11-toolkits/qscintilla-designer/BUILD
+++ b/x11-toolkits/qscintilla-designer/BUILD
@@ -1,5 +1,5 @@
if is_depends_enabled qscintilla qt4; then
- PATH=/usr/bin/qt4:$PATH &&
+ PATH=$QT4DIR/bin:$PATH &&
cd designer-Qt4 &&
qmake &&
make
diff --git a/x11-toolkits/qscintilla-designer/HISTORY
b/x11-toolkits/qscintilla-designer/HISTORY
index 8f3a42b..02f0246 100644
--- a/x11-toolkits/qscintilla-designer/HISTORY
+++ b/x11-toolkits/qscintilla-designer/HISTORY
@@ -1,3 +1,6 @@
+2015-08-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: fix qt4 path
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (9107f6bc93703d2f57fdaf6370d7978e46be133c), Thomas Orgis, 11/27/2015

Archive powered by MHonArc 2.6.24.

Top of Page