forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

temp/calamares: upgrade to 3.2.26.1 (MR 1366)

Browse source 
Upgrade to latest bugfix release, and add a patch to fix weird looking
borders on mobile.
This commit is contained in:
Oliver Smith 2020-06-24 08:56:36 +02:00
parent 79ad89afb2
commit 2f05e21d67
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
temp/calamares/0001-ViewManager-remove-mainLayout-border.patch Normal file
View file

@ -0,0 +1,26 @@
From 6e9b042ff704e410ff8eadc4a07724f1f395f2f2 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Wed, 24 Jun 2020 09:51:29 +0200
Subject: [PATCH] ViewManager: remove mainLayout border
This does not look good on mobile. Upstream issue with photo and request
to make it configurable: https://github.com/calamares/calamares/issues/1446
---
src/libcalamaresui/ViewManager.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp
index c78680418..e72c434f8 100644
--- a/src/libcalamaresui/ViewManager.cpp
+++ b/src/libcalamaresui/ViewManager.cpp
@@ -71,6 +71,7 @@ ViewManager::ViewManager( QObject* parent )
Q_ASSERT( !s_instance );
QBoxLayout* mainLayout = new QVBoxLayout;
+ mainLayout->setContentsMargins( 0, 0, 0, 0 );
m_widget->setObjectName( "viewManager" );
m_widget->setLayout( mainLayout );
--
2.20.1

9
temp/calamares/APKBUILD
View file

@ -1,6 +1,6 @@
# Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
pkgname=calamares
pkgver=3.2.26
pkgver=3.2.26.1
pkgrel=0
arch="all !armhf" # blocked by qt5-qtdeclarative
url="https://calamares.io/"
@ -37,7 +37,9 @@ makedepends="
qt5-qtsvg-dev
"
checkdepends="xvfb-run"
source="https://github.com/calamares/calamares/archive/v$pkgver/calamares-v$pkgver.tar.gz"
source="https://github.com/calamares/calamares/archive/v$pkgver/calamares-v$pkgver.tar.gz
0001-ViewManager-remove-mainLayout-border.patch
"
subpackages="$pkgname-doc $pkgname-lang $pkgname-dev"
# Modules to build:
@ -119,4 +121,5 @@ package() {
DESTDIR="$pkgdir" make -C build install
}
sha512sums="c7d6723c9c170aac8e59b026ed2100f7cfb3ce51003d69beec2a9727ac46037d8642b98d4a8a5605f63a2ae0f37649a689fb81c66e66d2685732d314769be5ab calamares-v3.2.26.tar.gz"
sha512sums="ef851e329988d31cb54112462dee7125d6ae4094926e9ed31cc02b25f808bbb8446652ffc03d0c12b8b489eb15d712d7eeef829451583c60c99ef5942286be6d calamares-v3.2.26.1.tar.gz
6b5e9a27bbc504f702e6dc8b464d3581c1de850477ef1e195b39b9128ec11577693d67808dd24886689ee2b7b6bced2c0d6ef43a07af0114e64bb60b2e7bee57 0001-ViewManager-remove-mainLayout-border.patch"