From e326a2a13684d974fb8d6722a94ddbe516c57bcd Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 4 Oct 2014 11:26:43 +0200 Subject: [PATCH] Aggiornata gcr a 3.14.0. --- .../{001-3.12.2.patch => 001-3.14.0.patch} | 59 ++++++++----------- packages/mingw-w64-gcr/PKGBUILD | 14 ++--- 2 files changed, 30 insertions(+), 43 deletions(-) rename packages/mingw-w64-gcr/{001-3.12.2.patch => 001-3.14.0.patch} (95%) diff --git a/packages/mingw-w64-gcr/001-3.12.2.patch b/packages/mingw-w64-gcr/001-3.14.0.patch similarity index 95% rename from packages/mingw-w64-gcr/001-3.12.2.patch rename to packages/mingw-w64-gcr/001-3.14.0.patch index 44dd337..f6657b5 100644 --- a/packages/mingw-w64-gcr/001-3.12.2.patch +++ b/packages/mingw-w64-gcr/001-3.14.0.patch @@ -196,20 +196,6 @@ #define STATE_LOCKED 1 #define STATE_FLOATING 8 ---- gcr-3.12.2-orig/gck/gck-debug.c 2014-03-02 09:05:22.000000000 +0100 -+++ gcr-3.12.2/gck/gck-debug.c 2014-08-11 15:34:41.096675100 +0200 -@@ -33,6 +33,11 @@ - - #include - -+#ifdef G_OS_WIN32 -+#define WINVER 0x0501 -+#include -+#endif -+ - #ifdef WITH_DEBUG - - static gsize initialized_flags = 0; --- 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 @@ -605,7 +605,7 @@ @@ -408,9 +394,9 @@ #include enum { ---- gcr-3.12.2-orig/gcr/gcr-gnupg-process.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/gcr/gcr-gnupg-process.c 2014-09-06 11:13:31.599364500 +0200 -@@ -30,12 +30,25 @@ +--- 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 +@@ -28,12 +28,25 @@ #include @@ -436,20 +422,20 @@ /** * GcrGnupgProcessFlags: * @GCR_GNUPG_PROCESS_NONE: No flags -@@ -853,7 +866,12 @@ +@@ -851,7 +864,12 @@ gint code; guint i; +#if defined (G_OS_UNIX) - _gcr_debug ("process exited: %d", (int)pid); + g_debug ("process exited: %d", (int)pid); +#elif defined (G_OS_WIN32) + DWORD real_pid = GetProcessId (pid); -+ _gcr_debug ("process exited: %d", (int)real_pid); ++ g_debug ("process exited: %d", (int)real_pid); +#endif g_spawn_close_pid (gnupg_source->child_pid); gnupg_source->child_pid = 0; -@@ -890,11 +908,14 @@ +@@ -888,11 +906,14 @@ } complete_source_is_done (gnupg_source); @@ -464,7 +450,7 @@ int *child_fds = user_data; long val; guint i; -@@ -910,6 +931,7 @@ +@@ -908,6 +929,7 @@ fcntl (child_fds[i], F_SETFD, val & ~FD_CLOEXEC); } } @@ -472,24 +458,25 @@ } static void -@@ -928,9 +950,16 @@ +@@ -926,9 +948,16 @@ /* Try and kill the child process */ if (gnupg_source->child_pid) { +#if defined(G_OS_UNIX) - _gcr_debug ("sending term signal to process: %d", - (int)gnupg_source->child_pid); + g_debug ("sending term signal to process: %d", +- (int)gnupg_source->child_pid); ++ (int)gnupg_source->child_pid); kill (gnupg_source->child_pid, SIGTERM); +#elif defined(G_OS_WIN32) + DWORD real_pid = GetProcessId (gnupg_source->child_pid); -+ _gcr_debug ("sending term signal to process: %d", ++ g_debug ("sending term signal to process: %d", + (int)real_pid); + TerminateProcess (gnupg_source->child_pid, 0); +#endif } } -@@ -999,14 +1028,22 @@ +@@ -997,14 +1026,22 @@ child_fds[FD_ERROR] = 2; if (flags & GCR_GNUPG_PROCESS_WITH_STATUS) { @@ -512,22 +499,22 @@ g_return_if_reached (); child_fds[FD_ATTRIBUTE] = attribute_fds[1]; g_ptr_array_add (args, g_strdup ("--attribute-fd")); -@@ -1067,7 +1104,12 @@ +@@ -1063,7 +1100,12 @@ return; } +#if defined (G_OS_UNIX) - _gcr_debug ("process started: %d", (int)pid); + g_debug ("process started: %d", (int)pid); +#elif defined (G_OS_WIN32) + DWORD real_pid = GetProcessId (pid); -+ _gcr_debug ("process started: %d", (int)real_pid); ++ g_debug ("process started: %d", (int)real_pid); +#endif source = g_source_new (&gnupg_source_funcs, sizeof (GnupgSource)); ---- gcr-3.12.2-orig/gcr/gcr-record.c 2014-03-03 21:05:24.000000000 +0100 -+++ gcr-3.12.2/gcr/gcr-record.c 2014-08-11 15:34:41.077660800 +0200 -@@ -595,7 +595,9 @@ +--- 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 +@@ -593,7 +593,9 @@ const gchar *raw; gulong result; gchar *end = NULL; @@ -538,7 +525,7 @@ g_return_val_if_fail (record, NULL); -@@ -613,14 +615,20 @@ +@@ -611,14 +613,20 @@ } /* Try to parse as a date */ @@ -554,7 +541,7 @@ + } + g_strfreev (string); + if (dt == NULL) { - _gcr_debug ("invalid date value: %s", raw); + g_debug ("invalid date value: %s", raw); return NULL; } @@ -563,7 +550,7 @@ } /** -@@ -858,4 +866,4 @@ +@@ -856,4 +864,4 @@ g_free (lines); return result; diff --git a/packages/mingw-w64-gcr/PKGBUILD b/packages/mingw-w64-gcr/PKGBUILD index 2f37975..a97e306 100644 --- a/packages/mingw-w64-gcr/PKGBUILD +++ b/packages/mingw-w64-gcr/PKGBUILD @@ -2,7 +2,7 @@ _realname=gcr pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=3.12.2 +pkgver=3.14.0 pkgrel=1 arch=('any') pkgdesc="Library for Crypto UI related task (mingw-w64)" @@ -14,18 +14,19 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-gtk-doc" "${MINGW_PACKAGE_PREFIX}-vala" "${MINGW_PACKAGE_PREFIX}-gobject-introspection" + "${MINGW_PACKAGE_PREFIX}-pkg-config" "gnupg") options=('strip' 'staticlibs') license=("LGPL 2.1") url="http://www.gnome.org/" source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver:0:4}/${_realname}-$pkgver.tar.xz - 001-3.12.2.patch) -sha256sums=('456e20615ab178aa92eeabdea64dcce535c10d5af189171d9375291a2447d21c' - '0adafaa9626e16ac5a447058b0aa38a6f4f075b00b0a70e3f8ab6003ab5ef2e6') + 001-3.14.0.patch) +sha256sums=('2a2231147a01e2061f57fa9ca77557ff97bc6ceab028cee5528079f4b2fca63d' + 'b861b72d7f11afd818c8adcb9da605238bb9c454e631c0583ad6bcad304f8d8d') prepare() { cd ${_realname}-${pkgver} - patch -p1 -i ${srcdir}/001-3.12.2.patch + patch -p1 -i ${srcdir}/001-3.14.0.patch autoreconf -fi } @@ -39,8 +40,7 @@ build() { --target=${MINGW_CHOST} \ --build=${MINGW_CHOST} \ --prefix=${MINGW_PREFIX} \ - --libexecdir=${MINGW_PREFIX}/lib \ - --enable-introspection=no + --libexecdir=${MINGW_PREFIX}/lib make } -- 2.49.0