From 37e7a3c4b841c11849c889853455675c98467ff5 Mon Sep 17 00:00:00 2001 From: Stefan Sauer Date: Tue, 12 May 2015 17:50:05 +0200 Subject: [PATCH] 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-lite.pc.in | 4 +--- protobuf.pc.in | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/protobuf-lite.pc.in b/protobuf-lite.pc.in index 29c218e5a3..80f1f46195 100644 --- a/protobuf-lite.pc.in +++ b/protobuf-lite.pc.in @@ -8,6 +8,4 @@ Description: Google's Data Interchange Format Version: @VERSION@ Libs: -L${libdir} -lprotobuf-lite @PTHREAD_CFLAGS@ @PTHREAD_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 +Conflicts: protobuf diff --git a/protobuf.pc.in b/protobuf.pc.in index 29f248773c..490149034d 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