Attachment #90833 for bug #128077

View | Details | Raw Unified | Return to bug 128077
Collapse All | Expand All




#

PORTNAME=	google-gadgets
PORTVERSION=	0.10.2
PORTREVISION=	1
CATEGORIES=	deskutils
MASTER_SITES=	http://google-gadgets-for-linux.googlecode.com/files/
DISTNAME=	${PORTNAME}-for-linux-${PORTVERSION}

RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/firefox-js.pc:${PORTSDIR}/www/firefox \
		${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info

USE_BZIP2=	yes
USE_LDCONFIG=	yes
USE_GMAKE=	yes
USE_GCC=	4.2+

USE_AUTOTOOLS=	libtool:15:env autoconf:262:env automake:110:env aclocal:110:env libltdl:15
WANT_GNOME=	yes
USE_GNOME=	gnomehack
INSTALLS_ICONS=	yes

OPTIONS=	DEBUGGING	"Enable debug output on runtime"	on\
		GTK		"Build GTK Host"			on\

Lines 1-3 Link Here

(-)./google-gadgets/distinfo (-3 / +3 lines)
1	MD5 (google-gadgets-for-linux-0.10.0.tar.gz) = 315406fe83ab05d31e48200e07344496	1	MD5 (google-gadgets-for-linux-0.10.2.tar.bz2) = 0822bb6294cff0b8aa9830a13c2dd06d
2	SHA256 (google-gadgets-for-linux-0.10.0.tar.gz) = 5367a44d47d60e31fc17dc43b7b1e1d393147bd901cb8c24f7975781e4abed5a	2	SHA256 (google-gadgets-for-linux-0.10.2.tar.bz2) = 0429408cd215dc8cb33c6fda31c65425366597426e3679004633b874f8fed164
3	SIZE (google-gadgets-for-linux-0.10.0.tar.gz) = 2499027	3	SIZE (google-gadgets-for-linux-0.10.2.tar.bz2) = 2188977





$FreeBSD$

--- configure.ac.orig
+++ configure.ac
@@ -371,6 +371,13 @@
     GGL_PLATFORM_SHORT=\"linux\"
     GGL_PLATFORM=\"linux\"
     ;;

   *solaris* )
     ggl_host_type=solaris
     PREDEFINED_MACROS="$PREDEFINED_MACROS -DGGL_HOST_SOLARIS=1"
@@ -389,6 +396,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])

 
 AC_SUBST(PREDEFINED_MACROS)
 AC_SUBST(DEFAULT_COMPILE_FLAGS)
@@ -489,7 +497,7 @@
 has_qtnetwork=no
 has_qtwebkit=no
 has_qtscript=no
-if test x$ggl_host_type = xlinux; then
+if test x$ggl_host_type = xlinux -o x$ggl_host_type = xfreebsd; then
   PKG_CHECK_MODULES(QT4, [QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3],
 			  QtNetwork >= 4.3],
 		    [has_qt4=yes
 		     MOC=`$PKG_CONFIG --variable=moc_location QtCore`],





$FreeBSD: ports/deskutils/google-gadgets/files/patch-extensions_gst__mediaplayer__element_gadget__videosink.cc,v 1.2 2008/06/13 14:01:28 pav Exp $

--- extensions/gst_mediaplayer_element/gadget_videosink.cc.orig
+++ extensions/gst_mediaplayer_element/gadget_videosink.cc
@@ -17,6 +17,12 @@
 #include "gadget_videosink.h"
 #include <pthread.h>
 
+#if __GNUC__ < 4
+#define CAST_HACK(x) (x)
+#else
+#define CAST_HACK(x) reinterpret_cast<x>
+#endif
+
 namespace ggadget {
 namespace gst {
 
@@ -454,10 +460,10 @@
       nom = gst_value_get_fraction_numerator(videosink->par_);
       den = gst_value_get_fraction_denominator(videosink->par_);
       gst_structure_set(structure, "pixel-aspect-ratio",
-                        GST_TYPE_FRACTION, nom, den, NULL);
+                        GST_TYPE_FRACTION, nom, den, (gchar*)0);
     } else {
       gst_structure_set(structure, "pixel-aspect-ratio",
-                        GST_TYPE_FRACTION, 1, 1, NULL);
+                        GST_TYPE_FRACTION, 1, 1, (gchar*)0);
     }
   }
 
@@ -669,18 +675,18 @@
       desired_caps = gst_caps_copy(caps);
       desired_struct = gst_caps_get_structure(desired_caps, 0);
 
-      gst_structure_set (desired_struct, "width", G_TYPE_INT, result.w, NULL);
-      gst_structure_set (desired_struct, "height", G_TYPE_INT, result.h, NULL);
+      gst_structure_set (desired_struct, "width", G_TYPE_INT, result.w, (gchar*)0);
+      gst_structure_set (desired_struct, "height", G_TYPE_INT, result.h, (gchar*)0);
 
       // PAR property overrides the default one.
       if (videosink->par_) {
         nom = gst_value_get_fraction_numerator(videosink->par_);
         den = gst_value_get_fraction_denominator(videosink->par_);
         gst_structure_set(desired_struct, "pixel-aspect-ratio",
-                           GST_TYPE_FRACTION, nom, den, NULL);
+                           GST_TYPE_FRACTION, nom, den, (gchar*)0);
       } else {
         gst_structure_set(desired_struct, "pixel-aspect-ratio",
-                          GST_TYPE_FRACTION, 1, 1, NULL);
+                          GST_TYPE_FRACTION, 1, 1, (gchar*)0);
       }
 
       // see if peer accepts our new suggestion, if there is no peer, this
@@ -859,7 +865,7 @@
         g_value_transform(videosink->par_, value);
       break;
     case PROP_RECEIVE_IMAGE_HANDLER:
-      g_value_set_pointer(value, reinterpret_cast<void*>(&ReceiveImageHandler));
+      g_value_set_pointer(value, CAST_HACK(void*)(&ReceiveImageHandler));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -892,7 +898,7 @@
   nom = gst_value_get_fraction_numerator(par_);
   den = gst_value_get_fraction_denominator(par_);
   gst_caps_set_simple(caps_, const_cast<gchar*>("pixel-aspect-ratio"),
-                      GST_TYPE_FRACTION, 1, 1, NULL);
+                      GST_TYPE_FRACTION, 1, 1, (gchar*)0);
 }
 
 // This function converts the image format if necessary, puts the image into





$FreeBSD: ports/deskutils/google-gadgets/files/patch-extensions_gst__mediaplayer__element_gst__mediaplayer__element.cc,v 1.1 2008/06/09 00:52:55 ahze Exp $

--- extensions/gst_mediaplayer_element/gst_mediaplayer_element.cc.orig
+++ extensions/gst_mediaplayer_element/gst_mediaplayer_element.cc
@@ -133,7 +133,7 @@
     return;
   } else {
     g_object_get(G_OBJECT(videosink_),
-                 "receive-image-handler", &receive_image_handler_, NULL);
+                 "receive-image-handler", &receive_image_handler_, (gchar*)0);
     if (!receive_image_handler_) {
       gst_object_unref(GST_OBJECT(playbin_));
       gst_object_unref(GST_OBJECT(videosink_));
@@ -143,7 +143,7 @@
   }
 
   // Set videosink to receive video output.
-  g_object_set(G_OBJECT(playbin_), "video-sink", videosink_, NULL);
+  g_object_set(G_OBJECT(playbin_), "video-sink", videosink_, (gchar*)0);
 
   // Create new audio sink with panorama support if possible.
   GstElement *audiosink = NULL;
@@ -169,15 +169,15 @@
     GstElement *audiobin = gst_bin_new("audiobin");
     GstPad *sinkpad;
     if (volume_ && panorama_) {
-      gst_bin_add_many(GST_BIN(audiobin), volume_, panorama_, audiosink, NULL);
-      gst_element_link_many(volume_, panorama_, audiosink, NULL);
+      gst_bin_add_many(GST_BIN(audiobin), volume_, panorama_, audiosink, (GstElement*)0);
+      gst_element_link_many(volume_, panorama_, audiosink, (GstElement*)0);
       sinkpad = gst_element_get_pad(volume_, "sink");
     } else if (volume_) {
-      gst_bin_add_many(GST_BIN(audiobin), volume_, audiosink, NULL);
+      gst_bin_add_many(GST_BIN(audiobin), volume_, audiosink, (GstElement*)0);
       gst_element_link(volume_, audiosink);
       sinkpad = gst_element_get_pad(volume_, "sink");
     } else {
-      gst_bin_add_many(GST_BIN(audiobin), panorama_, audiosink, NULL);
+      gst_bin_add_many(GST_BIN(audiobin), panorama_, audiosink, (GstElement*)0);
       gst_element_link(panorama_, audiosink);
       sinkpad = gst_element_get_pad(panorama_, "sink");
     }
