Thu May 5 19:03:27 UTC 2011

4 files changed, 0 insertions, 291 deletions

diff --git a/extra/blender/blender.desktop b/extra/blender/blender.desktop
deleted file mode 100644
index 71893dc4a..000000000
--- a/extra/blender/blender.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Blender
-Name[da]=Blender
-Name[nl]=Blender
-Name[no]=Blender
-Name[de]=Blender
-Name[es]=Blender
-Comment=A 3D program
-Comment[es]=Un programa de 3D
-Comment[no]=Et 3d-program
-Comment[da]=Et program til 3d-modelering
-Exec=blender
-Icon=blender
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Categories=Application;Graphics;3DGraphics;
-MimeType=application/blender;application/x-blender;
diff --git a/extra/blender/blender.svg b/extra/blender/blender.svg
deleted file mode 100644
index ab61cc362..000000000
--- a/extra/blender/blender.svg
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   id="svg1573"
-   sodipodi:version="0.32"
-   inkscape:version="0.39"
-   width="100.00000pt"
-   height="100.00000pt"
-   sodipodi:docbase="/home/build/abs/extra/multimedia/blender"
-   sodipodi:docname="blender.svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:xlink="http://www.w3.org/1999/xlink">
-  <defs
-     id="defs1575">
-    <linearGradient
-       id="linearGradient1792">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.42937854;"
-         offset="0.0000000"
-         id="stop1793" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.12429378;"
-         offset="0.63222224"
-         id="stop1795" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop1794" />
-    </linearGradient>
-    <radialGradient
-       xlink:href="#linearGradient1792"
-       id="radialGradient1950"
-       cx="0.50000000"
-       cy="0.50000000"
-       r="0.50000000"
-       fx="0.67944252"
-       fy="0.19298245" />
-    <linearGradient
-       id="linearGradient1606">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.62745100;"
-         offset="0.0000000"
-         id="stop1607" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop1608" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9999998"
-     inkscape:cx="50.134523"
-     inkscape:cy="35.997949"
-     inkscape:window-width="1272"
-     inkscape:window-height="1002"
-     showgrid="true"
-     snaptogrid="false"
-     gridspacingy="10.000000pt"
-     gridspacingx="10.000000pt"
-     gridoriginy="0.0000000pt"
-     gridoriginx="0.0000000pt"
-     gridtolerance="2.0000000px"
-     inkscape:grid-bbox="true"
-     inkscape:grid-points="true"
-     inkscape:window-x="1282"
-     inkscape:window-y="0" />
-  <metadata
-     id="metadata1576">
-    <rdf:RDF
-       id="RDF1577">
-      <cc:Work
-         rdf:about=""
-         id="Work1578">
-        <dc:description
-           id="description1579">Created with Inkscape
-http://www.inkscape.org/</dc:description>
-        <dc:format
-           id="format1581">image/svg+xml</dc:format>
-        <dc:type
-           id="type1583"
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title
-           id="title1606">ML-Term Icon</dc:title>
-        <dc:date
-           id="date1608">2004-07-14</dc:date>
-        <dc:creator
-           id="creator1610">
-          <cc:Agent
-             id="Agent1611">
-            <dc:title
-               id="title1612">Tobias Kieslich</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:coverage
-           id="coverage1614" />
-        <cc:license
-           id="license1616"
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/"
-         id="License1624">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction"
-           id="permits1625" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution"
-           id="permits1626" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice"
-           id="requires1627" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks"
-           id="permits1628" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike"
-           id="requires1629" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode"
-           id="requires1630" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <path
-     sodipodi:type="arc"
-     style="fill:url(#radialGradient1950);fill-opacity:0.75000000;fill-rule:evenodd;stroke-width:1.0000000pt;"
-     id="path1827"
-     sodipodi:cx="29.010935"
-     sodipodi:cy="58.727592"
-     sodipodi:rx="23.157850"
-     sodipodi:ry="23.157850"
-     d="M 52.168785 58.727592 A 23.157850 23.157850 0 1 0 5.8530846,58.727592 A 23.157850 23.157850 0 1 0 52.168785 58.727592 z"
-     transform="matrix(2.556262,0.000000,0.000000,0.770827,-8.357083,60.08188)" />
-  <g
-     id="g1084"
-     transform="matrix(4.277757,0.000000,0.000000,4.277757,-244.4442,-256.4384)">
-    <path
-       style="fill:#e79100;fill-rule:evenodd;stroke:#000000;stroke-width:2.5581360;"
-       d="M 70.183754,64.486103 C 70.970246,65.122765 71.746941,65.771669 72.540115,66.399985 C 69.453580,66.550314 66.336707,66.536916 63.267234,66.751339 C 61.553800,66.933280 62.119503,69.750024 63.656883,69.617641 C 64.925860,69.617641 66.194837,69.617641 67.463814,69.617641 C 64.899642,71.537080 62.334113,73.454704 59.769421,75.373447 C 57.974777,76.830324 59.759220,79.624301 61.528139,78.790956 C 62.843668,78.218932 63.672855,76.918567 64.775590,76.029244 C 65.272386,75.762533 66.061744,74.237148 66.195454,75.421789 C 66.812356,77.527269 68.113458,79.532317 70.023285,80.657078 C 78.453997,86.618341 88.293096,75.890516 82.467250,70.321032 C 81.347167,68.630878 79.527221,67.572142 77.996121,66.287702 C 76.220705,64.972085 74.509428,63.515316 72.695293,62.285243 C 70.961182,60.910865 68.645443,63.114782 70.183754,64.486103 z "
-       id="path1829"
-       sodipodi:nodetypes="cccccccccccccc" />
-    <path
-       style="fill:#e79100;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.63953400pt;"
-       d="M 70.479501,64.479682 C 71.265993,65.116344 72.042688,65.765247 72.835862,66.393564 C 69.749327,66.543893 66.632454,66.530495 63.562981,66.744917 C 61.849547,66.926859 62.415250,69.743603 63.952630,69.611219 C 65.221607,69.611219 66.490584,69.611219 67.759561,69.611219 C 65.195389,71.530659 62.629860,73.448283 60.065168,75.367025 C 58.270524,76.823903 60.054967,79.617880 61.823886,78.784535 C 63.139415,78.212510 63.968602,76.912146 65.071337,76.022823 C 65.568133,75.756111 66.357491,74.230727 66.491201,75.415368 C 67.108103,77.520848 68.409205,79.525896 70.319032,80.650657 C 78.749744,86.611920 88.588843,75.884095 82.762997,70.314611 C 81.642914,68.624457 79.822968,67.565721 78.291868,66.281281 C 76.516452,64.965664 74.805175,63.508895 72.991040,62.278821 C 71.256929,60.904444 68.941190,63.108361 70.479501,64.479682 z "
-       id="path1831"
-       sodipodi:nodetypes="cccccccccccccc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#345c87;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.4483387;"
-       id="path1832"
-       sodipodi:cx="28.791338"
-       sodipodi:cy="24.460691"
-       sodipodi:rx="5.3983760"
-       sodipodi:ry="5.0384841"
-       d="M 34.189714 24.460691 A 5.3983760 5.0384841 0 1 0 23.392962,24.460691 A 5.3983760 5.0384841 0 1 0 34.189714 24.460691 z"
-       transform="matrix(0.822413,0.000000,0.000000,0.822413,51.33976,53.33570)" />
-  </g>
-</svg>
diff --git a/extra/opencv/libpng-1.4.patch b/extra/opencv/libpng-1.4.patch
deleted file mode 100644
index c34c5a58a..000000000
--- a/extra/opencv/libpng-1.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp OpenCV-2.0.0/src/highgui/grfmt_png.cpp
---- OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp	2010-01-21 01:08:46.000000000 -0500
-+++ OpenCV-2.0.0/src/highgui/grfmt_png.cpp	2010-01-21 01:13:11.000000000 -0500
-@@ -223,7 +223,7 @@
-                 png_set_palette_to_rgb( png_ptr );
- 
-             if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 )
--                png_set_gray_1_2_4_to_8( png_ptr );
-+                png_set_expand_gray_1_2_4_to_8( png_ptr );
- 
-             if( CV_MAT_CN(m_type) > 1 && color )
-                 png_set_bgr( png_ptr ); // convert RGB to BGR
diff --git a/extra/qt/blacklist-fraudulent-comodo-certificates.patch b/extra/qt/blacklist-fraudulent-comodo-certificates.patch
deleted file mode 100644
index bd2da5bb3..000000000
--- a/extra/qt/blacklist-fraudulent-comodo-certificates.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp

