Switch to upstream CMakeLists.txt file

3 files changed, 12 insertions, 88 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50409363e832..8a3199538335 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = tok-git
 	pkgdesc = Telegram client built using Kirigami
-	pkgver = r86.fe69499
+	pkgver = r94.fa8fcd3
 	pkgrel = 1
 	url = https://invent.kde.org/network/tok
 	arch = x86_64
@@ -22,7 +22,7 @@ pkgbase = tok-git
 	source = git+https://invent.kde.org/network/tok.git
 	source = cmakebuild.patch
 	md5sums = SKIP
-	md5sums = 73e6e4344c2058f1b5bb6900debb5bd4
+	md5sums = 1410a072193b1d0f0339086b367f155c
 
 pkgname = tok-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 8aa531759a6e..53e8ddd8b4a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Gustavo Castro < gustawho [ at ] gmail [ dot ] com >
 
 pkgname=tok-git
-pkgver=r86.fe69499
+pkgver=r94.fa8fcd3
 pkgrel=1
 pkgdesc="Telegram client built using Kirigami"
 arch=(x86_64 i686 arm armv6h armv7h aarch64)
@@ -13,7 +13,7 @@ provides=('tok')
 conflicts=('tok')
 source=("git+${url}.git" 'cmakebuild.patch')
 md5sums=('SKIP'
-         '73e6e4344c2058f1b5bb6900debb5bd4')
+         '1410a072193b1d0f0339086b367f155c')
 
 pkgver() {
   cd "${pkgname%-git}"
diff --git a/cmakebuild.patch b/cmakebuild.patch
index c8075f61c8ab..922be04ea20d 100644
--- a/cmakebuild.patch
+++ b/cmakebuild.patch
@@ -1,88 +1,12 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-new file mode 100644
-index 0000000..cf64d73
---- /dev/null
+index 58e69bb..c41ac9b 100644
+--- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -0,0 +1,69 @@
-+cmake_minimum_required(VERSION 3.5)
-+
-+project(Tok LANGUAGES CXX)
-+
-+set(CMAKE_INCLUDE_CURRENT_DIR ON)
-+
-+set(CMAKE_AUTOUIC OFF)
-+set(CMAKE_AUTOMOC ON)
-+set(CMAKE_AUTORCC ON)
-+
-+set(CMAKE_CXX_STANDARD 20)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+
-+include(GNUInstallDirs)
-+
-+set(REQUIRED_QT_VERSION 5.15.0)
-+
-+find_package(Qt5 COMPONENTS Core Quick Widgets Concurrent REQUIRED)
-+find_package(KF5Kirigami2 REQUIRED)
-+find_package(KF5I18n REQUIRED)
-+find_package(KF5Notifications REQUIRED)
-+find_package(Td REQUIRED)
-+find_package(ICU 69.0 COMPONENTS uc REQUIRED)
-+
-+add_executable(org.kde.Tok
-+  src/main.cpp
-+
-+  src/client.cpp
-+  src/client_p.cpp
-+  src/chatsort.cpp
-+  src/userdata.cpp
-+
-+  src/util.cpp
-+
-+  src/setup.cpp
-+
-+  src/utilities.cpp
-+
-+  src/chatsmodel.cpp
-+
-+  src/messagesmodel.cpp
-+  src/messagesstore.cpp
-+  src/chatsstore.cpp
-+
-+  src/extractinator.cpp
-+  src/notificationmanager.cpp
-+
-+  src/tgimageprovider.cpp
-+
-+  data/main.qrc
-+
-+  src/internallib/qabstractrelationalmodel.cpp
-+  src/internallib/qquickrelationallistener.cpp
-+)
-+add_definitions(-Wall -Werror)
-+
-+target_compile_definitions(org.kde.Tok
-+  PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>
-+)
-+target_link_libraries(org.kde.Tok
-+  PRIVATE
-+    Qt5::Core Qt5::Widgets Qt5::Quick Qt5::Concurrent
-+    KF5::Kirigami2 KF5::I18n KF5::Notifications
-+    Td::TdStatic ${ICU_LIBRARIES}
-+)
-+
-+install(TARGETS org.kde.Tok DESTINATION ${CMAKE_INSTALL_BINDIR})
+@@ -67,3 +67,6 @@ target_link_libraries(org.kde.Tok
+ )
+ 
+ install(TARGETS org.kde.Tok DESTINATION ${CMAKE_INSTALL_BINDIR})
 +install(FILES src/org.kde.Tok.notifyrc DESTINATION ${CMAKE_INSTALL_DATADIR}/knotifications5)
 +install(FILES src/org.kde.Tok.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
-diff --git a/src/messagesmodel.cpp b/src/messagesmodel.cpp
-index ba0eea3..52b37a8 100644
---- a/src/messagesmodel.cpp
-+++ b/src/messagesmodel.cpp
-@@ -139,7 +139,7 @@ void MessagesModel::messageIDChanged(TDApi::int53 oldID, TDApi::int53 newID)
-     if (before > 0) {
-         dataChanged(index(before), index(before), {Roles::PreviousID, Roles::NextID});
-     }
--    if (after < d->messages.size()) {
-+    if (static_cast<uint64_t>(after) < d->messages.size()) {
-         dataChanged(index(after), index(after), {Roles::PreviousID, Roles::NextID});
-     }
-     dataChanged(index(idx), index(idx), {Roles::ID});
++install(FILES org.kde.Tok.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
+\ No newline at end of file