- Update to 0.10.5

PR:		ports/132291
Submitted by:	Ashish Shukla <wahjava AT gmail.com> (maintainer)
Approved by:	miwi (mentor)

5 files changed, 42 insertions, 52 deletions

diff --git a/deskutils/google-gadgets/Makefile b/deskutils/google-gadgets/Makefile
index 22039ae512c7..460b6cea5aa5 100644
--- a/deskutils/google-gadgets/Makefile
+++ b/deskutils/google-gadgets/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	google-gadgets
-PORTVERSION=	0.10.4
-PORTREVISION=	1
+PORTVERSION=	0.10.5
 CATEGORIES=	deskutils
 MASTER_SITES=	http://google-gadgets-for-linux.googlecode.com/files/
 DISTNAME=	${PORTNAME}-for-linux-${PORTVERSION}
@@ -64,7 +63,7 @@ CONFIGURE_ARGS+=	--disable-gtk-host --disable-libggadget-gtk --disable-gtkmoz-br
 .elif defined(WITH_GTK)
 USE_GNOME=	gtk20
 PLIST_SUB+=	GTK=""
-CONFIGURE_ARGS+=	--enable-gtk-host
+CONFIGURE_ARGS+=	--enable-gtk-host --with-gtkmozembed=firefox-gtkmozembed
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/libstartup-notification-1.0.pc:${PORTSDIR}/x11/startup-notification
 LIB_DEPENDS+=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 .endif
diff --git a/deskutils/google-gadgets/distinfo b/deskutils/google-gadgets/distinfo
index 9f7e270e857e..4e553a433311 100644
--- a/deskutils/google-gadgets/distinfo
+++ b/deskutils/google-gadgets/distinfo
@@ -1,3 +1,3 @@
-MD5 (google-gadgets-for-linux-0.10.4.tar.bz2) = 0ef0a62e0a575388084a77759b646718
-SHA256 (google-gadgets-for-linux-0.10.4.tar.bz2) = 03ff4140070ae7518a40fef94993c1f32b02d8f65f88f69363447cff501977df
-SIZE (google-gadgets-for-linux-0.10.4.tar.bz2) = 2384725
+MD5 (google-gadgets-for-linux-0.10.5.tar.bz2) = fdad6bd761b6c603e457b5d0d92ec2f9
+SHA256 (google-gadgets-for-linux-0.10.5.tar.bz2) = 944810df4b134542a1e675e6d9518503466ce9398e8bfca5e3637d994ef5038d
+SIZE (google-gadgets-for-linux-0.10.5.tar.bz2) = 2429875
diff --git a/deskutils/google-gadgets/files/patch-configure.ac b/deskutils/google-gadgets/files/patch-configure.ac
index 027e4c820532..6f3c2890ddda 100644
--- a/deskutils/google-gadgets/files/patch-configure.ac
+++ b/deskutils/google-gadgets/files/patch-configure.ac
@@ -3,9 +3,9 @@ $FreeBSD$
 
 --- configure.ac.orig
 +++ configure.ac
-@@ -371,6 +371,13 @@
-     GGL_PLATFORM_SHORT=\"linux\"
-     GGL_PLATFORM=\"linux\"
+@@ -422,6 +422,13 @@
+     GGL_PLATFORM_SHORT="\"linux\""
+     GGL_PLATFORM="\"linux\""
      ;;
 +  *freebsd* )
 +    ggl_host_type=freebsd
@@ -17,7 +17,7 @@ $FreeBSD$
    *solaris* )
      ggl_host_type=solaris
      PREDEFINED_MACROS="$PREDEFINED_MACROS -DGGL_HOST_SOLARIS=1"
-@@ -389,6 +396,7 @@
+@@ -442,6 +449,7 @@
  AM_CONDITIONAL([GGL_HOST_MACOSX], [test x$ggl_host_type = xmacosx])
  AM_CONDITIONAL([GGL_HOST_LINUX], [test x$ggl_host_type = xlinux])
  AM_CONDITIONAL([GGL_HOST_SOLARIS], [test x$ggl_host_type = xsolaris])
@@ -25,7 +25,7 @@ $FreeBSD$
  
  AC_SUBST(PREDEFINED_MACROS)
  AC_SUBST(DEFAULT_COMPILE_FLAGS)
-@@ -489,7 +497,7 @@
+@@ -558,7 +566,7 @@
  has_qtnetwork=no
  has_qtwebkit=no
  has_qtscript=no
