[141357] trunk/dports/net/wireshark

ricci at macports.org ricci at macports.org
Sat Dec 12 01:11:24 PST 2015


Revision: 141357
          https://trac.macports.org/changeset/141357
Author:   ricci at macports.org
Date:     2015-10-15 21:03:20 -0700 (Thu, 15 Oct 2015)
Log Message:
-----------
net/wireshark:
	upgrade to 1.12.8
		remove unneeded patchfile for pixmap-fix
	add '--disable-osx-deploy-target' to configure.args to resolve #47168 per comment by raimue@
	remove lua from default variants as wireshark and lua5.3 don't work together, avoids #48835

Modified Paths:
--------------
    trunk/dports/net/wireshark/Portfile

Removed Paths:
-------------
    trunk/dports/net/wireshark/files/patch-configure.pixmap-fix.diff

Modified: trunk/dports/net/wireshark/Portfile
===================================================================
--- trunk/dports/net/wireshark/Portfile	2015-10-16 03:15:16 UTC (rev 141356)
+++ trunk/dports/net/wireshark/Portfile	2015-10-16 04:03:20 UTC (rev 141357)
@@ -2,7 +2,7 @@
 
 PortSystem 1.0
 name		wireshark
-version		1.12.7
+version		1.12.8
 revision	0
 categories	net
 license		{GPL-2 GPL-3}
@@ -19,16 +19,15 @@
 master_sites	http://www.wireshark.org/download/src/			\
 		http://www.wireshark.org/download/src/all-versions/
 
-checksums           md5	    c8ae53f648b1dcbf6e74495401a0f1ab \
-                    sha1    bed365bacfd0b5c653d8568ad25e52957659bd9f \
-                    rmd160  4a36875d9203112045c41a9adf312b0a4f83bd49
+checksums           md5	    988a4595a4a87dafb3c4870ea40e89b5 \
+                    sha1    d8c23120525a2f3505e822b7684e7367bcd0ba70 \
+                    rmd160  bf87fd1e3404d04f6123d09798b46ea5b2af49e9
 
 use_bzip2	yes
 
 conflicts	wireshark-devel
 
-patchfiles	patch-configure.diff	\
-			patch-configure.pixmap-fix.diff
+patchfiles	patch-configure.diff
 
 depends_build 		\
 		port:pkgconfig
@@ -43,6 +42,7 @@
 		port:zlib
 
 configure.args	\
+		--disable-osx-deploy-target \
 		--without-libsmi \
 		--disable-usr-local \
 		--without-adns \
@@ -66,7 +66,7 @@
 
 configure.ldflags-append "-Wl,-search_paths_first"
 
-default_variants +gnutls +libgcrypt +ipv6 +lua +libsmi +geoip +rtp +ssl
+default_variants +gnutls +libgcrypt +ipv6 +libsmi +geoip +rtp +ssl
 
 if {![variant_isset qt] && ![variant_isset gtk3]} {
 	default_variants	+x11

Deleted: trunk/dports/net/wireshark/files/patch-configure.pixmap-fix.diff
===================================================================
--- trunk/dports/net/wireshark/files/patch-configure.pixmap-fix.diff	2015-10-16 03:15:16 UTC (rev 141356)
+++ trunk/dports/net/wireshark/files/patch-configure.pixmap-fix.diff	2015-10-16 04:03:20 UTC (rev 141357)
@@ -1,14 +0,0 @@
---- configure.old	2015-03-04 16:56:11.000000000 +1300
-+++ configure	2015-03-04 17:08:33.000000000 +1300
-@@ -31054,7 +31054,10 @@
- if test "$have_gtk" = "yes" ; then
- 	# If we have GTK then add flags for it.
- 
--	CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
-+	# 2015-03-04 - disabled to fix SegFault, see
-+	# https://trac.macports.org/ticket/46850
-+	# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=195980#c45
-+	#CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
- 	CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
- 	if test \( $gtk_config_major_version -eq 3 -a $gtk_config_minor_version -ge 10 \) ; then
- 		## Allow use of deprecated & disable deprecated warnings if Gtk >= 3.10;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/78b60f1f/attachment.html>


More information about the macports-changes mailing list