diff --git a/srcpkgs/dtkcore/template b/srcpkgs/dtkcore/template index 7e472c5c0e9..6fd82ef2c47 100644 --- a/srcpkgs/dtkcore/template +++ b/srcpkgs/dtkcore/template @@ -1,6 +1,6 @@ # Template file for 'dtkcore' pkgname=dtkcore -version=2.0.16.3 +version=2.0.16.4 revision=1 build_style=qmake configure_args="LIB_INSTALL_DIR=/usr/lib/ VERSION=${version}" @@ -12,25 +12,27 @@ license="GPL-3.0-or-later" homepage="https://github.com/linuxdeepin/dtkcore" changelog="https://github.com/linuxdeepin/dtkcore/blob/${version}/CHANGELOG.md" distfiles="https://github.com/linuxdeepin/dtkcore/archive/${version}.tar.gz" -checksum=b443869be7b2238d6c6ecdefe33e67c973b13b7cc5a396d07dd0acad3da464f2 +checksum=04e8de464fb48e4ad0c6577ca093a96861adccff73c6c642fc022713392c2fa6 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel" fi -post_build() { +pre_install() { if [ "$CROSS_BUILD" ]; then - cd ${wrksrc}/tools/deepin-os-release - vsed -i Makefile -e"s;\(CC .*=\).*;\1 $CC;" - vsed -i Makefile -e"s;\(CXX .*=\).*;\1 $CXX;" - vsed -i Makefile -e"s;\(CFLAGS .*=\).*;\1 $CFLAGS -fPIC;" - vsed -i Makefile -e"s;\(CXXFLAGS .*=\).*;\1 $CXXFLAGS -fPIC;" - vsed -i Makefile -e"s;\(LINK .*=\).*;\1 $CXX;" - vsed -i Makefile -e"s;\(LFLAGS .*=\).*;\1 $LDFLAGS -pie;" - vsed -i Makefile -e"s;\(AR .*=\).*;\1 $AR;" - vsed -i Makefile -e"s; /usr/lib/libQt5Core.so; ${XBPS_CROSS_BASE}/usr/lib/libQt5Core.so;" - make clean - make ${makejobs} + # Replace the host arch binary with target arch one + cd tools/deepin-os-release + rm *.o + qmake ${configure_args} \ + PREFIX=/usr \ + LIB=/usr/lib \ + QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \ + QMAKE_CFLAGS="${CFLAGS}" \ + QMAKE_CXXFLAGS="${CXXFLAGS}" \ + QMAKE_LFLAGS="${LDFLAGS}" \ + -qtconf ${wrksrc}/qt.conf + make CC="$CC" CXX="$CXX" LINK="$CXX" + cd ${wrksrc} fi } @@ -42,7 +44,9 @@ dtkcore-devel_package() { vmove "usr/lib/*.so" vmove usr/lib/qt5 vmove usr/lib/pkgconfig - vmove usr/lib/dtk2 + vmove "usr/lib/libdtk-${version%.*}" vmove usr/lib/cmake + vsed -e 's/libs = .*/libs = $$QT_MODULE_LIB_BASE/g' \ + -i ${PKGDESTDIR}/usr/lib/qt5/mkspecs/modules/qt_lib_dtkcore.pri } }