[DRE-commits] r3668 - in packages/ruby-gnome2/trunk/debian: . patches
Arnaud Cornet
acornet at alioth.debian.org
Thu Jun 25 22:13:17 UTC 2009
Author: acornet
Date: 2009-06-25 22:13:17 +0000 (Thu, 25 Jun 2009)
New Revision: 3668
Removed:
packages/ruby-gnome2/trunk/debian/patches/gtk_fs_error.patch
packages/ruby-gnome2/trunk/debian/patches/xulrunner-1.9.patch
Modified:
packages/ruby-gnome2/trunk/debian/changelog
packages/ruby-gnome2/trunk/debian/control
packages/ruby-gnome2/trunk/debian/patches/data-from-selection.patch
packages/ruby-gnome2/trunk/debian/patches/drag-signals.patch
packages/ruby-gnome2/trunk/debian/patches/gtkmozembed-rpath.patch
packages/ruby-gnome2/trunk/debian/patches/series
Log:
New upstream release.
Remove xulrunner-1.9.patch now upstream.
Remove gtk_fs_error.patch now upstream.
Depend on poppler-glib > 0.8.0.
Refresh patches.
Modified: packages/ruby-gnome2/trunk/debian/changelog
===================================================================
--- packages/ruby-gnome2/trunk/debian/changelog 2009-06-23 21:25:53 UTC (rev 3667)
+++ packages/ruby-gnome2/trunk/debian/changelog 2009-06-25 22:13:17 UTC (rev 3668)
@@ -1,4 +1,4 @@
-ruby-gnome2 (0.18.1-2) UNRELEASED; urgency=low
+ruby-gnome2 (0.19.0-1) UNRELEASED; urgency=low
[ Arnaud Cornet ]
* NOT RELEASED YET
@@ -13,8 +13,15 @@
[ Ryan Niebur ]
* fix watch file
- -- Arnaud Cornet <acornet at debian.org> Sat, 04 Apr 2009 12:39:33 +0200
+ [ Arnaud Cornet ]
+ * New upstream release (Closes: #534483).
+ * Remove xulrunner-1.9.patch now upstream.
+ * Remove gtk_fs_error.patch now upstream.
+ * Depend on poppler-glib > 0.8.0.
+ * Refresh patches.
+ -- Arnaud Cornet <acornet at debian.org> Fri, 26 Jun 2009 00:12:52 +0200
+
ruby-gnome2 (0.18.1-1) unstable; urgency=low
[ Arnaud Cornet ]
Modified: packages/ruby-gnome2/trunk/debian/control
===================================================================
--- packages/ruby-gnome2/trunk/debian/control 2009-06-23 21:25:53 UTC (rev 3667)
+++ packages/ruby-gnome2/trunk/debian/control 2009-06-25 22:13:17 UTC (rev 3668)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Arnaud Cornet <acornet at debian.org>
Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Paul van Tilburg <paulvt at debian.org>, Michael Schutte <m.schutte.jr at gmail.com>, Antonio Terceiro <terceiro at softwarelivre.org>
-Build-Depends: debhelper (>= 7), quilt, ruby, ruby1.8, ruby1.8-dev, libgnomeui-dev, libglade2-dev, libgtkhtml2-dev, libpng12-dev, libgtkglext1-dev, libxmu-dev, libgtksourceview-dev, libpanel-applet2-dev, libgnomeprint2.2-dev (>= 2.8.0), libgnomeprintui2.2-dev (>= 2.6.0), librsvg2-dev (>= 2.8.0), libcairo-ruby, xulrunner-dev (>= 1.9~b5-4), libvte-dev (>= 0.12.1), libpoppler-glib-dev (>= 0.5.2), pkg-config, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgoocanvas-dev (>= 0.8.0), libgtksourceview2.0-dev
+Build-Depends: debhelper (>= 7), quilt, ruby, ruby1.8, ruby1.8-dev, libgnomeui-dev, libglade2-dev, libgtkhtml2-dev, libpng12-dev, libgtkglext1-dev, libxmu-dev, libgtksourceview-dev, libpanel-applet2-dev, libgnomeprint2.2-dev (>= 2.8.0), libgnomeprintui2.2-dev (>= 2.6.0), librsvg2-dev (>= 2.8.0), libcairo-ruby, xulrunner-dev (>= 1.9~b5-4), libvte-dev (>= 0.12.1), libpoppler-glib-dev (>= 0.8.0), pkg-config, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgoocanvas-dev (>= 0.8.0), libgtksourceview2.0-dev
Standards-Version: 3.8.1
Homepage: http://ruby-gnome2.sourceforge.jp/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/ruby-gnome2/trunk/
Modified: packages/ruby-gnome2/trunk/debian/patches/data-from-selection.patch
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/data-from-selection.patch 2009-06-23 21:25:53 UTC (rev 3667)
+++ packages/ruby-gnome2/trunk/debian/patches/data-from-selection.patch 2009-06-25 22:13:17 UTC (rev 3668)
@@ -1,94 +1,95 @@
-diff -Naur ruby-gnome2-all-0.14.1/gtk/src/rbgtktreedrag.c ruby-gnome2-0.14.1-new/gtk/src/rbgtktreedrag.c
---- ruby-gnome2-all-0.14.1/gtk/src/rbgtktreedrag.c 2006-08-16 18:48:48.000000000 +0200
-+++ ruby-gnome2-0.14.1-new/gtk/src/rbgtktreedrag.c 2006-08-16 18:47:45.000000000 +0200
-@@ -54,24 +54,25 @@
- }
-
- static void
--_rb_marshal_BOOLEAN__BOXED_BOXED(GClosure *closure,
-- GValue *return_value,
-- guint n_param_values,
-- const GValue *param_values,
-- gpointer invocation_hint,
-- gpointer marshal_data)
--{
-- typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_BOXED) (gpointer data1,
-- gpointer arg_1,
-- gpointer arg_2,
-- gpointer data2);
-- register GMarshalFunc_BOOLEAN__BOXED_BOXED callback;
-+_rb_marshal_BOOLEAN__BOXED_OBJECT_BOXED(GClosure *closure,
-+ GValue *return_value,
-+ guint n_param_values,
-+ const GValue *param_values,
-+ gpointer invocation_hint,
-+ gpointer marshal_data)
-+{
-+ typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_OBJECT_BOXED) (gpointer data1,
-+ gpointer arg_1,
-+ gpointer arg_2,
-+ gpointer arg_3,
-+ gpointer data2);
-+ register GMarshalFunc_BOOLEAN__BOXED_OBJECT_BOXED callback;
- register GCClosure *cc = (GCClosure*) closure;
- register gpointer data1, data2;
- gboolean v_return;
-
- g_return_if_fail (return_value != NULL);
-- g_return_if_fail (n_param_values == 3);
-+ g_return_if_fail (n_param_values == 4);
-
- if (G_CCLOSURE_SWAP_DATA (closure))
- {
-@@ -83,11 +84,12 @@
- data1 = g_value_peek_pointer (param_values + 0);
- data2 = closure->data;
- }
-- callback = (GMarshalFunc_BOOLEAN__BOXED_BOXED) (marshal_data ? marshal_data : cc->callback);
-+ callback = (GMarshalFunc_BOOLEAN__BOXED_OBJECT_BOXED) (marshal_data ? marshal_data : cc->callback);
-
- v_return = callback (data1,
- g_marshal_value_peek_boxed (param_values + 1),
-- g_marshal_value_peek_boxed (param_values + 2),
-+ g_marshal_value_peek_object (param_values + 2),
-+ g_marshal_value_peek_boxed (param_values + 3),
- data2);
-
- g_value_set_boolean (return_value, v_return);
-@@ -110,10 +112,11 @@
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
-- _rb_marshal_BOOLEAN__BOXED_BOXED,
-- G_TYPE_BOOLEAN, 2,
-+ _rb_marshal_BOOLEAN__BOXED_OBJECT_BOXED,
-+ G_TYPE_BOOLEAN, 3,
- GTK_TYPE_TREE_PATH,
-- GTK_TYPE_SELECTION_DATA);
-+ GTK_TYPE_TREE_MODEL,
-+ GTK_TYPE_TREE_PATH);
- }
-
- static gboolean
-@@ -146,11 +149,20 @@
-
- guint signal_id = g_signal_lookup("row-drop-possible", G_TYPE_FROM_INSTANCE(drag_dest));
-
-+ GtkTreeModel* source_model = NULL;
-+ GtkTreePath* source_path = NULL;
-+ /* The selection_data must be of type GTK_TREE_MODEL_ROW, otherwise
-+ the get function returns false and the out values are hopefully left
-+ as-is. */
-+ gtk_tree_get_row_drag_data(selection_data, &source_model, &source_path);
-+
- if(g_signal_has_handler_pending(drag_dest, signal_id, 0, FALSE))
-- g_signal_emit(drag_dest, signal_id, 0, dest_path, selection_data, &retval);
-+ g_signal_emit(drag_dest, signal_id, 0, dest_path, source_model, source_path, &retval);
- else
- retval = TRUE; /* default value */
-
-+ if(source_path)
-+ gtk_tree_path_free(source_path);
- return retval;
- }
-
+Index: ruby-gnome2-0.19.0/gtk/src/rbgtktreedrag.c
+===================================================================
+--- ruby-gnome2-0.19.0.orig/gtk/src/rbgtktreedrag.c 2009-06-25 23:46:25.679853278 +0200
++++ ruby-gnome2-0.19.0/gtk/src/rbgtktreedrag.c 2009-06-25 23:47:45.155853333 +0200
+@@ -54,24 +54,25 @@
+ }
+
+ static void
+-_rb_marshal_BOOLEAN__BOXED_BOXED(GClosure *closure,
+- GValue *return_value,
+- guint n_param_values,
+- const GValue *param_values,
+- gpointer invocation_hint,
+- gpointer marshal_data)
+-{
+- typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_BOXED) (gpointer data1,
+- gpointer arg_1,
+- gpointer arg_2,
+- gpointer data2);
+- register GMarshalFunc_BOOLEAN__BOXED_BOXED callback;
++_rb_marshal_BOOLEAN__BOXED_OBJECT_BOXED(GClosure *closure,
++ GValue *return_value,
++ guint n_param_values,
++ const GValue *param_values,
++ gpointer invocation_hint,
++ gpointer marshal_data)
++{
++ typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_OBJECT_BOXED) (gpointer data1,
++ gpointer arg_1,
++ gpointer arg_2,
++ gpointer arg_3,
++ gpointer data2);
++ register GMarshalFunc_BOOLEAN__BOXED_OBJECT_BOXED callback;
+ register GCClosure *cc = (GCClosure*) closure;
+ register gpointer data1, data2;
+ gboolean v_return;
+
+ g_return_if_fail (return_value != NULL);
+- g_return_if_fail (n_param_values == 3);
++ g_return_if_fail (n_param_values == 4);
+
+ if (G_CCLOSURE_SWAP_DATA (closure))
+ {
+@@ -83,11 +84,12 @@
+ data1 = g_value_peek_pointer (param_values + 0);
+ data2 = closure->data;
+ }
+- callback = (GMarshalFunc_BOOLEAN__BOXED_BOXED) (marshal_data ? marshal_data : cc->callback);
++ callback = (GMarshalFunc_BOOLEAN__BOXED_OBJECT_BOXED) (marshal_data ? marshal_data : cc->callback);
+
+ v_return = callback (data1,
+ g_marshal_value_peek_boxed (param_values + 1),
+- g_marshal_value_peek_boxed (param_values + 2),
++ g_marshal_value_peek_object (param_values + 2),
++ g_marshal_value_peek_boxed (param_values + 3),
+ data2);
+
+ g_value_set_boolean (return_value, v_return);
+@@ -110,10 +112,11 @@
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+- _rb_marshal_BOOLEAN__BOXED_BOXED,
+- G_TYPE_BOOLEAN, 2,
++ _rb_marshal_BOOLEAN__BOXED_OBJECT_BOXED,
++ G_TYPE_BOOLEAN, 3,
+ GTK_TYPE_TREE_PATH,
+- GTK_TYPE_SELECTION_DATA);
++ GTK_TYPE_TREE_MODEL,
++ GTK_TYPE_TREE_PATH);
+ }
+
+ static gboolean
+@@ -146,11 +149,20 @@
+
+ guint signal_id = g_signal_lookup("row-drop-possible", G_TYPE_FROM_INSTANCE(drag_dest));
+
++ GtkTreeModel* source_model = NULL;
++ GtkTreePath* source_path = NULL;
++ /* The selection_data must be of type GTK_TREE_MODEL_ROW, otherwise
++ the get function returns false and the out values are hopefully left
++ as-is. */
++ gtk_tree_get_row_drag_data(selection_data, &source_model, &source_path);
++
+ if(g_signal_has_handler_pending(drag_dest, signal_id, 0, FALSE))
+- g_signal_emit(drag_dest, signal_id, 0, dest_path, selection_data, &retval);
++ g_signal_emit(drag_dest, signal_id, 0, dest_path, source_model, source_path, &retval);
+ else
+ retval = TRUE; /* default value */
+
++ if(source_path)
++ gtk_tree_path_free(source_path);
+ return retval;
+ }
+
Modified: packages/ruby-gnome2/trunk/debian/patches/drag-signals.patch
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/drag-signals.patch 2009-06-23 21:25:53 UTC (rev 3667)
+++ packages/ruby-gnome2/trunk/debian/patches/drag-signals.patch 2009-06-25 22:13:17 UTC (rev 3668)
@@ -1,7 +1,7 @@
-Index: ruby-gnome2-0.17.0~rc1/gtk/src/rbgtkliststore.c
+Index: ruby-gnome2-0.19.0/gtk/src/rbgtkliststore.c
===================================================================
---- ruby-gnome2-0.17.0~rc1.orig/gtk/src/rbgtkliststore.c 2008-06-06 16:03:41.000000000 +0200
-+++ ruby-gnome2-0.17.0~rc1/gtk/src/rbgtkliststore.c 2008-06-12 00:08:00.000000000 +0200
+--- ruby-gnome2-0.19.0.orig/gtk/src/rbgtkliststore.c 2009-05-18 14:47:08.000000000 +0200
++++ ruby-gnome2-0.19.0/gtk/src/rbgtkliststore.c 2009-06-25 23:46:25.679853278 +0200
@@ -11,6 +11,8 @@
#include "global.h"
@@ -9,9 +9,9 @@
+#include "rbgtktreedrag.h"
+
#define _SELF(s) (GTK_LIST_STORE(RVAL2GOBJ(s)))
- #define ITR2RVAL(i) (BOXED2RVAL(i, GTK_TYPE_TREE_ITER))
- #define RVAL2ITR(i) ((GtkTreeIter*)RVAL2BOXED(i, GTK_TYPE_TREE_ITER))
-@@ -34,7 +36,8 @@
+
+ static ID id_to_a, id_size;
+@@ -32,7 +34,8 @@
buf[cnt] = CLASS2GTYPE(argv[cnt]);
}
@@ -21,7 +21,7 @@
G_INITIALIZE(self, store);
-@@ -383,12 +386,12 @@
+@@ -381,12 +384,12 @@
void
Init_gtk_list_store()
{
@@ -36,10 +36,10 @@
(rbgtkiter_set_value_func)>k_list_store_set_value);
rb_define_method(ls, "initialize", lstore_initialize, -1);
rb_define_method(ls, "set_column_types", lstore_set_column_types, -1);
-Index: ruby-gnome2-0.17.0~rc1/gtk/src/rbgtktreedrag.c
+Index: ruby-gnome2-0.19.0/gtk/src/rbgtktreedrag.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ruby-gnome2-0.17.0~rc1/gtk/src/rbgtktreedrag.c 2008-06-12 00:06:25.000000000 +0200
++++ ruby-gnome2-0.19.0/gtk/src/rbgtktreedrag.c 2009-06-25 23:46:25.679853278 +0200
@@ -0,0 +1,184 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/************************************************
@@ -225,10 +225,10 @@
+
+G_DEFINE_TYPE(RbDndTreeStore, rb_dnd_tree_store, GTK_TYPE_TREE_STORE)
+G_DEFINE_TYPE(RbDndListStore, rb_dnd_list_store, GTK_TYPE_LIST_STORE)
-Index: ruby-gnome2-0.17.0~rc1/gtk/src/rbgtktreedrag.h
+Index: ruby-gnome2-0.19.0/gtk/src/rbgtktreedrag.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ruby-gnome2-0.17.0~rc1/gtk/src/rbgtktreedrag.h 2008-06-12 00:06:25.000000000 +0200
++++ ruby-gnome2-0.19.0/gtk/src/rbgtktreedrag.h 2009-06-25 23:46:25.679853278 +0200
@@ -0,0 +1,49 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/************************************************
@@ -279,10 +279,10 @@
+rb_dnd_list_store_get_type(void) G_GNUC_CONST;
+
+#endif /* __RBGTKTREEDRAG_H__ */
-Index: ruby-gnome2-0.17.0~rc1/gtk/src/rbgtktreestore.c
+Index: ruby-gnome2-0.19.0/gtk/src/rbgtktreestore.c
===================================================================
---- ruby-gnome2-0.17.0~rc1.orig/gtk/src/rbgtktreestore.c 2008-06-06 16:03:41.000000000 +0200
-+++ ruby-gnome2-0.17.0~rc1/gtk/src/rbgtktreestore.c 2008-06-12 00:06:25.000000000 +0200
+--- ruby-gnome2-0.19.0.orig/gtk/src/rbgtktreestore.c 2009-05-18 14:47:08.000000000 +0200
++++ ruby-gnome2-0.19.0/gtk/src/rbgtktreestore.c 2009-06-25 23:46:25.683853269 +0200
@@ -11,6 +11,8 @@
#include "global.h"
@@ -290,9 +290,9 @@
+#include "rbgtktreedrag.h"
+
#define _SELF(s) (GTK_TREE_STORE(RVAL2GOBJ(s)))
- #define ITR2RVAL(i) (BOXED2RVAL(i, GTK_TYPE_TREE_ITER))
- #define RVAL2ITR(i) ((GtkTreeIter*)RVAL2BOXED(i, GTK_TYPE_TREE_ITER))
-@@ -32,7 +34,8 @@
+
+ static VALUE
+@@ -30,7 +32,8 @@
buf[cnt] = CLASS2GTYPE(argv[cnt]);
}
@@ -302,7 +302,7 @@
G_INITIALIZE(self, store);
-@@ -351,9 +354,9 @@
+@@ -349,9 +352,9 @@
void
Init_gtk_tree_store()
{
Deleted: packages/ruby-gnome2/trunk/debian/patches/gtk_fs_error.patch
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/gtk_fs_error.patch 2009-06-23 21:25:53 UTC (rev 3667)
+++ packages/ruby-gnome2/trunk/debian/patches/gtk_fs_error.patch 2009-06-25 22:13:17 UTC (rev 3668)
@@ -1,20 +0,0 @@
---- a/gtk/src/rbgtkfilechooser.c
-+++ b/gtk/src/rbgtkfilechooser.c
-@@ -326,7 +326,7 @@ Init_gtk_file_chooser()
- #if GTK_CHECK_VERSION(2,4,0)
-
- VALUE gFileCho = G_DEF_INTERFACE(GTK_TYPE_FILE_CHOOSER, "FileChooser", mGtk);
--#ifdef HAVE_GTK_GTKFILESYSTEM_H
-+#ifdef GTK_FILE_SYSTEM_ERROR
- VALUE eFileSystemError;
- #endif
-
-@@ -372,7 +372,7 @@ Init_gtk_file_chooser()
- G_DEF_ERROR(GTK_FILE_CHOOSER_ERROR, "FileChooserError", mGtk, rb_eRuntimeError,
- GTK_TYPE_FILE_CHOOSER_ERROR);
-
--#ifdef HAVE_GTK_GTKFILESYSTEM_H
-+#ifdef GTK_FILE_SYSTEM_ERROR
- /* GtkFileSystemError */
- eFileSystemError = G_DEF_ERROR2(GTK_FILE_SYSTEM_ERROR, "FileSystemError",
- mGtk, rb_eRuntimeError);
Modified: packages/ruby-gnome2/trunk/debian/patches/gtkmozembed-rpath.patch
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/gtkmozembed-rpath.patch 2009-06-23 21:25:53 UTC (rev 3667)
+++ packages/ruby-gnome2/trunk/debian/patches/gtkmozembed-rpath.patch 2009-06-25 22:13:17 UTC (rev 3668)
@@ -1,12 +1,12 @@
-Index: ruby-gnome2-0.16.0/gtkmozembed/extconf.rb
+Index: ruby-gnome2-0.19.0/gtkmozembed/extconf.rb
===================================================================
---- ruby-gnome2-0.16.0.orig/gtkmozembed/extconf.rb 2007-05-24 21:31:10.000000000 +0200
-+++ ruby-gnome2-0.16.0/gtkmozembed/extconf.rb 2007-05-24 21:31:12.000000000 +0200
-@@ -46,7 +46,6 @@
- if mozpath
+--- ruby-gnome2-0.19.0.orig/gtkmozembed/extconf.rb 2009-05-18 14:47:19.000000000 +0200
++++ ruby-gnome2-0.19.0/gtkmozembed/extconf.rb 2009-06-25 23:48:37.956096059 +0200
+@@ -47,7 +47,6 @@
+ if mozilla_path
# please comment the CFLAGS line if you don't want a default comp_path
- $CFLAGS << " -DDEFAULT_MOZILLA_FIVE_HOME='\"" << mozpath << "\"' "
-- $LDFLAGS << " -Wl,-rpath " << mozpath
+ $CFLAGS << " -DDEFAULT_MOZILLA_FIVE_HOME='\"#{mozilla_path}\"' "
+- $LDFLAGS << " -Wl,-rpath #{mozilla_path}"
else
$stderr.puts "${package_id}.pc cannot be found."
exit 1
Modified: packages/ruby-gnome2/trunk/debian/patches/series
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/series 2009-06-23 21:25:53 UTC (rev 3667)
+++ packages/ruby-gnome2/trunk/debian/patches/series 2009-06-25 22:13:17 UTC (rev 3668)
@@ -3,6 +3,4 @@
extconf-strict.patch
shebangs.patch
gtkmozembed-rpath.patch
-xulrunner-1.9.patch
buildsys-abort-on-error.patch
-gtk_fs_error.patch
Deleted: packages/ruby-gnome2/trunk/debian/patches/xulrunner-1.9.patch
===================================================================
--- packages/ruby-gnome2/trunk/debian/patches/xulrunner-1.9.patch 2009-06-23 21:25:53 UTC (rev 3667)
+++ packages/ruby-gnome2/trunk/debian/patches/xulrunner-1.9.patch 2009-06-25 22:13:17 UTC (rev 3668)
@@ -1,153 +0,0 @@
-Index: ruby-gnome2-0.17.0~rc1.obsolete.0.316565399364666/gtkmozembed/extconf.rb
-===================================================================
---- ruby-gnome2-0.17.0~rc1.obsolete.0.316565399364666.orig/gtkmozembed/extconf.rb 2008-06-14 11:31:32.000000000 +0200
-+++ ruby-gnome2-0.17.0~rc1.obsolete.0.316565399364666/gtkmozembed/extconf.rb 2008-06-14 11:55:39.000000000 +0200
-@@ -3,9 +3,7 @@
- =end
-
- PACKAGE_NAME = "gtkmozembed"
--PACKAGE_IDS = ["xulrunner-gtkmozembed",
-- "firefox-gtkmozembed",
-- "mozilla-gtkmozembed"]
-+PACKAGE_IDS = ["libxul-embedding"]
-
- TOPDIR = File.expand_path(File.dirname(__FILE__) + '/..')
- MKMF_GNOME2_DIR = TOPDIR + '/glib/src/lib'
-@@ -37,28 +35,17 @@
- #
-
- PKGConfig.have_package('gtk+-2.0')
--PKGConfig.have_package(package_id)
--setup_win32(PACKAGE_NAME)
-+#PKGConfig.have_package(package_id)
-
--mozpath = PKGConfig.libs_only_L(package_id)
--mozpath.strip!.sub!(/^-L/, "")
-+$CFLAGS += " " + `pkg-config --cflags --define-variable=includetype=unstable libxul-embedding`.chomp
-+$CFLAGS.gsub!("-Wall", "")
-+$LDFLAGS += " " + `pkg-config --libs libxul-embedding`.chomp + " -lstdc++"
-
--if mozpath
-- # please comment the CFLAGS line if you don't want a default comp_path
-- $CFLAGS << " -DDEFAULT_MOZILLA_FIVE_HOME='\"" << mozpath << "\"' "
--else
-- $stderr.puts "${package_id}.pc cannot be found."
-- exit 1
--end
-+setup_win32(PACKAGE_NAME)
-
- add_depend_package("glib2", "glib/src", TOPDIR)
- add_depend_package("gtk2", "gtk/src", TOPDIR)
-
--have_library("gtkembedmoz") or exit 1
--
--have_func('gtk_moz_embed_new') or exit 1
--have_func('gtk_moz_embed_set_profile_path') or exit 1
--
- make_version_header("GTKMOZEMBED", package_id)
-
- create_makefile_at_srcdir(PACKAGE_NAME, SRCDIR,
-Index: ruby-gnome2-0.17.0~rc1.obsolete.0.316565399364666/gtkmozembed/src/rbgtkmozembed.c
-===================================================================
---- ruby-gnome2-0.17.0~rc1.obsolete.0.316565399364666.orig/gtkmozembed/src/rbgtkmozembed.c 2008-06-06 16:03:42.000000000 +0200
-+++ ruby-gnome2-0.17.0~rc1.obsolete.0.316565399364666/gtkmozembed/src/rbgtkmozembed.c 2008-06-14 11:31:32.000000000 +0200
-@@ -46,6 +46,13 @@
-
- #include "rbgtkmozembedversion.h"
-
-+# define GTK_TYPE_MOZ_EMBED_RELOAD_FLAGS (gtk_moz_embed_reload_flags_get_type ())
-+GType gtk_moz_embed_reload_flags_get_type (void);
-+
-+# undef GTK_TYPE_MOZ_EMBED_CHROME_FLAGS
-+# define GTK_TYPE_MOZ_EMBED_CHROME_FLAGS (gtk_moz_embed_chrome_flags_get_type ())
-+GType gtk_moz_embed_chrome_flags_get_type (void);
-+
- /*
- * Class: Gtk::MozEmbed
- *
-@@ -668,12 +675,10 @@
- /* */
- /*************************************************************/
-
--/** INIT **/
--
--void
--Init_gtkmozembed()
-+void do_Init_gtkmozembed()
- {
-
-+
- VALUE moz = G_DEF_CLASS(GTK_TYPE_MOZ_EMBED, "MozEmbed", mGtk);
-
- rb_define_module_function(moz, "set_profile_path",
-@@ -732,3 +737,4 @@
- #endif
-
- }
-+
-Index: ruby-gnome2-0.17.0~rc1.obsolete.0.316565399364666/gtkmozembed/src/rbgtkmozembedmodule.cpp
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ruby-gnome2-0.17.0~rc1.obsolete.0.316565399364666/gtkmozembed/src/rbgtkmozembedmodule.cpp 2008-06-14 11:31:32.000000000 +0200
-@@ -0,0 +1,61 @@
-+#include "ruby.h"
-+
-+#include "rbgtk.h"
-+
-+#ifdef XPCOM_GLUE
-+#include "gtkmozembed_glue.cpp"
-+#endif
-+
-+#include "rbgtkmozembedversion.h"
-+
-+extern "C" {
-+# define GTK_TYPE_MOZ_EMBED_RELOAD_FLAGS (gtk_moz_embed_reload_flags_get_type ())
-+GType gtk_moz_embed_reload_flags_get_type (void);
-+
-+# undef GTK_TYPE_MOZ_EMBED_CHROME_FLAGS
-+# define GTK_TYPE_MOZ_EMBED_CHROME_FLAGS (gtk_moz_embed_chrome_flags_get_type ())
-+GType gtk_moz_embed_chrome_flags_get_type (void);
-+
-+void do_Init_gtkmozembed();
-+void Init_gtkmozembed();
-+}
-+void Init_gtkmozembed()
-+{
-+#ifdef XPCOM_GLUE
-+ static const GREVersionRange greVersion = {
-+ "1.9b", PR_TRUE,
-+ "1.9.*", PR_TRUE
-+ };
-+ char xpcomLocation[4096];
-+ nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
-+ if (NS_FAILED(rv)) {
-+ printf("failed 1\n");
-+ return;
-+ } else printf("location: %s \n", xpcomLocation);
-+
-+ // Startup the XPCOM Glue that links us up with XPCOM.
-+ XPCOMGlueStartup(xpcomLocation);
-+ if (NS_FAILED(rv)) {
-+ printf("failed 2\n");
-+ return;
-+ }
-+ printf("before 3\n");
-+
-+ rv = GTKEmbedGlueStartup();
-+ if (NS_FAILED(rv)) {printf("location: %s \n", xpcomLocation);
-+ printf("failed 3\n");
-+ return;
-+ }
-+
-+ //gtk_moz_embed_set_comp_path(xpcomLocation);
-+
-+ char *lastSlash = strrchr(xpcomLocation, '/');
-+ if (lastSlash)
-+ *lastSlash = '\0';
-+
-+ gtk_moz_embed_set_path(xpcomLocation);
-+#endif
-+
-+ do_Init_gtkmozembed();
-+}
-+
More information about the Pkg-ruby-extras-commits
mailing list