Merge pull request #32903 from corngood/transgui-update
transgui: 5.0.1-svn-r986 -> 5.0.1-svn-r988
This commit is contained in:
commit
e17e2bcbf5
@ -3,12 +3,12 @@ libX11, glib, gtk2, gdk_pixbuf, pango, atk, cairo, openssl }:
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "transgui-5.0.1-svn-r${revision}";
|
name = "transgui-5.0.1-svn-r${revision}";
|
||||||
revision = "986";
|
revision = "988";
|
||||||
|
|
||||||
src = fetchsvn {
|
src = fetchsvn {
|
||||||
url = "https://svn.code.sf.net/p/transgui/code/trunk/";
|
url = "https://svn.code.sf.net/p/transgui/code/trunk/";
|
||||||
rev = revision;
|
rev = revision;
|
||||||
sha256 = "0z83hvlhllm6p1z4gkcfi1x3akgn2xkssnfhwp74qynb0n5362pi";
|
sha256 = "1i6ysxs6d2wsmqi6ha10rl3n562brmhizlanhcfad04i53y8pyxf";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
|
|||||||
substituteInPlace restranslator.pas --replace /usr/ $out/
|
substituteInPlace restranslator.pas --replace /usr/ $out/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
./r988-compile-fix.patch
|
||||||
|
];
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
"FPC=fpc"
|
"FPC=fpc"
|
||||||
"PP=fpc"
|
"PP=fpc"
|
||||||
|
@ -0,0 +1,22 @@
|
|||||||
|
diff --git a/utils.pas b/utils.pas
|
||||||
|
index eb8b828..1ff2440 100644
|
||||||
|
--- a/utils.pas
|
||||||
|
+++ b/utils.pas
|
||||||
|
@@ -100,7 +100,7 @@ uses
|
||||||
|
{$ifdef CALLSTACK}
|
||||||
|
lineinfo2,
|
||||||
|
{$endif CALLSTACK}
|
||||||
|
- LazFileUtils, LazUtf8, StdCtrls, Graphics;
|
||||||
|
+ LazFileUtils, LazUtf8, StdCtrls, Graphics, FileUtil;
|
||||||
|
|
||||||
|
{$ifdef windows}
|
||||||
|
function FileOpenUTF8(Const FileName : string; Mode : Integer) : THandle;
|
||||||
|
@@ -235,7 +235,7 @@ end;
|
||||||
|
|
||||||
|
function ParamStrUTF8(Param: Integer): utf8string;
|
||||||
|
begin
|
||||||
|
- Result:=FileUtil.ParamStrUTF8(Param);
|
||||||
|
+ Result:=ParamStrUTF8(Param);
|
||||||
|
end;
|
||||||
|
|
||||||
|
function ParamCount: integer;
|
Loading…
Reference in New Issue
Block a user