From ca94b7d53d0f6c7621f73051171e20473f3fd4d9 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Fri, 7 Jun 2013 17:08:10 +0300 Subject: [PATCH] [PATCH 1/1] cli: Guard deprecated g_type_init calls --- a2/58cc1a290f8b476bc9c0ff8e7f8ba33a09a696 | 68 +++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 a2/58cc1a290f8b476bc9c0ff8e7f8ba33a09a696 diff --git a/a2/58cc1a290f8b476bc9c0ff8e7f8ba33a09a696 b/a2/58cc1a290f8b476bc9c0ff8e7f8ba33a09a696 new file mode 100644 index 000000000..e762064b9 --- /dev/null +++ b/a2/58cc1a290f8b476bc9c0ff8e7f8ba33a09a696 @@ -0,0 +1,68 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 1B752431FAE + for ; Fri, 7 Jun 2013 07:08:29 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id hO7A1lsYKM2N for ; + Fri, 7 Jun 2013 07:08:17 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 60ECD431FAF + for ; Fri, 7 Jun 2013 07:08:17 -0700 (PDT) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 328301001F1; Fri, 7 Jun 2013 17:08:12 +0300 (EEST) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH 1/1] cli: Guard deprecated g_type_init calls +Date: Fri, 7 Jun 2013 17:08:10 +0300 +Message-Id: <1370614090-1715-1-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.8.0 +Cc: tomi.ollila@iki.fi +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 07 Jun 2013 14:08:29 -0000 + +g_type_init was deprecated in GLib 2.35.1. In order to compile +cleanly, guard these with a suitable #if. + +(commit msg from https://bugs.freedesktop.org/attachment.cgi?id=73774 ) +--- + notmuch.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/notmuch.c b/notmuch.c +index 99ddd6d..f9902ed 100644 +--- a/notmuch.c ++++ b/notmuch.c +@@ -291,8 +291,9 @@ main (int argc, char *argv[]) + local = talloc_new (NULL); + + g_mime_init (0); ++#if !GLIB_CHECK_VERSION(2, 35, 1) + g_type_init (); +- ++#endif + /* Globally default to the current output format version. */ + notmuch_format_version = NOTMUCH_FORMAT_CUR; + +-- +1.8.0 + -- 2.26.2