mirrors/aports
2
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2024-09-20 11:23:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

testing/lomiri: upgrade to 0.3.0

Browse source
This commit is contained in:
Luca Weiss 2024-08-06 22:22:37 +02:00 committed by Kevin Daudt
parent 98f81ee95b
commit 5ce0ae252f
10 changed files with 57 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
testing/lomiri/0001-Fix-overwriting-INCLUDE_DIRECTORIES-variable.patch
View file

@ -1,40 +0,0 @@
From 57a1a449b7305604710db32ffd9ab413492e1f5b Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Sun, 24 Dec 2023 17:23:39 +0100
Subject: [PATCH 1/7] Fix overwriting INCLUDE_DIRECTORIES variable
Let's set it before adding more include directories. Fixes compilation
on Alpine Linux as of day - with CMake 3.28.1 fwiw
---
tests/uqmlscene/CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/uqmlscene/CMakeLists.txt b/tests/uqmlscene/CMakeLists.txt
index 6cffcc4f1..6c0cce047 100644
--- a/tests/uqmlscene/CMakeLists.txt
+++ b/tests/uqmlscene/CMakeLists.txt
@@ -6,6 +6,10 @@ add_executable(uqmlscene
pkg_check_modules(XCB REQUIRED xcb)
+if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
+ set_target_properties(uqmlscene PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
+endif()
+
include_directories(
SYSTEM
${Qt5Quick_PRIVATE_INCLUDE_DIRS}
@@ -19,10 +23,6 @@ include_directories(
${liblomiri-private_SOURCE_DIR}
)
-if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
- set_target_properties(uqmlscene PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
-endif()
-
target_link_libraries(uqmlscene
Qt5::Qml Qt5::Quick Qt5::Test Qt5::DBus
${Qt5Qml_LIBRARIES}
--
2.43.0

6
testing/lomiri/0003-cursor-Always-follow-cursor-position-from-mir.patch → testing/lomiri/0001-cursor-Always-follow-cursor-position-from-mir.patch
View file

@ -1,7 +1,7 @@
From 0528e804b6625bd42664ac661566efb4f1918031 Mon Sep 17 00:00:00 2001
From 48aaa2fc53f1be91c799f984dc1ee5f384c9640f Mon Sep 17 00:00:00 2001
From: Marius Gripsgard <marius@ubports.com>
Date: Wed, 31 May 2023 05:48:35 +0200
Subject: [PATCH 3/7] cursor: Always follow cursor position from mir
Subject: [PATCH 1/6] cursor: Always follow cursor position from mir
It makes no sense to not, if we dont we can quickly get out of sync with
mir.
@ -28,5 +28,5 @@ index 4ef0199d9..5dcc1a421 100644
QScreen* currentScreen = screenAt(newPos);
--
2.43.0
2.46.0

12
testing/lomiri/0004-Disable-broken-tests-due-to-dropped-mocks-from-mir-2.patch → testing/lomiri/0002-Disable-broken-tests-due-to-dropped-mocks-from-mir-2.patch
View file

@ -1,18 +1,18 @@
From ced81a10807327855f583687f4ac3c7f7ec7250c Mon Sep 17 00:00:00 2001
From 9faf6026bae069302e8744284d870388659d80cd Mon Sep 17 00:00:00 2001
From: Marius Gripsgard <marius@ubports.com>
Date: Thu, 12 Jan 2023 01:08:08 +0100
Subject: [PATCH 4/7] Disable broken tests due to dropped mocks from mir 2.9
Subject: [PATCH 2/6] Disable broken tests due to dropped mocks from mir 2.9
---
tests/mocks/CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/mocks/CMakeLists.txt b/tests/mocks/CMakeLists.txt
index c9a93cf66..c49e8898f 100644
index 19d197d58..e0bebee5b 100644
--- a/tests/mocks/CMakeLists.txt
+++ b/tests/mocks/CMakeLists.txt
@@ -41,7 +41,8 @@ add_subdirectory(Powerd)
add_subdirectory(QMenuModel.1)
@@ -41,7 +41,8 @@ add_subdirectory(QMenuModel.1)
add_subdirectory(QOfono)
add_subdirectory(SessionBroadcast)
add_subdirectory(Lomiri)
-add_subdirectory(QtMir/Application)
@ -22,5 +22,5 @@ index c9a93cf66..c49e8898f 100644
add_subdirectory(WindowManager)
add_subdirectory(Wizard)
--
2.43.0
2.46.0

59
testing/lomiri/0002-Fix-build-on-32bit-arches-with-64bit-time_t.patch
View file

@ -1,59 +0,0 @@
From 601e01de1085356f61de8337c05b685f4f70c28d Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Sun, 28 Jan 2024 11:25:29 +0100
Subject: [PATCH 2/7] Fix build on 32bit arches with 64bit time_t
time element is deprecated on new input_event structure in kernel's
input.h [1]
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
---
plugins/UInput/uinput.cpp | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/plugins/UInput/uinput.cpp b/plugins/UInput/uinput.cpp
index e80db50d1..65034ae83 100644
--- a/plugins/UInput/uinput.cpp
+++ b/plugins/UInput/uinput.cpp
@@ -108,8 +108,11 @@ void UInput::removeMouse()
void UInput::moveMouse(int dx, int dy)
{
struct input_event event;
+ struct timespec time;
memset(&event, 0, sizeof(event));
- clock_gettime(CLOCK_MONOTONIC, (timespec*)&event.time);
+ clock_gettime(CLOCK_MONOTONIC, &time);
+ event.input_event_sec = time.tv_sec;
+ event.input_event_usec = time.tv_nsec / 1000;
event.type = EV_REL;
event.code = REL_X;
event.value = dx;
@@ -138,8 +141,11 @@ void UInput::releaseMouse(Button button)
void UInput::scrollMouse(int dh, int dv)
{
struct input_event event;
+ struct timespec time;
memset(&event, 0, sizeof(event));
- clock_gettime(CLOCK_MONOTONIC, (timespec*)&event.time);
+ clock_gettime(CLOCK_MONOTONIC, &time);
+ event.input_event_sec = time.tv_sec;
+ event.input_event_usec = time.tv_nsec / 1000;
event.type = EV_REL;
event.code = REL_HWHEEL;
event.value = dh;
@@ -158,8 +164,11 @@ void UInput::scrollMouse(int dh, int dv)
void UInput::injectMouse(Button button, int down)
{
struct input_event event;
+ struct timespec time;
memset(&event, 0, sizeof(event));
- clock_gettime(CLOCK_MONOTONIC, (timespec*)&event.time);
+ clock_gettime(CLOCK_MONOTONIC, &time);
+ event.input_event_sec = time.tv_sec;
+ event.input_event_usec = time.tv_nsec / 1000;
event.type = EV_KEY;
switch (button) {
case ButtonLeft:
--
2.43.0

10
testing/lomiri/0005-Add-qt5-suffix-to-search-for-Qt-tools.patch → testing/lomiri/0003-Add-qt5-suffix-to-search-for-Qt-tools.patch
View file

@ -1,7 +1,7 @@
From 7a1477480b29605193be5e77ee27faf5c52839d2 Mon Sep 17 00:00:00 2001
From 195f53d3b7ef1476ae42002753b626401772bbab Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Tue, 29 Jan 2019 19:25:24 +0100
Subject: [PATCH 5/7] Add -qt5 suffix to search for Qt tools
Subject: [PATCH 3/6] Add -qt5 suffix to search for Qt tools
---
cmake/modules/QmlTest.cmake | 4 ++--
@ -9,7 +9,7 @@ Subject: [PATCH 5/7] Add -qt5 suffix to search for Qt tools
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmake/modules/QmlTest.cmake b/cmake/modules/QmlTest.cmake
index f4a95ab4e..537ba792c 100644
index 1ac37afd3..5dda594c2 100644
--- a/cmake/modules/QmlTest.cmake
+++ b/cmake/modules/QmlTest.cmake
@@ -114,9 +114,9 @@ endfunction()
@ -25,7 +25,7 @@ index f4a95ab4e..537ba792c 100644
ARGS -input ${CMAKE_CURRENT_SOURCE_DIR}/${PATH}/tst_${COMPONENT_NAME}.qml ${QMLTEST_ARGS}
)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f2bcf212d..58cf9bee9 100644
index 33cf60049..86cf3f876 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -135,11 +135,11 @@ endfunction()
@ -43,5 +43,5 @@ index f2bcf212d..58cf9bee9 100644
install(DIRECTORY data graphics
--
2.43.0
2.46.0

6
testing/lomiri/0006-No-systemd.patch → testing/lomiri/0004-No-systemd.patch
View file

@ -1,7 +1,7 @@
From f7b5bcf00f57ef0d64cefb772a02e29d81b6bb2b Mon Sep 17 00:00:00 2001
From e291ed5deb5038a767248ebf8e6668ad7a8205b0 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Fri, 25 Jun 2021 10:16:19 +0200
Subject: [PATCH 6/7] No systemd
Subject: [PATCH 4/6] No systemd
---
data/CMakeLists.txt | 2 +-
@ -18,5 +18,5 @@ index 4bffd05dd..7b5bb8e4f 100644
-add_subdirectory(systemd-user)
+#add_subdirectory(systemd-user)
--
2.43.0
2.46.0

6
testing/lomiri/0007-Disable-lightdm-integration.patch → testing/lomiri/0005-Disable-lightdm-integration.patch
View file

@ -1,7 +1,7 @@
From 8f73d2aa28bf83b45876b1b6719a8488eb762f85 Mon Sep 17 00:00:00 2001
From ba6554778a5d6d205152eeafdb9c6adee396f959 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca.weiss@fairphone.com>
Date: Tue, 14 Nov 2023 22:00:38 +0100
Subject: [PATCH 7/7] Disable lightdm integration
Subject: [PATCH 5/6] Disable lightdm integration
Not needed on postmarketOS
---
@ -36,5 +36,5 @@ index 352beba17..5f6f5cc8c 100644
add_subdirectory(Lomiri)
add_subdirectory(Utils)
--
2.43.0
2.46.0

14
testing/lomiri/0008-Change-hard-coded-launcher-logo-to-one-set-by-a-reso.patch → testing/lomiri/0006-Change-hard-coded-launcher-logo-to-one-set-by-a-reso.patch
View file

@ -1,7 +1,7 @@
From b7df6bf3459ddadb29b6c4203e1032b6f3808c0b Mon Sep 17 00:00:00 2001
From bf47a23d9edf0a584200c8aaa72c5fce18df3e89 Mon Sep 17 00:00:00 2001
From: Brandon Boese <brandonboese@protonmail.com>
Date: Fri, 22 Mar 2024 19:28:46 -0400
Subject: [PATCH] Change hard-coded launcher logo to one set by a resolver
Subject: [PATCH 6/6] Change hard-coded launcher logo to one set by a resolver
---
plugins/Utils/constants.cpp | 1 +
@ -12,13 +12,13 @@ Subject: [PATCH] Change hard-coded launcher logo to one set by a resolver
create mode 100644 qml/Components/LogoResolver.qml
diff --git a/plugins/Utils/constants.cpp b/plugins/Utils/constants.cpp
index d7d6053f5..780cb75ed 100644
index a593c4cb9..507932882 100644
--- a/plugins/Utils/constants.cpp
+++ b/plugins/Utils/constants.cpp
@@ -29,4 +29,5 @@ Constants::Constants(QObject *parent)
QString snapRoot = QFile::decodeName(qgetenv("SNAP"));
m_defaultWallpaper = snapRoot + "/usr/share/backgrounds/warty-final-ubuntu.png";
m_defaultWallpaper = snapRoot + "/usr/share/backgrounds/lomiri-default-background.png";
+ m_defaultLogo = snapRoot + "/usr/share/lomiri/Launcher/graphics/home.svg";
}
diff --git a/plugins/Utils/constants.h b/plugins/Utils/constants.h
@ -111,7 +111,7 @@ index 000000000..53b1bb937
+ }
+}
diff --git a/qml/Launcher/LauncherPanel.qml b/qml/Launcher/LauncherPanel.qml
index 4d5764803..56a0110ea 100644
index 8f6436ff9..c1fd43050 100644
--- a/qml/Launcher/LauncherPanel.qml
+++ b/qml/Launcher/LauncherPanel.qml
@@ -19,6 +19,7 @@ import QtQml.StateMachine 1.0 as DSM
@ -122,7 +122,7 @@ index 4d5764803..56a0110ea 100644
import Utils 0.1
import "../Components"
@@ -95,11 +96,28 @@ Rectangle {
@@ -97,11 +98,28 @@ Rectangle {
width: parent.width * .6
height: width
anchors.centerIn: parent
@ -154,5 +154,5 @@ index 4d5764803..56a0110ea 100644
id: dashItem
anchors.fill: parent
--
2.44.0
2.46.0

11
testing/lomiri/2010_use-desktop-qtmir.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,7 +105,7 @@
option(WITH_MIR2 "Build against Mir 2" OFF)
if (WITH_MIR2)
- pkg_check_modules(QTMIRSERVER REQUIRED qt5mir2server>=0.6.0)
+ pkg_check_modules(QTMIRSERVER REQUIRED qtmirserver>=0.6.0)
pkg_check_modules(MIRAL REQUIRED miral>=3.0)
pkg_check_modules(MIROIL REQUIRED miroil)

39
testing/lomiri/APKBUILD
View file

@ -1,8 +1,8 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Luca Weiss <luca@lucaweiss.eu>
pkgname=lomiri
pkgver=0.2.1
pkgrel=2
pkgver=0.3.0
pkgrel=0
pkgdesc="A convergent desktop environment"
# armhf: blocked by lomiri-ui-toolkit
# s390x, riscv64, ppc64le: blocked by lomiri-system-settings
@ -55,14 +55,13 @@ makedepends="
"
checkdepends="py3-dbusmock"
source="https://gitlab.com/ubports/development/core/lomiri/-/archive/$pkgver/lomiri-$pkgver.tar.gz
0001-Fix-overwriting-INCLUDE_DIRECTORIES-variable.patch
0002-Fix-build-on-32bit-arches-with-64bit-time_t.patch
0003-cursor-Always-follow-cursor-position-from-mir.patch
0004-Disable-broken-tests-due-to-dropped-mocks-from-mir-2.patch
0005-Add-qt5-suffix-to-search-for-Qt-tools.patch
0006-No-systemd.patch
0007-Disable-lightdm-integration.patch
0008-Change-hard-coded-launcher-logo-to-one-set-by-a-reso.patch
0001-cursor-Always-follow-cursor-position-from-mir.patch
0002-Disable-broken-tests-due-to-dropped-mocks-from-mir-2.patch
0003-Add-qt5-suffix-to-search-for-Qt-tools.patch
0004-No-systemd.patch
0005-Disable-lightdm-integration.patch
0006-Change-hard-coded-launcher-logo-to-one-set-by-a-reso.patch
2010_use-desktop-qtmir.patch
home.svg
"
subpackages="$pkgname-lang"
@ -74,7 +73,8 @@ build() {
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_TYPE=None
-DCMAKE_BUILD_TYPE=None \
-DWITH_MIR2=ON
cmake --build build
}
@ -103,14 +103,13 @@ package() {
}
sha512sums="
4f844cb7552a6df9c3ed31f6705d0af2147fd44e7b390e8a4f7c5f95e61fc91590ebec1b296cf9eae83bbaa56df8fc5b1fa685143a788472e21525532d0b4251 lomiri-0.2.1.tar.gz
46f11652b0ed77fd27f14cef236a9f247885cc2fd85c433b47c617c0a9a3f80c292ba98c779b02e75bd752075160dc5e997b3f2bd4e24ee7f7005706268ded81 0001-Fix-overwriting-INCLUDE_DIRECTORIES-variable.patch
2a1f8069ff84486f7905fa2dc098b283c4d8308ad374d3f8383559241bfd9da4cabaecacfef41825f154e0d2d902eb85dff788aaca6260e1f6a21714bba7ff1d 0002-Fix-build-on-32bit-arches-with-64bit-time_t.patch
f124a98e8b13a0c640ab7180a9516d11122c787bff821225f7730fe292ad476a7fc68d1ffa7b3d2be0f3daf4732c3d60aba61044225764bf62eb4b432ca51a68 0003-cursor-Always-follow-cursor-position-from-mir.patch
1ce136ed0dd5f9a285d194684194ca04135ad9b4a7ac3bea5f1714b58465cc8d98f5f218938ea2155d9d9a4939877a65b7f7b02dba2d6beed3a940e42e137fd8 0004-Disable-broken-tests-due-to-dropped-mocks-from-mir-2.patch
33e92a4646352f16993829ae7686b7ebf2c949d418e51ed466268b53d8d0f939861fa113a19403936ce48e16e58c6166e370a4fd27a184bde554c4e2746b0898 0005-Add-qt5-suffix-to-search-for-Qt-tools.patch
828c19e69cc830b40d648ed5bfe03fdd350986c0f6276c7cb659097c54bb593a5a5c2471d2b4a463ced80f23f790829f50f5ec807c4e0d846e5b84a433109c1c 0006-No-systemd.patch
1ddd7a73bf5aa815e50251afd4b54563cc366667c9b9d230ba377451a569a0af01255ad2a3dbff255fc2067d9a404592f3c3f3910ff1c1a83f1280741663e92d 0007-Disable-lightdm-integration.patch
c953baa7ee424567105dcf37f45674638f9b8236e59121e05f454ccf198d65a9f8de445cfcc3d78a6e11439e395c33812d161b8fff0a6e03df2ee3f4d5526fbd 0008-Change-hard-coded-launcher-logo-to-one-set-by-a-reso.patch
d4a4731ff121b21e04225fd4afda801389dc52079cefdfb8dfb513b74c39b400e98960ba59334329bd96860dd0e707f575b14123296aff48d88a2f9e9b5f34d2 lomiri-0.3.0.tar.gz
6a2366586584b9929baae31c689e717f5198c04639902a5ec2bfeca20d0b176dde280cc64ba9ea90d8d1784aaacc86d642f800880e11c7e295eb18027f7cf013 0001-cursor-Always-follow-cursor-position-from-mir.patch
9a2a5dbc1fcfb94a354c56c0fe59395a42999f277c1353685cc10346154cea5d368d1f6471c5d0b62fbde8474b0411191ff4d21105752f7140434dde20434343 0002-Disable-broken-tests-due-to-dropped-mocks-from-mir-2.patch
182e09c4909ca48b95faf7bce6f56de92a5ff5c26661f826ef3fdc7ddad2c486978d138bfcf54312775208ec13c65646583021dd2eadcb6af9dc4016de010d19 0003-Add-qt5-suffix-to-search-for-Qt-tools.patch
d0baa1ba775f13f2782fb5771d2afa618d31e04fbec4442da57b3dd5eb3c2bc85e53518b75f4fd23b5407a520d2430e718e2bcb242af33ce37c48674168e7fce 0004-No-systemd.patch
accdc7cc9747a32593d4c64eac6869dc232ef8e6775066a56e41180b23d61f6f749779f37cd98e824cd54c60edb40f7c1fadede24c1abf5ef14daa79fa0a8a35 0005-Disable-lightdm-integration.patch
36ac033e4c892f8c43451ee93d00a5596b78fb6ff8cb13f96a28254af361b4e447a474cb0531f1a1f93a918e9939a5e169946568a7e8dbf5c8ea6c16f28d9355 0006-Change-hard-coded-launcher-logo-to-one-set-by-a-reso.patch
7a329bb4b0e17152fa900d5c9097fb472bfc0f4d0cc62c9709cfb1d60e0a2159934cddcd3d098ae1de7badfe8a89ee596f98cb9b138bd99a620e2c11940b591e 2010_use-desktop-qtmir.patch
8be30a5e7692c39ffb1948910b45d8fa69a88725df45b67ba69711281b3cf15568b9fff29a8b5b216e5e86656b5961ad7ef9eb0e87c007215e012c3a663045b7 home.svg
"