File wireshark-pkg-config.patch of Package wireshark

Overview Repositories Revisions Requests Users Attributes Meta

File wireshark-pkg-config.patch of Package wireshark (Revision f5881fb1601c3c4d9798ac82852279c9)

Currently displaying revision f5881fb1601c3c4d9798ac82852279c9 , Show latest

---
 Makefile.am     |    4 ++++
 configure.ac    |    1 +
 wireshark.pc.in |   18 ++++++++----------
 3 files changed, 13 insertions(+), 10 deletions(-)

Index: wireshark-2.0.0rc1/Makefile.am
===================================================================
--- wireshark-2.0.0rc1.orig/Makefile.am	2015-10-18 17:01:29.000000000 +0200
+++ wireshark-2.0.0rc1/Makefile.am	2015-10-18 17:01:46.000000000 +0200
@@ -55,6 +55,10 @@ EXTRA_PROGRAMS = wireshark-gtk wireshark
 dist_pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
 	smi_modules ipmap.html pdml2html.xsl
 
+# wireshark.pc is created by configure out of wireshark.pc.in
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = wireshark.pc
+
 #
 # Install global profiles in the "profiles" subdirectory
 #
Index: wireshark-2.0.0rc1/configure.ac
===================================================================
--- wireshark-2.0.0rc1.orig/configure.ac	2015-10-18 17:01:29.000000000 +0200
+++ wireshark-2.0.0rc1/configure.ac	2015-10-18 17:01:46.000000000 +0200
@@ -3095,6 +3095,7 @@ AC_CONFIG_HEADERS(config.h)
 AC_OUTPUT(
   Makefile
   doxygen.cfg
+  wireshark.pc
   asn1/Makefile
   _CUSTOM_ASN1_AC_OUTPUT_
   asn1/acp133/Makefile
Index: wireshark-2.0.0rc1/wireshark.pc.in
===================================================================
--- wireshark-2.0.0rc1.orig/wireshark.pc.in	2015-10-18 17:01:46.000000000 +0200
+++ wireshark-2.0.0rc1/wireshark.pc.in	2015-10-18 17:07:34.000000000 +0200
@@ -1,14 +1,12 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=@ABSOLUTE_CMAKE_INSTALL_LIBDIR@
-sharedlibdir=${libdir}
-includedir=${prefix}/include/wireshark
-plugindir=@PLUGIN_INSTALL_DIR@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: wireshark
 Description: wireshark network packet dissection library
-Version: @PROJECT_VERSION@
+Version: @PACKAGE_VERSION@
 
-Requires:
-Libs: -L${libdir} -L${sharedlibdir} -lwireshark
-Cflags: -I${includedir}
+Requires: glib-2.0 gmodule-2.0
+Libs: -L${libdir} -lwireshark
+Cflags: -I${includedir}/wireshark

Places

File wireshark-pkg-config.patch of Package wireshark (Revision f5881fb1601c3c4d9798ac82852279c9)

Places