Attachment #245322 for bug #274140

View | Details | Raw Unified | Return to bug 274140
Collapse All | Expand All

Lines 1-12 Link Here

(-)b/net-p2p/transmission-remote-gui/Makefile (-6 / +9 lines)
1	PORTNAME= transmission-remote-gui	1	PORTNAME= transmission-remote-gui
2	PORTVERSION= 5.18.0	2	PORTVERSION= 5.18.3
3	PORTREVISION= 15
4	DISTVERSIONPREFIX= v	3	DISTVERSIONPREFIX= v
		4	DISTVERSIONSUFFIX= .f
5	CATEGORIES= net-p2p	5	CATEGORIES= net-p2p
6	PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}	6	PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}
7		7
8	USE_GITHUB= yes	8	USE_GITHUB= yes
9	GH_PROJECT= transgui	9	GH_ACCOUNT= xavery
		10	GH_PROJECT= transgui synapse:synapselib
		11	GH_TAGNAME= af5a202:synapselib
		12	GH_SUBDIR= synapse/source/lib:synapselib
10		13
11	MAINTAINER= acm@FreeBSD.org	14	MAINTAINER= acm@FreeBSD.org
12	COMMENT= Remote GUI for transmission daemon	15	COMMENT= Remote GUI for transmission daemon
Lines 16-23 LICENSE= GPLv2+ Link Here
16	LICENSE_FILE= ${WRKSRC}/COPYING.txt	19	LICENSE_FILE= ${WRKSRC}/COPYING.txt
17		20
18	USES= desktop-file-utils fpc gnome iconv lazarus:flavors xorg	21	USES= desktop-file-utils fpc gnome iconv lazarus:flavors xorg
19	USE_FPC= cairo chm fcl-base fcl-image fcl-json fcl-net fcl-xml pasjpeg \	22	USE_FPC= cairo chm fcl-base fcl-extra fcl-image fcl-json fcl-net \
20	rtl-objpas rtl-extra x11	23	fcl-xml pasjpeg rtl-objpas rtl-extra x11
21	USE_GNOME= cairo	24	USE_GNOME= cairo
22	USE_XORG= x11	25	USE_XORG= x11
23		26
Lines 25-31 DESKTOP_ENTRIES="Transmission Remote GUI" \ Link Here
25	"Remote GUI for transmission daemon" \	28	"Remote GUI for transmission daemon" \
26	"transgui" \	29	"transgui" \
27	"${PREFIX}/bin/transgui" \	30	"${PREFIX}/bin/transgui" \
28	"Application;Network;" \	31	"Network;P2P;" \
29	${TRUE}	32	${TRUE}
30		33
31	PLIST_FILES= bin/transgui \	34	PLIST_FILES= bin/transgui \

Lines 1-3 Link Here

(-)b/net-p2p/transmission-remote-gui/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1577680999	1	TIMESTAMP = 1695994023
2	SHA256 (transmission-remote-gui-transgui-v5.18.0_GH0.tar.gz) = d1cbb16eb35d41e76f4a171a3887053899e8dc6a1124afc21615b5038ea60d78	2	SHA256 (xavery-transgui-v5.18.3.f_GH0.tar.gz) = f4eca3859855c2280741e72ae3d5958b19b4036589876d8ca4bc011887dd52d6
3	SIZE (transmission-remote-gui-transgui-v5.18.0_GH0.tar.gz) = 2848716	3	SIZE (xavery-transgui-v5.18.3.f_GH0.tar.gz) = 669018
		4	SHA256 (xavery-synapse-af5a202_GH0.tar.gz) = 5afca693a0a3be82b39582c15ab112b64edfaff4d757e2aeb22890dd4a211e8d
		5	SIZE (xavery-synapse-af5a202_GH0.tar.gz) = 356417

Added Link Here

