Date: Fri, 7 Aug 2009 14:48:24 +1100 From: "Dima Panov" <fluffy@fluffy.khv.ru> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/137504: deskutils/google-gadgets: update to 0.11.0 Message-ID: <1249616904.59486@Fluffy.Khv.RU> Resent-Message-ID: <200908070350.n773o2As065339@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 137504
>Category: ports
>Synopsis: deskutils/google-gadgets: update to 0.11.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 07 03:50:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Dima Panov
>Release: FreeBSD 8.0-800107-BETA2 i386
>Organization:
Fluffy.Khv.RU
>Environment:
System: FreeBSD 8.0-800107-BETA2 #0: Thu Aug 6 14:21:53 VLAST 2009
root@Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot
>Description:
deskutils/google-gadgets: update to 0.11.0
switched to USE_GECHO -- ggadgets now knows about libxul and others
>How-To-Repeat:
>Fix:
--- ggadgets.diff begins here ---
Index: deskutils/google-gadgets/Makefile
===================================================================
RCS file: /home/ncvs/ports/deskutils/google-gadgets/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- deskutils/google-gadgets/Makefile 2 Aug 2009 19:32:54 -0000 1.13
+++ deskutils/google-gadgets/Makefile 7 Aug 2009 03:42:26 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= google-gadgets
-PORTVERSION= 0.10.5
-PORTREVISION= 2
+PORTVERSION= 0.11.0
CATEGORIES= deskutils
MASTER_SITES= http://google-gadgets-for-linux.googlecode.com/files/
DISTNAME= ${PORTNAME}-for-linux-${PORTVERSION}
@@ -16,10 +15,8 @@
COMMENT= Google Desktop Gadgets
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus \
- ${LOCALBASE}/libdata/pkgconfig/firefox-js.pc:${PORTSDIR}/www/firefox \
${LOCALBASE}/libdata/pkgconfig/libcurl.pc:${PORTSDIR}/ftp/curl \
${LOCALBASE}/libdata/pkgconfig/libxml-2.0.pc:${PORTSDIR}/textproc/libxml2 \
- ${LOCALBASE}/libdata/pkgconfig/firefox-gtkmozembed.pc:${PORTSDIR}/www/firefox \
${LOCALBASE}/libdata/pkgconfig/cairo.pc:${PORTSDIR}/graphics/cairo \
${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc:${PORTSDIR}/graphics/librsvg2 \
zip:${PORTSDIR}/archivers/zip
@@ -28,8 +25,7 @@
dbus-1.3:${PORTSDIR}/devel/dbus \
curl.5:${PORTSDIR}/ftp/curl \
rsvg-2.2:${PORTSDIR}/graphics/librsvg2
-RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/firefox-js.pc:${PORTSDIR}/www/firefox \
- ${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
+RUN_DEPENDS= ${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
USE_BZIP2= yes
USE_LDCONFIG= yes
@@ -38,12 +34,15 @@
USE_GSTREAMER= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -Wno-deprecated-declarations" CPPFLAGS="-I${LOCALBASE}/include -Wno-deprecated-declarations" LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --enable-ltdl-install=no
+CONFIGURE_ARGS= --enable-ltdl-install=no --with-browser-plugins-dir=${LOCALBASE}/lib/browser_plugins
USE_AUTOTOOLS= libtool:22:env autoconf:262:env automake:110:env aclocal:110:env libltdl:22
WANT_GNOME= yes
USE_GNOME= gnomehack
INSTALLS_ICONS= yes
+USE_GECKO= libxul firefox mozilla seamonkey xulrunner
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
+
OPTIONS= DEBUGGING "Enable debug output on runtime" on\
GTK "Build GTK Host" on\
QT "Build Qt Host" on
@@ -64,7 +63,7 @@
.elif defined(WITH_GTK)
USE_GNOME= gtk20
PLIST_SUB+= GTK=""
-CONFIGURE_ARGS+= --enable-gtk-host --with-gtkmozembed=firefox-gtkmozembed
+CONFIGURE_ARGS+= --enable-gtk-host
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
Index: deskutils/google-gadgets/distinfo
===================================================================
RCS file: /home/ncvs/ports/deskutils/google-gadgets/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- deskutils/google-gadgets/distinfo 8 Mar 2009 12:53:51 -0000 1.7
+++ deskutils/google-gadgets/distinfo 7 Aug 2009 02:40:24 -0000
@@ -1,3 +1,3 @@
-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
+MD5 (google-gadgets-for-linux-0.11.0.tar.bz2) = 714b65738f4edeae361e2b164088c50d
+SHA256 (google-gadgets-for-linux-0.11.0.tar.bz2) = ee77f58866e94ed6ef592650329d30e81ad58cf44e418b36c9218734db02b82f
+SIZE (google-gadgets-for-linux-0.11.0.tar.bz2) = 2526161
Index: deskutils/google-gadgets/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/deskutils/google-gadgets/pkg-plist,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist
--- deskutils/google-gadgets/pkg-plist 8 Mar 2009 12:53:51 -0000 1.8
+++ deskutils/google-gadgets/pkg-plist 7 Aug 2009 03:31:10 -0000
@@ -62,6 +62,7 @@
include/google-gadgets/ggadget/js/js_utils.h
include/google-gadgets/ggadget/js/jscript_massager.h
include/google-gadgets/ggadget/label_element.h
+include/google-gadgets/ggadget/light_map.h
include/google-gadgets/ggadget/listbox_element.h
include/google-gadgets/ggadget/locales.h
include/google-gadgets/ggadget/localized_file_manager.h
@@ -174,6 +175,9 @@
%%GTK%%lib/google-gadgets/modules/gtkmoz-browser-element.a
%%GTK%%lib/google-gadgets/modules/gtkmoz-browser-element.la
%%GTK%%lib/google-gadgets/modules/gtkmoz-browser-element.so
+lib/google-gadgets/modules/html-flash-element.a
+lib/google-gadgets/modules/html-flash-element.la
+lib/google-gadgets/modules/html-flash-element.so
lib/google-gadgets/modules/libxml2-xml-parser.a
lib/google-gadgets/modules/libxml2-xml-parser.la
lib/google-gadgets/modules/libxml2-xml-parser.so
@@ -195,6 +199,9 @@
lib/google-gadgets/modules/smjs-script-runtime.a
lib/google-gadgets/modules/smjs-script-runtime.la
lib/google-gadgets/modules/smjs-script-runtime.so
+lib/google-gadgets/modules/soup-xml-http-request.a
+lib/google-gadgets/modules/soup-xml-http-request.la
+lib/google-gadgets/modules/soup-xml-http-request.so
lib/libggadget-1.0.a
lib/libggadget-1.0.la
lib/libggadget-1.0.so
Index: deskutils/google-gadgets/files/patch-configure.ac
===================================================================
RCS file: /home/ncvs/ports/deskutils/google-gadgets/files/patch-configure.ac,v
retrieving revision 1.4
diff -u -r1.4 patch-configure.ac
--- deskutils/google-gadgets/files/patch-configure.ac 8 Mar 2009 12:53:52 -0000 1.4
+++ deskutils/google-gadgets/files/patch-configure.ac 7 Aug 2009 03:43:07 -0000
@@ -1,11 +1,11 @@
$FreeBSD: ports/deskutils/google-gadgets/files/patch-configure.ac,v 1.4 2009/03/08 12:53:52 beat Exp $
---- configure.ac.orig
-+++ configure.ac
-@@ -422,6 +422,13 @@
- GGL_PLATFORM_SHORT="\"linux\""
+--- configure.ac.orig 2009-05-31 16:06:05.000000000 +1100
++++ configure.ac 2009-08-07 13:44:06.000000000 +1100
+@@ -501,6 +501,13 @@
GGL_PLATFORM="\"linux\""
+ build_linux_system_framework=yes
;;
+ *freebsd* )
+ ggl_host_type=freebsd
@@ -17,7 +17,7 @@
*solaris* )
ggl_host_type=solaris
PREDEFINED_MACROS="$PREDEFINED_MACROS -DGGL_HOST_SOLARIS=1"
-@@ -442,6 +449,7 @@
+@@ -526,6 +533,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,41 +25,12 @@
AC_SUBST(PREDEFINED_MACROS)
AC_SUBST(DEFAULT_COMPILE_FLAGS)
-@@ -558,7 +566,7 @@
- has_qtnetwork=no
+@@ -651,7 +659,7 @@
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],
- [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]) ;;
+ if test x$build_libggadget_qt = xyes; then
+- 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],
+ [has_qt4=yes
+ MOC=`$PKG_CONFIG --variable=moc_location QtCore`],
--- ggadgets.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1249616904.59486>