From 98d583e1269101331b9b595d41611a8c14aece24 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <andrea.zagli@email.it>
Date: Tue, 4 Apr 2017 12:34:29 +0200
Subject: [PATCH] organigramma: aggiornamenti e nuove patch.

---
 .../mingw-w64-organigramma/001-path.patch     | 36 +++++++------------
 .../002-path_resource.patch                   | 17 +++++++++
 packages/mingw-w64-organigramma/PKGBUILD      | 20 ++++++++---
 3 files changed, 45 insertions(+), 28 deletions(-)
 create mode 100644 packages/mingw-w64-organigramma/002-path_resource.patch

diff --git a/packages/mingw-w64-organigramma/001-path.patch b/packages/mingw-w64-organigramma/001-path.patch
index e5cc412..6158a8c 100644
--- a/packages/mingw-w64-organigramma/001-path.patch
+++ b/packages/mingw-w64-organigramma/001-path.patch
@@ -1,29 +1,19 @@
 diff --git a/src/Makefile.am b/src/Makefile.am
 index 95a1226..82a664d 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -21,11 +21,11 @@ resources.o: resources.rc
+--- a/libreria/Makefile.am
++++ b/libreria/Makefile.am
+@@ -19,11 +19,10 @@ endif
  
- bin_PROGRAMS = organigramma
+ lib_LTLIBRARIES = liborganigramma.la
  
--marshal.c: marshal.h organigramma_marshal.list $(GLIB_GENMARSHAL)
--	$(GLIB_GENMARSHAL) organigramma_marshal.list --body --prefix=_organigramma_marshal > $@
-+marshal.c: organigramma_marshal.list $(GLIB_GENMARSHAL)
-+	$(GLIB_GENMARSHAL) $< --body --prefix=_organigramma_marshal > $@
+-marshal.c: marshal.h ../src/organigramma_marshal.list $(GLIB_GENMARSHAL)
+-	$(GLIB_GENMARSHAL) ../src/organigramma_marshal.list --body --prefix=_organigramma_marshal > $@
++marshal.c marshal.h: $(top_srcdir)/src/organigramma_marshal.list $(GLIB_GENMARSHAL)
++	$(GLIB_GENMARSHAL) $< --body --prefix=_organigramma_marshal > marshal.c
++	$(GLIB_GENMARSHAL) $< --header --prefix=_organigramma_marshal > marshal.h
  
- marshal.h: organigramma_marshal.list $(GLIB_GENMARSHAL)
--	$(GLIB_GENMARSHAL) organigramma_marshal.list --header --prefix=_organigramma_marshal > $@
-+	$(GLIB_GENMARSHAL) $< --header --prefix=_organigramma_marshal > $@
+-marshal.h: ../src/organigramma_marshal.list $(GLIB_GENMARSHAL)
+-	$(GLIB_GENMARSHAL) ../src/organigramma_marshal.list --header --prefix=_organigramma_marshal > $@
  
