Remove .desktop patch that was fixed upstream

3 files changed, 5 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 753950067d58..33be1eeac059 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = jami-client-qt-git
 	pkgdesc = A free and private communication platform (QT client)
-	pkgver = r296.8caf659
+	pkgver = r299.67a7efa
 	pkgrel = 1
 	url = https://git.jami.net/savoirfairelinux/jami-client-qt
 	arch = x86_64
@@ -15,9 +15,7 @@ pkgbase = jami-client-qt-git
 	conflicts = jami-gnome-git
 	conflicts = jami-gnome
 	source = git+https://git.jami.net/savoirfairelinux/jami-client-qt.git
-	source = 0002.patch
 	sha512sums = SKIP
-	sha512sums = 1b10011ac78f71457b1a391c8a192d9a024e202f20b34e13d0d9d3c0092c1ef4fb9826c2ac092d2e60d72e8f4f68cb87275dd4a7397e72d1ac1157caacf9e33d
 
 pkgname = jami-client-qt-git
 
diff --git a/0002.patch b/0002.patch
deleted file mode 100644
index f192761e5e0f..000000000000
--- a/0002.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3f9055e..0c19315 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,8 +13,7 @@ set(CMAKE_AUTOUIC ON)
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- 
- set(SRC_DIR ${PROJECT_SOURCE_DIR}/src)
--set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}
--    -DJAMI_DATA_DIR='"'${CMAKE_INSTALL_PREFIX}/share/jami-qt'"')
-+set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS})
- 
- set(QML_RESOURCES ${PROJECT_SOURCE_DIR}/resources.qrc)
- set(QML_RESOURCES_QML ${PROJECT_SOURCE_DIR}/qml.qrc)
-@@ -207,6 +206,8 @@ add_executable(${PROJECT_NAME}
-     ${QML_RESOURCES_QML}
-     ${LRC_SRC_PATH}/webresource.qrc)
- 
-+target_compile_definitions(${PROJECT_NAME} PRIVATE JAMI_DATA_DIR="${CMAKE_INSTALL_PREFIX}/share/jami-qt")
-+
- find_library(ringclient ringclient ${LRCLIBDIR} NO_DEFAULT_PATH)
- find_library(qrencode qrencode)
- find_library(X11 X11)
diff --git a/PKGBUILD b/PKGBUILD
index 00c08590e2be..e7a8b8446e5b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Nick Econopouly <wry at mm dot st>
 pkgname=jami-client-qt-git
-pkgver=r296.8caf659
+pkgver=r299.67a7efa
 pkgrel=1
 pkgdesc="A free and private communication platform (QT client)"
 arch=('x86_64')
@@ -10,25 +10,17 @@ license=('GPL3')
 depends=('jami-daemon-git' 'libjamiclient-git' 'qt5-base' 'libnm' 'qrencode')
 makedepends=('git' )
 conflicts=('jami-gnome-git' 'jami-gnome')
-source=("git+$url.git" '0002.patch')
-sha512sums=(SKIP 1b10011ac78f71457b1a391c8a192d9a024e202f20b34e13d0d9d3c0092c1ef4fb9826c2ac092d2e60d72e8f4f68cb87275dd4a7397e72d1ac1157caacf9e33d)
-
+source=("git+$url.git")
+sha512sums=(SKIP)
 
 pkgver() {
   cd $srcdir/jami-client-qt
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-
- prepare() {
-	cd $srcdir/jami-client-qt
-	git apply ../0002.patch
-	mkdir -p build
- }
-
-
 build() {
 	cd jami-client-qt
+    mkdir -p build
 	cd build
 	# /usr is necessary for Arch; see https://archlinux.org/news/binaries-move-to-usrbin-requiring-update-intervention/
 	cmake .. -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"