Commit ddf7fc7a900944efe7e9c270aa6fc102048a86c5 - ruby-fxruby

+8

-9

debian/patches/add-iface.patch less more

14	14	2 files changed, 3990 insertions(+), 2 deletions(-)
15	15	create mode 100644 Scintilla.iface
16	16
17		diff --git a/Rakefile b/Rakefile
18		index 8e3b7ae..624f813 100755
19		--- a/Rakefile
20		+++ b/Rakefile
21		@@ -331,8 +331,8 @@ namespace :fxruby do
	17	Index: ruby-fxruby.git/Rakefile
	18	===================================================================
	19	--- ruby-fxruby.git.orig/Rakefile
	20	+++ ruby-fxruby.git/Rakefile
	21	@@ -347,8 +347,8 @@ namespace :fxruby do
22	22	end
23	23
24	24	task :scintilla => 'lib/fox16/scintilla.rb'

29	29	end
30	30
31	31	task :generate_kwargs_lib => 'lib/fox16/kwargs.rb'
32		diff --git a/Scintilla.iface b/Scintilla.iface
33		new file mode 100644
34		index 0000000..827e725
	32	Index: ruby-fxruby.git/Scintilla.iface
	33	===================================================================
35	34	--- /dev/null
36		+++ b/Scintilla.iface
	35	+++ ruby-fxruby.git/Scintilla.iface
37	36	@@ -0,0 +1,3988 @@
38	37	+## First line may be used for shbang
39	38	+

+7

-7

debian/patches/do-not-use-git-ls.patch less more

7	7	fxruby.gemspec \| 5 ++---
8	8	1 file changed, 2 insertions(+), 3 deletions(-)
9	9
10		diff --git a/fxruby.gemspec b/fxruby.gemspec
11		index f32945b..366b7dc 100644
12		--- a/fxruby.gemspec
13		+++ b/fxruby.gemspec
14		@@ -34,9 +34,8 @@ Gem::Specification.new do \|spec\|
15		spec.homepage = "https://github.com/larskanis/fxruby"
16		spec.license = 'LGPL-2.1'
	10	Index: ruby-fxruby.git/fxruby.gemspec
	11	===================================================================
	12	--- ruby-fxruby.git.orig/fxruby.gemspec
	13	+++ ruby-fxruby.git/fxruby.gemspec
	14	@@ -36,9 +36,8 @@ Gem::Specification.new do \|spec\|
	15	spec.metadata["changelog_uri"] = "https://github.com/larskanis/fxruby/blob/1.6/History.md"
	16	spec.metadata["documentation_uri"] = "https://rubydoc.info/gems/fxruby/frames"
17	17
18	18	- spec.files = `git ls-files -z`.split("\x0").reject do \|f\|
19	19	- f=~/^fox-includes\|^web/

+5

-5

debian/patches/dont-run-test.patch less more

