Add temporary patch to fix build error

It's a known issue upstream related to the .desktop file.

3 files changed, 36 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 496a53080144..753950067d58 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,7 +15,9 @@ 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
new file mode 100644
index 000000000000..f192761e5e0f
--- /dev/null
+++ b/0002.patch
@@ -0,0 +1,23 @@
+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 23c66dda7d35..00c08590e2be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,17 +10,25 @@ license=('GPL3')
 depends=('jami-daemon-git' 'libjamiclient-git' 'qt5-base' 'libnm' 'qrencode')
 makedepends=('git' )
 conflicts=('jami-gnome-git' 'jami-gnome')
-source=("git+$url.git")
-sha512sums=(SKIP)
+source=("git+$url.git" '0002.patch')
+sha512sums=(SKIP 1b10011ac78f71457b1a391c8a192d9a024e202f20b34e13d0d9d3c0092c1ef4fb9826c2ac092d2e60d72e8f4f68cb87275dd4a7397e72d1ac1157caacf9e33d)
+
 
 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"