Wireshark-dev: [Wireshark-dev] Problems to Update GTK2/Glib in 1.0.4

From: "Anders Broman" <a.broman@xxxxxxxxx>
Date: Tue, 7 Oct 2008 21:34:23 +0200

Hi,
Couldn't glib for gtk1 and gtk2 be separated.
Would something like this work? Or isn't it worth the effort?
Regards
Anders
P.S The installer might need some work too.

Index: Makefile.nmake
===================================================================
--- Makefile.nmake      (revision 26371)
+++ Makefile.nmake      (working copy)
@@ -687,6 +687,12 @@
                gtk+ gtk+-dev-1.3.0-20030115.zip
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)"
\
                glib-gtk1-hack gtk2.12/glib-2.14.5.zip
+# This is the latest possible glib that can be used with GTK1 do not update
+       @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)"
\
+               gtk1-glib gtk2.12/glib-2.14.6-2.zip
+       @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)"
\
+               gtk1-glib glib gtk2.12/glib-dev-2.14.6-2.zip
+
 !ENDIF
 !IFDEF ICONV_DIR
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)"
\
@@ -1048,6 +1054,8 @@
        set INSTALL_DIR=$(INSTALL1_DIR)
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-common-deps
        xcopy $(GLIB_GTK1_HACK_DIR)\bin\libgmodule-2.0-0.dll $(INSTALL1_DIR)
/d
+       xcopy $(GLIB_GTK1_DIR)\bin\libglib-2.0-0.dll $(INSTALL_DIR) /d
+       xcopy $(GLIB_GTK1_DIR)\bin\libgobject-2.0-0.dll $(INSTALL_DIR) /d
 !ENDIF

 install-common-deps2:
@@ -1057,13 +1065,13 @@
 # This should be moved back to install-common-deps if we ever drop
 # GTK+1 support.
        xcopy $(GLIB_DIR)\bin\libgmodule-2.0-0.dll $(INSTALL2_DIR) /d
+       xcopy $(GLIB_DIR)\bin\libglib-2.0-0.dll $(INSTALL_DIR) /d
+       xcopy $(GLIB_DIR)\bin\libgobject-2.0-0.dll $(INSTALL_DIR) /d
 !ENDIF

 install-common-deps:
        set copycmd=/y
        if not exist $(INSTALL_DIR) mkdir $(INSTALL_DIR)
-       xcopy $(GLIB_DIR)\bin\libglib-2.0-0.dll $(INSTALL_DIR) /d
-       xcopy $(GLIB_DIR)\bin\libgobject-2.0-0.dll $(INSTALL_DIR) /d
 !IFDEF ICONV_DIR
        xcopy $(ICONV_DIR)\bin\iconv.dll $(INSTALL_DIR) /d
 !ENDIF

Index: config.nmake
===================================================================
--- config.nmake        (revision 26371)
+++ config.nmake        (working copy)
@@ -114,6 +114,7 @@
 GLIB_VERSION=2.0
 GLIB_DIR=$(WIRESHARK_LIBS)\glib
 GLIB_GTK1_HACK_DIR=$(WIRESHARK_LIBS)\glib-gtk1-hack
+GLIB_GTK1_DIR=$(WIRESHARK_LIBS)\gtk1-glib

 #
 # Mandatory: GTK (& related) settings