From 4eaecc6a2d9bb64972f7364400b6d0fe6ed891cc Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sun, 28 Aug 2005 19:08:08 +0000 Subject: [PATCH] * Fix IDL installation [1] * Correct path to the icon in the Desktop item [2] * Add a patch to fix potential crashes with newer versions of GTK+ that can occur when closing windows [3] PR: 84896 [2] Submitted by: mezz [1] chinsan [2] Obtained from: https://bugzilla.mozilla.org/show_bug.cgi?id=300226 [3] --- www/mozilla-devel/Makefile | 4 +++- www/mozilla-devel/files/mozilla-devel.desktop.in | 2 +- .../patch-mozilla_widget_src_gtk2_mozdrawingarea.c | 12 ++++++++++++ www/seamonkey/Makefile | 4 +++- www/seamonkey/files/mozilla-devel.desktop.in | 2 +- .../patch-mozilla_widget_src_gtk2_mozdrawingarea.c | 12 ++++++++++++ www/seamonkey2/Makefile | 4 +++- www/seamonkey2/files/mozilla-devel.desktop.in | 2 +- .../patch-mozilla_widget_src_gtk2_mozdrawingarea.c | 12 ++++++++++++ 9 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 www/mozilla-devel/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c create mode 100644 www/seamonkey/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c create mode 100644 www/seamonkey2/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile index 3bc4f5640d76..9e4703bd4c4d 100644 --- a/www/mozilla-devel/Makefile +++ b/www/mozilla-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME?= mozilla PORTVERSION= 1.8.b1 -PORTREVISION?= 3 +PORTREVISION?= 4 PORTEPOCH?= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -213,6 +213,8 @@ USE_GNOME+= gnomehier .endif post-patch: + @${REINPLACE_CMD} -e 's/%{idldir}/%idldir%/g' \ + ${WRKSRC}/build/unix/mozilla-config.in @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ diff --git a/www/mozilla-devel/files/mozilla-devel.desktop.in b/www/mozilla-devel/files/mozilla-devel.desktop.in index 5f05c0464d34..88d7475a54f6 100644 --- a/www/mozilla-devel/files/mozilla-devel.desktop.in +++ b/www/mozilla-devel/files/mozilla-devel.desktop.in @@ -164,6 +164,6 @@ Exec=mozilla-devel %U StartupNotify=true Terminal=false Type=Application -Icon=%%PREFIX%%/lib/mozilla/chrome/icons/default/default.xpm +Icon=%%PREFIX%%/lib/mozilla-devel/chrome/icons/default/default.xpm Categories=Application;Network; MimeType=text/html;text/xml;application/xhtml+xml; diff --git a/www/mozilla-devel/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c b/www/mozilla-devel/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c new file mode 100644 index 000000000000..9e58b51864f2 --- /dev/null +++ b/www/mozilla-devel/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c @@ -0,0 +1,12 @@ +--- widget/src/gtk2/mozdrawingarea.c.orig Tue Apr 30 12:29:00 2002 ++++ widget/src/gtk2/mozdrawingarea.c Thu Aug 18 22:27:27 2005 +@@ -168,7 +168,9 @@ + + drawingarea = MOZ_DRAWINGAREA(object); + ++ gdk_window_set_user_data(drawingarea->inner_window, NULL); + gdk_window_destroy(drawingarea->inner_window); ++ gdk_window_set_user_data(drawingarea->clip_window, NULL); + gdk_window_destroy(drawingarea->clip_window); + + (* parent_class->finalize) (object); diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 3bc4f5640d76..9e4703bd4c4d 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -7,7 +7,7 @@ PORTNAME?= mozilla PORTVERSION= 1.8.b1 -PORTREVISION?= 3 +PORTREVISION?= 4 PORTEPOCH?= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -213,6 +213,8 @@ USE_GNOME+= gnomehier .endif post-patch: + @${REINPLACE_CMD} -e 's/%{idldir}/%idldir%/g' \ + ${WRKSRC}/build/unix/mozilla-config.in @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ diff --git a/www/seamonkey/files/mozilla-devel.desktop.in b/www/seamonkey/files/mozilla-devel.desktop.in index 5f05c0464d34..88d7475a54f6 100644 --- a/www/seamonkey/files/mozilla-devel.desktop.in +++ b/www/seamonkey/files/mozilla-devel.desktop.in @@ -164,6 +164,6 @@ Exec=mozilla-devel %U StartupNotify=true Terminal=false Type=Application -Icon=%%PREFIX%%/lib/mozilla/chrome/icons/default/default.xpm +Icon=%%PREFIX%%/lib/mozilla-devel/chrome/icons/default/default.xpm Categories=Application;Network; MimeType=text/html;text/xml;application/xhtml+xml; diff --git a/www/seamonkey/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c b/www/seamonkey/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c new file mode 100644 index 000000000000..9e58b51864f2 --- /dev/null +++ b/www/seamonkey/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c @@ -0,0 +1,12 @@ +--- widget/src/gtk2/mozdrawingarea.c.orig Tue Apr 30 12:29:00 2002 ++++ widget/src/gtk2/mozdrawingarea.c Thu Aug 18 22:27:27 2005 +@@ -168,7 +168,9 @@ + + drawingarea = MOZ_DRAWINGAREA(object); + ++ gdk_window_set_user_data(drawingarea->inner_window, NULL); + gdk_window_destroy(drawingarea->inner_window); ++ gdk_window_set_user_data(drawingarea->clip_window, NULL); + gdk_window_destroy(drawingarea->clip_window); + + (* parent_class->finalize) (object); diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile index 3bc4f5640d76..9e4703bd4c4d 100644 --- a/www/seamonkey2/Makefile +++ b/www/seamonkey2/Makefile @@ -7,7 +7,7 @@ PORTNAME?= mozilla PORTVERSION= 1.8.b1 -PORTREVISION?= 3 +PORTREVISION?= 4 PORTEPOCH?= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -213,6 +213,8 @@ USE_GNOME+= gnomehier .endif post-patch: + @${REINPLACE_CMD} -e 's/%{idldir}/%idldir%/g' \ + ${WRKSRC}/build/unix/mozilla-config.in @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ diff --git a/www/seamonkey2/files/mozilla-devel.desktop.in b/www/seamonkey2/files/mozilla-devel.desktop.in index 5f05c0464d34..88d7475a54f6 100644 --- a/www/seamonkey2/files/mozilla-devel.desktop.in +++ b/www/seamonkey2/files/mozilla-devel.desktop.in @@ -164,6 +164,6 @@ Exec=mozilla-devel %U StartupNotify=true Terminal=false Type=Application -Icon=%%PREFIX%%/lib/mozilla/chrome/icons/default/default.xpm +Icon=%%PREFIX%%/lib/mozilla-devel/chrome/icons/default/default.xpm Categories=Application;Network; MimeType=text/html;text/xml;application/xhtml+xml; diff --git a/www/seamonkey2/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c b/www/seamonkey2/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c new file mode 100644 index 000000000000..9e58b51864f2 --- /dev/null +++ b/www/seamonkey2/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c @@ -0,0 +1,12 @@ +--- widget/src/gtk2/mozdrawingarea.c.orig Tue Apr 30 12:29:00 2002 ++++ widget/src/gtk2/mozdrawingarea.c Thu Aug 18 22:27:27 2005 +@@ -168,7 +168,9 @@ + + drawingarea = MOZ_DRAWINGAREA(object); + ++ gdk_window_set_user_data(drawingarea->inner_window, NULL); + gdk_window_destroy(drawingarea->inner_window); ++ gdk_window_set_user_data(drawingarea->clip_window, NULL); + gdk_window_destroy(drawingarea->clip_window); + + (* parent_class->finalize) (object);