@@ -187,7 +187,7 @@
   }
 
   // Set audio-sink to our new audiosink.
-  g_object_set(G_OBJECT(playbin_), "audio-sink", audiosink, NULL);
+  g_object_set(G_OBJECT(playbin_), "audio-sink", audiosink, (gchar*)0);
 
   // Watch the message bus.
   // The host using this class must use a g_main_loop to capture the
@@ -262,7 +262,7 @@
   if (src_.compare(new_src_) != 0) {
     src_ = new_src_;
     media_changed_ = true;
-    g_object_set(G_OBJECT(playbin_), "uri", src_.c_str(), NULL);
+    g_object_set(G_OBJECT(playbin_), "uri", src_.c_str(), (gchar*)0);
 
     // Empty the tag cache when loading a new media.
     if (tag_list_) {
@@ -370,7 +370,7 @@
 void GstMediaPlayerElement::SetGeometry(int width, int height) {
   if (playbin_ && videosink_) {
     g_object_set(G_OBJECT(videosink_),
-                 "geometry-width", width, "geometry-height", height, NULL);
+                 "geometry-width", width, "geometry-height", height, (gchar*)0);
   } else {
     if (!playbin_)
       DLOG("Playbin was not initialized correctly.");
@@ -382,7 +382,7 @@
 int GstMediaPlayerElement::GetVolume() {
   if (playbin_) {
     double volume;
-    g_object_get(G_OBJECT(playbin_), "volume", &volume, NULL);
+    g_object_get(G_OBJECT(playbin_), "volume", &volume, (gchar*)0);
     int gg_volume = static_cast<int>((volume / kMaxGstVolume) *
                                       (kMaxVolume - kMinVolume) +
                                       kMinVolume);
@@ -404,7 +404,7 @@
       (gdouble(volume - kMinVolume) / (kMaxVolume - kMinVolume)) *
       kMaxGstVolume;
 
-    g_object_set(G_OBJECT(playbin_), "volume", gst_volume, NULL);
+    g_object_set(G_OBJECT(playbin_), "volume", gst_volume, (gchar*)0);
   } else {
     DLOG("Playbin was not initialized correctly.");
   }
@@ -413,7 +413,7 @@
 int GstMediaPlayerElement::GetBalance() {
   if (playbin_ && panorama_) {
     gfloat balance;
-    g_object_get(G_OBJECT(panorama_), "panorama", &balance, NULL);
+    g_object_get(G_OBJECT(panorama_), "panorama", &balance, (gchar*)0);
     int gg_balance = static_cast<int>(((balance + 1) / 2) *
                                       (kMaxBalance - kMinBalance) +
                                       kMinBalance);
@@ -437,7 +437,7 @@
     }
     gfloat gst_balance =
       (gfloat(balance - kMinBalance) / (kMaxBalance - kMinBalance)) * 2 - 1;
-    g_object_set(G_OBJECT(panorama_), "panorama", gst_balance, NULL);
+    g_object_set(G_OBJECT(panorama_), "panorama", gst_balance, (gchar*)0);
   } else {
     if (!playbin_)
       DLOG("Playbin was not initialized correctly.");
@@ -449,7 +449,7 @@
 bool GstMediaPlayerElement::GetMute() {
   if (playbin_ && volume_) {
     gboolean mute;
-    g_object_get(G_OBJECT(volume_), "mute", &mute, NULL);
+    g_object_get(G_OBJECT(volume_), "mute", &mute, (gchar*)0);
     return static_cast<bool>(mute);
   } else {
     if (!playbin_)
@@ -462,7 +462,7 @@
 
 void GstMediaPlayerElement::SetMute(bool mute) {
   if (playbin_ && volume_) {
-    g_object_set(G_OBJECT(volume_), "mute", static_cast<gboolean>(mute), NULL);
+    g_object_set(G_OBJECT(volume_), "mute", static_cast<gboolean>(mute), (gchar*)0);
   } else {
     if (!playbin_)
       DLOG("Playbin was not initialized correctly.");





$FreeBSD$

--- extensions/gst_video_element/gadget_videosink.cc.orig
+++ extensions/gst_video_element/gadget_videosink.cc
@@ -459,10 +459,10 @@
       nom = gst_value_get_fraction_numerator(videosink->par_);
       den = gst_value_get_fraction_denominator(videosink->par_);
       gst_structure_set(structure, "pixel-aspect-ratio",
-                        GST_TYPE_FRACTION, nom, den, NULL);
+                        GST_TYPE_FRACTION, nom, den, (gchar*)0);
     } else {
       gst_structure_set(structure, "pixel-aspect-ratio",
-                        GST_TYPE_FRACTION, 1, 1, NULL);
+                        GST_TYPE_FRACTION, 1, 1, (gchar*)0);
     }
   }
 
@@ -672,18 +672,18 @@
       desired_caps = gst_caps_copy(caps);
       desired_struct = gst_caps_get_structure(desired_caps, 0);
 
-      gst_structure_set (desired_struct, "width", G_TYPE_INT, result.w, NULL);
-      gst_structure_set (desired_struct, "height", G_TYPE_INT, result.h, NULL);
+      gst_structure_set (desired_struct, "width", G_TYPE_INT, result.w, (gchar*)0);
+      gst_structure_set (desired_struct, "height", G_TYPE_INT, result.h, (gchar*)0);
 
       // PAR property overrides the default one.
       if (videosink->par_) {
         nom = gst_value_get_fraction_numerator(videosink->par_);
         den = gst_value_get_fraction_denominator(videosink->par_);
         gst_structure_set(desired_struct, "pixel-aspect-ratio",
-                           GST_TYPE_FRACTION, nom, den, NULL);
+			  GST_TYPE_FRACTION, nom, den, (gchar*)0);
       } else {
         gst_structure_set(desired_struct, "pixel-aspect-ratio",
-                          GST_TYPE_FRACTION, 1, 1, NULL);
+                          GST_TYPE_FRACTION, 1, 1, (gchar*)0);
       }
 
       // see if peer accepts our new suggestion, if there is no peer, this
@@ -895,7 +895,7 @@
   nom = gst_value_get_fraction_numerator(par_);
   den = gst_value_get_fraction_denominator(par_);
   gst_caps_set_simple(caps_, const_cast<gchar*>("pixel-aspect-ratio"),
-                      GST_TYPE_FRACTION, 1, 1, NULL);
+                      GST_TYPE_FRACTION, 1, 1, (gchar*)0);
 }
 
 // This function converts the image format if necessary, puts the image into





$FreeBSD$

--- extensions/gst_video_element/gst_video_element.cc.orig
+++ extensions/gst_video_element/gst_video_element.cc
@@ -127,7 +127,7 @@
     return;
   } else {
     g_object_get(G_OBJECT(videosink_),
-                 "receive-image-handler", &receive_image_handler_, NULL);
+                 "receive-image-handler", &receive_image_handler_, (gchar*)0);
     if (!receive_image_handler_) {
       gst_object_unref(GST_OBJECT(playbin_));
       gst_object_unref(GST_OBJECT(videosink_));
@@ -137,7 +137,7 @@
   }
 
   // Set videosink to receive video output.
-  g_object_set(G_OBJECT(playbin_), "video-sink", videosink_, NULL);
+  g_object_set(G_OBJECT(playbin_), "video-sink", videosink_, (gchar*)0);
 
   // Create new audio sink with panorama support if possible.
   GstElement *audiosink = NULL;
