From 37e7a3c4b841c11849c889853455675c98467ff5 Mon Sep 17 00:00:00 2001
From: Stefan Sauer <ensonic@google.com>
Date: Tue, 12 May 2015 17:50:05 +0200
Subject: Uncomment conflict fields from pkg-config files.

The referenced bug was fixed in 2007 and has been released in pkg-config-0.23
(16.Jan.2008). The fixed version is widely available.
---
 protobuf.pc.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'protobuf.pc.in')

diff --git a/protobuf.pc.in b/protobuf.pc.in
index 29f24877..49014903 100644
--- a/protobuf.pc.in
+++ b/protobuf.pc.in
@@ -9,6 +9,4 @@ Version: @VERSION@
 Libs: -L${libdir} -lprotobuf @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
 Libs.private: @LIBS@
 Cflags: -I${includedir} @PTHREAD_CFLAGS@
-# Commented out because it crashes pkg-config *sigh*:
-#   http://bugs.freedesktop.org/show_bug.cgi?id=13265
-# Conflicts: protobuf-lite
+Conflicts: protobuf-lite
-- 
cgit v1.2.3