lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Refresh the license display patches

Browse source 
They have been partially obsoleted by the following pull request
upstream:

  https://github.com/obsproject/obs-studio/pull/1435
This commit is contained in:
Simon Chopin 2019-07-27 15:07:36 +02:00
parent b9bf10dfe2
commit 34aa2c5c96
4 changed files with 17 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

28
debian/patches/0001-Use-common-license.patch vendored
View file

@ -8,18 +8,22 @@ copy
UI/window-license-agreement.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/UI/window-license-agreement.cpp b/UI/window-license-agreement.cpp
index a7a5f3b..60cad40 100644
--- a/UI/window-license-agreement.cpp
+++ b/UI/window-license-agreement.cpp
@@ -13,9 +13,7 @@ OBSLicenseAgreement::OBSLicenseAgreement(QWidget *parent)
--- a/UI/window-basic-about.cpp
+++ b/UI/window-basic-about.cpp
@@ -149,15 +149,10 @@
void OBSAbout::ShowLicense()
{
ui->setupUi(this);
- std::string path;
+ std::string path("/usr/share/common-licenses/GPL-2");
QString error = "Error! File could not be read.\n\n \
Go to: https://github.com/obsproject/obs-studio/blob/master/COPYING";
- string path;
- if (!GetDataFilePath("license/gplv2.txt", path))
- throw "Could not find license file";
+ string path("/usr/share/common-licenses/GPL-2");
- if (!GetDataFilePath("license/gplv2.txt", path)) {
- ui->textBrowser->setPlainText(error);
- return;
- }
-
BPtr<char> text = os_quick_read_utf8_file(path.c_str());
BPtr<char> licenseText = os_quick_read_utf8_file(path.c_str());
if (!licenseText || !*licenseText || strlen(licenseText) < 1000)
if (!text || !*text) {