From 80dc579fa4d53941780d9deee49f9d75fa60ad63 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Wed, 26 Jul 2017 10:46:16 +0200 Subject: [PATCH] libzakform: patch per aggiornamento. --- packages/mingw-w64-libzakform/0001-win.patch | 43 ++++++++++++++++++++ packages/mingw-w64-libzakform/PKGBUILD | 9 ++-- 2 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 packages/mingw-w64-libzakform/0001-win.patch diff --git a/packages/mingw-w64-libzakform/0001-win.patch b/packages/mingw-w64-libzakform/0001-win.patch new file mode 100644 index 0000000..dd64a41 --- /dev/null +++ b/packages/mingw-w64-libzakform/0001-win.patch @@ -0,0 +1,43 @@ +--- ./src/commons.h ++++ ./src/commons.h +@@ -19,6 +19,12 @@ + #ifndef _ZAK_FORM_COMMONS_H_ + #define _ZAK_FORM_COMMONS_H_ + ++#ifdef G_OS_WIN32 ++ #include ++ ++static HMODULE backend_dll = NULL; ++#endif ++ + #include + + +--- ./src/form.c ++++ ./src/form.c +@@ -61,8 +61,6 @@ + G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ZakFormForm, zak_form_form, G_TYPE_OBJECT) + + #ifdef G_OS_WIN32 +-static HMODULE backend_dll = NULL; +- + BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved); + + BOOL WINAPI + +--- ./src/Makefile.am ++++ ./src/Makefile.am +@@ -8,10 +8,10 @@ + lib_LTLIBRARIES = libzakform.la + + zakformmarshal.c: zakformmarshal.h zakform_marshal.list $(GLIB_GENMARSHAL) +- $(GLIB_GENMARSHAL) $(srcdir)/zakform_marshal.list --body --prefix=_zak_form_marshal > $(srcdir)/$@ ++ $(GLIB_GENMARSHAL) $(srcdir)/zakform_marshal.list --body --prefix=_zak_form_marshal > $(builddir)/$@ + + zakformmarshal.h: zakform_marshal.list $(GLIB_GENMARSHAL) +- $(GLIB_GENMARSHAL) $(srcdir)/zakform_marshal.list --header --prefix=_zak_form_marshal > $(srcdir)/$@ ++ $(GLIB_GENMARSHAL) $(srcdir)/zakform_marshal.list --header --prefix=_zak_form_marshal > $(builddir)/$@ + + libzakform_la_SOURCES = \ + commons.c \ + diff --git a/packages/mingw-w64-libzakform/PKGBUILD b/packages/mingw-w64-libzakform/PKGBUILD index 4135743..83a4b0f 100644 --- a/packages/mingw-w64-libzakform/PKGBUILD +++ b/packages/mingw-w64-libzakform/PKGBUILD @@ -4,7 +4,7 @@ _realname=libzakform _base_ver=0.0.1 pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.0.1.67.e2390fe +pkgver=0.0.1.110.b3cc41c pkgrel=1 arch=('any') pkgdesc="Library manage forms (mingw-w64)" @@ -16,8 +16,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" options=('!strip' 'debug' 'staticlibs') license=("LGPL 2.1") url="http://saetta.ns0.it/" -source=(git+http://saetta.ns0.it/git/zakform/${_realname}#branch=develop) -sha256sums=('SKIP') +source=(git+http://saetta.ns0.it/git/zakform/${_realname}#branch=develop + 0001-win.patch) +sha256sums=('SKIP' + 'ce7262eb70ca79ceff3add3435a6676048553d5baea5b39daaee0c7e9ce81ba0') pkgver() { cd "$srcdir/$_realname" @@ -27,6 +29,7 @@ pkgver() { prepare() { cd ${_realname} + patch -p1 -i ${srcdir}/0001-win.patch } build() { -- 2.49.0