Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Remko van der Vossen (1d329c3b4dd6f2afcffe23e76d99a192cf4ba1f5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Remko van der Vossen (1d329c3b4dd6f2afcffe23e76d99a192cf4ba1f5)
  • Date: Sat, 5 Sep 2009 13:21:17 -0500

GIT changes to devel-xorg-modular grimoire by Remko van der Vossen
<wich AT sourcemage.org>:

ChangeLog | 13 ++++++++
archive/bacula/BUILD | 14 +++------
archive/bacula/DEPENDS | 6 +--
archive/bacula/DETAILS | 29
+++++++------------
archive/bacula/HISTORY | 6 +++
archive/bacula/PREPARE | 6 +--
archive/bacula/bacula-3.0.2.gpg |binary
archive/bacula/bacula.gpg | 0
archive/lzip/DETAILS | 2 -
archive/lzip/HISTORY | 3 +
chat-libs/libmsn/DETAILS | 7 ++--
chat-libs/libmsn/HISTORY | 4 ++
crypto/engine_pkcs11/DEPENDS | 4 ++
crypto/engine_pkcs11/DETAILS | 17 +++++++++++
crypto/engine_pkcs11/HISTORY | 4 ++
crypto/gnupg-exp/DETAILS | 2 -
crypto/gnupg-exp/HISTORY | 3 +
crypto/libp11/DEPENDS | 6 +++
crypto/libp11/DETAILS | 18 +++++++++++
crypto/libp11/HISTORY | 4 ++
crypto/opensc/DEPENDS | 4 +-
crypto/opensc/HISTORY | 3 +
crypto/pinentry/BUILD | 8 +++++
crypto/pinentry/HISTORY | 3 +
database/couchdb/DEPENDS | 5 +++
database/couchdb/DETAILS | 18 +++++++++++
database/couchdb/HISTORY | 3 +
database/mysql/DETAILS | 2 -
database/mysql/HISTORY | 3 +
dev/null |binary
display/read-edid/DEPENDS | 1
display/read-edid/DETAILS | 24 +++++++++++++++
display/read-edid/HISTORY | 3 +
editors/lyx/DETAILS | 4 +-
editors/lyx/HISTORY | 3 +
graphics/imagemagick/DETAILS | 2 -
graphics/imagemagick/HISTORY | 3 +
graphics/imagemagick/ImageMagick-6.5.5-4.tar.bz2.sig | 0
graphics/imagemagick/ImageMagick-6.5.5-6.tar.bz2.sig |binary
http/webkitgtk/DETAILS | 4 +-
http/webkitgtk/HISTORY | 3 +
http/xulrunner/DEPENDS | 3 +
http/xulrunner/HISTORY | 3 +
libs/gmp/DEPENDS | 2 +
libs/gmp/HISTORY | 3 +
libs/libcsv/BUILD | 2 +
libs/libcsv/DETAILS | 16 ++++++++++
libs/libcsv/HISTORY | 4 ++
printer/exaro/DEPENDS | 5 +--
printer/exaro/DETAILS | 10 +-----
printer/exaro/HISTORY | 4 ++
utils/iso-codes/DETAILS | 2 -
utils/iso-codes/HISTORY | 3 +
x11-toolkits/qt4/DETAILS | 4 +-
x11-toolkits/qt4/HISTORY | 13 ++++++++
x11-toolkits/qt4/POST_INSTALL | 5 +--
x11-toolkits/qt4/PRE_BUILD | 3 +
x11-toolkits/qt4/nokia.diff | 11 +++++++
58 files changed, 276 insertions(+), 61 deletions(-)

New commits:
commit 6a28bc9e5169cc33859a518d7502ca21c4dc7d8f
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

xulrunner: added missing dep python

commit f0bf56523718aeb3242f96fe30883e5af02c075d
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

gmp: added missing dep m4 (build dep)

commit b7c4e265e20fb63095acf20373460b5cb26a9914
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

mysql: Updated stable to version 5.1.38

commit d6d71b84ec02356b81d13792b52893fbb26d1ec9
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

lyx: Updated to version 1.6.4.1

commit ad1c811904079ac17a097172ca24f614f66b2f10
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

imagemagick: Updated to version 6.5.5-6

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

qt4 - fix cve-2009-2700

commit e2d58542d6b2d77d1418617cd2c89d48dc20742f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

lzip 1.8

commit 778823ced1e7d70aa587b0b790269996e9375e7a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

iso-codes 3.10.3

commit d85a856913718f87cef982eab64982b93aead5b1
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

gnupg-exp 2.0.13

commit 02bebaf058f674600b5e975d22099473b9824e37
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

webitgtk: Updated devel to version 48037

commit 7f610d754e78513480777ed6bf0ffac968756b53
Author: Bearcat M. Şandor <bearcat AT clowder.feline-soul.net>
Commit: Bearcat M. Şandor <bearcat AT clowder.feline-soul.net>

new spell: couchdb

commit 9c919f6373a21cae0cd6eba83bd36670127369c9
Author: Bearcat M. Şandor <bearcat AT clowder.feline-soul.net>
Commit: Bearcat M. Şandor <bearcat AT clowder.feline-soul.net>

couchdb: new spell

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

qt4 - fix bug #15387

commit 65d9d2163e71ddac12488b47bb26c5648242a73c
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

archive/bacula: forgot to change dependency on CVS to git

commit 9c9251c2738b496a090791198e436785e499c7e8
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

archive/bacula: cleaned up, git version corrected

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

changelog entry for crypto/engine_pkcs11:

commit 0a6d565a4c8605bdfb58b01e798120799c54308b
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

archive/bacula: updated to version 3.0.2, git for scm ; dependency on
mtx-tape made optional

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

opensc - fix depends flags

commit b9cc185df190470f324afadfc4daffe5c15accca
Author: Finn Haedicke <finn_haedicke AT gmx.net>
Commit: Finn Haedicke <finn_haedicke AT gmx.net>

display/read-edid: new spell, monitor metadata extractor

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

crypto/engine_pkcs11

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

crypto/libp11

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

libmsn: => 4.0-beta8

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

exaaara - 2.0.0 is now stable

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

pinentry - fix qt4 build

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

libs/libcsv: new spell

diff --git a/ChangeLog b/ChangeLog
index d51a716..88e11dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-09-04 Bearcat M. Sandor <sourcemage AT feline-soul.net>
+ * database/couchdb: New spell for html doc databases
+
+2009-09-04 Finn Haedicke <finn_haedicke AT gmx.net>
+ * display/read-edid: new spell; display metadata extractor
+
+2009-09-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * crypto/libp11: new spell, PKCS#11 library
+ * crypto/engine_pkcs11: new spell engine for openssl
+
+2009-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * libs/libcsv: new spell, parse csv files
+
2009-09-03 Quentin Rameau <quinq AT sourcemage.org>
* ftp/gtorrentviewer: new spell, viewer and editor for BitTorrent
files

diff --git a/archive/bacula/BUILD b/archive/bacula/BUILD
index c096cca..89c9a09 100755
--- a/archive/bacula/BUILD
+++ b/archive/bacula/BUILD
@@ -1,12 +1,8 @@
local python_ver=$(installed_version python) &&

OPTS=${OPTS//--with-python/--with-python=\/usr\/include\/python${python_ver:0:3}}
&&
OPTS=${OPTS//sqlite/sqlite3} &&
-./configure \
- --prefix=$INSTALL_ROOT/usr \
- --sysconfdir=$INSTALL_ROOT/etc/bacula \
- --localstatedir=$INSTALL_ROOT/var \
- --mandir=$INSTALL_ROOT/usr/share/man \
- --infodir=$INSTALL_ROOT/usr/share/info \
- $BACULA_CLIENT \
- $OPTS &&
-make
+OPTS="${OPTS} ${BACULA_CLIENT}" &&
+if [ "${BACULA_SCM}" == 'y' ]; then
+ cd bacula
+fi &&
+default_build
diff --git a/archive/bacula/DEPENDS b/archive/bacula/DEPENDS
index c12d567..6f0ab53 100755
--- a/archive/bacula/DEPENDS
+++ b/archive/bacula/DEPENDS
@@ -1,12 +1,12 @@
depends g++ &&

-if [[ "$BACULA_CVS" == y ]]; then
- depends "CVS"
+if [[ ${BACULA_SCM} == "y" ]]; then
+ depends git
fi &&
if [[ -z "$BACULA_CLIENT" ]]; then
- depends mtx-tape &&
depends $BACULA_BACKEND "--with-$BACULA_BACKEND=$INSTALL_ROOT/usr" &&

+ optional_depends mtx-tape '' '' 'for tape support' &&
optional_depends libgnome '--enable-gnome' '--disable-gnome' 'for GNOME
console' &&
optional_depends wxgtk '--enable-wx-console' '--disable-wx-console' 'for
wxWidgets console' &&
optional_depends gtk+2 '--enable-tray-monitor' '--disable-tray-monitor'
'for tray monitor' &&
diff --git a/archive/bacula/DETAILS b/archive/bacula/DETAILS
index f4eabfe..8ce04a2 100755
--- a/archive/bacula/DETAILS
+++ b/archive/bacula/DETAILS
@@ -1,33 +1,28 @@
-
SPELL=bacula
-
-if [ "${BACULA_CVS}" == 'y' ]
-then
-if [ "${BACULA_CVS_AUTOUPDATE}" == 'y' ]
+if [ "${BACULA_SCM}" == 'y' ]
then
+ if [ "${BACULA_SCM_AUTOUPDATE}" == 'y' ]
+ then
VERSION=$(date +%Y%m%d)
- FORCE_DOWNLOAD='on'
-else
- VERSION='cvs'
-fi
-
+ else
+ VERSION=scm
+ fi
+ FORCE_DOWNLOAD=on
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_IGNORE=volatile
-
SOURCE_URL[0]='cvs://:pserver:anonymous AT bacula.cvs.sourceforge.net:/cvsroot/bacula:bacula'
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_URL[0]=git://bacula.git.sourceforge.net/gitroot/bacula/bacula:$SPELL-$VERSION
else
- VERSION=1.38.11
+ VERSION=3.0.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
- SOURCE_GPG="${SPELL}.gpg":"${SOURCE2}":UPSTREAM_KEY
SOURCE2_IGNORE=signature
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE2_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE2_URL[0]=${SOURCE_URL}.sig
+ SOURCE_GPG=${SPELL}-${VERSION}.gpg:${SOURCE2}
fi
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.bacula.org/
ENTERED=20050419
- UPDATED=20060507
LICENSE[0]=GPL
KEYWORDS="archive"
SHORT='Network backup system'
diff --git a/archive/bacula/HISTORY b/archive/bacula/HISTORY
index be1643d..b81dcf4 100644
--- a/archive/bacula/HISTORY
+++ b/archive/bacula/HISTORY
@@ -1,3 +1,8 @@
+2009-09-04 Quentin Rameau <quinq AT sourcemage.org>
+ * DETAILS: updated to version 3.0.2, now use git instead of cvs for
scm
+ * DEPENDS: made dependency on mtx-tape optional, changed CVS to git
+ * BUILD: build directory changed for git version
+
2007-03-21 David Kowis <dkowis AT shlrm.org>
* BUILD: fixed python path, fixed sqlite include

@@ -55,3 +60,4 @@

2005-04-19 Sergey Lipnevich <sergey AT sourcemage.org>
* ALL: created spell
+
diff --git a/archive/bacula/PREPARE b/archive/bacula/PREPARE
index 51ea7fe..d2cf639 100755
--- a/archive/bacula/PREPARE
+++ b/archive/bacula/PREPARE
@@ -1,4 +1,4 @@
-config_query BACULA_CVS 'Build from CVS?' n &&
-if [ "${BACULA_CVS}" == 'y' ]; then
- config_query BACULA_CVS_AUTOUPDATE 'Update on every system update?' n
+config_query BACULA_SCM 'Build scm version ?' n &&
+if [ "${BACULA_SCM}" == 'y' ]; then
+ config_query BACULA_SCM_AUTOUPDATE 'Update on every system update?' n
fi
diff --git a/archive/bacula/bacula-3.0.2.gpg b/archive/bacula/bacula-3.0.2.gpg
new file mode 100644
index 0000000..948351b
Binary files /dev/null and b/archive/bacula/bacula-3.0.2.gpg differ
diff --git a/archive/bacula/bacula.gpg b/archive/bacula/bacula.gpg
deleted file mode 100644
index bb0d177..0000000
Binary files a/archive/bacula/bacula.gpg and /dev/null differ
diff --git a/archive/lzip/DETAILS b/archive/lzip/DETAILS
index 9fa3ad2..667f028 100755
--- a/archive/lzip/DETAILS
+++ b/archive/lzip/DETAILS
@@ -1,5 +1,5 @@
SPELL=lzip
- VERSION=1.7
+ VERSION=1.8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/archive/lzip/HISTORY b/archive/lzip/HISTORY
index c815cdd..5a6bd92 100644
--- a/archive/lzip/HISTORY
+++ b/archive/lzip/HISTORY
@@ -1,3 +1,6 @@
+2009-09-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8
+
2009-06-27 Treeve Jelbert <treeve AT sourcemage.org>
* CONFLICTS: added, for xz-utils

diff --git a/chat-libs/libmsn/DETAILS b/chat-libs/libmsn/DETAILS
index d4b5433..2f70d0b 100755
--- a/chat-libs/libmsn/DETAILS
+++ b/chat-libs/libmsn/DETAILS
@@ -1,6 +1,6 @@
SPELL=libmsn
- VERSION=4.0-beta7
-
SOURCE_HASH=sha512:8951699e2ae27480905441f2356c38c2ddfda427f6e4204a2f6ee55058bc47ad6fe99cedcf3909e59b285644f0758000657d005930d0e8a6d0d5c2f840b74c33
+ VERSION=4.0-beta8
+
SOURCE_HASH=sha512:68170742e5f51381ab823f8d601df7539353157c0871c2f57cfbc6b6f1fccd145aca0950572afd73cc660488d4b6b4a2c0261c22671c5e9bd954a0aab17fd4cd
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
@@ -10,6 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
KEYWORDS="library"
SHORT="library for connecting to MSN Messenger service"
cat << EOF
-Libmsn is a reusable, open-source, fully documented library for connecting
to Microsoft's MSN
+Libmsn is a reusable, open-source, fully documented library for connecting
+to Microsoft's MSN
Messenger service
EOF
diff --git a/chat-libs/libmsn/HISTORY b/chat-libs/libmsn/HISTORY
index 4076135..7c93487 100644
--- a/chat-libs/libmsn/HISTORY
+++ b/chat-libs/libmsn/HISTORY
@@ -1,3 +1,7 @@
+2009-09-03 Bor Kraljic <pyrobor AT ver.si>
+ * DETAILS: updated spell to 4.0-beta8
+ fixed long description wrap
+
2009-08-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0-beta7

diff --git a/crypto/engine_pkcs11/DEPENDS b/crypto/engine_pkcs11/DEPENDS
new file mode 100755
index 0000000..7dc6dad
--- /dev/null
+++ b/crypto/engine_pkcs11/DEPENDS
@@ -0,0 +1,4 @@
+depends openssl &&
+depends libp11 &&
+depends libtool &&
+depends pkgconfig
diff --git a/crypto/engine_pkcs11/DETAILS b/crypto/engine_pkcs11/DETAILS
new file mode 100755
index 0000000..11b8660
--- /dev/null
+++ b/crypto/engine_pkcs11/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=engine_pkcs11
+ VERSION=0.1.6
+
SOURCE_HASH=sha512:3df761147093dc3b53511ff0ea3b267d08ee24cfe9411fc6338834584c86b52e9a072f63d4aa0a80599164d0b8b824cce6938a16552dbb4b7aa44b73adc05bfb
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://www.opensc-project.org/files/$SPELL/$SOURCE
+ WEB_SITE=http://www.opensc-project.org/$SPELL
+ LICENSE[0]=BSD
+ ENTERED=20090904
+ KEYWORDS="crypto"
+ SHORT="an implementation of an engine for OpenSS"
+cat << EOF
+Engine_pkcs11 is an implementation of an engine for OpenSSL. It can be
loaded using code, config file or
+command line and will pass any function call by openssl to a PKCS#11 module.
Engine_pkcs11 is meant to be used
+with smart cards and software for using smart cards in PKCS#11 format, such
as OpenSC. Originaly this engine
+was a part of OpenSC, until OpenSC was split into several small projects for
improved flexibility.
+EOF
diff --git a/crypto/engine_pkcs11/HISTORY b/crypto/engine_pkcs11/HISTORY
new file mode 100644
index 0000000..839152f
--- /dev/null
+++ b/crypto/engine_pkcs11/HISTORY
@@ -0,0 +1,4 @@
+2009-09-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1.6
+ spell created
+
diff --git a/crypto/gnupg-exp/DETAILS b/crypto/gnupg-exp/DETAILS
index 7e3d987..682478d 100755
--- a/crypto/gnupg-exp/DETAILS
+++ b/crypto/gnupg-exp/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnupg-exp
- VERSION=2.0.12
+ VERSION=2.0.13
SECURITY_PATCH=5
PATCHLEVEL=0

diff --git a/crypto/gnupg-exp/HISTORY b/crypto/gnupg-exp/HISTORY
index ff1b9e5..7f09044 100644
--- a/crypto/gnupg-exp/HISTORY
+++ b/crypto/gnupg-exp/HISTORY
@@ -1,3 +1,6 @@
+2009-09-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.0.13
+
2009-06-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.12

diff --git a/crypto/libp11/DEPENDS b/crypto/libp11/DEPENDS
new file mode 100755
index 0000000..d1ba3ea
--- /dev/null
+++ b/crypto/libp11/DEPENDS
@@ -0,0 +1,6 @@
+depends openssl &&
+depends libtool &&
+depends libxslt &&
+depends pkgconfig &&
+optional_depends "doxygen" "" "" "build API docs"
+
diff --git a/crypto/libp11/DETAILS b/crypto/libp11/DETAILS
new file mode 100755
index 0000000..7d4a75b
--- /dev/null
+++ b/crypto/libp11/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=libp11
+ VERSION=0.2.6
+
SOURCE_HASH=sha512:9d1fec7f8a6ff1ce23f55340dec135dd29b44dd929b5a80a00e18b9211a65030ef34488f823eba7eea1c571f66087a208db607d41caef34947142658a53afc7c
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://www.opensc-project.org/files/$SPELL/$SOURCE
+ WEB_SITE=http://www.opensc-project.org/$SPELL
+ LICENSE[0]=LGPL
+ ENTERED=20090904
+ KEYWORDS="crypto"
+ SHORT="small layer on top of PKCS#11 API"
+cat << EOF
+Libp11 is a library implementing a small layer on top of PKCS#11 API to make
using PKCS#11 implementations easier.
+ The official name for PKCS#11 is "RSA Security Inc. PKCS #11 Cryptographic
Token Interface (Cryptoki)".
+ The official header files for PKCS #11 Standard are under a non-free
license. Libp11 does not include these
+header files, but instead uses a rewritten pkcs11.h header file from scute
project, which is licensed as open
+source software.
+EOF
diff --git a/crypto/libp11/HISTORY b/crypto/libp11/HISTORY
new file mode 100644
index 0000000..35eb714
--- /dev/null
+++ b/crypto/libp11/HISTORY
@@ -0,0 +1,4 @@
+2009-09-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.2.5
+ spell created
+
diff --git a/crypto/opensc/DEPENDS b/crypto/opensc/DEPENDS
index 2f839f7..14b953c 100755
--- a/crypto/opensc/DEPENDS
+++ b/crypto/opensc/DEPENDS
@@ -11,12 +11,12 @@ optional_depends libassuan \
"Enable libassuan support?" &&

optional_depends pcsc-lite \
- "" \
+ "--enable-pcsc" \
"" \
"Enable PCSC-Lite support?" &&

optional_depends openct \
- "" \
+ "--enable-openct" \
"" \
"Enable OpenCT support?"

diff --git a/crypto/opensc/HISTORY b/crypto/opensc/HISTORY
index 92fba48..1e8b31c 100644
--- a/crypto/opensc/HISTORY
+++ b/crypto/opensc/HISTORY
@@ -1,3 +1,6 @@
+2009-09-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add some specific flags
+
2009-07-29 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.11.9

diff --git a/crypto/pinentry/BUILD b/crypto/pinentry/BUILD
index cde8c41..c8bdb94 100755
--- a/crypto/pinentry/BUILD
+++ b/crypto/pinentry/BUILD
@@ -1,2 +1,10 @@
+# fix bad moc files
+if is_depends_enabled $SPELL qt4;then
+ MOC=/usr/bin/qt4/moc &&
+ cd qt4 &&
+ $MOC pinentrydialog.h > pinentrydialog.moc &&
+ $MOC qsecurelineedit.h > qsecurelineedit.moc &&
+ cd ..
+fi &&
OPTS="$OPTS $PINENTRY_CURSES" &&
default_build
diff --git a/crypto/pinentry/HISTORY b/crypto/pinentry/HISTORY
index c4eaa22..a143d80 100644
--- a/crypto/pinentry/HISTORY
+++ b/crypto/pinentry/HISTORY
@@ -1,3 +1,6 @@
+2009-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: fix bad moc files for qt4
+
2009-06-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.7.6
* DEPENDS: added optional_depends qt4
diff --git a/database/couchdb/DEPENDS b/database/couchdb/DEPENDS
new file mode 100755
index 0000000..dda692f
--- /dev/null
+++ b/database/couchdb/DEPENDS
@@ -0,0 +1,5 @@
+depends erlang &&
+depends icu &&
+depends openssl &&
+depends spidermonkey &&
+depends curl
diff --git a/database/couchdb/DETAILS b/database/couchdb/DETAILS
new file mode 100755
index 0000000..7ce2ea7
--- /dev/null
+++ b/database/couchdb/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=couchdb
+ VERSION=0.9.1
+ SOURCE="apache-${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://mirror.nyi.net/apache/${SPELL}/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:160c0346483d9c33cc4141e7ec03ef836c6b8a546e7e993f4911ea25ba86c4c6bd90ca35b26e46f7a999fee49dc95a6e8ef63543b5747f34f4abc8691e38ce7f
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/apache-${SPELL}-${VERSION}"
+ WEB_SITE="couchdb.apache.org"
+ LICENSE[0]=apache
+ ENTERED=20090904
+ SHORT="A http document server"
+cat << EOF
+CouchDB is
+ * A document database server, accessible via a RESTful JSON API.
+ * Ad-hoc and schema-free with a flat address space. * Distributed,
+ featuring robust, incremental replication with bi-directional conflict
+ detection and management. * Query-able and index-able, featuring a
+ table oriented reporting engine that uses Javascript as a query language.
+EOF
diff --git a/database/couchdb/HISTORY b/database/couchdb/HISTORY
new file mode 100644
index 0000000..5d2ecf8
--- /dev/null
+++ b/database/couchdb/HISTORY
@@ -0,0 +1,3 @@
+2009-09-04 Bearcat M. Sandor <sourcemage AT feline-soul.com>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/database/mysql/DETAILS b/database/mysql/DETAILS
index ab85443..e542280 100755
--- a/database/mysql/DETAILS
+++ b/database/mysql/DETAILS
@@ -3,7 +3,7 @@ if [[ $OLD == y ]]; then
VERSION=5.0.85
SECURITY_PATCH=3
else
- VERSION=5.1.37
+ VERSION=5.1.38
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index c79407a..a96f554 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,6 @@
+2009-09-05 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated stable to 5.1.38
+
2009-08-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.0.85 [old]

diff --git a/display/read-edid/DEPENDS b/display/read-edid/DEPENDS
new file mode 100755
index 0000000..b436583
--- /dev/null
+++ b/display/read-edid/DEPENDS
@@ -0,0 +1 @@
+depends libx86
diff --git a/display/read-edid/DETAILS b/display/read-edid/DETAILS
new file mode 100755
index 0000000..c181cc9
--- /dev/null
+++ b/display/read-edid/DETAILS
@@ -0,0 +1,24 @@
+ SPELL=read-edid
+ VERSION=2.0.0
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://www.polypux.org/projects/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:3503a9cff0009c407ca3fded9209f08e7f24755b0499c136a41e59a3479141ceef9f94c30a8b6125db1fdca6a47f62a74fd27101ccadaa7c9af337de310cd29f
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.polypux.org/projects/read-edid/";
+ LICENSE[0]=GPL
+ ENTERED=20090904
+ SHORT="monitor EDID extractor tool"
+cat << EOF
+read-edid is a pair of tools (originally by John Fremlin) for reading the
EDID
+from a monitor. It should work with most monitors made since 1996 (except for
+newer ones with 256-byte EDID's - WiP), assuming the video card supports the
+standard read commands (most do).read-edid is a set of two tools - get-edid,
+which gets the raw edid information from the monitor, and parse-edid, which
+turns the raw binary information into an XF86Config-compatible monitor
section.
+
+As of read-edid version 2.0.0, the lrmi code has been replaced by libx86 code
+- same syntax, but allows for use on many more architectures. For powerpc,
+there is a /proc interface, /proc/device-tree/pci/{video-card}/EDID, which
+you can pipe to parse-edid. Some architectures, AFAIK, may be stuck with
+only parse-edid.
+EOF
diff --git a/display/read-edid/HISTORY b/display/read-edid/HISTORY
new file mode 100644
index 0000000..cf38ba2
--- /dev/null
+++ b/display/read-edid/HISTORY
@@ -0,0 +1,3 @@
+2009-09-04 Finn Haedicke <finn_haedicke AT gmx.net>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/editors/lyx/DETAILS b/editors/lyx/DETAILS
index 256e75f..faf9638 100755
--- a/editors/lyx/DETAILS
+++ b/editors/lyx/DETAILS
@@ -1,11 +1,11 @@
SPELL=lyx
- VERSION=1.6.4
+ VERSION=1.6.4.1
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/$SOURCE
SOURCE_URL[1]=ftp://ftp.lip6.fr/pub/lyx/stable/1.6.x/$SOURCE

SOURCE_URL[2]=ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/1.6.x/${SOURCE}
-
SOURCE_HASH=sha512:7c18accce4805d26ecc046112c68f8f2d55ef5f064672b2a372ae62af4bcd6941413687406ae66fa6ced55b6666d0403d58fddd0cc4f427690999cf28145a034
+
SOURCE_HASH=sha512:c460a8385bf4b17ea402fd64cd905f589ab4d5c16c89682655959baedb839e18939cea36599fd3d939aa18d2a5dbadae652e45da6aba24cdc95a142689e07cdd
WEB_SITE=http://www.lyx.org/
LICENSE[0]=GPL
ENTERED=20020330
diff --git a/editors/lyx/HISTORY b/editors/lyx/HISTORY
index d9ab2b4..a2112d3 100644
--- a/editors/lyx/HISTORY
+++ b/editors/lyx/HISTORY
@@ -1,3 +1,6 @@
+2009-09-05 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.6.4.1
+
2009-08-25 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 1.6.4
Updated SOURCE_URL's
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 78d65cf..1fff2d6 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.5.5-4
+ VERSION=6.5.5-6
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 72bc268..dcb2ded 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2009-09-05 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 6.5.5-6
+
2009-08-30 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 6.5.5-4

diff --git a/graphics/imagemagick/ImageMagick-6.5.5-4.tar.bz2.sig
b/graphics/imagemagick/ImageMagick-6.5.5-4.tar.bz2.sig
deleted file mode 100644
index 1afc368..0000000
Binary files a/graphics/imagemagick/ImageMagick-6.5.5-4.tar.bz2.sig and
/dev/null differ
diff --git a/graphics/imagemagick/ImageMagick-6.5.5-6.tar.bz2.sig
b/graphics/imagemagick/ImageMagick-6.5.5-6.tar.bz2.sig
new file mode 100644
index 0000000..0b23ba2
Binary files /dev/null and
b/graphics/imagemagick/ImageMagick-6.5.5-6.tar.bz2.sig differ
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index ca55a79..c34e0bb 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,9 +1,9 @@
SPELL=webkitgtk
if [[ $WEBKITGTK_NIGHT == "y" ]]; then
- VERSION=r47011
+ VERSION=r48037
SOURCE=WebKit-$VERSION.tar.bz2
SOURCE_URL[0]=http://nightly.webkit.org/files/trunk/src/$SOURCE
-
SOURCE_HASH=sha512:9ee7cef0e7ecb53f595159d7d12bbb2ade60ce6554d06f7835d4a40f0d7fe070833b9c7d4ec5b4f832bc299e4645bbd12b669b6f33345306edff7177bda9e735
+
SOURCE_HASH=sha512:35674e51c1ad477d8449355c3abace6600614d4121e20738a9486124ff8123d38f41ffcc5ccbd3c66cae3e0ff182dadf72a69431747f99138b9e1e97806dbbbc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/WebKit-$VERSION"
else
VERSION=1.1.13
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 35cbd5a..18634e2 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2009-09-04 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated devel to r48037
+
2009-08-24 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated stable to 1.1.13

diff --git a/http/xulrunner/DEPENDS b/http/xulrunner/DEPENDS
index d3a2512..abee08e 100755
--- a/http/xulrunner/DEPENDS
+++ b/http/xulrunner/DEPENDS
@@ -3,11 +3,12 @@ depends cairo &&
depends jpeg &&
depends libidl &&
depends libxft &&
-depends -sub APNG libpng &&
+depends -sub APNG libpng &&
depends sqlite &&
depends nspr &&
depends -sub "3.12.x" nss &&
depends perl &&
+depends python &&
depends xorg-libs '--with-x' &&
depends zip &&
depends zlib &&
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index 8fff52f..30087e3 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,6 @@
+2009-09-05 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: Added dependency on python
+
2009-08-03 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 1.9.1.2. SECURITY_PATCH++

diff --git a/libs/gmp/DEPENDS b/libs/gmp/DEPENDS
index b518752..599d7e5 100755
--- a/libs/gmp/DEPENDS
+++ b/libs/gmp/DEPENDS
@@ -1,3 +1,5 @@
+depends m4
+
# only allow dependency on g++ if g++ is installed, otherwise a cycle is
created
if spell_ok g++; then
optional_depends g++ \
diff --git a/libs/gmp/HISTORY b/libs/gmp/HISTORY
index 71baf1c..411cbd4 100644
--- a/libs/gmp/HISTORY
+++ b/libs/gmp/HISTORY
@@ -1,3 +1,6 @@
+2009-09-05 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: gmp requires m4 to build
+
2009-05-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.3.1

diff --git a/libs/libcsv/BUILD b/libs/libcsv/BUILD
new file mode 100755
index 0000000..4a4d108
--- /dev/null
+++ b/libs/libcsv/BUILD
@@ -0,0 +1,2 @@
+make CC="gcc $CFLAGS"
+
diff --git a/libs/libcsv/DETAILS b/libs/libcsv/DETAILS
new file mode 100755
index 0000000..1c08ac7
--- /dev/null
+++ b/libs/libcsv/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=libcsv
+ VERSION=3.0.0
+
SOURCE_HASH=sha512:e7fe9cc4eca0e8030e94f31f48efc62a2780f0a05f851129532c68253a501fdfd4ed4e09d522d694e32cc2bd4aa290a2d8088b5e4327bdef64fafbb22d41426f
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ WEB_SITE=http://$SPELL.SourceForge.net
+ LICENSE[0]=LGPL
+ ENTERED=20090721
+ KEYWORDS="libs"
+ SHORT="small, simple and fast CSV library"
+cat << EOF
+libcsv is a small, simple and fast CSV library written in pure ANSI C89 that
can read and write CSV
+data. It provides a straight-forward interface using callback functions to
handle parsed fields and
+rows and can parse improperly formatted CSV files.
+EOF
diff --git a/libs/libcsv/HISTORY b/libs/libcsv/HISTORY
new file mode 100644
index 0000000..3866326
--- /dev/null
+++ b/libs/libcsv/HISTORY
@@ -0,0 +1,4 @@
+2009-07-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.0
+ spell created
+
diff --git a/printer/exaro/DEPENDS b/printer/exaro/DEPENDS
index bfd68d0..bbdd5a0 100755
--- a/printer/exaro/DEPENDS
+++ b/printer/exaro/DEPENDS
@@ -2,9 +2,8 @@ depends g++ &&
depends qt4 &&
depends zint &&
depends shared-mime-info &&
-if [[ $EX_VER == y ]];then
- depends xz-utils
-fi &&
+depends cmake &&
+depends xz-utils &&
optional_depends quazip '' '' 'ods export' &&
optional_depends propertyeditor '' '' 'build eXaro designer'

diff --git a/printer/exaro/DETAILS b/printer/exaro/DETAILS
index 8a2507f..9f21f69 100755
--- a/printer/exaro/DETAILS
+++ b/printer/exaro/DETAILS
@@ -1,15 +1,11 @@
SPELL=exaro
-if [[ $EX_VER == y ]];then
+#if [[ $EX_VER == y ]];then
VERSION=2.0.0

SOURCE_HASH=sha512:80237eaef6c69857e57094f052907b007b55857ecfc348881ab4a5ee319e8eaccc44c2a257f3b87fe430f0892bd47ab6ad3bd3a4e65b06c8bcbadea82025a9ff
SX=${SPELL}_${VERSION}
SOURCE=$SX.tar.lzma
-else
- VERSION=1.0.1
-
SOURCE_HASH=sha512:1af540db653712bf5ea634bae3630cdbec387e09edeb6003680143c28051801c2101a59548d3be5666fc354fa28563cc6d3a793d6e4ff953fe1fe3cf3a3243ab
- SX=$SPELL-$VERSION
- SOURCE=$SX.tar.bz2
-fi
+#else
+#fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SX
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://$SPELL.SourceForge.net
diff --git a/printer/exaro/HISTORY b/printer/exaro/HISTORY
index bf84099..e5d9945 100644
--- a/printer/exaro/HISTORY
+++ b/printer/exaro/HISTORY
@@ -1,3 +1,7 @@
+2009-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS, DEPENDS: treat 2.0.0 as stable
+ * DEPENDS: add cmake
+
2009-08-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.0 (devel)

diff --git a/utils/iso-codes/DETAILS b/utils/iso-codes/DETAILS
index 4ec85de..7908fba 100755
--- a/utils/iso-codes/DETAILS
+++ b/utils/iso-codes/DETAILS
@@ -1,5 +1,5 @@
SPELL=iso-codes
- VERSION=3.10.2
+ VERSION=3.10.3
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=${SOURCE}.sig
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/utils/iso-codes/HISTORY b/utils/iso-codes/HISTORY
index cbf39f3..27bb525 100644
--- a/utils/iso-codes/HISTORY
+++ b/utils/iso-codes/HISTORY
@@ -1,3 +1,6 @@
+2009-09-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.10.3
+
2009-08-13 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.10.2

diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index e10b49d..adf1f98 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -19,11 +19,11 @@ persistent_remove QT_VER
# ;;
# *) #stable
VERSION=4.5.2
- PATCHLEVEL=1
+ PATCHLEVEL=2

SOURCE_HASH=sha512:385f4a30959a67864f05e6192fbd05755a12319dfbf30507d8757b9cf515cb70eba063e0eb356c583bbd90538434c41ab08336daf10b3ce43016b85f1e462735
SOURCE=$SPELLX-$VERSION.tar.bz2
URI=qt/source/$SOURCE
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
#esac
SOURCE_URL[0]=http://download.qtsoftware.com/$URI
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 164e56a..4dcd082 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,16 @@
+2009-09-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: apply nokia patch
+ * nodia.diff: added, upstream security patch
+
<http://qt.nokia.com/about/news/qt-patches-released-addressing-potential-security-flaw>
+ cve-2009-2700
+ fixes bug #15388
+
+2009-09-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * POST_INSTALL: fix bad pkgconfig files
+ * DETAILS: PATCHLEVEL=2
+ fixes bug #15296, 15387
+
2009-07-16 Treeve Jelbert <treeve AT sourcemage.org>
* POST_INSTALL: added, fix bad pkgconfig files
* DETAILS: PATCHLEVEL=1
diff --git a/x11-toolkits/qt4/POST_INSTALL b/x11-toolkits/qt4/POST_INSTALL
index 5248462..396ba0a 100755
--- a/x11-toolkits/qt4/POST_INSTALL
+++ b/x11-toolkits/qt4/POST_INSTALL
@@ -1,2 +1,3 @@
-sed -i "/location/s|/src/qt-x11-opensource-src-${VERSION}/bin|/bin/qt4|" \
- ${INSTALL_ROOT}/usr/lib/pkgconfig/Qt*.pc
+for FF in `ls ${TRACK_ROOT}/usr/lib/pkgconfig/Qt*.pc`;do
+ sed -i "/location/s|/src/$SPELLX-${VERSION}/bin|/bin/qt4|" $FF
+done
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 27d53a0..58941c6 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,6 +1,9 @@
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
new file mode 100644
index 0000000..5d365b3
--- /dev/null
+++ b/x11-toolkits/qt4/nokia.diff
@@ -0,0 +1,11 @@
+--- 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 devel-xorg-modular grimoire by Remko van der Vossen (1d329c3b4dd6f2afcffe23e76d99a192cf4ba1f5), Remko van der Vossen, 09/05/2009

Archive powered by MHonArc 2.6.24.

Top of Page