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

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

View file

@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=qt5-qtfeedback
pkgver=0_git20180122
pkgver=0_git20180903
_commit="a14bd0bb1373cde86e09e3619fb9dc70f34c71f2"
pkgrel=0
arch="x86_64"

View file

@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=qt5-qtpim
pkgver=0_git20181121
pkgver=0_git20181129
_commit="380605ef048372a40587f0231ba00df146bc070e"
pkgrel=0
arch="x86_64"

View file

@ -1,8 +1,8 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=qt5-qtsystems
pkgver=0_git20180122
_commit="66e45676f5f5c6251ccab36906c6324fd0065e08"
pkgver=0_git20190103
_commit="e3332ee38d27a134cef6621fdaf36687af1b6f4a"
pkgrel=0
arch="x86_64"
url='http://qt-project.org/'
@ -39,4 +39,4 @@ package() {
install -d "$pkgdir"/usr/share/licenses
ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname
}
sha512sums="b0190cd2b02d41222738887ef24d1f34aa74e3d739fe5eb61b02a23369f43b718bf92c08b4a083e703598443d2445a36cf60980d9ef31ac71303d07bb7d95de7 qt5-qtsystems-66e45676f5f5c6251ccab36906c6324fd0065e08.tar.gz"
sha512sums="48ed8353a021892cb226a5cb99de1919a48638ddf765094f47c204e8699892e33f66a39d717bfd238516b9529d2158227be8c510f4f1a7ddb68901e6e7cb0e85 qt5-qtsystems-e3332ee38d27a134cef6621fdaf36687af1b6f4a.tar.gz"

View file

@ -1,7 +1,7 @@
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=gsettings-qt
pkgver=0_git20171026
_commit="3b03880cc40675541d330681e55e0e9787dce99d"
pkgver=0_git20180418
_commit="c8ecb2bf269f4ed0a4477bad262751d77ae6bb72"
pkgrel=0
pkgdesc="Library to access GSettings from Qt"
url="https://github.com/ubports/gsettings-qt"
@ -32,5 +32,5 @@ package() {
make INSTALL_ROOT="$pkgdir" install
}
sha512sums="6f0e7522da13ec3f07f2a23458eaab179ff778d367b224b3e648b2a60d4986b2b8b5016ff5fa1fda11c92dc64e8ae5aef40c7b9a72bdbce32fea2786bd007ac8 gsettings-qt-3b03880cc40675541d330681e55e0e9787dce99d.tar.gz
sha512sums="696e10212369f02a811b7b56f2a2b496383dcd6d008f83b6f71da4d70fa3f26cfafe35ce4689eacd6d15d4cdd0ba3d632b33de045022f74e6f7b828062011b35 gsettings-qt-c8ecb2bf269f4ed0a4477bad262751d77ae6bb72.tar.gz
de1dd50997868c67742a23909b3682068e7262991df6f0e27dfd0f2774de26dc07f524f1a0fe335b93ee8044b78ee42e9af8d9a38c03f9cf073e361f6f6c2b08 fix_install.patch"

View file

@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=indicator-network
pkgver=0_git20181231
pkgver=0_git20190212
_commit="3cb4ada3d87303e6b981cf1307244f3a88017fec"
pkgrel=0
pkgdesc="The 'Network' indicator for Ubuntu Touch"

View file

