summaryrefslogtreecommitdiffstats
path: root/abs/core-testing/qt
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2010-10-23 18:17:40 (GMT)
committerJames Meyer <james.meyer@operamail.com>2010-10-23 18:19:39 (GMT)
commitadbcf19958300e9b6598990184c8815b945ba0ee (patch)
treef4283c850ac0ac202c17e78a637ee7ca8147621b /abs/core-testing/qt
parent61a68250df10d29b624650948484898334ff22d0 (diff)
downloadlinhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.zip
linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.gz
linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.bz2
Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.
Diffstat (limited to 'abs/core-testing/qt')
-rw-r--r--abs/core-testing/qt/PKGBUILD110
-rw-r--r--abs/core-testing/qt/__changelog2
-rw-r--r--abs/core-testing/qt/assistant.desktop8
-rw-r--r--abs/core-testing/qt/ca-certificates.patch25
-rw-r--r--abs/core-testing/qt/designer.desktop9
-rw-r--r--abs/core-testing/qt/linguist.desktop9
-rw-r--r--abs/core-testing/qt/qt-webkit-4.6.3-flash-plugin-segfault.patch43
-rw-r--r--abs/core-testing/qt/qt.install11
-rw-r--r--abs/core-testing/qt/qtconfig.desktop8
9 files changed, 0 insertions, 225 deletions
diff --git a/abs/core-testing/qt/PKGBUILD b/abs/core-testing/qt/PKGBUILD
deleted file mode 100644
index 75e4737..0000000
--- a/abs/core-testing/qt/PKGBUILD
+++ /dev/null
@@ -1,110 +0,0 @@
-# $Id: PKGBUILD 82062 2010-06-08 11:58:32Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=qt
-pkgver=4.6.3
-pkgrel=2
-pkgdesc='A cross-platform application and UI framework'
-arch=('i686' 'x86_64')
-url='http://qt.nokia.com/'
-license=('GPL3' 'LGPL')
-depends=('libpng' 'fontconfig' 'libtiff' 'libmng' 'sqlite3' 'xdg-utils' 'ca-certificates'
- 'hicolor-icon-theme' 'alsa-lib' 'glib2' 'dbus' 'libxrender' 'libgl' 'libsm')
-optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
-makedepends=('mesa' 'inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'libxfixes' 'gtk2')
-install=qt.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' 'qt-webkit-4.6.3-flash-plugin-segfault.patch')
-
-build() {
- unset QMAKESPEC
- export QT4DIR=$srcdir/$_pkgfqn
- export PATH=${QT4DIR}/bin:${PATH}
- export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-
- 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
- patch -p0 < $srcdir/qt-webkit-4.6.3-flash-plugin-segfault.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
-
- ./configure -confirm-license -opensource \
- -prefix /usr \
- -sysconfdir /etc \
- -plugindir /usr/lib/qt/plugins \
- -translationdir /usr/share/qt/translations \
- -datadir /usr/share/qt \
- -docdir /usr/share/doc/qt \
- -examplesdir /usr/share/doc/qt/examples \
- -demosdir /usr/share/doc/qt/demos \
- -largefile \
- -plugin-sql-{psql,mysql,sqlite,odbc} \
- -system-sqlite \
- -xmlpatterns \
- -no-phonon \
- -no-phonon-backend \
- -svg \
- -webkit \
- -scripttools \
- -system-zlib \
- -system-libtiff \
- -system-libpng \
- -system-libmng \
- -system-libjpeg \
- -openssl-linked \
- -nomake demos \
- -nomake examples \
- -nomake docs \
- -no-rpath \
- -silent \
- -optimized-qmake \
- -dbus \
- -no-separate-debug-info \
- -reduce-relocations \
- -gtkstyle \
- -opengl \
- -no-openvg \
- -glib
- make
-}
-
-package() {
- cd $srcdir/$_pkgfqn
- make INSTALL_ROOT=$pkgdir install
-
- # install missing icons and desktop files
- for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
- size=$(echo $(basename ${icon}) | cut -d- -f2)
- install -p -D -m644 ${icon} ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png
- done
- install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png
- install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png
- install -p -D -m644 tools/designer/src/designer/images/designer.png ${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png
- install -d ${pkgdir}/usr/share/applications
- install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop ${pkgdir}/usr/share/applications/
-
- # install license addition
- install -D -m644 LGPL_EXCEPTION.txt ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
-
- # Fix wrong path in pkgconfig files
- find ${pkgdir}/usr/lib/pkgconfig -type f -name '*.pc' \
- -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
- # Fix wrong path in prl files
- find ${pkgdir}/usr/lib -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-}
-md5sums=('5c69f16d452b0bb3d44bc3c10556c072'
- 'a445c6917086d80f1cfc1e40cb6b0132'
- 'd457f0a0ad68a3861c3cadefe3b42ded'
- '668331d9798a0e2b94381efb7be4c513'
- 'c29f2993d6a0f73d756d2fa36e130e1c'
- 'd5c4cad7af93f1d736d4569a207bd739'
- '17382f5532888268bb50d1ab47e5fa19')
diff --git a/abs/core-testing/qt/__changelog b/abs/core-testing/qt/__changelog
deleted file mode 100644
index 86af276..0000000
--- a/abs/core-testing/qt/__changelog
+++ /dev/null
@@ -1,2 +0,0 @@
-remove cups support
-added QtWebKit_Flash.patch to fix crash with Flash 10.1 and webkit browsers like mythbrowser. http://trac.webkit.org/changeset/61307 This shouldn't be needed in qt versions 4.6.4 or later.
diff --git a/abs/core-testing/qt/assistant.desktop b/abs/core-testing/qt/assistant.desktop
deleted file mode 100644
index 1b9f0a7..0000000
--- a/abs/core-testing/qt/assistant.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Exec=/usr/bin/assistant
-Name=Qt Assistant
-GenericName=Qt Document Browser
-Icon=assistant
-Terminal=false
-Type=Application
-Categories=Qt;Development;Documentation
diff --git a/abs/core-testing/qt/ca-certificates.patch b/abs/core-testing/qt/ca-certificates.patch
deleted file mode 100644
index 02ebbad..0000000
--- a/abs/core-testing/qt/ca-certificates.patch
+++ /dev/null
@@ -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);
-
diff --git a/abs/core-testing/qt/designer.desktop b/abs/core-testing/qt/designer.desktop
deleted file mode 100644
index 8f36273..0000000
--- a/abs/core-testing/qt/designer.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Exec=/usr/bin/designer
-Name=Qt Designer
-GenericName=Interface Designer
-MimeType=application/x-designer
-Icon=designer
-Terminal=false
-Type=Application
-Categories=Qt;Development;GUIDesigner
diff --git a/abs/core-testing/qt/linguist.desktop b/abs/core-testing/qt/linguist.desktop
deleted file mode 100644
index 94e92c1..0000000
--- a/abs/core-testing/qt/linguist.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Exec=/usr/bin/linguist
-Name=Qt Linguist
-GenericName=Translation Tool
-MimeType=application/x-linguist
-Terminal=false
-Type=Application
-Icon=linguist
-Categories=Qt;Development;Translation
diff --git a/abs/core-testing/qt/qt-webkit-4.6.3-flash-plugin-segfault.patch b/abs/core-testing/qt/qt-webkit-4.6.3-flash-plugin-segfault.patch
deleted file mode 100644
index 6fc87ca..0000000
--- a/abs/core-testing/qt/qt-webkit-4.6.3-flash-plugin-segfault.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-This patch fixes WebKit Bug 40567: [Qt] QtWebKit crashes while initializing
-flash plugin 10.1.53.64...
-https://bugs.webkit.org/show_bug.cgi?id=40567
-
---- src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp
-+++ src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp
-@@ -35,4 +35,6 @@
-
- namespace WebCore {
-+
-+typedef void gtkInitFunc(int *argc, char ***argv);
-
- bool PluginPackage::fetchInfo()
-@@ -110,4 +112,5 @@
- NP_InitializeFuncPtr NP_Initialize;
- NPError npErr;
-+ gtkInitFunc* gtkInit;
-
- NP_Initialize = (NP_InitializeFuncPtr)m_module->resolve("NP_Initialize");
-@@ -126,4 +129,24 @@
- // It does so in NP_Initialize with a null instance, therefore it is done this way:
- m_browserFuncs.getvalue = staticPluginQuirkRequiresGtkToolKit_NPN_GetValue;
-+ }
-+
-+ // WORKAROUND: Prevent gtk based plugin crashes such as BR# 40567 by
-+ // explicitly forcing the initializing of Gtk, i.e. calling gtk_init,
-+ // whenver the symbol is present in the plugin library loaded above.
-+ // Note that this workaround is based on code from the NSPluginClass ctor
-+ // in KDE's kdebase/apps/nsplugins/viewer/nsplugin.cpp file.
-+ gtkInit = (gtkInitFunc*)m_module->resolve("gtk_init");
-+ if (gtkInit) {
-+ // Prevent gtk_init() from replacing the X error handlers, since the Gtk
-+ // handlers abort when they receive an X error, thus killing the viewer.
-+#ifdef Q_WS_X11
-+ int (*old_error_handler)(Display*, XErrorEvent*) = XSetErrorHandler(0);
-+ int (*old_io_error_handler)(Display*) = XSetIOErrorHandler(0);
-+#endif
-+ gtkInit(0, 0);
-+#ifdef Q_WS_X11
-+ XSetErrorHandler(old_error_handler);
-+ XSetIOErrorHandler(old_io_error_handler);
-+#endif
- }
diff --git a/abs/core-testing/qt/qt.install b/abs/core-testing/qt/qt.install
deleted file mode 100644
index e70c054..0000000
--- a/abs/core-testing/qt/qt.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/abs/core-testing/qt/qtconfig.desktop b/abs/core-testing/qt/qtconfig.desktop
deleted file mode 100644
index 7c221e5..0000000
--- a/abs/core-testing/qt/qtconfig.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Qt Config
-Comment=Configure Qt behavior, styles, fonts
-Exec=/usr/bin/qtconfig
-Icon=qtlogo
-Terminal=false
-Type=Application
-Categories=Qt;Settings;