aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2006-11-12 22:18:50 +0000
committerAnders Broman <anders.broman@ericsson.com>2006-11-12 22:18:50 +0000
commit09bd61c23374adcb04dce0e801fd5a58b7632ea9 (patch)
treef0e8c5cc1668bff40fd4ac6d850dbdca9dee3fd6 /packaging
parent63cd996fa59bbbcd25d536153e77c4e9e51f5046 (diff)
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
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/wireshark.nsi5
1 files changed, 3 insertions, 2 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 079ab1c549..d75d9e8ce4 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -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