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

main/*, unity8/*: update various unity8 packages (!221)

Browse source 
Everything seems to be fine in QEMU.

[skip ci]: too many packages have changed
This commit is contained in:
Luca Weiss 2019-02-14 20:59:01 +01:00 • committed by Oliver Smith
parent 7896439813
commit 624c046cd4
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
16 changed files with 34 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

39
unity8/ubuntu-ui-toolkit/0001-Adapt-to-QtPim-API-changes.patch
View file

@ -1,39 +0,0 @@
From bd27207eba5211e106129b79be138e5298c9b3cb Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Wed, 3 Oct 2018 17:07:21 +0200
Subject: [PATCH 1/5] Adapt to QtPim API changes
---
debian/control | 2 +-
src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 97964424e..800892f62 100644
--- a/debian/control
+++ b/debian/control
@@ -52,7 +52,7 @@ Build-Depends: accountsservice,
qtdeclarative5-private-dev,
qtdeclarative5-unity-action-plugin (>= 1.1.0),
qtmultimedia5-doc-html,
- qtpim5-dev,
+ qtpim5-dev (>= 5.0~git20171109~0bd985b),
qtscript5-doc-html,
qtsvg5-doc-html,
qtsystems5-dev,
diff --git a/src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp b/src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp
index 72e30ba12..7552142f2 100644
--- a/src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp
+++ b/src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp
@@ -420,7 +420,7 @@ AlarmsAdapter::AlarmsAdapter(AlarmManager *qq)
QStringLiteral("collection-type"), QStringLiteral("Task List"));
if (!manager->saveCollection(&collection)) {
qWarning() << "WARNING: Creating dedicated collection for alarms was not possible, alarms will be saved into the default collection!";
- collection = manager->defaultCollection();
+ collection = manager->collection(manager->defaultCollectionId());
}
}
}
--
2.20.1

14
unity8/ubuntu-ui-toolkit/APKBUILD
View file

@ -1,8 +1,8 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=ubuntu-ui-toolkit
pkgver=0_git20180422
_commit="2f541e8b5e509ad40cd8dc70d634434e7ab8fc42"
pkgver=0_git20190208
_commit="cee7f49f493f37ebf0690137ed85700f94bacdf9"
pkgrel=0
pkgdesc='The Ubuntu UI toolkit used in Ubuntu Touch'
arch="x86_64"
@ -12,11 +12,7 @@ depends="qt5-qtfeedback"
depends_dev="libnih-dev qt5-qtsvg-dev qt5-qtpim-dev qt5-qtsystems-dev lttng-ust-dev libxi-dev eudev-dev mir-dev libevdev-dev qt5-qtgraphicaleffects qt5-qtfeedback-dev"
makedepends="$depends_dev qt5-qttools-dev qt5-qtdeclarative-dev"
source="$pkgname-$_commit.tar.gz::https://github.com/ubports/$pkgname/archive/$_commit.tar.gz
0001-Adapt-to-QtPim-API-changes.patch
0002-Fix-Missing-sentinel-in-function-call-warning.patch
0003-Add-option-to-disable-building-of-docs.patch
0004-Make-it-compile-with-Qt-5.12.patch
0005-Adjust-for-removed-QTest-waitForEvents-method.patch
replace-bash-for-sh.patch"
subpackages="$pkgname-dev $pkgname-lang"
options="!check" # Complaining about a non-existing file
@ -45,10 +41,6 @@ package() {
make INSTALL_ROOT="$pkgdir" install
}
sha512sums="9f2d4707db936eb262893b226ffda71c886dcb2a99cb3c2e169f12f80ba04836717322a43f28919a75f43c57c8a6b1ebf52cd74cca50af0d8a657708faf81502 ubuntu-ui-toolkit-2f541e8b5e509ad40cd8dc70d634434e7ab8fc42.tar.gz
d293464a334fdbdf6a61700002a692d2e101803b8aa46effd004c84341fca993f4a17fda55ba22eb1bd628a400e54b8f1e6c4cb1f690f49405e6f3f3122f1475 0001-Adapt-to-QtPim-API-changes.patch
7dbdc3d2d3de42820cd628f59f959c18f26189e3c690cacbefdc51c4913186d954137b0997da206a2004ba837fb7f6bdce64c9ab4fe013044ce857507bb8e7d6 0002-Fix-Missing-sentinel-in-function-call-warning.patch
13109d75e1922a9b750e0d528d120d85a164be045f2db728a5cdf637eebc8aca0633ca7d4e766c71f57a1ee10892f36841ad3351a2db72289059ae7d00e43da1 0003-Add-option-to-disable-building-of-docs.patch
sha512sums="bdbef210a353349d26b273979a5fca67d47cee16fc56f8386247ff6c7871635e2cf7dbca8e69bc258a46db536885bc3350de2a7706ef4a01b1dcced505e31600 ubuntu-ui-toolkit-cee7f49f493f37ebf0690137ed85700f94bacdf9.tar.gz
5b5c00bd365ee4068e2e0622a0ce31c7b67b0c6cf136b0d717dd68ac9559bc2d9c54e1e0c9106fa1d6e3438de974fa8b44c023888fe87bc1d1ed584023184eba 0004-Make-it-compile-with-Qt-5.12.patch
402f529c6eba4e384ba0c7789fd6c23757b278befa24f9b8b23a0d11b6a1ffe4abab28d188e77f606708a2e23a89bf4ec0c04e65e51efb82b448d4257b276381 0005-Adjust-for-removed-QTest-waitForEvents-method.patch
e01567f2426f78b0862e7b09cd99cabf3d885b600592e6a4f0e07dc077fae2ba8dd1d2deba3bb89d31171a90db6de909281664bcbc7736b9432f2bc0b26544e1 replace-bash-for-sh.patch"