@ -1,8 +1,8 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=libusermetrics
pkgver=0_git20180919
_commit="a50ce9f3d4c428646c0a7063e11c7dff82d5983b"
pkgver=0_git20190101
_commit="ed7dd5d3fb5b01c345f942561008c4ca86568b34"
pkgrel=0
pkgdesc='Library for exporting anonymous metrics about users'
arch="x86_64"
@ -11,8 +11,7 @@ license="GPL-3.0 LGPL-3.0 LGPL-2.1"
depends=""
depends_dev="qt5-qtxmlpatterns-dev libapparmor-dev gsettings-qt-dev qt5-qtdeclarative-dev click-dev qdjango-dev"
makedepends="$depends_dev cmake-extras qt5-qtbase-dev libapparmor libqtdbustest intltool"
source="$pkgname-$_commit.tar.gz::https://github.com/ubports/$pkgname/archive/$_commit.tar.gz
fix_linking.patch"
source="$pkgname-$_commit.tar.gz::https://github.com/ubports/$pkgname/archive/$_commit.tar.gz"
subpackages="$pkgname-dev $pkgname-lang"
builddir="$srcdir/$pkgname-$_commit"
@ -45,5 +44,4 @@ package() {
make DESTDIR="$pkgdir" install
}
sha512sums="d3863df6b68c8fac0f2afc70dff943f8db293aaffea61031b8d3242f5652a8d55994172b32defaccfe825922d7980bb59f610f06ec16bffbf5bf54aa725c2ad5 libusermetrics-a50ce9f3d4c428646c0a7063e11c7dff82d5983b.tar.gz
f1ff2e49c67507cc8930e14f63c49e67bbc259d9fccf074999f18c5f2017dc34c4830aa350cf5f27e10e3ba43794b2d3d184c74a1ce0807ba59d775fa2383a33 fix_linking.patch"
sha512sums="39a61b1afd4e91eacd1d01322a0c505dbc14b557bd802b41d050fd2e93280ebc77bb2c66608496f06c970324d84bd215d8f8de9cbdc421d6061443a9d2554dc2 libusermetrics-ed7dd5d3fb5b01c345f942561008c4ca86568b34.tar.gz"

View file

