Skip to Content.
Sympa Menu

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

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 (500eeb4719ff44002a1bad1fc2876bbf327d6559)
  • Date: Tue, 12 Jun 2007 08:56:11 -0500

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

fonts/linuxlibertine/DETAILS | 9 ++++----
fonts/linuxlibertine/HISTORY | 3 ++
ftp/aria2/DETAILS | 4 +--
ftp/aria2/HISTORY | 3 ++
x11-toolkits/qscintilla/BUILD | 14 +++++++++---
x11-toolkits/qscintilla/DEPENDS | 3 --
x11-toolkits/qscintilla/DETAILS | 6 ++---
x11-toolkits/qscintilla/HISTORY | 14 ++++++++++++
x11-toolkits/qscintilla/PRE_SUB_DEPENDS | 5 ++++
x11-toolkits/qscintilla/SUB_DEPENDS | 9 ++++++++
x11-toolkits/qscintilla/mk.diff | 28 -------------------------
x11-toolkits/qscintilla/mk.diff.qt3 | 28 +++++++++++++++++++++++++
x11-toolkits/qscintilla/mk.diff.qt4 | 35
++++++++++++++++++++++++++++++++
x11-toolkits/qt4/DETAILS | 4 +--
x11-toolkits/qt4/HISTORY | 3 ++
15 files changed, 123 insertions(+), 45 deletions(-)

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

aria2-0.11.0

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

qscintilla - add SUB_DEPENDS

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

linuxlibertine-2.6.9

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

1.73-gpl-2.1

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

qt4-4.3.1-snapshot-20070610

