Blame SOURCES/wireshark-1.10.x-ftbfs-glib2.patch

dbc6ab
diff --git a/CMakeLists.txt b/CMakeLists.txt
dbc6ab
index e6b8e46..f308c12 100644
dbc6ab
--- a/CMakeLists.txt
dbc6ab
+++ b/CMakeLists.txt
dbc6ab
@@ -183,7 +183,6 @@ if(ENABLE_EXTRA_GCC_CHECKS)   # This overrides -Werror
dbc6ab
 endif()
dbc6ab
 
dbc6ab
 add_definitions(
dbc6ab
-	-DG_DISABLE_DEPRECATED
dbc6ab
 	-DG_DISABLE_SINGLE_INCLUDES
dbc6ab
 )
dbc6ab
 
dbc6ab
diff --git a/configure.ac b/configure.ac
dbc6ab
index cf593db..4e2f0d2 100644
dbc6ab
--- a/configure.ac
dbc6ab
+++ b/configure.ac
dbc6ab
@@ -1474,14 +1474,6 @@ then
dbc6ab
 fi
dbc6ab
 AC_SUBST(MOC)
dbc6ab
 
dbc6ab
-# Error out if a glib header other than a "top level" header
dbc6ab
-#  (glib.h, glib-object.h, gio.h) or certain other headers( e.g.,gmodule.h)
dbc6ab
-#  is used.
dbc6ab
-CPPFLAGS="-DG_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
dbc6ab
-
dbc6ab
-# Error out on the usage of deprecated glib functions
dbc6ab
-CPPFLAGS="-DG_DISABLE_DEPRECATED $CPPFLAGS"
dbc6ab
-
dbc6ab
 #
dbc6ab
 # Check whether GLib modules are supported, to determine whether we
dbc6ab
 # can support plugins.