Update to use gtk 2.10.6 and friends.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20188 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.nmake b/Makefile.nmake
index 175397e9ed43c9c255b0fc68a506f9b0ef5e3889..7382378345997891a9f1b550328b4386a822b7ef 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -504,7 +504,14 @@ verify_tools:
 # If you used this setup target before, consider doing a clean_setup.
 setup: verify_tools
     if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
-!IF "$(GTK2_INST_VERSION)" == "2.8"
+!IF "$(GTK2_INST_VERSION)" == "2.10"
+# ran into problems probably due to stuff left in gtk dir, remove it 
+       rm -r $(WIRESHARK_LIBS)/gtk2
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               glib gtk2.10/glib-2.12.6.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               glib gtk2.10/glib-dev-2.12.6.zip
+!ELSEIF "$(GTK2_INST_VERSION)" == "2.8"
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                glib gtk2.8/glib-2.12.4.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
@@ -575,7 +582,22 @@ setup: verify_tools
 !ENDIF
 
 !IFDEF GTK2_DIR
-!IF "$(GTK2_INST_VERSION)" == "2.8"
+!IF "$(GTK2_INST_VERSION)" == "2.10"
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.10/gtk+-2.10.6.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.10/gtk+-dev-2.10.6.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.10/cairo-1.2.6.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.10/cairo-dev-1.2.6.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.10/atk-1.12.3.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.10/atk-dev-1.12.3.zip
+       @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
+               gtk2 gtk2.10/libpng-1.2.8-bin.zip
+!ELSEIF "$(GTK2_INST_VERSION)" == "2.8"
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/gtk+-2.8.20.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
@@ -620,9 +642,9 @@ setup: verify_tools
 !ENDIF
 !IF "$(PANGO_INST_VERSION)" == "1.14"
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.8/pango-1.14.5.zip
+               gtk2 gtk2.10/pango-1.14.8.zip
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
-               gtk2 gtk2.8/pango-dev-1.14.5.zip
+               gtk2 gtk2.10/pango-dev-1.14.8.zip
 !ELSEIF "$(PANGO_INST_VERSION)" == "1.10"
        @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
                gtk2 gtk2.8/pango-1.10.1.zip

diff --git a/config.nmake b/config.nmake
index 17393880f75eb55335815629790cc0549e608240..2aab9c1ce498e744846e09d4426e2260af2562bd 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -14,7 +14,7 @@ VERSION_MINOR=99
 VERSION_MICRO=5
 # It's recommended to change VERSION_EXTRA for your own custom builds
 # e.g. "-SVN-12345"
-VERSION_EXTRA=
+VERSION_EXTRA=-SVN-20180
 
 # The version of the wiretap library (recommended: leave unchanged)
 WTAP_VERSION_MAJOR=0
@@ -64,8 +64,11 @@ GTK2_DIR=$(WIRESHARK_LIBS)\gtk2
 # GTK 2.6 is the mainline since Ethereal 0.10.14
 #GTK2_INST_VERSION=2.6
 #PANGO_INST_VERSION=1.8
-# Support for GTK 2.8 is currently experimental ...
-GTK2_INST_VERSION=2.8
+# Support for GTK 2.8 
+#GTK2_INST_VERSION=2.8
+#PANGO_INST_VERSION=1.14
+# Support for GTK 2.10 is currently experimental ...
+GTK2_INST_VERSION=2.10
 PANGO_INST_VERSION=1.14
 
 #
@@ -438,8 +441,17 @@ GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-2.0.lib \
        $(GTK2_DIR)\lib\pango-1.0.lib \
        $(GLIB_LIBS)
 
+!IF "$(GTK2_INST_VERSION)" == "2.10"
+GTK2_LIB_DIR=2.10.0
+NEED_LIBPNG_DLL=USE
+NEED_CAIRO_DLL=USE
+GTK_WIMP_DIR=DUMMY_TO_USE_WIMP
+GTK_WIMP_DLLSRC_DIR=$(GTK2_DIR)\lib\gtk-2.0\2.10.0\engines
+GTK_WIMP_DLLDST_DIR=lib\gtk-2.0\2.10.0\engines
+GTK_WIMP_RCSRC_DIR=$(GTK2_DIR)\share\themes\MS-Windows\gtk-2.0
+GTK_WIMP_RCDST_DIR=etc\gtk-2.0
+!ELSEIF "$(GTK2_INST_VERSION)" == "2.8"
 # the lib dir of GTK2.6 didn't changed since 2.4.0
-!IF "$(GTK2_INST_VERSION)" == "2.8"
 GTK2_LIB_DIR=2.4.0
 NEED_LIBPNG_DLL=USE
 NEED_CAIRO_DLL=USE

diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index eefc3b53ea833d4945af946ac62f60e9c1ff9902..d4e3b01cef8a90d3935b641f9ab1b13006343298 100755 (executable)
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -4,7 +4,7 @@
 #   http://anonsvn.wireshark.org/wireshark-win32-libs/tags/<date>/packages
 # in order to provide backward compatibility with older trees (e.g. a
 # previous release or an older SVN checkout).
-DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2006-11-12/packages"
+DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2006-12-21/packages"
 
 # Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag.
 #DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"
@@ -78,7 +78,7 @@ case "$1" in
                err_exit "Can't download $DOWNLOAD_PREFIX/$PACKAGE_PATH"
        cd "$DEST_SUBDIR" || err_exit "Can't find $DEST_SUBDIR"
        echo "Extracting $DEST_PATH/$PACKAGE into $DEST_PATH/$DEST_SUBDIR"
-       unzip -oq "$DEST_PATH/$PACKAGE" ||
+       unzip -nq "$DEST_PATH/$PACKAGE" ||
                err_exit "Couldn't unpack $DEST_PATH/$PACKAGE"
        echo "Verifying that the DLLs in $DEST_PATH/$DEST_SUBDIR are executable."
        for i in `/usr/bin/find $DEST_PATH/$DEST_SUBDIR -name \*\.dll` ; do