diff options
| author | Alexander Aring <aar@pengutronix.de> | 2016-04-27 17:54:23 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-17 08:28:47 +0200 |
| commit | 6dc79422db37e82982f3f3a6bbbfd7888a896238 (patch) | |
| tree | fa0eacb4e2859305035ae83ac489636b9545ff37 /patches | |
| parent | 3bb02472422390ea508ddf5b7a05b3ed9173361f (diff) | |
| download | ptxdist-6dc79422db37e82982f3f3a6bbbfd7888a896238.tar.gz ptxdist-6dc79422db37e82982f3f3a6bbbfd7888a896238.tar.xz | |
wireshark: version bump 1.10.6 -> 2.0.3
Signed-off-by: Alexander Aring <aar@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/wireshark-2.0.3/0001-help_url-add-forgotten-HAVE_EXTCAP.patch | 25 | ||||
| -rw-r--r-- | patches/wireshark-2.0.3/series | 4 |
2 files changed, 29 insertions, 0 deletions
diff --git a/patches/wireshark-2.0.3/0001-help_url-add-forgotten-HAVE_EXTCAP.patch b/patches/wireshark-2.0.3/0001-help_url-add-forgotten-HAVE_EXTCAP.patch new file mode 100644 index 000000000..01f0714dd --- /dev/null +++ b/patches/wireshark-2.0.3/0001-help_url-add-forgotten-HAVE_EXTCAP.patch @@ -0,0 +1,25 @@ +From: Alexander Aring <aar@pengutronix.de> +Date: Wed, 27 Apr 2016 16:51:08 +0200 +Subject: [PATCH] help_url: add forgotten HAVE_EXTCAP + +Signed-off-by: Alexander Aring <aar@pengutronix.de> +--- + ui/help_url.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ui/help_url.c b/ui/help_url.c +index 7a2b9a026e1c..144eb9855f4c 100644 +--- a/ui/help_url.c ++++ b/ui/help_url.c +@@ -265,9 +265,11 @@ topic_action_url(topic_action_e action) + case(HELP_EXPERT_INFO_DIALOG): + url = user_guide_url("ChAdvExpert.html"); + break; ++#if HAVE_EXTCAP + case(HELP_EXTCAP_OPTIONS_DIALOG): + url = user_guide_url("ChExtcapOptions.html"); + break; ++#endif + case(HELP_STATS_SUMMARY_DIALOG): + url = user_guide_url("ChStatSummary.html"); + break; diff --git a/patches/wireshark-2.0.3/series b/patches/wireshark-2.0.3/series new file mode 100644 index 000000000..5c72479f6 --- /dev/null +++ b/patches/wireshark-2.0.3/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-help_url-add-forgotten-HAVE_EXTCAP.patch +# 71fce02a9deb431a1f0a2c4d041df890 - git-ptx-patches magic |