@@ -163,15 +163,15 @@
     GstElement *audiobin = gst_bin_new("audiobin");
     GstPad *sinkpad;
     if (volume_ && panorama_) {
-      gst_bin_add_many(GST_BIN(audiobin), volume_, panorama_, audiosink, NULL);
-      gst_element_link_many(volume_, panorama_, audiosink, NULL);
+      gst_bin_add_many(GST_BIN(audiobin), volume_, panorama_, audiosink, (gchar*)0);
+      gst_element_link_many(volume_, panorama_, audiosink, (gchar*)0);
       sinkpad = gst_element_get_pad(volume_, "sink");
     } else if (volume_) {
-      gst_bin_add_many(GST_BIN(audiobin), volume_, audiosink, NULL);
+      gst_bin_add_many(GST_BIN(audiobin), volume_, audiosink, (gchar*)0);
       gst_element_link(volume_, audiosink);
       sinkpad = gst_element_get_pad(volume_, "sink");
     } else {
-      gst_bin_add_many(GST_BIN(audiobin), panorama_, audiosink, NULL);
+      gst_bin_add_many(GST_BIN(audiobin), panorama_, audiosink, (gchar*)0);
       gst_element_link(panorama_, audiosink);
       sinkpad = gst_element_get_pad(panorama_, "sink");
     }
@@ -181,7 +181,7 @@
   }
 
   // Set audio-sink to our new audiosink.
-  g_object_set(G_OBJECT(playbin_), "audio-sink", audiosink, NULL);
+  g_object_set(G_OBJECT(playbin_), "audio-sink", audiosink, (gchar*)0);
 
   // Watch the message bus.
   // The host using this class must use a g_main_loop to capture the
@@ -361,7 +361,7 @@
 
     src_ = src;
     media_changed_ = true;
-    g_object_set(G_OBJECT(playbin_), "uri", src_.c_str(), NULL);
+    g_object_set(G_OBJECT(playbin_), "uri", src_.c_str(), (gchar*)0);
     if (GetAutoPlay())
       Play();
   }
@@ -370,7 +370,7 @@
 int GstVideoElement::GetVolume() {
   if (playbin_) {
     double volume;
-    g_object_get(G_OBJECT(playbin_), "volume", &volume, NULL);
+    g_object_get(G_OBJECT(playbin_), "volume", &volume, (gchar*)0);
     int gg_volume = static_cast<int>((volume / kMaxGstVolume) *
                                      (kMaxVolume - kMinVolume) + kMinVolume);
     return Clamp(gg_volume, kMinVolume, kMaxVolume);
@@ -387,7 +387,7 @@
     }
     gdouble gg_volume = ((gdouble(volume - kMinVolume) /
                           (kMaxVolume - kMinVolume)) * kMaxGstVolume);
-    g_object_set(G_OBJECT(playbin_), "volume", gg_volume, NULL);
+    g_object_set(G_OBJECT(playbin_), "volume", gg_volume, (gchar*)0);
   } else {
     DLOG("Playbin was not initialized correctly.");
   }
