jer 15/07/25 07:02:35 Modified: wireshark-99999999-pkgconfig.patch Added: wireshark-1.99.8-qtchooser.patch Log: Version bump. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.4 net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch?r1=1.3&r2=1.4 Index: wireshark-99999999-pkgconfig.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- wireshark-99999999-pkgconfig.patch 13 Apr 2015 17:29:19 -0000 1.3 +++ wireshark-99999999-pkgconfig.patch 25 Jul 2015 07:02:35 -0000 1.4 @@ -1,23 +1,21 @@ --- a/configure.ac +++ b/configure.ac -@@ -242,9 +242,10 @@ +@@ -242,7 +242,7 @@ # This is referenced via AC_REQUIRE([PKG_PROG_PKG_CONFIG] in some macros # like PKG_CHECK_MODULES. If the first call to such a macro is under an # "if" statement, it's safer to call PKG_PROG_PKG_CONFIG directly, see -# the comments in acolocal.m4 +# the comments in aclocal.m4 # - PKG_PROG_PKG_CONFIG -+ - if test -z "$PKG_CONFIG"; then - AC_MSG_ERROR(I couldn't find pkg-config; make sure it's installed and in your path) - fi -@@ -1918,6 +1919,18 @@ + # We want version 0.7 or better. (XXX - explain why. Is that just + # because our Qt tests were originally based on AM_PATH_GTK, and *it* +@@ -1910,6 +1910,19 @@ AC_SUBST(plugins_dir) # +# Find out where to store wireshark.pc and what should be in it +# ++ +PKG_INSTALLDIR + +AC_SUBST(CMAKE_INSTALL_PREFIX,[$prefix]) @@ -31,7 +29,7 @@ # If we have <dlfcn.h>, check whether we have dladdr. # if test "$ac_cv_header_dlfcn_h" = "yes" -@@ -3086,10 +3099,15 @@ +@@ -3080,10 +3093,15 @@ sinclude(asn1/Custom.m4) dnl ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl 1.1 net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch?rev=1.1&content-type=text/plain Index: wireshark-1.99.8-qtchooser.patch =================================================================== --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2149,7 +2149,6 @@ # -qt={version} argument, otherwise we look for particular # tool versions using tool name suffixes. # - AC_PATH_PROG(QTCHOOSER, qtchooser) if test ! -z "$QTCHOOSER"; then # # We found qtchooser; we assume that means that
