diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-09-24 15:31:00 +0200 |
|---|---|---|
| committer | TDE Gitea <gitea@mirror.git.trinitydesktop.org> | 2021-09-29 06:38:41 +0000 |
| commit | 10bda82501cc9ba3f9f0c41f1092ee834b6a78e9 (patch) | |
| tree | 934cb3ea7538eeb6c123ef3e2db695a5164ec314 /arch | |
| parent | f094b09f989fd251a082301b04fcf5d64b50fdba (diff) | |
| download | tde-packaging-10bda82501cc9ba3f9f0c41f1092ee834b6a78e9.tar.gz tde-packaging-10bda82501cc9ba3f9f0c41f1092ee834b6a78e9.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/tde-base/tde-tdebindings/PKGBUILD | 10 | ||||
| -rw-r--r-- | arch/tde-base/tde-tdebindings/bp002-33697c89.diff | 24 |
2 files changed, 31 insertions, 3 deletions
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) + |