diff options
| author | Slávek Banko <[email protected]> | 2021-09-24 15:31:00 +0200 |
|---|---|---|
| committer | TDE Gitea <[email protected]> | 2021-09-29 06:38:41 +0000 |
| commit | 10bda82501cc9ba3f9f0c41f1092ee834b6a78e9 (patch) | |
| tree | 934cb3ea7538eeb6c123ef3e2db695a5164ec314 /arch/tde-base/tde-tdebindings/bp002-33697c89.diff | |
| 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 <[email protected]>
Diffstat (limited to 'arch/tde-base/tde-tdebindings/bp002-33697c89.diff')
| -rw-r--r-- | arch/tde-base/tde-tdebindings/bp002-33697c89.diff | 24 |
1 files changed, 24 insertions, 0 deletions
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 <[email protected]> +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 <[email protected]> + (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) + |