osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
41,231 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

506 Commits

Author SHA1 Message Date
Anders Broman e6e6d6217b From Tony Trinh: 
Update Lua from 5.1 to 5.2

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400

svn path=/trunk/; revision=43482
 2012-06-25 20:42:07 +00:00
Jörg Mayer 41232f172e Remove HAVE_WIRELESS_TOOLBAR from the other build systems. 
svn path=/trunk/; revision=43419
 2012-06-20 19:11:55 +00:00
Anders Broman 227eb36c83 Start to have an generic wireless toolbar. Sligtly modified patch from 
Pontus Fuchs.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6973

svn path=/trunk/; revision=43354
 2012-06-19 12:42:06 +00:00
Bill Meier 0ec00075ef Add a comment as to .bsc files seemingly not usable with VS2010. 
svn path=/trunk/; revision=43234
 2012-06-13 16:44:06 +00:00
Gerald Combs c592ceded1 Update the Lua configuration on Win64 to reflect the recent change to 
Visual Studio 2010.

svn path=/trunk/; revision=43142
 2012-06-06 20:42:47 +00:00
Gerald Combs f1cf70fc10 1.7.2 → 1.9.0. 
svn path=/trunk/; revision=43120
 2012-06-05 16:21:47 +00:00
Anders Broman 7b43b3de0f Make it possible to build with GTK3 on Windows 
svn path=/trunk/; revision=43083
 2012-06-04 20:42:09 +00:00
Anders Broman 94627901a9 Update GTK 3.0 package Id 
svn path=/trunk/; revision=43071
 2012-06-04 16:56:08 +00:00
Guy Harris 1dd90d3560 Default to the version recommended in the Developer's Guide, namely 
MSVC++ 2010 Express Edition.

svn path=/trunk/; revision=43016
 2012-06-03 07:07:35 +00:00
