[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e653a3dc68ff05510c10f48798d1cf25d0bb0fcd)

Treeve Jelbert scm at sourcemage.org
Tue Jun 12 12:43:33 EDT 2007


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

 x11-toolkits/qscintilla-designer/BUILD   |   14 +++++++++++---
 x11-toolkits/qscintilla-designer/DETAILS |   10 +++++-----
 x11-toolkits/qscintilla-designer/HISTORY |    7 +++++++
 x11-toolkits/qscintilla-designer/INSTALL |   10 ++++++++--
 4 files changed, 31 insertions(+), 10 deletions(-)

New commits:
commit e653a3dc68ff05510c10f48798d1cf25d0bb0fcd
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    qscintilla-designer 1.73-gpl-2.1

diff --git a/x11-toolkits/qscintilla-designer/BUILD b/x11-toolkits/qscintilla-designer/BUILD
index 9d5611c..6a8bda0 100755
--- a/x11-toolkits/qscintilla-designer/BUILD
+++ b/x11-toolkits/qscintilla-designer/BUILD
@@ -1,3 +1,11 @@
-cd designer            &&
-sedit 's|$(QTDIR)/plugins/designer|$(QTDIR)/lib/qt/plugins/designer|' designer.pro  &&
-true
+if is_depends_enabled qscintilla qt4; then
+  PATH=/usr/bin/qt4:$PATH     &&
+  cd designer-Qt4             &&
+  qmake                       &&
+  make
+else
+  source /etc/profile.d/qt.sh &&
+  cd designer-Qt3             &&
+  sedit 's|$(QTDIR)/plugins/designer|$(QTDIR)/lib/qt/plugins/designer|' designer.pro
+  qmake
+fi
diff --git a/x11-toolkits/qscintilla-designer/DETAILS b/x11-toolkits/qscintilla-designer/DETAILS
index e1f36ca..a438622 100755
--- a/x11-toolkits/qscintilla-designer/DETAILS
+++ b/x11-toolkits/qscintilla-designer/DETAILS
@@ -1,10 +1,10 @@
            SPELL=qscintilla-designer
-         VERSION=1.65-gpl-1.6
-     SOURCE_HASH=sha512:efbce2d0f9b3b51c167375b48801823b2d2567f30184ac3be01f1ab764d7e1e1854fe10604c528e12ba630d7f312f46833712a1e634b0094d7cc6735da19b8ac
-          SOURCE=qscintilla-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/qscintilla-$VERSION
+         VERSION=1.73-gpl-2.1
+     SOURCE_HASH=sha512:db0f0def2660539e76f0016e57daefb7ffc9abe279a0c8468d98cf2b8f1a18643648b31e136c92e18f39116bc3688268923bf9f7ed71f6c4d1cdd52224f1bdf2
+          SOURCE=QScintilla-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/QScintilla-$VERSION
         WEB_SITE=http://www.riverbankcomputing.co.uk/qscintilla/
-   SOURCE_URL[0]=http://www.riverbankcomputing.com/Downloads/QScintilla1/$SOURCE
+   SOURCE_URL[0]=http://www.riverbankcomputing.com/Downloads/QScintilla2/$SOURCE
       LICENSE[0]=GPL
          ENTERED=20060410
      GATHER_DOCS="off"
diff --git a/x11-toolkits/qscintilla-designer/HISTORY b/x11-toolkits/qscintilla-designer/HISTORY
index 27dee76..ce2855d 100644
--- a/x11-toolkits/qscintilla-designer/HISTORY
+++ b/x11-toolkits/qscintilla-designer/HISTORY
@@ -1,3 +1,10 @@
+2007-06-12 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.73-gpl-2.1
+	* BUILD: use either qt3 or qt4,
+	  depending on how qscintilla was built
+	  do qmake && make 
+	* INSTALL: only do 'make install' for qt4
+
 2006-06-28 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Removed BUILD_API=2, set grimoire-wide
 
diff --git a/x11-toolkits/qscintilla-designer/INSTALL b/x11-toolkits/qscintilla-designer/INSTALL
index 3d989ee..3f0eefb 100755
--- a/x11-toolkits/qscintilla-designer/INSTALL
+++ b/x11-toolkits/qscintilla-designer/INSTALL
@@ -1,2 +1,8 @@
-qmake designer  &&
-make
+cd $SOURCE_DIRECTORY          &&
+if is_depends_enabled qscintilla qt4; then
+  cd designer-Qt4             &&
+  make  install
+else
+  cd designer-Qt3             &&
+  make
+fi



More information about the SM-Commit mailing list