minor fixes

akiyosi · Sep 3, 2020 · 6d2596e · 6d2596e
1 parent 6356190
commit 6d2596e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/internal/binding/parser/parser.go b/internal/binding/parser/parser.go
@@ -142,7 +142,7 @@ func LoadModule(m string) *Module {
 			err = xml.Unmarshal([]byte(utils.LoadOptional(path)), &module)
 			if err != nil {
 				utils.Log.WithFields(logFields).Debug("falling back to bundled *.index files")
-				err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION()), "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module)
+				err = xml.Unmarshal([]byte(utils.LoadOptional(filepath.Join(strings.TrimSpace(utils.GoListOptional("{{.Dir}}", "github.com/therecipe/qt/internal/binding/files/docs/"+utils.QT_API(utils.QT_VERSION_MAJOR()+".0"), "-find", "get doc dir")), fmt.Sprintf("qt%v.index", strings.ToLower(m))))), &module)
 			}
 		}
 	}

diff --git a/internal/cmd/deploy/bundle.go b/internal/cmd/deploy/bundle.go
@@ -103,7 +103,7 @@ func bundle(mode, target, path, name, depPath string, tagsCustom string, fast bo
 		utils.RunCmd(dep, fmt.Sprintf("deploy for %v on %v", target, runtime.GOOS))
 
 		//break the rpath
-		pPath := "/break_the_rpath/"
+		pPath := "/broken/"
 		fn := filepath.Join(depPath, name+".app", "Contents", "MacOS", name)
 		data, err := ioutil.ReadFile(fn)
 		if err != nil {

diff --git a/internal/examples/3rdparty/mpv/mpv.go b/internal/examples/3rdparty/mpv/mpv.go
@@ -1,5 +1,10 @@
 package mpv
 
+//it's also possible to directly place this file beside the files from mpv-examples/libmpv/qml
+//to get this working, change init.go to just run `make mocables`
+//and remove the cgo LDFLAGS line used to link against the static lib below
+//more info: https://github.com/therecipe/qt/issues/1162
+
 /*
 #cgo pkg-config: mpv
 #cgo linux,amd64 LDFLAGS: -L ${SRCDIR}/mpv-examples/libmpv/qml -lmpvtest