@ -1,19 +0,0 @@
diff --git a/src/libusermetricsinput/CMakeLists.txt b/src/libusermetricsinput/CMakeLists.txt
index bf3262e..47b7346 100644
--- a/src/libusermetricsinput/CMakeLists.txt
+++ b/src/libusermetricsinput/CMakeLists.txt
@@ -79,6 +79,7 @@ qt5_use_modules(
target_link_libraries(
usermetricsinput
usermetricscommon
+ intl
)
set_target_properties(
@@ -157,5 +158,6 @@ qt5_use_modules(
target_link_libraries(
usermetricsinput-increment
usermetricsinput
+ intl
)

View file

@ -1,9 +1,9 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=location-service
pkgver=0_git20180614
pkgver=0_git20190111
pkgrel=0
_commit="142f6ca0e4243448a43110453d22dae31f57b617"
_commit="b1d6a2fda0269be01a573b2b3726184a25168110"
pkgdesc="Location service aggregating position/velocity/heading updates and exporting them over dbus"
arch="x86_64"
url="https://unity8.io"
@ -11,18 +11,13 @@ license="GPL-3.0 LGPL-3.0"
depends=""
depends_dev="boost-dev dbus-dev net-cpp-dev process-cpp-dev properties-cpp-dev json-c-dev libapparmor-dev gflags-dev glog-dev trust-store-dev"
makedepends="$depends_dev cmake-extras gettext gtest-dev gmock dbus-cpp-dev"
source="$pkgname-$_commit.tar.gz::https://github.com/ubports/$pkgname/archive/$_commit.tar.gz
missing_includes.patch"
source="$pkgname-$_commit.tar.gz::https://github.com/ubports/$pkgname/archive/$_commit.tar.gz"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
options="!check" # Several failures
builddir="$srcdir/$pkgname-$_commit"
prepare() {
default_prepare
mkdir -p "$builddir"/build
}
build() {
mkdir -p "$builddir"/build
cd "$builddir"/build
cmake \
-DCMAKE_BUILD_TYPE=Release \
@ -42,5 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
sha512sums="07fc5288370290cdfa1d8af5b14ef8f682ea899027be8d91bdd084fd58ccffbf946aa4dd9a2d654ec8f93ba6c47350f7e4a313646d8baba48f1e5305100de433 location-service-142f6ca0e4243448a43110453d22dae31f57b617.tar.gz
e22591651b49f222487203cc292b592d6dbcc485ac1731977ad1354bd14cbcef7a054ae188f5d09da5da2def1a491aa902da58d2057f9dad69d7fedd39e5cf04 missing_includes.patch"
sha512sums="72821a935f9401d5006ee76f1b034976773af621a3a9ad2dfab15af6e99c8cbfbcb32304a4e2d8ce072bfc38309db2058bc78b2fd1f5e7342bb7f51ff857ad93 location-service-b1d6a2fda0269be01a573b2b3726184a25168110.tar.gz"

View file

@ -1,12 +0,0 @@
diff --git a/include/location_service/com/ubuntu/location/service/permission_manager.h b/include/location_service/com/ubuntu/location/service/permission_manager.h
index 73b79bd..045a83d 100644
--- a/include/location_service/com/ubuntu/location/service/permission_manager.h
+++ b/include/location_service/com/ubuntu/location/service/permission_manager.h
@@ -19,6 +19,7 @@
#define LOCATION_SERVICE_COM_UBUNTU_LOCATION_SERVICE_PERMISSION_MANAGER_H_
#include <memory>
+#include <sys/types.h>
namespace com
{

View file

@ -2,8 +2,8 @@
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=system-settings
_pkgname=system-settings
pkgver=0_git20180920
_commit="10e0e8c96890cd4924e63b84ba883b9ad330e071"
pkgver=0_git20181011
_commit="7414ae1e6436aafe8be2717b382ab865bd923a2e"
pkgrel=0
pkgdesc="System Settings application for Unity8"
url="https://github.com/ubports/system-settings"
@ -44,5 +44,5 @@ package() {
cd "$builddir"/build
make DESTDIR="$pkgdir" install
}
sha512sums="6243ac823871c93636d0b0ea8da3283bea885f532f190e7252f395cc2836af73442d679f5baf2b1abadbcf7c8f11522b6eb52ea891ac2b19cdaefd61328321da system-settings-10e0e8c96890cd4924e63b84ba883b9ad330e071.tar.gz
sha512sums="a4cbc9d5be75268032bf4a325b95bab180b5cf20e7f6b6a176e195522c076edf048962f7acbcda56f368fca745ef8e2888261bd35a5c772d54e0ff42c51f6ad4 system-settings-7414ae1e6436aafe8be2717b382ab865bd923a2e.tar.gz
d839e01038301ecccaba86407f0b82c56cac175992d7900893a5aa6a71468a7a78a6458ba56a39c949947be7c9b705409db9f8e70e08ddf3155259ceb5327d31 qmltestrunner.patch"

View file

@ -1,8 +1,8 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=ubuntu-download-manager
pkgver=0_git20180603
_commit="5ff8a51e5a8f68dce791a5c66f162137d7b96543"
pkgver=0_git20181003
_commit="b77fc522e41f43e5dba248e990ab6ae9c43cef40"
pkgrel=0
pkgdesc="Provides a service for downloading files while an application is suspended"
arch="x86_64"
@ -39,5 +39,5 @@ package() {
make DESTDIR="$pkgdir" install
}
sha512sums="1f343548951c14e29e9e461335ca3803f7a9f75c469760ed7bc93f5ff7d166e124c77da5cf1267c9f633b13e2bad6489fbbadb76e930044ac80ad1c2d9a3408a ubuntu-download-manager-5ff8a51e5a8f68dce791a5c66f162137d7b96543.tar.gz
sha512sums="1e9c9d41eb3f35a2d4280a746936b1d791fc3d300aae9d6842785559c9729f7f3f291b922bf093833cb0091fa8f8a92ef34833e162782ed28eba7d2e6f7ed6ae ubuntu-download-manager-b77fc522e41f43e5dba248e990ab6ae9c43cef40.tar.gz
36fa1cfccfa29b9c298711bf8c7e264ec15d4e78a3e47cdd12f8ab0752f83504dc4b3e8576e84ca529ff631c8a9a7452a88bfa9612b7261fe8d80c4c8c4f1d35 cmake-extras.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

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"

View file

@ -1,8 +1,8 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=unity-api
pkgver=0_git20190129
_commit="417d59b748bf2fc914561e671603399bf3818f6e"
pkgver=0_git20190211
_commit="3361ed583f7545684965ac8b0094cd88a5cf26cd"
pkgrel=0
pkgdesc="API for Unity shell integration"
url="https://github.com/ubports/unity-api"
@ -12,8 +12,7 @@ depends=""
depends_dev=""
makedepends="$depends_dev cmake cmake-extras qt5-qtdeclarative-dev libqtdbustest gtest-dev gmock"
source="$pkgname-$_commit.tar.gz::https://github.com/ubports/$pkgname/archive/$_commit.tar.gz
qmltestrunner.patch
gtest.patch"
qmltestrunner.patch"
subpackages="$pkgname-dev"
builddir="$srcdir/$pkgname-$_commit"
options="!check" # 88% tests passed, 3 tests failed out of 26
@ -37,6 +36,5 @@ package() {
make DESTDIR="$pkgdir" install
}
sha512sums="8bced72af9a3cecac9786ca079c7e28a6867de44e68f80e846e4ddba913ab39b60c3bcab0d38a1a7fb62f3195b33057493e26d72cda075f65e73ee035f9a8fea unity-api-417d59b748bf2fc914561e671603399bf3818f6e.tar.gz
8695998cb0451943ff08f00be52766d27c439184b1e8531a563cffe4bf4251dea52d5bc3493d797f4f6007f13130930c6b0cfb2c04b9dc54e6891e17c2978fb9 qmltestrunner.patch
d1fdccdf8d2b31d3be68478ba671514bc83afd26c756062f3f4a3cb1ee05331efb1ca5092b612449cc00552f8dd7071ba22903b5d336cc34b5bc94077a00d51e gtest.patch"
sha512sums="fe69fdfb958a885a4a7472868750d7eb23c29d77a1c32914f47f7ffc9adfd62e6f354e6d48498890eb7f5a6ad42fdec3c0bcae690ca59f06f634db3574e72aee unity-api-3361ed583f7545684965ac8b0094cd88a5cf26cd.tar.gz
8695998cb0451943ff08f00be52766d27c439184b1e8531a563cffe4bf4251dea52d5bc3493d797f4f6007f13130930c6b0cfb2c04b9dc54e6891e17c2978fb9 qmltestrunner.patch"

View file

@ -1,49 +0,0 @@
diff --git a/test/gtest/CMakeLists.txt b/test/gtest/CMakeLists.txt
index b2e105c..b1fa79e 100644
--- a/test/gtest/CMakeLists.txt
+++ b/test/gtest/CMakeLists.txt
@@ -1,7 +1,6 @@
find_package(Threads REQUIRED)
-set(TESTLIBDIR ${CMAKE_BINARY_DIR}/test/gtest/libgtest/build)
-set(LIBGTEST gtest)
-set(TESTLIBS ${TESTLIBS} ${LIBGTEST} ${CMAKE_THREAD_LIBS_INIT})
+find_package(GMock REQUIRED)
+set(TESTLIBS ${TESTLIBS} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
# gtest does weird things with its own implementation of tr1::tuple. For clang, we need to
# set this macro, otherwise anything that includes gtest.h won't compile.
@@ -9,7 +8,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1")
endif()
-add_subdirectory(libgtest)
add_subdirectory(unity)
set(TEST_SRC
diff --git a/test/gtest/libgtest/CMakeLists.txt b/test/gtest/libgtest/CMakeLists.txt
deleted file mode 100644
index e4b4074..0000000
--- a/test/gtest/libgtest/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-if (NOT DEFINED GTEST_ROOT)
- set(GTEST_ROOT /usr/src/gtest)
-endif()
-
-# Do not use -Wsuggest-override here, we can't fix gtest
-string (REPLACE "-Wsuggest-override" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-
-set(GTEST_SRC_DIR "${GTEST_ROOT}/src")
-set(GTEST_INCLUDE_DIR ${GTEST_ROOT})
-
-add_library(gtest STATIC
-${GTEST_SRC_DIR}/gtest-all.cc
-${GTEST_SRC_DIR}/gtest_main.cc
-)
-
-set_target_properties(gtest PROPERTIES INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIR})
-
-# Clang complains about unused private field 'pretty_' in gtest-internal-inl.h.
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-Wno-unused-private-field")
-endif()

View file

@ -1,7 +1,7 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Luca Weiss <luca@z3ntu.xyz>
pkgname=unity8
pkgver=0_git20180919
pkgver=0_git20181011
_commit="18c3f6f3c6d6274e1a63562b955bd65f41266fb8"
pkgrel=0
pkgdesc="A convergent desktop environment"