Skip to Content.
Sympa Menu

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

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 (15c220892f8bffa543070baca29e2086b8b358a6)
  • Date: Thu, 1 Oct 2009 10:33:54 -0500

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

devel/qt4pas/HISTORY | 3 +++
devel/qt4pas/PREPARE | 12 ------------
kde4/kdebase4-runtime/DEPENDS | 1 +
kde4/kdebase4-runtime/HISTORY | 3 +++
kde4/kdewebdev4/DEPENDS | 6 ++++--
kde4/kdewebdev4/HISTORY | 4 ++++
video/dvgrab/DETAILS | 4 ++--
video/dvgrab/HISTORY | 4 ++++
video/dvgrab/PRE_BUILD | 3 ---
video/dvgrab/gcc44.patch | 20 --------------------
x11-toolkits/qt4/DETAILS | 29 +++++------------------------
x11-toolkits/qt4/HISTORY | 7 +++++++
x11-toolkits/qt4/PRE_BUILD | 3 ---
x11-toolkits/qt4/nokia.diff | 11 -----------
14 files changed, 33 insertions(+), 77 deletions(-)

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

qt4: => 4.5.3

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

qt4pas- delete obsolete file

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

kdebase4-runtime - add optional depends libssh

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

kdewebdev4 - extra depends

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

dvgrab: => 3.5

diff --git a/devel/qt4pas/HISTORY b/devel/qt4pas/HISTORY
index f04772b..8b7e588 100644
--- a/devel/qt4pas/HISTORY
+++ b/devel/qt4pas/HISTORY
@@ -1,3 +1,6 @@
+2009-10-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * PREPARE: delete obsolete file
+
2009-09-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version V1.72 (qt45)

diff --git a/devel/qt4pas/PREPARE b/devel/qt4pas/PREPARE
deleted file mode 100755
index 0ea75b7..0000000
--- a/devel/qt4pas/PREPARE
+++ /dev/null
@@ -1,12 +0,0 @@
-config_query QT44 "support QT-4.4.x ?" n
-local CFG &&
-CFG=fpc.cfg &&
-if ([ ! -e /etc/$CFG ] && [ ! -e ~/.fpc.cfg ] ) ;then
-cat << EOF
-${PROBLEM_COLOR} please create a $CFG file. ${MESSAGE_COLOR}
-Try:
-FPCPATH=/usr/lib/fpc/$VERSION &&
-fpcmkcfg > /etc/fpc.cfg ${DEFAULT_COLOR}
-EOF
- return 1
-fi
diff --git a/kde4/kdebase4-runtime/DEPENDS b/kde4/kdebase4-runtime/DEPENDS
index 5c23ce1..44b3ab5 100755
--- a/kde4/kdebase4-runtime/DEPENDS
+++ b/kde4/kdebase4-runtime/DEPENDS
@@ -17,6 +17,7 @@ depends xine-lib &&
if [[ "${KDE_VER}" == "stable" ]];then
depends kdelibs4-experimental
fi &&
+optional_depends libssh '' '' 'build kio_sftp slave' &&
optional_depends pulseaudio '' '' 'Pulseaudio server support' &&
optional_depends openexr '' '' 'EXR support for thumbnails' &&
optional_depends openslp '' '' 'Service Location Protocol' &&
diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY
index dae0985..de835b9 100644
--- a/kde4/kdebase4-runtime/HISTORY
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -1,3 +1,6 @@
+2009-10-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add optional libssh
+
2009-09-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.69svn1027298 (unstable)

diff --git a/kde4/kdewebdev4/DEPENDS b/kde4/kdewebdev4/DEPENDS
index dcf7620..67f5750 100755
--- a/kde4/kdewebdev4/DEPENDS
+++ b/kde4/kdewebdev4/DEPENDS
@@ -1,4 +1,6 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
depends boost &&
-optional_depends kdesdk4 '' '' 'Cervisia (CVS) and Kompare (diff) support'
-
+depends kdepimlibs4 &&
+optional_depends kdevplatform4 '' '' 'build quanta' &&
+optional_depends ruby '' '' 'scripting support'
+#optional_depends libtidy '' '' 'ability to tidy HTML'
diff --git a/kde4/kdewebdev4/HISTORY b/kde4/kdewebdev4/HISTORY
index 0fd80e6..2b37f50 100644
--- a/kde4/kdewebdev4/HISTORY
+++ b/kde4/kdewebdev4/HISTORY
@@ -1,3 +1,7 @@
+2009-09-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add kdevplatform4, kdepimlibs4
+ remove kdesdk4
+
2009-09-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.69svn1027298 (unstable)

diff --git a/video/dvgrab/DETAILS b/video/dvgrab/DETAILS
index 676db79..76ef4bc 100755
--- a/video/dvgrab/DETAILS
+++ b/video/dvgrab/DETAILS
@@ -1,6 +1,6 @@
SPELL=dvgrab
- VERSION=3.4
-
SOURCE_HASH=sha512:7188ae771d3b0ea5059e76bbeaba19d7d293914ba3f387e5c4c15dea9e7772fab436fdc3be1fd92d0f01352d36befc7d725029d6f19a816fd91b710074a02294
+ VERSION=3.5
+
SOURCE_HASH=sha512:7d9cae1661d27dbef1d0dcdf18966a0ab386d936803ff7d071a18e0303fca45631c9b27187a413adfa4391c395e5909e3b8dc5c543d529e7805550f1a3ee6735
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/kino/$SOURCE
diff --git a/video/dvgrab/HISTORY b/video/dvgrab/HISTORY
index 637e660..2ef3bc9 100644
--- a/video/dvgrab/HISTORY
+++ b/video/dvgrab/HISTORY
@@ -1,3 +1,7 @@
+2009-09-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: VERSION 3.5
+ * PRE_BUILD, gcc44.patch: deleted
+
2009-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* TRIGGERS: added

