osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Update to use the latest gtk 2.8 glib and pango libraries. 

Note from a mail on gtk dev list:
-rwxr-xr-x    1 tml      Administ   224510 Oct  3 18:35 libpango-1.0-0.dll
-rwxr-xr-x    1 tml      Administ    37952 Oct  3 18:35 libpangocairo-1.0-0.dll
-rwxr-xr-x    1 tml      Administ    58749 Oct  3 18:35 libpangowin32-1.0-0.dll

(That's the relevant DLLs from the "bin" folder in Pango 1.14.5, where
the module(s) are built-in into the DLLs, so no
lib/pango/1.5.0/modules folder is needed.)

svn path=/trunk/; revision=19880
This commit is contained in:
Anders Broman 2006-11-12 22:18:50 +00:00
parent 63cd996fa5
commit 09bd61c233
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile.nmake
View File

@ -505,9 +505,9 @@ verify_tools:
setup: verify_tools
!IF "$(GTK2_INST_VERSION)" == "2.8"
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
glib gtk2.8/glib-2.12.1.zip
glib gtk2.8/glib-2.12.4.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
glib gtk2.8/glib-dev-2.12.1.zip
glib gtk2.8/glib-dev-2.12.4.zip
!ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
glib gtk2.6/glib-2.6.6.zip
@ -580,9 +580,9 @@ setup: verify_tools
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.8/gtk+-dev-2.8.20.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.8/cairo-1.2.2.zip
gtk2 gtk2.8/cairo-1.2.6.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.8/cairo-dev-1.2.2.zip
gtk2 gtk2.8/cairo-dev-1.2.6.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.8/atk-1.10.3.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
@ -617,11 +617,11 @@ setup: verify_tools
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2/atk-dev-1.4.0.zip
!ENDIF
!IF "$(PANGO_INST_VERSION)" == "1.12"
!IF "$(PANGO_INST_VERSION)" == "1.14"
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.8/pango-1.12.3.zip
gtk2 gtk2.8/pango-1.14.5.zip
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.8/pango-dev-1.12.3.zip
gtk2 gtk2.8/pango-dev-1.14.5.zip
!ELSEIF "$(PANGO_INST_VERSION)" == "1.10"
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
gtk2 gtk2.8/pango-1.10.1.zip
@ -804,14 +804,14 @@ install-deps2: install-common-deps2
if not exist $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR) mkdir $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)
if not exist $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders mkdir $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders
if not exist $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules mkdir $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules
if not exist $(INSTALL2_DIR)\lib\pango mkdir $(INSTALL2_DIR)\lib\pango
if not exist $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR) mkdir $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)
if not exist $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules mkdir $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules
# if not exist $(INSTALL2_DIR)\lib\pango mkdir $(INSTALL2_DIR)\lib\pango
# if not exist $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR) mkdir $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)
# if not exist $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules mkdir $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules
xcopy $(GTK2_DIR)\etc\gtk-2.0\*.* $(INSTALL2_DIR)\etc\gtk-2.0 /d
xcopy $(GTK2_DIR)\etc\pango\pango.* $(INSTALL2_DIR)\etc\pango /d
xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders\libpixbufloader-*.dll $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\loaders /d
xcopy $(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules\im-*.dll $(INSTALL2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\immodules /d
xcopy $(GTK2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules\pango-*.dll $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules /d
# xcopy $(GTK2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules\pango-*.dll $(INSTALL2_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules /d
!IFDEF NEED_LIBPNG_DLL
xcopy $(GTK2_DIR)\bin\libpng13.dll $(INSTALL2_DIR) /d
!ENDIF

4
config.nmake
View File

@ -66,7 +66,7 @@ GTK2_DIR=$(WIRESHARK_LIBS)\gtk2
#PANGO_INST_VERSION=1.8
# Support for GTK 2.8 is currently experimental ...
GTK2_INST_VERSION=2.8
PANGO_INST_VERSION=1.12
PANGO_INST_VERSION=1.14
#
# If you have GTK-Wimp, set this to the pathname of the directory in
@ -446,7 +446,7 @@ GTK_THEME_DIR=$(GTK_WIMP_DIR)\Theme\gtk-2.0
!ENDIF
# the lib dir of PANGO changed in 1.12
!IF "$(PANGO_INST_VERSION)" == "1.12"
!IF "$(PANGO_INST_VERSION)" == "1.14"
PANGO_LIB_DIR=1.5.0
!ELSEIF "$(PANGO_INST_VERSION)" == "1.10"
PANGO_LIB_DIR=1.4.0

5
packaging/nsis/wireshark.nsi
View File

@ -666,8 +666,9 @@ SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\loaders
File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_LIB_DIR}\loaders\libpixbufloader-*.dll"
SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\immodules
File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_LIB_DIR}\immodules\im-*.dll"
SetOutPath $INSTDIR\lib\pango\${PANGO_LIB_DIR}\modules
File "${GTK2_DIR}\lib\pango\${PANGO_LIB_DIR}\modules\pango-*.dll"
# Not needed with pango 1.14.5
#SetOutPath $INSTDIR\lib\pango\${PANGO_LIB_DIR}\modules
#File "${GTK2_DIR}\lib\pango\${PANGO_LIB_DIR}\modules\pango-*.dll"
SectionEnd

5
tools/win32-setup.sh
View File

@ -4,7 +4,10 @@
# 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-26/packages"
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2006-11-12/packages"
# Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag.
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"
err_exit () {
echo ""