Date: Sat, 23 Jun 2012 14:04:19 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r796 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-beta mail/thunderbird-beta/files mail/thunderbird-esr mail/thunderbird-esr/files mail/thunderbird/files www/firefox www/firefox-beta www/firefox-beta/files www/firefox-esr www/firefox-esr/files www/firefox-nightly www/firefox-nightly/files www/firefox/files www/libxul www/libxul/files www/seamonkey www/seamonkey-beta www/seamonkey-beta/files www/seamonkey/files Message-ID: <201206231404.q5NE4JZP081986@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Jun 23 14:04:19 2012
New Revision: 796
Log:
add cairo-qt support
It depends on qt surface in cairo (ports/169343),
else can be built with bundled cairo.
Added:
branches/experimental/mail/thunderbird-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-widget-src-qt-nsNativeThemeQt.cpp
branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp
branches/experimental/www/firefox-beta/files/patch-widget-qt-nsNativeThemeQt.cpp
branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsNativeThemeQt.cpp
branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsNativeThemeQt.cpp
branches/experimental/www/firefox/files/patch-widget-qt-nsNativeThemeQt.cpp
branches/experimental/www/libxul/files/patch-widget-src-qt-nsNativeThemeQt.cpp
branches/experimental/www/seamonkey-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp
branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/mail/thunderbird-beta/Makefile
branches/experimental/mail/thunderbird-esr/Makefile
branches/experimental/mail/thunderbird/Makefile
branches/experimental/www/firefox-beta/Makefile
branches/experimental/www/firefox-esr/Makefile
branches/experimental/www/firefox-nightly/Makefile
branches/experimental/www/firefox/Makefile
branches/experimental/www/libxul/Makefile
branches/experimental/www/seamonkey-beta/Makefile
branches/experimental/www/seamonkey/Makefile
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Sat Jun 23 13:59:11 2012 (r795)
+++ branches/experimental/Mk/bsd.gecko.mk Sat Jun 23 14:04:19 2012 (r796)
@@ -514,7 +514,7 @@
MOZILLA_BIN?= ${PORTNAME}-bin
MOZILLA_EXEC_NAME?=${MOZILLA}
MOZ_RPATH?= ${MOZILLA}
-USE_GNOME+= gtk20 libidl desktopfileutils
+USE_GNOME+= libidl desktopfileutils
USE_ICONV= yes
USE_PERL5_BUILD=yes
USE_XORG= printproto sm xt xi xext x11 xinerama \
@@ -665,6 +665,15 @@
MOZ_MK_OPTIONS+= XP_UNIX=1 \
PERL=${PERL}
+.if ${MOZ_TOOLKIT:Mcairo-qt}
+USE_GNOME+= pango
+USE_QT4+= moc_build gui network opengl
+MOZ_OPTIONS+= --with-qtdir= # pkg-config
+CONFIGURE_ENV+= HOST_MOC="${MOC}" HOST_RCC="${FALSE}"
+.else # gtk2, cairo-gtk2
+USE_GNOME+= gtk20
+.endif
+
.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
CONFIGURE_ENV+= MOZ_OPTIMIZE_FLAGS="${CFLAGS:M-O*}"
MOZ_OPTIONS+= --enable-optimize
@@ -785,6 +794,7 @@
.endif
.for subdir in "" nsprpub js/src
@if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \
+ ${ECHO_CMD} "cairo-qt.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
${ECHO_CMD} "fenv.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
${ECHO_CMD} "malloc_np.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
${ECHO_CMD} "pthread_np.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
Modified: branches/experimental/mail/thunderbird-beta/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-beta/Makefile Sat Jun 23 13:59:11 2012 (r795)
+++ branches/experimental/mail/thunderbird-beta/Makefile Sat Jun 23 14:04:19 2012 (r796)
@@ -31,6 +31,8 @@
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
+USE_QT4= # empty
+QT_NONSTANDARD= yes
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796)
@@ -0,0 +1,12 @@
+--- mozilla/widget/qt/nsNativeThemeQt.cpp~
++++ mozilla/widget/qt/nsNativeThemeQt.cpp
+@@ -25,7 +25,9 @@
+ #include "nsThemeConstants.h"
+ #include "nsIServiceManager.h"
+ #include "nsIDOMHTMLInputElement.h"
++#ifdef __GLIBC__
+ #include <malloc.h>
++#endif
+
+
+ #include "gfxASurface.h"
Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 23 13:59:11 2012 (r795)
+++ branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 23 14:04:19 2012 (r796)
@@ -32,6 +32,8 @@
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
+USE_QT4= # empty
+QT_NONSTANDARD= yes
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
Added: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-widget-src-qt-nsNativeThemeQt.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-widget-src-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796)
@@ -0,0 +1,12 @@
+--- mozilla/widget/src/qt/nsNativeThemeQt.cpp~
++++ mozilla/widget/src/qt/nsNativeThemeQt.cpp
+@@ -25,7 +25,9 @@
+ #include "nsThemeConstants.h"
+ #include "nsIServiceManager.h"
+ #include "nsIDOMHTMLInputElement.h"
++#ifdef __GLIBC__
+ #include <malloc.h>
++#endif
+
+
+ #include "gfxASurface.h"
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Sat Jun 23 13:59:11 2012 (r795)
+++ branches/experimental/mail/thunderbird/Makefile Sat Jun 23 14:04:19 2012 (r796)
@@ -31,6 +31,8 @@
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
+USE_QT4= # empty
+QT_NONSTANDARD= yes
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
Added: branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796)
@@ -0,0 +1,12 @@
+--- mozilla/widget/qt/nsNativeThemeQt.cpp~
++++ mozilla/widget/qt/nsNativeThemeQt.cpp
+@@ -25,7 +25,9 @@
+ #include "nsThemeConstants.h"
+ #include "nsIServiceManager.h"
+ #include "nsIDOMHTMLInputElement.h"
++#ifdef __GLIBC__
+ #include <malloc.h>
++#endif
+
+
+ #include "gfxASurface.h"
Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile Sat Jun 23 13:59:11 2012 (r795)
+++ branches/experimental/www/firefox-beta/Makefile Sat Jun 23 14:04:19 2012 (r796)
@@ -34,6 +34,8 @@
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
+USE_QT4= # empty
+QT_NONSTANDARD= yes
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
GNU_CONFIGURE= yes
Added: branches/experimental/www/firefox-beta/files/patch-widget-qt-nsNativeThemeQt.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-widget-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796)
@@ -0,0 +1,12 @@
+--- widget/qt/nsNativeThemeQt.cpp~
++++ widget/qt/nsNativeThemeQt.cpp
+@@ -25,7 +25,9 @@
+ #include "nsThemeConstants.h"
+ #include "nsIServiceManager.h"
+ #include "nsIDOMHTMLInputElement.h"
++#ifdef __GLIBC__
+ #include <malloc.h>
++#endif
+
+
+ #include "gfxASurface.h"
Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile Sat Jun 23 13:59:11 2012 (r795)
+++ branches/experimental/www/firefox-esr/Makefile Sat Jun 23 14:04:19 2012 (r796)
@@ -35,6 +35,8 @@
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
+USE_QT4= # empty
+QT_NONSTANDARD= yes
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
GNU_CONFIGURE= yes
Added: branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsNativeThemeQt.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796)
@@ -0,0 +1,12 @@
+--- widget/src/qt/nsNativeThemeQt.cpp~
++++ widget/src/qt/nsNativeThemeQt.cpp
+@@ -25,7 +25,9 @@
+ #include "nsThemeConstants.h"
+ #include "nsIServiceManager.h"
+ #include "nsIDOMHTMLInputElement.h"
++#ifdef __GLIBC__
+ #include <malloc.h>
++#endif
+
+
+ #include "gfxASurface.h"
Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile Sat Jun 23 13:59:11 2012 (r795)
+++ branches/experimental/www/firefox-nightly/Makefile Sat Jun 23 14:04:19 2012 (r796)
@@ -37,6 +37,8 @@
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
+USE_QT4= # empty
+QT_NONSTANDARD= yes
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
GNU_CONFIGURE= yes
Added: branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsNativeThemeQt.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796)
@@ -0,0 +1,12 @@
+--- widget/qt/nsNativeThemeQt.cpp~
++++ widget/qt/nsNativeThemeQt.cpp
+@@ -25,7 +25,9 @@
+ #include "nsThemeConstants.h"
+ #include "nsIServiceManager.h"
+ #include "nsIDOMHTMLInputElement.h"
++#ifdef __GLIBC__
+ #include <malloc.h>
++#endif
+
+
+ #include "gfxASurface.h"
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Sat Jun 23 13:59:11 2012 (r795)
+++ branches/experimental/www/firefox/Makefile Sat Jun 23 14:04:19 2012 (r796)
@@ -34,6 +34,8 @@
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
+USE_QT4= # empty
+QT_NONSTANDARD= yes
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
GNU_CONFIGURE= yes
Added: branches/experimental/www/firefox/files/patch-widget-qt-nsNativeThemeQt.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-widget-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796)
@@ -0,0 +1,12 @@
+--- widget/qt/nsNativeThemeQt.cpp~
++++ widget/qt/nsNativeThemeQt.cpp
+@@ -25,7 +25,9 @@
+ #include "nsThemeConstants.h"
+ #include "nsIServiceManager.h"
+ #include "nsIDOMHTMLInputElement.h"
++#ifdef __GLIBC__
+ #include <malloc.h>
++#endif
+
+
+ #include "gfxASurface.h"
Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile Sat Jun 23 13:59:11 2012 (r795)
+++ branches/experimental/www/libxul/Makefile Sat Jun 23 14:04:19 2012 (r796)
@@ -27,6 +27,8 @@
USE_AUTOTOOLS= autoconf213:env
WANT_GNOME= yes
+USE_QT4= # empty
+QT_NONSTANDARD= yes
WANT_PERL= yes
ALL_TARGET= default
GNU_CONFIGURE= yes
Added: branches/experimental/www/libxul/files/patch-widget-src-qt-nsNativeThemeQt.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-widget-src-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796)
@@ -0,0 +1,12 @@
+--- widget/src/qt/nsNativeThemeQt.cpp~
++++ widget/src/qt/nsNativeThemeQt.cpp
+@@ -25,7 +25,9 @@
+ #include "nsThemeConstants.h"
+ #include "nsIServiceManager.h"
+ #include "nsIDOMHTMLInputElement.h"
++#ifdef __GLIBC__
+ #include <malloc.h>
++#endif
+
+
+ #include "gfxASurface.h"
Modified: branches/experimental/www/seamonkey-beta/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-beta/Makefile Sat Jun 23 13:59:11 2012 (r795)
+++ branches/experimental/www/seamonkey-beta/Makefile Sat Jun 23 14:04:19 2012 (r796)
@@ -27,6 +27,8 @@
USE_GMAKE= yes
USE_GECKO= gecko
WANT_GNOME= yes
+USE_QT4= # empty
+QT_NONSTANDARD= yes
WANT_PERL= yes
GNU_CONFIGURE= yes
ALL_TARGET= default
Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796)
@@ -0,0 +1,12 @@
+--- mozilla/widget/qt/nsNativeThemeQt.cpp~
++++ mozilla/widget/qt/nsNativeThemeQt.cpp
+@@ -25,7 +25,9 @@
+ #include "nsThemeConstants.h"
+ #include "nsIServiceManager.h"
+ #include "nsIDOMHTMLInputElement.h"
++#ifdef __GLIBC__
+ #include <malloc.h>
++#endif
+
+
+ #include "gfxASurface.h"
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Sat Jun 23 13:59:11 2012 (r795)
+++ branches/experimental/www/seamonkey/Makefile Sat Jun 23 14:04:19 2012 (r796)
@@ -27,6 +27,8 @@
USE_GMAKE= yes
USE_GECKO= gecko
WANT_GNOME= yes
+USE_QT4= # empty
+QT_NONSTANDARD= yes
WANT_PERL= yes
GNU_CONFIGURE= yes
OBJDIR_BUILD= yes
Added: branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796)
@@ -0,0 +1,12 @@
+--- mozilla/widget/qt/nsNativeThemeQt.cpp~
++++ mozilla/widget/qt/nsNativeThemeQt.cpp
+@@ -25,7 +25,9 @@
+ #include "nsThemeConstants.h"
+ #include "nsIServiceManager.h"
+ #include "nsIDOMHTMLInputElement.h"
++#ifdef __GLIBC__
+ #include <malloc.h>
++#endif
+
+
+ #include "gfxASurface.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206231404.q5NE4JZP081986>