Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (876e4e8a1b880d354757bb3bf0247a92cc06406b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (876e4e8a1b880d354757bb3bf0247a92cc06406b)
  • Date: Sat, 10 Aug 2013 06:01:36 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 3 ++
devel/qwtplot3d/BUILD | 2 -
devel/qwtplot3d/DEPENDS | 2 -
devel/qwtplot3d/HISTORY | 4 +++
libs/muparser/DETAILS | 11 +++++-----
libs/muparser/HISTORY | 4 +++
libs/pugixml/BUILD | 2 +
libs/pugixml/CMakeLists.txt | 12 +++++++++++
libs/pugixml/DEPENDS | 2 +
libs/pugixml/DETAILS | 20 +++++++++++++++++++
libs/pugixml/HISTORY | 4 +++
libs/pugixml/PRE_BUILD | 5 ++++
science/octave/DEPENDS | 5 ++--
science/octave/DETAILS | 4 +--
science/octave/HISTORY | 5 ++++
science/octave/PRE_BUILD | 4 ---
science/octave/configure.patch | 17 ----------------
science/qtiplot/BUILD | 3 --
science/qtiplot/DEPENDS | 4 ++-
science/qtiplot/DETAILS | 4 +--
science/qtiplot/HISTORY | 8 +++++++
science/qtiplot/PRE_BUILD | 14 +++++++++++--
science/qtiplot/build.conf | 10 +++++++++
science/qtiplot/conf.patch | 40
---------------------------------------
science/qtoctave/BUILD | 7 ------
science/qtoctave/DETAILS | 6 ++---
science/qtoctave/HISTORY | 4 +++
x11-toolkits/qt-embedded/HISTORY | 2 -
x11-toolkits/qwt5/BUILD | 4 ---
x11-toolkits/qwt5/DETAILS | 4 +--
x11-toolkits/qwt5/HISTORY | 5 ++++
x11-toolkits/qwt5/PRE_BUILD | 12 +++--------
32 files changed, 131 insertions(+), 102 deletions(-)

New commits:
commit 876e4e8a1b880d354757bb3bf0247a92cc06406b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pugixml-1.2

commit b3494235c2d636eff1504fba1debde382466cc9a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

octave: => 3.6.4

commit 4c58de6d992ba28a11a6e2ce3ddae16548a35d73
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qtoctave: => 0.10.1

commit cbadd6e0959118a95d6b6398f81e60d929146530
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qtiplot: => 0.9.8.9

commit 314ddc19af5e5c97fd8afa2cc45130485f54bf00
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

muparser: => v2_2_3

commit 150417583c173f44399959c7c6b8356a1017ea01
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qwtplot3d - use qt4_build

commit 2e766dfac2a67f6e04ddea2eeba5b20b77731427
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

deprecate x11-toolkits/qt-embedded

commit 9c6cb5f5b79741cb17c3f30fced340936d425e9d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qwt5: => 6.1.0

diff --git a/ChangeLog b/ChangeLog
index 6740774..d793594 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2013-08-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * libs/pugixml: new spll, xml parser
+
2013-08-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* utils/nocache: new spell, a tool for excluding processes from
participating in the buffer cache
diff --git a/devel/qwtplot3d/BUILD b/devel/qwtplot3d/BUILD
index b9755a6..eec3de4 100755
--- a/devel/qwtplot3d/BUILD
+++ b/devel/qwtplot3d/BUILD
@@ -1 +1 @@
-build_qt3_or_4
+qt4_build
diff --git a/devel/qwtplot3d/DEPENDS b/devel/qwtplot3d/DEPENDS
index 5a6f29a..b6d7c1e 100755
--- a/devel/qwtplot3d/DEPENDS
+++ b/devel/qwtplot3d/DEPENDS
@@ -1,2 +1,2 @@
-depends QT &&
+depends qt4 &&
depends OPENGL
diff --git a/devel/qwtplot3d/HISTORY b/devel/qwtplot3d/HISTORY
index ceca561..99d12bd 100644
--- a/devel/qwtplot3d/HISTORY
+++ b/devel/qwtplot3d/HISTORY
@@ -1,3 +1,7 @@
+2013-08-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: use qt4_build
+ * DEPENDS: QT => qt4
+
2012-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, qwtplot3d-qt48.patch: added patch from gentoo to fix
compile
error
diff --git a/libs/muparser/DETAILS b/libs/muparser/DETAILS
index a15ddbb..2be1486 100755
--- a/libs/muparser/DETAILS
+++ b/libs/muparser/DETAILS
@@ -1,10 +1,11 @@
SPELL=muparser
- VERSION=1.30
- SOURCE="${SPELL}_v${VERSION/./}.tar.gz"
+ VERSION=v2_2_3
+
SOURCE_HASH=sha512:86d140c07161757e2f0de516a4c2922ce5b135d06b01466bc15ad90833bd3e9f99b9b9c528617262597a7a5a6b09bff5ae8ced5d51c413ea611059e0bdb22e6d
+ SX="${SPELL}_${VERSION}"
+ SOURCE="${SX}.zip"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:a79f7bd83219ff03a4d6869ae90591bfc63531628b635fad079a70d588ceed391575e675a43ad699a9a7b53f2c8b2da1fd33892dd76a777b892fa39d801ff3e7
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
- WEB_SITE="http://muparser.sourceforge.net";
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SX}"
+ WEB_SITE="http://muparser.beltoforion.de";
LICENSE[0]=MIT
ENTERED=20070218
SHORT="a fast math expression parser library"
diff --git a/libs/muparser/HISTORY b/libs/muparser/HISTORY
index 2a34bd0..283a7fc 100644
--- a/libs/muparser/HISTORY
+++ b/libs/muparser/HISTORY
@@ -1,3 +1,7 @@
+2013-08-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.2.3
+ new website & url
+
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/libs/pugixml/BUILD b/libs/pugixml/BUILD
new file mode 100755
index 0000000..760e1eb
--- /dev/null
+++ b/libs/pugixml/BUILD
@@ -0,0 +1,2 @@
+cmake_build
+
diff --git a/libs/pugixml/CMakeLists.txt b/libs/pugixml/CMakeLists.txt
new file mode 100644
index 0000000..82a834b
--- /dev/null
+++ b/libs/pugixml/CMakeLists.txt
@@ -0,0 +1,12 @@
+project(pugixml)
+cmake_minimum_required(VERSION 2.8.11)
+set(VERSION 1.2)
+set(HEADERS src/pugixml.hpp src/pugiconfig.hpp)
+set(SOURCES ${HEADERS} src/pugixml.cpp)
+
+add_library(pugixml SHARED ${SOURCES})
+
+set_target_properties(pugixml PROPERTIES VERSION ${VERSION} SOVERSION
${VERSION})
+
+install(TARGETS pugixml LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+install(FILES ${HEADERS} DESTINATION include)
diff --git a/libs/pugixml/DEPENDS b/libs/pugixml/DEPENDS
new file mode 100755
index 0000000..2236fb7
--- /dev/null
+++ b/libs/pugixml/DEPENDS
@@ -0,0 +1,2 @@
+depends -sub CXX gcc &&
+depends cmake
diff --git a/libs/pugixml/DETAILS b/libs/pugixml/DETAILS
new file mode 100755
index 0000000..00fbdbb
--- /dev/null
+++ b/libs/pugixml/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=pugixml
+ VERSION=1.2
+
SOURCE_HASH=sha512:c46ed096b6657a670e12738d191f81da0c33f699dd3ec8bc9b093a05edf2b0788a2d0c79a900a2aafd99a966b3c9a85cfdaeda6291c06e9a0fb419b5ac4d445e
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://pugixml.org/
+ SOURCE_URL[0]=http://$SPELL.googlecode.com/files/$SOURCE
+ LICENSE[0]=MIT
+ ENTERED=20130810
+ KEYWORDS="C++ XML"
+ SHORT="light-weight C++ XML processing library"
+cat << EOF
+pugixml is a light-weight C++ XML processing library. It features:
+DOM-like interface with rich traversal/modification capabilities
+Extremely fast non-validating XML parser which constructs the DOM tree from
an XML
+file/buffer
+XPath 1.0 implementation for complex data-driven tree queries
+Full Unicode support with Unicode interface variants and automatic encoding
conversions
+The library is extremely portable and easy to integrate and use.
+EOF
diff --git a/libs/pugixml/HISTORY b/libs/pugixml/HISTORY
new file mode 100644
index 0000000..c7d9340
--- /dev/null
+++ b/libs/pugixml/HISTORY
@@ -0,0 +1,4 @@
+2013-08-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2
+ spell created
+
diff --git a/libs/pugixml/PRE_BUILD b/libs/pugixml/PRE_BUILD
new file mode 100755
index 0000000..7719943
--- /dev/null
+++ b/libs/pugixml/PRE_BUILD
@@ -0,0 +1,5 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file &&
+#use an improveed version of their cmake file
+cp $SPELL_DIRECTORY/CMakeLists.txt .
diff --git a/science/octave/DEPENDS b/science/octave/DEPENDS
index 48417cd..f8d188d 100755
--- a/science/octave/DEPENDS
+++ b/science/octave/DEPENDS
@@ -1,4 +1,5 @@
depends -sub FORTRAN gcc &&
+depends pcre &&

optional_depends gnuplot \
'' \
@@ -11,8 +12,8 @@ optional_depends fltk \
'for FLTK based plotting system' &&

optional_depends readline \
- '--with-readline' \
- '--without-readline' \
+ '--enable-readline' \
+ '--disable-readline' \
'for better command-line support' &&

#
diff --git a/science/octave/DETAILS b/science/octave/DETAILS
index 1f0300f..21de347 100755
--- a/science/octave/DETAILS
+++ b/science/octave/DETAILS
@@ -1,7 +1,7 @@
SPELL=octave
- VERSION=3.4.0
+ VERSION=3.6.4
+
SOURCE_HASH=sha512:a49ef50161272618c9543057be5903e1e50b7f4ecb929777f6715d4b3a07a92c36a5b13958c52d8b942b6c7e7e3f7844409d0062eb02bdb3972d7194312b7a81
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:af418895e10bc9bc0535420ca5ae66f9cfb2c798479009a7462fcd09dbd53a54c77a95ff6077889cc65f829fffe1b6b9098e469d6daf6d20acdcc334f024d51b
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
LICENSE[0]=GPL
diff --git a/science/octave/HISTORY b/science/octave/HISTORY
index 4914167..f1e88f9 100644
--- a/science/octave/HISTORY
+++ b/science/octave/HISTORY
@@ -1,3 +1,8 @@
+2013-08-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.6.4
+ * DEPENDS: add prce, adjust readline flags
+ * PRE_BUILD. configure.patch: deleted
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on fortran to dependency on gcc with
sub-depends on FORTRAN (scripted)
diff --git a/science/octave/PRE_BUILD b/science/octave/PRE_BUILD
deleted file mode 100755
index c6831b6..0000000
--- a/science/octave/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-
-cd $SOURCE_DIRECTORY &&
-patch configure $SPELL_DIRECTORY/configure.patch
diff --git a/science/octave/configure.patch b/science/octave/configure.patch
deleted file mode 100644
index a50b65c..0000000
--- a/science/octave/configure.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- octave-3.4.0/configure 2011-02-08 18:03:31.000000000 +0800
-+++ configure 2011-05-20 14:50:40.024000681 +0800
-@@ -46257,11 +46257,14 @@
- return 0;
- }
- _ACEOF
-+ac_link_hold="$ac_link"
-+ac_link='$F77 -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS
conftest.$ac_ext $LIBS >&5'
- if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
- else
- eval "$as_ac_Lib=no"
- fi
-+ac_link="$ac_link_hold"
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
diff --git a/science/qtiplot/BUILD b/science/qtiplot/BUILD
index c24bfbe..eec3de4 100755
--- a/science/qtiplot/BUILD
+++ b/science/qtiplot/BUILD
@@ -1,2 +1 @@
-"$INSTALL_ROOT/usr/bin/qt4/qmake" qtiplot.pro &&
-make
+qt4_build
diff --git a/science/qtiplot/DEPENDS b/science/qtiplot/DEPENDS
index f969a56..28b50f0 100755
--- a/science/qtiplot/DEPENDS
+++ b/science/qtiplot/DEPENDS
@@ -1,4 +1,6 @@
-depends qt4 &&
+depends -sub QT3 qt4 &&
+depends libpng &&
+depends muparser &&
depends qwt5 &&
depends qwtplot3d &&
depends gsl &&
diff --git a/science/qtiplot/DETAILS b/science/qtiplot/DETAILS
index 087f750..23f2f49 100755
--- a/science/qtiplot/DETAILS
+++ b/science/qtiplot/DETAILS
@@ -1,8 +1,8 @@
SPELL=qtiplot
- VERSION=0.9rc3
+ VERSION=0.9.8.9
+
SOURCE_HASH=sha512:3a0cb7b49c508f56228e8e3a259b4fd34c872410ad14ef1d8656372e3e8ab9f92e59094a9cc1a75680099a8832f7472ad31462b3ae8a9e132ac7056d5245cf2a
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://soft.proindependent.com/src/${SOURCE}
-
SOURCE_HASH=sha512:d6407fd3cfd0e87f32b19aae13a0cdfff620c032bd52d54123f22cdc497366d850536c09e77fe3a83aea5c77289f412cc698c63b70c04bd08d7d6f43a163051d
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://soft.proindependent.com/qtiplot.html "
LICENSE[0]=GPL
diff --git a/science/qtiplot/HISTORY b/science/qtiplot/HISTORY
index 126d481..814bbad 100644
--- a/science/qtiplot/HISTORY
+++ b/science/qtiplot/HISTORY
@@ -1,3 +1,11 @@
+2013-08-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.8.9
+ * BUILD: use qt4_build
+ * DEPENDS: add libpng, muparser, qt4 needs QT3
+ * PRE_BUILD: copy build.conf, various fixups
+ * build.conf: added
+ * conf.patch: deleted
+
2007-07-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PRE_BUILD: enable python, disable when dependency not met
* DEPENDS: added optional pyqt4
diff --git a/science/qtiplot/PRE_BUILD b/science/qtiplot/PRE_BUILD
index 19a146c..1bca1d9 100755
--- a/science/qtiplot/PRE_BUILD
+++ b/science/qtiplot/PRE_BUILD
@@ -1,7 +1,17 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/conf.patch &&
-sed -i '/^LIBS/d; s,^#unix,unix,p' fitPlugins/fitRational?/fitRational?.pro
&&
+cp $SPELL_DIRECTORY/build.conf . &&
+sed -i '/3rdparty/D;/manual/D;/STATIC/D' \
+ qtiplot.pro qtiplot/src/lib/qti.pro qtiplot/qtiplot.pro &&
+
+sed -i '/libsuff=64/D' \
+ fitPlugins/planck_wavelength/planck_wavelength.pro \
+ fitPlugins/fitRational1/fitRational1.pro \
+ fitPlugins/fitRational0/fitRational0.pro \
+ fitPlugins/explin/explin.pro \
+ fitPlugins/exp_saturation/exp_saturation.pro \
+ qtiplot/src/lib/qti.pro &&
+

