Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (25594fe12d6f1fa2e8f426973d96297ade45ee6c)

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 devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (25594fe12d6f1fa2e8f426973d96297ade45ee6c)
  • Date: Wed, 29 Apr 2015 14:39:27 -0500

GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

ChangeLog | 2
FUNCTIONS | 2
devel/qt-creator/BUILD | 5 -
devel/qt-creator/CONFIGURE | 1
devel/qt-creator/DEPENDS | 8 ---
devel/qt-creator/DETAILS | 22 --------
devel/qt-creator/HISTORY | 99 ---------------------------------------
devel/qt-creator/INSTALL | 1
qt5-qmake/qt-creator/CONFIGURE | 1
qt5-qmake/qt-creator/DEPENDS | 6 ++
qt5-qmake/qt-creator/DETAILS | 22 ++++++++
qt5-qmake/qt-creator/HISTORY | 104
+++++++++++++++++++++++++++++++++++++++++
qt5-qmake/qt-creator/INSTALL | 1
13 files changed, 137 insertions(+), 137 deletions(-)

New commits:
commit 25594fe12d6f1fa2e8f426973d96297ade45ee6c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

FUNCTIONS: fix qt5_build

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

qt-creator: => 3.4.0

diff --git a/ChangeLog b/ChangeLog
index e53cdb1..c6cdf42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
* add missing baloo-widgets ballo
* move choqok
* FUNCTIONS: fix qt4_build, qt4_cmake_build
+ * move qt-creator
+ * FUNCTIONS: fix qt5_build

