From 9aa52cdc2cd3cc075c3a8f2d08d6f887bb58671f Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 7 Jul 2019 20:56:15 +0000 Subject: Initial revision --- .../lxinput-qt/lxqt-config-input_pt_BR_utf8.patch | 75 +++++++ .../patch/lxqt-config/lxqt-config_cmake38.patch | 223 +++++++++++++++++++++ .../patch/lxqt-panel/lxqt-panel_fix_explicit.patch | 32 +++ .../lxqt-powermanagement/lidwatcher_qt4.patch | 24 +++ .../post-install/lxqt-common/xinit/xinitrc.lxqt | 32 +++ 5 files changed, 386 insertions(+) create mode 100644 lxqt/build/patch/lxinput-qt/lxqt-config-input_pt_BR_utf8.patch create mode 100644 lxqt/build/patch/lxqt-config/lxqt-config_cmake38.patch create mode 100644 lxqt/build/patch/lxqt-panel/lxqt-panel_fix_explicit.patch create mode 100644 lxqt/build/patch/lxqt-powermanagement/lidwatcher_qt4.patch create mode 100644 lxqt/build/post-install/lxqt-common/xinit/xinitrc.lxqt diff --git a/lxqt/build/patch/lxinput-qt/lxqt-config-input_pt_BR_utf8.patch b/lxqt/build/patch/lxinput-qt/lxqt-config-input_pt_BR_utf8.patch new file mode 100644 index 00000000..bd573ea0 --- /dev/null +++ b/lxqt/build/patch/lxinput-qt/lxqt-config-input_pt_BR_utf8.patch @@ -0,0 +1,75 @@ +Fixed building error due to recent Brasilian translation update. +The update was submitted in ISO-8859-1 format which is a not +allowed format. The correct format is UTF-8. This commit has +converted the translation to UTF-8. + +--- lxinput-qt-af35900_20140326git.orig/src/translations/lxqt-config-input_pt_BR.ts 2014-03-26 12:40:52.000000000 +0100 ++++ lxinput-qt-af35900_20140326git/src/translations/lxqt-config-input_pt_BR.ts 2014-05-09 14:15:43.883158970 +0200 +@@ -4,7 +4,7 @@ + MainDialog + + Input Device Preferences +- Preferências do Dispositivo de Entrada ++ Preferências do Dispositivo de Entrada + + + Motion +@@ -16,7 +16,7 @@ + + + Fast +- Rápido ++ Rápido + + + Sensitivity: +@@ -28,7 +28,7 @@ + + + Acceleration: +- Aceleração: ++ Aceleração: + + + Slow +@@ -40,7 +40,7 @@ + + + Left handed (Swap left and right mouse buttons) +- Canhoto (Inverter botões esquerdo e direito do mouse) ++ Canhoto (Inverter botões esquerdo e direito do mouse) + + + Mouse +@@ -48,7 +48,7 @@ + + + Character Repeat +- Repetição de Caracter ++ Repetição de Caracter + + + Long +@@ -56,7 +56,7 @@ + + + Repeat delay: +- Atraso de Repetição: ++ Atraso de Repetição: + + + Short +@@ -64,11 +64,11 @@ + + + Repeat interval: +- Intervalo de Repetição: ++ Intervalo de Repetição: + + + Type in the following box to test your keyboard settings +- Digite na caixa seguinte para testar as definições do teclado ++ Digite na caixa seguinte para testar as definições do teclado + + + Beep when there is an error of keyboard input diff --git a/lxqt/build/patch/lxqt-config/lxqt-config_cmake38.patch b/lxqt/build/patch/lxqt-config/lxqt-config_cmake38.patch new file mode 100644 index 00000000..7e23ff70 --- /dev/null +++ b/lxqt/build/patch/lxqt-config/lxqt-config_cmake38.patch @@ -0,0 +1,223 @@ +https://github.com/lxde/lxqt-config/commit/bca652a75f8a497a69b1fbc1c7eaa353f6b4eef8.patch + +From bca652a75f8a497a69b1fbc1c7eaa353f6b4eef8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= +Date: Wed, 19 Apr 2017 12:56:45 +0100 +Subject: [PATCH] Fixes a FTBFS with CMake v3.8 + +CMake v3.8 AUTOUIC changed the directory where the file is generated to: +/_autogen/include. The changes makes +us fail. +The change is actually just an sympton and not a root cause. We shouldn't +include a ui generated file in public header. + +Closes https://github.com/lxde/lxqt/issues/1277 +--- + liblxqt-config-cursor/selectwnd.cpp | 64 ++++++++++++++++++++----------------- + liblxqt-config-cursor/selectwnd.h | 9 ++++-- + 2 files changed, 41 insertions(+), 32 deletions(-) + +diff --git a/liblxqt-config-cursor/selectwnd.cpp b/liblxqt-config-cursor/selectwnd.cpp +index e76840b..8a1fa18 100644 +--- a/liblxqt-config-cursor/selectwnd.cpp ++++ b/liblxqt-config-cursor/selectwnd.cpp +@@ -13,6 +13,7 @@ + #include + + #include "selectwnd.h" ++#include "ui_selectwnd.h" + + #include + #include +@@ -37,22 +38,24 @@ + + #define HOME_ICON_DIR QDir::homePath() + "/.icons" + +-SelectWnd::SelectWnd(LXQt::Settings* settings, QWidget *parent) : QWidget(parent), mSettings(settings) ++SelectWnd::SelectWnd(LXQt::Settings* settings, QWidget *parent) ++ : QWidget(parent), ++ mSettings(settings), ++ ui(new Ui::SelectWnd) + { +- setupUi(this); +- +- warningLabel->hide(); ++ ui->setupUi(this); ++ ui->warningLabel->hide(); + + mModel = new XCursorThemeModel(this); + + int size = style()->pixelMetric(QStyle::PM_LargeIconSize); +- lbThemes->setModel(mModel); +- lbThemes->setItemDelegate(new ItemDelegate(this)); +- lbThemes->setIconSize(QSize(size, size)); +- lbThemes->setSelectionMode(QAbstractItemView::SingleSelection); ++ ui->lbThemes->setModel(mModel); ++ ui->lbThemes->setItemDelegate(new ItemDelegate(this)); ++ ui->lbThemes->setIconSize(QSize(size, size)); ++ ui->lbThemes->setSelectionMode(QAbstractItemView::SingleSelection); + + // Make sure we find out about selection changes +- connect(lbThemes->selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)), ++ connect(ui->lbThemes->selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)), + SLOT(currentChanged(const QModelIndex &, const QModelIndex &))); + // display/hide warning label + connect(mModel, SIGNAL(modelReset()), +@@ -62,15 +65,15 @@ SelectWnd::SelectWnd(LXQt::Settings* settings, QWidget *parent) : QWidget(parent + connect(mModel, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), + this, SLOT(handleWarning())); + +- connect(warningLabel, SIGNAL(showDirInfo()), ++ connect(ui->warningLabel, SIGNAL(showDirInfo()), + this, SLOT(showDirInfo())); + + // Disable the install button if we can't install new themes to ~/.icons, + // or Xcursor isn't set up to look for cursor themes there +- btInstall->setEnabled(mModel->searchPaths().contains(HOME_ICON_DIR) && iconsIsWritable()); ++ ui->btInstall->setEnabled(mModel->searchPaths().contains(HOME_ICON_DIR) && iconsIsWritable()); + // TODO/FIXME: btInstall functionality +- btInstall->hide(); +- btRemove->hide(); ++ ui->btInstall->hide(); ++ ui->btRemove->hide(); + + //QTimer::singleShot(0, this, SLOT(setCurrent())); + +@@ -80,11 +83,12 @@ SelectWnd::SelectWnd(LXQt::Settings* settings, QWidget *parent) : QWidget(parent + + SelectWnd::~SelectWnd() + { ++ delete ui; + } + + void SelectWnd::setCurrent() + { +- lbThemes->selectionModel()->clear(); ++ ui->lbThemes->selectionModel()->clear(); + + QString ct = getCurrentTheme(); + mAppliedIndex = mModel->defaultIndex(); +@@ -97,9 +101,9 @@ void SelectWnd::setCurrent() + const XCursorThemeData *theme = mModel->theme(mAppliedIndex); + // Select the current theme + selectRow(mAppliedIndex); +- lbThemes->scrollTo(mAppliedIndex, QListView::PositionAtCenter); ++ ui->lbThemes->scrollTo(mAppliedIndex, QListView::PositionAtCenter); + // Update the preview widget as well +- if (theme) preview->setTheme(*theme);// else preview->clearTheme(); ++ if (theme) ui->preview->setTheme(*theme);// else ui->preview->clearTheme(); + } + } + +@@ -123,8 +127,8 @@ void SelectWnd::selectRow(int row) const + QModelIndex from = mModel->index(row, 0); + QModelIndex to = mModel->index(row, mModel->columnCount()-1); + QItemSelection selection(from, to); +- lbThemes->selectionModel()->select(selection, QItemSelectionModel::Select); +- lbThemes->selectionModel()->setCurrentIndex(mAppliedIndex, QItemSelectionModel::NoUpdate); ++ ui->lbThemes->selectionModel()->select(selection, QItemSelectionModel::Select); ++ ui->lbThemes->selectionModel()->setCurrentIndex(mAppliedIndex, QItemSelectionModel::NoUpdate); + } + + void SelectWnd::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) +@@ -133,16 +137,16 @@ void SelectWnd::currentChanged(const QModelIndex ¤t, const QModelIndex &pr + if (current.isValid()) { + const XCursorThemeData *theme = mModel->theme(current); + if (theme) { +- preview->setTheme(*theme); +- btRemove->setEnabled(theme->isWritable()); ++ ui->preview->setTheme(*theme); ++ ui->btRemove->setEnabled(theme->isWritable()); + } else { +- preview->clearTheme(); ++ ui->preview->clearTheme(); + } + + // directly apply the current settings + applyCurrent(); + } else { +- preview->clearTheme(); ++ ui->preview->clearTheme(); + } + //emit changed(mAppliedIndex != current); + } +@@ -155,7 +159,7 @@ void SelectWnd::on_btInstall_clicked() + void SelectWnd::applyCurrent() + { + //qDebug() << "'set' clicked"; +- const XCursorThemeData *theme = mModel->theme(lbThemes->currentIndex()); ++ const XCursorThemeData *theme = mModel->theme(ui->lbThemes->currentIndex()); + if (!theme) return; + applyTheme(*theme); + fixXDefaults(theme->name()); +@@ -200,7 +204,7 @@ void SelectWnd::applyCurrent() + void SelectWnd::on_btRemove_clicked() + { + qDebug() << "'remove' clicked"; +- const XCursorThemeData *theme = mModel->theme(lbThemes->currentIndex()); ++ const XCursorThemeData *theme = mModel->theme(ui->lbThemes->currentIndex()); + if (!theme) return; + QString ct = getCurrentTheme(); + if (ct == theme->name()) +@@ -210,20 +214,20 @@ void SelectWnd::on_btRemove_clicked() + return; + } + QDir d(theme->path()); +- preview->clearTheme(); +- mModel->removeTheme(lbThemes->currentIndex()); ++ ui->preview->clearTheme(); ++ mModel->removeTheme(ui->lbThemes->currentIndex()); + removeXCursorTheme(d); + } + + void SelectWnd::handleWarning() + { + bool empty = mModel->rowCount(); +- warningLabel->setVisible(!empty); +- preview->setVisible(empty); +- infoLabel->setVisible(empty); ++ ui->warningLabel->setVisible(!empty); ++ ui->preview->setVisible(empty); ++ ui->infoLabel->setVisible(empty); + } + + void SelectWnd::showDirInfo() + { +- QToolTip::showText(mapToGlobal(warningLabel->buttonPos()), mModel->searchPaths().join("\n")); ++ QToolTip::showText(mapToGlobal(ui->warningLabel->buttonPos()), mModel->searchPaths().join("\n")); + } +diff --git a/liblxqt-config-cursor/selectwnd.h b/liblxqt-config-cursor/selectwnd.h +index c9bc428..200cfa0 100644 +--- a/liblxqt-config-cursor/selectwnd.h ++++ b/liblxqt-config-cursor/selectwnd.h +@@ -15,16 +15,20 @@ + + #include + #include ++#include + #include + + namespace LXQt { + class Settings; + } + ++namespace Ui { ++class SelectWnd; ++} ++ + class XCursorThemeModel; + +-#include "ui_selectwnd.h" +-class LXQT_API SelectWnd : public QWidget, private Ui_SelectWnd ++class LXQT_API SelectWnd : public QWidget + { + Q_OBJECT + +@@ -55,6 +59,7 @@ private slots: + XCursorThemeModel *mModel; + QPersistentModelIndex mAppliedIndex; + LXQt::Settings* mSettings; ++ Ui::SelectWnd *ui; + }; + + #endif diff --git a/lxqt/build/patch/lxqt-panel/lxqt-panel_fix_explicit.patch b/lxqt/build/patch/lxqt-panel/lxqt-panel_fix_explicit.patch new file mode 100644 index 00000000..ebe3ab7d --- /dev/null +++ b/lxqt/build/patch/lxqt-panel/lxqt-panel_fix_explicit.patch @@ -0,0 +1,32 @@ +From ec62109e0fa678875a9b10fc6f1975267432712d Mon Sep 17 00:00:00 2001 +From: Palo Kisa +Date: Mon, 30 Jan 2017 12:21:10 +0100 +Subject: [PATCH] plugin-kbindicator: Undef the "explicit" workaround + +..after include and add explanation of the workaround. + +closes lxde/lxqt#1251 +--- + plugin-kbindicator/src/x11/kbdlayout.cpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/plugin-kbindicator/src/x11/kbdlayout.cpp b/plugin-kbindicator/src/x11/kbdlayout.cpp +index c4aa4e2..883df07 100644 +--- a/plugin-kbindicator/src/x11/kbdlayout.cpp ++++ b/plugin-kbindicator/src/x11/kbdlayout.cpp +@@ -33,8 +33,15 @@ + + #include + #include ++ ++// Note: We need to override "explicit" as this is a C++ keyword. But it is ++// used as variable name in xkb.h. This is causing a failure in C++ compile ++// time. ++// Similar bug here: https://bugs.freedesktop.org/show_bug.cgi?id=74080 + #define explicit _explicit + #include ++#undef explicit ++ + #include "../kbdinfo.h" + #include "../controls.h" + diff --git a/lxqt/build/patch/lxqt-powermanagement/lidwatcher_qt4.patch b/lxqt/build/patch/lxqt-powermanagement/lidwatcher_qt4.patch new file mode 100644 index 00000000..5fe81e8c --- /dev/null +++ b/lxqt/build/patch/lxqt-powermanagement/lidwatcher_qt4.patch @@ -0,0 +1,24 @@ +--- lxqt-powermanagement-0.7.0/src/lidwatcher.cpp.orig 2014-05-01 04:04:14.000000000 +0200 ++++ lxqt-powermanagement-0.7.0/src/lidwatcher.cpp 2014-05-08 11:54:48.657344347 +0200 +@@ -27,8 +27,8 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + #include + #include "lidwatcher.h" + #include "../config/powermanagementsettings.h" +--- lxqt-powermanagement-0.7.0/src/lid.cpp.orig 2014-05-01 04:04:14.000000000 +0200 ++++ lxqt-powermanagement-0.7.0/src/lid.cpp 2014-05-08 13:19:45.532202958 +0200 +@@ -27,7 +27,7 @@ + #include "lid.h" + #include + #include +-#include ++#include + #include + + Lid::Lid() diff --git a/lxqt/build/post-install/lxqt-common/xinit/xinitrc.lxqt b/lxqt/build/post-install/lxqt-common/xinit/xinitrc.lxqt new file mode 100644 index 00000000..d83c2dbf --- /dev/null +++ b/lxqt/build/post-install/lxqt-common/xinit/xinitrc.lxqt @@ -0,0 +1,32 @@ +#!/bin/sh +# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $ + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +# merge in defaults and keymaps + +if [ -f $sysresources ]; then + xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f $userresources ]; then + xrdb -merge $userresources +fi + +if [ -f $usermodmap ]; then + xmodmap $usermodmap +fi + +# Start the window manager: +if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then + exec ck-launch-session dbus-launch --exit-with-session startlxqt +else + exec startlxqt +fi -- cgit v1.2.3-65-gdbad