[csw-devel] SF.net SVN: gar:[20752] csw/mgar/pkg/wireshark/trunk

[dmichelsen at users.sourceforge.net]

Revision: 20752
          http://gar.svn.sourceforge.net/gar/?rev=20752&view=rev
Author:   dmichelsen
Date:     2013-04-16 13:56:11 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
wireshark/trunk: Update to 1.8.6

Modified Paths:
--------------
    csw/mgar/pkg/wireshark/trunk/Makefile
    csw/mgar/pkg/wireshark/trunk/checksums

Modified: csw/mgar/pkg/wireshark/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wireshark/trunk/Makefile	2013-04-16 13:29:25 UTC (rev 20751)
+++ csw/mgar/pkg/wireshark/trunk/Makefile	2013-04-16 13:56:11 UTC (rev 20752)
@@ -1,5 +1,5 @@
 NAME = wireshark
-VERSION = 1.8.2
+VERSION = 1.8.6
 GARTYPE = v2
 
 DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer
@@ -15,7 +15,6 @@
 #new glib2 only on Solaris 10
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
-
 VENDOR_URL = http://www.wireshark.org/
 
 BUILD_DEP_PKGS += CSWlibgcrypt-dev
@@ -31,7 +30,7 @@
 BUILD_DEP_PKGS += CSWlibkrb5-dev
 BUILD_DEP_PKGS += CSWlibssl-dev
 BUILD_DEP_PKGS += CSWlibgnutls-dev
-# BUILD_DEP_PKGS += CSWlua
+BUILD_DEP_PKGS += CSWliblua5-2
 BUILD_DEP_PKGS += CSWgeoip-dev
 
 # Lua support disabled because luaL_register is checked during autoconf which
@@ -45,29 +44,20 @@
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgpg-error0
 RUNTIME_DEP_PKGS_CSWwireshark += CSWpango
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibz1
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcares2
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibpcap1
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibsmi2
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibkrb5-3
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibk5crypto3
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgnutls26
-# RUNTIME_DEP_PKGS_CSWwireshark += CSWlua
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcairo2
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgeoip1
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibatk1-0-0
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgthread2-0-0
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgmodule2-0-0
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgdk-x11-2-0-0
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgdk-pixbuf2-0-0
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgtk-x11-2-0-0
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgtk-x11-2-0-0
 
 # No more library splitting unless absolutely necessary
 CHECKPKG_OVERRIDES_CSWwireshark += shared-lib-package-contains-so-symlink
@@ -93,9 +83,12 @@
 
 # Do not use LD_OPTIONS as it leads to the new version being built against old
 # wireshark private libs
-LD_OPTIONS =
-EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
+#LD_OPTIONS =
+#EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
 
+# This is now deprecated in Pango, use workaround until Pango is updated
+EXTRA_CFLAGS += -DG_CONST_RETURN=const
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-usr-local=no
 CONFIGURE_ARGS += --with-ssl=/opt/csw

Modified: csw/mgar/pkg/wireshark/trunk/checksums
===================================================================
--- csw/mgar/pkg/wireshark/trunk/checksums	2013-04-16 13:29:25 UTC (rev 20751)
+++ csw/mgar/pkg/wireshark/trunk/checksums	2013-04-16 13:56:11 UTC (rev 20752)
@@ -1 +1 @@
-5e3ea7eed50dace479e12f49d24506f4  wireshark-1.8.2.tar.bz2
+317361e701936c72f7f18f857059b944  wireshark-1.8.6.tar.bz2

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.