Hi,

here's the update to latest webkit-gtk. As usual, test in you random
configuration if you use it or one of the depending ports..

Landry
? libwebkit-1.0.so.2.1
? libwebkit-1.0.so.2.1-120
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/webkit/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile    21 Jun 2010 15:55:33 -0000      1.29
+++ Makefile    25 Jun 2010 07:13:38 -0000
@@ -2,10 +2,10 @@
 
 COMMENT =      open source web browser engine
 
-V = 1.2.0
+V = 1.2.1
 DISTNAME =     webkit-${V}
 # XXX do not remove v0. pX comes before vX.
-PKGNAME =      webkit-${V}p2v0
+PKGNAME =      webkit-${V}v0
 CATEGORIES =   www
 
 HOMEPAGE =     http://webkitgtk.org/
@@ -53,10 +53,10 @@
                ::multimedia/gstreamer-0.10/plugins-good
 
 WANTLIB =      ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
-               Xfixes Xi Xinerama Xrandr Xrender Xt atk-1.0 c \
+               Xfixes Xi Xinerama Xrandr Xrender Xt atk-1.0 c xcb-render \
                expat fontconfig freetype gcrypt gio-2.0 glib-2.0 glitz 
gmodule-2.0 \
                gnutls gobject-2.0 gpg-error gthread-2.0 intl jpeg m \
-               pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pthread \
+               pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pthread 
xcb-render-util \
                tasn1 z cairo pixman-1 png pthread-stubs xcb xml2 ${STDCPPLIB}
 
 LIB_DEPENDS =  
gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0,gailutil::x11/gtk+2,-main \
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/webkit/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo    22 Apr 2010 13:36:59 -0000      1.12
+++ distinfo    25 Jun 2010 07:13:38 -0000
@@ -1,5 +1,5 @@
-MD5 (webkit-1.2.0.tar.gz) = sr/LxLvx0KUfhIy1TCHuZg==
-RMD160 (webkit-1.2.0.tar.gz) = EitA8tEDQGpC5TQPpmYngaDjVuI=
-SHA1 (webkit-1.2.0.tar.gz) = rJ23wlRx7tnQPqkM6hwLM3i21H4=
-SHA256 (webkit-1.2.0.tar.gz) = DOSSeJcIV9s3TTH9GDG/Qv+x3KR5fvOZEaltAdjF4fc=
-SIZE (webkit-1.2.0.tar.gz) = 7554632
+MD5 (webkit-1.2.1.tar.gz) = 629HPY175W7NIm591V3Lmw==
+RMD160 (webkit-1.2.1.tar.gz) = +MFYtn+839mXft1TDV+MFeQC2m0=
+SHA1 (webkit-1.2.1.tar.gz) = ztVkUU8L4KiMaW56/WkC2WfVMqI=
+SHA256 (webkit-1.2.1.tar.gz) = ye5VHqtOmHMPoGqqSTzpWCjmxmYewUNh5iVLwjeVot0=
+SIZE (webkit-1.2.1.tar.gz) = 7577236
Index: patches/patch-GNUmakefile_in
===================================================================
RCS file: /cvs/ports/www/webkit/patches/patch-GNUmakefile_in,v
retrieving revision 1.7
diff -u -r1.7 patch-GNUmakefile_in
--- patches/patch-GNUmakefile_in        23 May 2010 10:27:46 -0000      1.7
+++ patches/patch-GNUmakefile_in        25 Jun 2010 07:13:38 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-GNUmakefile_in,v 1.7 2010/05/23 10:27:46 espie Exp $
 install GtkLauncher, remove silent build lines, fix lpthread/pthread
---- GNUmakefile.in.orig        Mon Apr  5 14:55:24 2010
-+++ GNUmakefile.in     Wed Apr 21 15:32:34 2010
+--- GNUmakefile.in.orig        Fri May  7 23:03:21 2010
++++ GNUmakefile.in     Thu Jun 24 18:04:00 2010
 @@ -82,9 +82,9 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
@@ -14,7 +14,7 @@
        $(am__EXEEXT_1)
  
  # For the Gtk port we want to use XP_UNIX both in X11 and Mac
-@@ -5877,7 +5877,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
+@@ -5895,7 +5895,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  AM_V_CC = $(am__v_CC_$(V))
  am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
@@ -23,7 +23,7 @@
  AM_V_at = $(am__v_at_$(V))
  am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
  am__v_at_0 = @
-@@ -5887,22 +5887,22 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
+@@ -5905,22 +5905,22 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
  AM_V_CCLD = $(am__v_CCLD_$(V))
  am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
@@ -50,7 +50,7 @@
  SOURCES = $(TestNetscapePlugin_libtestnetscapeplugin_la_SOURCES) \
        $(libJavaScriptCore_la_SOURCES) \
        $(nodist_libJavaScriptCore_la_SOURCES) \
-@@ -8956,9 +8956,10 @@ libJavaScriptCore_la_SOURCES = \
+@@ -8976,9 +8976,10 @@ libJavaScriptCore_la_SOURCES = \
  
  libJavaScriptCore_la_LIBADD = \
        $(UNICODE_LIBS) \
@@ -63,7 +63,7 @@
  libJavaScriptCore_la_CXXFLAGS = \
        $(global_cxxflags) \
        $(libJavaScriptCore_la_CFLAGS)
-@@ -9007,12 +9008,12 @@ libwebkit_1_0_la_CPPFLAGS = \
+@@ -9027,12 +9028,12 @@ libwebkit_1_0_la_CPPFLAGS = \
        $(HILDON_CPPFLAGS)
  
  libwebkit_1_0_la_LDFLAGS = \
@@ -77,7 +77,7 @@
        libJavaScriptCore.la \
        libWebCoreJS.la \
        $(webcore_ldflags) \
-@@ -9074,7 +9075,7 @@ Programs_minidom_CFLAGS = \
+@@ -9094,7 +9095,7 @@ Programs_minidom_CFLAGS = \
  Programs_minidom_LDADD = \
         libJavaScriptCore.la \
         -lm \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/webkit/pkg/PLIST,v
retrieving revision 1.12
diff -u -r1.12 PLIST
--- pkg/PLIST   22 Apr 2010 13:37:00 -0000      1.12
+++ pkg/PLIST   25 Jun 2010 07:13:38 -0000
@@ -1,5 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.12 2010/04/22 13:37:00 landry Exp $
 %%SHARED%%
+...@bin bin/GtkLauncher
 @bin bin/jsc
 include/webkit-1.0/
 include/webkit-1.0/JavaScriptCore/

Reply via email to