ArchLinux tdebindings: Backport patch to resolve FTBFS for build with java.

Enable build with java as default.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/107/head
Slávek Banko 3 years ago committed by TDE Gitea
parent f094b09f98
commit 10bda82501

@ -12,14 +12,16 @@ license=('GPL')
groups=('tde-base') groups=('tde-base')
pkgdesc="Trinity Desktop bindings" pkgdesc="Trinity Desktop bindings"
depends=('tde-tdebase') depends=('tde-tdebase')
makedepends=('pkgconfig' 'autoconf' 'imake' 'python2' 'ruby') makedepends=('pkgconfig' 'autoconf' 'imake' 'python2' 'ruby' 'jdk-openjdk')
options=('staticlibs' 'libtool' '!strip') options=('staticlibs' 'libtool' '!strip')
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebindings-trinity-${pkgver}.tar.xz" source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebindings-trinity-${pkgver}.tar.xz"
'bp000-817f960e.diff' 'bp000-817f960e.diff'
'bp001-8301a3c8.diff') 'bp001-8301a3c8.diff'
'bp002-33697c89.diff')
md5sums=('47294367d80fa79fefa80d755a6bf93d' md5sums=('47294367d80fa79fefa80d755a6bf93d'
'79e6de2ddfec059b7601fac3f3a1adc5' '79e6de2ddfec059b7601fac3f3a1adc5'
'8267435e92a265b83efbf07db5e36c01') '8267435e92a265b83efbf07db5e36c01'
'feb8afbd1b3467c3e36f1dffb8c5ca53')
# install='' # install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
@ -32,6 +34,7 @@ build() {
msg "Apply backported patches..." msg "Apply backported patches..."
patch -p1 < ${srcdir}/bp000-817f960e.diff patch -p1 < ${srcdir}/bp000-817f960e.diff
patch -p1 < ${srcdir}/bp001-8301a3c8.diff patch -p1 < ${srcdir}/bp001-8301a3c8.diff
patch -p1 < ${srcdir}/bp002-33697c89.diff
msg "Copying system libtool files...." msg "Copying system libtool files...."
cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in
@ -50,6 +53,7 @@ build() {
--with-qt-libraries=${QTDIR}/lib \ --with-qt-libraries=${QTDIR}/lib \
--with-extra-includes="/usr/include/tqt:/usr/include/tqt/Qt" \ --with-extra-includes="/usr/include/tqt:/usr/include/tqt/Qt" \
--with-extra-libs="${TDEDIR}/lib:${TDEDIR}/lib/trinity" \ --with-extra-libs="${TDEDIR}/lib:${TDEDIR}/lib/trinity" \
--with-java=/usr/lib/jvm/default \
--sysconfdir=${TDEDIR}/etc \ --sysconfdir=${TDEDIR}/etc \
--localstatedir=/var \ --localstatedir=/var \
--enable-closure --enable-closure

@ -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)
Loading…
Cancel
Save