1 |
commit: f311853431ea7ce292d6fa9604f8eb99ff776951 |
2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 29 07:18:25 2022 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 29 07:18:25 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3118534 |
7 |
|
8 |
app-text/jabref: treeclean |
9 |
|
10 |
Closes: https://bugs.gentoo.org/792606 |
11 |
Closes: https://bugs.gentoo.org/600698 |
12 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
13 |
|
14 |
app-text/jabref/Manifest | 1 - |
15 |
.../files/jabref-2.10-javax.swing-java-9+.patch | 313 ------------------ |
16 |
.../files/jabref-2.10-skip-failing-tests.patch | 349 --------------------- |
17 |
.../files/jabref-2.10-test-jvm-props-args.patch | 49 --- |
18 |
app-text/jabref/files/jabref-2.10-test-prefs.xml | 19 -- |
19 |
app-text/jabref/jabref-2.10-r7.ebuild | 132 -------- |
20 |
app-text/jabref/metadata.xml | 19 -- |
21 |
profiles/package.mask | 6 - |
22 |
8 files changed, 888 deletions(-) |
23 |
|
24 |
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest |
25 |
deleted file mode 100644 |
26 |
index 2759022f01e2..000000000000 |
27 |
--- a/app-text/jabref/Manifest |
28 |
+++ /dev/null |
29 |
@@ -1 +0,0 @@ |
30 |
-DIST JabRef-2.10-src.tar.bz2 16769469 BLAKE2B adb0acabd1872d5b9b054e8c4c7e85a0cf0425ad748408e248a66dceef7ba3eca0af8a8d2cc1ef0828bc930cab7e48e8f1800c8e55902af19b4827ae4480fe16 SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942 |
31 |
|
32 |
diff --git a/app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch b/app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch |
33 |
deleted file mode 100644 |
34 |
index 30dbe53e9725..000000000000 |
35 |
--- a/app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch |
36 |
+++ /dev/null |
37 |
@@ -1,313 +0,0 @@ |
38 |
-From bd03f07b5bcc5feb558caec4fbfd556947630fb9 Mon Sep 17 00:00:00 2001 |
39 |
-From: Yuan Liao <liaoyuan@×××××.com> |
40 |
-Date: Sat, 19 Feb 2022 08:25:21 -0800 |
41 |
-Subject: [PATCH] Update uses of javax.swing API members for Java 9+ |
42 |
- |
43 |
-These changes are backward compatible with Java 8. |
44 |
- |
45 |
-Signed-off-by: Yuan Liao <liaoyuan@×××××.com> |
46 |
---- |
47 |
- .../sf/jabref/FindUnlinkedFilesDialog.java | 9 ++++----- |
48 |
- .../net/sf/jabref/collab/EntryChange.java | 6 +++--- |
49 |
- .../sf/jabref/groups/AddToGroupAction.java | 5 +++-- |
50 |
- .../net/sf/jabref/groups/GroupSelector.java | 9 +++++---- |
51 |
- .../net/sf/jabref/groups/GroupTreeNode.java | 20 ++++++++----------- |
52 |
- src/java/net/sf/jabref/groups/GroupsTree.java | 17 ++++++++-------- |
53 |
- .../jabref/imports/AppendDatabaseAction.java | 5 +++-- |
54 |
- .../sf/jabref/sql/exporter/DBExporter.java | 9 +++++---- |
55 |
- 8 files changed, 40 insertions(+), 40 deletions(-) |
56 |
- |
57 |
-diff --git a/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java b/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java |
58 |
-index 4bcbd73..5f7473d 100644 |
59 |
---- a/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java |
60 |
-+++ b/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java |
61 |
-@@ -669,13 +669,12 @@ public class FindUnlinkedFilesDialog extends JDialog { |
62 |
- * The root node representing a tree structure. |
63 |
- * @return A list of files of all checked leaf nodes. |
64 |
- */ |
65 |
-- @SuppressWarnings("unchecked") |
66 |
- private List<File> getFileListFromNode(CheckableTreeNode node) { |
67 |
- List<File> filesList = new ArrayList<File>(); |
68 |
-- Enumeration<CheckableTreeNode> childs = node.depthFirstEnumeration(); |
69 |
-+ Enumeration<TreeNode> childs = node.depthFirstEnumeration(); |
70 |
- ArrayList<CheckableTreeNode> nodesToRemove = new ArrayList<FindUnlinkedFilesDialog.CheckableTreeNode>(); |
71 |
- while (childs.hasMoreElements()) { |
72 |
-- CheckableTreeNode child = childs.nextElement(); |
73 |
-+ CheckableTreeNode child = (CheckableTreeNode) childs.nextElement(); |
74 |
- if (child.isLeaf() && child.getSelected()) { |
75 |
- File nodeFile = ((FileNodeWrapper) child.getUserObject()).file; |
76 |
- if (nodeFile != null && nodeFile.isFile()) { |
77 |
-@@ -1105,9 +1104,9 @@ public class FindUnlinkedFilesDialog extends JDialog { |
78 |
- @SuppressWarnings("unchecked") |
79 |
- public void setSelected(boolean bSelected) { |
80 |
- isSelected = bSelected; |
81 |
-- Enumeration<CheckableTreeNode> children = this.children(); |
82 |
-+ Enumeration<TreeNode> children = this.children(); |
83 |
- while (children.hasMoreElements()) { |
84 |
-- CheckableTreeNode child = children.nextElement(); |
85 |
-+ CheckableTreeNode child = (CheckableTreeNode) children.nextElement(); |
86 |
- child.setSelected(bSelected); |
87 |
- } |
88 |
- |
89 |
-diff --git a/src/java/net/sf/jabref/collab/EntryChange.java b/src/java/net/sf/jabref/collab/EntryChange.java |
90 |
-index 924fd25..d479995 100644 |
91 |
---- a/src/java/net/sf/jabref/collab/EntryChange.java |
92 |
-+++ b/src/java/net/sf/jabref/collab/EntryChange.java |
93 |
-@@ -21,6 +21,7 @@ import java.util.TreeSet; |
94 |
- import javax.swing.JComponent; |
95 |
- import javax.swing.JLabel; |
96 |
- import javax.swing.JScrollPane; |
97 |
-+import javax.swing.tree.TreeNode; |
98 |
- |
99 |
- import net.sf.jabref.*; |
100 |
- import net.sf.jabref.undo.NamedCompound; |
101 |
-@@ -83,11 +84,10 @@ public class EntryChange extends Change { |
102 |
- |
103 |
- |
104 |
- public boolean makeChange(BasePanel panel, BibtexDatabase secondary, NamedCompound undoEdit) { |
105 |
-- @SuppressWarnings("unchecked") |
106 |
- boolean allAccepted = true; |
107 |
-- Enumeration<Change> e = children(); |
108 |
-+ Enumeration<TreeNode> e = children(); |
109 |
- for (; e.hasMoreElements();) { |
110 |
-- Change c = e.nextElement(); |
111 |
-+ Change c = (Change) e.nextElement(); |
112 |
- if (c.isAcceptable() && c.isAccepted()) |
113 |
- c.makeChange(panel, secondary, undoEdit); |
114 |
- else allAccepted = false; |
115 |
-diff --git a/src/java/net/sf/jabref/groups/AddToGroupAction.java b/src/java/net/sf/jabref/groups/AddToGroupAction.java |
116 |
-index 30d57c8..1840e32 100644 |
117 |
---- a/src/java/net/sf/jabref/groups/AddToGroupAction.java |
118 |
-+++ b/src/java/net/sf/jabref/groups/AddToGroupAction.java |
119 |
-@@ -20,6 +20,7 @@ import java.util.Enumeration; |
120 |
- import java.util.Vector; |
121 |
- |
122 |
- import javax.swing.AbstractAction; |
123 |
-+import javax.swing.tree.TreeNode; |
124 |
- import javax.swing.undo.AbstractUndoableEdit; |
125 |
- |
126 |
- import net.sf.jabref.BasePanel; |
127 |
-@@ -59,10 +60,10 @@ public class AddToGroupAction extends AbstractAction { |
128 |
- |
129 |
- if (m_move) { |
130 |
- // collect warnings for removal |
131 |
-- Enumeration<GroupTreeNode> e = ((GroupTreeNode) m_node.getRoot()).preorderEnumeration(); |
132 |
-+ Enumeration<TreeNode> e = ((GroupTreeNode) m_node.getRoot()).preorderEnumeration(); |
133 |
- GroupTreeNode node; |
134 |
- while (e.hasMoreElements()) { |
135 |
-- node = e.nextElement(); |
136 |
-+ node = (GroupTreeNode) e.nextElement(); |
137 |
- if (!node.getGroup().supportsRemove()) |
138 |
- continue; |
139 |
- for (int i = 0; i < entries.length; ++i) { |
140 |
-diff --git a/src/java/net/sf/jabref/groups/GroupSelector.java b/src/java/net/sf/jabref/groups/GroupSelector.java |
141 |
-index 4700d13..4813f12 100644 |
142 |
---- a/src/java/net/sf/jabref/groups/GroupSelector.java |
143 |
-+++ b/src/java/net/sf/jabref/groups/GroupSelector.java |
144 |
-@@ -60,6 +60,7 @@ import javax.swing.event.PopupMenuListener; |
145 |
- import javax.swing.event.TreeSelectionEvent; |
146 |
- import javax.swing.event.TreeSelectionListener; |
147 |
- import javax.swing.tree.DefaultTreeModel; |
148 |
-+import javax.swing.tree.TreeNode; |
149 |
- import javax.swing.tree.TreePath; |
150 |
- import javax.swing.undo.AbstractUndoableEdit; |
151 |
- import javax.swing.undo.CompoundEdit; |
152 |
-@@ -1498,8 +1499,8 @@ public class GroupSelector extends SidePaneComponent implements |
153 |
- GroupTreeNode node; |
154 |
- AbstractGroup group; |
155 |
- Vector<GroupTreeNode> vec = new Vector<GroupTreeNode>(); |
156 |
-- for (Enumeration<GroupTreeNode> e = groupsRoot.preorderEnumeration(); e.hasMoreElements();) { |
157 |
-- node = e.nextElement(); |
158 |
-+ for (Enumeration<TreeNode> e = groupsRoot.preorderEnumeration(); e.hasMoreElements();) { |
159 |
-+ node = (GroupTreeNode) e.nextElement(); |
160 |
- group = node.getGroup(); |
161 |
- int i; |
162 |
- for (i = 0; i < entries.length; ++i) { |
163 |
-@@ -1537,8 +1538,8 @@ public class GroupSelector extends SidePaneComponent implements |
164 |
- BibtexEntry entry; |
165 |
- Vector<GroupTreeNode> vec = new Vector<GroupTreeNode>(); |
166 |
- Map<String, String> dummyMap = new HashMap<String, String>(); // just because I don't want to use null... |
167 |
-- for (Enumeration<GroupTreeNode> e = groupsRoot.depthFirstEnumeration(); e.hasMoreElements();) { |
168 |
-- node = e.nextElement(); |
169 |
-+ for (Enumeration<TreeNode> e = groupsRoot.depthFirstEnumeration(); e.hasMoreElements();) { |
170 |
-+ node = (GroupTreeNode) e.nextElement(); |
171 |
- rule = node.getSearchRule(); |
172 |
- for (Iterator<BibtexEntry> it = matches.iterator(); it.hasNext();) { |
173 |
- entry = it.next(); |
174 |
-diff --git a/src/java/net/sf/jabref/groups/GroupTreeNode.java b/src/java/net/sf/jabref/groups/GroupTreeNode.java |
175 |
-index 9013af4..c55c7cf 100644 |
176 |
---- a/src/java/net/sf/jabref/groups/GroupTreeNode.java |
177 |
-+++ b/src/java/net/sf/jabref/groups/GroupTreeNode.java |
178 |
-@@ -81,10 +81,10 @@ public class GroupTreeNode extends DefaultMutableTreeNode implements |
179 |
- */ |
180 |
- public String getTreeAsString() { |
181 |
- StringBuffer sb = new StringBuffer(); |
182 |
-- Enumeration<GroupTreeNode> e = preorderEnumeration(); |
183 |
-+ Enumeration<TreeNode> e = preorderEnumeration(); |
184 |
- GroupTreeNode cursor; |
185 |
- while (e.hasMoreElements()) { |
186 |
-- cursor = e.nextElement(); |
187 |
-+ cursor = (GroupTreeNode) e.nextElement(); |
188 |
- sb.append(cursor.getLevel()).append(" ").append(cursor.getGroup().toString()).append("\n"); |
189 |
- } |
190 |
- return sb.toString(); |
191 |
-@@ -194,26 +194,22 @@ public class GroupTreeNode extends DefaultMutableTreeNode implements |
192 |
- } |
193 |
- |
194 |
- @Override |
195 |
-- @SuppressWarnings("unchecked") |
196 |
-- public Enumeration<GroupTreeNode> preorderEnumeration(){ |
197 |
-+ public Enumeration<TreeNode> preorderEnumeration(){ |
198 |
- return super.preorderEnumeration(); |
199 |
- } |
200 |
- |
201 |
- @Override |
202 |
-- @SuppressWarnings("unchecked") |
203 |
-- public Enumeration<GroupTreeNode> depthFirstEnumeration(){ |
204 |
-+ public Enumeration<TreeNode> depthFirstEnumeration(){ |
205 |
- return super.depthFirstEnumeration(); |
206 |
- } |
207 |
- |
208 |
- @Override |
209 |
-- @SuppressWarnings("unchecked") |
210 |
-- public Enumeration<GroupTreeNode> breadthFirstEnumeration(){ |
211 |
-+ public Enumeration<TreeNode> breadthFirstEnumeration(){ |
212 |
- return super.breadthFirstEnumeration(); |
213 |
- } |
214 |
- |
215 |
- @Override |
216 |
-- @SuppressWarnings("unchecked") |
217 |
-- public Enumeration<GroupTreeNode> children(){ |
218 |
-+ public Enumeration<TreeNode> children(){ |
219 |
- return super.children(); |
220 |
- } |
221 |
- |
222 |
-@@ -224,10 +220,10 @@ public class GroupTreeNode extends DefaultMutableTreeNode implements |
223 |
- */ |
224 |
- public AbstractGroup[] getMatchingGroups(BibtexEntry entry) { |
225 |
- Vector<AbstractGroup> matchingGroups = new Vector<AbstractGroup>(); |
226 |
-- Enumeration<GroupTreeNode> e = preorderEnumeration(); |
227 |
-+ Enumeration<TreeNode> e = preorderEnumeration(); |
228 |
- AbstractGroup group; |
229 |
- while (e.hasMoreElements()) { |
230 |
-- group = (e.nextElement()).getGroup(); |
231 |
-+ group = ((GroupTreeNode) e.nextElement()).getGroup(); |
232 |
- if (group.contains(null, entry)) // first argument is never used |
233 |
- matchingGroups.add(group); |
234 |
- } |
235 |
-diff --git a/src/java/net/sf/jabref/groups/GroupsTree.java b/src/java/net/sf/jabref/groups/GroupsTree.java |
236 |
-index e58a567..c3daf94 100644 |
237 |
---- a/src/java/net/sf/jabref/groups/GroupsTree.java |
238 |
-+++ b/src/java/net/sf/jabref/groups/GroupsTree.java |
239 |
-@@ -31,6 +31,7 @@ import javax.swing.JTree; |
240 |
- import javax.swing.SwingUtilities; |
241 |
- import javax.swing.ToolTipManager; |
242 |
- import javax.swing.tree.DefaultMutableTreeNode; |
243 |
-+import javax.swing.tree.TreeNode; |
244 |
- import javax.swing.tree.TreePath; |
245 |
- import javax.swing.tree.TreeSelectionModel; |
246 |
- import javax.swing.undo.AbstractUndoableEdit; |
247 |
-@@ -415,14 +416,14 @@ public class GroupsTree extends JTree implements DragSourceListener, |
248 |
- |
249 |
- /** Expand this node and all its children. */ |
250 |
- public void expandSubtree(GroupTreeNode node) { |
251 |
-- for (Enumeration<GroupTreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();) |
252 |
-- expandPath(new TreePath(e.nextElement().getPath())); |
253 |
-+ for (Enumeration<TreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();) |
254 |
-+ expandPath(new TreePath(((GroupTreeNode) e.nextElement()).getPath())); |
255 |
- } |
256 |
- |
257 |
- /** Collapse this node and all its children. */ |
258 |
- public void collapseSubtree(GroupTreeNode node) { |
259 |
-- for (Enumeration<GroupTreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();) |
260 |
-- collapsePath(new TreePath((e.nextElement()) |
261 |
-+ for (Enumeration<TreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();) |
262 |
-+ collapsePath(new TreePath(((GroupTreeNode) e.nextElement()) |
263 |
- .getPath())); |
264 |
- } |
265 |
- |
266 |
-@@ -432,8 +433,8 @@ public class GroupsTree extends JTree implements DragSourceListener, |
267 |
- */ |
268 |
- public boolean hasExpandedDescendant(TreePath path) { |
269 |
- GroupTreeNode node = (GroupTreeNode) path.getLastPathComponent(); |
270 |
-- for (Enumeration<GroupTreeNode> e = node.children(); e.hasMoreElements();) { |
271 |
-- GroupTreeNode child = e.nextElement(); |
272 |
-+ for (Enumeration<TreeNode> e = node.children(); e.hasMoreElements();) { |
273 |
-+ GroupTreeNode child = (GroupTreeNode) e.nextElement(); |
274 |
- if (child.isLeaf()) |
275 |
- continue; // don't care about this case |
276 |
- TreePath pathToChild = path.pathByAddingChild(child); |
277 |
-@@ -449,8 +450,8 @@ public class GroupsTree extends JTree implements DragSourceListener, |
278 |
- */ |
279 |
- public boolean hasCollapsedDescendant(TreePath path) { |
280 |
- GroupTreeNode node = (GroupTreeNode) path.getLastPathComponent(); |
281 |
-- for (Enumeration<GroupTreeNode> e = node.children(); e.hasMoreElements();) { |
282 |
-- GroupTreeNode child = e.nextElement(); |
283 |
-+ for (Enumeration<TreeNode> e = node.children(); e.hasMoreElements();) { |
284 |
-+ GroupTreeNode child = (GroupTreeNode) e.nextElement(); |
285 |
- if (child.isLeaf()) |
286 |
- continue; // don't care about this case |
287 |
- TreePath pathToChild = path.pathByAddingChild(child); |
288 |
-diff --git a/src/java/net/sf/jabref/imports/AppendDatabaseAction.java b/src/java/net/sf/jabref/imports/AppendDatabaseAction.java |
289 |
-index ad84bbc..5fdce20 100644 |
290 |
---- a/src/java/net/sf/jabref/imports/AppendDatabaseAction.java |
291 |
-+++ b/src/java/net/sf/jabref/imports/AppendDatabaseAction.java |
292 |
-@@ -22,6 +22,7 @@ import java.util.Iterator; |
293 |
- import java.util.List; |
294 |
- |
295 |
- import javax.swing.JOptionPane; |
296 |
-+import javax.swing.tree.TreeNode; |
297 |
- |
298 |
- import net.sf.jabref.BaseAction; |
299 |
- import net.sf.jabref.BasePanel; |
300 |
-@@ -175,9 +176,9 @@ public class AppendDatabaseAction extends BaseAction { |
301 |
- ExplicitGroup group; |
302 |
- BibtexEntry entry; |
303 |
- |
304 |
-- for (Enumeration<GroupTreeNode> e = newGroups |
305 |
-+ for (Enumeration<TreeNode> e = newGroups |
306 |
- .preorderEnumeration(); e.hasMoreElements();) { |
307 |
-- node = e.nextElement(); |
308 |
-+ node = (GroupTreeNode) e.nextElement(); |
309 |
- if (!(node.getGroup() instanceof ExplicitGroup)) |
310 |
- continue; |
311 |
- group = (ExplicitGroup) node.getGroup(); |
312 |
-diff --git a/src/java/net/sf/jabref/sql/exporter/DBExporter.java b/src/java/net/sf/jabref/sql/exporter/DBExporter.java |
313 |
-index deb9126..1518e0b 100644 |
314 |
---- a/src/java/net/sf/jabref/sql/exporter/DBExporter.java |
315 |
-+++ b/src/java/net/sf/jabref/sql/exporter/DBExporter.java |
316 |
-@@ -32,6 +32,7 @@ import java.util.Set; |
317 |
- import java.util.Vector; |
318 |
- |
319 |
- import javax.swing.JOptionPane; |
320 |
-+import javax.swing.tree.TreeNode; |
321 |
- |
322 |
- import net.sf.jabref.BibtexDatabase; |
323 |
- import net.sf.jabref.BibtexEntry; |
324 |
-@@ -201,9 +202,9 @@ public abstract class DBExporter extends DBImporterExporter{ |
325 |
- rs.next(); |
326 |
- myID = rs.getInt("groups_id"); |
327 |
- } |
328 |
-- for (Enumeration<GroupTreeNode> e = cursor.children(); e |
329 |
-+ for (Enumeration<TreeNode> e = cursor.children(); e |
330 |
- .hasMoreElements();) |
331 |
-- currentID = populateEntryGroupsTable(e.nextElement(), myID, |
332 |
-+ currentID = populateEntryGroupsTable((GroupTreeNode) e.nextElement(), myID, |
333 |
- currentID, out, database_id); |
334 |
- return currentID; |
335 |
- } |
336 |
-@@ -338,9 +339,9 @@ public abstract class DBExporter extends DBImporterExporter{ |
337 |
- rs.next(); |
338 |
- myID = rs.getInt("groups_id"); |
339 |
- } |
340 |
-- for (Enumeration<GroupTreeNode> e = cursor.children(); e |
341 |
-+ for (Enumeration<TreeNode> e = cursor.children(); e |
342 |
- .hasMoreElements();) |
343 |
-- currentID = populateGroupsTable(e.nextElement(), myID, ++currentID, |
344 |
-+ currentID = populateGroupsTable((GroupTreeNode) e.nextElement(), myID, ++currentID, |
345 |
- out, database_id); |
346 |
- return currentID; |
347 |
- } |
348 |
--- |
349 |
-2.34.1 |
350 |
- |
351 |
|
352 |
diff --git a/app-text/jabref/files/jabref-2.10-skip-failing-tests.patch b/app-text/jabref/files/jabref-2.10-skip-failing-tests.patch |
353 |
deleted file mode 100644 |
354 |
index 95a2e7310fe6..000000000000 |
355 |
--- a/app-text/jabref/files/jabref-2.10-skip-failing-tests.patch |
356 |
+++ /dev/null |
357 |
@@ -1,349 +0,0 @@ |
358 |
-From 0791be415c4104a4c7ff79487823a9f0a7a1d2ec Mon Sep 17 00:00:00 2001 |
359 |
-From: Yuan Liao <liaoyuan@×××××.com> |
360 |
-Date: Sat, 19 Feb 2022 10:47:42 -0800 |
361 |
-Subject: [PATCH] Skip tests that fail when run directly outside Portage |
362 |
- |
363 |
-Because the tests are JUnit 3 tests, to skip them, each test's method |
364 |
-name needs to be changed to something that does not start with 'test'. |
365 |
- |
366 |
-Signed-off-by: Yuan Liao <liaoyuan@×××××.com> |
367 |
---- |
368 |
- .../tests/net/sf/jabref/UtilFindFileTest.java | 4 ++-- |
369 |
- src/java/tests/net/sf/jabref/UtilTest.java | 10 +++++----- |
370 |
- .../jabref/export/layout/LayoutEntryTest.java | 19 ++++++++++++++----- |
371 |
- .../sf/jabref/export/layout/LayoutTest.java | 4 ++-- |
372 |
- .../sf/jabref/export/layout/RTFCharsTest.java | 4 ++-- |
373 |
- .../AuthorLastFirstAbbreviatorTester.java | 2 +- |
374 |
- .../export/layout/format/DOICheckTest.java | 10 +++++++++- |
375 |
- .../sf/jabref/imports/BibtexParserTest.java | 4 ++-- |
376 |
- .../sf/jabref/imports/CopacImporterTest.java | 4 ++-- |
377 |
- .../sf/jabref/imports/IsiImporterTest.java | 4 ++-- |
378 |
- .../net/sf/jabref/imports/OAI2ImportTest.java | 2 +- |
379 |
- .../tests/net/sf/jabref/util/XMPUtilTest.java | 6 +++--- |
380 |
- 12 files changed, 45 insertions(+), 28 deletions(-) |
381 |
- |
382 |
-diff --git a/src/java/tests/net/sf/jabref/UtilFindFileTest.java b/src/java/tests/net/sf/jabref/UtilFindFileTest.java |
383 |
-index 7718c2c..b82360b 100644 |
384 |
---- a/src/java/tests/net/sf/jabref/UtilFindFileTest.java |
385 |
-+++ b/src/java/tests/net/sf/jabref/UtilFindFileTest.java |
386 |
-@@ -27,7 +27,7 @@ public class UtilFindFileTest extends FileBasedTestCase { |
387 |
- * |
388 |
- * @throws IOException |
389 |
- */ |
390 |
-- public void testFindFileRelative() throws IOException { |
391 |
-+ public void skipTestFindFileRelative() throws IOException { |
392 |
- |
393 |
- // Most basic case |
394 |
- assertEqualPaths("HipKro03.pdf", findFile(root.getAbsolutePath() + "/test/", |
395 |
-@@ -144,7 +144,7 @@ public class UtilFindFileTest extends FileBasedTestCase { |
396 |
- |
397 |
- } |
398 |
- |
399 |
-- public void testFindFile() throws IOException { |
400 |
-+ public void skipTestFindFile() throws IOException { |
401 |
- |
402 |
- // Simple case |
403 |
- assertEqualPaths("HipKro03.pdf", Util.findFile(entry, database, root.getAbsolutePath() |
404 |
-diff --git a/src/java/tests/net/sf/jabref/UtilTest.java b/src/java/tests/net/sf/jabref/UtilTest.java |
405 |
-index a2e4ac6..50a6cad 100644 |
406 |
---- a/src/java/tests/net/sf/jabref/UtilTest.java |
407 |
-+++ b/src/java/tests/net/sf/jabref/UtilTest.java |
408 |
-@@ -65,7 +65,7 @@ public class UtilTest extends TestCase { |
409 |
- |
410 |
- } |
411 |
- |
412 |
-- public void testPlaceDialog() { |
413 |
-+ public void skipTestPlaceDialog() { |
414 |
- Dialog d = new JDialog(); |
415 |
- d.setSize(50, 50); |
416 |
- Container c = new JWindow(); |
417 |
-@@ -111,7 +111,7 @@ public class UtilTest extends TestCase { |
418 |
- assertEquals("\"{a\"}", Util.shaveString(" \"{a\"} ")); |
419 |
- } |
420 |
- |
421 |
-- public void testCheckLegalKey() { |
422 |
-+ public void skipTestCheckLegalKey() { |
423 |
- |
424 |
- assertEquals("AAAA", Util.checkLegalKey("AA AA")); |
425 |
- assertEquals("SPECIALCHARS", Util.checkLegalKey("SPECIAL CHARS#{\\\"}~,^")); |
426 |
-@@ -119,7 +119,7 @@ public class UtilTest extends TestCase { |
427 |
- assertEquals("", Util.checkLegalKey("\n\t\r")); |
428 |
- } |
429 |
- |
430 |
-- public void testReplaceSpecialCharacters() { |
431 |
-+ public void skipTestReplaceSpecialCharacters() { |
432 |
- // Shouldn't German � be resolved to Ae |
433 |
- assertEquals("AeaeaAAA", Util.replaceSpecialCharacters("������")); |
434 |
- assertEquals("Hallo Arger", Util.replaceSpecialCharacters("Hallo Arger")); |
435 |
-@@ -221,7 +221,7 @@ public class UtilTest extends TestCase { |
436 |
- } |
437 |
- |
438 |
- |
439 |
-- public void testFieldAndFormat(){ |
440 |
-+ public void skipTestFieldAndFormat(){ |
441 |
- assertEquals("Eric von Hippel and Georg von Krogh", Util.getFieldAndFormat("[author]", entry, database)); |
442 |
- |
443 |
- assertEquals("Eric von Hippel and Georg von Krogh", Util.getFieldAndFormat("author", entry, database)); |
444 |
-@@ -239,7 +239,7 @@ public class UtilTest extends TestCase { |
445 |
- assertEquals("HipKro03", Util.getFieldAndFormat("[bibtexkey:]", entry, database)); |
446 |
- } |
447 |
- |
448 |
-- public void testUserFieldAndFormat(){ |
449 |
-+ public void skipTestUserFieldAndFormat(){ |
450 |
- |
451 |
- String[] names = Globals.prefs.getStringArray(NameFormatterTab.NAME_FORMATER_KEY); |
452 |
- if (names == null) |
453 |
-diff --git a/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java b/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java |
454 |
-index 8d6cea9..3197bf0 100644 |
455 |
---- a/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java |
456 |
-+++ b/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java |
457 |
-@@ -92,11 +92,20 @@ public class LayoutEntryTest extends TestCase |
458 |
- /*************************/ |
459 |
- /****** tests Cases ******/ |
460 |
- /*************************/ |
461 |
-+ |
462 |
-+ /* |
463 |
-+ * An empty test case to avoid "No tests found" failure: |
464 |
-+ * |
465 |
-+ * warning(junit.framework.TestSuite$1)junit.framework.AssertionFailedError: |
466 |
-+ * No tests found in tests.net.sf.jabref.export.layout.LayoutEntryTest |
467 |
-+ */ |
468 |
-+ public void testDummy() { |
469 |
-+ } |
470 |
- |
471 |
- /** |
472 |
- * @throws Exception |
473 |
- */ |
474 |
-- public void testNoHighlighting() throws Exception |
475 |
-+ public void skipTestNoHighlighting() throws Exception |
476 |
- { |
477 |
- // say that this bibtex object was found |
478 |
- mBTE.setSearchHit(true); |
479 |
-@@ -113,7 +122,7 @@ public class LayoutEntryTest extends TestCase |
480 |
- /** |
481 |
- * @throws Exception |
482 |
- */ |
483 |
-- public void testHighlightingOneWordCaseInsesitive() throws Exception |
484 |
-+ public void skipTestHighlightingOneWordCaseInsesitive() throws Exception |
485 |
- { |
486 |
- // say that this bibtex object was found |
487 |
- mBTE.setSearchHit(true); |
488 |
-@@ -135,7 +144,7 @@ public class LayoutEntryTest extends TestCase |
489 |
- /** |
490 |
- * @throws Exception |
491 |
- */ |
492 |
-- public void testHighlightingTwoWordsCaseInsesitive() throws Exception |
493 |
-+ public void skipTestHighlightingTwoWordsCaseInsesitive() throws Exception |
494 |
- { |
495 |
- // say that this bibtex object was found |
496 |
- mBTE.setSearchHit(true); |
497 |
-@@ -162,7 +171,7 @@ public class LayoutEntryTest extends TestCase |
498 |
- /** |
499 |
- * @throws Exception |
500 |
- */ |
501 |
-- public void testHighlightingOneWordCaseSesitive() throws Exception |
502 |
-+ public void skipTestHighlightingOneWordCaseSesitive() throws Exception |
503 |
- { |
504 |
- // say that this bibtex object was found |
505 |
- mBTE.setSearchHit(true); |
506 |
-@@ -184,7 +193,7 @@ public class LayoutEntryTest extends TestCase |
507 |
- /** |
508 |
- * @throws Exception |
509 |
- */ |
510 |
-- public void testHighlightingMoreWordsCaseSesitive() throws Exception |
511 |
-+ public void skipTestHighlightingMoreWordsCaseSesitive() throws Exception |
512 |
- { |
513 |
- // say that this bibtex object was found |
514 |
- mBTE.setSearchHit(true); |
515 |
-diff --git a/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java b/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java |
516 |
-index cb98fe3..e54a9b8 100644 |
517 |
---- a/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java |
518 |
-+++ b/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java |
519 |
-@@ -66,7 +66,7 @@ public class LayoutTest extends TestCase { |
520 |
- assertEquals("Misc", layout("\\bibtextype", "@misc{bla, author={This\nis\na\ntext}}")); |
521 |
- } |
522 |
- |
523 |
-- public void testHTMLChar() throws Exception { |
524 |
-+ public void skipTestHTMLChar() throws Exception { |
525 |
- String layoutText = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author} ", |
526 |
- "@other{bla, author={This\nis\na\ntext}}"); |
527 |
- |
528 |
-@@ -95,7 +95,7 @@ public class LayoutTest extends TestCase { |
529 |
- * |
530 |
- * @throws Exception |
531 |
- */ |
532 |
-- public void testLayout() throws Exception { |
533 |
-+ public void skipTestLayout() throws Exception { |
534 |
- |
535 |
- String layoutText = layout( |
536 |
- "<font face=\"arial\">\\begin{abstract}<BR><BR><b>Abstract: </b> \\format[HTMLChars]{\\abstract}\\end{abstract}</font>", |
537 |
-diff --git a/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java b/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java |
538 |
-index 43627ba..e977614 100644 |
539 |
---- a/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java |
540 |
-+++ b/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java |
541 |
-@@ -35,7 +35,7 @@ public class RTFCharsTest extends TestCase { |
542 |
- assertEquals("{\\b hallo}", layout.format("{\\textbf hallo}")); |
543 |
- } |
544 |
- |
545 |
-- public void testComplicated() { |
546 |
-+ public void skipTestComplicated() { |
547 |
- LayoutFormatter layout = new RTFChars(); |
548 |
- |
549 |
- assertEquals("R\\u233eflexions sur le timing de la quantit\\u233e \\u230ae should be \\u230ae", layout.format("Réflexions sur le timing de la quantité \\ae should be æ")); |
550 |
-@@ -43,7 +43,7 @@ public class RTFCharsTest extends TestCase { |
551 |
- assertEquals("h\\u225all{\\uc2\\u339oe}", layout.format("h\\'all\\oe ")); |
552 |
- } |
553 |
- |
554 |
-- public void testSpecialCharacters() { |
555 |
-+ public void skipTestSpecialCharacters() { |
556 |
- |
557 |
- LayoutFormatter layout = new RTFChars(); |
558 |
- |
559 |
-diff --git a/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java b/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java |
560 |
-index 446a89c..496f18b 100644 |
561 |
---- a/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java |
562 |
-+++ b/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java |
563 |
-@@ -76,7 +76,7 @@ public class AuthorLastFirstAbbreviatorTester extends TestCase { |
564 |
- * Testcase for |
565 |
- * http://sourceforge.net/tracker/index.php?func=detail&aid=1466924&group_id=92314&atid=600306 |
566 |
- */ |
567 |
-- public void testJrAuthor(){ |
568 |
-+ public void skipTestJrAuthor(){ |
569 |
- String name = "Other, Jr., Anthony N."; |
570 |
- assertEquals("Other, A. N.", abbreviate(name)); |
571 |
- } |
572 |
-diff --git a/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java b/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java |
573 |
-index dceb88c..d0680e3 100644 |
574 |
---- a/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java |
575 |
-+++ b/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java |
576 |
-@@ -5,8 +5,16 @@ import net.sf.jabref.export.layout.LayoutFormatter; |
577 |
- import net.sf.jabref.export.layout.format.DOICheck; |
578 |
- |
579 |
- public class DOICheckTest extends TestCase { |
580 |
-+ /* |
581 |
-+ * An empty test case to avoid "No tests found" failure: |
582 |
-+ * |
583 |
-+ * warning(junit.framework.TestSuite$1)junit.framework.AssertionFailedError: |
584 |
-+ * No tests found in tests.net.sf.jabref.export.layout.format.DOICheckTest |
585 |
-+ */ |
586 |
-+ public void testDummy() { |
587 |
-+ } |
588 |
- |
589 |
-- public void testFormat() { |
590 |
-+ public void skipTestFormat() { |
591 |
- LayoutFormatter lf = new DOICheck(); |
592 |
- |
593 |
- assertEquals("", lf.format("")); |
594 |
-diff --git a/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java b/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java |
595 |
-index f8bc3dc..ad4899b 100644 |
596 |
---- a/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java |
597 |
-+++ b/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java |
598 |
-@@ -257,7 +257,7 @@ public class BibtexParserTest extends TestCase { |
599 |
- assertEquals("2002", e.getField("year")); |
600 |
- } |
601 |
- |
602 |
-- public void testNewlineHandling() throws IOException { |
603 |
-+ public void skipTestNewlineHandling() throws IOException { |
604 |
- |
605 |
- BibtexEntry e = BibtexParser.singleFromString("@article{canh05," + |
606 |
- "a = {a\nb}," + |
607 |
-@@ -320,7 +320,7 @@ public class BibtexParserTest extends TestCase { |
608 |
- * @author Uwe Kuehn |
609 |
- * @author Andrei Haralevich |
610 |
- */ |
611 |
-- public void testFileNaming3(){ |
612 |
-+ public void skipTestFileNaming3(){ |
613 |
- BibtexEntry e = BibtexParser.singleFromString("@article{canh05," |
614 |
- + "title = {\nHallo \nWorld \nthis \n is\n\nnot \n\nan \n\n exercise \n \n.\n \n\n},\n" |
615 |
- + "tabs = {\nHallo \tWorld \tthis \t is\t\tnot \t\tan \t\n exercise \t \n.\t \n\t},\n" |
616 |
-diff --git a/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java b/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java |
617 |
-index 558ebb7..20f6c02 100644 |
618 |
---- a/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java |
619 |
-+++ b/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java |
620 |
-@@ -24,7 +24,7 @@ public class CopacImporterTest extends TestCase { |
621 |
- super.tearDown(); |
622 |
- } |
623 |
- |
624 |
-- public void testIsRecognizedFormat() throws IOException { |
625 |
-+ public void skipTestIsRecognizedFormat() throws IOException { |
626 |
- |
627 |
- CopacImporter importer = new CopacImporter(); |
628 |
- assertTrue(importer.isRecognizedFormat(CopacImporterTest.class |
629 |
-@@ -46,7 +46,7 @@ public class CopacImporterTest extends TestCase { |
630 |
- .getResourceAsStream("IsiImporterTestMedline.isi"))); |
631 |
- } |
632 |
- |
633 |
-- public void testImportEntries() throws IOException { |
634 |
-+ public void skipTestImportEntries() throws IOException { |
635 |
- CopacImporter importer = new CopacImporter(); |
636 |
- |
637 |
- List<BibtexEntry> entries = importer.importEntries(CopacImporterTest.class |
638 |
-diff --git a/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java b/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java |
639 |
-index 041a31e..ee89a2b 100644 |
640 |
---- a/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java |
641 |
-+++ b/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java |
642 |
-@@ -33,7 +33,7 @@ public class IsiImporterTest extends TestCase { |
643 |
- super.tearDown(); |
644 |
- } |
645 |
- |
646 |
-- public void testIsRecognizedFormat() throws IOException { |
647 |
-+ public void skipTestIsRecognizedFormat() throws IOException { |
648 |
- |
649 |
- IsiImporter importer = new IsiImporter(); |
650 |
- assertTrue(importer.isRecognizedFormat(IsiImporterTest.class |
651 |
-@@ -201,7 +201,7 @@ public class IsiImporterTest extends TestCase { |
652 |
- assertEquals(BibtexEntryType.ARTICLE, b.getType()); |
653 |
- } |
654 |
- |
655 |
-- public void testImportEntriesWOS() throws IOException { |
656 |
-+ public void skipTestImportEntriesWOS() throws IOException { |
657 |
- IsiImporter importer = new IsiImporter(); |
658 |
- |
659 |
- List<BibtexEntry> entries = importer.importEntries(IsiImporterTest.class |
660 |
-diff --git a/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java b/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java |
661 |
-index 9e7e73f..e0bfdf5 100644 |
662 |
---- a/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java |
663 |
-+++ b/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java |
664 |
-@@ -112,7 +112,7 @@ public class OAI2ImportTest extends TestCase { |
665 |
- assertEquals("", OAI2Fetcher.fixKey("arXiv:")); |
666 |
- } |
667 |
- |
668 |
-- public void testOnline() throws InterruptedException { |
669 |
-+ public void skipTestOnline() throws InterruptedException { |
670 |
- |
671 |
- { |
672 |
- OAI2Fetcher fetcher = new OAI2Fetcher(); |
673 |
-diff --git a/src/java/tests/net/sf/jabref/util/XMPUtilTest.java b/src/java/tests/net/sf/jabref/util/XMPUtilTest.java |
674 |
-index 74571f5..5b74057 100644 |
675 |
---- a/src/java/tests/net/sf/jabref/util/XMPUtilTest.java |
676 |
-+++ b/src/java/tests/net/sf/jabref/util/XMPUtilTest.java |
677 |
-@@ -345,7 +345,7 @@ public class XMPUtilTest extends TestCase { |
678 |
- * @throws TransformerException |
679 |
- * Should not happen. |
680 |
- */ |
681 |
-- public void testPrivacyFilter() throws IOException, TransformerException { |
682 |
-+ public void skipTestPrivacyFilter() throws IOException, TransformerException { |
683 |
- |
684 |
- { // First set: |
685 |
- prefs.putBoolean("useXmpPrivacyFilter", true); |
686 |
-@@ -1023,7 +1023,7 @@ public class XMPUtilTest extends TestCase { |
687 |
- assertEquals(t3BibtexEntry(), b); |
688 |
- } |
689 |
- |
690 |
-- public void testReadWriteDC() throws IOException, TransformerException { |
691 |
-+ public void skipTestReadWriteDC() throws IOException, TransformerException { |
692 |
- List<BibtexEntry> l = new LinkedList<BibtexEntry>(); |
693 |
- l.add(t3BibtexEntry()); |
694 |
- |
695 |
-@@ -1103,7 +1103,7 @@ public class XMPUtilTest extends TestCase { |
696 |
- |
697 |
- } |
698 |
- |
699 |
-- public void testWriteSingleUpdatesDCAndInfo() throws IOException, |
700 |
-+ public void skipTestWriteSingleUpdatesDCAndInfo() throws IOException, |
701 |
- TransformerException { |
702 |
- List<BibtexEntry> l = new LinkedList<BibtexEntry>(); |
703 |
- l.add(t3BibtexEntry()); |
704 |
--- |
705 |
-2.34.1 |
706 |
- |
707 |
|
708 |
diff --git a/app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch b/app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch |
709 |
deleted file mode 100644 |
710 |
index d3e413e9b0fd..000000000000 |
711 |
--- a/app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch |
712 |
+++ /dev/null |
713 |
@@ -1,49 +0,0 @@ |
714 |
-From f24492bff17f728bcf2b5a50069669ae08b8b372 Mon Sep 17 00:00:00 2001 |
715 |
-From: Yuan Liao <liaoyuan@×××××.com> |
716 |
-Date: Sat, 19 Feb 2022 10:21:04 -0800 |
717 |
-Subject: [PATCH] Add JVM system properties and argument for tests |
718 |
- |
719 |
-The changes to system properties ensure that all paths the application |
720 |
-may write to during the tests are not protected by the Portage sandbox. |
721 |
- |
722 |
-The extra argument added is required on Java 17+, but it should also be |
723 |
-compatible with all Java versions that support the Java Platform Module |
724 |
-System (JPMS), namely Java 9+. On older Java versions, it is optional. |
725 |
-On Java 8, however, including it in JVM arguments would cause an error. |
726 |
- |
727 |
-Signed-off-by: Yuan Liao <liaoyuan@×××××.com> |
728 |
---- |
729 |
- build.xml | 9 ++++++++- |
730 |
- 1 file changed, 8 insertions(+), 1 deletion(-) |
731 |
- |
732 |
-diff --git a/build.xml b/build.xml |
733 |
-index d13a9f3..788a4d1 100644 |
734 |
---- a/build.xml |
735 |
-+++ b/build.xml |
736 |
-@@ -28,7 +28,7 @@ |
737 |
- |
738 |
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--> |
739 |
- |
740 |
--<project name="JabRef" default="jars" basedir="."> |
741 |
-+<project name="JabRef" default="jars" basedir="." xmlns:if="ant:if"> |
742 |
- |
743 |
- <!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
744 |
- PROPERTY SETUP |
745 |
-@@ -596,7 +596,14 @@ version=${jabref.version}</echo> |
746 |
- </target> |
747 |
- |
748 |
- <target name="test" depends="buildtest" description="Runs all unit tests"> |
749 |
-+ <condition property="shouldAddOpens"> |
750 |
-+ <javaversion atleast="9" /> |
751 |
-+ </condition> |
752 |
- <java fork="yes" classname="junit.textui.TestRunner" failonerror="true"> |
753 |
-+ <sysproperty key="java.io.tmpdir" value="${java.io.tmpdir}" /> |
754 |
-+ <sysproperty key="user.home" value="${user.home}" /> |
755 |
-+ <jvmarg if:set="shouldAddOpens" |
756 |
-+ value="--add-opens=java.desktop/java.awt=ALL-UNNAMED" /> |
757 |
- <arg value="tests.net.sf.jabref.AllTests" /> |
758 |
- <classpath refid="classpathTest" /> |
759 |
- </java> |
760 |
--- |
761 |
-2.34.1 |
762 |
- |
763 |
|
764 |
diff --git a/app-text/jabref/files/jabref-2.10-test-prefs.xml b/app-text/jabref/files/jabref-2.10-test-prefs.xml |
765 |
deleted file mode 100644 |
766 |
index aea6c9f32bbd..000000000000 |
767 |
--- a/app-text/jabref/files/jabref-2.10-test-prefs.xml |
768 |
+++ /dev/null |
769 |
@@ -1,19 +0,0 @@ |
770 |
-<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
771 |
-<!DOCTYPE map SYSTEM "http://java.sun.com/dtd/preferences.dtd"> |
772 |
-<map MAP_XML_VERSION="1.0"> |
773 |
- <entry key="autoAssignGroup" value="true"/> |
774 |
- <entry key="autoCompFF" value="false"/> |
775 |
- <entry key="autoCompFirstNameMode" value="both"/> |
776 |
- <entry key="autoCompLF" value="false"/> |
777 |
- <entry key="autoComplete" value="true"/> |
778 |
- <entry key="autolinkExactKeyOnly" value="true"/> |
779 |
- <entry key="caseSensitiveSearch" value="false"/> |
780 |
- <entry key="nameFormatterFormats" value=""/> |
781 |
- <entry key="nameFormatterNames" value=""/> |
782 |
- <entry key="pdfDirectory" value=""/> |
783 |
- <entry key="pushToApplication" value="Insert selected citations into LyX/Kile"/> |
784 |
- <entry key="showFileLinksUpgradeWarning" value="false"/> |
785 |
- <entry key="useRegExpSearch" value="false"/> |
786 |
- <entry key="useXmpPrivacyFilter" value="false"/> |
787 |
- <entry key="xmpPrivacyFilter" value="pdf;timestamp;keywords;owner;note;review"/> |
788 |
-</map> |
789 |
|
790 |
diff --git a/app-text/jabref/jabref-2.10-r7.ebuild b/app-text/jabref/jabref-2.10-r7.ebuild |
791 |
deleted file mode 100644 |
792 |
index 2dfca56aca17..000000000000 |
793 |
--- a/app-text/jabref/jabref-2.10-r7.ebuild |
794 |
+++ /dev/null |
795 |
@@ -1,132 +0,0 @@ |
796 |
-# Copyright 1999-2022 Gentoo Authors |
797 |
-# Distributed under the terms of the GNU General Public License v2 |
798 |
- |
799 |
-EAPI=8 |
800 |
- |
801 |
-JAVA_PKG_IUSE="doc test" |
802 |
- |
803 |
-inherit desktop java-pkg-2 java-ant-2 virtualx xdg-utils |
804 |
- |
805 |
-MY_PV="${PV/_beta/b}" |
806 |
- |
807 |
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies" |
808 |
-HOMEPAGE="https://www.jabref.org/" |
809 |
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2" |
810 |
- |
811 |
-LICENSE="GPL-2" |
812 |
-SLOT="0" |
813 |
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
814 |
- |
815 |
-CP_DEPEND=" |
816 |
- dev-java/antlr:0 |
817 |
- dev-java/antlr:3 |
818 |
- dev-java/commons-logging:0 |
819 |
- dev-java/fontbox:1.7 |
820 |
- dev-java/jaxb-api:2 |
821 |
- dev-java/jempbox:1.7 |
822 |
- dev-java/log4j-12-api:2 |
823 |
- dev-java/log4j-api:2 |
824 |
- dev-java/spin:0 |
825 |
- dev-java/microba:0 |
826 |
- >=dev-java/glazedlists-1.8.0:0" |
827 |
- |
828 |
-TEST_DEPEND="dev-java/junit:0" |
829 |
- |
830 |
-# Since Java 9, all dependencies ever imported by the source files need to be |
831 |
-# present in the classpath for Javadoc generation; in particular, for this |
832 |
-# package, the test sources will be passed to 'javadoc' as well as the non-test |
833 |
-# sources, so all test dependencies are required for Javadoc generation too. |
834 |
-DEPEND=" |
835 |
- >=virtual/jdk-1.8:* |
836 |
- doc? ( ${TEST_DEPEND} ) |
837 |
- test? ( ${TEST_DEPEND} ) |
838 |
- ${CP_DEPEND}" |
839 |
- |
840 |
-# Java 17+ requires "--add-opens=java.desktop/java.awt=ALL-UNNAMED" in |
841 |
-# arguments to the JVM that runs this application; Java 8 and 11 are OK, |
842 |
-# but dev-java/java-config currently does not support declaration like |
843 |
-# RDEPEND="|| ( virtual/jre:1.8 virtual/jre:11 )" yet, so only one JRE |
844 |
-# version can be chosen to run this application at the moment. |
845 |
-RDEPEND=" |
846 |
- virtual/jre:1.8 |
847 |
- ${CP_DEPEND}" |
848 |
- |
849 |
-IDEPEND="dev-util/desktop-file-utils" |
850 |
- |
851 |
-S="${WORKDIR}/${PN}-${MY_PV}" |
852 |
- |
853 |
-PATCHES=( |
854 |
- "${FILESDIR}/${P}-javax.swing-java-9+.patch" |
855 |
- "${FILESDIR}/${P}-skip-failing-tests.patch" |
856 |
- "${FILESDIR}/${P}-test-jvm-props-args.patch" |
857 |
-) |
858 |
- |
859 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
860 |
-EANT_BUILD_TARGET="jars" |
861 |
-EANT_DOC_TARGET="docs" |
862 |
- |
863 |
-# Some dependencies that are also used by the tests need to be explicitly |
864 |
-# listed to avoid "package does not exist" compiler errors. |
865 |
-EANT_TEST_GENTOO_CLASSPATH="junit" |
866 |
-EANT_TEST_GENTOO_CLASSPATH+=",antlr-3,commons-logging,glazedlists" |
867 |
-EANT_TEST_GENTOO_CLASSPATH+=",jempbox-1.7,microba,spin" |
868 |
-EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=${T} -Duser.home=${HOME}" |
869 |
- |
870 |
-src_prepare() { |
871 |
- default |
872 |
- |
873 |
- # If we cleanup it complains about missing jarbundler |
874 |
- # BUILD FAILED |
875 |
- # taskdef class net.sourceforge.jarbundler.JarBundler cannot be found |
876 |
-# java-pkg_clean |
877 |
- |
878 |
- # Remove bundled dependencies. |
879 |
- rm lib/antlr*.jar || die |
880 |
- rm lib/fontbox*.jar || die |
881 |
- rm lib/glazedlists*.jar || die |
882 |
- rm lib/jempbox*.jar || die |
883 |
- rm lib/microba.jar || die |
884 |
- rm lib/spin.jar || die |
885 |
- rm lib/plugin/commons-logging.jar || die |
886 |
- |
887 |
- # Remove unjarlib target (do this only once we have removed all |
888 |
- # bundled dependencies in lib). |
889 |
- #sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml |
890 |
- |
891 |
- # Fix license file copy operation for microba bundled lib. |
892 |
- sed -i -e 's:^.*microba-license.*::' build.xml |
893 |
- |
894 |
- use doc && EANT_GENTOO_CLASSPATH_EXTRA="$(\ |
895 |
- java-pkg_getjars --build-only junit)" |
896 |
-} |
897 |
- |
898 |
-src_test() { |
899 |
- # Tests will launch the application, which requires an X environment. |
900 |
- # An existing application preference file is needed to make the tests |
901 |
- # non-interactive; otherwise, the application will hang for user input. |
902 |
- local prefs_dir="${HOME}/.java/.userPrefs/net/sf/jabref" |
903 |
- mkdir -p "${prefs_dir}" || |
904 |
- die "Failed to create application preference directory for tests" |
905 |
- cp "${FILESDIR}/${P}-test-prefs.xml" "${prefs_dir}/prefs.xml" || |
906 |
- die "Failed to copy application preference file for tests" |
907 |
- virtx java-pkg-2_src_test |
908 |
-} |
909 |
- |
910 |
-src_install() { |
911 |
- java-pkg_newjar build/lib/JabRef-${MY_PV}.jar |
912 |
- |
913 |
- dodoc src/txt/README |
914 |
- use doc && java-pkg_dojavadoc build/docs/API |
915 |
- |
916 |
- java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef |
917 |
- newicon src/images/JabRef-icon-48.png JabRef-icon.png |
918 |
- make_desktop_entry ${PN} JabRef JabRef-icon Office |
919 |
-} |
920 |
- |
921 |
-pkg_postinst() { |
922 |
- xdg_desktop_database_update |
923 |
-} |
924 |
- |
925 |
-pkg_postrm() { |
926 |
- xdg_desktop_database_update |
927 |
-} |
928 |
|
929 |
diff --git a/app-text/jabref/metadata.xml b/app-text/jabref/metadata.xml |
930 |
deleted file mode 100644 |
931 |
index 8117e0980392..000000000000 |
932 |
--- a/app-text/jabref/metadata.xml |
933 |
+++ /dev/null |
934 |
@@ -1,19 +0,0 @@ |
935 |
-<?xml version="1.0" encoding="UTF-8"?> |
936 |
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
937 |
-<pkgmetadata> |
938 |
- <maintainer type="person"> |
939 |
- <email>nicolasbock@g.o</email> |
940 |
- <name>Nicolas Bock</name> |
941 |
- </maintainer> |
942 |
- <maintainer type="project"> |
943 |
- <email>java@g.o</email> |
944 |
- <name>Java</name> |
945 |
- </maintainer> |
946 |
- <maintainer type="project"> |
947 |
- <email>sci@g.o</email> |
948 |
- <name>Gentoo Science Project</name> |
949 |
- </maintainer> |
950 |
- <upstream> |
951 |
- <remote-id type="sourceforge">jabref</remote-id> |
952 |
- </upstream> |
953 |
-</pkgmetadata> |
954 |
|
955 |
diff --git a/profiles/package.mask b/profiles/package.mask |
956 |
index 6ae4eefff953..977a1efc0a94 100644 |
957 |
--- a/profiles/package.mask |
958 |
+++ b/profiles/package.mask |
959 |
@@ -476,12 +476,6 @@ dev-util/patdiff:0/0.15 |
960 |
# Unused java library. Removal on 2022-05-24. |
961 |
dev-java/jgraph |
962 |
|
963 |
-# Volkmar W. Pogatzki <gentoo@××××××××.net> (2022-04-19) |
964 |
-# Release of the source-based ebuild is from 2014. At the moment |
965 |
-# impossible to provide source-based ebuild for the current version. |
966 |
-# Up-to-date binary package exists. Removal on 2022-05-30 |
967 |
-app-text/jabref |
968 |
- |
969 |
# David Seifert <soap@g.o> (2022-04-17) |
970 |
# Dead library, part of >=sys-fs/e2fsprogs-1.46.5 now, bug #806875, |
971 |
# removal on 2022-05-17. |