[arch-commits] Commit in qt/trunk (PKGBUILD ca-certificates.patch)

[Andrea Scarpino]

    Date: Thursday, September 23, 2010 @ 13:56:29
  Author: andrea
Revision: 91174

upgpkg: qt 4.7.0-1
upstream release

Modified:
  qt/trunk/PKGBUILD
Deleted:
  qt/trunk/ca-certificates.patch

-----------------------+
 PKGBUILD              |   19 +++++++------------
 ca-certificates.patch |   25 -------------------------
 2 files changed, 7 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-23 17:52:22 UTC (rev 91173)
+++ PKGBUILD	2010-09-23 17:56:29 UTC (rev 91174)
@@ -1,8 +1,9 @@
 # $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=qt
-pkgver=4.6.3
+pkgver=4.7.0
 pkgrel=1
 pkgdesc='A cross-platform application and UI framework'
 arch=('i686' 'x86_64')
@@ -12,18 +13,16 @@
          'hicolor-icon-theme' 'alsa-lib' 'glib2' 'dbus' 'libxrender' 'libgl' 'libsm')
 optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
 makedepends=('mesa' 'inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'cups' 'libxfixes' 'gtk2')
-install=qt.install
+install="${pkgname}.install"
 options=('!libtool')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
-        'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop'
-        'ca-certificates.patch')
-md5sums=('5c69f16d452b0bb3d44bc3c10556c072'
+        'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop')
+md5sums=('3a2f25b9b115037277f4fb759194a7a5'
          'a445c6917086d80f1cfc1e40cb6b0132'
          'd457f0a0ad68a3861c3cadefe3b42ded'
          '668331d9798a0e2b94381efb7be4c513'
-         'c29f2993d6a0f73d756d2fa36e130e1c'
-         'd5c4cad7af93f1d736d4569a207bd739')
+         'c29f2993d6a0f73d756d2fa36e130e1c')
 
 build() {
 	unset QMAKESPEC
@@ -33,10 +32,6 @@
 
 	cd $srcdir/$_pkgfqn
 
-	# see http://cvs.fedoraproject.org/viewvc/rpms/qt/devel/
-	# use system ssl cert bundle
-	patch -p1 -i $srcdir/ca-certificates.patch || return 1
-
 	sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
 	sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
 	sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf

Deleted: ca-certificates.patch
===================================================================
--- ca-certificates.patch	2010-09-23 17:52:22 UTC (rev 91173)
+++ ca-certificates.patch	2010-09-23 17:56:29 UTC (rev 91174)
@@ -1,25 +0,0 @@
-diff -up qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp
---- qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates	2009-09-29 06:01:38.000000000 -0500
-+++ qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp	2009-10-02 11:20:10.674662746 -0500
-@@ -482,8 +482,20 @@ void QSslSocketPrivate::resetDefaultCiph
- 
- QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
- {
-+
-+    QFile caBundle;
-+
-+#ifdef Q_OS_UNIX
-+    // Check known locations for the system's default bundle.  ### On Windows,
-+    // we should use CAPI to find the bundle, and not rely on default unix
-+    // locations.
-+    caBundle.setFileName(QLatin1String("/etc/ssl/certs/ca-certificates.crt"));
-+    if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
-+       return QSslCertificate::fromDevice(&caBundle);
-+#endif
-+
-     // Qt provides a default bundle of certificates
--    QFile caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
-+    caBundle.setFileName(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
-     if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
-         return QSslCertificate::fromDevice(&caBundle);
-