From: Andrea Zagli <andrea.zagli@email.it>
Date: Thu, 12 Apr 2018 07:40:39 +0000 (+0200)
Subject: gcr: aggiornato a 3.28.0.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=632b8ad8aa7bbad3b9cfc940299245fbadb4b8fb;p=msys2

gcr: aggiornato a 3.28.0.
---

diff --git a/packages/mingw-w64-gcr/001-3.14.0.patch b/packages/mingw-w64-gcr/001-3.14.0.patch
index 7415b94..ffe23b6 100644
--- a/packages/mingw-w64-gcr/001-3.14.0.patch
+++ b/packages/mingw-w64-gcr/001-3.14.0.patch
@@ -810,7 +810,7 @@
  	g_log_set_handler ("Glib", flags, log_handler, NULL);
 --- ./ui/Makefile.am.orig	2015-01-20 09:48:48.000000000 +0100
 +++ ./ui/Makefile.am	2015-03-15 10:30:44.111171500 +0100
-@@ -36,12 +36,6 @@
+@@ -36,11 +36,5 @@
  	$(GTK_LIBS) \
  	$(NULL)
  
@@ -820,6 +820,5 @@
 -	$(LN_S) -f `readlink $(DESTDIR)$(libdir)/libgcr-ui-@GCR_MAJOR@.so` $(DESTDIR)$(libdir)/libgcr-@GCR_MAJOR@.so.@GCR_CURRENT@
 -	$(LN_S) -f `readlink $(DESTDIR)$(libdir)/libgcr-ui-@GCR_MAJOR@.so` $(DESTDIR)$(libdir)/libgcr-@GCR_MAJOR@.so.@GCR_CURRENT@.0.0
 -