if ! is_depends_enabled $SPELL pyqt4; then
sed -i '/^SCRIPT.*Python/d' $SOURCE_DIRECTORY/qtiplot/qtiplot.pro
diff --git a/science/qtiplot/build.conf b/science/qtiplot/build.conf
new file mode 100644
index 0000000..6778a40
--- /dev/null
+++ b/science/qtiplot/build.conf
@@ -0,0 +1,10 @@
+ZLIB_INCLUDEPATH = /usr/include
+MUPARSER_INCLUDEPATH = /usr/include
+QWT_INCLUDEPATH = /usr/include
+QWT3D_INCLUDEPATH = /usr/include/qwtplot3d
+GSL_INCLUDEPATH = /usr/include/gsl
+
+MUPARSER_LIBS = -lmuparser
+QWT_LIBS = -lqwt
+QWT3D_LIBS = -lqwtplot3d
+GSL_LIBS = -lgsl -lgslcblas
diff --git a/science/qtiplot/conf.patch b/science/qtiplot/conf.patch
deleted file mode 100644
index 95257e2..0000000
--- a/science/qtiplot/conf.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- qtiplot/qtiplot.pro.orig 2007-07-12 17:42:26.000000000 +0200
-+++ qtiplot/qtiplot.pro 2007-07-12 17:45:40.000000000 +0200
-@@ -26,11 +26,12 @@
-
#############################################################################
-
- INCLUDEPATH += ../3rdparty/muParser
--INCLUDEPATH += ../3rdparty/qwtplot3d/include
--INCLUDEPATH += ../3rdparty/qwt/src
- INCLUDEPATH += ../3rdparty/liborigin
--INCLUDEPATH += ../3rdparty/gsl/include
- INCLUDEPATH += ../3rdparty/zlib123/include
-+INCLUDEPATH += /usr/include/qwtplot3d
-+INCLUDEPATH += /usr/include/qwt
-+INCLUDEPATH += /usr/include/gsl
-+
-
- ##################### 3rd PARTY LIBRARIES SECTION
###########################
- #!!! Warning: You must modify these paths according to your computer
settings
-@@ -43,18 +44,14 @@
- unix:LIBS += -L /usr/lib$${libsuff}
-
- # statically link against Qwt(3D) in 3rdparty
--unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
--unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
- # dynamically link against Qwt(3D) installed system-wide
- # WARNING: make sure they are compiled against Qt4
--#unix:LIBS += -lqwtplot3d
--#unix:LIBS += -lqwt
-+unix:LIBS += -lqwtplot3d
-+unix:LIBS += -lqwt
-
- # statically link against GSL in 3rdparty
--unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
--unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
- #dynamically link against GSL installed system-wide
--#unix:LIBS += -lgsl -lgslcblas
-+unix:LIBS += -lgsl -lgslcblas
-
- ##################### Windows
###############################################
-
diff --git a/science/qtoctave/BUILD b/science/qtoctave/BUILD
index 961b5c2..2113434 100755
--- a/science/qtoctave/BUILD
+++ b/science/qtoctave/BUILD
@@ -1,6 +1 @@
-cmake "-DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_ROOT}/usr" \
- "-DCMAKE_CXX_FLAGS_RELEASE:STRING=${CXXFLAGS}" \
- "-DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF" \
- "-DQT_QMAKE_EXECUTABLE:FILEPATH=${TRACK_ROOT}/usr/bin/qt4/qmake" \
- . &&
-default_build_make
+qt4_cmake_build
diff --git a/science/qtoctave/DETAILS b/science/qtoctave/DETAILS
index e29d90b..1fc1c15 100755
--- a/science/qtoctave/DETAILS
+++ b/science/qtoctave/DETAILS
@@ -1,8 +1,8 @@
SPELL=qtoctave
- VERSION=0.8.2
+ VERSION=0.10.1
+
SOURCE_HASH=sha512:b91e59ba9f16ebc2da9f2d606d0e7440d06e13cd6670fb7aa896eb30ad43835df74b7ba5127f1e9095c88de2468c6d2b2c174f1c5b1638678968bf81647b665f
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://forja.rediris.es/frs/download.php/1383/${SOURCE}
-
SOURCE_HASH=sha512:6a0e616e51f6b5f8e2659201b55f97e7c5aa2c59624bf6aca278a66ea7bf374558451b6883bad5f863b7522591713dcb8042921a2136b23230272f05a08ef85b
+ SOURCE_URL[0]=http://forja.rediris.es/frs/download.php/2054/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://forja.rediris.es/projects/csl-qtoctave";
LICENSE[0]=GPL
diff --git a/science/qtoctave/HISTORY b/science/qtoctave/HISTORY
index 068fecf..739ca59 100644
--- a/science/qtoctave/HISTORY
+++ b/science/qtoctave/HISTORY
@@ -1,3 +1,7 @@
+2013-08-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.10.1
+ * BUILD: use qt4_cmake_build
+
2011-01-02 Ismael Luceno <ismael AT sourcemage.org>
* qtoctave.desktop: added spanish comment

