From dd24d92e0e8749670488f2517d1e8c3c86d57d7c Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Wed, 25 Jul 2018 00:27:04 -0500 Subject: user/quaternion: bump to 0.0.9.2, fix build --- user/quaternion/APKBUILD | 30 ++-- user/quaternion/install-library.patch | 9 -- user/quaternion/unbundle-lib1.patch | 292 ++++++++++++++++++++++++++++++++++ user/quaternion/unbundle-lib2.patch | 15 ++ 4 files changed, 319 insertions(+), 27 deletions(-) delete mode 100644 user/quaternion/install-library.patch create mode 100644 user/quaternion/unbundle-lib1.patch create mode 100644 user/quaternion/unbundle-lib2.patch (limited to 'user') diff --git a/user/quaternion/APKBUILD b/user/quaternion/APKBUILD index 370e68900..a7337d03f 100644 --- a/user/quaternion/APKBUILD +++ b/user/quaternion/APKBUILD @@ -1,26 +1,21 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=quaternion -pkgver=0.0.5 -_libver=0.2 +pkgver=0.0.9.2 pkgrel=0 pkgdesc="Qt5-based Matrix chat client" url="https://matrix.org/docs/projects/client/quaternion.html" arch="all" -license="GPL-3.0" -makedepends="cmake qt5-qtbase-dev qt5-qtdeclarative-dev" +license="GPL-3.0+" +depends="qt5-qtquickcontrols" +makedepends="cmake qt5-qtbase-dev qt5-qtdeclarative-dev libqmatrixclient-dev" subpackages="" source="quaternion-$pkgver.tar.gz::https://github.com/QMatrixClient/Quaternion/archive/v$pkgver.tar.gz - libqmatrixclient-$_libver.tar.gz::https://github.com/QMatrixClient/libqmatrixclient/archive/v0.2-q0.0.5.tar.gz - install-library.patch + unbundle-lib1.patch + unbundle-lib2.patch " builddir="$srcdir/Quaternion-$pkgver" -unpack() { - default_unpack - mv "$srcdir"/libqmatrixclient-$_libver-q$pkgver/* "$builddir"/lib/ -} - build() { cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then @@ -33,6 +28,7 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DUSE_DYNAMIC_LIB=True \ ${CMAKE_CROSSOPTS} make } @@ -43,12 +39,10 @@ check() { } package() { - for i in "$builddir" "$builddir"/lib; do - cd $i - make DESTDIR="$pkgdir" install - done + cd "$builddir" + make DESTDIR="$pkgdir" install } -sha512sums="ec4a6196ff687d08de49f47141a7869e8d0c56eee142a70682bd9880eb5ae8fb96c38616eec0d61b250a3f0a4cf358debeaa7c001f8dc88c58367bd0d125cb93 quaternion-0.0.5.tar.gz -3065793171ee60b5bc325756b9c82a57db0e4993b608d080ed6f54e9c55a835a594cf519681aede3063d0126c6f778ac885ab301569d25970aa22b7aa85bdadb libqmatrixclient-0.2.tar.gz -a814970d408bf43706c20f01a39b1503c5054efc5e8c36aadae36fd7a028e9ed286c79b846d960ca0c4791be463a5aa33ecf7a09d5dd6e87268af79b791fe58d install-library.patch" +sha512sums="9a72a39a8f353828d1322abce54f6ea5854346aa96c230684afee113142d1b5dfd521bf12dc29c397a39769b65e36c5b6c8b8de812011b4cd96c1570494803c5 quaternion-0.0.9.2.tar.gz +da88b919832a7d84375e7b698785941897e3f40c9afff1ced5a91b8f7f82f348b684cbd137232656ba66ba249ff8cd6a0952d13108131b98d28f98f616491a11 unbundle-lib1.patch +3573d21fb6170083f75c90eda599fd418c80f19b2127277a3df03cb74f6b7ff246dae67f50a04299c8953a12e163e28ff63a72f7ef30b988e39b5863a85c307e unbundle-lib2.patch" diff --git a/user/quaternion/install-library.patch b/user/quaternion/install-library.patch deleted file mode 100644 index 66fb1615c..000000000 --- a/user/quaternion/install-library.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- Quaternion-0.0.5/lib/CMakeLists.txt.old 2017-12-21 00:41:34.000000000 -0600 -+++ Quaternion-0.0.5/lib/CMakeLists.txt 2017-12-30 16:33:32.858838009 -0600 -@@ -100,3 +100,6 @@ - install (FILES mime/packages/freedesktop.org.xml - DESTINATION mime/packages) - endif (WIN32) -+ -+install (TARGETS qmatrixclient -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/user/quaternion/unbundle-lib1.patch b/user/quaternion/unbundle-lib1.patch new file mode 100644 index 000000000..e109e86b7 --- /dev/null +++ b/user/quaternion/unbundle-lib1.patch @@ -0,0 +1,292 @@ +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 new file mode 100644 index 000000000..5b3b4d2f6 --- /dev/null +++ b/user/quaternion/unbundle-lib2.patch @@ -0,0 +1,15 @@ +--- 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-60-g2f50