@@ -409,7 +409,7 @@
 int GstVideoElement::GetBalance() {
   if (playbin_ && panorama_) {
     gfloat balance;
-    g_object_get(G_OBJECT(panorama_), "panorama", &balance, NULL);
+    g_object_get(G_OBJECT(panorama_), "panorama", &balance, (gchar*)0);
     int gg_balance = static_cast<int>(((balance + 1) / 2) *
                                       (kMaxBalance - kMinBalance) +
                                       kMinBalance);
@@ -432,7 +432,7 @@
     }
     gfloat gg_balance = (gfloat(balance - kMinBalance) /
                           (kMaxBalance - kMinBalance)) * 2 - 1;
-    g_object_set(G_OBJECT(panorama_), "panorama", gg_balance, NULL);
+    g_object_set(G_OBJECT(panorama_), "panorama", gg_balance, (gchar*)0);
   } else {
     if (!playbin_)
       DLOG("Playbin was not initialized correctly.");
@@ -444,7 +444,7 @@
 bool GstVideoElement::GetMute() {
   if (playbin_ && volume_) {
     gboolean mute;
-    g_object_get(G_OBJECT(volume_), "mute", &mute, NULL);
+    g_object_get(G_OBJECT(volume_), "mute", &mute, (gchar*)0);
     return static_cast<bool>(mute);
   } else {
     if (!playbin_)
@@ -457,7 +457,7 @@
 
 void GstVideoElement::SetMute(bool mute) {
   if (playbin_ && volume_) {
-    g_object_set(G_OBJECT(volume_), "mute", static_cast<gboolean>(mute), NULL);
+    g_object_set(G_OBJECT(volume_), "mute", static_cast<gboolean>(mute), (gchar*)0);
   } else {
     if (!playbin_)
       DLOG("Playbin was not initialized correctly.");
@@ -470,7 +470,7 @@
   if (playbin_ && videosink_) {
     g_object_set(G_OBJECT(videosink_),
                  "geometry-width", static_cast<int>(width),
-                 "geometry-height", static_cast<int>(height), NULL);
+                 "geometry-height", static_cast<int>(height), (gchar*)0);
   } else {
     if (!playbin_)
       DLOG("Playbin was not initialized correctly.");





$FreeBSD$

--- extensions/linux_system_framework/file_system.cc.orig
+++ extensions/linux_system_framework/file_system.cc
@@ -463,8 +463,8 @@
   if (stat(path, &stat_value))
     return Date(0);
 
-  return Date(stat_value.st_mtim.tv_sec * 1000
-              + stat_value.st_mtim.tv_nsec / 1000000);
+  return Date(statbuf.st_mtimespec.tv_sec * 1000
+              + statbuf.st_mtimespec.tv_nsec / 1000000);
 }
 
 static Date GetDateLastAccessed(const char *path) {
@@ -476,8 +476,8 @@
   if (stat(path, &stat_value))
     return Date(0);
 
-  return Date(stat_value.st_atim.tv_sec * 1000
-              + stat_value.st_atim.tv_nsec / 1000000);
+  return Date(statbuf.st_atimespec.tv_sec * 1000
+              + statbuf.st_atimespec.tv_nsec / 1000000);
 }
 
 class Drive : public DriveInterface {
-                + statbuf.st_mtim.tv_nsec / 1000000);
+    return Date(statbuf.st_mtimespec.tv_sec * 1000
+                + statbuf.st_mtimespec.tv_nsec / 1000000);
   }
 
   virtual Date GetDateLastAccessed() {
@@ -368,8 +368,8 @@
     if (stat(path_.c_str(), &statbuf))
       return Date(0);
 
-    return Date(statbuf.st_atim.tv_sec * 1000
-                + statbuf.st_atim.tv_nsec / 1000000);
+    return Date(statbuf.st_atimespec.tv_sec * 1000
+                + statbuf.st_atimespec.tv_nsec / 1000000);
   }
 
   virtual int64_t GetSize() {
@@ -646,8 +646,8 @@
     if (stat(path_.c_str(), &statbuf))
       return Date(0);
 
-    return Date(statbuf.st_mtim.tv_sec * 1000
-                + statbuf.st_mtim.tv_nsec / 1000000);
+    return Date(statbuf.st_mtimespec.tv_sec * 1000
+                + statbuf.st_mtimespec.tv_nsec / 1000000);
   }
 
   virtual Date GetDateLastAccessed() {
@@ -658,8 +658,8 @@
     if (stat(path_.c_str(), &statbuf))
       return Date(0);
 
-    return Date(statbuf.st_atim.tv_sec * 1000
-                + statbuf.st_atim.tv_nsec / 1000000);
+    return Date(statbuf.st_atimespec.tv_sec * 1000
+                + statbuf.st_atimespec.tv_nsec / 1000000);
   }
 
   virtual std::string GetType() {





$FreeBSD$

--- gadgets/designer/designer_script_utils.cc.orig
+++ gadgets/designer/designer_script_utils.cc
@@ -231,7 +231,7 @@
     if ((pid = fork()) == 0) {
       if (fork() != 0)
         _exit(0);
-      execlp(command, command, file, NULL);
+      execlp(command, command, file, (char*)0);
       DLOG("Failed to exec command: %s", command);
       _exit(-1);
     }





$FreeBSD: ports/deskutils/google-gadgets/files/patch-ggadget_gtk_utilities.cc,v 1.1 2008/06/09 00:52:55 ahze Exp $

--- ggadget/gtk/utilities.cc.orig
+++ ggadget/gtk/utilities.cc
@@ -262,7 +262,7 @@
     if (fork() != 0)
       _exit(0);
 
-    execl(xdg_open.c_str(), xdg_open.c_str(), url, NULL);
+    execl(xdg_open.c_str(), xdg_open.c_str(), url, (char*)0);
 
     DLOG("Failed to exec command: %s", xdg_open.c_str());
     _exit(-1);





$FreeBSD: ports/deskutils/google-gadgets/files/patch-ggadget_qt_utilities.cc,v 1.1 2008/08/15 15:21:31 miwi Exp $

--- ggadget/qt/utilities.cc.orig
+++ ggadget/qt/utilities.cc
@@ -111,7 +111,7 @@
     if (fork() != 0)
       _exit(0);
 
-    execl(xdg_open.c_str(), xdg_open.c_str(), url, NULL);
+    execl(xdg_open.c_str(), xdg_open.c_str(), url, (const char*)0);
 
     DLOG("Failed to exec command: %s", xdg_open.c_str());
     _exit(-1);




include/google-gadgets/ggadget/dbus/dbus_result_receiver.h
include/google-gadgets/ggadget/decorated_view_host.h
include/google-gadgets/ggadget/details_view_data.h
include/google-gadgets/ggadget/details_view_decorator.h
include/google-gadgets/ggadget/digest_utils.h
include/google-gadgets/ggadget/dir_file_manager.h
include/google-gadgets/ggadget/display_window.h
include/google-gadgets/ggadget/div_element.h
include/google-gadgets/ggadget/docked_main_view_decorator.h
include/google-gadgets/ggadget/edit_element_base.h
include/google-gadgets/ggadget/element_factory.h
include/google-gadgets/ggadget/elements.h

include/google-gadgets/ggadget/file_manager_interface.h
include/google-gadgets/ggadget/file_manager_wrapper.h
include/google-gadgets/ggadget/file_system_interface.h
include/google-gadgets/ggadget/floating_main_view_decorator.h
include/google-gadgets/ggadget/font_interface.h
include/google-gadgets/ggadget/framed_view_decorator_base.h
include/google-gadgets/ggadget/framework_interface.h
include/google-gadgets/ggadget/gadget.h
include/google-gadgets/ggadget/gadget_consts.h

%%GTK%%include/google-gadgets/ggadget/gtk/utilities.h
%%GTK%%include/google-gadgets/ggadget/gtk/view_widget_binder.h
include/google-gadgets/ggadget/host_interface.h
include/google-gadgets/ggadget/host_utils.h
include/google-gadgets/ggadget/image_cache.h
include/google-gadgets/ggadget/image_interface.h
include/google-gadgets/ggadget/img_element.h

include/google-gadgets/ggadget/localized_file_manager.h
include/google-gadgets/ggadget/logger.h
include/google-gadgets/ggadget/main_loop_interface.h
include/google-gadgets/ggadget/main_view_decorator_base.h
include/google-gadgets/ggadget/math_utils.h
include/google-gadgets/ggadget/mediaplayer_element_base.h
include/google-gadgets/ggadget/memory_options.h
include/google-gadgets/ggadget/menu_interface.h
include/google-gadgets/ggadget/messages.h
include/google-gadgets/ggadget/module.h
include/google-gadgets/ggadget/object_element.h
include/google-gadgets/ggadget/object_videoplayer.h
include/google-gadgets/ggadget/options_interface.h
include/google-gadgets/ggadget/permissions.h
include/google-gadgets/ggadget/popout_main_view_decorator.h
include/google-gadgets/ggadget/progressbar_element.h
%%QT%%include/google-gadgets/ggadget/qt/qt_graphics.h
%%QT%%include/google-gadgets/ggadget/qt/qt_main_loop.h

include/google-gadgets/ggadget/script_runtime_manager.h
include/google-gadgets/ggadget/scriptable_array.h
include/google-gadgets/ggadget/scriptable_binary_data.h
include/google-gadgets/ggadget/scriptable_enumerator.h
include/google-gadgets/ggadget/scriptable_event.h
include/google-gadgets/ggadget/scriptable_file_system.h
include/google-gadgets/ggadget/scriptable_framework.h

include/google-gadgets/ggadget/texture.h
include/google-gadgets/ggadget/unicode_utils.h
include/google-gadgets/ggadget/variant.h
include/google-gadgets/ggadget/video_element_base.h
include/google-gadgets/ggadget/view.h
include/google-gadgets/ggadget/view_decorator_base.h
include/google-gadgets/ggadget/view_element.h
include/google-gadgets/ggadget/view_host_interface.h
include/google-gadgets/ggadget/view_interface.h
include/google-gadgets/ggadget/xdg/desktop_entry.h
include/google-gadgets/ggadget/xdg/utilities.h
include/google-gadgets/ggadget/xml_dom.h
include/google-gadgets/ggadget/xml_dom_interface.h
include/google-gadgets/ggadget/xml_http_request_interface.h

lib/google-gadgets/modules/gst-audio-framework.a
lib/google-gadgets/modules/gst-audio-framework.la
lib/google-gadgets/modules/gst-audio-framework.so
lib/google-gadgets/modules/gst-video-element.a
lib/google-gadgets/modules/gst-video-element.la
lib/google-gadgets/modules/gst-video-element.so
%%GTK%%lib/google-gadgets/modules/gtk-edit-element.a
%%GTK%%lib/google-gadgets/modules/gtk-edit-element.la
%%GTK%%lib/google-gadgets/modules/gtk-edit-element.so

%%QT%%lib/libggadget-qt-1.0.la
%%QT%%lib/libggadget-qt-1.0.so
%%QT%%lib/libggadget-qt-1.0.so.0
lib/libggadget-xdg-1.0.a
lib/libggadget-xdg-1.0.la
lib/libggadget-xdg-1.0.so
lib/libggadget-xdg-1.0.so.0
libdata/pkgconfig/libggadget-1.0.pc
libdata/pkgconfig/libggadget-dbus-1.0.pc
%%GTK%%libdata/pkgconfig/libggadget-gtk-1.0.pc
libdata/pkgconfig/libggadget-js-1.0.pc
%%QT%%libdata/pkgconfig/libggadget-qt-1.0.pc
libdata/pkgconfig/libggadget-xdg-1.0.pc
%%GTK%%share/applications/ggl-gtk.desktop
%%QT%%share/applications/ggl-qt.desktop
%%DATADIR%%/analog_clock.gg
%%DATADIR%%/designer.gg
%%DATADIR%%/digital_alarm_clock.gg
%%DATADIR%%/google-gadget-browser.gg
%%DATADIR%%/igoogle.gg
%%DATADIR%%/photos.gg
%%DATADIR%%/resources.gg
%%DATADIR%%/rss.gg
share/icons/hicolor/128x128/apps/google-gadgets.png
share/icons/hicolor/128x128/mimetypes/application-x-google-gadgets.png
share/icons/hicolor/192x192/apps/google-gadgets.png
share/icons/hicolor/192x192/mimetypes/application-x-google-gadgets.png
share/icons/hicolor/32x32/apps/google-gadgets.png
share/icons/hicolor/32x32/mimetypes/application-x-google-gadgets.png
share/icons/hicolor/48x48/apps/google-gadgets.png
share/icons/hicolor/48x48/mimetypes/application-x-google-gadgets.png
share/icons/hicolor/64x64/apps/google-gadgets.png
share/icons/hicolor/64x64/mimetypes/application-x-google-gadgets.png
share/mime/packages/00-google-gadgets.xml
share/pixmaps/google-gadgets.png
@dirrm %%DATADIR%%

@dirrm lib/google-gadgets
%%QT%%@dirrm include/google-gadgets/ggadget/qt
@dirrm include/google-gadgets/ggadget/js
@dirrm include/google-gadgets/ggadget/xdg
%%GTK%%@dirrm include/google-gadgets/ggadget/gtk
@dirrm include/google-gadgets/ggadget/dbus
@dirrm include/google-gadgets/ggadget

Return to bug 128077

Lines 6-13 Link Here

(-)./google-gadgets/Makefile (-2 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= google-gadgets	8	PORTNAME= google-gadgets
9	PORTVERSION= 0.10.0	9	PORTVERSION= 0.10.2
10	PORTREVISION= 1
11	CATEGORIES= deskutils	10	CATEGORIES= deskutils
12	MASTER_SITES= http://google-gadgets-for-linux.googlecode.com/files/	11	MASTER_SITES= http://google-gadgets-for-linux.googlecode.com/files/
13	DISTNAME= ${PORTNAME}-for-linux-${PORTVERSION}	12	DISTNAME= ${PORTNAME}-for-linux-${PORTVERSION}
Lines 31-36 Link Here
31	RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/firefox-js.pc:${PORTSDIR}/www/firefox \	30	RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/firefox-js.pc:${PORTSDIR}/www/firefox \
32	${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info	31	${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
33		32
		33	USE_BZIP2= yes
34	USE_LDCONFIG= yes	34	USE_LDCONFIG= yes
35	USE_GMAKE= yes	35	USE_GMAKE= yes
36	USE_GCC= 4.2+	36	USE_GCC= 4.2+
Lines 41-46 Link Here
41	USE_AUTOTOOLS= libtool:15:env autoconf:262:env automake:110:env aclocal:110:env libltdl:15	41	USE_AUTOTOOLS= libtool:15:env autoconf:262:env automake:110:env aclocal:110:env libltdl:15
42	WANT_GNOME= yes	42	WANT_GNOME= yes
43	USE_GNOME= gnomehack	43	USE_GNOME= gnomehack
		44	INSTALLS_ICONS= yes
44		45
45	OPTIONS= DEBUGGING "Enable debug output on runtime" on\	46	OPTIONS= DEBUGGING "Enable debug output on runtime" on\
46	GTK "Build GTK Host" on\	47	GTK "Build GTK Host" on\

Lines 1-9 Link Here

(-)./google-gadgets/files/patch-configure.ac (-9 / +9 lines)
1		1
2	$FreeBSD: ports/deskutils/google-gadgets/files/patch-configure.ac,v 1.2 2008/08/15 15:21:31 miwi Exp $	2	$FreeBSD$
3		3
4	--- configure.ac.orig	4	--- configure.ac.orig
5	+++ configure.ac	5	+++ configure.ac
6	@@ -334,6 +334,13 @@	6	@@ -371,6 +371,13 @@
7	GGL_PLATFORM_SHORT=\"linux\"	7	GGL_PLATFORM_SHORT=\"linux\"
8	GGL_PLATFORM=\"linux\"	8	GGL_PLATFORM=\"linux\"
9	;;	9	;;
Lines 17-23 Link Here
17	solaris )	17	solaris )
18	ggl_host_type=solaris	18	ggl_host_type=solaris
19	PREDEFINED_MACROS="$PREDEFINED_MACROS -DGGL_HOST_SOLARIS=1"	19	PREDEFINED_MACROS="$PREDEFINED_MACROS -DGGL_HOST_SOLARIS=1"
20	@@ -352,6 +359,7 @@	20	@@ -389,6 +396,7 @@
21	AM_CONDITIONAL([GGL_HOST_MACOSX], [test x$ggl_host_type = xmacosx])	21	AM_CONDITIONAL([GGL_HOST_MACOSX], [test x$ggl_host_type = xmacosx])
22	AM_CONDITIONAL([GGL_HOST_LINUX], [test x$ggl_host_type = xlinux])	22	AM_CONDITIONAL([GGL_HOST_LINUX], [test x$ggl_host_type = xlinux])
23	AM_CONDITIONAL([GGL_HOST_SOLARIS], [test x$ggl_host_type = xsolaris])	23	AM_CONDITIONAL([GGL_HOST_SOLARIS], [test x$ggl_host_type = xsolaris])
Lines 25-36 Link Here
25		25
26	AC_SUBST(PREDEFINED_MACROS)	26	AC_SUBST(PREDEFINED_MACROS)
27	AC_SUBST(DEFAULT_COMPILE_FLAGS)	27	AC_SUBST(DEFAULT_COMPILE_FLAGS)
28	@@ -445,7 +453,7 @@	28	@@ -489,7 +497,7 @@
29	fi	29	has_qtnetwork=no
30		30	has_qtwebkit=no
31	# Check qt4	31	has_qtscript=no
32	-if test x$ggl_host_type = xlinux; then	32	-if test x$ggl_host_type = xlinux; then
33	+if test x$ggl_host_type = xlinux -o x$ggl_host_type = xfreebsd; then	33	+if test x$ggl_host_type = xlinux -o x$ggl_host_type = xfreebsd; then
34	PKG_CHECK_MODULES(QT4, [QtGui >= 4.3, QtCore >= 4.3, QtOpenGL >= 4.3,	34	PKG_CHECK_MODULES(QT4, [QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3],
35	QtNetwork >= 4.3],
36	[has_qt4=yes	35	[has_qt4=yes
		36	MOC=`$PKG_CONFIG --variable=moc_location QtCore`],

Lines 1-72 Link Here

(-)./google-gadgets/files/patch-extensions_gst__mediaplayer__element_gadget__videosink.cc (-72 lines)
1
2	$FreeBSD: ports/deskutils/google-gadgets/files/patch-extensions_gst__mediaplayer__element_gadget__videosink.cc,v 1.2 2008/06/13 14:01:28 pav Exp $
3
4	--- extensions/gst_mediaplayer_element/gadget_videosink.cc.orig
5	+++ extensions/gst_mediaplayer_element/gadget_videosink.cc
6	@@ -17,6 +17,12 @@
7	#include "gadget_videosink.h"
8	#include <pthread.h>
9
10	+#if __GNUC__ < 4
11	+#define CAST_HACK(x) (x)
12	+#else
13	+#define CAST_HACK(x) reinterpret_cast<x>
14	+#endif
15	+
16	namespace ggadget {
17	namespace gst {
18
19	@@ -454,10 +460,10 @@
20	nom = gst_value_get_fraction_numerator(videosink->par_);
21	den = gst_value_get_fraction_denominator(videosink->par_);
22	gst_structure_set(structure, "pixel-aspect-ratio",
23	- GST_TYPE_FRACTION, nom, den, NULL);
24	+ GST_TYPE_FRACTION, nom, den, (gchar*)0);
25	} else {
26	gst_structure_set(structure, "pixel-aspect-ratio",
27	- GST_TYPE_FRACTION, 1, 1, NULL);
28	+ GST_TYPE_FRACTION, 1, 1, (gchar*)0);
29	}
30	}
31
32	@@ -669,18 +675,18 @@
33	desired_caps = gst_caps_copy(caps);
34	desired_struct = gst_caps_get_structure(desired_caps, 0);
35
36	- gst_structure_set (desired_struct, "width", G_TYPE_INT, result.w, NULL);
37	- gst_structure_set (desired_struct, "height", G_TYPE_INT, result.h, NULL);
38	+ gst_structure_set (desired_struct, "width", G_TYPE_INT, result.w, (gchar*)0);
39	+ gst_structure_set (desired_struct, "height", G_TYPE_INT, result.h, (gchar*)0);
40
41	// PAR property overrides the default one.
42	if (videosink->par_) {
43	nom = gst_value_get_fraction_numerator(videosink->par_);
44	den = gst_value_get_fraction_denominator(videosink->par_);
45	gst_structure_set(desired_struct, "pixel-aspect-ratio",
46	- GST_TYPE_FRACTION, nom, den, NULL);
47	+ GST_TYPE_FRACTION, nom, den, (gchar*)0);
48	} else {
49	gst_structure_set(desired_struct, "pixel-aspect-ratio",
50	- GST_TYPE_FRACTION, 1, 1, NULL);
51	+ GST_TYPE_FRACTION, 1, 1, (gchar*)0);
52	}
53
54	// see if peer accepts our new suggestion, if there is no peer, this
55	@@ -859,7 +865,7 @@
56	g_value_transform(videosink->par_, value);
57	break;
58	case PROP_RECEIVE_IMAGE_HANDLER:
59	- g_value_set_pointer(value, reinterpret_cast<void*>(&ReceiveImageHandler));
60	+ g_value_set_pointer(value, CAST_HACK(void*)(&ReceiveImageHandler));
61	break;
62	default:
63	G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
64	@@ -892,7 +898,7 @@
65	nom = gst_value_get_fraction_numerator(par_);
66	den = gst_value_get_fraction_denominator(par_);
67	gst_caps_set_simple(caps_, const_cast<gchar*>("pixel-aspect-ratio"),
68	- GST_TYPE_FRACTION, 1, 1, NULL);
69	+ GST_TYPE_FRACTION, 1, 1, (gchar*)0);
70	}
71
72	// This function converts the image format if necessary, puts the image into

Line 0 Link Here

(-)./google-gadgets/files/patch-extensions_gst__video__element_gadget__videosink.cc (+50 lines)
	1
	2	$FreeBSD$
	3
	4	--- extensions/gst_video_element/gadget_videosink.cc.orig
	5	+++ extensions/gst_video_element/gadget_videosink.cc
	6	@@ -459,10 +459,10 @@
	7	nom = gst_value_get_fraction_numerator(videosink->par_);
	8	den = gst_value_get_fraction_denominator(videosink->par_);
	9	gst_structure_set(structure, "pixel-aspect-ratio",
	10	- GST_TYPE_FRACTION, nom, den, NULL);
	11	+ GST_TYPE_FRACTION, nom, den, (gchar*)0);
	12	} else {
	13	gst_structure_set(structure, "pixel-aspect-ratio",
	14	- GST_TYPE_FRACTION, 1, 1, NULL);
	15	+ GST_TYPE_FRACTION, 1, 1, (gchar*)0);
	16	}
	17	}
	18
	19	@@ -672,18 +672,18 @@
	20	desired_caps = gst_caps_copy(caps);
	21	desired_struct = gst_caps_get_structure(desired_caps, 0);
	22
	23	- gst_structure_set (desired_struct, "width", G_TYPE_INT, result.w, NULL);
	24	- gst_structure_set (desired_struct, "height", G_TYPE_INT, result.h, NULL);
	25	+ gst_structure_set (desired_struct, "width", G_TYPE_INT, result.w, (gchar*)0);
	26	+ gst_structure_set (desired_struct, "height", G_TYPE_INT, result.h, (gchar*)0);
	27
	28	// PAR property overrides the default one.
	29	if (videosink->par_) {
	30	nom = gst_value_get_fraction_numerator(videosink->par_);
	31	den = gst_value_get_fraction_denominator(videosink->par_);
	32	gst_structure_set(desired_struct, "pixel-aspect-ratio",
	33	- GST_TYPE_FRACTION, nom, den, NULL);
	34	+ GST_TYPE_FRACTION, nom, den, (gchar*)0);
	35	} else {
	36	gst_structure_set(desired_struct, "pixel-aspect-ratio",
	37	- GST_TYPE_FRACTION, 1, 1, NULL);
	38	+ GST_TYPE_FRACTION, 1, 1, (gchar*)0);
	39	}
	40
	41	// see if peer accepts our new suggestion, if there is no peer, this
	42	@@ -895,7 +895,7 @@
	43	nom = gst_value_get_fraction_numerator(par_);
	44	den = gst_value_get_fraction_denominator(par_);
	45	gst_caps_set_simple(caps_, const_cast<gchar*>("pixel-aspect-ratio"),
	46	- GST_TYPE_FRACTION, 1, 1, NULL);
	47	+ GST_TYPE_FRACTION, 1, 1, (gchar*)0);
	48	}
	49
	50	// This function converts the image format if necessary, puts the image into

