ports/134737: Update webkit-gtk2 to 1.1.7
Eric L. Chen
d9364104 at mail.nchu.edu.tw
Fri May 22 08:38:51 UTC 2009
Refresh patches, Fix plugin path (this problem existed in 1.0.1_6, too).
/Eric
On Wed, May 20, 2009 at 2:10 PM, <FreeBSD-gnats-submit at freebsd.org> wrote:
> Thank you very much for your problem report.
> It has the internal identification `ports/134737'.
> The individual assigned to look at your
> report is: freebsd-ports-bugs.
>
> You can access the state of your problem report at any time
> via this link:
>
> http://www.freebsd.org/cgi/query-pr.cgi?pr=134737
>
> >Category: ports
> >Responsible: freebsd-ports-bugs
> >Synopsis: Update webkit-gtk2 to 1.1.7
> >Arrival-Date: Wed May 20 06:10:03 UTC 2009
>
-------------- next part --------------
diff -purN www/webkit-gtk2.orig/Makefile www/webkit-gtk2/Makefile
--- www/webkit-gtk2.orig/Makefile 2009-05-20 14:36:30.000000000 +0800
+++ www/webkit-gtk2/Makefile 2009-05-22 14:59:52.000000000 +0800
@@ -7,10 +7,10 @@
#
PORTNAME= webkit
-PORTVERSION= 1.0.1
-PORTREVISION= 6
+PORTVERSION= 1.1.7
+PORTREVISION= 0
CATEGORIES= www
-MASTER_SITES= http://people.freedesktop.org/~alp/webkit/gtk/
+MASTER_SITES= http://webkitgtk.org/
PKGNAMESUFFIX= -gtk2
MAINTAINER= gnome at FreeBSD.org
@@ -27,15 +27,13 @@ USE_GMAKE= yes
USE_GNOME= gtk20 libxslt
USE_PERL5= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= autoconf:262 automake:110 libtool:15
+HAS_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
ac_cv_path_DOLT_BASH=""
-CONFIGURE_ARGS= --with-webkit-target=x11 \
- --enable-icon-database \
+CONFIGURE_ARGS= --enable-icon-database \
--enable-svg \
- --enable-svg-fonts \
- --enable-svg-experimental
+ --enable-svg-fonts
MAKEFILE= GNUmakefile
BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2
@@ -53,18 +51,9 @@ CONFIGURE_ARGS+=--enable-video
post-patch:
@${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \
${WRKSRC}/WebCore/plugins/PluginDatabase.cpp
- @${REINPLACE_CMD} -e 's|autoconf|${AUTOCONF}|g ; \
- s|automake|${AUTOMAKE}|g ; s|aclocal|${ACLOCAL}|g ; \
- s|autoheader|${AUTOHEADER}|g ; \
- s|LIBTOOLIZE=libtoolize|LIBTOOLIZE=${LIBTOOLIZE}|g ; \
- s|$$srcdir/configure|#$$srcdir/configure|g' \
- ${WRKSRC}/autogen.sh
@${FIND} ${WRKSRC} -name GNUmakefile.am | ${XARGS} ${REINPLACE_CMD} -e \
's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
-pre-configure:
- @(cd ${WRKSRC} && ${SH} autogen.sh)
-
post-install:
# Install compat pkg-config file so we don't have to patch ports
${CP} ${PREFIX}/libdata/pkgconfig/webkit-1.0.pc \
diff -purN www/webkit-gtk2.orig/distinfo www/webkit-gtk2/distinfo
--- www/webkit-gtk2.orig/distinfo 2009-05-20 14:36:30.000000000 +0800
+++ www/webkit-gtk2/distinfo 2009-05-22 14:59:52.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (webkit-1.0.1.tar.gz) = 4de68a5773998bea14e8939aa341c466
-SHA256 (webkit-1.0.1.tar.gz) = 9601ed57978e7f1221f770c24933d2037fdb93e4b412716d842b993507f0b856
-SIZE (webkit-1.0.1.tar.gz) = 13418752
+MD5 (webkit-1.1.7.tar.gz) = f681773e29898509741cd3bc293816f4
+SHA256 (webkit-1.1.7.tar.gz) = 1aaae2bc36ba7ffb27690647e1631f336c0aee56bad2fd91ee6ea906ff17945f
+SIZE (webkit-1.1.7.tar.gz) = 6205024
diff -purN www/webkit-gtk2.orig/files/patch-WebKit_gtk_webkit.pc.in www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in
--- www/webkit-gtk2.orig/files/patch-WebKit_gtk_webkit.pc.in 2009-05-20 14:36:30.000000000 +0800
+++ www/webkit-gtk2/files/patch-WebKit_gtk_webkit.pc.in 2009-05-22 14:59:52.000000000 +0800
@@ -1,8 +1,8 @@
---- WebKit/gtk/webkit.pc.in.orig 2008-04-01 14:46:09.251210738 -0400
-+++ WebKit/gtk/webkit.pc.in 2008-04-01 14:46:21.218068816 -0400
-@@ -8,4 +8,4 @@
+--- WebKit/gtk/webkit.pc.in.orig 2009-05-13 20:55:10.000000000 +0800
++++ WebKit/gtk/webkit.pc.in 2009-05-19 15:09:51.000000000 +0800
+@@ -8,4 +8,4 @@ Description: Web content engine for GTK+
Version: @VERSION@
- Requires: gtk+-2.0
+ Requires: glib-2.0 gtk+-2.0 libsoup-2.4
Libs: -L${libdir} -lwebkit-1.0
-Cflags: -I${includedir}/webkit-1.0
+Cflags: -I${includedir}/webkit-1.0 -I${includedir}/webkit-1.0/webkit
diff -purN www/webkit-gtk2.orig/files/patch-Webcore_plugins_PluginDatabase.cpp www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp
--- www/webkit-gtk2.orig/files/patch-Webcore_plugins_PluginDatabase.cpp 2009-05-20 14:36:30.000000000 +0800
+++ www/webkit-gtk2/files/patch-Webcore_plugins_PluginDatabase.cpp 2009-05-22 15:02:45.000000000 +0800
@@ -1,10 +1,10 @@
---- WebCore/plugins/PluginDatabase.cpp.orig 2008-05-26 01:03:07.236973838 -0700
-+++ WebCore/plugins/PluginDatabase.cpp 2008-05-26 01:03:52.356436787 -0700
-@@ -281,6 +281,7 @@
+--- WebCore/plugins/PluginDatabase.cpp.orig 2008-11-02 03:12:05.000000000 +0800
++++ WebCore/plugins/PluginDatabase.cpp 2009-05-19 15:09:51.000000000 +0800
+@@ -283,6 +283,7 @@ Vector<String> PluginDatabase::defaultPl
userPluginPath.append(String("/.netscape/plugins"));
paths.append(userPluginPath);
-+ paths.append("%%BROWSER_PLUGINS%%");
++ paths.append("%%BROWSER_PLUGINS_DIR%%");
paths.append("/usr/lib/browser/plugins");
paths.append("/usr/local/lib/mozilla/plugins");
paths.append("/usr/lib/firefox/plugins");
diff -purN www/webkit-gtk2.orig/files/patch-cairo www/webkit-gtk2/files/patch-cairo
--- www/webkit-gtk2.orig/files/patch-cairo 2009-05-20 14:36:30.000000000 +0800
+++ www/webkit-gtk2/files/patch-cairo 2009-05-22 14:59:52.000000000 +0800
@@ -1,31 +1,11 @@
---- WebCore/platform/graphics/BitmapImage.cpp
-+++ WebCore/platform/graphics/BitmapImage.cpp
-@@ -203,7 +203,7 @@ float BitmapImage::frameDurationAtIndex(size_t index)
- bool BitmapImage::frameHasAlphaAtIndex(size_t index)
+--- WebCore/platform/graphics/BitmapImage.cpp.orig 2009-03-04 03:34:16.000000000 +0800
++++ WebCore/platform/graphics/BitmapImage.cpp 2009-05-19 15:09:51.000000000 +0800
+@@ -202,7 +202,7 @@ bool BitmapImage::isSizeAvailable()
+ NativeImagePtr BitmapImage::frameAtIndex(size_t index)
{
if (index >= frameCount())
- return 0;
-+ return true;
++ return NULL;
if (index >= m_frames.size() || !m_frames[index].m_frame)
cacheFrame(index);
---- WebCore/platform/graphics/cairo/ImageCairo.cpp
-+++ WebCore/platform/graphics/cairo/ImageCairo.cpp
-@@ -76,6 +76,7 @@ BitmapImage::BitmapImage(cairo_surface_t* surface, ImageObserver* observer)
-
- m_frames.grow(1);
- m_frames[0].m_frame = surface;
-+ m_frames[0].m_hasAlpha = cairo_surface_get_content(surface) != CAIRO_CONTENT_COLOR;
- checkForSolidColor();
- }
-
---- WebCore/platform/graphics/cg/ImageCG.cpp
-+++ WebCore/platform/graphics/cg/ImageCG.cpp
-@@ -87,6 +87,7 @@ BitmapImage::BitmapImage(CGImageRef cgImage, ImageObserver* observer)
-
- m_frames.grow(1);
- m_frames[0].m_frame = cgImage;
-+ m_frames[0].m_hasAlpha = true;
- checkForSolidColor();
- }
-
diff -purN www/webkit-gtk2.orig/files/patch-configure www/webkit-gtk2/files/patch-configure
--- www/webkit-gtk2.orig/files/patch-configure 1970-01-01 08:00:00.000000000 +0800
+++ www/webkit-gtk2/files/patch-configure 2009-05-22 14:59:52.000000000 +0800
@@ -0,0 +1,20 @@
+--- configure.orig 2009-05-19 15:17:51.000000000 +0800
++++ configure 2009-05-19 15:18:21.000000000 +0800
+@@ -20986,7 +20986,7 @@
+
+ if test "$enable_jit" = "yes"; then
+ case "$target_cpu" in
+- i*86|x86_64)
++ i*86|x86_64|amd64)
+
+ cat >>confdefs.h <<\_ACEOF
+ #define ENABLE_JIT 1
+@@ -21020,7 +21020,7 @@
+ _ACEOF
+
+ ;;
+- x86_64)
++ x86_64|amd64)
+
+ cat >>confdefs.h <<\_ACEOF
+ #define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1
diff -purN www/webkit-gtk2.orig/pkg-plist www/webkit-gtk2/pkg-plist
--- www/webkit-gtk2.orig/pkg-plist 2009-05-20 14:36:30.000000000 +0800
+++ www/webkit-gtk2/pkg-plist 2009-05-22 14:59:52.000000000 +0800
@@ -8,6 +8,7 @@ include/webkit-1.0/JavaScriptCore/JSStri
include/webkit-1.0/JavaScriptCore/JSValueRef.h
include/webkit-1.0/JavaScriptCore/JavaScript.h
include/webkit-1.0/JavaScriptCore/JavaScriptCore.h
+include/webkit-1.0/JavaScriptCore/WebKitAvailability.h
include/webkit-1.0/webkit/webkit.h
include/webkit-1.0/webkit/webkitdefines.h
include/webkit-1.0/webkit/webkitnetworkrequest.h
@@ -17,12 +18,143 @@ include/webkit-1.0/webkit/webkitwebframe
include/webkit-1.0/webkit/webkitwebhistoryitem.h
include/webkit-1.0/webkit/webkitwebsettings.h
include/webkit-1.0/webkit/webkitwebview.h
-lib/libwebkit-1.0.a
+include/webkit-1.0/webkit/webkitdownload.h
+include/webkit-1.0/webkit/webkiterror.h
+include/webkit-1.0/webkit/webkitsoupauthdialog.h
+include/webkit-1.0/webkit/webkitwebinspector.h
+include/webkit-1.0/webkit/webkitwebnavigationaction.h
+include/webkit-1.0/webkit/webkitwebpolicydecision.h
+include/webkit-1.0/webkit/webkitwebwindowfeatures.h
+include/webkit-1.0/webkit/webkitenumtypes.h
lib/libwebkit-1.0.la
lib/libwebkit-1.0.so
-lib/libwebkit-1.0.so.1
+lib/libwebkit-1.0.so.7
libdata/pkgconfig/WebKitGtk.pc
libdata/pkgconfig/webkit-1.0.pc
+share/locale/de/LC_MESSAGES/webkit.mo
+share/locale/it/LC_MESSAGES/webkit.mo
+share/locale/pt_BR/LC_MESSAGES/webkit.mo
+share/locale/ru/LC_MESSAGES/webkit.mo
+share/locale/sv/LC_MESSAGES/webkit.mo
+share/webkit-1.0/webinspector/Images/back.png
+share/webkit-1.0/webinspector/Images/checker.png
+share/webkit-1.0/webinspector/Images/clearConsoleButtons.png
+share/webkit-1.0/webinspector/Images/closeButtons.png
+share/webkit-1.0/webinspector/Images/consoleButtons.png
+share/webkit-1.0/webinspector/Images/database.png
+share/webkit-1.0/webinspector/Images/databaseTable.png
+share/webkit-1.0/webinspector/Images/databasesIcon.png
+share/webkit-1.0/webinspector/Images/debuggerContinue.png
+share/webkit-1.0/webinspector/Images/debuggerPause.png
+share/webkit-1.0/webinspector/Images/debuggerStepInto.png
+share/webkit-1.0/webinspector/Images/debuggerStepOut.png
+share/webkit-1.0/webinspector/Images/debuggerStepOver.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallDown.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallDownBlack.png
+share/webkit-1.0/webinspector/Images/dockButtons.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallDownWhite.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRight.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightBlack.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDown.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDownBlack.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDownWhite.png
+share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightWhite.png
+share/webkit-1.0/webinspector/Images/domStorage.png
+share/webkit-1.0/webinspector/Images/elementsIcon.png
+share/webkit-1.0/webinspector/Images/enableButtons.png
+share/webkit-1.0/webinspector/Images/errorIcon.png
+share/webkit-1.0/webinspector/Images/errorMediumIcon.png
+share/webkit-1.0/webinspector/Images/excludeButtons.png
+share/webkit-1.0/webinspector/Images/focusButtons.png
+share/webkit-1.0/webinspector/Images/forward.png
+share/webkit-1.0/webinspector/Images/glossyHeader.png
+share/webkit-1.0/webinspector/Images/glossyHeaderPressed.png
+share/webkit-1.0/webinspector/Images/glossyHeaderSelected.png
+share/webkit-1.0/webinspector/Images/glossyHeaderSelectedPressed.png
+share/webkit-1.0/webinspector/Images/goArrow.png
+share/webkit-1.0/webinspector/Images/graphLabelCalloutLeft.png
+share/webkit-1.0/webinspector/Images/graphLabelCalloutRight.png
+share/webkit-1.0/webinspector/Images/largerResourcesButtons.png
+share/webkit-1.0/webinspector/Images/nodeSearchButtons.png
+share/webkit-1.0/webinspector/Images/paneBottomGrow.png
+share/webkit-1.0/webinspector/Images/paneBottomGrowActive.png
+share/webkit-1.0/webinspector/Images/paneGrowHandleLine.png
+share/webkit-1.0/webinspector/Images/pauseOnExceptionButtons.png
+share/webkit-1.0/webinspector/Images/percentButtons.png
+share/webkit-1.0/webinspector/Images/profileGroupIcon.png
+share/webkit-1.0/webinspector/Images/profileIcon.png
+share/webkit-1.0/webinspector/Images/profileSmallIcon.png
+share/webkit-1.0/webinspector/Images/profilesIcon.png
+share/webkit-1.0/webinspector/Images/profilesSilhouette.png
+share/webkit-1.0/webinspector/Images/recordButtons.png
+share/webkit-1.0/webinspector/Images/reloadButtons.png
+share/webkit-1.0/webinspector/Images/resourceCSSIcon.png
+share/webkit-1.0/webinspector/Images/resourceDocumentIcon.png
+share/webkit-1.0/webinspector/Images/resourceDocumentIconSmall.png
+share/webkit-1.0/webinspector/Images/resourceJSIcon.png
+share/webkit-1.0/webinspector/Images/resourcePlainIcon.png
+share/webkit-1.0/webinspector/Images/resourcePlainIconSmall.png
+share/webkit-1.0/webinspector/Images/resourcesIcon.png
+share/webkit-1.0/webinspector/Images/resourcesSizeGraphIcon.png
+share/webkit-1.0/webinspector/Images/resourcesTimeGraphIcon.png
+share/webkit-1.0/webinspector/Images/scriptsIcon.png
+share/webkit-1.0/webinspector/Images/scriptsSilhouette.png
+share/webkit-1.0/webinspector/Images/searchSmallBlue.png
+share/webkit-1.0/webinspector/Images/searchSmallBrightBlue.png
+share/webkit-1.0/webinspector/Images/searchSmallGray.png
+share/webkit-1.0/webinspector/Images/searchSmallWhite.png
+share/webkit-1.0/webinspector/Images/segment.png
+share/webkit-1.0/webinspector/Images/segmentEnd.png
+share/webkit-1.0/webinspector/Images/segmentHover.png
+share/webkit-1.0/webinspector/Images/segmentHoverEnd.png
+share/webkit-1.0/webinspector/Images/segmentSelected.png
+share/webkit-1.0/webinspector/Images/segmentSelectedEnd.png
+share/webkit-1.0/webinspector/Images/splitviewDimple.png
+share/webkit-1.0/webinspector/Images/splitviewDividerBackground.png
+share/webkit-1.0/webinspector/Images/statusbarBackground.png
+share/webkit-1.0/webinspector/Images/statusbarBottomBackground.png
+share/webkit-1.0/webinspector/Images/statusbarButtons.png
+share/webkit-1.0/webinspector/Images/statusbarMenuButton.png
+share/webkit-1.0/webinspector/Images/statusbarMenuButtonSelected.png
+share/webkit-1.0/webinspector/Images/statusbarResizerHorizontal.png
+share/webkit-1.0/webinspector/Images/statusbarResizerVertical.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillBlue.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillGray.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillGreen.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillOrange.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillPurple.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillRed.png
+share/webkit-1.0/webinspector/Images/timelineHollowPillYellow.png
+share/webkit-1.0/webinspector/Images/timelinePillBlue.png
+share/webkit-1.0/webinspector/Images/timelinePillGray.png
+share/webkit-1.0/webinspector/Images/timelinePillGreen.png
+share/webkit-1.0/webinspector/Images/timelinePillOrange.png
+share/webkit-1.0/webinspector/Images/timelinePillPurple.png
+share/webkit-1.0/webinspector/Images/timelinePillRed.png
+share/webkit-1.0/webinspector/Images/timelinePillYellow.png
+share/webkit-1.0/webinspector/Images/tipBalloon.png
+share/webkit-1.0/webinspector/Images/tipBalloonBottom.png
+share/webkit-1.0/webinspector/Images/tipIcon.png
+share/webkit-1.0/webinspector/Images/tipIconPressed.png
+share/webkit-1.0/webinspector/Images/toolbarItemSelected.png
+share/webkit-1.0/webinspector/Images/treeDownTriangleBlack.png
+share/webkit-1.0/webinspector/Images/treeDownTriangleWhite.png
+share/webkit-1.0/webinspector/Images/treeRightTriangleBlack.png
+share/webkit-1.0/webinspector/Images/treeRightTriangleWhite.png
+share/webkit-1.0/webinspector/Images/treeUpTriangleBlack.png
+share/webkit-1.0/webinspector/Images/treeUpTriangleWhite.png
+share/webkit-1.0/webinspector/Images/userInputIcon.png
+share/webkit-1.0/webinspector/Images/userInputPreviousIcon.png
+share/webkit-1.0/webinspector/Images/userInputResultIcon.png
+share/webkit-1.0/webinspector/Images/warningIcon.png
+share/webkit-1.0/webinspector/Images/warningMediumIcon.png
+share/webkit-1.0/webinspector/Images/warningsErrors.png
+share/webkit-1.0/webinspector/localizedStrings.js
+share/webkit-1.0/resources/error.html
+ at dirrm share/webkit-1.0/webinspector/Images
+ at dirrm share/webkit-1.0/webinspector
+ at dirrm share/webkit-1.0/resources
+ at dirrm share/webkit-1.0
@dirrm include/webkit-1.0/webkit
@dirrm include/webkit-1.0/JavaScriptCore
@dirrm include/webkit-1.0
More information about the freebsd-ports-bugs
mailing list