-index 618ac79..a5cdf01 100644

---- a/src/network/ssl/qsslcertificate.cpp

-+++ b/src/network/ssl/qsslcertificate.cpp

-@@ -219,17 +219,19 @@ bool QSslCertificate::isNull() const

-     Returns true if this certificate is valid; otherwise returns

-     false.

- 

--    Note: Currently, this function only checks that the current

-+    Note: Currently, this function checks that the current

-     data-time is within the date-time range during which the

--    certificate is considered valid. No other checks are

--    currently performed.

-+    certificate is considered valid, and checks that the

-+    certificate is not in a blacklist of fraudulent certificates.

- 

-     \sa isNull()

- */

- bool QSslCertificate::isValid() const

- {

-     const QDateTime currentTime = QDateTime::currentDateTime();

--    return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter;

-+    return currentTime >= d->notValidBefore &&

-+            currentTime <= d->notValidAfter &&

-+            ! QSslCertificatePrivate::isBlacklisted(*this);

- }

- 

- /*!

-@@ -798,6 +800,30 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr

-     return certificates;

- }

- 

-+// These certificates are known to be fraudulent and were created during the comodo

-+// compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html

-+static const char *certificate_blacklist[] = {

-+    "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",

-+    "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",

-+    "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",

-+    "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",

-+    "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",

-+    "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",

-+    "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",

-+    "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",

-+    "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",

-+    0

-+};

-+

-+bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)

-+{

-+    for (int a = 0; certificate_blacklist[a] != 0; a++) {

-+        if (certificate.serialNumber() == certificate_blacklist[a])

-+            return true;

-+    }

-+    return false;

-+}

-+

- #ifndef QT_NO_DEBUG_STREAM

- QDebug operator<<(QDebug debug, const QSslCertificate &certificate)

- {

-diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h

-index cdceb0f..1ce33d3 100644

---- a/src/network/ssl/qsslcertificate_p.h

-+++ b/src/network/ssl/qsslcertificate_p.h

-@@ -96,6 +96,7 @@ public:

-     static QSslCertificate QSslCertificate_from_X509(X509 *x509);

-     static QList<QSslCertificate> certificatesFromPem(const QByteArray &pem, int count = -1);

-     static QList<QSslCertificate> certificatesFromDer(const QByteArray &der, int count = -1);

-+    static bool isBlacklisted(const QSslCertificate &certificate);

- 

-     friend class QSslSocketBackendPrivate;

- 

-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp

-index 0866534..2427193 100644

---- a/src/network/ssl/qsslsocket_openssl.cpp

-+++ b/src/network/ssl/qsslsocket_openssl.cpp

-@@ -1193,6 +1193,13 @@ bool QSslSocketBackendPrivate::startHandshake()

-     X509 *x509 = q_SSL_get_peer_certificate(ssl);

-     configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);

-     q_X509_free(x509);

-+    if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {

-+        q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));

-+        q->setSocketError(QAbstractSocket::SslHandshakeFailedError);

-+        emit q->error(QAbstractSocket::SslHandshakeFailedError);

-+        plainSocket->disconnectFromHost();

-+        return false;

-+    }

- 

-     // Start translating errors.

-     QList<QSslError> errors;