diff --git a/deskutils/fet/Makefile b/deskutils/fet/Makefile index 5bcc08779d6bf..ddac87143a9d4 100644 --- a/deskutils/fet/Makefile +++ b/deskutils/fet/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fet -PORTVERSION= 5.23.1 +PORTVERSION= 5.23.2 CATEGORIES= deskutils kde MASTER_SITES= http://lalescu.ro/liviu/fet/download/ \ http://lalescu.ro/liviu/fet/download/old/ \ diff --git a/deskutils/fet/distinfo b/deskutils/fet/distinfo index d405edbf5b6b8..87574a2b2867e 100644 --- a/deskutils/fet/distinfo +++ b/deskutils/fet/distinfo @@ -1,2 +1,2 @@ -SHA256 (fet-5.23.1.tar.bz2) = 7952a98b1a79f22ad169553f0ec45109af8aa785bb026385c826f61920c4aaac -SIZE (fet-5.23.1.tar.bz2) = 8463474 +SHA256 (fet-5.23.2.tar.bz2) = edbb9671e2f6d1c0028beafc968b428d7bf603955bd9d28087b84ceead16d6d7 +SIZE (fet-5.23.2.tar.bz2) = 8467459 diff --git a/deskutils/fet/files/patch-mutex b/deskutils/fet/files/patch-mutex deleted file mode 100644 index 5ae94811f34c9..0000000000000 --- a/deskutils/fet/files/patch-mutex +++ /dev/null @@ -1,337 +0,0 @@ ---- src/engine/generate.cpp.orig 2014-03-02 16:22:17.052250281 +0100 -+++ src/engine/generate.cpp 2014-03-02 16:16:52.423231858 +0100 -@@ -50,7 +50,7 @@ - - #include - --extern QMutex mutex; //timetablegenerateform.cpp -+extern QMutex fet_mutex; //timetablegenerateform.cpp - - #ifndef FET_COMMAND_LINE - extern QSemaphore semaphorePlacedActivity; -@@ -2596,7 +2596,7 @@ - } - - if(threaded){ -- mutex.lock(); -+ fet_mutex.lock(); - } - c.makeUnallocated(gt.rules); - -@@ -2612,7 +2612,7 @@ - maxActivitiesPlaced=0; - - if(threaded){ -- mutex.unlock(); -+ fet_mutex.unlock(); - } - - triedRemovals.resize(gt.rules.nInternalActivities, gt.rules.nHoursPerWeek); -@@ -2645,13 +2645,13 @@ - time(&starting_time); - - if(threaded){ -- mutex.lock(); -+ fet_mutex.lock(); - } - timeToHighestStage=0; - searchTime=0; - generationStartDateTime=QDateTime::currentDateTime(); - if(threaded){ -- mutex.unlock(); -+ fet_mutex.unlock(); - } - - //2000 was before -@@ -2666,11 +2666,11 @@ - prevvalue: - - if(threaded){ -- mutex.lock(); -+ fet_mutex.lock(); - } - if(abortOptimization){ - if(threaded){ -- mutex.unlock(); -+ fet_mutex.unlock(); - } - return; - } -@@ -2680,7 +2680,7 @@ - - if(searchTime>=maxSeconds){ - if(threaded){ -- mutex.unlock(); -+ fet_mutex.unlock(); - } - - timeExceeded=true; -@@ -2945,7 +2945,7 @@ - if(!foundGoodSwap){ - if(impossibleActivity){ - if(threaded){ -- mutex.unlock(); -+ fet_mutex.unlock(); - } - nDifficultActivities=1; - difficultActivities[0]=permutation[added_act]; -@@ -3075,7 +3075,7 @@ - - added_act=q+1; - if(threaded){ -- mutex.unlock(); -+ fet_mutex.unlock(); - } - - //if(semaphorePlacedActivity){ -@@ -3119,18 +3119,18 @@ - } - - if(threaded){ -- mutex.unlock(); -+ fet_mutex.unlock(); - } - emit(activityPlaced(added_act+1)); - if(threaded){ - semaphorePlacedActivity.acquire(); - } - if(threaded){ -- mutex.lock(); -+ fet_mutex.lock(); - } - if(added_act==gt.rules.nInternalActivities && foundGoodSwap){ - if(threaded){ -- mutex.unlock(); -+ fet_mutex.unlock(); - } - break; - } -@@ -3150,7 +3150,7 @@ - } - - if(threaded){ -- mutex.unlock(); -+ fet_mutex.unlock(); - } - } - -@@ -9111,8 +9111,8 @@ - if(level==0 && (nConflActivities[perm[0]]==MAX_ACTIVITIES)){ - //to check if generation was stopped - if(this->isThreaded){ -- mutex.unlock(); -- mutex.lock(); -+ fet_mutex.unlock(); -+ fet_mutex.lock(); - } - if(!abortOptimization && activity_count_impossible_tries - --extern QMutex mutex; -+extern QMutex fet_mutex; - - static GenerateMultipleThread generateMultipleThread; - -@@ -93,9 +93,9 @@ - - bool ok; - -- mutex.lock(); -+ fet_mutex.lock(); - if(genMulti.abortOptimization){ -- mutex.unlock(); -+ fet_mutex.unlock(); - return; - } - else if(impossible){ -@@ -163,7 +163,7 @@ - - s+=QString("."); - } -- mutex.unlock(); -+ fet_mutex.unlock(); - - emit(timetableGenerated(i+1, s, ok)); - semaphoreTimetableFinished.acquire(); -@@ -369,9 +369,9 @@ - - simulation_running_multi=false; - -- mutex.lock(); -+ fet_mutex.lock(); - genMulti.abortOptimization=true; -- mutex.unlock(); -+ fet_mutex.unlock(); - - QString s=TimetableGenerateMultipleForm::tr("Simulation interrupted!"); - s+="\n\n";