From: Marcin Banasiak Date: Fri, 25 Feb 2011 18:48:48 +0000 (+0000) Subject: - obsolete X-Git-Tag: auto/th/ruby-gnome2-0_90_6-2~1 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;ds=sidebyside;h=0494cd16362abd051897e22ce5fb3aa850ee8c23;p=packages%2Fruby-gnome2.git - obsolete Changed files: ruby-gnome2-libgnomeui.patch -> 1.3 ruby-gnome2-libxul.patch -> 1.3 ruby-gnome2-ruby19.patch -> 1.2 --- diff --git a/ruby-gnome2-libgnomeui.patch b/ruby-gnome2-libgnomeui.patch deleted file mode 100644 index 5329c39..0000000 --- a/ruby-gnome2-libgnomeui.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN ruby-gnome2-all-0.18.1/panel-applet/extconf.rb ruby-gnome2-all-0.18.1.new/panel-applet/extconf.rb ---- ruby-gnome2-all-0.18.1/panel-applet/extconf.rb 2008-10-23 15:23:53.000000000 +0200 -+++ ruby-gnome2-all-0.18.1.new/panel-applet/extconf.rb 2009-04-09 13:59:45.267912154 +0200 -@@ -14,6 +14,7 @@ - require 'mkmf-gnome2' - - PKGConfig.have_package(PACKAGE_ID, 2, 6) or exit 1 -+PKGConfig.have_package('libgnomeui-2.0') or exit 1 - setup_win32(PACKAGE_NAME) - - add_depend_package("glib2", "glib/src", TOPDIR) -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 - -+#include -+#include -+ - #include - #include - #include diff --git a/ruby-gnome2-libxul.patch b/ruby-gnome2-libxul.patch deleted file mode 100644 index 2af6588..0000000 --- a/ruby-gnome2-libxul.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff -urN ruby-gnome2-all-0.16.0/gtkmozembed/extconf.rb ruby-gnome2-all-0.16.0.new/gtkmozembed/extconf.rb ---- ruby-gnome2-all-0.16.0/gtkmozembed/extconf.rb 2006-12-29 14:17:28.000000000 +0100 -+++ ruby-gnome2-all-0.16.0.new/gtkmozembed/extconf.rb 2008-07-08 22:34:51.000000000 +0200 -@@ -45,7 +45,7 @@ - - if mozilla_path - # please comment the CFLAGS line if you don't want a default comp_path -- $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." -@@ -58,12 +58,12 @@ - add_depend_package("glib2", "glib/src", TOPDIR) - add_depend_package("gtk2", "gtk/src", TOPDIR) - --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 -@@ -113,7 +113,8 @@ - * - * path: the mozilla component path (String). - * -- * You should call this method before the constructor. -+ * You should call this method before the constructor. It's -+ * used in gecko-libs 1.8. - * - * The path should be something like /usr/lib/mozilla or - * /usr/lib/mozilla-firefox depending on your installation and -@@ -133,6 +134,33 @@ - return Qnil; - } - -+/* -+ * Class method: set_path(path) -+ * -+ * path: the mozilla component path (String). -+ * -+ * You should call this method before the constructor. This -+ * function is used in gecko-libs 1.9 instead of the old one, -+ * set_comp_path(String). -+ * -+ * The path should be something like /usr/lib/mozilla or -+ * /usr/lib/mozilla-firefox depending on your installation and -+ * distribution. -+ * -+ * We call this inside Init_gtkmozembed() and set the value at -+ * compile time before initializing XPCOM. -+ * -+ * Returns: nil. -+ * -+ */ -+static VALUE -+moz_set_path(self, path) -+ VALUE self, path; -+{ -+ gtk_moz_embed_set_path(RVAL2CSTR(path)); -+ return Qnil; -+} -+ - /* - * Method: load_url(url) - * -@@ -315,6 +343,18 @@ - return CSTR2RVAL(title); - } - -+ -+#ifndef GTK_TYPE_MOZ_EMBED_RELOAD_FLAGS -+GtkType gtk_moz_embed_reload_flags_get_type(void); -+#define GTK_TYPE_MOZ_EMBED_RELOAD_FLAGS \ -+ (gtk_moz_embed_reload_flags_get_type()) -+#endif -+#ifndef GTK_TYPE_MOZ_EMBED_CHROME_FLAGS -+GtkType gtk_moz_embed_chrome_flags_get_type(void); -+#define GTK_TYPE_MOZ_EMBED_CHROME_FLAGS \ -+ (gtk_moz_embed_chrome_flags_get_type()) -+#endif -+ - /* - * Method: reload(flags) - * -@@ -680,6 +720,8 @@ - moz_set_profile_path, 2); - rb_define_module_function(moz, "set_comp_path", - moz_set_comp_path, 1); -+ rb_define_module_function(moz, "set_path", -+ moz_set_path, 1); - - rb_define_method(moz, "initialize", moz_initialize, 0); - rb_define_method(moz, "load_url", moz_load_url, 1); diff --git a/ruby-gnome2-ruby19.patch b/ruby-gnome2-ruby19.patch deleted file mode 100644 index f7751b7..0000000 --- a/ruby-gnome2-ruby19.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ruby-gnome2-all-0.19.4/glib/src/lib/glib-mkenums.rb.orig 2010-07-31 23:18:04.303915210 +0200 -+++ ruby-gnome2-all-0.19.4/glib/src/lib/glib-mkenums.rb 2010-07-31 23:28:22.970166438 +0200 -@@ -145,7 +145,7 @@ - @targets = [] - files.each do |path| - data = "" -- File.open(path) do |i| -+ File.open(path, "r:ASCII-8BIT") do |i| - data = i.read - end - @targets << [path, EnumDefinition.parse(data, g_type_prefix, options)]