Date: Tuesday, February 14, 2023 @ 13:05:48
Author: arojas
Revision: 1400446
upgpkg: libcutefish 0.7-2: libkscreen 5.27 rebuild
Added:
libcutefish/trunk/libkscreen-5.27.patch
Modified:
libcutefish/trunk/PKGBUILD
-----------------------+
PKGBUILD | 14 ++++++-
libkscreen-5.27.patch | 87 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 98 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-02-14 13:02:42 UTC (rev 1400445)
+++ PKGBUILD 2023-02-14 13:05:48 UTC (rev 1400446)
@@ -2,7 +2,7 @@
pkgname=libcutefish
pkgver=0.7
-pkgrel=1
+pkgrel=2
pkgdesc="System library for Cutefish applications"
arch=('x86_64')
url="https://github.com/cutefishos/libcutefish";
@@ -11,9 +11,17 @@
# via dbus:
'accountsservice')
makedepends=('extra-cmake-modules' 'ninja' 'qt5-tools')
-source=("https://github.com/cutefishos/libcutefish/archive/$pkgver/$pkgname-$pkgver.tar.gz";)
-sha512sums=('a6a83f10f7e3309ce1cbf4cb607328cb7448364ae66af1f36e8dd41ae1682a70fd9dccf18b84f205e7445d27a7b81e9d14d5f5eae383cc20fdbb81e7ee08fae6')
+source=("https://github.com/cutefishos/libcutefish/archive/$pkgver/$pkgname-$pkgver.tar.gz";
+ libkscreen-5.27.patch)
+sha512sums=('a6a83f10f7e3309ce1cbf4cb607328cb7448364ae66af1f36e8dd41ae1682a70fd9dccf18b84f205e7445d27a7b81e9d14d5f5eae383cc20fdbb81e7ee08fae6'
+
'1a197f3b04b51162468b3882bd14af5962766c578c26a16ff31467f5479f1102094c20c47ce7c57c93644ad36454ea6012b16ac8ccef74c2b45ed3dc52f64597')
+prepare() {
+# Fix build with libkscreen 5.27
+ sed -e 's|CMAKE_CXX_STANDARD 14|CMAKE_CXX_STANDARD 17|' -i
$pkgname-$pkgver/CMakeLists.txt
+ patch -d $pkgname-$pkgver -p1 < libkscreen-5.27.patch
+}
+
build() {
cd $pkgname-$pkgver
Added: libkscreen-5.27.patch
===================================================================
--- libkscreen-5.27.patch (rev 0)
+++ libkscreen-5.27.patch 2023-02-14 13:05:48 UTC (rev 1400446)
@@ -0,0 +1,87 @@
+diff --git a/screen/confighandler.cpp b/screen/confighandler.cpp
+index b4838d1..5375b62 100644
+--- a/screen/confighandler.cpp
++++ b/screen/confighandler.cpp
+@@ -65,7 +65,7 @@ void ConfigHandler::setConfig(KScreen::ConfigPtr config)
+ connect(m_config.data(), &KScreen::Config::outputRemoved, this, [this]() {
+ Q_EMIT outputConnect(false);
+ });
+- connect(m_config.data(), &KScreen::Config::primaryOutputChanged, this,
&ConfigHandler::primaryOutputChanged);
++ connect(m_config.data(), &KScreen::Config::prioritiesChanged, this,
&ConfigHandler::primaryOutputChanged);
+
+ Q_EMIT outputModelChanged();
+ }
+@@ -219,9 +219,8 @@ void ConfigHandler::primaryOutputSelected(int index)
+ // TODO
+ }
+
+-void ConfigHandler::primaryOutputChanged(const KScreen::OutputPtr &output)
++void ConfigHandler::primaryOutputChanged()
+ {
+- Q_UNUSED(output)
+ }
+
+ Control::OutputRetention ConfigHandler::getRetention() const
+diff --git a/screen/confighandler.h b/screen/confighandler.h
+index cc6956a..9705c73 100644
+--- a/screen/confighandler.h
++++ b/screen/confighandler.h
+@@ -84,7 +84,7 @@ private:
+ QSize screenSize() const;
+ Control::OutputRetention getRetention() const;
+ void primaryOutputSelected(int index);
+- void primaryOutputChanged(const KScreen::OutputPtr &output);
++ void primaryOutputChanged();
+ void initOutput(const KScreen::OutputPtr &output);
+ void resetScale(const KScreen::OutputPtr &output);
+
+diff --git a/screen/outputmodel.cpp b/screen/outputmodel.cpp
+index 39ece45..4e16013 100644
+--- a/screen/outputmodel.cpp
++++ b/screen/outputmodel.cpp
+@@ -223,7 +223,7 @@ void OutputModel::add(const KScreen::OutputPtr &output)
+ }
+ m_outputs.insert(i, Output(output, pos));
+
+- connect(output.data(), &KScreen::Output::isPrimaryChanged,
++ connect(output.data(), &KScreen::Output::priorityChanged,
+ this, [this, output](){
+ roleChanged(output->id(), PrimaryRole);
+ });
+@@ -603,7 +603,7 @@ bool OutputModel::setReplicationSourceIndex(int
outputIndex, int sourceIndex)
+ return false;
+ }
+ m_config->setReplicationSource(output.ptr, nullptr);
+- output.ptr->setLogicalSize(QSizeF());
++ output.ptr->setExplicitLogicalSize(QSizeF());
+ resetPosition(output);
+ } else {
+ const auto source = m_outputs[sourceIndex].ptr;
+@@ -614,7 +614,7 @@ bool OutputModel::setReplicationSourceIndex(int
outputIndex, int sourceIndex)
+ m_config->setReplicationSource(output.ptr, source);
+ output.posReset = output.ptr->pos();
+ output.ptr->setPos(source->pos());
+- output.ptr->setLogicalSize(source->logicalSize());
++ output.ptr->setExplicitLogicalSize(source->explicitLogicalSize());
+ }
+
+ reposition();
+diff --git a/screen/outputmodel.h b/screen/outputmodel.h
+index 49cd5bb..ad2429d 100644
+--- a/screen/outputmodel.h
++++ b/screen/outputmodel.h
+@@ -18,6 +18,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
+ #ifndef OUTPUTMODEL_H
+ #define OUTPUTMODEL_H
+
++#include <kscreen/mode.h>
+ #include <kscreen/config.h>
+ #include <kscreen/output.h>
+
+@@ -151,4 +152,4 @@ private:
+ ConfigHandler *m_config;
+ };
+
+-#endif
+\ No newline at end of file
++#endif