- uidir = $(datadir)/gcr-@GCR_MAJOR@/ui/
- 
- ui_DATA = \
+ lib_LTLIBRARIES += \
+ 	libgcr-ui-@GCR_MAJOR@.la
diff --git a/packages/mingw-w64-gcr/002-3.28.0.patch b/packages/mingw-w64-gcr/002-3.28.0.patch
new file mode 100644
index 0000000..49965de
--- /dev/null
+++ b/packages/mingw-w64-gcr/002-3.28.0.patch
@@ -0,0 +1,81 @@
+--- ./gcr/Makefile.am
++++ ./gcr/Makefile.am
+@@ -25,7 +25,6 @@
+ 	gcr/gcr-secure-memory.h \
+ 	gcr/gcr-simple-certificate.h \
+ 	gcr/gcr-simple-collection.h \
+-	gcr/gcr-ssh-askpass.h \
+ 	gcr/gcr-system-prompt.h \
+ 	gcr/gcr-system-prompter.h \
+ 	gcr/gcr-trust.h \
+@@ -75,7 +74,6 @@
+ 	gcr/gcr-secure-memory.c gcr/gcr-secure-memory.h \
+ 	gcr/gcr-simple-certificate.c gcr/gcr-simple-certificate.h \
+ 	gcr/gcr-simple-collection.c gcr/gcr-simple-collection.h \
+-	gcr/gcr-ssh-askpass.c gcr/gcr-ssh-askpass.h \
+ 	gcr/gcr-system-prompt.c gcr/gcr-system-prompt.h \
+ 	gcr/gcr-system-prompter.c gcr/gcr-system-prompter.h \
+ 	gcr/gcr-types.h \
+@@ -170,19 +168,6 @@
+ 
+ gcr/gcr-dbus-generated.h: gcr/gcr-dbus-generated.c
+ 
+-libexec_PROGRAMS += gcr-ssh-askpass
+-
+-gcr_ssh_askpass_SOURCES = gcr/gcr-ssh-askpass.c
+-
+-gcr_ssh_askpass_CFLAGS = \
+-	-DGCR_SSH_ASKPASS_TOOL \
+-	-DGCR_COMPILATION \
+-	$(GLIB_CFLAGS)
+-
+-gcr_ssh_askpass_LDADD = \
+-	libegg.la \
+-	$(GLIB_LIBS)
+-
+ pkgconfig_DATA += \
+ 	gcr-base-$(GCR_MAJOR).pc
+ 
+@@ -306,8 +291,7 @@
+ 	test-gnupg-key \
+ 	test-gnupg-collection \
+ 	test-gnupg-process \
+-	test-system-prompt \
+-	test-ssh-askpass
++	test-system-prompt
+ 
+ test_certificate_SOURCES = gcr/test-certificate.c
+ test_certificate_CFLAGS = $(gcr_CFLAGS)
+@@ -365,10 +349,6 @@
+ test_simple_certificate_CFLAGS = $(gcr_CFLAGS)
+ test_simple_certificate_LDADD = $(gcr_LIBS)
+ 
+-test_ssh_askpass_SOURCES = gcr/test-ssh-askpass.c
+-test_ssh_askpass_CFLAGS = $(gcr_CFLAGS)
+-test_ssh_askpass_LDADD = libegg-test.la $(gcr_LIBS)
+-
+ test_system_prompt_SOURCES = gcr/test-system-prompt.c
+ test_system_prompt_CFLAGS = $(gcr_CFLAGS)
+ test_system_prompt_LDADD = $(gcr_LIBS)
+
+--- ./gcr/Makefile.am
++++ ./gcr/Makefile.am
+@@ -284,7 +284,6 @@
+ 	test-fingerprint \
+ 	test-openpgp \
+ 	test-openssh \
+-	test-secure-memory \
+ 	test-parser \
+ 	test-record \
+ 	test-memory-icon \
+@@ -341,10 +340,6 @@
+ test_secret_exchange_CFLAGS = $(gcr_CFLAGS)
+ test_secret_exchange_LDADD = $(gcr_LIBS)
+ 
+-test_secure_memory_SOURCES = gcr/test-secure-memory.c
+-test_secure_memory_CFLAGS = $(gcr_CFLAGS)
+-test_secure_memory_LDADD = $(gcr_LIBS)
+-
+ test_simple_certificate_SOURCES = gcr/test-simple-certificate.c
+ test_simple_certificate_CFLAGS = $(gcr_CFLAGS)
+ test_simple_certificate_LDADD = $(gcr_LIBS)
diff --git a/packages/mingw-w64-gcr/PKGBUILD b/packages/mingw-w64-gcr/PKGBUILD
index 7c379cb..00a3cc5 100644
--- a/packages/mingw-w64-gcr/PKGBUILD
+++ b/packages/mingw-w64-gcr/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=gcr
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.20.0
+pkgver=3.28.0
 pkgrel=0
 arch=('any')
 pkgdesc="Library for Crypto UI related task (mingw-w64)"
@@ -22,14 +22,17 @@ license=("LGPL 2.1")
 url="http://www.gnome.org/"
 install=${_realname}-${CARCH}.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver:0:4}/${_realname}-$pkgver.tar.xz
-        001-3.14.0.patch)
-sha256sums=('90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379'
-            '0801a552a731bd29cad902bbbe1a3ff6fd4ac1e6eac12a883afd077079ac017d')
+        001-3.14.0.patch
+        002-3.28.0.patch)
+sha256sums=('15e175d1da7ec486d59749ba34906241c442898118ce224a7b70bf2e849faf0b'
+            '0a7dcbc705aa32b7f27211d3b1f21e91e2de5f5bcb890a0fc04427c7077b4816'
+            'f3c7ab65654e176d7a6eb153296c976a15a4273f6d68bb6d8df7cdb44ed169f1')
 
 prepare() {
   cd ${_realname}-${pkgver}
 
   patch -b -V simple -p1 -i ${srcdir}/001-3.14.0.patch
+  patch -b -V simple -p1 -i ${srcdir}/002-3.28.0.patch
 
   autoreconf -fi
 }