Line 0 Link Here

(-)./google-gadgets/files/patch-extensions_gst__video__element_gst__video__element.cc (+124 lines)
		1
		2	$FreeBSD$
		3
		4	--- extensions/gst_video_element/gst_video_element.cc.orig
		5	+++ extensions/gst_video_element/gst_video_element.cc
		6	@@ -127,7 +127,7 @@
		7	return;
		8	} else {
		9	g_object_get(G_OBJECT(videosink_),
		10	- "receive-image-handler", &receive_image_handler_, NULL);
		11	+ "receive-image-handler", &receive_image_handler_, (gchar*)0);
		12	if (!receive_image_handler_) {
		13	gst_object_unref(GST_OBJECT(playbin_));
		14	gst_object_unref(GST_OBJECT(videosink_));
		15	@@ -137,7 +137,7 @@
		16	}
		17
		18	// Set videosink to receive video output.
		19	- g_object_set(G_OBJECT(playbin_), "video-sink", videosink_, NULL);
		20	+ g_object_set(G_OBJECT(playbin_), "video-sink", videosink_, (gchar*)0);
		21
		22	// Create new audio sink with panorama support if possible.
		23	GstElement *audiosink = NULL;
		24	@@ -163,15 +163,15 @@
		25	GstElement *audiobin = gst_bin_new("audiobin");
		26	GstPad *sinkpad;
		27	if (volume_ && panorama_) {
		28	- gst_bin_add_many(GST_BIN(audiobin), volume_, panorama_, audiosink, NULL);
		29	- gst_element_link_many(volume_, panorama_, audiosink, NULL);
		30	+ gst_bin_add_many(GST_BIN(audiobin), volume_, panorama_, audiosink, (gchar*)0);
		31	+ gst_element_link_many(volume_, panorama_, audiosink, (gchar*)0);
		32	sinkpad = gst_element_get_pad(volume_, "sink");
		33	} else if (volume_) {
		34	- gst_bin_add_many(GST_BIN(audiobin), volume_, audiosink, NULL);
		35	+ gst_bin_add_many(GST_BIN(audiobin), volume_, audiosink, (gchar*)0);
		36	gst_element_link(volume_, audiosink);
		37	sinkpad = gst_element_get_pad(volume_, "sink");
		38	} else {
		39	- gst_bin_add_many(GST_BIN(audiobin), panorama_, audiosink, NULL);
		40	+ gst_bin_add_many(GST_BIN(audiobin), panorama_, audiosink, (gchar*)0);
		41	gst_element_link(panorama_, audiosink);
		42	sinkpad = gst_element_get_pad(panorama_, "sink");
		43	}
		44	@@ -181,7 +181,7 @@
		45	}
		46
		47	// Set audio-sink to our new audiosink.
		48	- g_object_set(G_OBJECT(playbin_), "audio-sink", audiosink, NULL);
		49	+ g_object_set(G_OBJECT(playbin_), "audio-sink", audiosink, (gchar*)0);
		50
		51	// Watch the message bus.
		52	// The host using this class must use a g_main_loop to capture the
		53	@@ -361,7 +361,7 @@
		54
		55	src_ = src;
		56	media_changed_ = true;
		57	- g_object_set(G_OBJECT(playbin_), "uri", src_.c_str(), NULL);
		58	+ g_object_set(G_OBJECT(playbin_), "uri", src_.c_str(), (gchar*)0);
		59	if (GetAutoPlay())
		60	Play();
		61	}
		62	@@ -370,7 +370,7 @@
		63	int GstVideoElement::GetVolume() {
		64	if (playbin_) {
65	double volume;
66	- g_object_get(G_OBJECT(playbin_), "volume", &volume, NULL);
67	+ g_object_get(G_OBJECT(playbin_), "volume", &volume, (gchar*)0);
68	int gg_volume = static_cast<int>((volume / kMaxGstVolume) *
69	(kMaxVolume - kMinVolume) + kMinVolume);
70	return Clamp(gg_volume, kMinVolume, kMaxVolume);
71	@@ -387,7 +387,7 @@
72	}
73	gdouble gg_volume = ((gdouble(volume - kMinVolume) /
74	(kMaxVolume - kMinVolume)) * kMaxGstVolume);
75	- g_object_set(G_OBJECT(playbin_), "volume", gg_volume, NULL);
76	+ g_object_set(G_OBJECT(playbin_), "volume", gg_volume, (gchar*)0);
77	} else {
78	DLOG("Playbin was not initialized correctly.");
79	}
80	@@ -409,7 +409,7 @@
81	int GstVideoElement::GetBalance() {
82	if (playbin_ && panorama_) {
83	gfloat balance;
84	- g_object_get(G_OBJECT(panorama_), "panorama", &balance, NULL);
85	+ g_object_get(G_OBJECT(panorama_), "panorama", &balance, (gchar*)0);
86	int gg_balance = static_cast<int>(((balance + 1) / 2) *
87	(kMaxBalance - kMinBalance) +
88	kMinBalance);
89	@@ -432,7 +432,7 @@
90	}
91	gfloat gg_balance = (gfloat(balance - kMinBalance) /
92	(kMaxBalance - kMinBalance)) * 2 - 1;
93	- g_object_set(G_OBJECT(panorama_), "panorama", gg_balance, NULL);
94	+ g_object_set(G_OBJECT(panorama_), "panorama", gg_balance, (gchar*)0);
95	} else {
96	if (!playbin_)
97	DLOG("Playbin was not initialized correctly.");
98	@@ -444,7 +444,7 @@
99	bool GstVideoElement::GetMute() {
100	if (playbin_ && volume_) {
101	gboolean mute;
102	- g_object_get(G_OBJECT(volume_), "mute", &mute, NULL);
103	+ g_object_get(G_OBJECT(volume_), "mute", &mute, (gchar*)0);
104	return static_cast<bool>(mute);
105	} else {
106	if (!playbin_)
107	@@ -457,7 +457,7 @@
108
109	void GstVideoElement::SetMute(bool mute) {
110	if (playbin_ && volume_) {
111	- g_object_set(G_OBJECT(volume_), "mute", static_cast<gboolean>(mute), NULL);
112	+ g_object_set(G_OBJECT(volume_), "mute", static_cast<gboolean>(mute), (gchar*)0);
113	} else {
114	if (!playbin_)
115	DLOG("Playbin was not initialized correctly.");
116	@@ -470,7 +470,7 @@
117	if (playbin_ && videosink_) {
118	g_object_set(G_OBJECT(videosink_),
119	"geometry-width", static_cast<int>(width),
120	- "geometry-height", static_cast<int>(height), NULL);
121	+ "geometry-height", static_cast<int>(height), (gchar*)0);
122	} else {
123	if (!playbin_)
124	DLOG("Playbin was not initialized correctly.");

Line 0 Link Here

(-)./google-gadgets/files/patch-gadgets_designer_designer__script__utils.cc (+14 lines)
	1
	2	$FreeBSD$
	3
	4	--- gadgets/designer/designer_script_utils.cc.orig
	5	+++ gadgets/designer/designer_script_utils.cc
	6	@@ -231,7 +231,7 @@
	7	if ((pid = fork()) == 0) {
	8	if (fork() != 0)
	9	_exit(0);
	10	- execlp(command, command, file, NULL);
	11	+ execlp(command, command, file, (char*)0);
	12	DLOG("Failed to exec command: %s", command);
	13	_exit(-1);
	14	}

Lines 1-14 Link Here

(-)./google-gadgets/files/patch-ggadget_gtk_utilities.cc (-14 lines)
1
2	$FreeBSD: ports/deskutils/google-gadgets/files/patch-ggadget_gtk_utilities.cc,v 1.1 2008/06/09 00:52:55 ahze Exp $
3
4	--- ggadget/gtk/utilities.cc.orig
5	+++ ggadget/gtk/utilities.cc
6	@@ -262,7 +262,7 @@
7	if (fork() != 0)
8	_exit(0);
9
10	- execl(xdg_open.c_str(), xdg_open.c_str(), url, NULL);
11	+ execl(xdg_open.c_str(), xdg_open.c_str(), url, (char*)0);
12
13	DLOG("Failed to exec command: %s", xdg_open.c_str());
14	_exit(-1);

Lines 1-14 Link Here

(-)./google-gadgets/files/patch-ggadget_qt_utilities.cc (-14 lines)
1
2	$FreeBSD: ports/deskutils/google-gadgets/files/patch-ggadget_qt_utilities.cc,v 1.1 2008/08/15 15:21:31 miwi Exp $
3
4	--- ggadget/qt/utilities.cc.orig
5	+++ ggadget/qt/utilities.cc
6	@@ -111,7 +111,7 @@
7	if (fork() != 0)
8	_exit(0);
9
10	- execl(xdg_open.c_str(), xdg_open.c_str(), url, NULL);
11	+ execl(xdg_open.c_str(), xdg_open.c_str(), url, (const char*)0);
12
13	DLOG("Failed to exec command: %s", xdg_open.c_str());
14	_exit(-1);

Lines 19-28 Link Here

(-)./google-gadgets/pkg-plist (-4 / +35 lines)
19	include/google-gadgets/ggadget/dbus/dbus_result_receiver.h	19	include/google-gadgets/ggadget/dbus/dbus_result_receiver.h
20	include/google-gadgets/ggadget/decorated_view_host.h	20	include/google-gadgets/ggadget/decorated_view_host.h
21	include/google-gadgets/ggadget/details_view_data.h	21	include/google-gadgets/ggadget/details_view_data.h
		22	include/google-gadgets/ggadget/details_view_decorator.h
22	include/google-gadgets/ggadget/digest_utils.h	23	include/google-gadgets/ggadget/digest_utils.h
23	include/google-gadgets/ggadget/dir_file_manager.h	24	include/google-gadgets/ggadget/dir_file_manager.h
24	include/google-gadgets/ggadget/display_window.h	25	include/google-gadgets/ggadget/display_window.h
25	include/google-gadgets/ggadget/div_element.h	26	include/google-gadgets/ggadget/div_element.h
		27	include/google-gadgets/ggadget/docked_main_view_decorator.h
26	include/google-gadgets/ggadget/edit_element_base.h	28	include/google-gadgets/ggadget/edit_element_base.h
27	include/google-gadgets/ggadget/element_factory.h	29	include/google-gadgets/ggadget/element_factory.h
28	include/google-gadgets/ggadget/elements.h	30	include/google-gadgets/ggadget/elements.h
Lines 33-39 Link Here
33	include/google-gadgets/ggadget/file_manager_interface.h	35	include/google-gadgets/ggadget/file_manager_interface.h
34	include/google-gadgets/ggadget/file_manager_wrapper.h	36	include/google-gadgets/ggadget/file_manager_wrapper.h
35	include/google-gadgets/ggadget/file_system_interface.h	37	include/google-gadgets/ggadget/file_system_interface.h
		38	include/google-gadgets/ggadget/floating_main_view_decorator.h
36	include/google-gadgets/ggadget/font_interface.h	39	include/google-gadgets/ggadget/font_interface.h
		40	include/google-gadgets/ggadget/framed_view_decorator_base.h
37	include/google-gadgets/ggadget/framework_interface.h	41	include/google-gadgets/ggadget/framework_interface.h
38	include/google-gadgets/ggadget/gadget.h	42	include/google-gadgets/ggadget/gadget.h
39	include/google-gadgets/ggadget/gadget_consts.h	43	include/google-gadgets/ggadget/gadget_consts.h
Lines 49-54 Link Here
49	%%GTK%%include/google-gadgets/ggadget/gtk/utilities.h	53	%%GTK%%include/google-gadgets/ggadget/gtk/utilities.h
50	%%GTK%%include/google-gadgets/ggadget/gtk/view_widget_binder.h	54	%%GTK%%include/google-gadgets/ggadget/gtk/view_widget_binder.h
51	include/google-gadgets/ggadget/host_interface.h	55	include/google-gadgets/ggadget/host_interface.h
		56	include/google-gadgets/ggadget/host_utils.h
52	include/google-gadgets/ggadget/image_cache.h	57	include/google-gadgets/ggadget/image_cache.h
53	include/google-gadgets/ggadget/image_interface.h	58	include/google-gadgets/ggadget/image_interface.h
54	include/google-gadgets/ggadget/img_element.h	59	include/google-gadgets/ggadget/img_element.h
Lines 61-74 Link Here
61	include/google-gadgets/ggadget/localized_file_manager.h	66	include/google-gadgets/ggadget/localized_file_manager.h
62	include/google-gadgets/ggadget/logger.h	67	include/google-gadgets/ggadget/logger.h
63	include/google-gadgets/ggadget/main_loop_interface.h	68	include/google-gadgets/ggadget/main_loop_interface.h
		69	include/google-gadgets/ggadget/main_view_decorator_base.h
64	include/google-gadgets/ggadget/math_utils.h	70	include/google-gadgets/ggadget/math_utils.h
65	include/google-gadgets/ggadget/mediaplayer_element_base.h
66	include/google-gadgets/ggadget/memory_options.h	71	include/google-gadgets/ggadget/memory_options.h
67	include/google-gadgets/ggadget/menu_interface.h	72	include/google-gadgets/ggadget/menu_interface.h
68	include/google-gadgets/ggadget/messages.h	73	include/google-gadgets/ggadget/messages.h
69	include/google-gadgets/ggadget/module.h	74	include/google-gadgets/ggadget/module.h
70	include/google-gadgets/ggadget/object_element.h	75	include/google-gadgets/ggadget/object_element.h
		76	include/google-gadgets/ggadget/object_videoplayer.h
71	include/google-gadgets/ggadget/options_interface.h	77	include/google-gadgets/ggadget/options_interface.h
		78	include/google-gadgets/ggadget/permissions.h
		79	include/google-gadgets/ggadget/popout_main_view_decorator.h
72	include/google-gadgets/ggadget/progressbar_element.h	80	include/google-gadgets/ggadget/progressbar_element.h
73	%%QT%%include/google-gadgets/ggadget/qt/qt_graphics.h	81	%%QT%%include/google-gadgets/ggadget/qt/qt_graphics.h
74	%%QT%%include/google-gadgets/ggadget/qt/qt_main_loop.h	82	%%QT%%include/google-gadgets/ggadget/qt/qt_main_loop.h
Lines 84-89 Link Here
84	include/google-gadgets/ggadget/script_runtime_manager.h	92	include/google-gadgets/ggadget/script_runtime_manager.h
85	include/google-gadgets/ggadget/scriptable_array.h	93	include/google-gadgets/ggadget/scriptable_array.h
86	include/google-gadgets/ggadget/scriptable_binary_data.h	94	include/google-gadgets/ggadget/scriptable_binary_data.h
		95	include/google-gadgets/ggadget/scriptable_enumerator.h
87	include/google-gadgets/ggadget/scriptable_event.h	96	include/google-gadgets/ggadget/scriptable_event.h
88	include/google-gadgets/ggadget/scriptable_file_system.h	97	include/google-gadgets/ggadget/scriptable_file_system.h
89	include/google-gadgets/ggadget/scriptable_framework.h	98	include/google-gadgets/ggadget/scriptable_framework.h
Lines 107-116 Link Here
107	include/google-gadgets/ggadget/texture.h	116	include/google-gadgets/ggadget/texture.h
108	include/google-gadgets/ggadget/unicode_utils.h	117	include/google-gadgets/ggadget/unicode_utils.h
109	include/google-gadgets/ggadget/variant.h	118	include/google-gadgets/ggadget/variant.h
		119	include/google-gadgets/ggadget/video_element_base.h
110	include/google-gadgets/ggadget/view.h	120	include/google-gadgets/ggadget/view.h
		121	include/google-gadgets/ggadget/view_decorator_base.h
111	include/google-gadgets/ggadget/view_element.h	122	include/google-gadgets/ggadget/view_element.h
112	include/google-gadgets/ggadget/view_host_interface.h	123	include/google-gadgets/ggadget/view_host_interface.h
113	include/google-gadgets/ggadget/view_interface.h	124	include/google-gadgets/ggadget/view_interface.h
		125	include/google-gadgets/ggadget/xdg/desktop_entry.h
		126	include/google-gadgets/ggadget/xdg/utilities.h
114	include/google-gadgets/ggadget/xml_dom.h	127	include/google-gadgets/ggadget/xml_dom.h
115	include/google-gadgets/ggadget/xml_dom_interface.h	128	include/google-gadgets/ggadget/xml_dom_interface.h
116	include/google-gadgets/ggadget/xml_http_request_interface.h	129	include/google-gadgets/ggadget/xml_http_request_interface.h
Lines 137-145 Link Here
137	lib/google-gadgets/modules/gst-audio-framework.a	150	lib/google-gadgets/modules/gst-audio-framework.a
138	lib/google-gadgets/modules/gst-audio-framework.la	151	lib/google-gadgets/modules/gst-audio-framework.la
139	lib/google-gadgets/modules/gst-audio-framework.so	152	lib/google-gadgets/modules/gst-audio-framework.so
140	lib/google-gadgets/modules/gst-mediaplayer-element.a	153	lib/google-gadgets/modules/gst-video-element.a
141	lib/google-gadgets/modules/gst-mediaplayer-element.la	154	lib/google-gadgets/modules/gst-video-element.la
142	lib/google-gadgets/modules/gst-mediaplayer-element.so	155	lib/google-gadgets/modules/gst-video-element.so
143	%%GTK%%lib/google-gadgets/modules/gtk-edit-element.a	156	%%GTK%%lib/google-gadgets/modules/gtk-edit-element.a
144	%%GTK%%lib/google-gadgets/modules/gtk-edit-element.la	157	%%GTK%%lib/google-gadgets/modules/gtk-edit-element.la
145	%%GTK%%lib/google-gadgets/modules/gtk-edit-element.so	158	%%GTK%%lib/google-gadgets/modules/gtk-edit-element.so
Lines 190-208 Link Here
190	%%QT%%lib/libggadget-qt-1.0.la	203	%%QT%%lib/libggadget-qt-1.0.la
191	%%QT%%lib/libggadget-qt-1.0.so	204	%%QT%%lib/libggadget-qt-1.0.so
192	%%QT%%lib/libggadget-qt-1.0.so.0	205	%%QT%%lib/libggadget-qt-1.0.so.0
		206	lib/libggadget-xdg-1.0.a
		207	lib/libggadget-xdg-1.0.la
		208	lib/libggadget-xdg-1.0.so
		209	lib/libggadget-xdg-1.0.so.0
193	libdata/pkgconfig/libggadget-1.0.pc	210	libdata/pkgconfig/libggadget-1.0.pc
194	libdata/pkgconfig/libggadget-dbus-1.0.pc	211	libdata/pkgconfig/libggadget-dbus-1.0.pc
195	%%GTK%%libdata/pkgconfig/libggadget-gtk-1.0.pc	212	%%GTK%%libdata/pkgconfig/libggadget-gtk-1.0.pc
196	libdata/pkgconfig/libggadget-js-1.0.pc	213	libdata/pkgconfig/libggadget-js-1.0.pc
197	%%QT%%libdata/pkgconfig/libggadget-qt-1.0.pc	214	%%QT%%libdata/pkgconfig/libggadget-qt-1.0.pc
		215	libdata/pkgconfig/libggadget-xdg-1.0.pc
198	%%GTK%%share/applications/ggl-gtk.desktop	216	%%GTK%%share/applications/ggl-gtk.desktop
199	%%QT%%share/applications/ggl-qt.desktop	217	%%QT%%share/applications/ggl-qt.desktop
200	%%DATADIR%%/analog_clock.gg	218	%%DATADIR%%/analog_clock.gg
		219	%%DATADIR%%/designer.gg
201	%%DATADIR%%/digital_alarm_clock.gg	220	%%DATADIR%%/digital_alarm_clock.gg
202	%%DATADIR%%/google-gadget-browser.gg	221	%%DATADIR%%/google-gadget-browser.gg
203	%%DATADIR%%/igoogle.gg	222	%%DATADIR%%/igoogle.gg
		223	%%DATADIR%%/photos.gg
204	%%DATADIR%%/resources.gg	224	%%DATADIR%%/resources.gg
205	%%DATADIR%%/rss.gg	225	%%DATADIR%%/rss.gg
		226	share/icons/hicolor/128x128/apps/google-gadgets.png
		227	share/icons/hicolor/128x128/mimetypes/application-x-google-gadgets.png
		228	share/icons/hicolor/192x192/apps/google-gadgets.png
		229	share/icons/hicolor/192x192/mimetypes/application-x-google-gadgets.png
		230	share/icons/hicolor/32x32/apps/google-gadgets.png
		231	share/icons/hicolor/32x32/mimetypes/application-x-google-gadgets.png
		232	share/icons/hicolor/48x48/apps/google-gadgets.png
		233	share/icons/hicolor/48x48/mimetypes/application-x-google-gadgets.png
		234	share/icons/hicolor/64x64/apps/google-gadgets.png
		235	share/icons/hicolor/64x64/mimetypes/application-x-google-gadgets.png
206	share/mime/packages/00-google-gadgets.xml	236	share/mime/packages/00-google-gadgets.xml
207	share/pixmaps/google-gadgets.png	237	share/pixmaps/google-gadgets.png
208	@dirrm %%DATADIR%%	238	@dirrm %%DATADIR%%
Lines 212-217 Link Here
212	@dirrm lib/google-gadgets	242	@dirrm lib/google-gadgets
213	%%QT%%@dirrm include/google-gadgets/ggadget/qt	243	%%QT%%@dirrm include/google-gadgets/ggadget/qt
214	@dirrm include/google-gadgets/ggadget/js	244	@dirrm include/google-gadgets/ggadget/js
		245	@dirrm include/google-gadgets/ggadget/xdg
215	%%GTK%%@dirrm include/google-gadgets/ggadget/gtk	246	%%GTK%%@dirrm include/google-gadgets/ggadget/gtk
216	@dirrm include/google-gadgets/ggadget/dbus	247	@dirrm include/google-gadgets/ggadget/dbus
217	@dirrm include/google-gadgets/ggadget	248	@dirrm include/google-gadgets/ggadget