Hello,
I have upgraded area51's qt ports to qt-4.8.4 (which was rather easy). The svn
diff to the QT subpath of the area51 repository is attached.
Works on HEAD and STABLE-9. Could someone review and commit it to area51? ^-^
Alonso
Index: Mk/bsd.qt.mk
===================================================================
--- Mk/bsd.qt.mk (revision 8823)
+++ Mk/bsd.qt.mk (working copy)
@@ -116,7 +116,7 @@
#
# QT4 version
#
-QT4_VERSION?= 4.8.3
+QT4_VERSION?= 4.8.4
_USE_QT4_ALL= accessible assistant assistant-adp assistantclient \
clucene codecs-cn codecs-jp codecs-kr codecs-tw corelib \
Index: devel/qt4/distinfo
===================================================================
--- devel/qt4/distinfo (revision 8823)
+++ devel/qt4/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.3.tar.gz) = f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728
-SIZE (KDE/qt-everywhere-opensource-src-4.8.3.tar.gz) = 233635127
+SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
+SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028
Index: textproc/qt4-clucene/files/patch-src__3rdparty__clucene__src__CLucene__index__SegmentMerger.cpp
===================================================================
--- textproc/qt4-clucene/files/patch-src__3rdparty__clucene__src__CLucene__index__SegmentMerger.cpp (revision 0)
+++ textproc/qt4-clucene/files/patch-src__3rdparty__clucene__src__CLucene__index__SegmentMerger.cpp (working copy)
@@ -0,0 +1,11 @@
+--- src/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp.orig 2012-12-15 15:36:00.000000000 +0000
++++ src/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp 2012-12-15 15:34:55.000000000 +0000
+@@ -264,7 +264,7 @@
+ CND_CONDITION(fieldsWriter != NULL, "Memory allocation for fieldsWriter failed");
+
+ try {
+- IndexReader* reader = NULL;
++ reader = NULL;
+ int32_t maxDoc = 0;
+ //Iterate through all readers
+ for (uint32_t i = 0; i < readers.size(); i++) {
Index: textproc/qt4-clucene/files/patch-src__3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp
===================================================================
--- textproc/qt4-clucene/files/patch-src__3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp (revision 8823)
+++ textproc/qt4-clucene/files/patch-src__3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp (working copy)
@@ -9,3 +9,12 @@
FieldCacheImpl::FieldCacheImpl():
cache(false,true){
}
+@@ -416,7 +416,7 @@
+ _CLDECDELETE(term);
+
+ try {
+- Term* term = enumerator->term(false);
++ term = enumerator->term(false);
+ if (term == NULL) {
+ _CLTHROWA(CL_ERR_Runtime,"no terms in field - cannot determine sort type"); //todo: make rich error: " + field + "
+ }
_______________________________________________
kde-freebsd mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information
