Refresh the license display patches
They have been partially obsoleted by the following pull request upstream: https://github.com/obsproject/obs-studio/pull/1435
This commit is contained in:
parent
b9bf10dfe2
commit
34aa2c5c96
4 changed files with 17 additions and 36 deletions
28
debian/patches/0001-Use-common-license.patch
vendored
28
debian/patches/0001-Use-common-license.patch
vendored
|
@ -8,18 +8,22 @@ copy
|
||||||
UI/window-license-agreement.cpp | 4 +---
|
UI/window-license-agreement.cpp | 4 +---
|
||||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/UI/window-license-agreement.cpp b/UI/window-license-agreement.cpp
|
--- a/UI/window-basic-about.cpp
|
||||||
index a7a5f3b..60cad40 100644
|
+++ b/UI/window-basic-about.cpp
|
||||||
--- a/UI/window-license-agreement.cpp
|
@@ -149,15 +149,10 @@
|
||||||
+++ b/UI/window-license-agreement.cpp
|
|
||||||
@@ -13,9 +13,7 @@ OBSLicenseAgreement::OBSLicenseAgreement(QWidget *parent)
|
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)) {
|
||||||
- if (!GetDataFilePath("license/gplv2.txt", path))
|
- ui->textBrowser->setPlainText(error);
|
||||||
- throw "Could not find license file";
|
- return;
|
||||||
+ string path("/usr/share/common-licenses/GPL-2");
|
- }
|
||||||
|
-
|
||||||
|
BPtr<char> text = os_quick_read_utf8_file(path.c_str());
|
||||||
|
|
||||||
BPtr<char> licenseText = os_quick_read_utf8_file(path.c_str());
|
if (!text || !*text) {
|
||||||
if (!licenseText || !*licenseText || strlen(licenseText) < 1000)
|
|
||||||
|
|
|
@ -1,22 +0,0 @@
|
||||||
From: Chris Lamb <lamby@debian.org>
|
|
||||||
Date: Mon, 19 Feb 2018 21:32:07 +0100
|
|
||||||
Subject: Do not display license on first startup
|
|
||||||
|
|
||||||
---
|
|
||||||
UI/obs-app.cpp | 3 +--
|
|
||||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp
|
|
||||||
index 52b15a0..186128c 100644
|
|
||||||
--- a/UI/obs-app.cpp
|
|
||||||
+++ b/UI/obs-app.cpp
|
|
||||||
@@ -1216,8 +1216,7 @@ bool OBSApp::OBSInit()
|
|
||||||
{
|
|
||||||
ProfileScope("OBSApp::OBSInit");
|
|
||||||
|
|
||||||
- bool licenseAccepted = config_get_bool(globalConfig, "General",
|
|
||||||
- "LicenseAccepted");
|
|
||||||
+ bool licenseAccepted = true;
|
|
||||||
OBSLicenseAgreement agreement(nullptr);
|
|
||||||
|
|
||||||
if (licenseAccepted || agreement.exec() == QDialog::Accepted) {
|
|
3
debian/patches/series
vendored
3
debian/patches/series
vendored
|
@ -3,5 +3,4 @@
|
||||||
0003-Use-path-in-usr-lib.patch
|
0003-Use-path-in-usr-lib.patch
|
||||||
0004-Link-with-libm-and-libdl-to-fix-underlinking.patch
|
0004-Link-with-libm-and-libdl-to-fix-underlinking.patch
|
||||||
0005-Link-with-xcb-and-X-libraries-to-fix-underlinking.patch
|
0005-Link-with-xcb-and-X-libraries-to-fix-underlinking.patch
|
||||||
0006-Do-not-display-license-on-first-startup.patch
|
0006-Add-SONAME.patch
|
||||||
0007-Add-SONAME.patch
|
|
||||||
|
|
Loading…
Reference in a new issue