Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/bdsup2sub/files/
Date: Wed, 04 Jan 2017 10:15:59
Message-Id: 1483524832.4900df19ccc108c602fda59a5e6a7f095934241b.soap@gentoo
1 commit: 4900df19ccc108c602fda59a5e6a7f095934241b
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Dec 30 14:26:11 2016 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 4 10:13:52 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4900df19
7
8 media-video/bdsup2sub: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/3286
11
12 .../bdsup2sub/files/bdsup2sub-4.0.0-xdg.diff | 37 ----------------------
13 1 file changed, 37 deletions(-)
14
15 diff --git a/media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.diff b/media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.diff
16 deleted file mode 100644
17 index 4a045d3..00000000
18 --- a/media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.diff
19 +++ /dev/null
20 @@ -1,37 +0,0 @@
21 -diff -Naur src.orig/deadbeef/SupTools/Core.java src/deadbeef/SupTools/Core.java
22 ---- src.orig/deadbeef/SupTools/Core.java 2010-07-28 22:56:08.319223422 +0200
23 -+++ src/deadbeef/SupTools/Core.java 2010-07-28 22:56:08.890223411 +0200
24 -@@ -22,6 +22,8 @@
25 - import deadbeef.Tools.Props;
26 - import deadbeef.Tools.ToolBox;
27 -
28 -+import java.io.File;
29 -+
30 - /*
31 - * Copyright 2009 Volker Oth (0xdeadbeef)
32 - *
33 -@@ -768,6 +770,11 @@
34 - }
35 - fnameProps += Core.iniName;
36 -
37 -+ // use XDG spec
38 -+ fnameProps = System.getenv("XDG_CONFIG_HOME");
39 -+ if (fnameProps == null) fnameProps = System.getProperty("user.home") + "/.config";
40 -+ fnameProps += "/" + Core.iniName;
41 -+
42 - // read properties from ini file
43 - props = new Props();
44 - props.setHeader(Core.progNameVer+" settings - don't modify manually");
45 -@@ -905,8 +912,11 @@
46 - * Write properties
47 - */
48 - public static void storeProps() {
49 -- if (props != null)
50 -+ if (props != null) {
51 -+ File path = new File(ToolBox.getPathName(fnameProps));
52 -+ path.mkdirs();
53 - props.save(fnameProps);
54 -+ }
55 - }
56 -
57 - /**