r31494 - in /trunk/libgtk2-mozembed-perl/debian/patches: series use-the-right-xul whatis-entry
ryan52-guest at users.alioth.debian.org
ryan52-guest at users.alioth.debian.org
Fri Mar 6 06:06:02 UTC 2009
Author: ryan52-guest
Date: Fri Mar 6 06:05:29 2009
New Revision: 31494
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=31494
Log:
clean up patch
Modified:
trunk/libgtk2-mozembed-perl/debian/patches/series
trunk/libgtk2-mozembed-perl/debian/patches/use-the-right-xul
trunk/libgtk2-mozembed-perl/debian/patches/whatis-entry
Modified: trunk/libgtk2-mozembed-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/debian/patches/series?rev=31494&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/debian/patches/series (original)
+++ trunk/libgtk2-mozembed-perl/debian/patches/series Fri Mar 6 06:05:29 2009
@@ -1,2 +1,2 @@
+whatis-entry
use-the-right-xul
-whatis-entry
Modified: trunk/libgtk2-mozembed-perl/debian/patches/use-the-right-xul
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/debian/patches/use-the-right-xul?rev=31494&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/debian/patches/use-the-right-xul (original)
+++ trunk/libgtk2-mozembed-perl/debian/patches/use-the-right-xul Fri Mar 6 06:05:29 2009
@@ -53,7 +53,7 @@
/* ------------------------------------------------------------------------- */
-@@ -134,145 +135,55 @@
+@@ -134,143 +135,49 @@
/* gint (* dom_key_press) (GtkMozEmbed *embed, gpointer dom_event); */
@@ -159,38 +159,34 @@
-#ifdef GTK_MOZ_EMBED_PERL_XULRUNNER_PATH
- gtk_moz_embed_set_path (GTK_MOZ_EMBED_PERL_XULRUNNER_PATH);
-#endif /* GTK_MOZ_EMBED_PERL_XULRUNNER_PATH */
-+ /* copied from the gnome-python-extras package's patch */
++ /* copied from the gnome-python-extras package's patch */
+ 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);
-+
++ nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
++ if (NS_FAILED(rv)) {
++ croak("failed 1");
++ };
++
+ // Startup the XPCOM Glue that links us up with XPCOM.
+ XPCOMGlueStartup(xpcomLocation);
+ if (NS_FAILED(rv)) {
-+ printf("failed 2\n");
-+ return;
++ croak("failed 2");
+ }
-+ printf("before 3\n");
-+
++
+ rv = GTKEmbedGlueStartup();
-+ if (NS_FAILED(rv)) {printf("location: %s \n", xpcomLocation);
-+ printf("failed 3\n");
-+ return;
++ if (NS_FAILED(rv)) {
++ croak("failed 3");
+ }
-+
++
+ gtk_moz_embed_set_comp_path(xpcomLocation);
-+
++
+ char *lastSlash = strrchr(xpcomLocation, '/');
+ if (lastSlash)
+ *lastSlash = '\0';
-+
++
+ gtk_moz_embed_set_path(xpcomLocation);
+
gperl_signal_set_marshaller_for (GTK_TYPE_MOZ_EMBED,
@@ -231,12 +227,9 @@
+#include "register.xsh"
+#include "boot.xsh"
--=for object Gtk2::MozEmbed::main
-+=for object Gtk2::MozEmbed::main - Perl interface to the Mozilla embedding widget
-
- =cut
-
-@@ -539,31 +450,6 @@
+ =for object Gtk2::MozEmbed::main
+
+@@ -539,31 +446,6 @@
OUTPUT:
RETVAL
Modified: trunk/libgtk2-mozembed-perl/debian/patches/whatis-entry
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-mozembed-perl/debian/patches/whatis-entry?rev=31494&op=diff
==============================================================================
--- trunk/libgtk2-mozembed-perl/debian/patches/whatis-entry (original)
+++ trunk/libgtk2-mozembed-perl/debian/patches/whatis-entry Fri Mar 6 06:05:29 2009
@@ -2,7 +2,7 @@
--- a/xs/GtkMozEmbed.xs
+++ b/xs/GtkMozEmbed.xs
-@@ -453,7 +453,7 @@
+@@ -567,7 +567,7 @@
# --------------------------------------------------------------------------- #
More information about the Pkg-perl-cvs-commits
mailing list