commit 8385ebc1659188e4116b4ae090022a58a72ed4c1
author Gustavo Zacarias <gustavo@zacarias.com.ar> Thu Sep 04 17:50:38 2014 -0300
committer Peter Korsgaard <peter@korsgaard.com> Fri Sep 05 13:00:14 2014 +0200
tree 241b4031bedd1f755006c1f1fdbde7e88cf6211d
parent eed29f35c99b0a733d72028a95d9c8ff09e01c1a

wireshark: bump to version 1.12.0

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

package/wireshark/wireshark-0001-fix-wrong-cflags-for-build-assumption.patch

diff --git a/package/wireshark/wireshark-0001-fix-wrong-cflags-for-build-assumption.patch b/package/wireshark/wireshark-0001-fix-wrong-cflags-for-build-assumption.patch
index de30c81..14cb957 100644
--- a/package/wireshark/wireshark-0001-fix-wrong-cflags-for-build-assumption.patch
+++ b/package/wireshark/wireshark-0001-fix-wrong-cflags-for-build-assumption.patch
@@ -11,30 +11,28 @@
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
-diff -Nura wireshark-1.10.3.orig/acinclude.m4 wireshark-1.10.3/acinclude.m4
---- wireshark-1.10.3.orig/acinclude.m4	2013-12-04 14:06:44.986074426 -0300
-+++ wireshark-1.10.3/acinclude.m4	2013-12-04 14:25:36.496356791 -0300
-@@ -1664,11 +1664,6 @@
-                             # the saved value plus just the new option.
-                             #
-                             CFLAGS="$CFLAGS_saved $GCC_OPTION"
--                            #
--                            # Add it to the flags we use when building
--                            # build tools.
--                            #
--                            CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
-                             if test "$2" != C ; then
-                               #
-                               # Add it to the C++ flags as well.
-@@ -1687,11 +1682,6 @@
-                         # the saved value plus just the new option.
-                         #
-                         CFLAGS="$CFLAGS_saved $GCC_OPTION"
--                        #
--                        # Add it to the flags we use when building
--                        # build tools.
--                        #
--                        CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
-                         if test "$2" != C ; then
-                           #
-                           # Add it to the C++ flags as well.
+diff -Nura wireshark-1.12.0.orig/acinclude.m4 wireshark-1.12.0/acinclude.m4
+--- wireshark-1.12.0.orig/acinclude.m4	2014-09-04 15:45:38.365255309 -0300
++++ wireshark-1.12.0/acinclude.m4	2014-09-04 15:46:23.349810353 -0300
+@@ -1755,10 +1755,6 @@
+               # just the new option.
+               #
+               CFLAGS="$CFLAGS_saved $GCC_OPTION"
+-              #
+-              # Add it to the flags we use when building build tools.
+-              #
+-              CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
+             ],
+             [
+               AC_MSG_RESULT(yes)
+@@ -1771,10 +1767,6 @@
+           # just the new option.
+           #
+           CFLAGS="$CFLAGS_saved $GCC_OPTION"
+-          #
+-          # Add it to the flags we use when building build tools.
+-          #
+-          CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
+         fi
+       ],
+       [