From 691110e3635188597d20eaceb7f8d0eddf5a3cff Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Fri, 22 May 2015 08:47:12 +0200 Subject: [PATCH] libical: enabled introspection. --- mingw-w64-libical/002-introspection.patch | 11 +++++++++++ mingw-w64-libical/PKGBUILD | 18 ++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 mingw-w64-libical/002-introspection.patch diff --git a/mingw-w64-libical/002-introspection.patch b/mingw-w64-libical/002-introspection.patch new file mode 100644 index 0000000000..a067baaadd --- /dev/null +++ b/mingw-w64-libical/002-introspection.patch @@ -0,0 +1,11 @@ +--- ./cmake/modules/GObjectIntrospectionMacros.cmake.orig 2015-05-22 08:36:36.673111400 +0200 ++++ ./cmake/modules/GObjectIntrospectionMacros.cmake 2015-05-22 08:36:38.510219500 +0200 +@@ -50,7 +50,7 @@ + set(_gir_libtool "--no-libtool") + + add_custom_command( +- COMMAND ${INTROSPECTION_SCANNER} ++ COMMAND CC=${CMAKE_C_COMPILER} ${INTROSPECTION_SCANNER} + ${INTROSPECTION_SCANNER_ARGS} + --namespace=${_gir_namespace} + --nsversion=${_gir_version} diff --git a/mingw-w64-libical/PKGBUILD b/mingw-w64-libical/PKGBUILD index 37deb4ee6d..7aa6d2c85b 100644 --- a/mingw-w64-libical/PKGBUILD +++ b/mingw-w64-libical/PKGBUILD @@ -3,7 +3,7 @@ _realname=libical pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.0.1 -pkgrel=1 +pkgrel=2 arch=('any') pkgdesc="An Open Source implementation of the iCalendar protocols and protocol data units (mingw-w64)" license=("LGPL 2.1") @@ -11,17 +11,24 @@ url="https://github.com/libical/libical" depends=() makedepends=("${MINGW_PACKAGE_PREFIX}-cmake") options=('strip' '!debug' 'staticlibs') -source=(https://github.com/${_realname}/${_realname}/archive/v$pkgver.tar.gz - 001-win.patch) +source=("${_realname}-${pkgver}.tar.gz"::https://github.com/${_realname}/${_realname}/archive/v$pkgver.tar.gz + 001-win.patch + 002-introspection.patch) +noextract=(${_realname}-${pkgver}.tar.gz) sha256sums=('7d5f613454ec6c7d1bcfb441c919215be53292aa15cd1cb14249d1413d6c610c' - 'f080396da2203af16ed770141595fed86934df51c2ce40edfeccea23eaf25e00') + 'f080396da2203af16ed770141595fed86934df51c2ce40edfeccea23eaf25e00' + '9dcd3c8fe152a5ce3e2a0b7983df879fb09bab6f3b81497b2530f274c744d31b') prepare() { + tar --exclude=ReadMe.md -zxf ${_realname}-${pkgver}.tar.gz + cd ${_realname}-${pkgver} patch -p1 -i ${srcdir}/001-win.patch + patch -p1 -i ${srcdir}/002-introspection.patch } build() { + [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST} mkdir -p build-${MINGW_CHOST} cd build-${MINGW_CHOST} @@ -30,6 +37,7 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ -DCMAKE_C_FLAGS="${CFLAGS}" \ + -DGOBJECT_INTROSPECTION=true \ -G "MSYS Makefiles" \ ../${_realname}-${pkgver} make @@ -44,4 +52,6 @@ package() { popd > /dev/null sed -s "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" \ -i ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/libical.pc + + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" }