From 10bda82501cc9ba3f9f0c41f1092ee834b6a78e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Fri, 24 Sep 2021 15:31:00 +0200
Subject: ArchLinux tdebindings: Backport patch to resolve FTBFS for build with
 java. Enable build with java as default.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 arch/tde-base/tde-tdebindings/PKGBUILD            | 10 +++++++---
 arch/tde-base/tde-tdebindings/bp002-33697c89.diff | 24 +++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 arch/tde-base/tde-tdebindings/bp002-33697c89.diff

diff --git a/arch/tde-base/tde-tdebindings/PKGBUILD b/arch/tde-base/tde-tdebindings/PKGBUILD
index 8f37fd2bd..db6bd3902 100644
--- a/arch/tde-base/tde-tdebindings/PKGBUILD
+++ b/arch/tde-base/tde-tdebindings/PKGBUILD
@@ -12,14 +12,16 @@ license=('GPL')
 groups=('tde-base')
 pkgdesc="Trinity Desktop bindings"
 depends=('tde-tdebase')
-makedepends=('pkgconfig' 'autoconf' 'imake' 'python2' 'ruby')
+makedepends=('pkgconfig' 'autoconf' 'imake' 'python2' 'ruby' 'jdk-openjdk')
 options=('staticlibs' 'libtool' '!strip')
 source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebindings-trinity-${pkgver}.tar.xz"
         'bp000-817f960e.diff'
-        'bp001-8301a3c8.diff')
+        'bp001-8301a3c8.diff'
+        'bp002-33697c89.diff')
 md5sums=('47294367d80fa79fefa80d755a6bf93d'
          '79e6de2ddfec059b7601fac3f3a1adc5'
-         '8267435e92a265b83efbf07db5e36c01')
+         '8267435e92a265b83efbf07db5e36c01'
+         'feb8afbd1b3467c3e36f1dffb8c5ca53')
 # install=''
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
@@ -32,6 +34,7 @@ build() {
   msg "Apply backported patches..."
   patch -p1 < ${srcdir}/bp000-817f960e.diff
   patch -p1 < ${srcdir}/bp001-8301a3c8.diff
+  patch -p1 < ${srcdir}/bp002-33697c89.diff
 
   msg "Copying system libtool files...."
   cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
@@ -50,6 +53,7 @@ build() {
     --with-qt-libraries=${QTDIR}/lib \
     --with-extra-includes="/usr/include/tqt:/usr/include/tqt/Qt" \
     --with-extra-libs="${TDEDIR}/lib:${TDEDIR}/lib/trinity" \
+    --with-java=/usr/lib/jvm/default \
     --sysconfdir=${TDEDIR}/etc \
     --localstatedir=/var \
     --enable-closure
diff --git a/arch/tde-base/tde-tdebindings/bp002-33697c89.diff b/arch/tde-base/tde-tdebindings/bp002-33697c89.diff
new file mode 100644
index 000000000..a559fec2a
--- /dev/null
+++ b/arch/tde-base/tde-tdebindings/bp002-33697c89.diff
@@ -0,0 +1,24 @@
+commit 5092f046c4f6b678a728bb1156123e0f0e45380f
+Author: Slávek Banko <slavek.banko@axis.cz>
+Date:   Fri Sep 24 15:02:20 2021 +0200
+
+    Fix FTBFS in dcopjava in case TQt3 is not installed in the system directory.
+    
+    Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
+    (cherry picked from commit 33697c89a362c187fbf375c2d05b0a8d6beb9429)
+
+diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am
+index be90dd10..2fe8e5d5 100644
+--- a/dcopjava/binding/Makefile.am
++++ b/dcopjava/binding/Makefile.am
+@@ -1,8 +1,8 @@
+ lib_LTLIBRARIES = libjavadcop.la
+ 
+ libjavadcop_la_SOURCES = client.cpp 
+-libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
+-libjavadcop_la_LIBADD = $(LIB_TDECORE)
++libjavadcop_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(KDE_PLUGIN)
++libjavadcop_la_LIBADD = $(LIB_TDECORE) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
+ 
+ INCLUDES = $(jni_includes) $(all_includes)
+ 
-- 
cgit v1.2.1