Pascal Quantin 5adc7cd8ef Use GeoIP package 1.4.8-2 for win64 also (I guess that's what was intended in r42933) 
svn path=/trunk/; revision=42946
 2012-05-31 18:56:02 +00:00
Gerald Combs ddcd6c5ce7 Use the updated GeoIP package (1.4.8-2). 
svn path=/trunk/; revision=42933
 2012-05-30 22:55:02 +00:00
Gerald Combs 77b9085de9 Revert GEOIP_CFLAGS back to r42905. It looks like the builders picked up 
the wrong archive yesterday before I had a chance to upload the right one.

svn path=/trunk/; revision=42919
 2012-05-30 15:36:48 +00:00
Chris Maynard b9e43af6e9 Ugh. Fix GEOIP_CFLAGS again. 3rd time's the charm? 
svn path=/trunk/; revision=42918
 2012-05-30 15:30:07 +00:00
Chris Maynard b15dc3a9af Try it with Windows style path separator instead. 
svn path=/trunk/; revision=42917
 2012-05-30 15:05:21 +00:00
Chris Maynard a489998855 Fix GEOIP_CFLAGS so GeoIP.h can be found. 
svn path=/trunk/; revision=42916
 2012-05-30 14:33:00 +00:00
Gerald Combs 43670460ff Use GeoIP 1.4.8 which includes a DLL instead of a static library. 
svn path=/trunk/; revision=42905
 2012-05-29 23:31:00 +00:00
Gerald Combs 992587c3bf Try using an OBS-derived Gtk2 bundle, second try. 
svn path=/trunk/; revision=42623
 2012-05-14 17:54:47 +00:00
Anders Broman 361454b6b8 Add PKG_SUFIX 
svn path=/trunk/; revision=42202
 2012-04-23 07:19:22 +00:00
Anders Broman 2c996e9c18 Make it possible to download the GTK3 package 
svn path=/trunk/; revision=42174
 2012-04-21 08:45:52 +00:00
Gerald Combs 733834afdb Switch back to the gtk.org version of the GTK+ bundle since its Cairo 
doesn't crash.

svn path=/trunk/; revision=42171
 2012-04-20 23:41:36 +00:00
Gerald Combs d8389b5429 Switch to our custom GTK+ bundles derived from openSUSE Build Service 
packages. Sort and normalize our DLL lists. Add several new required DLLs.

svn path=/trunk/; revision=42143
 2012-04-19 18:31:11 +00:00
Gerald Combs e5cd6c087e 1.7.1 → 1.7.2. 
svn path=/trunk/; revision=41971
 2012-04-06 17:27:20 +00:00
Anders Broman 6c902761a8 Revert 
svn path=/trunk/; revision=41928
 2012-04-04 15:42:46 +00:00
Anders Broman 82913779e4 Update to a version which have getopt_long(). 
svn path=/trunk/; revision=41926
 2012-04-04 15:23:47 +00:00
Gerald Combs 3ae3fcee5c Use the GnuTLS 2.12.18-1.2-1 bundle. 
svn path=/trunk/; revision=41829
 2012-03-29 20:18:10 +00:00
Gerald Combs 2a1e0baeac Use GnuTLS 2.12.18. 
svn path=/trunk/; revision=41809
 2012-03-27 22:57:42 +00:00
Anders Broman 665aae16f6 Revert the change of MSVC_VARIANT made by misstake. 
svn path=/trunk/; revision=41238
 2012-02-29 14:50:02 +00:00
Anders Broman 90cf729795 Use GTK 2.24.10 for win32. 
svn path=/trunk/; revision=41237
 2012-02-29 14:44:08 +00:00
Anders Broman 1fb2e2b3e0 Add the package version of GTK 2.24.10(commented out). 
svn path=/trunk/; revision=41236
 2012-02-29 12:03:51 +00:00
Bill Meier a94a0e3b4e (Minor): Add -DG_DISABLE_SINGLE_INCLUDES to GLIB_CFLAGS 
svn path=/trunk/; revision=41076
 2012-02-19 23:26:29 +00:00
Bill Meier e61e93baae Rework optional generation of .sbr & .bsc files. 
svn path=/trunk/; revision=40779
 2012-01-30 22:57:09 +00:00
Bill Meier cd4e301f06 Fix QtShark compile error. 
(Quoting can be tricky ...)

svn path=/trunk/; revision=40766
 2012-01-30 00:44:11 +00:00
Anders Broman 087e6087f0 Part of "Build Browse Information File per default" from 
Kovarththanan Rajaratnam applied.

It's still not the default but easier to make it so.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3480

svn path=/trunk/; revision=40765
 2012-01-29 21:56:35 +00:00
Chris Maynard 6d213e71bd Since we know the version of WinPcap we're compiling against, go ahead and display it instead of displaying "version unknown". 
svn path=/trunk/; revision=40740
 2012-01-27 03:41:20 +00:00
Bill Meier 0600db677f Remove support for MSVC < MSVC2005; Update Developer's Guide. 
svn path=/trunk/; revision=40395
 2012-01-06 15:45:46 +00:00
Gerald Combs 50594f1d71 Allow for, but don't yet use, GTK+ 2.24. 
svn path=/trunk/; revision=40032
 2011-11-29 00:07:54 +00:00
Gerald Combs 3f12c48ace Add an SVN_REVISION variable to config.nmake. This can be used to 
retrieve our SVN revision in releases.

Use make-version.pl to set all version information. Be more explicit
about the tasks it performs:

  - Fetching the SVN revision which corresponds to our code. The
    revision can be fetched via "svn info", "git svn info", SubWCRev",
    config.nmake, or by prodding .svn.

  - Setting the version numbers (the "major.minor.micro" triplet).

  - Setting the release information (revision/build number, local build
    identifier)

Remove the "is_release" configuration option and dist-hook target.

When run with a "--set-*" option or no options make sure we leave a
valid svnversion.h behind.


svn path=/trunk/; revision=39891
 2011-11-17 00:19:03 +00:00
Gerald Combs 2798ad267a 1.7.0 → 1.7.1. 
svn path=/trunk/; revision=39769
 2011-11-08 22:35:56 +00:00
Gerald Combs d40223b6fb Add a HAVE_GEOIP_V6 configuration option and enable it by default. 
svn path=/trunk/; revision=39283
 2011-10-05 23:02:31 +00:00
Gerald Combs 996935a5de Add more entries to the Python CRT list. 
svn path=/trunk/; revision=39257
 2011-10-04 20:50:12 +00:00
Jörg Mayer 576ab168c9 Get rid of (hopefully) all configure options to enable MAIN_MENU_USE_UIMANAGER 
as it is the only option left.

svn path=/trunk/; revision=39138
 2011-09-25 21:27:19 +00:00
Anders Broman af6d7d7963 Make MAIN_MENU_USE_UIMANAGER the default. 
svn path=/trunk/; revision=38650
 2011-08-21 20:39:58 +00:00
Jörg Mayer b87f22700e Always build with -DGTK_DISABLE_DEPRECATED. The files that 
fail when built in specific configurations will disable this
option when required.

svn path=/trunk/; revision=38588
 2011-08-17 17:34:56 +00:00
Jörg Mayer e22f19f645 MAIN_MENU_USE_UIMANAGER is also used in some includes, not only 
in .c files, so the aproach to #undef GTK_DISABLE_DEPRECATED was
wrong.
Only enable GTK_DISABLE_DEPRECATED if MAIN_MENU_USE_UIMANAGER is
defined.

svn path=/trunk/; revision=38420
 2011-08-08 20:35:36 +00:00
Jörg Mayer a28af865bc Looks like the Windows code isn't as clean as the Unix path: 
Comment out GTK_DISABLE_DEPRECATED

svn path=/trunk/; revision=38405
 2011-08-08 14:03:53 +00:00
Jörg Mayer 6ef6042641 GTK3 stuff: 
- Update Status file
- configure.in: start GSEALing with 2.20 and not 2.22
- configure.in/config.nmake/CMakeLists.txt: enable GTK_DISABLE_SINGLE_INCLUDE
    and GTK_DISABLE_DEPRECATED
- menus.c: If not building with UI_MANAGER, disable GTK_DISABLE_DEPRECATED

svn path=/trunk/; revision=38404
 2011-08-08 13:39:21 +00:00
Anders Broman c11c8b0ee0 svn path=/trunk/; revision=38396 2011-08-07 19:58:13 +00:00
Anders Broman 79501e9198 Revert previous commit. 
(Note to self read the description first)

"Returns :
 
a newly-allocated string, with all the upper case characters in str converted to lower case, with semantics that exactly match g_ascii_tolower(). (Note that this is unlike the old g_strdown(), which modified the string in place.)"

svn path=/trunk/; revision=38395
 2011-08-07 19:15:17 +00:00
Anders Broman e48dcbaf15 Replace deprecated glib functions. 
set DG_DISABLE_DEPRECATED for windows build.

svn path=/trunk/; revision=38394
 2011-08-07 19:08:41 +00:00
Anders Broman 7bcc6dd237 - Get rid of deprecated functions. 
- Include pangocairo.

svn path=/trunk/; revision=38317
 2011-08-03 14:54:03 +00:00