From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Aug 7 05:38:18 2009 Return-Path: Delivered-To: freebsd-ports-bugs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A719D106564A for ; Fri, 7 Aug 2009 05:38:18 +0000 (UTC) (envelope-from Fluffy@fluffy.khv.ru) Received: from ns.ael.RU (ns.ael.ru [62.76.207.226]) by mx1.freebsd.org (Postfix) with ESMTP id EFA338FC16 for ; Fri, 7 Aug 2009 05:38:16 +0000 (UTC) Received: from Fluffy.Khv.RU ([80.83.238.210]) by ns.ael.RU (8.14.3/8.14.3/Fluffy/5.3) with ESMTP id n775bs6u051272; Fri, 7 Aug 2009 16:38:00 +1100 (VLAST) (envelope-from Fluffy@fluffy.khv.ru) Received: from fluffy.khv.ru (localhost [127.0.0.1]) by Fluffy.Khv.RU (8.14.3/8.14.3/Fluffy/5.4.1) with ESMTP id n775bhjq011956; Fri, 7 Aug 2009 16:37:46 +1100 (VLAST) (envelope-from Fluffy@fluffy.khv.ru) From: Dima Panov Organization: Twilight Zone To: Ashish SHUKLA Date: Fri, 7 Aug 2009 16:37:41 +1100 User-Agent: KMail/1.12.0 (FreeBSD/8.0-800107-BETA2; KDE/4.3.0; i386; ; ) X-Face: "RE-2'yS-N:*/7DHOjQ%Az<.+SG>K7B'k(&; qb0K4]Hv>J}"l9,=:m2_]-3S/}`b\]yA-g !y3en*Zl(i-86iM?Q[w@!=rW&JdT>KHW@dri>+qMcy42O, 5#izEqa-K+=B<@A X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (ns.ael.RU [62.76.207.226]); Fri, 07 Aug 2009 16:38:13 +1100 (VLAST) X-Spam-Status: No, score=-1.7 required=3.0 tests=AWL,BAYES_00,RDNS_NONE, URIBL_SBL autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on ns.ael.RU Cc: freebsd-ports-bugs@freebsd.org Subject: Re: ports/137504: deskutils/google-gadgets: update to 0.11.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Aug 2009 05:38:18 -0000 --Boundary-00=_m27eKqK21cxWpjA Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sorry, webmail didn't hadle attach repost ========================== 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 05:17:48 -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 seamonkey mozilla 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 --with-gtkmozembed=${GECKO} 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 05:21:07 -0000 @@ -3,9 +3,9 @@ --- configure.ac.orig +++ configure.ac -@@ -422,6 +422,13 @@ - GGL_PLATFORM_SHORT="\"linux\"" +@@ -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,31 @@ 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`], +@@ -930,15 +938,15 @@ + else + case $with_gtkmozembed in + libxul) +- gtkmozembed_list="libxul-embedding-unstable libxu-embedding" ++ gtkmozembed_list="libxul-embedding-unstable libxul-embedding" + ;; + xulrunner) + gtkmozembed_list="xulrunner-gtkmozembed" + ;; +- firefox2) ++ firefox) + gtkmozembed_list="firefox2-gtkmozembed" + ;; +- firefox) ++ firefox1) + gtkmozembed_list="firefox-gtkmozembed" + ;; + seamonkey) ========================== -- Dmitry "Red Fox" Panov @ Home | KDE@FreeBSD Team | FreeBSD since September 1995 Khabarovsk, Russia | Skype:dima.panov | Jabber.org:fluffy.khv | ICQ:1745024 --Boundary-00=_m27eKqK21cxWpjA Content-Type: text/x-patch; charset="UTF-8"; name="ggadgets.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="ggadgets.diff" 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 05:17:48 -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 seamonkey mozilla 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 --with-gtkmozembed=${GECKO} 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 05:21:07 -0000 @@ -3,9 +3,9 @@ --- configure.ac.orig +++ configure.ac -@@ -422,6 +422,13 @@ - GGL_PLATFORM_SHORT="\"linux\"" +@@ -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,31 @@ 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`], +@@ -930,15 +938,15 @@ + else + case $with_gtkmozembed in + libxul) +- gtkmozembed_list="libxul-embedding-unstable libxu-embedding" ++ gtkmozembed_list="libxul-embedding-unstable libxul-embedding" + ;; + xulrunner) + gtkmozembed_list="xulrunner-gtkmozembed" + ;; +- firefox2) ++ firefox) + gtkmozembed_list="firefox2-gtkmozembed" + ;; +- firefox) ++ firefox1) + gtkmozembed_list="firefox-gtkmozembed" + ;; + seamonkey) --Boundary-00=_m27eKqK21cxWpjA--