diff options
| author | rakuco <rakuco@FreeBSD.org> | 2012-06-02 08:08:27 +0800 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2012-06-02 08:08:27 +0800 |
| commit | b56c81cff2f9aaf42727cee6179be4af87ec0d72 (patch) | |
| tree | 561081ac65caad76e531cf75ddbaee1fd87d3c54 /x11-toolkits/qt4-gui | |
| parent | b0f7cb0df680686966bc9d0506ce43991d41c574 (diff) | |
| download | freebsd-ports-gnome-b56c81cff2f9aaf42727cee6179be4af87ec0d72.tar.gz freebsd-ports-gnome-b56c81cff2f9aaf42727cee6179be4af87ec0d72.tar.zst freebsd-ports-gnome-b56c81cff2f9aaf42727cee6179be4af87ec0d72.zip | |
The KDE on FreeBSD team is happy to update Qt to its 4.8.2 release.
The upstream changelog can be seen in
<https://qt.gitorious.org/qt/qt/blobs/4.8/dist/changes-4.8.2>.
Relevant changes include a few patches having been integrated upstream
and thus removed from the ports tree and some improved work on USE_QT4
in bsd.qt.mk.
Diffstat (limited to 'x11-toolkits/qt4-gui')
| -rw-r--r-- | x11-toolkits/qt4-gui/Makefile | 1 | ||||
| -rw-r--r-- | x11-toolkits/qt4-gui/files/patch-src__gui__text__qtextlayout.cpp | 13 |
2 files changed, 0 insertions, 14 deletions
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile index 2ce5f8e689d2..7cf71375e83e 100644 --- a/x11-toolkits/qt4-gui/Makefile +++ b/x11-toolkits/qt4-gui/Makefile @@ -8,7 +8,6 @@ PORTNAME= gui DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES?= x11-toolkits PKGNAMEPREFIX= qt4- diff --git a/x11-toolkits/qt4-gui/files/patch-src__gui__text__qtextlayout.cpp b/x11-toolkits/qt4-gui/files/patch-src__gui__text__qtextlayout.cpp deleted file mode 100644 index 7043bfc32308..000000000000 --- a/x11-toolkits/qt4-gui/files/patch-src__gui__text__qtextlayout.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- ./src/gui/text/qtextlayout.cpp.orig 2012-03-14 15:01:14.000000000 +0100 -+++ ./src/gui/text/qtextlayout.cpp 2012-04-03 09:40:53.779974016 +0200 -@@ -2508,6 +2508,10 @@ - int pos = *cursorPos; - int itm; - const HB_CharAttributes *attributes = eng->attributes(); -+ if (!attributes) { -+ *cursorPos = 0; -+ return x.toReal(); -+ } - while (pos < line.from + line.length && !attributes[pos].charStop) - pos++; - if (pos == line.from + (int)line.length) { |