diff --git a/x11-toolkits/qt-embedded/HISTORY
b/x11-toolkits/qt-embedded/HISTORY
index 0ad87af..576231a 100644
--- a/x11-toolkits/qt-embedded/HISTORY
+++ b/x11-toolkits/qt-embedded/HISTORY
@@ -1,4 +1,4 @@
-2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
+2013-08-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0
PATCHLEVEL=9999
spell deprecated
diff --git a/x11-toolkits/qwt5/BUILD b/x11-toolkits/qwt5/BUILD
index 7255991..eec3de4 100755
--- a/x11-toolkits/qwt5/BUILD
+++ b/x11-toolkits/qwt5/BUILD
@@ -1,3 +1 @@
-export QTDIR=${INSTALL_ROOT}/usr &&
-$TRACK_ROOT/usr/bin/qt4/qmake &&
-make
+qt4_build
diff --git a/x11-toolkits/qwt5/DETAILS b/x11-toolkits/qwt5/DETAILS
index 706b929..f1bde7b 100755
--- a/x11-toolkits/qwt5/DETAILS
+++ b/x11-toolkits/qwt5/DETAILS
@@ -1,9 +1,9 @@
SPELL=qwt5
- VERSION=6.0.1
+ VERSION=6.1.0
+
SOURCE_HASH=sha512:5c5c8309debad1829cb59cf1c941b66306153a25b2027d674a2cfa5a150bfdd3823a1b6ed9df3b326bacc1dc7d1b6c301b1fd5bcebf7ff51cfa74b76a55f30bc
SOURCE=qwt-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/qwt-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/qwt/${SOURCE}
-
SOURCE_HASH=sha512:36fdd5344203586daa8b8283b6ae743fedd3f0685bc3405295868288de66827695b5e31e9a54231a3fe8aa0f3b008f1d0961ff9d89a201a4f5b14f7376b17610
WEB_SITE=http://qwt.sourceforge.net
ENTERED=20061003
LICENSE[0]=http://qwt.sourceforge.net/qwtlicense.html
diff --git a/x11-toolkits/qwt5/HISTORY b/x11-toolkits/qwt5/HISTORY
index f623d90..32888a0 100644
--- a/x11-toolkits/qwt5/HISTORY
+++ b/x11-toolkits/qwt5/HISTORY
@@ -1,3 +1,8 @@
+2013-08-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 6.1.0
+ * BUILD: use qt4_build
+ * PRE_BUILD: simplify
+
2012-08-15 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS, BUILD, DEPENDS, PRE_BUILD: update to qt4-only 6.0.1 ...
qwt5
name is suboptimal now.
diff --git a/x11-toolkits/qwt5/PRE_BUILD b/x11-toolkits/qwt5/PRE_BUILD
index 9ac9b76..31656b1 100755
--- a/x11-toolkits/qwt5/PRE_BUILD
+++ b/x11-toolkits/qwt5/PRE_BUILD
@@ -2,12 +2,8 @@ default_pre_build &&