8	8	Rakefile \| 6 +++---
9	9	1 file changed, 3 insertions(+), 3 deletions(-)
10	10
11		diff --git a/Rakefile b/Rakefile
12		index 76cb249..d2e95e1 100755
13		--- a/Rakefile
14		+++ b/Rakefile
15		@@ -81,9 +81,9 @@ CLEAN.include( ".config", "ext/fox16_c/Makefile", "ext/fox16_c/*.o", "ext/fox16_
	11	Index: ruby-fxruby.git/Rakefile
	12	===================================================================
	13	--- ruby-fxruby.git.orig/Rakefile
	14	+++ ruby-fxruby.git/Rakefile
	15	@@ -81,9 +81,9 @@ CLEAN.include( ".config", "ext/fox16_c/M
16	16	CLOBBER.include( "pkg" )
17	17
18	18	# Make sure extension is built before tests are run

+22

-22

debian/patches/drop-failing-test.patch less more

10	10	test/TC_FXVec4f.rb \| 8 ++++----
11	11	5 files changed, 22 insertions(+), 22 deletions(-)
12	12
13		diff --git a/test/TC_FXApp.rb b/test/TC_FXApp.rb
14		index 385074f..d989047 100755
15		--- a/test/TC_FXApp.rb
16		+++ b/test/TC_FXApp.rb
	13	Index: ruby-fxruby.git/test/TC_FXApp.rb
	14	===================================================================
	15	--- ruby-fxruby.git.orig/test/TC_FXApp.rb
	16	+++ ruby-fxruby.git/test/TC_FXApp.rb
17	17	@@ -3,15 +3,15 @@ require 'fox16'
18	18	require 'testcase'
19	19	require 'socket'

39	39
40	40	class TC_FXApp2 < Fox::TestCase
41	41	include Fox
42		diff --git a/test/TC_FXId.rb b/test/TC_FXId.rb
43		index 7e677e6..ad46c51 100755
44		--- a/test/TC_FXId.rb
45		+++ b/test/TC_FXId.rb
	42	Index: ruby-fxruby.git/test/TC_FXId.rb
	43	===================================================================
	44	--- ruby-fxruby.git.orig/test/TC_FXId.rb
	45	+++ ruby-fxruby.git/test/TC_FXId.rb
46	46	@@ -12,7 +12,7 @@ class TC_FXId < Fox::TestCase
47	47	def test_created?
48	48	assert !mainWindow.created?

52	52	mainWindow.destroy
53	53	assert !mainWindow.created?
54	54	end
55		diff --git a/test/TC_FXMainWindow.rb b/test/TC_FXMainWindow.rb
56		index d8267fb..68179a0 100644
57		--- a/test/TC_FXMainWindow.rb
58		+++ b/test/TC_FXMainWindow.rb
59		@@ -10,11 +10,11 @@ class TC_FXMainWindow < Test::Unit::TestCase
	55	Index: ruby-fxruby.git/test/TC_FXMainWindow.rb
	56	===================================================================
	57	--- ruby-fxruby.git.orig/test/TC_FXMainWindow.rb
	58	+++ ruby-fxruby.git/test/TC_FXMainWindow.rb
	59	@@ -10,11 +10,11 @@ class TC_FXMainWindow < Test::Unit::Test
60	60	end
61	61	end
62	62

75	75	+# end
76	76	+# end
77	77	end
78		diff --git a/test/TC_FXMaterial.rb b/test/TC_FXMaterial.rb
79		index 2ac01b2..771bbe0 100755
80		--- a/test/TC_FXMaterial.rb
81		+++ b/test/TC_FXMaterial.rb
82		@@ -68,7 +68,7 @@ class TC_FXMaterial < Test::Unit::TestCase
	78	Index: ruby-fxruby.git/test/TC_FXMaterial.rb
	79	===================================================================
	80	--- ruby-fxruby.git.orig/test/TC_FXMaterial.rb
	81	+++ ruby-fxruby.git/test/TC_FXMaterial.rb
	82	@@ -68,7 +68,7 @@ class TC_FXMaterial < Test::Unit::TestCa
83	83	mat.ambient = FXVec4f.new(0, 0, 0, 0)
84	84	cube.setMaterial(0, mat)
85	85	mat2 = cube.getMaterial(0)

88	88	assert_instance_of(FXVec4f, mat2.specular)
89	89	assert_instance_of(FXVec4f, mat2.diffuse)
90	90	end
91		diff --git a/test/TC_FXVec4f.rb b/test/TC_FXVec4f.rb
92		index 3958c52..027af86 100755
93		--- a/test/TC_FXVec4f.rb
94		+++ b/test/TC_FXVec4f.rb
	91	Index: ruby-fxruby.git/test/TC_FXVec4f.rb
	92	===================================================================
	93	--- ruby-fxruby.git.orig/test/TC_FXVec4f.rb
	94	+++ ruby-fxruby.git/test/TC_FXVec4f.rb
95	95	@@ -133,10 +133,10 @@ class TC_FXVec4f < Test::Unit::TestCase
96	96	assert_equal(2.0, v.length)
97	97	end

+16

-16

debian/patches/fix-path-headers.patch less more

11	11	scripts/build-fox.rb \| 2 +-
12	12	4 files changed, 4 insertions(+), 4 deletions(-)
13	13
14		diff --git a/ext/fox16_c/FXRbApp.cpp b/ext/fox16_c/FXRbApp.cpp
15		index 397aeea..7437c20 100644
16		--- a/ext/fox16_c/FXRbApp.cpp
17		+++ b/ext/fox16_c/FXRbApp.cpp
	14	Index: ruby-fxruby.git/ext/fox16_c/FXRbApp.cpp
	15	===================================================================
	16	--- ruby-fxruby.git.orig/ext/fox16_c/FXRbApp.cpp
	17	+++ ruby-fxruby.git/ext/fox16_c/FXRbApp.cpp
18	18	@@ -24,7 +24,7 @@
19	19	* $Id: FXRbApp.cpp 2902 2008-12-11 14:09:20Z lyle $
20	20	***********************************************************************/

24	24
25	25	#ifdef HAVE_SYS_TIME_H
26	26	#include <sys/time.h> /* For struct timeval */
27		diff --git a/ext/fox16_c/extconf.rb b/ext/fox16_c/extconf.rb
28		index 5b13f97..57f08cf 100755
29		--- a/ext/fox16_c/extconf.rb
30		+++ b/ext/fox16_c/extconf.rb
	27	Index: ruby-fxruby.git/ext/fox16_c/extconf.rb
	28	===================================================================
	29	--- ruby-fxruby.git.orig/ext/fox16_c/extconf.rb
	30	+++ ruby-fxruby.git/ext/fox16_c/extconf.rb
31	31	@@ -1,4 +1,4 @@
32	32	-#!/bin/env ruby
33	33	+#!/usr/bin/env ruby
34	34
35	35	require 'fileutils'
36	36	require 'mkmf'
37		diff --git a/ext/fox16_c/make_impl.rb b/ext/fox16_c/make_impl.rb
38		index 3cf4377..91b6a64 100755
39		--- a/ext/fox16_c/make_impl.rb
40		+++ b/ext/fox16_c/make_impl.rb
	37	Index: ruby-fxruby.git/ext/fox16_c/make_impl.rb
	38	===================================================================
	39	--- ruby-fxruby.git.orig/ext/fox16_c/make_impl.rb
	40	+++ ruby-fxruby.git/ext/fox16_c/make_impl.rb
41	41	@@ -1,4 +1,4 @@
42	42	-#!/bin/env ruby
43	43	+#!/usr/bin/env ruby
44	44
45	45	$special_stubclasses = ["FXGLSHAPE", "FXICONITEM", "FXTABLE", "FXTABLEITEM", "FXTEXT", "FXTREEITEM"]
46	46
47		diff --git a/scripts/build-fox.rb b/scripts/build-fox.rb
48		index 0d3e747..0b62e9f 100755
49		--- a/scripts/build-fox.rb
50		+++ b/scripts/build-fox.rb
	47	Index: ruby-fxruby.git/scripts/build-fox.rb
	48	===================================================================
	49	--- ruby-fxruby.git.orig/scripts/build-fox.rb
	50	+++ ruby-fxruby.git/scripts/build-fox.rb
51	51	@@ -1,4 +1,4 @@
52	52	-#!/usr/local/bin/ruby
53	53	+#!/usr/bin/ruby

+4

-4

debian/patches/fix-scintilla-not-in-scope.patch less more

8	8	swig-interfaces/scintilla.i \| 2 +-
9	9	1 file changed, 1 insertion(+), 1 deletion(-)
10	10
11		diff --git a/swig-interfaces/scintilla.i b/swig-interfaces/scintilla.i
12		index 5584b68..08f0c76 100644
13		--- a/swig-interfaces/scintilla.i
14		+++ b/swig-interfaces/scintilla.i
	11	Index: ruby-fxruby.git/swig-interfaces/scintilla.i
	12	===================================================================
	13	--- ruby-fxruby.git.orig/swig-interfaces/scintilla.i
	14	+++ ruby-fxruby.git/swig-interfaces/scintilla.i
15	15	@@ -49,9 +49,9 @@
16	16	%include freefuncs.i
17	17

+5

-5

debian/patches/installation-with-rakefile.patch less more

8	8	Rakefile \| 138 ++++++++++++++++++++++++++++++++++-----------------------------
9	9	1 file changed, 74 insertions(+), 64 deletions(-)
10	10
11		diff --git a/Rakefile b/Rakefile
12		index 624f813..76cb249 100755
13		--- a/Rakefile
14		+++ b/Rakefile
	11	Index: ruby-fxruby.git/Rakefile
	12	===================================================================
	13	--- ruby-fxruby.git.orig/Rakefile
	14	+++ ruby-fxruby.git/Rakefile
15	15	@@ -7,67 +7,67 @@ require 'bundler/gem_helper'
16	16	require './lib/fox16/version.rb'
17	17

160	160
161	161
162	162	gem_spec = Bundler.load_gemspec('fxruby.gemspec')
163		@@ -139,8 +149,8 @@ ext_task = Rake::ExtensionTask.new("fox16_c", gem_spec) do \|ext\|
	163	@@ -140,8 +150,8 @@ ext_task = Rake::ExtensionTask.new("fox1
164	164	end
165	165	end
166	166