Compare commits

..

No commits in common. "c0045cf45db343be41d5c3cae4f2458eb8314701" and "9c6539c2ab5381dda34b4f99f36642673fd88f63" have entirely different histories.

7 changed files with 5 additions and 69 deletions

View File

@ -1,8 +0,0 @@
FROM ubuntu:24.04
ENV DEBIAN_FRONTEND=noninteractive
ENV DEBIAN_PRIORITY=critical
RUN apt update
RUN apt dist-upgrade -y
RUN apt install -y build-essential cmake g++ qt6-base-dev qt6-webengine-dev linguist-qt6 libgl1-mesa-dev qt6-tools-dev qt6-l10n-tools qt6-tools-dev-tools libqt6core5compat6-dev lxqt-build-tools qt6-webengine-dev-tools libqt6webenginecore6-bin

30
Jenkinsfile vendored
View File

@ -1,33 +1,11 @@
pipeline {
agent {
docker {
image 'ubuntu:24.04'
args '-u root:root'
}
}
agent any
stages {
stage('Install Dependencies') {
steps {
sh '''
apt-get update
apt-get install -y build-essential cmake g++ qt6-base-dev qt6-webengine-dev linguist-qt6 libgl1-mesa-dev qt6-tools-dev qt6-l10n-tools qt6-tools-dev-tools libqt6core5compat6-dev lxqt-build-tools qt6-webengine-dev-tools libqt6webenginecore6-bin
'''
}
}
stage('Build') {
steps {
sh '''
mkdir -p build
cd build
cmake .. -G Ninja
ninja
'''
echo 'Jenkinsfile for ogbrowser'
}
}
}
post {
always {
cleanWs()
}
}
}
}

View File

@ -53,7 +53,7 @@ else()
find_package(Qt5LinguistTools "${QT_MINIMUM_VERSION}" REQUIRED)
endif()
find_package(lxqt2-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
if(USE_UTF8PROC)
find_package(Utf8Proc REQUIRED)

View File

@ -53,12 +53,6 @@ int main(int argc, char *argv[])
QCommandLineOption disableWebSecurityOption("disable-web-security", "Disable web security and allow custom URL schemes");
parser.addOption(disableWebSecurityOption);
QCommandLineOption noSandboxOption("no-sandbox", "Disable Chromium sandbox to allow running as root");
parser.addOption(noSandboxOption);
QCommandLineOption ignoreSslErrors("ignore-ssl-errors", "Ignore SSL certificate errors");
parser.addOption(ignoreSslErrors);
QCommandLineOption helpOption = parser.addHelpOption();
OGCommandLineOptions &options = OGCommandLineOptions::getInstance();
@ -82,10 +76,6 @@ int main(int argc, char *argv[])
options.setNewTabBehavior(OGCommandLineOptions::NewTabBehavior::Ignore);
}
if (parser.isSet(ignoreSslErrors)) {
options.setIgnoreSslErrors(true);
}
QStringList positional = parser.positionalArguments();
if ( positional.length() > 0) {
options.setUrl( positional[0 ] );

View File

@ -127,7 +127,6 @@ MainWindow::MainWindow(QWidget *parent)
connect(m_web,SIGNAL(loadFinished(bool)),this,SLOT(slotWebLoadFinished(bool)));
connect(m_web,SIGNAL(loadProgress(int)),this,SLOT(slotWebLoadProgress(int)));
connect(m_web,SIGNAL(urlChanged(const QUrl&)),this,SLOT(slotUrlChanged(const QUrl&)));
// Ignore SSL errors.
@ -181,9 +180,6 @@ MainWindow::MainWindow(QWidget *parent)
//QStringList arguments=QCoreApplication::arguments();
m_web->setPage( new OGWebPage(this));
connect(m_web->page(), &QWebEnginePage::certificateError, this, &MainWindow::slotCertificateErrors);
OGCommandLineOptions &options = OGCommandLineOptions::getInstance();
QUrl url = QUrl(options.getUrl());
@ -345,18 +341,6 @@ void MainWindow::slotSslErrors(QNetworkReply* reply)
reply->ignoreSslErrors();
}
void MainWindow::slotCertificateErrors(const QWebEngineCertificateError &certificateError) {
qWarning() << "SSL error:" << certificateError.description();
OGCommandLineOptions &options = OGCommandLineOptions::getInstance();
if (options.getIgnoreSslErrors()) {
qInfo() << "Ignoring SSL errors";
auto mutableError = const_cast<QWebEngineCertificateError&>(certificateError);
mutableError.acceptCertificate();
}
}
void MainWindow::slotProcessStarted()
{
startProgressBar();

View File

@ -58,8 +58,6 @@ class MainWindow : public QMainWindow
void slotWebLoadFinished(bool ok);
void slotWebLoadProgress(int progress);
void slotSslErrors(QNetworkReply* reply);
void slotCertificateErrors(const QWebEngineCertificateError &certificateError);
// Funciones que manejan cada vez que el proceso hace algo
void slotProcessStarted();

View File

@ -35,10 +35,6 @@ class OGCommandLineOptions {
NewTabBehavior getNewTabBehavior() const { return _newTabBehavior; }
void setNewTabBehavior(NewTabBehavior nt) { _newTabBehavior = nt; }
bool getIgnoreSslErrors() const { return _ignoreSslErrors; }
void setIgnoreSslErrors(bool value) { _ignoreSslErrors = value; }
private:
OGCommandLineOptions() {
@ -46,6 +42,4 @@ private:
QString _url;
NewTabBehavior _newTabBehavior{ReplacePage};
bool _ignoreSslErrors = false;
};