- organigramma_SOURCES = \
-                 commons.h \
-diff --git a/src/resources.rc.in b/src/resources.rc.in
-index 8b83290..f976b81 100644
---- a/src/resources.rc.in
-+++ b/src/resources.rc.in
-@@ -1,4 +1,4 @@
--AppIcon ICON "..\\data\\organigramma\\images\\organigramma.ico"
-+AppIcon ICON "@top_srcdir@\\data\\organigramma\\images\\organigramma.ico"
- 
- 1 VERSIONINFO
- FILEVERSION     @V_MAJOR@,@V_MINOR@,@V_MICRO@,0
+ liborganigramma_la_SOURCES = \
+                 ../src/commons.c \
diff --git a/packages/mingw-w64-organigramma/002-path_resource.patch b/packages/mingw-w64-organigramma/002-path_resource.patch
new file mode 100644
index 0000000..d55d517
--- /dev/null
+++ b/packages/mingw-w64-organigramma/002-path_resource.patch
@@ -0,0 +1,17 @@
+--- ./src/resources.rc.in
++++ ./src/resources.rc.in
+@@ -1,4 +1,4 @@
+-AppIcon ICON "..\\data\\organigramma\\images\\organigramma.ico"
++AppIcon ICON "@top_srcdir@\\data\\organigramma\\images\\organigramma.ico"
+
+ 1 VERSIONINFO
+ FILEVERSION     @V_MAJOR@,@V_MINOR@,@V_MICRO@,0
+@@ -12,7 +12,7 @@
+       VALUE "FileDescription", "Organigramma"
+       VALUE "FileVersion", "@V_MAJOR@.@V_MINOR@.@V_MICRO@"
+       VALUE "InternalName", "organigramma"
+-      VALUE "LegalCopyright", "Copyright 2013 Andrea Zagli <a.zagli@comune.scandicci.fi.it>"
++      VALUE "LegalCopyright", "Copyright 2013-2017 Andrea Zagli <a.zagli@comune.scandicci.fi.it>"
+       VALUE "OriginalFilename", "organigramma.exe"
+       VALUE "ProductName", "Organigramma"
+       VALUE "ProductVersion", "@V_MAJOR@.@V_MINOR@.@V_MICRO@"
diff --git a/packages/mingw-w64-organigramma/PKGBUILD b/packages/mingw-w64-organigramma/PKGBUILD
index 81dd3c8..a04a8e1 100644
--- a/packages/mingw-w64-organigramma/PKGBUILD
+++ b/packages/mingw-w64-organigramma/PKGBUILD
@@ -4,26 +4,35 @@ _realname=organigramma
 _base_ver=0.0.1
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.0.1.79.b695ec4
+pkgver=0.0.1.144.05d01ae
 pkgrel=1
 arch=('any')
 pkgdesc="Gestione dati territoriali (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-libgdaex"
+         "${MINGW_PACKAGE_PREFIX}-libgdaexgrid"
          "${MINGW_PACKAGE_PREFIX}-libgtkform"
+         "${MINGW_PACKAGE_PREFIX}-libzakform"
+         "${MINGW_PACKAGE_PREFIX}-libzakformgtk"
+         "${MINGW_PACKAGE_PREFIX}-libzakformgdaex"
+         "${MINGW_PACKAGE_PREFIX}-libzakformgtkdecoder"
+         "${MINGW_PACKAGE_PREFIX}-libzakconfi"
          "${MINGW_PACKAGE_PREFIX}-libzakauthe"
          "${MINGW_PACKAGE_PREFIX}-libzakautho"
+         "${MINGW_PACKAGE_PREFIX}-libzakutils"
          "${MINGW_PACKAGE_PREFIX}-territorio"
-		 "${MINGW_PACKAGE_PREFIX}-postgresql")
+          "${MINGW_PACKAGE_PREFIX}-postgresql")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "gtk-doc"
              "${MINGW_PACKAGE_PREFIX}-gnome-common")
 options=('!strip' 'debug' 'staticlibs')
 license=("GPL 2")
 url="http://saetta.ns0.it/"
-source=(git+http://saetta.ns0.it/git/solipa/${_realname}#branch=develop
-        001-path.patch)
+source=(git+http://saetta.ns0.it/git/solipa/${_realname}#branch=zakform
+        001-path.patch
+        002-path_resource.patch)
 sha256sums=('SKIP'
-            '386873ec9873c3d8f438d8ff43eb9de3a23159721644c23f418a165a048dc953')
+            'af39df959c19fe12d1ed4f966b4fe1690ae77c2f1ce0fbabcf1d397190a52834'
+            '38c986392bbb26978edf7787f9eb1b0a380a842aadcbe30d38a7a460fa35888b')
 
 pkgver() {
   cd "$srcdir/$_realname"
@@ -34,6 +43,7 @@ prepare() {
   cd ${_realname}
 
   patch -p1 -i ${srcdir}/001-path.patch
+  patch -p1 -i ${srcdir}/002-path_resource.patch
 }
 
 build() {
-- 
2.49.0