fxruby 1.6.34 → 1.6.35

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bdb64100c3c660af155b0cc354ca36d84c0625b2
4
- data.tar.gz: a0e65e9075cb681ca3cce792ebe4415523820002
3
+ metadata.gz: '09493b9c0988db72cc281d64a7713de5d9c1b806'
4
+ data.tar.gz: a3a7428a6a00aee41a5a457ef9507c5d6d33c89f
5
5
  SHA512:
6
- metadata.gz: 4bf5beea53bda6442aa96da25167fb1d1e9c056688522d5a6de94aee2017a0436e5cd61f4774e7643a8261134651acb787a7765869ce4b78be864761fc02cd58
7
- data.tar.gz: fcdf7ccb8bdb6002256d7700010aa2c92423c869f24108b3d996183c4d06bf26533538dfd9dd8b482c3b71f595bf211bed5a8cf7f3dff0443b22036e0996631d
6
+ metadata.gz: e6004b3f167631f32b43a4846157397dd8a06bdbf8b1e30e0afc4df9afb846682bf033372e8bfc63401a90d51754ab21a6b0ccd3cbbbfe643889e83b5e9ade2a
7
+ data.tar.gz: f20030cefee54cd62dad5ba39146ff5744e4fc675a7a54f1b2763de04c8ebdfc67ac217150e4732387eb2d98f97779f0363ab9323e1d54517b6edba5d24346bb
@@ -1,3 +1,14 @@
1
+ === 1.6.35 / 2017-02-15
2
+
3
+ * Adjust for Ruby-2.4 with unified Integers
4
+ * Add support for RubyInstaller-2.4
5
+ * Drop support for Ruby-1.8 and 1.9. It may work with them, but is no longer tested.
6
+ * Add compat with SWIG-3.0
7
+ * Fix an issue with FXApp#removeInput introduced in fxruby-1.6.30.
8
+ * Work around missing /usr/lib/libfxscintilla.so file in Ubuntu
9
+ * Update dependent gems.
10
+ * Update libraries for Windows build.
11
+
1
12
  === 1.6.34 / 2016-04-26
2
13
 
3
14
  * Add support for RubyInstaller-2.3
data/Rakefile CHANGED
@@ -51,7 +51,7 @@ SWIG_MODULES = {
51
51
  hoe = Hoe.spec "fxruby" do
52
52
  # ... project specific data ...
53
53
  self.blog_categories = %w{FXRuby}
54
- self.clean_globs = [".config", "ext/fox16_c/Makefile", "ext/fox16_c/*.o", "ext/fox16_c/*.bundle", "ext/fox16_c/mkmf.log", "ext/fox16_c/conftest.dSYM", "ext/fox16_c/include/swigrubyrun.h", "ext/fox16_c/librb.c", "ext/fox16_c/include/inlinestubs.h", "ext/fox16_c/*_wrap.cpp", "tmp", "ports/*.installed", "ports/*mingw32*"]
54
+ self.clean_globs = [".config", "ext/fox16_c/Makefile", "ext/fox16_c/*.o", "ext/fox16_c/*.bundle", "ext/fox16_c/mkmf.log", "ext/fox16_c/conftest.dSYM", "ext/fox16_c/swigruby.h", "ext/fox16_c/librb.c", "ext/fox16_c/include/inlinestubs.h", "ext/fox16_c/*_wrap.cpp", "tmp", "ports/*.installed", "ports/*mingw32*"]
55
55
  developer("Lyle Johnson", "lyle@lylejohnson.name")
56
56
  developer("Lars Kanis", "kanis@comcard.de")
57
57
  self.extra_rdoc_files = ["rdoc-sources", File.join("rdoc-sources", "README.rdoc")]
@@ -68,12 +68,14 @@ hoe = Hoe.spec "fxruby" do
68
68
  self.version = PKG_VERSION
69
69
  self.readme_file = 'README.rdoc'
70
70
  self.extra_rdoc_files << self.readme_file
71
- self.extra_deps << ['mini_portile', '~> 0.6']
72
- self.extra_dev_deps << ['rake-compiler', '~> 0.9']
73
- self.extra_dev_deps << ['rake-compiler-dock', '~> 0.5.2']
71
+ self.extra_deps << ['mini_portile2', '~> 2.1']
72
+ self.extra_dev_deps << ['rake-compiler', '~> 1.0']
73
+ self.extra_dev_deps << ['rake-compiler-dock', '~> 0.6.0']
74
74
  self.extra_dev_deps << ['opengl', '~> 0.8']
75
75
  self.extra_dev_deps << ['glu', '~> 8.0']
76
76
  self.extra_dev_deps << ['test-unit', '~> 3.1']
77
+ self.extra_dev_deps << ['yard', '~> 0.8']
78
+ self.extra_dev_deps << ['hoe-bundler', '~> 1.1']
77
79
  self.license 'LGPL'
78
80
 
79
81
  spec_extras[:files] = File.read_utf("Manifest.txt").split(/\r?\n\r?/).reject{|f| f=~/^fox-includes|^web/ }
@@ -113,7 +115,7 @@ Rake::ExtensionTask.new("fox16_c", hoe.spec) do |ext|
113
115
  # Add dependent DLLs to the cross gems
114
116
  ext.cross_compiling do |spec|
115
117
  platform_host_map = {
116
- 'x86-mingw32' => ['i586-mingw32msvc', 'i686-w64-mingw32'],
118
+ 'x86-mingw32' => ['i686-w64-mingw32'],
117
119
  'x64-mingw32' => ['x86_64-w64-mingw32'],
118
120
  }
119
121
 
@@ -127,7 +129,7 @@ Rake::ExtensionTask.new("fox16_c", hoe.spec) do |ext|
127
129
  "libfxscintilla-20.dll",
128
130
  "libFOX-1.6-0.dll",
129
131
  "libjpeg-8.dll",
130
- "libpng15-15.dll",
132
+ "libpng16-16.dll",
131
133
  "libtiff-5.dll",
132
134
  "zlib1.dll",
133
135
  ]
