| 1 |
jer 15/07/25 07:02:35 |
| 2 |
|
| 3 |
Modified: wireshark-99999999-pkgconfig.patch |
| 4 |
Added: wireshark-1.99.8-qtchooser.patch |
| 5 |
Log: |
| 6 |
Version bump. |
| 7 |
|
| 8 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.4 net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch?rev=1.4&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch?rev=1.4&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch?r1=1.3&r2=1.4 |
| 16 |
|
| 17 |
Index: wireshark-99999999-pkgconfig.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch,v |
| 20 |
retrieving revision 1.3 |
| 21 |
retrieving revision 1.4 |
| 22 |
diff -u -r1.3 -r1.4 |
| 23 |
--- wireshark-99999999-pkgconfig.patch 13 Apr 2015 17:29:19 -0000 1.3 |
| 24 |
+++ wireshark-99999999-pkgconfig.patch 25 Jul 2015 07:02:35 -0000 1.4 |
| 25 |
@@ -1,23 +1,21 @@ |
| 26 |
--- a/configure.ac |
| 27 |
+++ b/configure.ac |
| 28 |
-@@ -242,9 +242,10 @@ |
| 29 |
+@@ -242,7 +242,7 @@ |
| 30 |
# This is referenced via AC_REQUIRE([PKG_PROG_PKG_CONFIG] in some macros |
| 31 |
# like PKG_CHECK_MODULES. If the first call to such a macro is under an |
| 32 |
# "if" statement, it's safer to call PKG_PROG_PKG_CONFIG directly, see |
| 33 |
-# the comments in acolocal.m4 |
| 34 |
+# the comments in aclocal.m4 |
| 35 |
# |
| 36 |
- PKG_PROG_PKG_CONFIG |
| 37 |
-+ |
| 38 |
- if test -z "$PKG_CONFIG"; then |
| 39 |
- AC_MSG_ERROR(I couldn't find pkg-config; make sure it's installed and in your path) |
| 40 |
- fi |
| 41 |
-@@ -1918,6 +1919,18 @@ |
| 42 |
+ # We want version 0.7 or better. (XXX - explain why. Is that just |
| 43 |
+ # because our Qt tests were originally based on AM_PATH_GTK, and *it* |
| 44 |
+@@ -1910,6 +1910,19 @@ |
| 45 |
AC_SUBST(plugins_dir) |
| 46 |
|
| 47 |
# |
| 48 |
+# Find out where to store wireshark.pc and what should be in it |
| 49 |
+# |
| 50 |
++ |
| 51 |
+PKG_INSTALLDIR |
| 52 |
+ |
| 53 |
+AC_SUBST(CMAKE_INSTALL_PREFIX,[$prefix]) |
| 54 |
@@ -31,7 +29,7 @@ |
| 55 |
# If we have <dlfcn.h>, check whether we have dladdr. |
| 56 |
# |
| 57 |
if test "$ac_cv_header_dlfcn_h" = "yes" |
| 58 |
-@@ -3086,10 +3099,15 @@ |
| 59 |
+@@ -3080,10 +3093,15 @@ |
| 60 |
sinclude(asn1/Custom.m4) dnl |
| 61 |
ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
|
| 66 |
1.1 net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch |
| 67 |
|
| 68 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch?rev=1.1&view=markup |
| 69 |
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 |
| 70 |
|
| 71 |
Index: wireshark-1.99.8-qtchooser.patch |
| 72 |
=================================================================== |
| 73 |
--- a/acinclude.m4 |
| 74 |
+++ b/acinclude.m4 |
| 75 |
@@ -2149,7 +2149,6 @@ |
| 76 |
# -qt={version} argument, otherwise we look for particular |
| 77 |
# tool versions using tool name suffixes. |
| 78 |
# |
| 79 |
- AC_PATH_PROG(QTCHOOSER, qtchooser) |
| 80 |
if test ! -z "$QTCHOOSER"; then |
| 81 |
# |
| 82 |
# We found qtchooser; we assume that means that |
Archives