kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix obvious infinite loop. Don't redefine a local variable.

Browse source 
Bump revision.
This commit is contained in:
joerg 2012-11-16 00:28:54 +00:00
parent 44c42fbc59
commit efd70c55df
5 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
x11/qt4-libs/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.80 2012/11/02 22:30:30 joerg Exp $
# $NetBSD: Makefile,v 1.81 2012/11/16 00:28:54 joerg Exp $
PKGNAME= qt4-libs-${QTVERSION}
PKGREVISION= 3
PKGREVISION= 4
COMMENT= C++ X GUI toolkit
.include "../../x11/qt4-libs/Makefile.common"

5
x11/qt4-libs/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.79 2012/11/02 22:30:31 joerg Exp $
$NetBSD: distinfo,v 1.80 2012/11/16 00:28:54 joerg Exp $
SHA1 (qt-everywhere-opensource-src-4.8.3.tar.gz) = bc352a283610e0cd2fe0dbedbc45613844090fcb
RMD160 (qt-everywhere-opensource-src-4.8.3.tar.gz) = fe56e5da874503a79d6f84a1e15460eba5a6feae
@ -38,6 +38,9 @@ SHA1 (patch-cb) = 13e1b0ffb171637e1ff84a548ef83cf4e006c207
SHA1 (patch-cg) = 2519fe525237167f10dffb9294c861f4d7063f31
SHA1 (patch-qmake_generators_makefile.cpp) = d163cfbf8e598123dd1ed2f9bb5e6935b4e5bf64
SHA1 (patch-src-tools-mocmain.cpp-QTBUG-22829) = 79ffa61f856d657be054d1ea2fcab3a90740621e
SHA1 (patch-src_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp) = 8f43ece880786f7dc9352322d922c7fff652a36f
SHA1 (patch-src_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp) = 4f03369a9e5681f5babe8f6d5f8aaf560f45a855
SHA1 (patch-src_3rdparty_clucene_src_CLucene_util_Arrays.h) = 41c2cf95b81157f3809acb7bd82fe7e098e2abb8
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_Interpreter.cpp) = a9e94ed9becb0d5a88b30f721048509cd0d6b5a5
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = cbce2e10307d26163a76266c0ceee315a609d63d
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp) = bfe38ea1e26fef02dd78e40c95c000cb0cc32a04

13
x11/qt4-libs/patches/patch-src_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-src_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp,v 1.1 2012/11/16 00:28:54 joerg Exp $
--- src/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp.orig 2012-09-11 01:36:50.000000000 +0000
+++ src/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp
@@ -264,7 +264,7 @@ int32_t SegmentMerger::mergeFields()
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++) {

13
x11/qt4-libs/patches/patch-src_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-src_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp,v 1.1 2012/11/16 00:28:54 joerg Exp $
--- src/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp.orig 2012-09-11 01:36:50.000000000 +0000
+++ src/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp
@@ -414,7 +414,7 @@ FieldCacheImpl::FileEntry::FileEntry (co
_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 + "
}

13
x11/qt4-libs/patches/patch-src_3rdparty_clucene_src_CLucene_util_Arrays.h Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-src_3rdparty_clucene_src_CLucene_util_Arrays.h,v 1.1 2012/11/16 00:28:54 joerg Exp $
--- src/3rdparty/clucene/src/CLucene/util/Arrays.h.orig 2012-09-11 01:36:50.000000000 +0000
+++ src/3rdparty/clucene/src/CLucene/util/Arrays.h
@@ -151,7 +151,7 @@ CL_NS_DEF(util)
_itr1 itr1 = val1->begin();
_itr2 itr2 = val2->begin();
- while ( --size >= 0 ){
+ while ( size-- > 0 ){
if ( !comp(*itr1,*itr2) )
return false;
itr1++;