(-)b/net-p2p/transmission-remote-gui/files/patch-main.pas (+10 lines)
1	--- main.pas.orig 2023-09-29 13:34:52 UTC
2	+++ main.pas
3	@@ -1554,7 +1554,6 @@ begin
4	FTorrents:=TVarList.Create(gTorrents.Columns.Count, 0);
5	FTorrents.ExtraColumns:=TorrentsExtraColumns;
6	gTorrents.Items.ExtraColumns:=TorrentsExtraColumns;
7	- gTorrents.Options2:=[goNoScrollAfterSetRow];
8	lvFiles.Items.ExtraColumns:=FilesExtraColumns;
9	FFiles:=lvFiles.Items;
10	FFilesTree:=TFilesTree.Create(lvFiles);




--- rpc.pas	2019-10-12 00:52:07.000000000 -0500
+++ rpc.pas	2021-01-06 18:48:06.854420000 -0500
@@ -805,21 +805,32 @@
   req, args: TJSONObject;
   _fields: TJSONArray;
   i: integer;
+  sl: TStringList;
 begin
   Result:=nil;
   req:=TJSONObject.Create;
+  sl:=TStringList.Create;
   try
     req.Add('method', 'torrent-get');
     args:=TJSONObject.Create;
     if TorrentId <> 0 then
       args.Add('ids', TJSONArray.Create([TorrentId]));
-    _fields:=TJSONArray.Create(Fields);
-    for i:=Low(ExtraFields) to High(ExtraFields) do
-      _fields.Add(ExtraFields[i]);
+    _fields:=TJSONArray.Create;
+    for i:=Low(Fields) to High(Fields) do
+      if (Fields[i].VType=vtAnsiString) then
+         sl.Add(String(Fields[i].VAnsiString));
+    sl.AddStrings(ExtraFields);
+    sl.Sort;
+    for i:=sl.Count-2 downto 0 do
+      if (sl[i]=sl[i+1]) then
+        sl.Delete(i+1);
+    for i:=0 to sl.Count-1 do
+      _fields.Add(sl[i]);
     args.Add('fields', _fields);
     req.Add('arguments', args);
     Result:=SendRequest(req);
   finally
+    sl.Free;
     req.Free;
   end;
 end;
- 

Return to bug 274140

Removed Link Here

(-)a/net-p2p/transmission-remote-gui/files/patch-rpc.pas (-39 lines)
1	--- rpc.pas 2019-10-12 00:52:07.000000000 -0500
2	+++ rpc.pas 2021-01-06 18:48:06.854420000 -0500
3	@@ -805,21 +805,32 @@
4	req, args: TJSONObject;
5	_fields: TJSONArray;
6	i: integer;
7	+ sl: TStringList;
8	begin
9	Result:=nil;
10	req:=TJSONObject.Create;
11	+ sl:=TStringList.Create;
12	try
13	req.Add('method', 'torrent-get');
14	args:=TJSONObject.Create;
15	if TorrentId <> 0 then
16	args.Add('ids', TJSONArray.Create([TorrentId]));
17	- _fields:=TJSONArray.Create(Fields);
18	- for i:=Low(ExtraFields) to High(ExtraFields) do
19	- _fields.Add(ExtraFields[i]);
20	+ _fields:=TJSONArray.Create;
21	+ for i:=Low(Fields) to High(Fields) do
22	+ if (Fields[i].VType=vtAnsiString) then
23	+ sl.Add(String(Fields[i].VAnsiString));
24	+ sl.AddStrings(ExtraFields);
25	+ sl.Sort;
26	+ for i:=sl.Count-2 downto 0 do
27	+ if (sl[i]=sl[i+1]) then
28	+ sl.Delete(i+1);
29	+ for i:=0 to sl.Count-1 do
30	+ _fields.Add(sl[i]);
31	args.Add('fields', _fields);
32	req.Add('arguments', args);
33	Result:=SendRequest(req);
34	finally
35	+ sl.Free;
36	req.Free;
37	end;
38	end;
39	-