From bd6169208943bda16dfdbbd804a3e49710b2fca3 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 23 Oct 2018 04:39:44 +0000 Subject: user/quaternion, libqmatrixclient: bump to new version --- user/quaternion/APKBUILD | 16 +- user/quaternion/unbundle-lib1.patch | 292 ------------------------------------ user/quaternion/unbundle-lib2.patch | 15 -- 3 files changed, 5 insertions(+), 318 deletions(-) delete mode 100644 user/quaternion/unbundle-lib1.patch delete mode 100644 user/quaternion/unbundle-lib2.patch (limited to 'user/quaternion') diff --git a/user/quaternion/APKBUILD b/user/quaternion/APKBUILD index a7337d03f..363e30f5c 100644 --- a/user/quaternion/APKBUILD +++ b/user/quaternion/APKBUILD @@ -1,19 +1,17 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=quaternion -pkgver=0.0.9.2 +pkgver=0.0.9.3 pkgrel=0 pkgdesc="Qt5-based Matrix chat client" url="https://matrix.org/docs/projects/client/quaternion.html" arch="all" license="GPL-3.0+" depends="qt5-qtquickcontrols" -makedepends="cmake qt5-qtbase-dev qt5-qtdeclarative-dev libqmatrixclient-dev" +makedepends="cmake libqmatrixclient-dev qt5-qtbase-dev qt5-qtdeclarative-dev + qt5-qttools-dev" subpackages="" -source="quaternion-$pkgver.tar.gz::https://github.com/QMatrixClient/Quaternion/archive/v$pkgver.tar.gz - unbundle-lib1.patch - unbundle-lib2.patch - " +source="quaternion-$pkgver.tar.gz::https://github.com/QMatrixClient/Quaternion/archive/v$pkgver.tar.gz" builddir="$srcdir/Quaternion-$pkgver" build() { @@ -27,8 +25,6 @@ build() { -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - -DCMAKE_C_FLAGS="$CFLAGS" \ - -DUSE_DYNAMIC_LIB=True \ ${CMAKE_CROSSOPTS} make } @@ -43,6 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9a72a39a8f353828d1322abce54f6ea5854346aa96c230684afee113142d1b5dfd521bf12dc29c397a39769b65e36c5b6c8b8de812011b4cd96c1570494803c5 quaternion-0.0.9.2.tar.gz -da88b919832a7d84375e7b698785941897e3f40c9afff1ced5a91b8f7f82f348b684cbd137232656ba66ba249ff8cd6a0952d13108131b98d28f98f616491a11 unbundle-lib1.patch -3573d21fb6170083f75c90eda599fd418c80f19b2127277a3df03cb74f6b7ff246dae67f50a04299c8953a12e163e28ff63a72f7ef30b988e39b5863a85c307e unbundle-lib2.patch" +sha512sums="3836338cddc674b3a8b6e7d8376f0136db5c548788a0e56f27023fe7b238e2c07d77bf5e5b50e49cdb011c61f05700818b6a22a394ee8d52015f5f32b3fe4d47 quaternion-0.0.9.3.tar.gz" diff --git a/user/quaternion/unbundle-lib1.patch b/user/quaternion/unbundle-lib1.patch deleted file mode 100644 index e109e86b7..000000000 --- a/user/quaternion/unbundle-lib1.patch +++ /dev/null @@ -1,292 +0,0 @@ -From 5a6fbaa3738de2f22171e5ef511d0250cfe006b6 Mon Sep 17 00:00:00 2001 -From: Arun Isaac -Date: Fri, 13 Jul 2018 16:25:23 +0530 -Subject: [PATCH] Remove references to lib in all #include headers. - ---- - client/chatroomwidget.cpp | 8 ++++---- - client/imageprovider.cpp | 4 ++-- - client/logindialog.cpp | 2 +- - client/main.cpp | 2 +- - client/mainwindow.cpp | 12 ++++++------ - client/models/messageeventmodel.cpp | 14 +++++++------- - client/models/roomlistmodel.cpp | 4 ++-- - client/models/roomlistmodel.h | 4 ++-- - client/models/userlistmodel.cpp | 6 +++--- - client/networkconfigdialog.cpp | 2 +- - client/quaternionconnection.h | 2 +- - client/quaternionroom.cpp | 4 ++-- - client/quaternionroom.h | 2 +- - client/roomdialogs.cpp | 8 ++++---- - client/roomlistdock.cpp | 2 +- - client/systemtrayicon.cpp | 2 +- - client/userlistdock.cpp | 6 +++--- - 17 files changed, 42 insertions(+), 42 deletions(-) - -diff --git a/client/chatroomwidget.cpp b/client/chatroomwidget.cpp -index e72a7ed..bcd8921 100644 ---- a/client/chatroomwidget.cpp -+++ b/client/chatroomwidget.cpp -@@ -36,10 +36,10 @@ - #include - #include - --#include "lib/events/roommessageevent.h" --#include "lib/user.h" --#include "lib/connection.h" --#include "lib/settings.h" -+#include -+#include -+#include -+#include - #include "models/messageeventmodel.h" - #include "imageprovider.h" - #include "chatedit.h" -diff --git a/client/imageprovider.cpp b/client/imageprovider.cpp -index a627bf1..94f8a4f 100644 ---- a/client/imageprovider.cpp -+++ b/client/imageprovider.cpp -@@ -19,8 +19,8 @@ - - #include "imageprovider.h" - --#include "lib/connection.h" --#include "lib/jobs/mediathumbnailjob.h" -+#include -+#include - - #include - #include -diff --git a/client/logindialog.cpp b/client/logindialog.cpp -index f5d082b..633c6e0 100644 ---- a/client/logindialog.cpp -+++ b/client/logindialog.cpp -@@ -19,7 +19,7 @@ - - #include "logindialog.h" - --#include "lib/connection.h" -+#include - - #include - #include -diff --git a/client/main.cpp b/client/main.cpp -index 547f1c7..08c7db6 100644 ---- a/client/main.cpp -+++ b/client/main.cpp -@@ -26,7 +26,7 @@ - #include "networksettings.h" - #include "mainwindow.h" - #include "activitydetector.h" --#include "lib/settings.h" -+#include - - int main( int argc, char* argv[] ) - { -diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp -index 4dd4879..1c22e9f 100644 ---- a/client/mainwindow.cpp -+++ b/client/mainwindow.cpp -@@ -27,11 +27,11 @@ - #include "roomdialogs.h" - #include "systemtrayicon.h" - --#include "lib/csapi/joining.h" --#include "lib/connection.h" --#include "lib/networkaccessmanager.h" --#include "lib/settings.h" --#include "lib/logging.h" -+#include -+#include -+#include -+#include -+#include - - #include - #include -diff --git a/client/models/messageeventmodel.cpp b/client/models/messageeventmodel.cpp -index 56d3452..1f18379 100644 ---- a/client/models/messageeventmodel.cpp -+++ b/client/models/messageeventmodel.cpp -@@ -24,12 +24,12 @@ - #include // for qmlRegisterType() - - #include "../quaternionroom.h" --#include "lib/connection.h" --#include "lib/user.h" --#include "lib/settings.h" --#include "lib/events/roommemberevent.h" --#include "lib/events/simplestateevents.h" --#include "lib/events/redactionevent.h" -+#include -+#include -+#include -+#include -+#include -+#include - - enum EventRoles { - EventTypeRole = Qt::UserRole + 1, -diff --git a/client/models/roomlistmodel.cpp b/client/models/roomlistmodel.cpp -index 39b045b..8e85d65 100644 ---- a/client/models/roomlistmodel.cpp -+++ b/client/models/roomlistmodel.cpp -@@ -21,8 +21,8 @@ - - #include "../quaternionroom.h" - --#include "lib/user.h" --#include "lib/connection.h" -+#include -+#include - - #include - -diff --git a/client/models/roomlistmodel.h b/client/models/roomlistmodel.h -index cdc3dd3..79f648f 100644 ---- a/client/models/roomlistmodel.h -+++ b/client/models/roomlistmodel.h -@@ -20,8 +20,8 @@ - #pragma once - - #include "../quaternionroom.h" --#include "lib/connection.h" --#include "lib/util.h" -+#include -+#include - - #include - -diff --git a/client/models/userlistmodel.cpp b/client/models/userlistmodel.cpp -index 54b7cf6..704b1f5 100644 ---- a/client/models/userlistmodel.cpp -+++ b/client/models/userlistmodel.cpp -@@ -23,9 +23,9 @@ - #include - #include - --#include "lib/connection.h" --#include "lib/room.h" --#include "lib/user.h" -+#include -+#include -+#include - - - UserListModel::UserListModel(QObject* parent) -diff --git a/client/networkconfigdialog.cpp b/client/networkconfigdialog.cpp -index 64006db..2b32e28 100644 ---- a/client/networkconfigdialog.cpp -+++ b/client/networkconfigdialog.cpp -@@ -18,7 +18,7 @@ - - #include "networkconfigdialog.h" - --#include "lib/networksettings.h" -+#include - - #include - #include -diff --git a/client/quaternionconnection.h b/client/quaternionconnection.h -index 707790b..b421ef0 100644 ---- a/client/quaternionconnection.h -+++ b/client/quaternionconnection.h -@@ -19,7 +19,7 @@ - - #pragma once - --#include "lib/connection.h" -+#include - - class QuaternionConnection: public QMatrixClient::Connection - { -diff --git a/client/quaternionroom.cpp b/client/quaternionroom.cpp -index c156283..ae38009 100644 ---- a/client/quaternionroom.cpp -+++ b/client/quaternionroom.cpp -@@ -19,8 +19,8 @@ - - #include "quaternionroom.h" - --#include "lib/user.h" --#include "lib/events/roommessageevent.h" -+#include -+#include - - using namespace QMatrixClient; - -diff --git a/client/quaternionroom.h b/client/quaternionroom.h -index f7ab255..46410cb 100644 ---- a/client/quaternionroom.h -+++ b/client/quaternionroom.h -@@ -19,7 +19,7 @@ - - #pragma once - --#include "lib/room.h" -+#include - - class QuaternionRoom: public QMatrixClient::Room - { -diff --git a/client/roomdialogs.cpp b/client/roomdialogs.cpp -index 1de2d48..0d75ea9 100644 ---- a/client/roomdialogs.cpp -+++ b/client/roomdialogs.cpp -@@ -19,10 +19,10 @@ - #include "roomdialogs.h" - - #include "quaternionroom.h" --#include "lib/user.h" --#include "lib/connection.h" --#include "lib/csapi/create_room.h" --#include "lib/logging.h" -+#include -+#include -+#include -+#include - - #include - #include -diff --git a/client/roomlistdock.cpp b/client/roomlistdock.cpp -index 3486382..6b61210 100644 ---- a/client/roomlistdock.cpp -+++ b/client/roomlistdock.cpp -@@ -26,7 +26,7 @@ - - #include "models/roomlistmodel.h" - #include "quaternionroom.h" --#include "lib/connection.h" -+#include - - class RoomListItemDelegate : public QStyledItemDelegate - { -diff --git a/client/systemtrayicon.cpp b/client/systemtrayicon.cpp -index 5da7684..deaaee7 100644 ---- a/client/systemtrayicon.cpp -+++ b/client/systemtrayicon.cpp -@@ -21,7 +21,7 @@ - - #include "mainwindow.h" - #include "quaternionroom.h" --#include "lib/settings.h" -+#include - - SystemTrayIcon::SystemTrayIcon(MainWindow* parent) - : QSystemTrayIcon(parent) -diff --git a/client/userlistdock.cpp b/client/userlistdock.cpp -index 76039ac..4cb0c32 100644 ---- a/client/userlistdock.cpp -+++ b/client/userlistdock.cpp -@@ -23,9 +23,9 @@ - #include - #include - --#include "lib/connection.h" --#include "lib/room.h" --#include "lib/user.h" -+#include -+#include -+#include - #include "models/userlistmodel.h" - - UserListDock::UserListDock(QWidget* parent) diff --git a/user/quaternion/unbundle-lib2.patch b/user/quaternion/unbundle-lib2.patch deleted file mode 100644 index 5b3b4d2f6..000000000 --- a/user/quaternion/unbundle-lib2.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Quaternion-0.0.9.2/CMakeLists.txt.old 2018-06-17 01:05:02.000000000 +0000 -+++ Quaternion-0.0.9.2/CMakeLists.txt 2018-07-25 05:15:28.550000000 +0000 -@@ -43,8 +43,10 @@ - endif() - get_filename_component(Qt5_Prefix "${Qt5_DIR}/../../../.." ABSOLUTE) - --add_subdirectory(lib) --include_directories(lib) -+if (NOT USE_DYNAMIC_LIB) -+ add_subdirectory(lib) -+ include_directories(lib) -+endif() - - message( STATUS ) - message( STATUS "=============================================================================" ) -- cgit v1.2.3-70-g09d2