Disable GTK+ by default.
authorGerald Combs <gerald@wireshark.org>
Tue, 18 Oct 2016 08:16:39 +0000 (10:16 +0200)
committerJörg Mayer <jmayer@loplof.de>
Wed, 19 Oct 2016 20:35:31 +0000 (20:35 +0000)
I suggested disabling GTK+ by default at Sharkfest EU and no one
objected, hence this patch.

Disable it by default in both Autotools and CMake. Make sure it's
enabled for Debian packaging. The RPM packaging enables GTK3 explicitly
so no change appears to be necessary there.

Change-Id: If5daeaef4bb26cf60006bc8883be15b2cf6c6ae4
Reviewed-on: https://code.wireshark.org/review/18256
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
.travis.yml
CMakeOptions.txt
configure.ac
debian/rules
docbook/release-notes.asciidoc

index 1a1f8ca59a58f022318c985fb7f13efd306fd5b7..8c1ce4917d6f8130f379fa028814873024f0f12c 100644 (file)
@@ -10,6 +10,8 @@ compiler:
 env:
  - BUILD_CMAKE=no
  - BUILD_CMAKE=yes
+ - CMAKE_GTK_OPTS="-DBUILD_wireshark_gtk=ON"
+ - AUTOTOOLS_GTK_OPTS="--with-gtk=3"
 
 matrix:
   exclude:
@@ -35,6 +37,6 @@ before_install:
 #  - sudo apt-get -qq install qt5-default qttools5-dev qttools5-dev-tools
   - $CC --version
 before_script:
-  if [ ${BUILD_CMAKE} == "yes" ]; then mkdir build && cd build && cmake ..; else ./autogen.sh && ./configure ; fi
+  if [ ${BUILD_CMAKE} == "yes" ]; then mkdir build && cd build && cmake ${CMAKE_GTK_OPTS} ..; else ./autogen.sh && ./configure ${AUTOTOOLS_GTK_OPTS} ; fi
 script:
   - make
index 00351ed49c84e8d22a43c8a95f6b4e868f8f4e8b..f1aacd098f84fafd6438e7266f9133eab5433d77 100644 (file)
@@ -1,7 +1,7 @@
 # Build options for use by CMake
 
 option(BUILD_wireshark     "Build Wireshark" ON)
-option(BUILD_wireshark_gtk "Build Wireshark (GTK+ UI)" ON)
+option(BUILD_wireshark_gtk "Build Wireshark (GTK+ UI)" OFF)
 option(BUILD_tshark        "Build tshark" ON)
 option(BUILD_tfshark       "Build tfshark" ON)
 option(BUILD_rawshark      "Build rawshark" ON)
index 378477a1de72b4508aa0f1ce95dfdc3e7e9f8863..5a0cede700bf0e09584501210b3624f8d3026274 100644 (file)
@@ -256,14 +256,14 @@ AC_ARG_WITH([qt],
 
 AC_ARG_WITH([gtk],
   AC_HELP_STRING( [--with-gtk=@<:@yes/no/2/3@:>@],
-       [use GTK+ @<:@default=yes, if available@:>@]),
+       [use GTK+ @<:@default=no@:>@]),
        AS_CASE([$withval],
          [yes], [with_gtk="3 2 fail"],
          [no],  [with_gtk="no"],
          [3],   [with_gtk="3 fail3"],
          [2],   [with_gtk="2 fail2"],
          [AC_MSG_ERROR([--with-gtk must be one of yes/no/2/3])]),
-       with_gtk="3 2")
+       with_gtk="no")
 
 # GnuTLS
 # Version 3.0 switched from LGPLv2.1+ to LGPLv3+, then switched back to
index b2dadddd350a349ca70ba994fc9e8778a9b1feef..baf321c715610cb7000592db75364e0176e04d36 100755 (executable)
@@ -28,6 +28,7 @@ export docdir = /usr/share/doc/wireshark-doc
 
 override_dh_auto_configure:
        dh_auto_configure -- -DENABLE_HTML_GUIDES=ON -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
+       -DBUILD_wireshark_gtk=ON \
 #      -DENABLE_QT5=OFF
 
 override_dh_auto_build:
index 9bd215816f4a8dfaf133ab1a2418c0b2ad20cf00..a9594fb84fd26c5d4448377f5577428f928e3457 100644 (file)
@@ -32,6 +32,7 @@ since version 2.2.0:
   That is, you should make sure the NSIS package is completely uninstalled before
   installing the Windows Installer package and vice-versa.
 * Source packages are now compressed using xz instead of bzip2.
+* GTK+ is disabled by default in Autotools and CMake.
 
 //=== Removed Dissectors