- up to 0.19.4

Changed files:
    ruby-gnome2-libgnomeui.patch -> 1.2
    ruby-gnome2-libxul.patch -> 1.2
    ruby-gnome2.spec -> 1.50

diff --git a/ruby-gnome2-libgnomeui.patch b/ruby-gnome2-libgnomeui.patch
index e97aeb3880ebf0448540177a39628cf9bb407536..5329c3943e913e5adbe71b58d64ac890af91a9e9 100644 (file)
--- a/ruby-gnome2-libgnomeui.patch
+++ b/ruby-gnome2-libgnomeui.patch
@@ -9,9 +9,9 @@ diff -urN ruby-gnome2-all-0.18.1/panel-applet/extconf.rb ruby-gnome2-all-0.18.1.
  setup_win32(PACKAGE_NAME)
  
  add_depend_package("glib2", "glib/src", TOPDIR)
-diff -urN ruby-gnome2-all-0.18.1/panel-applet/rbpanel-applet.c ruby-gnome2-all-0.18.1.new/panel-applet/rbpanel-applet.c
---- ruby-gnome2-all-0.18.1/panel-applet/rbpanel-applet.c       2008-10-23 15:23:53.000000000 +0200
-+++ ruby-gnome2-all-0.18.1.new/panel-applet/rbpanel-applet.c   2009-04-09 13:59:58.401814463 +0200
+diff -urN ruby-gnome2-all-0.18.1/panel-applet/src/rbpanel-applet.c ruby-gnome2-all-0.18.1.new/panel-applet/src/rbpanel-applet.c
+--- ruby-gnome2-all-0.18.1/panel-applet/src/rbpanel-applet.c   2008-10-23 15:23:53.000000000 +0200
++++ ruby-gnome2-all-0.18.1.new/panel-applet/src/rbpanel-applet.c       2009-04-09 13:59:58.401814463 +0200
 @@ -16,6 +16,9 @@
  #  undef _
  #endif

diff --git a/ruby-gnome2-libxul.patch b/ruby-gnome2-libxul.patch
index 8193ec597d990554d4c0b6cefc51a0cfc503f04f..2af658846a05cfbeb86d6a79c2215cb35f882a61 100644 (file)
--- a/ruby-gnome2-libxul.patch
+++ b/ruby-gnome2-libxul.patch
@@ -3,22 +3,30 @@ diff -urN ruby-gnome2-all-0.16.0/gtkmozembed/extconf.rb ruby-gnome2-all-0.16.0.n
 +++ ruby-gnome2-all-0.16.0.new/gtkmozembed/extconf.rb  2008-07-08 22:34:51.000000000 +0200
 @@ -45,7 +45,7 @@
  
- if mozpath 
+ if mozilla_path 
    # please comment the CFLAGS line if you don't want a default comp_path
--  $CFLAGS << " -DDEFAULT_MOZILLA_FIVE_HOME='\"" << mozpath << "\"' "
-+  $CFLAGS << " -I/usr/include/xulrunner/gtkembedmoz " << " -DDEFAULT_MOZILLA_FIVE_HOME='\"" << mozpath << "\"' "
-   $LDFLAGS << " -Wl,-rpath " << mozpath
+-  $CFLAGS << " -DDEFAULT_MOZILLA_FIVE_HOME='\"#{mozilla_path}\"' "
++  $CFLAGS << " -I/usr/include/xulrunner/gtkembedmoz -DDEFAULT_MOZILLA_FIVE_HOME='\"#{mozilla_path}\"' "
+   $LDFLAGS << " -Wl,-rpath,#{mozilla_path}"
  else
    $stderr.puts "${package_id}.pc cannot be found."
-@@ -55,7 +55,7 @@
+@@ -58,12 +58,12 @@
  add_depend_package("glib2", "glib/src", TOPDIR)
  add_depend_package("gtk2", "gtk/src", TOPDIR)
  
--have_library("gtkembedmoz") or exit 1
-+have_library("xul") or exit 1
- 
- have_func('gtk_moz_embed_new') or exit 1
- have_func('gtk_moz_embed_set_profile_path') or exit 1
+-if have_library("xpcomglue")
+-  have_header("gtkmozembed_glue.cpp") or exit 1
+-  CONFIG['LDSHARED'].gsub!(/\$\(CC\)/, "$(CXX)")
+-elsif have_library("gtkembedmoz")
++if have_library("xul")
+   have_func('gtk_moz_embed_new') or exit 1
+   have_func('gtk_moz_embed_set_profile_path') or exit 1
++elsif have_library("xpcomglue")
++  have_header("gtkmozembed_glue.cpp") or exit 1
++  CONFIG['LDSHARED'].gsub!(/\$\(CC\)/, "$(CXX)")
+ else
+   exit 1
+ end
 diff -urN ruby-gnome2-all-0.16.0/gtkmozembed/src/rbgtkmozembed.c ruby-gnome2-all-0.16.0.new/gtkmozembed/src/rbgtkmozembed.c
 --- ruby-gnome2-all-0.16.0/gtkmozembed/src/rbgtkmozembed.c     2006-12-29 14:17:28.000000000 +0100
 +++ ruby-gnome2-all-0.16.0.new/gtkmozembed/src/rbgtkmozembed.c 2008-07-08 22:33:52.000000000 +0200

diff --git a/ruby-gnome2.spec b/ruby-gnome2.spec
index d89b853d47ee3ef5832580c22d5aef84b411161c..2121061ca32fe0c9c326a82c82692c57b5b5397f 100644 (file)
--- a/ruby-gnome2.spec
+++ b/ruby-gnome2.spec
@@ -1,12 +1,12 @@
 Summary:       GNOME 2 libraries for Ruby
 Summary(pl.UTF-8):     Biblioteki GNOME 2 dla Ruby
 Name:          ruby-gnome2
-Version:       0.18.1
-Release:       1
+Version:       0.19.4
+Release:       0.1
 License:       GPL
 Group:         Development/Languages
 Source0:       http://dl.sourceforge.net/ruby-gnome2/%{name}-all-%{version}.tar.gz
-# Source0-md5: 7b312986a9098cbfa180b3ae46cee063
+# Source0-md5: 40451e4173e2c8bcd5046aea7e499ef9
 Patch0:                %{name}-libxul.patch
 Patch1:                %{name}-libgnomeui.patch
 URL:           http://ruby-gnome2.sourceforge.jp/