Date: Mon, 3 Mar 2014 16:23:00 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346926 - in head/deskutils/fet: . files Message-ID: <201403031623.s23GN03D099653@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Mon Mar 3 16:23:00 2014 New Revision: 346926 URL: http://svnweb.freebsd.org/changeset/ports/346926 QAT: https://qat.redports.org/buildarchive/r346926/ Log: - Update to version 5.21.0 [1] - Fix build with clang [1] - Remove conditional installation of files PR: ports/185144 [1] Submitted by: Zsolt Udvari <udvzsolt@gmail.com> Approved by: maintainer timeout Added: head/deskutils/fet/files/ head/deskutils/fet/files/patch-mutex (contents, props changed) head/deskutils/fet/files/patch-src__engine__timeconstraint.cpp (contents, props changed) Modified: head/deskutils/fet/Makefile head/deskutils/fet/distinfo Modified: head/deskutils/fet/Makefile ============================================================================== --- head/deskutils/fet/Makefile Mon Mar 3 16:21:03 2014 (r346925) +++ head/deskutils/fet/Makefile Mon Mar 3 16:23:00 2014 (r346926) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fet -PORTVERSION= 5.20.1 +PORTVERSION= 5.21.0 CATEGORIES= deskutils kde MASTER_SITES= http://lalescu.ro/liviu/fet/download/ \ http://lalescu.ro/liviu/fet/download/old/ \ @@ -32,8 +32,6 @@ DESKTOP_ENTRIES="FET" \ OPTIONS_DEFINE= EXAMPLES NLS OPTIONS_SUB= yes -.include <bsd.port.options.mk> - post-patch: ${REINPLACE_CMD} -e 's|/usr/share/fet|${DATADIR}|g' \ ${WRKSRC}/src/interface/fet.cpp @@ -42,13 +40,9 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fet ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/fet-cl ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/doc/fet.1 ${STAGEDIR}${MANPREFIX}/man/man1 -.if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \. ${STAGEDIR}${EXAMPLESDIR} -.endif -.if ${PORT_OPTIONS:MNLS} - ${MKDIR} ${STAGEDIR}${DATADIR}/translations + @${MKDIR} ${STAGEDIR}${DATADIR}/translations cd ${WRKSRC}/translations && ${INSTALL_DATA} *.qm ${STAGEDIR}${DATADIR}/translations -.endif .include <bsd.port.mk> Modified: head/deskutils/fet/distinfo ============================================================================== --- head/deskutils/fet/distinfo Mon Mar 3 16:21:03 2014 (r346925) +++ head/deskutils/fet/distinfo Mon Mar 3 16:23:00 2014 (r346926) @@ -1,2 +1,2 @@ -SHA256 (fet-5.20.1.tar.bz2) = 4c34b05ff6fd87326f736c7d7598e82759fcfd09701568703d9687e50c407fd2 -SIZE (fet-5.20.1.tar.bz2) = 7981564 +SHA256 (fet-5.21.0.tar.bz2) = 9a90ac129d6ccec07c50a5fb1d48de854ddeaceb855e918be8be5c89a667da89 +SIZE (fet-5.21.0.tar.bz2) = 8056540 Added: head/deskutils/fet/files/patch-mutex ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/fet/files/patch-mutex Mon Mar 3 16:23:00 2014 (r346926) @@ -0,0 +1,337 @@ +--- 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 <QSemaphore> + +-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<MAX_RETRIES_FOR_AN_ACTIVITY_AT_LEVEL_0){ + activity_count_impossible_tries++; +--- src/interface/fet.cpp.orig 2014-03-02 16:22:44.447319626 +0100 ++++ src/interface/fet.cpp 2014-03-02 16:18:50.547263613 +0100 +@@ -102,9 +102,9 @@ + extern bool students_schedule_ready, teachers_schedule_ready, rooms_schedule_ready; + + #ifndef FET_COMMAND_LINE +-extern QMutex mutex; ++extern QMutex fet_mutex; + #else +-QMutex mutex; ++QMutex fet_mutex; + #endif + + void writeDefaultSimulationParameters(); +--- src/interface/timetablegenerateform.cpp.orig 2014-03-02 16:23:08.548355931 +0100 ++++ src/interface/timetablegenerateform.cpp 2014-03-02 16:19:40.633349485 +0100 +@@ -38,7 +38,7 @@ + + #include "longtextmessagebox.h" + +-QMutex mutex; ++QMutex fet_mutex; + + static GenerateThread generateThread; + +@@ -189,11 +189,11 @@ + + simulation_running=false; + +- mutex.lock(); ++ fet_mutex.lock(); + gen.abortOptimization=true; +- mutex.unlock(); ++ fet_mutex.unlock(); + +- mutex.lock(); ++ fet_mutex.lock(); + + Solution& c=gen.c; + +@@ -294,7 +294,7 @@ + s+="\n"; + } + +- mutex.unlock(); ++ fet_mutex.unlock(); + + //show the message in a dialog + QDialog dialog(this); +@@ -340,11 +340,11 @@ + + simulation_running=false; + +- mutex.lock(); ++ fet_mutex.lock(); + gen.abortOptimization=true; +- mutex.unlock(); ++ fet_mutex.unlock(); + +- mutex.lock(); ++ fet_mutex.lock(); + + Solution& c=highestStageSolution; + +@@ -421,7 +421,7 @@ + + s+="\n"; + +- mutex.unlock(); ++ fet_mutex.unlock(); + + //show the message in a dialog + QDialog dialog(this); +@@ -468,11 +468,11 @@ + + simulation_running=false; + +- mutex.lock(); ++ fet_mutex.lock(); + gen.abortOptimization=true; +- mutex.unlock(); ++ fet_mutex.unlock(); + +- mutex.lock(); ++ fet_mutex.lock(); + + + +@@ -542,7 +542,7 @@ + s+="\n"; + } + +- mutex.unlock(); ++ fet_mutex.unlock(); + + //show the message in a dialog + QDialog dialog(this); +@@ -661,11 +661,11 @@ + void TimetableGenerateForm::activityPlaced(int na){ + assert(gt.rules.initialized && gt.rules.internalStructureComputed); + +- mutex.lock(); ++ fet_mutex.lock(); + int t=gen.searchTime; //seconds + int mact=maxActivitiesPlaced; + int seconds=gen.timeToHighestStage; +- mutex.unlock(); ++ fet_mutex.unlock(); + + //write to the Qt interface + QString s; +@@ -756,7 +756,7 @@ + } + + void TimetableGenerateForm::write(){ +- mutex.lock(); ++ fet_mutex.lock(); + + Solution& c=gen.c; + +@@ -783,7 +783,7 @@ + + TimetableExport::writeSimulationResults(this); + +- mutex.unlock(); ++ fet_mutex.unlock(); + + QString kk; + kk=FILE_SEP; +@@ -803,7 +803,7 @@ + } + + void TimetableGenerateForm::writeHighestStage(){ +- mutex.lock(); ++ fet_mutex.lock(); + + Solution& c=highestStageSolution; + +@@ -830,7 +830,7 @@ + + TimetableExport::writeHighestStageResults(this); + +- mutex.unlock(); ++ fet_mutex.unlock(); + + QString kk; + kk=FILE_SEP; +@@ -859,7 +859,7 @@ + { + QString s; + +- mutex.lock(); ++ fet_mutex.lock(); + + s+=TimetableGenerateForm::tr("Information relating difficult to schedule activities:"); + s+="\n\n"; +@@ -884,7 +884,7 @@ + s+="\n"; + } + +- mutex.unlock(); ++ fet_mutex.unlock(); + + //show the message in a dialog + QDialog dialog(this); +--- src/interface/timetablegeneratemultipleform.cpp.orig 2014-03-02 16:23:32.468317057 +0100 ++++ src/interface/timetablegeneratemultipleform.cpp 2014-03-02 16:20:11.886252298 +0100 +@@ -35,7 +35,7 @@ + + #include <QDir> + +-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"; Added: head/deskutils/fet/files/patch-src__engine__timeconstraint.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/fet/files/patch-src__engine__timeconstraint.cpp Mon Mar 3 16:23:00 2014 (r346926) @@ -0,0 +1,10 @@ +--- ./src/engine/timeconstraint.cpp.orig 2014-02-01 14:51:03.804739136 +0100 ++++ ./src/engine/timeconstraint.cpp 2014-02-01 14:51:46.994628354 +0100 +@@ -42,6 +42,7 @@ + + //for min max functions + #include <algorithm> ++#include <stdlib.h> + using namespace std; + + static QString trueFalse(bool x){
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403031623.s23GN03D099653>