diff --git a/video/dvgrab/PRE_BUILD b/video/dvgrab/PRE_BUILD
deleted file mode 100755
index 05e0b12..0000000
--- a/video/dvgrab/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/gcc44.patch
diff --git a/video/dvgrab/gcc44.patch b/video/dvgrab/gcc44.patch
deleted file mode 100644
index 0b52bb1..0000000
--- a/video/dvgrab/gcc44.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- error.cc 2007/07/06 19:08:17 1.7
-+++ error.cc 2009/04/11 04:11:24 1.8
-@@ -32,6 +32,7 @@
- #include <iostream>
- #include <sstream>
- #include <iomanip>
-+#include <cstdio>
-
- using std::ostringstream;
- using std::string;
---- smiltime.cc 2008/11/26 03:49:43 1.7
-+++ smiltime.cc 2009/04/11 04:11:24 1.8
-@@ -27,6 +27,7 @@
- #include <iostream>
- #include <iomanip>
- #include <sstream>
-+#include <cstdio>
-
- #include <stdlib.h>
- #include <math.h>
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 4210cde..fe3a6a7 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -4,33 +4,14 @@ if [[ $QT_TMPFS == n ]]; then
TMPFS=off
fi
SPELLX=qt-x11-opensource-src
-#case $QT_VER in
-# snapshot)
-# VERSION=4.5.0-snapshot-$(date +%Y%m%d)
-# SOURCE_IGNORE=volatile
-# SOURCE=$SPELLX-$VERSION.tar.gz
-# URI=qt/snapshots/$SOURCE
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
-# ;;
-# prerelease)
-# VERSION=
-# SOURCE_HASH=sha512:
-# SOURCE=${SPELLX}-$VERSION.tar.gz
-# URI=qt/source/$SOURCE
-# SECURITY_PATCH=2
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-$VERSION
-# ;;
-# *) #stable
- VERSION=4.5.2
- PATCHLEVEL=2
-
SOURCE_HASH=sha512:385f4a30959a67864f05e6192fbd05755a12319dfbf30507d8757b9cf515cb70eba063e0eb356c583bbd90538434c41ab08336daf10b3ce43016b85f1e462735
- SOURCE=$SPELLX-$VERSION.tar.bz2
+ VERSION=4.5.3
+
SOURCE_HASH=sha512:aa1051f3a5cab0ffe225eb03cd50b8bf34bcc28f89dd4bda6b80c9769395dbaec31b8d3b365e1a8aa0407be5e4cdd51c788706daebdfab8420e8f2853d8226a2
+ SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
SECURITY_PATCH=3
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
-#esac
- SOURCE_URL[0]=http://download.qtsoftware.com/$URI
- WEB_SITE=http://www.qtsoftware.com//products
+ SOURCE_URL[0]=http://download.qt.nokia.com/$URI
+ WEB_SITE=http://www.qtsoftware.com/products
ENTERED=20020410
LICENSE[0]=LGPL
DOCS="FAQ README README-QT.TXT"
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 1490a88..6964cde 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,10 @@
+2009-10-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.5.3
+ new url
+ cleanup
+ * PRE_BUILD: don't apply nokia patch
+ * nokia.diff: deleted
+
2009-09-22 Peng Chang (Charles) <chp AT sourcemage.org>
* DETAILS: optionally turn TMPFS=off, 1GB RAM is insufficient
* PREPARE: if RAM < 1GB auto disable tmpfs, else query whether to
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 58941c6..27d53a0 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,9 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-# upstream patch
-patch -p0 < $SPELL_DIRECTORY/nokia.diff &&
-
# add better optimisation flags
sed -i "s|-O2||" mkspecs/common/g++.conf \
mkspecs/linux-cxx/qmake.conf &&
diff --git a/x11-toolkits/qt4/nokia.diff b/x11-toolkits/qt4/nokia.diff
deleted file mode 100644
index 5d365b3..0000000
--- a/x11-toolkits/qt4/nokia.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/network/ssl/qsslcertificate.cpp 2009-09-05 11:24:45.000000000
+0200
-+++ src/network/ssl/qsslcertificate.cpp.cp 2009-09-05 11:54:28.000000000
+0200
-@@ -377,7 +377,7 @@
- }
-
- const char *altNameStr = reinterpret_cast<const char
*>(q_ASN1_STRING_data(genName->d.ia5));
-- const QString altName = QLatin1String(QByteArray(altNameStr,
len));
-+ const QString altName = QString::fromLatin1(altNameStr, len);
- if (genName->type == GEN_DNS)
- result.insert(QSsl::DnsEntry, altName);
- else if (genName->type == GEN_EMAIL)



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (15c220892f8bffa543070baca29e2086b8b358a6), Treeve Jelbert, 10/01/2009

Archive powered by MHonArc 2.6.24.

Top of Page