File: datadir.patch

package info (click to toggle)
jstest-gtk 0.1.1~git20160825-4
  • links: PTS, VCS
  • area: main
  • in suites: bookworm, bullseye
  • size: 404 kB
  • sloc: cpp: 2,482; ansic: 467; xml: 35; makefile: 5
file content (37 lines) | stat: -rw-r--r-- 845 bytes parent folder | download | duplicates (3)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
Description: Hard-code the data directory
Author: Stephen Kitt <skitt@debian.org>

binreloc fails to find /usr/share/jstest-gtk in some circumstances.
Since we know where the data directory is, hard-code it.

--- a/src/main.cpp
+++ b/src/main.cpp
@@ -188,27 +188,7 @@
 
 std::string find_datadir()
 {
-  BrInitError error;
-  if (!br_init(&error))
-  {
-    std::ostringstream out;
-    out << "Error: Couldn't init binreloc: " << error;
-    throw std::runtime_error(out.str());
-  }
-  else
-  {
-    char* c_prefix = br_find_exe_dir(NULL);
-    if (!c_prefix)
-    {
-      throw std::runtime_error("Error: Couldn't find prefix");
-    }
-    else
-    {
-      std::string prefix = c_prefix;
-      free(c_prefix);
-      return prefix + "/data/";
-    }
-  }
+  return "/usr/share/jstest-gtk/data/";
 }
 
 int main(int argc, char** argv)