diff --git a/fonts/linuxlibertine/DETAILS b/fonts/linuxlibertine/DETAILS
index f82df28..ccde35e 100755
--- a/fonts/linuxlibertine/DETAILS
+++ b/fonts/linuxlibertine/DETAILS
@@ -1,9 +1,10 @@
SPELL=linuxlibertine
- VERSION=2.0.9
- SOURCE=LinLibertineTTF-${VERSION}.tgz
+ SPELLX=LinLibertineFont
+ VERSION=2.6.9
+
SOURCE_HASH=sha512:876394c00be720cf1e7498d7b3059dede6f72802b586da1bc4a20631f6b738ebbba41ba20949506fa307e251439d6115c161621b535950b1c227750a65183414
+ SOURCE=$SPELLX-${VERSION//.9}.tgz
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:ac3451dec9cee1ed89cb6fa8a53753fd6bf159967fea7930e9ad8659e456ebd934e50323b72864682dc35d84011469b03559e4ed0b417c048a62fc54ab9c9342
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/LinLibertineTTF
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELLX
WEB_SITE=http://linuxlibertine.sourceforge.net/
ENTERED=20060628
LICENSE[0]=GPL
diff --git a/fonts/linuxlibertine/HISTORY b/fonts/linuxlibertine/HISTORY
index e13fcca..604267e 100644
--- a/fonts/linuxlibertine/HISTORY
+++ b/fonts/linuxlibertine/HISTORY
@@ -1,3 +1,6 @@
+2007-06-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.6.9
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/ftp/aria2/DETAILS b/ftp/aria2/DETAILS
index 13c5445..503c490 100755
--- a/ftp/aria2/DETAILS
+++ b/ftp/aria2/DETAILS
@@ -1,8 +1,8 @@
SPELL=aria2
- VERSION=0.10.2+1
+ VERSION=0.11.0
+
SOURCE_HASH=sha512:c0545a0bf73dcfa5992ede508938e580243e694e80fde01b3eb91229c8f1f7d45e635d316e9dccb2de4b9661363cecac2b4f64c4e89df5306e3df805185d6845
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:2c76e5b18512313978f4b2844de4e6ed7ef81586bd355a24ef8cb0f1f216a29247601e294dd86ea7bc897c9cb56178dda938864da56b282b2b6bdbceb59bb9d1
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://aria2.sourceforge.net/
ENTERED=20060322
diff --git a/ftp/aria2/HISTORY b/ftp/aria2/HISTORY
index 347f9a8..ea5362e 100644
--- a/ftp/aria2/HISTORY
+++ b/ftp/aria2/HISTORY
@@ -1,3 +1,6 @@
+2007-06-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.11.0
+
2007-03-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.10.2+2

diff --git a/x11-toolkits/qscintilla/BUILD b/x11-toolkits/qscintilla/BUILD
index d20fb90..6a8af43 100755
--- a/x11-toolkits/qscintilla/BUILD
+++ b/x11-toolkits/qscintilla/BUILD
@@ -1,8 +1,14 @@
- cd qt &&
+QTDIR=/usr &&
+local QTSCINT &&
+if is_depends_enabled $SPELL qt4;then
+ PATH=$QTDIR/bin/qt4:$PATH
+ QTSCINT=Qt4
+else
+ QTSCINT=Qt3
+fi &&
+ cd $SOURCE_DIRECTORY/$QTSCINT &&
qmake qscintilla.pro &&
-
# fix the generated Makefile, so that libqscintilla gets installed at the
correct time
-#
- patch -p0 < $SPELL_DIRECTORY/mk.diff &&
+ patch -p0 < $SPELL_DIRECTORY/mk.diff.${QTSCINT/Q/q} &&
make

diff --git a/x11-toolkits/qscintilla/DEPENDS b/x11-toolkits/qscintilla/DEPENDS
index e2b481d..0a3bd97 100755
--- a/x11-toolkits/qscintilla/DEPENDS
+++ b/x11-toolkits/qscintilla/DEPENDS
@@ -1,3 +1,2 @@
depends g++ &&
-depends qt-x11
-
+depends QT
diff --git a/x11-toolkits/qscintilla/DETAILS b/x11-toolkits/qscintilla/DETAILS
index 481bcfd..6a4969c 100755
--- a/x11-toolkits/qscintilla/DETAILS
+++ b/x11-toolkits/qscintilla/DETAILS
@@ -1,10 +1,10 @@
SPELL=qscintilla
- VERSION=1.71-gpl-1.7.1
-
SOURCE_HASH=sha512:2db07d10eb24472584cc69ba3618205aead601b9d9c0c638081be0efca98e792578532b749a5ec41451158ef072d486a6000d863c5f7e65463dd56f9f68f69ef
+ 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=20060206
KEYWORDS="qt editors x11 libs"
diff --git a/x11-toolkits/qscintilla/HISTORY b/x11-toolkits/qscintilla/HISTORY
index 7e9bb54..88c933d 100644
--- a/x11-toolkits/qscintilla/HISTORY
+++ b/x11-toolkits/qscintilla/HISTORY
@@ -1,3 +1,17 @@
+2007-06-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: added
+ * CONFIGURE: deleted
+ * DEPENDS: depends QT
+ * BUILD: use is_depends_enabled
+
+2007-06-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.73-gpl-2.1
+ * CONFIGURE: added, to choose which qt version
+ * BUILD, DEPENDS: allow qt3 or qt4
+ apply different patches for qt3 and qt4
+ * mk.diff: deleted
+ * mk.diff.qt{3.4}: added
+
2007-03-01 David Kowis <dkowis AT shlrm.org>
* DETAILS: version 1.71-gnu-1.7.1 It's what he's got...

diff --git a/x11-toolkits/qscintilla/PRE_SUB_DEPENDS
b/x11-toolkits/qscintilla/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..ba8807b
--- /dev/null
+++ b/x11-toolkits/qscintilla/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ QT3) is_depends_enabled $SPELL qt-x11 && return 0;;
+ QT4) is_depends_enabled $SPELL qt4 && return 0;;
+esac
+return 1
diff --git a/x11-toolkits/qscintilla/SUB_DEPENDS
b/x11-toolkits/qscintilla/SUB_DEPENDS
new file mode 100755
index 0000000..8aff794
--- /dev/null
+++ b/x11-toolkits/qscintilla/SUB_DEPENDS
@@ -0,0 +1,9 @@
+case $THIS_SUB_DEPENDS in
+QT4) echo "QT4 support requested, forcing QT4 dependency." &&
+ depends qt4
+ ;;
+QT3) echo "QT3 support requested, forcing QT4 dependency." &&
+ depends qt-x11
+ ;;
+*) echo unknown sub-depends!!! ; return 1 ;;
+esac
diff --git a/x11-toolkits/qscintilla/mk.diff b/x11-toolkits/qscintilla/mk.diff
deleted file mode 100644
index cc21e61..0000000
--- a/x11-toolkits/qscintilla/mk.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile 2006-02-09 11:13:54.000000000 +0100
-+++ Makefile.cp 2006-02-09 11:19:11.000000000 +0100
-@@ -398,12 +398,12 @@
-
- ####### Build rules
-
--all: Makefile $(QTDIR)/lib/$(TARGET)
-+all: Makefile $(TARGET)
-
--$(QTDIR)/lib/$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
$(OBJCOMP)
-- test -d $(QTDIR)/lib/ || mkdir -p $(QTDIR)/lib/
-- -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
-+$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)
- $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
-+
-+install-scint: $(TARGET)
- -ln -s $(TARGET) $(TARGET0)
- -ln -s $(TARGET) $(TARGET1)
- -ln -s $(TARGET) $(TARGET2)
-@@ -1094,7 +1094,7 @@
- -$(DEL_DIR) "$(INSTALL_ROOT)$(QTDIR)/translations/"
-
-
--install: install_header install_trans
-+install: install-scint install_header install_trans
-
- uninstall: uninstall_header uninstall_trans
-
diff --git a/x11-toolkits/qscintilla/mk.diff.qt3
b/x11-toolkits/qscintilla/mk.diff.qt3
new file mode 100644
index 0000000..07c4f2e
--- /dev/null
+++ b/x11-toolkits/qscintilla/mk.diff.qt3
@@ -0,0 +1,28 @@
+--- Makefile.orig 2007-06-10 18:22:43.000000000 +0200
++++ Makefile 2007-06-10 18:34:59.000000000 +0200
+@@ -435,12 +435,12 @@
+
+ ####### Build rules
+
+-all: Makefile $(QTDIR)/lib/$(TARGET)
++all: Makefile $(TARGET)
+
+-$(QTDIR)/lib/$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
$(OBJCOMP)
+- test -d $(QTDIR)/lib/ || mkdir -p $(QTDIR)/lib/
+- -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
++$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)
+ $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
++
++install-scint: $(TARGET)
+ -ln -s $(TARGET) $(TARGET0)
+ -ln -s $(TARGET) $(TARGET1)
+ -ln -s $(TARGET) $(TARGET2)
+@@ -1264,7 +1264,7 @@
+ -$(DEL_DIR) "$(INSTALL_ROOT)../../../share/qt/"
+
+
+-install: install_header install_trans install_qsci
++install: install-scint install_header install_trans install_qsci
+
+ uninstall: uninstall_header uninstall_trans uninstall_qsci
+
diff --git a/x11-toolkits/qscintilla/mk.diff.qt4
b/x11-toolkits/qscintilla/mk.diff.qt4
new file mode 100644
index 0000000..9a826cd
--- /dev/null
+++ b/x11-toolkits/qscintilla/mk.diff.qt4
@@ -0,0 +1,35 @@
+--- Makefile 2007-06-10 17:46:56.000000000 +0200
++++ Makefile.cp 2007-06-10 17:58:10.000000000 +0200
+@@ -383,19 +383,15 @@
+
+ ####### Build rules
+
+-all: Makefile ../../../lib/$(TARGET)
++all: Makefile $(TARGET)
+
+-../../../lib/$(TARGET): $(OBJECTS) $(SUBLIBS) $(OBJCOMP)
+- @$(CHK_DIR_EXISTS) ../../../lib/ || $(MKDIR) ../../../lib/
+- -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
++$(TARGET): $(OBJECTS) $(SUBLIBS) $(OBJCOMP)
+ $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(OBJCOMP)
+ -ln -s $(TARGET) $(TARGET0)
+ -ln -s $(TARGET) $(TARGET1)
+ -ln -s $(TARGET) $(TARGET2)
+- -$(DEL_FILE) ../../../lib/$(TARGET)
+- -$(DEL_FILE) ../../../lib/$(TARGET0)
+- -$(DEL_FILE) ../../../lib/$(TARGET1)
+- -$(DEL_FILE) ../../../lib/$(TARGET2)
++
++install-scint: $(TARGET)
+ -$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) ../../../lib/
+
+
+@@ -1267,7 +1263,7 @@
+ -$(DEL_DIR) $(INSTALL_ROOT)/usr/share/qt4/
+
+
+-install: install_header install_trans install_qsci FORCE
++install: install-scint install_header install_trans install_qsci FORCE
+
+ uninstall: uninstall_header uninstall_trans uninstall_qsci FORCE
+
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 9a7ebff..f81c25f 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -2,8 +2,8 @@
SPELLX=qt-x11-opensource-src
case $QT_VER in
snapshot)
- VERSION=4.3.0-snapshot-20070531
-
SOURCE_HASH=sha512:08d811f8b95783518af6b4dcf8d5aead81dde13bf04799984af5b927fa2c3d963f196354e5f419b971ba75964b869f58d65c67adf72669bc5dddd12375853f31
+ VERSION=4.3.1-snapshot-20070610
+
SOURCE_HASH=sha512:567fc58bc6b5732a67eecc940e5ac920153d87be523e133fb61aab4696d04e72a914df6a3789b8bf7e79c0628ba37057bf2f9a69973d60874132b7fd5aaf7548
SOURCE=$SPELLX-$VERSION.tar.bz2
URI=qt/snapshots/$SOURCE
;;
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 2619567..4046b0d 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,6 @@
+2007-06-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: update snapshot to 4.3.1-snapshot-20070610
+
2007-06-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: update snapshot to 4.3.0-snapshot-20070531





Archive powered by MHonArc 2.6.24.

Top of Page