aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libraries/qt5/desktop/qt5-assistant.desktop8
-rw-r--r--libraries/qt5/desktop/qt5-designer.desktop10
-rw-r--r--libraries/qt5/desktop/qt5-linguist.desktop9
-rw-r--r--libraries/qt5/desktop/qt5-qdbusviewer.desktop9
-rw-r--r--libraries/qt5/patches/QTBUG-39047.patch57
-rw-r--r--libraries/qt5/qt5.SlackBuild19
-rw-r--r--libraries/qt5/qt5.info6
7 files changed, 75 insertions, 43 deletions
diff --git a/libraries/qt5/desktop/qt5-assistant.desktop b/libraries/qt5/desktop/qt5-assistant.desktop
deleted file mode 100644
index 64658fdabfed8..0000000000000
--- a/libraries/qt5/desktop/qt5-assistant.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Qt5 Assistant
-Comment=Shows Qt5 documentation and examples
-Exec=/usr/lib@LIBDIR@/qt5/bin/assistant
-Icon=qt5-assistant
-Terminal=false
-Type=Application
-Categories=Qt;Development;Documentation;
diff --git a/libraries/qt5/desktop/qt5-designer.desktop b/libraries/qt5/desktop/qt5-designer.desktop
deleted file mode 100644
index e7004bf34f1e5..0000000000000
--- a/libraries/qt5/desktop/qt5-designer.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt5 Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt5 applications
-Exec=/usr/lib@LIBDIR@/qt5/bin/designer
-Icon=qt5-designer
-MimeType=application/x-designer;
-Terminal=false
-Type=Application
-Categories=Qt;Development;
diff --git a/libraries/qt5/desktop/qt5-linguist.desktop b/libraries/qt5/desktop/qt5-linguist.desktop
deleted file mode 100644
index 4e260652ba901..0000000000000
--- a/libraries/qt5/desktop/qt5-linguist.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt5 Linguist
-Comment=Add translations to Qt5 applications
-Exec=/usr/lib@LIBDIR@/qt5/bin/linguist
-Icon=qt5-linguist
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Type=Application
-Categories=Qt;Development;
diff --git a/libraries/qt5/desktop/qt5-qdbusviewer.desktop b/libraries/qt5/desktop/qt5-qdbusviewer.desktop
deleted file mode 100644
index 7835314ff79ca..0000000000000
--- a/libraries/qt5/desktop/qt5-qdbusviewer.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt5 QDbusViewer
-GenericName=Qt5 D-Bus Debugger
-Comment=Debug D-Bus applications
-Exec=/usr/lib@LIBDIR@/qt5/bin/qdbusviewer
-Icon=qt5-qdbusviewer
-Terminal=false
-Type=Application
-Categories=Qt;Development;Debugger;
diff --git a/libraries/qt5/patches/QTBUG-39047.patch b/libraries/qt5/patches/QTBUG-39047.patch
new file mode 100644
index 0000000000000..ee6e4ad40ef6f
--- /dev/null
+++ b/libraries/qt5/patches/QTBUG-39047.patch
@@ -0,0 +1,57 @@
+From 009ad875f89d7d7bc4447e18c2fbbd485a75e0b5 Mon Sep 17 00:00:00 2001
+From: Oleg Shparber <trollixx@gmail.com>
+Date: Mon, 19 May 2014 00:53:39 -0700
+Subject: [PATCH] Fix improper antialiasing property behavior
+
+For components antialiased by default the property was returned
+as false if default true value was set to true again.
+
+Task-number: QTBUG-39047
+Change-Id: I16960a12b6d38a0d9e487fc6612610c39c4949d4
+Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
+---
+ src/quick/items/qquickitem.cpp | 8 +++++---
+ tests/auto/quick/qquicktext/tst_qquicktext.cpp | 7 +++++++
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
+index 3f0dae8..ef2eac4 100644
+--- a/src/quick/items/qquickitem.cpp
++++ b/src/quick/items/qquickitem.cpp
+@@ -5691,10 +5691,12 @@ void QQuickItem::setAntialiasing(bool aa)
+ {
+ Q_D(QQuickItem);
+
+- bool changed = (aa != antialiasing());
+- d->antialiasingValid = true;
++ if (!d->antialiasingValid) {
++ d->antialiasingValid = true;
++ d->antialiasing = d->implicitAntialiasing;
++ }
+
+- if (!changed)
++ if (aa == d->antialiasing)
+ return;
+
+ d->antialiasing = aa;
+diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+index 0b69981..d36c55d 100644
+--- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
++++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+@@ -1334,6 +1334,13 @@ void tst_qquicktext::antialiasing()
+ text->resetAntialiasing();
+ QCOMPARE(text->antialiasing(), true);
+ QCOMPARE(spy.count(), 2);
++
++ // QTBUG-39047
++ component.setData("import QtQuick 2.0\n Text { antialiasing: true }", QUrl());
++ object.reset(component.create());
++ text = qobject_cast<QQuickText *>(object.data());
++ QVERIFY(text);
++ QCOMPARE(text->antialiasing(), true);
+ }
+
+ void tst_qquicktext::weight()
+--
+1.7.1
+
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
index 14f7cc7f77313..1449b0bf5d4b8 100644
--- a/libraries/qt5/qt5.SlackBuild
+++ b/libraries/qt5/qt5.SlackBuild
@@ -46,7 +46,7 @@
# tailored to Qt 5. Modified by Larry Hajali.
PRGNAM=qt5
-VERSION=${VERSION:-5.2.1}
+VERSION=${VERSION:-5.3.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -105,6 +105,17 @@ patch -p1 < $CWD/patches/qt5.mysql.h.diff
# https://bugs.webkit.org/show_bug.cgi?id=117077
patch -p1 < $CWD/patches/platformplugin-install-path-fix.patch
+# Fix QTBUG-39047. https://bugreports.qt-project.org/browse/QTBUG-39047
+patch -p1 -d qtdeclarative < $CWD/patches/QTBUG-39047.patch
+
+# Limit -reduce-relocations to ix86 and x86_64.
+# https://bugreports.qt-project.org/browse/QTBUG-36129
+if echo $ARCH | grep -q '\(i.86\|x86_64\)' 2>/dev/null; then
+ RELOCATIONS="-reduce-relocations"
+else
+ RELOCATIONS=""
+fi
+
if echo "$ARCH" | grep -q "i.86" 2>/dev/null; then
sed -i "/^QMAKE_CFLAGS_RELEASE/ s|+=.*|+= $SLKCFLAGS|" qtbase/mkspecs/common/gcc-base.conf
fi
@@ -129,19 +140,18 @@ export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
-verbose \
-optimized-qmake \
-dbus-linked \
- -reduce-relocations \
-qpa xcb \
-xcb \
-glib \
-accessibility \
- -javascript-jit \
-system-harfbuzz \
-nomake examples \
-no-separate-debug-info \
-no-pch \
-no-rpath \
-no-strip \
- -release
+ -release \
+ $RELOCATIONS
make
make install INSTALL_ROOT=$PKG
@@ -208,6 +218,7 @@ sed -i \
-e "s|-Wl,-whole-archive -lANGLE -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/ANGLE[^ ]* ||" \
-e "s|-Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/JavaScriptCore[^ ]* ||" \
-e "s|-Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WTF[^ ]* ||" \
+ -e "s|-Wl,-whole-archive -lleveldb -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/leveldb[^ ]* ||" \
$PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/lib/pkgconfig/Qt5WebKit.pc
# While we are at it, there isn't any reason to keep references to $PKG in the *.prl files.
diff --git a/libraries/qt5/qt5.info b/libraries/qt5/qt5.info
index 8b5546967dc10..17937d4f0c070 100644
--- a/libraries/qt5/qt5.info
+++ b/libraries/qt5/qt5.info
@@ -1,8 +1,8 @@
PRGNAM="qt5"
-VERSION="5.2.1"
+VERSION="5.3.0"
HOMEPAGE="http://qt-project.org/"
-DOWNLOAD="http://download.qt-project.org/official_releases/qt/5.2/5.2.1/single/qt-everywhere-opensource-src-5.2.1.tar.xz"
-MD5SUM="0c8d2aa45f38be9c3f7c9325eb059d9d"
+DOWNLOAD="http://download.qt-project.org/official_releases/qt/5.3/5.3.0/single/qt-everywhere-opensource-src-5.3.0.tar.xz"
+MD5SUM="f00ac7930e3b1b2b364dedcd15acc142"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-26 22:07:53 +0000