From 41ed57cc4852e6d1a508e31cc3abd4a3ffdcdc2e Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Tue, 27 Jul 2021 23:12:56 +0530 Subject: [PATCH] tepl: Disable --version-script for clang --- .../001-disable-version-script-clang.patch | 11 ++++++++ mingw-w64-tepl/PKGBUILD | 28 ++++++++++++------- 2 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 mingw-w64-tepl/001-disable-version-script-clang.patch diff --git a/mingw-w64-tepl/001-disable-version-script-clang.patch b/mingw-w64-tepl/001-disable-version-script-clang.patch new file mode 100644 index 0000000000..cc8e2528c1 --- /dev/null +++ b/mingw-w64-tepl/001-disable-version-script-clang.patch @@ -0,0 +1,11 @@ +--- a/tepl/meson.build ++++ b/tepl/meson.build +@@ -132,7 +132,7 @@ + tepl_lib_link_args = [] + tepl_lib_link_depends = [] + +-if meson.get_compiler('c').get_argument_syntax() != 'msvc' ++if meson.get_compiler('c').get_id() == 'gcc' + symbol_map = meson.current_source_dir() / 'symbol.map' + tepl_lib_link_args = '-Wl,--version-script,' + symbol_map + tepl_lib_link_depends = symbol_map diff --git a/mingw-w64-tepl/PKGBUILD b/mingw-w64-tepl/PKGBUILD index d9ae51259c..ef3522faf1 100644 --- a/mingw-w64-tepl/PKGBUILD +++ b/mingw-w64-tepl/PKGBUILD @@ -4,26 +4,27 @@ _realname=tepl pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}5" pkgver=5.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Library that eases the development of GtkSourceView-based text editors and IDEs (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') url="https://wiki.gnome.org/Projects/Tepl" license=("LGPL") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-pkg-config" +makedepends=("${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-gtk-doc" "${MINGW_PACKAGE_PREFIX}-gobject-introspection" - "${MINGW_PACKAGE_PREFIX}-meson" - "${MINGW_PACKAGE_PREFIX}-ninja") + "${MINGW_PACKAGE_PREFIX}-meson") depends=("${MINGW_PACKAGE_PREFIX}-amtk" "${MINGW_PACKAGE_PREFIX}-gtksourceview4" "${MINGW_PACKAGE_PREFIX}-icu") -source=("https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz") -sha256sums=('b1274967609f524484b38775fa9ecb296c6d6616aabd052f286339a289912804') +source=("https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz" + "001-disable-version-script-clang.patch") +sha256sums=('b1274967609f524484b38775fa9ecb296c6d6616aabd052f286339a289912804' + 'd11a1cbb3bf0b386720522528df648188e448d1a689fded764fbc6d5a665d11b') prepare() { cd "${srcdir}"/${_realname}-${pkgver} + patch -Np1 -i "${srcdir}/001-disable-version-script-clang.patch" } build() { @@ -31,18 +32,25 @@ build() { mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST} MSYS2_ARG_CONV_EXCL="--prefix=" \ - ${MINGW_PREFIX}/bin/meson \ + ${MINGW_PREFIX}/bin/meson.exe \ --prefix="${MINGW_PREFIX}" \ + --wrap-mode=nodownload \ + --default-library=both \ --buildtype=plain \ -D gtk_doc=true \ "../${_realname}-${pkgver}" - ninja + ${MINGW_PREFIX}/bin/meson.exe compile +} + +check() { + cd "${srcdir}/build-${MINGW_CHOST}" + ${MINGW_PREFIX}/bin/meson.exe test || true } package() { cd "${srcdir}/build-${MINGW_CHOST}" - DESTDIR="${pkgdir}" ninja install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson.exe install install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSES/LGPL-3.0-or-later.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LGPL-3.0-or-later.txt" }