public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark/files: wireshark-1.8.0-underlinking.patch
@ 2012-06-27 20:35 Justin Lecher (jlec)
  0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher (jlec) @ 2012-06-27 20:35 UTC (permalink / raw
  To: gentoo-commits

jlec        12/06/27 20:35:33

  Added:                wireshark-1.8.0-underlinking.patch
  Log:
  Add fix for underlinking because of gmodule-2 being removed from glibs pkg-config, detected by gold
  
  (Portage version: 2.2.0_alpha113/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch?rev=1.1&content-type=text/plain

Index: wireshark-1.8.0-underlinking.patch
===================================================================
 Makefile.am |    1 +
 Makefile.in |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2bf4898..3ffa6a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -333,6 +333,7 @@ wireshark_LDADD = \
 	@LIBGNUTLS_LIBS@		\
 	@LIBSMI_LDFLAGS@		\
 	@PORTAUDIO_LIBS@		\
+	@GLIB_LIBS@			\
 	@GTK_LIBS@ -lm
 
 wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
diff --git a/Makefile.in b/Makefile.in
index a7c8474..c94ebc9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1051,6 +1051,7 @@ wireshark_LDADD = \
 	@LIBGNUTLS_LIBS@		\
 	@LIBSMI_LDFLAGS@		\
 	@PORTAUDIO_LIBS@		\
+	@GLIB_LIBS@				\
 	@GTK_LIBS@ -lm
 
 wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)






^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark/files: wireshark-1.8.0-underlinking.patch
@ 2012-06-27 21:04 Jeroen Roovers (jer)
  0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers (jer) @ 2012-06-27 21:04 UTC (permalink / raw
  To: gentoo-commits

jer         12/06/27 21:04:43

  Modified:             wireshark-1.8.0-underlinking.patch
  Log:
  Clean up patch.
  
  (Portage version: 2.2.0_alpha113/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch?r1=1.1&r2=1.2

Index: wireshark-1.8.0-underlinking.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wireshark-1.8.0-underlinking.patch	27 Jun 2012 20:35:33 -0000	1.1
+++ wireshark-1.8.0-underlinking.patch	27 Jun 2012 21:04:43 -0000	1.2
@@ -1,10 +1,3 @@
- Makefile.am |    1 +
- Makefile.in |    1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 2bf4898..3ffa6a3 100644
---- a/Makefile.am
 +++ b/Makefile.am
 @@ -333,6 +333,7 @@ wireshark_LDADD = \
  	@LIBGNUTLS_LIBS@		\
@@ -14,15 +7,3 @@
  	@GTK_LIBS@ -lm
  
  wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
-diff --git a/Makefile.in b/Makefile.in
-index a7c8474..c94ebc9 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1051,6 +1051,7 @@ wireshark_LDADD = \
- 	@LIBGNUTLS_LIBS@		\
- 	@LIBSMI_LDFLAGS@		\
- 	@PORTAUDIO_LIBS@		\
-+	@GLIB_LIBS@				\
- 	@GTK_LIBS@ -lm
- 
- wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark/files: wireshark-1.8.0-underlinking.patch
@ 2012-06-27 21:11 Jeroen Roovers (jer)
  0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers (jer) @ 2012-06-27 21:11 UTC (permalink / raw
  To: gentoo-commits

jer         12/06/27 21:11:04

  Modified:             wireshark-1.8.0-underlinking.patch
  Log:
  Er, put back eautoreconf.
  
  (Portage version: 2.2.0_alpha113/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch?r1=1.2&r2=1.3

Index: wireshark-1.8.0-underlinking.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.8.0-underlinking.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wireshark-1.8.0-underlinking.patch	27 Jun 2012 21:04:43 -0000	1.2
+++ wireshark-1.8.0-underlinking.patch	27 Jun 2012 21:11:04 -0000	1.3
@@ -1,3 +1,4 @@
+--- a/Makefile.am
 +++ b/Makefile.am
 @@ -333,6 +333,7 @@ wireshark_LDADD = \
  	@LIBGNUTLS_LIBS@		\






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark/files: wireshark-1.8.0-underlinking.patch
@ 2012-07-25 21:07 Jeroen Roovers (jer)
  0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers (jer) @ 2012-07-25 21:07 UTC (permalink / raw
  To: gentoo-commits

jer         12/07/25 21:07:41

  Removed:              wireshark-1.8.0-underlinking.patch
  Log:
  Vulnerable.
  
  (Portage version: 2.2.0_alpha120/cvs/Linux x86_64)


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-07-25 21:07 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-27 20:35 [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark/files: wireshark-1.8.0-underlinking.patch Justin Lecher (jlec)
  -- strict thread matches above, loose matches on Subject: below --
2012-06-27 21:04 Jeroen Roovers (jer)
2012-06-27 21:11 Jeroen Roovers (jer)
2012-07-25 21:07 Jeroen Roovers (jer)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox