transgui: 5.0.1-svn-r988 -> 5.17.0

This commit is contained in:
ajs124 2019-07-03 01:41:07 +02:00 committed by Lassulus
parent bb7a367fed
commit f4398b3212
2 changed files with 11 additions and 32 deletions

View File

@ -1,14 +1,15 @@
{ stdenv, fetchsvn, pkgconfig, makeDesktopItem, unzip, fpc, lazarus,
{ stdenv, fetchFromGitHub, pkgconfig, makeDesktopItem, unzip, fpc, lazarus,
libX11, glib, gtk2, gdk_pixbuf, pango, atk, cairo, openssl }:
stdenv.mkDerivation rec {
name = "transgui-5.0.1-svn-r${revision}";
revision = "988";
pname = "transgui";
version = "5.17.0";
src = fetchsvn {
url = "https://svn.code.sf.net/p/transgui/code/trunk/";
rev = revision;
sha256 = "1i6ysxs6d2wsmqi6ha10rl3n562brmhizlanhcfad04i53y8pyxf";
src = fetchFromGitHub {
owner = "transmission-remote-gui";
repo = "transgui";
rev = "v${version}";
sha256 = "0p76vavny5asi5naa4jn67raxlarsmrkbchfn96y6gh5p2vzwpl7";
};
nativeBuildInputs = [ pkgconfig ];
@ -27,9 +28,9 @@ stdenv.mkDerivation rec {
substituteInPlace restranslator.pas --replace /usr/ $out/
'';
patches = [
./r988-compile-fix.patch
];
preBuild = ''
lazbuild -B transgui.lpr --lazarusdir=${lazarus}/share/lazarus
'';
makeFlags = [
"FPC=fpc"

View File

@ -1,22 +0,0 @@
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:=LazUtf8.ParamStrUTF8(Param);
end;
function ParamCount: integer;