# Those messy droppings of this QT4 lib are annoying!
# Trying to get things into some system-like order.
+cd $SOURCE_DIRECTORY &&
+sed -i -e "/local/D;/QWT_INSTALL_PREFIX *=/s|=.*$|= $INSTALL_ROOT/usr|" \
+ -e "s|/doc|/share/doc|;/features/s|/|/share/qt4/mkspecs/|" \
+ qwtconfig.pri

-sedit "s: QWT_INSTALL_PREFIX = /usr/local/qwt-\$\$QWT_VERSION:
QWT_INSTALL_PREFIX = $INSTALL_ROOT/usr:" \
- $SOURCE_DIRECTORY/qwtconfig.pri &&
-
-sedit "s:QWT_INSTALL_DOCS =
\$\${QWT_INSTALL_PREFIX}/doc:QWT_INSTALL_DOCS =
\$\${QWT_INSTALL_PREFIX}/share/doc/qwt:" \
- $SOURCE_DIRECTORY/qwtconfig.pri &&
-
-sedit "s:QWT_INSTALL_FEATURES =
\$\${QWT_INSTALL_PREFIX}/features:QWT_INSTALL_FEATURES =
\$\${QWT_INSTALL_PREFIX}/share/qt4/mkspecs/features:" \
- $SOURCE_DIRECTORY/qwtconfig.pri



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (876e4e8a1b880d354757bb3bf0247a92cc06406b), Treeve Jelbert, 08/10/2013

Archive powered by MHonArc 2.6.24.

Top of Page