pango 0.20.0 → 0.20.1

data/Rakefile

@@ -8,23 +8,7 @@ CLOBBER.include '**/extconf.h'
 
 # Determine the current version of the software
 def ruby_pango_version
-  buf = File.read('src/rbpango.h')
-  if buf =~ /\s*RBPANGO_MAJOR_VERSION\s*(\d.+)/
-    major = $1
-  else
-    major = 0
-  end
-  if buf =~ /\s*RBPANGO_MINOR_VERSION\s*(\d.+)/
-    minor = $1
-  else
-    minor = 0
-  end
-  if buf =~ /\s*RBPANGO_MICRO_VERSION\s*(\d.+)/
-    micro = $1
-  else
-    micro = 0
-  end
-  "#{major}.#{minor}.#{micro}"
+  "0.20.1"
 end
 
 CURRENT_VERSION = ruby_pango_version

data/extconf.rb

@@ -6,15 +6,15 @@ PACKAGE_NAME = "pango"
 PACKAGE_ID   = "pango"
 
 begin
+  require 'rubygems'
   require 'mkmf-gnome2'
-  USE_GLIB_GEM = true
+  USE_GNOME_GEMS = true
   TOPDIR = File.expand_path(File.dirname(__FILE__) )
   SRCDIR = TOPDIR + '/src'
   require 'glib2'
-
 rescue LoadError => e
 
-  USE_GLIB_GEM = false
+  USE_GNOME_GEMS = false
 
   TOPDIR = File.expand_path(File.dirname(__FILE__) + '/..')
   MKMF_GNOME2_DIR = TOPDIR + '/glib/src/lib'
@@ -47,9 +47,9 @@ if PKGConfig.have_package('pangocairo')
   check_cairo
 end
 
-if USE_GLIB_GEM
-  
-  path = File.expand_path(ENV['GEM_HOME'] + "/gems/glib2-#{GLib::BINDING_VERSION.join('.')}/src")
+if USE_GNOME_GEMS
+  # locate the latest glib2 install and add the package dependency
+  path = File.dirname(Gem.find_files('rbglib.h').first)
   add_depend_package("glib2", path, '/')
 else
   add_depend_package("glib2", "glib/src", TOPDIR)

data/src/rbpango.h

@@ -10,14 +10,11 @@
 ************************************************/
 
 #include "ruby.h"
+
 #define PANGO_ENABLE_ENGINE
 #define PANGO_ENABLE_BACKEND
 #include <pango/pango.h>
 
-#define RBPANGO_MAJOR_VERSION 0
-#define RBPANGO_MINOR_VERSION 20
-#define RBPANGO_MICRO_VERSION 0
-
 #if HAVE_FREETYPE2
 #include <pango/pangofc-font.h>
 #endif

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: pango
 version: !ruby/object:Gem::Version 
-  hash: 79
   prerelease: false
   segments: 
   - 0
   - 20
-  - 0
-  version: 0.20.0
+  - 1
+  version: 0.20.1
 platform: ruby
 authors: 
 - ruby-gnome2/AUTHORS
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -101,6 +98,7 @@ files:
 - src/rbpangoversion.h
 - sample/attribute.rb
 - sample/break.rb
+- sample/cairo.png
 - sample/gdk_layout.rb
 - sample/glyphstring.rb
 - sample/item.rb
@@ -130,7 +128,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -139,7 +136,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"