diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-09-24 15:27:04 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-09-29 09:28:02 +0200 |
| commit | 005403e878b739c9f7022e25043ecf97d8d91a4b (patch) | |
| tree | a5361b3cff5e07db8bd41e1017a0c39cf20d43e9 | |
| parent | f6bf503a70f7b7a278e82822549f45f3b57594e1 (diff) | |
| download | tde-packaging-005403e8.tar.gz tde-packaging-005403e8.zip | |
ArchLinux gtk3-tqt-engine: Backport patch to resolve FTBFS.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f094b09f989fd251a082301b04fcf5d64b50fdba)
| -rw-r--r-- | arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD | 15 | ||||
| -rw-r--r-- | arch/tde-extra/tde-gtk3-tqt-engine/bp000-0e2c727907.diff | 32 |
2 files changed, 40 insertions, 7 deletions
diff --git a/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD b/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD index 17969464b..0e5c741f5 100644 --- a/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD +++ b/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD @@ -15,18 +15,21 @@ makedepends=('pkgconfig' 'cmake') #conflicts=('gtk3-tqt-engine') #replaces=('gtk3-tqt-engine') options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/gtk3-tqt-engine-trinity-${pkgver}.tar.xz") -md5sums=('1f94fd009a3c062e042f914c21d49984') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/gtk3-tqt-engine-trinity-${pkgver}.tar.xz" + 'bp000-0e2c727907.diff') +md5sums=('1f94fd009a3c062e042f914c21d49984' + '280b56843ebeb41b9ee74120b0ef28b6') # install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 -[ -n "$TQTDIR" ] || TQTDIR=${QTDIR} build() { ## Generate config files and update with autoreconf cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} + patch -p1 < ${srcdir}/bp000-0e2c727907.diff + msg "Copying system libtool files...." cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh @@ -36,7 +39,6 @@ build() { ## configure msg "Configuring - ${pkgname}..." - ./configure \ --prefix=${TDEDIR} \ --with-qt-dir=${QTDIR} \ @@ -45,9 +47,8 @@ build() { --with-extra-includes="/usr/include/tqt:/usr/include/tqt/Qt" \ --with-extra-libs="${TDEDIR}/lib:${TDEDIR}/lib/trinity" \ - ### PATCH: This allows the package to compile due to some odd reason its not finding tqt-mt, Remove LD_LIBRARY_PATH - ### if fixed on future versions - LD_LIBRARY_PATH=$TQTDIR/lib make $NUMJOBS + msg "Building - ${pkgname}..." + make $NUMJOBS } package() { diff --git a/arch/tde-extra/tde-gtk3-tqt-engine/bp000-0e2c727907.diff b/arch/tde-extra/tde-gtk3-tqt-engine/bp000-0e2c727907.diff new file mode 100644 index 000000000..fd8dd3872 --- /dev/null +++ b/arch/tde-extra/tde-gtk3-tqt-engine/bp000-0e2c727907.diff @@ -0,0 +1,32 @@ +commit b1327f977ffaa5b1789fd5987f621fa9b35a2a08 +Author: Slávek Banko <slavek.banko@axis.cz> +Date: Fri Sep 24 14:54:59 2021 +0200 + + Fix FTBFS in case TQt3 is not installed in the system directory. + + Signed-off-by: Slávek Banko <slavek.banko@axis.cz> + (cherry picked from commit 0e2c72790799d6043225910bd437bd54f5cc6989) + +diff --git a/tdegtk/Makefile.am b/tdegtk/Makefile.am +index 54a5db3..f1886dc 100644 +--- a/tdegtk/Makefile.am ++++ b/tdegtk/Makefile.am +@@ -44,9 +44,8 @@ libtdegtk_la_SOURCES = $(source_h) $(source_c) + libtdegtk_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) + libtdegtk_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) + +-libtdegtk_la_LIBADD = $(KDE_LIBADD) libtqtcairo.la $(all_libraries) $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) +- +-libtdegtk_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) ++libtdegtk_la_LIBADD = $(KDE_LIBADD) libtqtcairo.la $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) ++libtdegtk_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) + + lib_LTLIBRARIES = libtqtcairo.la + +@@ -56,5 +55,4 @@ libtqtcairo_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) + libtqtcairo_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) + + libtqtcairo_la_LIBADD = $(KDE_LIBADD) $(LIB_QT) $(LIB_TDEUI) +- +-libtqtcairo_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) ++libtqtcairo_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) |