@@ -157,7 +159,12 @@ end
157
159
  desc "Build the windows binary gems"
158
160
  task 'gem:windows' => 'gem' do
159
161
  require 'rake_compiler_dock'
160
- RakeCompilerDock.sh "rake cross native gem MAKE=\"nice make V=1 -j `nproc`\" "
162
+
163
+ gf = "tmp/Gemfile-rcd"
164
+ File.write(gf, File.read("Gemfile").gsub(/.*"(glu|opengl)".*/, ""))
165
+
166
+ sh "BUNDLE_GEMFILE=#{gf} bundle package"
167
+ RakeCompilerDock.sh "BUNDLE_GEMFILE=#{gf} bundle --local --without=norcd && rake cross native gem MAKE=\"nice make V=1 -j `nproc`\" "
161
168
  end
162
169
 
163
170
  # Set environment variable SWIG_LIB to
@@ -60,6 +60,11 @@ extern "C" {
60
60
  // Opaque type declaration from SWIG runtime
61
61
  struct swig_type_info;
62
62
 
63
+ static int FXSWIG_ConvertPtr(VALUE obj, void **ptr, swig_type_info *ty, int flags){
64
+ return SWIG_ConvertPtr(obj, ptr, ty, flags);
65
+ }
66
+
67
+
63
68
  // Wrapper around SWIG_TypeQuery() that caches results for performance
64
69
  swig_type_info *FXRbTypeQuery(const char *desc){
65
70
  FXASSERT(desc!=0);
@@ -2,7 +2,9 @@
2
2
 
3
3
  require 'fileutils'
4
4
  require 'mkmf'
5
- require 'mini_portile'
5
+
6
+ gem 'mini_portile2', '~>2.1'
7
+ require 'mini_portile2'
6
8
 
7
9
  def find_installed_fox_version
8
10
  stddirs = ["/usr/include/fox-1.6",
@@ -86,19 +88,19 @@ def with_env(hash)
86
88
  end
87
89
  end
88
90
 
89
- LIBZ_VERSION = ENV['LIBZ_VERSION'] || '1.2.7'
90
- LIBZ_SOURCE_URI = "http://downloads.sourceforge.net/project/libpng/zlib/#{LIBZ_VERSION}/zlib-#{LIBZ_VERSION}.tar.bz2"
91
+ LIBZ_VERSION = ENV['LIBZ_VERSION'] || '1.2.7.3'
92
+ LIBZ_SOURCE_URI = "http://zlib.net/fossils/zlib-#{LIBZ_VERSION}.tar.gz"
91
93
 
92
- LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.5.13'
94
+ LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.6.26'
93
95
  LIBPNG_SOURCE_URI = "http://prdownloads.sourceforge.net/libpng/libpng-#{LIBPNG_VERSION}.tar.gz"
94
96
 
95
97
  LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '8d'
96
98
  LIBJPEG_SOURCE_URI = "http://www.ijg.org/files/jpegsrc.v#{LIBJPEG_VERSION}.tar.gz"
97
99
 
98
- LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.0.3'
100
+ LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.0.7'
99
101
  LIBTIFF_SOURCE_URI = "http://download.osgeo.org/libtiff/tiff-#{LIBTIFF_VERSION}.tar.gz"
100
102
 
101
- LIBFOX_VERSION = ENV['LIBFOX_VERSION'] || '1.6.49'
103
+ LIBFOX_VERSION = ENV['LIBFOX_VERSION'] || '1.6.53'
102
104
  LIBFOX_SOURCE_URI = "http://ftp.fox-toolkit.org/pub/fox-#{LIBFOX_VERSION}.tar.gz"
103
105
 
104
106
  LIBFXSCINTILLA_VERSION = ENV['LIBFXSCINTILLA_VERSION'] || '2.28.0'
@@ -157,8 +159,6 @@ end
157
159
 
158
160
  def do_rake_compiler_setup
159
161
  if enable_config("win32-cross")
160
- require 'mini_portile'
161
-
162
162
  dir_config("installed")
163
163
 
164
164
  libz_recipe = BuildRecipe.new("libz", LIBZ_VERSION, [LIBZ_SOURCE_URI]).tap do |recipe|
@@ -307,7 +307,7 @@ def do_rake_compiler_setup
307
307
  if is_fxscintilla_build?
308
308
  FileUtils.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exist?('scintilla_wrap.cpp.bak')
309
309
  $CPPFLAGS = $CPPFLAGS + " -DWITH_FXSCINTILLA -DHAVE_FOX_1_6"
310
- $libs = append_library($libs, "fxscintilla")
310
+ find_library("fxscintilla", nil) || find_library(":libfxscintilla.so.19", nil) || ($libs = append_library($libs, "fxscintilla"))
311
311
  else
312
312
  FileUtils.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exist?('scintilla_wrap.cpp')
313
313
  end
@@ -41,16 +41,14 @@ struct swig_type_info;
41
41
  extern "C" {
42
42
  static const char * SWIG_TypeName(const swig_type_info *ty);
43
43
  static VALUE SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int own);
44
- #define SWIG_ConvertPtr(obj, pptr, type, flags) SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, 0)
45
- typedef void (*ruby_owntype)(void*);
46
- static int SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags, ruby_owntype *own);
44
+ static int FXSWIG_ConvertPtr(VALUE obj, void **ptr, swig_type_info *ty, int flags);
47
45
  }
48
46
 
49
47
  // Helper for overloaded show() functions
50
48
  template <class TYPE>
51
49
  VALUE showHelper(VALUE self, int argc, VALUE *argv, TYPE *p, swig_type_info *typeinfo) {
52
50
  TYPE *win;
53
- SWIG_ConvertPtr(self,(void**)&win,typeinfo,1);
51
+ FXSWIG_ConvertPtr(self,(void**)&win,typeinfo,1);
54
52
  if (argc == 0) {
55
53
  win->_show();
56
54
  }
@@ -6,16 +6,25 @@ rescue LoadError
6
6
  major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
7
7
  raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
8
8
 
9
- # Set the PATH environment variable, so that the DLLs can be found.
10
- old_path = ENV['PATH']
11
- begin
12
- ports_dir = RbConfig::CONFIG["host"].gsub('i686-pc-mingw32') do
13
- major_minor < '2.0' ? 'i586-mingw32msvc' : 'i686-w64-mingw32'
9
+ add_dll_path = proc do |path, &block|
10
+ begin
11
+ require 'ruby_installer'
12
+ RubyInstaller.add_dll_directory(path, &block)
13
+ rescue LoadError
14
+ old_path = ENV['PATH']
15
+ ENV['PATH'] = "#{path};#{old_path}"
16
+ block.call
17
+ ENV['PATH'] = old_path
14
18
  end
15
- ENV['PATH'] = "#{File.expand_path("../../ports/#{ports_dir}/bin", __FILE__)};#{old_path}"
19
+ end
20
+
21
+ # Temporary add this directory for DLL search, so that libpq.dll can be found.
22
+ ports_dir = RbConfig::CONFIG["host"].gsub('i686-pc-mingw32') do
23
+ major_minor < '2.0' ? 'i586-mingw32msvc' : 'i686-w64-mingw32'
24
+ end
25
+ ports_bin = File.expand_path("../../ports/#{ports_dir}/bin", __FILE__)
26
+ add_dll_path.call(ports_bin) do
16
27
  require "#{major_minor}/fox16_c"
17
- ensure
18
- ENV['PATH'] = old_path
19
28
  end
20
29
  else
21
30
  raise
@@ -1,5 +1,5 @@
1
1
  module Fox
2
2
  def Fox.fxrubyversion
3
- "1.6.34"
3
+ "1.6.35"
4
4
  end
5
5
  end
@@ -374,7 +374,7 @@ public:
374
374
  */
375
375
  bool removeInput(VALUE obj,FXuint mode){
376
376
  FXInputHandle fd;
377
- if(mode&INPUT_READ|INPUT_EXCEPT){
377
+ if(mode&(INPUT_READ|INPUT_EXCEPT)){
378
378
  fd=FXRbGetReadFileHandle(obj, mode);
379
379
  self->removeInput(fd,mode);
380
380
  FXRbRemoveReadFileHandle(obj, mode);
@@ -715,7 +715,7 @@ inline void* to_FXEvent(VALUE obj){
715
715
  $2 = RSTRING_LEN($input);
716
716
  }
717
717
 
718
- // Extract a C array (dashpattern) and its length (dashlength) from a Ruby array of Fixnums
718
+ // Extract a C array (dashpattern) and its length (dashlength) from a Ruby array of Integers
719
719
  %typemap(in) (const FXchar* dashpattern, FXuint dashlength) {
720
720
  Check_Type($input, T_ARRAY);
721
721
  $1 = new FXchar[RARRAY_LEN($input)];
@@ -763,7 +763,7 @@ inline void* to_FXEvent(VALUE obj){
763
763
  */
764
764
 
765
765
  %typemap(in) FXWindow* TOOLBAR_DOCK_AFTER {
766
- if (TYPE($input) == T_FIXNUM) {
766
+ if (TYPE($input) == T_FIXNUM || TYPE($input) == T_BIGNUM)) {
767
767
  $1 = reinterpret_cast<FXWindow *>(static_cast<long>(NUM2INT($input)));
768
768
  } else {
769
769
  SWIG_ConvertPtr($input, (void **) &$1, SWIGTYPE_p_FXWindow, 1);
@@ -26,7 +26,7 @@ class TC_FXButton < Fox::TestCase
26
26
 
27
27
  def testStyle
28
28
  assert(@button.buttonStyle)
29
- assert_instance_of(Fixnum, @button.buttonStyle)
29
+ assert_kind_of(Integer, @button.buttonStyle)
30
30
 
31
31
  @button.buttonStyle |= BUTTON_AUTOGRAY
32
32
  assert((@button.buttonStyle & BUTTON_AUTOGRAY) != 0)
@@ -56,7 +56,7 @@ class TC_FXButton < Fox::TestCase
56
56
 
57
57
  def testState
58
58
  assert(@button.state)
59
- assert_kind_of(Fixnum, @button.state)
59
+ assert_kind_of(Integer, @button.state)
60
60
 
61
61
  @button.state = STATE_UP
62
62
  assert_equal(STATE_UP, @button.state)
@@ -22,7 +22,7 @@ class TC_FXHeader < Fox::TestCase
22
22
 
23
23
  def test_getArrowDir
24
24
  @header.appendItem("")
25
- assert_instance_of(Fixnum, @header.getArrowDir(0))
25
+ assert_kind_of(Integer, @header.getArrowDir(0))
26
26
  end
27
27
 
28
28
  def test_arrowUp?
@@ -12,7 +12,7 @@ class TC_FXWindow < Fox::TestCase
12
12
 
13
13
  def test_width_accessor
14
14
  pos = @window.width
15
- assert_instance_of(Fixnum, pos)
15
+ assert_kind_of(Integer, pos)
16
16
  @window.width = pos + 1
17
17
  assert_equal(pos + 1, @window.width)
18
18
  @window.width = pos + 2.7
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fxruby
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.34
4
+ version: 1.6.35
5
5
  platform: ruby
6
6
  authors:
7
7
  - Lyle Johnson
@@ -9,66 +9,94 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-04-26 00:00:00.000000000 Z
12
+ date: 2017-02-16 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
- name: mini_portile
15
+ name: mini_portile2
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
18
  - - "~>"
19
19
  - !ruby/object:Gem::Version
20
- version: '0.6'
20
+ version: '2.1'
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - "~>"
26
26
  - !ruby/object:Gem::Version
27
- version: '0.6'
27
+ version: '2.1'
28
28
  - !ruby/object:Gem::Dependency
29
- name: rdoc
29
+ name: rake-compiler
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
32
  - - "~>"
33
33
  - !ruby/object:Gem::Version
34
- version: '4.0'
34
+ version: '1.0'
35
35
  type: :development
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - "~>"
40
40
  - !ruby/object:Gem::Version
41
- version: '4.0'
41
+ version: '1.0'
42
42
  - !ruby/object:Gem::Dependency
43
- name: rake-compiler
43
+ name: rake-compiler-dock
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
46
  - - "~>"
47
47
  - !ruby/object:Gem::Version
48
- version: '0.9'
48
+ version: 0.6.0
49
49
  type: :development
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
53
  - - "~>"
54
54
  - !ruby/object:Gem::Version
55
- version: '0.9'
55
+ version: 0.6.0
56
56
  - !ruby/object:Gem::Dependency
57
- name: rake-compiler-dock
57
+ name: opengl
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
60
  - - "~>"
61
61
  - !ruby/object:Gem::Version
62
- version: 0.5.2
62
+ version: '0.8'
63
63
  type: :development
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
67
  - - "~>"
68
68
  - !ruby/object:Gem::Version
69
- version: 0.5.2
69
+ version: '0.8'
70
70
  - !ruby/object:Gem::Dependency
71
- name: opengl
71
+ name: glu
72
+ requirement: !ruby/object:Gem::Requirement
73
+ requirements:
74
+ - - "~>"
75
+ - !ruby/object:Gem::Version
76
+ version: '8.0'
77
+ type: :development
78
+ prerelease: false
79
+ version_requirements: !ruby/object:Gem::Requirement
80
+ requirements:
81
+ - - "~>"
82
+ - !ruby/object:Gem::Version
83
+ version: '8.0'
84
+ - !ruby/object:Gem::Dependency
85
+ name: test-unit
86
+ requirement: !ruby/object:Gem::Requirement
87
+ requirements:
88
+ - - "~>"
89
+ - !ruby/object:Gem::Version
90
+ version: '3.1'
91
+ type: :development
92
+ prerelease: false
93
+ version_requirements: !ruby/object:Gem::Requirement
94
+ requirements:
95
+ - - "~>"
96
+ - !ruby/object:Gem::Version
97
+ version: '3.1'
98
+ - !ruby/object:Gem::Dependency
99
+ name: yard
72
100
  requirement: !ruby/object:Gem::Requirement
73
101
  requirements:
74
102
  - - "~>"
@@ -82,47 +110,47 @@ dependencies:
82
110
  - !ruby/object:Gem::Version
83
111
  version: '0.8'
84
112
  - !ruby/object:Gem::Dependency
85
- name: glu
113
+ name: hoe-bundler
86
114
  requirement: !ruby/object:Gem::Requirement
87
115
  requirements:
88
116
  - - "~>"
89
117
  - !ruby/object:Gem::Version
90
- version: '8.0'
118
+ version: '1.1'
91
119
  type: :development
92
120
  prerelease: false
93
121
  version_requirements: !ruby/object:Gem::Requirement
94
122
  requirements:
95
123
  - - "~>"
96
124
  - !ruby/object:Gem::Version
97
- version: '8.0'
125
+ version: '1.1'
98
126
  - !ruby/object:Gem::Dependency
99
- name: test-unit
127
+ name: rdoc
100
128
  requirement: !ruby/object:Gem::Requirement
101
129
  requirements:
102
130
  - - "~>"
103
131
  - !ruby/object:Gem::Version
104
- version: '3.1'
132
+ version: '4.0'
105
133
  type: :development
106
134
  prerelease: false
107
135
  version_requirements: !ruby/object:Gem::Requirement
108
136
  requirements:
109
137
  - - "~>"
110
138
  - !ruby/object:Gem::Version
111
- version: '3.1'
139
+ version: '4.0'
112
140
  - !ruby/object:Gem::Dependency
113
141
  name: hoe
114
142
  requirement: !ruby/object:Gem::Requirement
115
143
  requirements:
116
144
  - - "~>"
117
145
  - !ruby/object:Gem::Version
118
- version: '3.14'
146
+ version: '3.16'
119
147
  type: :development
120
148
  prerelease: false
121
149
  version_requirements: !ruby/object:Gem::Requirement
122
150
  requirements:
123
151
  - - "~>"
124
152
  - !ruby/object:Gem::Version
125
- version: '3.14'
153
+ version: '3.16'
126
154
  description: FXRuby is the Ruby binding to the FOX GUI toolkit.
127
155
  email:
128
156
  - lyle@lylejohnson.name
@@ -1100,7 +1128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1100
1128
  version: '0'
1101
1129
  requirements: []
1102
1130
  rubyforge_project:
1103
- rubygems_version: 2.5.1
1131
+ rubygems_version: 2.6.8
1104
1132
  signing_key:
1105
1133
  specification_version: 4
1106
1134
  summary: FXRuby is the Ruby binding to the FOX GUI toolkit.