about summary refs log tree commit diff
path: root/nixpkgs/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff')
-rw-r--r--nixpkgs/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff35
1 files changed, 17 insertions, 18 deletions
diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff b/nixpkgs/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff
index b4ef86f79b38..f8e005f577a3 100644
--- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff
+++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff
@@ -1,25 +1,24 @@
+diff --git a/src/src/gstvideowriter.cpp b/src/src/gstvideowriter.cpp
+index c96c8b0..fcc11da 100644
+--- a/src/src/gstvideowriter.cpp
++++ b/src/src/gstvideowriter.cpp
+@@ -282,6 +282,7 @@ void GstVideoWriter::loadAppSrcCaps()
+ 
+ QString GstVideoWriter::libPath(const QString &strlib)
+ {
++    return strlib;
+     QDir  dir;
+     QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
+     dir.setPath(path);
 diff --git a/src/src/mainwindow.cpp b/src/src/mainwindow.cpp
-index d3c6f5c..4817446 100644
+index d3c6c24..6d313a6 100644
 --- a/src/src/mainwindow.cpp
 +++ b/src/src/mainwindow.cpp
-@@ -781,19 +781,7 @@ void CMainWindow::slotPopupSettingsDialog()
+@@ -784,6 +784,7 @@ void CMainWindow::slotPopupSettingsDialog()
  
  QString CMainWindow::libPath(const QString &strlib)
  {
--    QDir  dir;
--    QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
--    dir.setPath(path);
--    QStringList list = dir.entryList(QStringList() << (strlib + "*"), QDir::NoDotAndDotDot | QDir::Files); //filter name with strlib
--
--    if (list.contains(strlib))
--        return strlib;
--
--    list.sort();
--    if (list.size() > 0)
--        return list.last();
--
--    return "";
 +    return strlib;
- }
- 
- void CMainWindow::reflushSnapshotLabel()
+     QDir  dir;
+     QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
+     dir.setPath(path);