[SCM] SDL (Simple DirectMedia Layer) bindings for Perl branch, master, updated. debian/2.540-1-11-gfade04a

Dominique Dumont dod at debian.org
Fri May 3 12:09:51 UTC 2013


The following commit has been merged in the master branch:
commit 153beb338ac41f9b5dc1b33ffdf5c5fe5cb676e5
Author: Dominique Dumont <dod at debian.org>
Date:   Fri May 3 13:53:54 2013 +0200

    patch to hard code default font path (Closes: #682338)

diff --git a/debian/patches/hardcode-default-font b/debian/patches/hardcode-default-font
new file mode 100644
index 0000000..b0f062f
--- /dev/null
+++ b/debian/patches/hardcode-default-font
@@ -0,0 +1,93 @@
+Description: Hardcode default font
+ upstream SDL delivers a default font for SDLx::Text. This font is
+ provided by package fonts-sil-gentium-basic in Debian. This patch
+ hardcodes the default font path and remove the dependency on
+ File::ShareDir which is no longer required.
+Bug-Debian: #682338
+Forwarded: no
+Author: dod
+--- a/lib/SDLx/Text.pm
++++ b/lib/SDLx/Text.pm
+@@ -16,11 +16,8 @@
+ 	unless ( SDL::Config->has('SDL_ttf') ) {
+ 		Carp::cluck("SDL_ttf support has not been compiled");
+ 	}  
+-	my $file = $options{'font'};
+-    if (!$file) {
+-        require File::ShareDir;
+-        $file = File::ShareDir::dist_file('SDL', 'GenBasR.ttf');
+-    }
++	my $file = $options{'font'}
++	         || '/usr/share/fonts/truetype/gentium-basic/GenBasR.ttf';
+ 
+ 	my $color = defined $options{'color'} ? $options{'color'} : [255, 255, 255];
+ 
+--- a/Build.PL
++++ b/Build.PL
+@@ -571,7 +571,6 @@
+ 		'ExtUtils::CBuilder' => '0.260301',
+ 		'Alien::SDL'         => '1.426',
+ 		'File::Find'         => '0',
+-		'File::ShareDir'     => '1.0',
+ 		'Tie::Simple'        => '0',
+ 		'Capture::Tiny'      => '0',
+ 	},
+@@ -581,14 +580,12 @@
+ 		'Test::Most'        => '0.21',
+ 		'Alien::SDL'        => '1.426',
+ 		'File::Find'        => '0',
+-		'File::ShareDir'    => '1.0',
+ 		'Tie::Simple'       => '0',
+ 		'Scalar::Util'      => '0',
+ 	},
+ 	requires => {
+ 		'Scalar::Util'   => '0',
+ 		'Tie::Simple'    => '0',
+-		'File::ShareDir' => '1.0',
+ 		'CPAN'           => '1.92',
+ 		'perl'           => '5.008000',
+ 	},
+--- a/META.json
++++ b/META.json
+@@ -20,7 +20,6 @@
+             "Capture::Tiny" : "0",
+             "ExtUtils::CBuilder" : "0",
+             "File::Find" : "0",
+-            "File::ShareDir" : "1.0",
+             "Scalar::Util" : "0",
+             "Test::Most" : "0.21",
+             "Test::Simple" : "0.88",
+@@ -33,7 +32,6 @@
+             "Capture::Tiny" : "0",
+             "ExtUtils::CBuilder" : "0.260301",
+             "File::Find" : "0",
+-            "File::ShareDir" : "1.0",
+             "Module::Build" : "0.38",
+             "Tie::Simple" : "0"
+          }
+@@ -41,7 +39,6 @@
+       "runtime" : {
+          "requires" : {
+             "CPAN" : "1.92",
+-            "File::ShareDir" : "1.0",
+             "Scalar::Util" : "0",
+             "Tie::Simple" : "0",
+             "perl" : "5.008000"
+--- a/META.yml
++++ b/META.yml
+@@ -7,7 +7,6 @@
+   Capture::Tiny: 0
+   ExtUtils::CBuilder: 0
+   File::Find: 0
+-  File::ShareDir: 1.0
+   Scalar::Util: 0
+   Test::Most: 0.21
+   Test::Simple: 0.88
+@@ -17,7 +16,6 @@
+   Capture::Tiny: 0
+   ExtUtils::CBuilder: 0.260301
+   File::Find: 0
+-  File::ShareDir: 1.0
+   Module::Build: 0.38
+   Tie::Simple: 0
+ dynamic_config: 1
diff --git a/debian/patches/series b/debian/patches/series
index 01c1298..be6009f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ install_man_pages_correctly
 fix_whatis_entries
 fix_spelling
 fix_api_spelling
+hardcode-default-font

-- 
SDL (Simple DirectMedia Layer) bindings for Perl



More information about the Pkg-perl-cvs-commits mailing list