From: Andrea Zagli Date: Sun, 15 Mar 2015 10:24:16 +0000 (+0100) Subject: gcr: aggiornato a 3.15.90. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=23338d4e73b1b11c6eac2579ee1022c5ace90034;p=msys2 gcr: aggiornato a 3.15.90. --- diff --git a/packages/mingw-w64-gcr/001-3.14.0.patch b/packages/mingw-w64-gcr/001-3.14.0.patch index f6657b5..460d852 100644 --- a/packages/mingw-w64-gcr/001-3.14.0.patch +++ b/packages/mingw-w64-gcr/001-3.14.0.patch @@ -1,6 +1,6 @@ ---- gcr-3.12.2-orig/configure.ac 2014-05-13 21:03:55.000000000 +0200 -+++ gcr-3.12.2/configure.ac 2014-09-06 11:46:03.751895300 +0200 -@@ -75,6 +75,16 @@ +--- ./configure.ac.orig 2015-02-25 20:47:34.000000000 +0100 ++++ ./configure.ac 2015-03-15 10:33:08.876517300 +0100 +@@ -79,6 +79,18 @@ AC_SUBST(GETTEXT_PACKAGE) AM_GLIB_GNU_GETTEXT @@ -10,14 +10,16 @@ + +if test "$os_unix" = "yes"; then + GIO_PACKAGE="gio-2.0 gio-unix-2.0" ++ GTK_PACKAGE="gtk+-3.0 >= $GTK_REQ gtk+-x11-3.0 >= $GTK_REQ" +else + GIO_PACKAGE="gio-2.0" ++ GTK_PACKAGE="gtk+-3.0 >= $GTK_REQ" +fi + # ----------------------------------------------------------------------------- # GLib and GTK+ stuff -@@ -83,7 +93,7 @@ +@@ -87,7 +99,7 @@ gmodule-no-export-2.0 gthread-2.0 gobject-2.0 @@ -26,7 +28,16 @@ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB_MIN" GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=$GLIB_MAX" AC_SUBST(GLIB_CFLAGS) -@@ -140,7 +150,17 @@ +@@ -116,7 +128,7 @@ + AM_CONDITIONAL(WITH_GTK, test "$with_gtk" != "no") + + if test "x$with_gtk" != "xno"; then +- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQ gtk+-x11-3.0 >= $GTK_REQ) ++ PKG_CHECK_MODULES(GTK, $GTK_PACKAGE) + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + fi +@@ -144,7 +156,17 @@ # AC_CHECK_FUNCS(timegm, AC_DEFINE(HAVE_TIMEGM,1,[Have timegm])) @@ -45,40 +56,8 @@ # -------------------------------------------------------------------- # p11-kit ---- gcr-3.12.2-orig/Makefile.am 2014-04-17 08:51:07.000000000 +0200 -+++ gcr-3.12.2/Makefile.am 2014-09-06 22:33:28.916978100 +0200 -@@ -164,6 +164,7 @@ - INTROSPECTION_GIRS = - INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --warn-all --add-include-path=. - INTROSPECTION_COMPILER_ARGS = --includedir=. -+INTROSPECTION_SCANNER_ENV = CC="$(CC)" - - girdir = $(datadir)/gir-1.0 - gir_DATA = ---- gcr-3.12.2-orig/egg/Makefile.am 2014-05-13 21:01:43.000000000 +0200 -+++ gcr-3.12.2/egg/Makefile.am 2014-09-06 12:50:02.014502900 +0200 -@@ -13,7 +13,8 @@ - - libegg_la_LIBADD = \ - $(GLIB_LIBS) \ -- $(LIBGCRYPT_LIBS) -+ $(LIBGCRYPT_LIBS) \ -+ -lmman - - libegg_la_SOURCES = \ - egg/egg-armor.c egg/egg-armor.h \ -@@ -72,7 +73,8 @@ - egg_LDADD = \ - libegg.la \ - $(LIBGCRYPT_LIBS) \ -- $(GLIB_LIBS) -+ $(GLIB_LIBS) \ -+ -lmman - - egg_TESTS = \ - test-asn1 \ ---- gcr-3.12.2-orig/egg/egg-armor.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/egg/egg-armor.c 2014-08-11 15:34:41.041658400 +0200 +--- ./egg/egg-armor.c.orig 2014-09-23 09:40:08.000000000 +0200 ++++ ./egg/egg-armor.c 2015-03-15 10:30:43.424118000 +0100 @@ -59,6 +59,29 @@ #define ARMOR_PREF_END "-----END " #define ARMOR_PREF_END_L 9 @@ -109,8 +88,8 @@ static void parse_header_lines (const gchar *hbeg, const gchar *hend, ---- gcr-3.12.2-orig/egg/egg-asn1x.c 2014-05-13 21:01:43.000000000 +0200 -+++ gcr-3.12.2/egg/egg-asn1x.c 2014-08-11 15:34:41.034658600 +0200 +--- ./egg/egg-asn1x.c.orig 2015-01-20 09:48:48.000000000 +0100 ++++ ./egg/egg-asn1x.c 2015-03-15 10:30:43.469120600 +0100 @@ -1928,7 +1928,7 @@ two_to_four_digit_year (int year) { @@ -139,8 +118,8 @@ /* * Check if it's within 40 years before the ---- gcr-3.12.2-orig/egg/egg-secure-memory.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/egg/egg-secure-memory.c 2014-09-06 11:11:19.489433700 +0200 +--- ./egg/egg-secure-memory.c.orig 2014-09-23 09:40:08.000000000 +0200 ++++ ./egg/egg-secure-memory.c 2015-03-15 10:30:43.477122000 +0100 @@ -913,7 +913,7 @@ DEBUG_ALLOC ("gkr-secure-memory: freed block ", sz); @@ -150,8 +129,30 @@ #endif } ---- gcr-3.12.2-orig/egg/test-asn1x.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/egg/test-asn1x.c 2014-08-11 15:34:41.047660400 +0200 +--- ./egg/Makefile.am.orig 2015-01-20 09:48:48.000000000 +0100 ++++ ./egg/Makefile.am 2015-03-15 10:30:43.413118300 +0100 +@@ -13,7 +13,8 @@ + + libegg_la_LIBADD = \ + $(GLIB_LIBS) \ +- $(LIBGCRYPT_LIBS) ++ $(LIBGCRYPT_LIBS) \ ++ -lmman + + libegg_la_SOURCES = \ + egg/egg-armor.c egg/egg-armor.h \ +@@ -72,7 +73,8 @@ + egg_LDADD = \ + libegg.la \ + $(LIBGCRYPT_LIBS) \ +- $(GLIB_LIBS) ++ $(GLIB_LIBS) \ ++ -lmman + + egg_TESTS = \ + test-asn1 \ +--- ./egg/test-asn1x.c.orig 2014-09-23 09:40:08.000000000 +0200 ++++ ./egg/test-asn1x.c 2015-03-15 10:30:43.486121900 +0100 @@ -26,7 +26,9 @@ #include "egg/egg-asn1-defs.h" #include "egg/egg-testing.h" @@ -162,30 +163,8 @@ #include #include ---- gcr-3.12.2-orig/gck/Makefile.am 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/gck/Makefile.am 2014-09-06 12:11:38.941793800 +0200 -@@ -71,7 +71,8 @@ - libegg-secmem.la \ - $(P11_KIT_LIBS) \ - $(GIO_LIBS) \ -- $(GLIB_LIBS) -+ $(GLIB_LIBS) \ -+ -lmman - - noinst_LTLIBRARIES += libgck-testable.la - libgck_testable_la_SOURCES = \ -@@ -193,7 +194,8 @@ - libegg-hex.la \ - $(GLIB_LIBS) \ - $(P11_KIT_LIBS) \ -- $(GIO_LIBS) -+ $(GIO_LIBS) \ -+ -lmman - - gck_TESTS = \ - test-gck-attributes \ ---- gcr-3.12.2-orig/gck/gck-attributes.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/gck/gck-attributes.c 2014-09-06 22:14:58.034848700 +0200 +--- ./gck/gck-attributes.c.orig 2014-09-23 09:40:08.000000000 +0200 ++++ ./gck/gck-attributes.c 2015-03-15 10:30:43.506123100 +0100 @@ -44,7 +44,9 @@ * this library will operate on such an attribute. */ @@ -196,8 +175,8 @@ #define STATE_LOCKED 1 #define STATE_FLOATING 8 ---- gcr-3.12.2-orig/gck/gck-slot.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/gck/gck-slot.c 2014-08-11 15:34:41.053657400 +0200 +--- ./gck/gck-slot.c.orig 2014-09-23 09:40:08.000000000 +0200 ++++ ./gck/gck-slot.c 2015-03-15 10:30:43.516130700 +0100 @@ -605,7 +605,7 @@ { GckTokenInfo *token_info; @@ -248,8 +227,30 @@ g_return_if_fail (len == sizeof (info->utcTime)); memcpy (info->utcTime, buffer, sizeof (info->utcTime)); } else { ---- gcr-3.12.2-orig/gck/test-gck-crypto.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/gck/test-gck-crypto.c 2014-08-11 15:34:41.105662500 +0200 +--- ./gck/Makefile.am.orig 2015-01-20 09:48:48.000000000 +0100 ++++ ./gck/Makefile.am 2015-03-15 10:30:43.493122100 +0100 +@@ -70,7 +70,8 @@ + libegg-secmem.la \ + $(P11_KIT_LIBS) \ + $(GIO_LIBS) \ +- $(GLIB_LIBS) ++ $(GLIB_LIBS) \ ++ -lmman + + noinst_LTLIBRARIES += libgck-testable.la + libgck_testable_la_SOURCES = \ +@@ -192,7 +193,8 @@ + libegg-hex.la \ + $(GLIB_LIBS) \ + $(P11_KIT_LIBS) \ +- $(GIO_LIBS) ++ $(GIO_LIBS) \ ++ -lmman + + gck_TESTS = \ + test-gck-attributes \ +--- ./gck/test-gck-crypto.c.orig 2014-09-23 09:40:08.000000000 +0200 ++++ ./gck/test-gck-crypto.c 2015-03-15 10:30:43.528125100 +0100 @@ -56,7 +56,11 @@ GckSlot *slot; @@ -262,8 +263,8 @@ g_assert_no_error (err); g_assert (GCK_IS_MODULE (test->module)); g_object_add_weak_pointer (G_OBJECT (test->module), (gpointer *)&test->module); ---- gcr-3.12.2-orig/gck/test-gck-enumerator.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/gck/test-gck-enumerator.c 2014-08-11 15:34:41.110662100 +0200 +--- ./gck/test-gck-enumerator.c.orig 2015-01-20 09:48:48.000000000 +0100 ++++ ./gck/test-gck-enumerator.c 2015-03-15 10:30:43.590127500 +0100 @@ -49,7 +49,11 @@ GError *err = NULL; @@ -276,8 +277,8 @@ g_assert_no_error (err); g_assert (GCK_IS_MODULE (test->module)); g_object_add_weak_pointer (G_OBJECT (test->module), (gpointer *)&test->module); ---- gcr-3.12.2-orig/gck/test-gck-module.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/gck/test-gck-module.c 2014-08-11 15:34:41.117663800 +0200 +--- ./gck/test-gck-module.c.orig 2014-09-23 09:40:08.000000000 +0200 ++++ ./gck/test-gck-module.c 2015-03-15 10:30:43.598128500 +0100 @@ -41,7 +41,11 @@ GError *err = NULL; @@ -326,8 +327,8 @@ g_free (path); } ---- gcr-3.12.2-orig/gck/test-gck-modules.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/gck/test-gck-modules.c 2014-08-11 15:34:41.122663400 +0200 +--- ./gck/test-gck-modules.c.orig 2014-09-23 09:40:08.000000000 +0200 ++++ ./gck/test-gck-modules.c 2015-03-15 10:30:43.605129400 +0100 @@ -47,7 +47,11 @@ GError *err = NULL; @@ -340,8 +341,8 @@ g_assert_no_error (err); g_assert (GCK_IS_MODULE (module)); ---- gcr-3.12.2-orig/gck/test-gck-object.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/gck/test-gck-object.c 2014-08-11 15:34:41.129665100 +0200 +--- ./gck/test-gck-object.c.orig 2014-09-23 09:40:08.000000000 +0200 ++++ ./gck/test-gck-object.c 2015-03-15 10:30:43.691134000 +0100 @@ -49,7 +49,11 @@ GList *slots; @@ -354,8 +355,8 @@ g_assert_no_error (err); g_assert (GCK_IS_MODULE (test->module)); ---- gcr-3.12.2-orig/gck/test-gck-session.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/gck/test-gck-session.c 2014-08-11 15:34:41.136677400 +0200 +--- ./gck/test-gck-session.c.orig 2015-01-20 09:48:48.000000000 +0100 ++++ ./gck/test-gck-session.c 2015-03-15 10:30:43.719135400 +0100 @@ -49,7 +49,11 @@ GList *slots; @@ -368,8 +369,8 @@ g_assert_no_error (err); g_assert (GCK_IS_MODULE (test->module)); g_object_add_weak_pointer (G_OBJECT (test->module), (gpointer *)&test->module); ---- gcr-3.12.2-orig/gck/test-gck-slot.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/gck/test-gck-slot.c 2014-08-11 15:34:41.141664500 +0200 +--- ./gck/test-gck-slot.c.orig 2014-09-23 09:40:08.000000000 +0200 ++++ ./gck/test-gck-slot.c 2015-03-15 10:30:43.749137600 +0100 @@ -42,7 +42,11 @@ GList *slots; @@ -382,9 +383,9 @@ g_assert_no_error (err); g_assert (GCK_IS_MODULE (test->module)); ---- gcr-3.12.2-orig/gcr/gcr-gnupg-collection.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/gcr/gcr-gnupg-collection.c 2014-08-11 15:34:41.058659700 +0200 -@@ -34,7 +34,9 @@ +--- ./gcr/gcr-gnupg-collection.c.orig 2014-09-23 09:40:08.000000000 +0200 ++++ ./gcr/gcr-gnupg-collection.c 2015-03-15 10:30:43.830141900 +0100 +@@ -32,7 +32,9 @@ #include "gcr-record.h" #include "gcr-util.h" @@ -394,8 +395,8 @@ #include enum { ---- gcr-3.14.0/gcr/gcr-gnupg-process.c.orig 2014-09-23 09:40:08.000000000 +0200 -+++ gcr-3.14.0/gcr/gcr-gnupg-process.c 2014-10-04 10:03:24.930749400 +0200 +--- ./gcr/gcr-gnupg-process.c.orig 2014-09-23 09:40:08.000000000 +0200 ++++ ./gcr/gcr-gnupg-process.c 2015-03-15 10:30:43.843142500 +0100 @@ -28,12 +28,25 @@ #include @@ -512,8 +513,8 @@ source = g_source_new (&gnupg_source_funcs, sizeof (GnupgSource)); ---- gcr-3.14.0/gcr/gcr-record.c.orig 2014-09-23 09:40:08.000000000 +0200 -+++ gcr-3.14.0/gcr/gcr-record.c 2014-10-04 10:06:39.245627700 +0200 +--- ./gcr/gcr-record.c.orig 2014-09-23 09:40:08.000000000 +0200 ++++ ./gcr/gcr-record.c 2015-03-15 10:30:43.923159200 +0100 @@ -593,7 +593,9 @@ const gchar *raw; gulong result; @@ -557,9 +558,9 @@ -} +} \ Manca newline alla fine del file ---- gcr-3.12.2-orig/gcr/Makefile.am 2014-04-17 08:51:07.000000000 +0200 -+++ gcr-3.12.2/gcr/Makefile.am 2014-09-06 13:20:31.506762300 +0200 -@@ -134,7 +134,8 @@ +--- ./gcr/Makefile.am.orig 2015-01-20 09:48:48.000000000 +0100 ++++ ./gcr/Makefile.am 2015-03-15 10:30:43.936159800 +0100 +@@ -133,7 +133,8 @@ libgck-@GCK_MAJOR@.la \ $(GLIB_LIBS) \ $(LIBGCRYPT_LIBS) \ @@ -569,7 +570,7 @@ gcr/gcr-marshal.h: gcr/gcr-marshal.list $(GLIB_GENMARSHAL) $(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=_gcr_marshal > $@ -@@ -266,7 +267,8 @@ +@@ -270,7 +271,8 @@ libgck-testable.la \ $(GLIB_LIBS) \ $(LIBGCRYPT_LIBS) \ @@ -579,7 +580,7 @@ gcr_TESTS = \ test-util \ -@@ -274,14 +276,10 @@ +@@ -278,14 +280,10 @@ test-secret-exchange \ test-simple-certificate \ test-certificate \ @@ -594,7 +595,7 @@ test-parser \ test-record \ test-memory-icon \ -@@ -294,10 +292,6 @@ +@@ -298,10 +296,6 @@ test_certificate_CFLAGS = $(gcr_CFLAGS) test_certificate_LDADD = $(gcr_LIBS) @@ -605,7 +606,7 @@ test_filter_collection_SOURCES = gcr/test-filter-collection.c test_filter_collection_CFLAGS = $(gcr_CFLAGS) test_filter_collection_LDADD = $(gcr_LIBS) -@@ -334,10 +328,6 @@ +@@ -338,10 +332,6 @@ test_parser_CFLAGS = $(gcr_CFLAGS) test_parser_LDADD = $(gcr_LIBS) @@ -616,7 +617,7 @@ test_record_SOURCES = gcr/test-record.c test_record_CFLAGS = $(gcr_CFLAGS) test_record_LDADD = $(gcr_LIBS) -@@ -354,18 +344,10 @@ +@@ -358,18 +348,10 @@ test_simple_certificate_CFLAGS = $(gcr_CFLAGS) test_simple_certificate_LDADD = $(gcr_LIBS) @@ -635,8 +636,18 @@ test_util_SOURCES = gcr/test-util.c test_util_CFLAGS = $(gcr_CFLAGS) test_util_LDADD = $(gcr_LIBS) ---- gcr-3.12.2-orig/ui/frob-prompt.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/ui/frob-prompt.c 2014-08-11 16:52:11.692510200 +0200 +--- ./Makefile.am.orig 2015-01-20 09:48:48.000000000 +0100 ++++ ./Makefile.am 2015-03-15 10:30:43.402117900 +0100 +@@ -164,6 +164,7 @@ + INTROSPECTION_GIRS = + INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --warn-all --add-include-path=. + INTROSPECTION_COMPILER_ARGS = --includedir=. ++INTROSPECTION_SCANNER_ENV = CC="$(CC)" + + girdir = $(datadir)/gir-1.0 + gir_DATA = +--- ./ui/frob-prompt.c.orig 2014-09-23 09:40:08.000000000 +0200 ++++ ./ui/frob-prompt.c 2015-03-15 10:30:43.942161000 +0100 @@ -25,15 +25,45 @@ #include "gcr/gcr-base.h" @@ -696,8 +707,8 @@ gcr_prompt_set_caller_window (GCR_PROMPT (prompt), caller_id); g_free (caller_id); } ---- gcr-3.12.2-orig/ui/frob-system-prompt.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/ui/frob-system-prompt.c 2014-08-11 16:52:28.435130400 +0200 +--- ./ui/frob-system-prompt.c.orig 2014-09-23 09:40:08.000000000 +0200 ++++ ./ui/frob-system-prompt.c 2015-03-15 10:30:44.037166600 +0100 @@ -26,7 +26,12 @@ #include "egg/egg-testing.h" @@ -723,9 +734,9 @@ gcr_prompt_set_caller_window (GCR_PROMPT (prompt), caller_id); g_free (caller_id); ---- gcr-3.12.2-orig/ui/gcr-prompt-dialog.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/ui/gcr-prompt-dialog.c 2014-08-11 15:52:01.024449200 +0200 -@@ -29,7 +29,12 @@ +--- ./ui/gcr-prompt-dialog.c.orig 2014-09-23 09:40:08.000000000 +0200 ++++ ./ui/gcr-prompt-dialog.c 2015-03-15 10:30:44.044166400 +0100 +@@ -27,7 +27,12 @@ #include "gcr-secure-entry-buffer.h" #include @@ -738,7 +749,7 @@ #include /** -@@ -150,7 +155,9 @@ +@@ -148,7 +153,9 @@ } display = gtk_widget_get_display (GTK_WIDGET (self)); @@ -748,9 +759,9 @@ if (transient_for == NULL) { g_warning ("caller-window property doesn't represent a window on current display: %s", self->pv->caller_window); ---- gcr-3.12.2-orig/ui/gcr-prompter-tool.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/ui/gcr-prompter-tool.c 2014-08-11 16:07:06.442588100 +0200 -@@ -29,13 +29,20 @@ +--- ./ui/gcr-prompter-tool.c.orig 2014-09-23 09:40:08.000000000 +0200 ++++ ./ui/gcr-prompter-tool.c 2015-03-15 10:30:44.097169300 +0100 +@@ -27,13 +27,20 @@ #include #include @@ -771,7 +782,7 @@ #define QUIT_TIMEOUT 10 -@@ -141,6 +148,7 @@ +@@ -139,6 +146,7 @@ /* Note that crit and err are the other way around in syslog */ @@ -779,7 +790,7 @@ switch (G_LOG_LEVEL_MASK & log_level) { case G_LOG_LEVEL_ERROR: level = LOG_CRIT; -@@ -170,6 +178,7 @@ +@@ -168,6 +176,7 @@ syslog (level, "%s: %s", log_domain, message); else syslog (level, "%s", message); @@ -787,7 +798,7 @@ /* And then to default handler for aborting and stuff like that */ g_log_default_handler (log_domain, log_level, message, user_data); -@@ -179,7 +188,9 @@ +@@ -177,7 +186,9 @@ printerr_handler (const gchar *string) { /* Print to syslog and stderr */ @@ -797,7 +808,7 @@ fprintf (stderr, "%s", string); } -@@ -190,7 +201,9 @@ +@@ -188,7 +199,9 @@ G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO; @@ -807,8 +818,8 @@ g_log_set_handler (NULL, flags, log_handler, NULL); g_log_set_handler ("Glib", flags, log_handler, NULL); ---- gcr-3.12.2-orig/ui/Makefile.am 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/ui/Makefile.am 2014-08-11 17:11:21.038892800 +0200 +--- ./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 @@ $(GTK_LIBS) \ $(NULL) diff --git a/packages/mingw-w64-gcr/PKGBUILD b/packages/mingw-w64-gcr/PKGBUILD index f2b3555..8a59e97 100644 --- a/packages/mingw-w64-gcr/PKGBUILD +++ b/packages/mingw-w64-gcr/PKGBUILD @@ -2,8 +2,8 @@ _realname=gcr pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=3.14.0 -pkgrel=2 +pkgver=3.15.90 +pkgrel=1 arch=('any') pkgdesc="Library for Crypto UI related task (mingw-w64)" depends=("${MINGW_PACKAGE_PREFIX}-gtk3" @@ -22,12 +22,12 @@ 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=('2a2231147a01e2061f57fa9ca77557ff97bc6ceab028cee5528079f4b2fca63d' - 'b861b72d7f11afd818c8adcb9da605238bb9c454e631c0583ad6bcad304f8d8d') +sha256sums=('b0ad0cfb9f504cda67e740f79a53b5d19c9814a07b7f257d47fbf0409376efe2' + '344ef81cef6b5ee6a2328a8bc82849884d1cccf9ee5a0f4ee7fadf30d0789743') prepare() { cd ${_realname}-${pkgver} - patch -p1 -i ${srcdir}/001-3.14.0.patch + patch -b -V simple -p1 -i ${srcdir}/001-3.14.0.patch autoreconf -fi } @@ -48,4 +48,6 @@ build() { package() { cd "$srcdir/build-${MINGW_CHOST}" make DESTDIR=$pkgdir install + + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" }