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

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