2015-04-27 Pavel Vinogradov <public AT sourcemage.org>
* http/webkitfltk: new spell, FLTK port of WebKit
diff --git a/FUNCTIONS b/FUNCTIONS
index e450b9d..253e7b2 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -8,7 +8,7 @@ qt5_build() {
cd $SOURCE_DIRECTORY &&
PATH="$QT5DIR/bin:$PATH"
qmake PREFIX=$QT5DIR LIBDIR=$QT5DIR/lib \
- $OPTS $SRC/*.pro &&
+ $OPTS *.pro &&
make
}

diff --git a/devel/qt-creator/BUILD b/devel/qt-creator/BUILD
deleted file mode 100755
index 3f1d6c5..0000000
--- a/devel/qt-creator/BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-if is_depends_enabled $SPELL qtbase;then
- qt5_build
-else
- qt4_build
-fi
diff --git a/devel/qt-creator/CONFIGURE b/devel/qt-creator/CONFIGURE
deleted file mode 100755
index 2e91016..0000000
--- a/devel/qt-creator/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query QTCREATOR_DEVEL "Do you want to build the development branch?" n
diff --git a/devel/qt-creator/DEPENDS b/devel/qt-creator/DEPENDS
deleted file mode 100755
index a10832d..0000000
--- a/devel/qt-creator/DEPENDS
+++ /dev/null
@@ -1,8 +0,0 @@
-depends -sub CXX gcc &&
-depends QT &&
-if is_depends_enabled $SPELL qtbase;then
- depends qtx11extras &&
- depends qtdeclarative &&
- optional_depends qtquick1 '' '' 'old QtQuick support'
-fi
-
diff --git a/devel/qt-creator/DETAILS b/devel/qt-creator/DETAILS
deleted file mode 100755
index a16668b..0000000
--- a/devel/qt-creator/DETAILS
+++ /dev/null
@@ -1,22 +0,0 @@
- SPELL=qt-creator
-if [[ "${QTCREATOR_DEVEL}" == "y" ]]; then
- VERSION=3.0.0-rc1
-
SOURCE_HASH=sha512:60c3a996647a6e987de76780293e5867f0a144d41aeff36b6b634487181863bb41d5196c365b6b82f5a3fdd13dd112f048fba7db9b39153a4c9844741c504cd5
- SOURCE=$SPELL-opensource-src-$VERSION.tar.gz
-
SOURCE_URL[0]=http://download.qt-project.org/development_releases/qtcreator/${VERSION%.*}/${VERSION}/${SOURCE}
-else
- VERSION=3.1.0
-
SOURCE_HASH=sha512:2a54d03ae2319db8e2593a6668e2f50a40cb3cef5463df9a0a88702a15e36e7beb286150b0cc81cd18fb093c71cce1b8e86ccb1e9b37b51b26a33dceec53a839
- SOURCE=$SPELL-opensource-src-$VERSION.tar.gz
-
SOURCE_URL[0]=http://download.qt-project.org/official_releases/qtcreator/${VERSION%.*}/${VERSION}/${SOURCE}
-fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-opensource-src-$VERSION
- WEB_SITE=http://www.qtsoftware.com/downloads
- LICENSE[0]=LGPL
- ENTERED=20090304
- KEYWORDS="qt4 ide"
- SHORT="cross-platform integrated development environment for use
with Qt"
-cat << EOF
-Qt® Creator is a new cross-platform integrated development environment for
-use with Qt.
-EOF
diff --git a/devel/qt-creator/HISTORY b/devel/qt-creator/HISTORY
deleted file mode 100644
index 53d8698..0000000
--- a/devel/qt-creator/HISTORY
+++ /dev/null
@@ -1,99 +0,0 @@
-2014-04-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: stable version 3.1.0
-
-2014-02-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: stable version 3.0.1
-
-2014-02-04 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS, BUILD: add qt5 support
-
-2013-12-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: stable version 3.0.0
-
-2013-12-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * INSTALL: ensure installation to /usr
-
-2013-11-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: devel version 3.0.0-rc1
-
-2013-10-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: devel version 3.0.0-beta
-
-2013-08-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 2.8.1
-
-2013-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 2.7.0
-
-2013-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: devel 2.7.0-rc
-
-2013-02-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: devel 2.7.0-beta, stable 2.6.2
-
-2012-10-27 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
- * DETAILS: fixe screwy (r)
-
-2012-09-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: devel 2.6.0-beta, stable 2.5.2
-
-2012-07-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: stable and devel version 2.5.1
-
-2012-06-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: stable and devel version 2.5.0
-
-2012-04-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: devel version 2.5.0-rc
-
-2012-03-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 2.4.1
-
-2011-12-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: devel version 2.4.0-rc
-
-2011-10-14 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: fixed long description wrap (scripted)
-
-2011-09-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 2.3.1
-
-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)
-
-2011-01-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS, CONFIGURE: added optional support for the development
version
-
-2010-11-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 2.1.0-rc1
-
-2010-11-13 Bor Kraljič <pyrobor AT ver.si>
- * INSTALL: removed, no longer needed
-
-2010-10-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 2.0.1
-
-2010-04-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 1.3.1
-
-2009-12-03 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.3.0
-
-2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.2.90
-
-2009-07-27 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.2.1
-
-2009-06-26 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.2.0
-
-2009-04-23 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.1.0
- * INSTALL: added (their Makefile is bad if qdoc3 is missing)
-
-2009-03-04 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 1.0
- spell created
-
diff --git a/devel/qt-creator/INSTALL b/devel/qt-creator/INSTALL
deleted file mode 100755
index 12550e5..0000000
--- a/devel/qt-creator/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-make INSTALL_ROOT=${INSTALL_ROOT}/usr install
diff --git a/qt5-qmake/qt-creator/CONFIGURE b/qt5-qmake/qt-creator/CONFIGURE
new file mode 100755
index 0000000..2e91016
--- /dev/null
+++ b/qt5-qmake/qt-creator/CONFIGURE
@@ -0,0 +1 @@
+config_query QTCREATOR_DEVEL "Do you want to build the development branch?" n
diff --git a/qt5-qmake/qt-creator/DEPENDS b/qt5-qmake/qt-creator/DEPENDS
new file mode 100755
index 0000000..62797fa
--- /dev/null
+++ b/qt5-qmake/qt-creator/DEPENDS
@@ -0,0 +1,6 @@
+depends -sub CXX gcc &&
+depends qtbase &&
+depends qtx11extras &&
+depends qtdeclarative &&
+optional_depends qtquick1 '' '' 'old QtQuick support'
+
diff --git a/qt5-qmake/qt-creator/DETAILS b/qt5-qmake/qt-creator/DETAILS
new file mode 100755
index 0000000..78f9173
--- /dev/null
+++ b/qt5-qmake/qt-creator/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=qt-creator
+if [[ "${QTCREATOR_DEVEL}" == "y" ]]; then
+ VERSION=3.4.0-rc1
+ SOURCE_HASH=sha512:
+ SOURCE=$SPELL-opensource-src-$VERSION.tar.gz
+
SOURCE_URL[0]=http://download.qt.io/development_releases/qtcreator/${VERSION%.*}/${VERSION}/${SOURCE}
+else
+ VERSION=3.4.0
+
SOURCE_HASH=sha512:26d527a914b073f16dffe92314635af975c5878221dfbb8b7d0d0279d38e7934b062a4087f352fe619da2db1f66a090dc3f93ac2c1596438bd3d3f08d67e3d82
+ SOURCE=$SPELL-opensource-src-$VERSION.tar.gz
+
SOURCE_URL[0]=http://download.qt.io/official_releases/qtcreator/${VERSION%.*}/${VERSION}/${SOURCE}
+fi
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-opensource-src-$VERSION
+ WEB_SITE=http://www.qt.io/developers
+ LICENSE[0]=LGPL
+ ENTERED=20090304
+ KEYWORDS="qt5 ide"
+ SHORT="cross-platform integrated development environment for use
with Qt"
+cat << EOF
+Qt® Creator is a new cross-platform integrated development environment for
+use with Qt.
+EOF
diff --git a/qt5-qmake/qt-creator/HISTORY b/qt5-qmake/qt-creator/HISTORY
new file mode 100644
index 0000000..2147bf3
--- /dev/null
+++ b/qt5-qmake/qt-creator/HISTORY
@@ -0,0 +1,104 @@
+2015-04-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.4.0
+ new website & url
+ * DEPENDS: qt5 only
+
+2014-04-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: stable version 3.1.0
+
+2014-02-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: stable version 3.0.1
+
+2014-02-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS, BUILD: add qt5 support
+
+2013-12-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: stable version 3.0.0
+
+2013-12-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * INSTALL: ensure installation to /usr
+
+2013-11-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: devel version 3.0.0-rc1
+
+2013-10-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: devel version 3.0.0-beta
+
+2013-08-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.8.1
+
+2013-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.7.0
+
+2013-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: devel 2.7.0-rc
+
+2013-02-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: devel 2.7.0-beta, stable 2.6.2
+
+2012-10-27 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: fixe screwy (r)
+
+2012-09-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: devel 2.6.0-beta, stable 2.5.2
+
+2012-07-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: stable and devel version 2.5.1
+
+2012-06-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: stable and devel version 2.5.0
+
+2012-04-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: devel version 2.5.0-rc
+
+2012-03-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.4.1
+
+2011-12-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: devel version 2.4.0-rc
+
+2011-10-14 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: fixed long description wrap (scripted)
+
+2011-09-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.3.1
+
+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)
+
+2011-01-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, CONFIGURE: added optional support for the development
version
+
+2010-11-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.1.0-rc1
+
+2010-11-13 Bor Kraljič <pyrobor AT ver.si>
+ * INSTALL: removed, no longer needed
+
+2010-10-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.1
+
+2010-04-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.3.1
+
+2009-12-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.0
+
+2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.90
+
+2009-07-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.1
+
+2009-06-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.0
+
+2009-04-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.0
+ * INSTALL: added (their Makefile is bad if qdoc3 is missing)
+
+2009-03-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0
+ spell created
+
diff --git a/qt5-qmake/qt-creator/INSTALL b/qt5-qmake/qt-creator/INSTALL
new file mode 100755
index 0000000..12550e5
--- /dev/null
+++ b/qt5-qmake/qt-creator/INSTALL
@@ -0,0 +1 @@
+make INSTALL_ROOT=${INSTALL_ROOT}/usr install



  • [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (25594fe12d6f1fa2e8f426973d96297ade45ee6c), Treeve Jelbert, 04/29/2015

Archive powered by MHonArc 2.6.24.

Top of Page