@@ -34,3 +34,32 @@ $FreeBSD$
    PKG_CHECK_MODULES(QT4, [QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3],
  		    [has_qt4=yes
  		     MOC=`$PKG_CONFIG --variable=moc_location QtCore`],
+@@ -749,12 +757,12 @@
+                         [has_gtkmozembed=xulrunner-gtkmozembed],
+         [has_gtkmozembed=no])
+       ;;
+-    firefox2)
++    firefox2-gtkmozembed)
+       PKG_CHECK_MODULES(GTKMOZEMBED, [firefox2-gtkmozembed],
+                         [has_gtkmozembed=firefox2-gtkmozembed],
+         [has_gtkmozembed=no])
+       ;;
+-    firefox)
++    firefox-gtkmozembed)
+       PKG_CHECK_MODULES(GTKMOZEMBED, [firefox-gtkmozembed],
+                         [has_gtkmozembed=firefox-gtkmozembed],
+         [has_gtkmozembed=no])
+@@ -783,11 +791,11 @@
+     PKG_CHECK_MODULES(LIBMOZJS, [xulrunner-js],
+ 		      [has_libmozjs=xulrunner-js],
+ 		      [has_gtkmozembed=no]) ;;
+-  firefox2)
++  firefox2-gtkmozembed)
+     PKG_CHECK_MODULES(LIBMOZJS, [firefox2-js],
+ 		      [has_libmozjs=firefox2-js],
+ 		      [has_gtkmozembed=no]) ;;
+-  firefox)
++  firefox-gtkmozembed)
+     PKG_CHECK_MODULES(LIBMOZJS, [firefox-js],
+ 		      [has_libmozjs=firefox-js],
+ 		      [has_gtkmozembed=no]) ;;
diff --git a/deskutils/google-gadgets/files/patch-extensions_gtkmoz__browser__element_browser__element.cc b/deskutils/google-gadgets/files/patch-extensions_gtkmoz__browser__element_browser__element.cc
index 7e60f7dec37b..faf4100dbe15 100644
--- a/deskutils/google-gadgets/files/patch-extensions_gtkmoz__browser__element_browser__element.cc
+++ b/deskutils/google-gadgets/files/patch-extensions_gtkmoz__browser__element_browser__element.cc
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- extensions/gtkmoz_browser_element/browser_element.cc.orig
 +++ extensions/gtkmoz_browser_element/browser_element.cc
-@@ -157,7 +157,7 @@
+@@ -164,7 +164,7 @@
        std::string up_fd_str = StringPrintf("%d", up_fds[1]);
        for (size_t i = 0; kBrowserChildNames[i]; ++i) {
          execl(kBrowserChildNames[i], kBrowserChildNames[i],
@@ -12,41 +12,3 @@ $FreeBSD$
        }
        LOG("Failed to execute browser child");
        _exit(-1);
-@@ -416,6 +416,8 @@
-           object_id_str_(StringPrintf("%zu", object_id)),
-           call_self_(this),
-           to_string_(NewSlot(this, &BrowserObjectWrapper::ToString)) {
-+      if (parent_)
-+        parent_->Ref();
-     }
- 
-     virtual ~BrowserObjectWrapper() {
-@@ -426,6 +428,8 @@
-         owner_->controller_->SendCommand(kUnrefCommand, owner_->browser_id_,
-                                          object_id_str_.c_str(), NULL);
-       }
-+      if (parent_)
-+        parent_->Unref();
-     }
- 
-     void OnOwnerDestroy() {
-@@ -523,8 +527,8 @@
-         buffer += '\n';
-         buffer += wrapper_->object_id_str_;
-         buffer += '\n';
--        if (wrapper_->parent_.Get())
--          buffer += wrapper_->parent_.Get()->object_id_str_;
-+        if (wrapper_->parent_)
-+          buffer += wrapper_->parent_->object_id_str_;
-         for (int i = 0; i < argc; i++) {
-           buffer += '\n';
-           buffer += wrapper_->owner_->EncodeValue(argv[i]);
-@@ -546,7 +550,7 @@
-     };
- 
-     BrowserElementImpl *owner_;
--    ScriptableHolder<BrowserObjectWrapper> parent_;
-+    BrowserObjectWrapper *parent_;
-     size_t object_id_;
-     std::string object_id_str_;
-     CallSelfSlot call_self_;
diff --git a/deskutils/google-gadgets/pkg-plist b/deskutils/google-gadgets/pkg-plist
index a4291f6b3f37..464300335392 100644
--- a/deskutils/google-gadgets/pkg-plist
+++ b/deskutils/google-gadgets/pkg-plist
@@ -258,10 +258,10 @@ share/pixmaps/google-gadgets.png
 @dirrm lib/google-gadgets/include/ggadget
 @dirrm lib/google-gadgets/include
 @dirrm lib/google-gadgets
+@dirrm include/google-gadgets/ggadget/xdg
 %%QT%%@dirrm include/google-gadgets/ggadget/qt
-@dirrm include/google-gadgets/ggadget/js
 @dirrm include/google-gadgets/ggadget/npapi
-@dirrm include/google-gadgets/ggadget/xdg
+@dirrm include/google-gadgets/ggadget/js
 %%GTK%%@dirrm include/google-gadgets/ggadget/gtk
 @dirrm include/google-gadgets/ggadget/dbus
 @dirrm include/google-gadgets/ggadget