From a0f12218701a4db5c44120f5a59bb5c8826a79d9 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Mon, 18 Apr 2016 21:43:15 +0200 Subject: [PATCH] template-glib: compilazione ok. --- .../mingw-w64-template-glib-git/001-win.patch | 19 +++++++++++++++++++ packages/mingw-w64-template-glib-git/PKGBUILD | 16 +++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 packages/mingw-w64-template-glib-git/001-win.patch diff --git a/packages/mingw-w64-template-glib-git/001-win.patch b/packages/mingw-w64-template-glib-git/001-win.patch new file mode 100644 index 0000000..0b5f9ba --- /dev/null +++ b/packages/mingw-w64-template-glib-git/001-win.patch @@ -0,0 +1,19 @@ +--- ./examples/Makefile.am.orig 2016-04-18 21:11:15.234531300 +0200 ++++ ./examples/Makefile.am 2016-04-18 21:11:48.046203700 +0200 +@@ -6,14 +6,14 @@ + noinst_PROGRAMS = simple + + simple_SOURCES = simple.c +-simple_CFLAGS = $(TMPL_CFLAGS) -I$(top_srcdir)/src ++simple_CFLAGS = $(TMPL_CFLAGS) -I$(top_srcdir)/src -I$(top_builddir)/src + simple_LDADD = $(top_builddir)/src/libtemplate-glib-1.0.la + + if ENABLE_VAPIGEN + noinst_PROGRAMS += simple-vala + + simple_vala_SOURCES = simple-vala.vala +-simple_vala_CFLAGS = $(TMPL_CFLAGS) -I$(top_srcdir)/src ++simple_vala_CFLAGS = $(TMPL_CFLAGS) -I$(top_srcdir)/src -I$(top_builddir)/src + simple_vala_LDADD = $(top_builddir)/src/libtemplate-glib-1.0.la + simple_vala_VALAFLAGS = \ + --vapidir $(top_builddir)/src \ diff --git a/packages/mingw-w64-template-glib-git/PKGBUILD b/packages/mingw-w64-template-glib-git/PKGBUILD index 2bfce3a..00ec99c 100644 --- a/packages/mingw-w64-template-glib-git/PKGBUILD +++ b/packages/mingw-w64-template-glib-git/PKGBUILD @@ -4,7 +4,7 @@ _realname=template-glib _base_ver=3.19.4 pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=3.19.4.30.fea2f7b +pkgver=3.19.4.40.5d1e73a pkgrel=1 arch=('any') pkgdesc="A templating library for GLib (mingw-w64)" @@ -13,12 +13,15 @@ depends=("${MINGW_PACKAGE_PREFIX}-glib2" makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "gtk-doc" "flex" - "bison") + "bison" + "autoconf-archive") options=('!strip' 'debug' 'staticlibs') license=("LGPL 2.1") url="http://saetta.ns0.it/" -source=(git+http://git.gnome.org/browse/${_realname}) -sha256sums=('SKIP') +source=(git+http://git.gnome.org/browse/${_realname} + 001-win.patch) +sha256sums=('SKIP' + 'c20511d44927c23f26641949ee4b9b4010c52d624b1818e2fe1a007e10fa850a') pkgver() { cd "$srcdir/$_realname" @@ -28,6 +31,8 @@ pkgver() { prepare() { cd ${_realname} + patch -b -V simple -p1 -i ${srcdir}/001-win.patch + aclocal --install -I build-aux || exit 1 gtkdocize || exit 1 autoreconf --force --install -Wno-portability || exit 1 @@ -42,7 +47,8 @@ build() { --target=${MINGW_CHOST} \ --build=${MINGW_CHOST} \ --prefix=${MINGW_PREFIX} \ - --libexecdir=${MINGW_PREFIX}/lib + --libexecdir=${MINGW_PREFIX}/lib \ + --enable-vala=no make } -- 2.49.0