taskjuggler: remove unused files
This commit is contained in:
parent
1cdf4d2d19
commit
24542ed593
@ -1,75 +0,0 @@
|
|||||||
{stdenv, fetchurl,
|
|
||||||
zlib, libpng, libjpeg, perl, expat, qt3,
|
|
||||||
libX11, libXext, libSM, libICE,
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "taskjuggler-2.4.3";
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://www.taskjuggler.org/download/${name}.tar.bz2";
|
|
||||||
sha256 = "14gkxa2vwfih5z7fffbavps7m44z5bq950qndigw2icam5ks83jl";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs =
|
|
||||||
[zlib libpng libX11 libXext libSM libICE perl expat libjpeg]
|
|
||||||
;
|
|
||||||
|
|
||||||
patches = [ ./timezone-glibc.patch ];
|
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
for i in $(grep -R "/bin/bash" . | sed 's/:.*//'); do
|
|
||||||
substituteInPlace $i --replace /bin/bash $(type -Pp bash)
|
|
||||||
done
|
|
||||||
for i in $(grep -R "/usr/bin/perl" . | sed 's/:.*//'); do
|
|
||||||
substituteInPlace $i --replace /usr/bin/perl ${perl}/bin/perl
|
|
||||||
done
|
|
||||||
|
|
||||||
# Fix install
|
|
||||||
for i in docs/en/Makefile.in Examples/BigProject/Common/Makefile.in Examples/BigProject/Makefile.in Examples/BigProject/Project1/Makefile.in Examples/BigProject/Project2/Makefile.in Examples/FirstProject/Makefile.in Examples/ShiftSchedule/Makefile.in; do
|
|
||||||
# Do not use variable substitution because there is some text after the last '@'
|
|
||||||
substituteInPlace $i --replace 'docprefix = @PACKAGES_DIR@' 'docprefix = $(docdir)/'
|
|
||||||
done
|
|
||||||
|
|
||||||
# Comment because the ical export need the KDE support.
|
|
||||||
for i in Examples/FirstProject/AccountingSoftware.tjp; do
|
|
||||||
substituteInPlace $i --replace "icalreport" "# icalreport"
|
|
||||||
done
|
|
||||||
|
|
||||||
for i in TestSuite/testdir TestSuite/createrefs \
|
|
||||||
TestSuite/Scheduler/Correct/Expression.sh; do
|
|
||||||
substituteInPlace $i --replace '/bin/rm' 'rm'
|
|
||||||
done
|
|
||||||
|
|
||||||
# Some tests require writing at $HOME
|
|
||||||
HOME=$TMPDIR
|
|
||||||
'';
|
|
||||||
|
|
||||||
configureFlags = [
|
|
||||||
"--without-arts" "--disable-docs"
|
|
||||||
"--x-includes=${libX11.dev}/include"
|
|
||||||
"--x-libraries=${libX11.out}/lib"
|
|
||||||
"--with-qt-dir=${qt3}"
|
|
||||||
];
|
|
||||||
|
|
||||||
preInstall = ''
|
|
||||||
mkdir -p $out/share/emacs/site-lisp/
|
|
||||||
cp Contrib/emacs/taskjug.el $out/share/emacs/site-lisp/
|
|
||||||
'';
|
|
||||||
|
|
||||||
# kde_locale is not defined when installing without kde.
|
|
||||||
installFlags = [ "kde_locale=\${out}/share/locale" ];
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "http://www.taskjuggler.org";
|
|
||||||
license = lib.licenses.gpl2;
|
|
||||||
description = "Project management tool";
|
|
||||||
longDescription = ''
|
|
||||||
TaskJuggler is a modern and powerful, Open Source project management
|
|
||||||
tool. Its new approach to project planing and tracking is more
|
|
||||||
flexible and superior to the commonly used Gantt chart editing
|
|
||||||
tools. It has already been successfully used in many projects and
|
|
||||||
scales easily to projects with hundreds of resources and thousands of
|
|
||||||
tasks.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,48 +0,0 @@
|
|||||||
From the discussion in http://groups.google.com/group/taskjuggler-users/browse_thread/thread/f65a3efd4dcae2fc/a44c711a9d28ebee?show_docid=a44c711a9d28ebee
|
|
||||||
|
|
||||||
From: Chris Schlaeger <cs@kde.org>
|
|
||||||
Date: Sat, 27 Feb 2010 06:33:35 +0000 (+0100)
|
|
||||||
Subject: Try to fix time zone check for glibc 2.11.
|
|
||||||
X-Git-Url: http://www.taskjuggler.org/cgi-bin/gitweb.cgi?p=taskjuggler.git;a=commitdiff_plain;h=2382ed54f90c3c899badb3f56aaa2b3b5dba361e;hp=c666c5068312fec7db75e17d1c567d94127d1dda
|
|
||||||
|
|
||||||
Try to fix time zone check for glibc 2.11.
|
|
||||||
|
|
||||||
Reported-by: Lee <pFQh8RQn4fqB@dyweni.com>
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/taskjuggler/Utility.cpp b/taskjuggler/Utility.cpp
|
|
||||||
index 5e2bf21..9b7fce2 100644
|
|
||||||
--- a/taskjuggler/Utility.cpp
|
|
||||||
+++ b/taskjuggler/Utility.cpp
|
|
||||||
@@ -206,16 +206,28 @@ setTimezone(const char* tZone)
|
|
||||||
|
|
||||||
/* To validate the tZone value we call tzset(). It will convert the zone
|
|
||||||
* into a three-letter acronym in case the tZone value is good. If not, it
|
|
||||||
- * will just copy the wrong value to tzname[0] (glibc < 2.5) or fall back
|
|
||||||
- * to UTC. */
|
|
||||||
+ * will
|
|
||||||
+ * - copy the wrong value to tzname[0] (glibc < 2.5)
|
|
||||||
+ * - or fall back to UTC (glibc >= 2.5 && < 2.11)
|
|
||||||
+ * - copy the part before the '/' to tzname[0] (glibc >= 2.11).
|
|
||||||
+ */
|
|
||||||
tzset();
|
|
||||||
+ char* region = new(char[strlen(tZone) + 1]);
|
|
||||||
+ region[0] = 0;
|
|
||||||
+ if (strchr(tZone, '/'))
|
|
||||||
+ {
|
|
||||||
+ strcpy(region, tZone);
|
|
||||||
+ *strchr(region, '/') = 0;
|
|
||||||
+ }
|
|
||||||
if (timezone2tz(tZone) == 0 &&
|
|
||||||
- (strcmp(tzname[0], tZone) == 0 ||
|
|
||||||
+ (strcmp(tzname[0], tZone) == 0 || strcmp(tzname[0], region) == 0 ||
|
|
||||||
(strcmp(tZone, "UTC") != 0 && strcmp(tzname[0], "UTC") == 0)))
|
|
||||||
{
|
|
||||||
UtilityError = QString(i18n("Illegal timezone '%1'")).arg(tZone);
|
|
||||||
+ delete region;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
+ delete region;
|
|
||||||
|
|
||||||
if (!LtHashTab)
|
|
||||||
return true;
|
|
Loading…
Reference in New Issue
Block a user