From c53f558993bf01849d8eeb8980d56e0daed68a8f Mon Sep 17 00:00:00 2001 From: landry Date: Mon, 27 Apr 2009 19:25:08 +0000 Subject: [PATCH] Update to webkit 1.1.5v0, finally switch to plain releases instead of tracking a random svn snapshot, as webkit-gtk has regular releases now. ok ajacoutot@ phessler@ --- www/webkit/Makefile | 26 ++++--------- www/webkit/distinfo | 10 ++--- www/webkit/patches/patch-GNUmakefile_am | 28 -------------- www/webkit/patches/patch-GNUmakefile_in | 37 +++++++++++++++++++ .../patch-JavaScriptCore_GNUmakefile_am | 12 ------ www/webkit/patches/patch-autogen_sh | 18 --------- www/webkit/pkg/PLIST | 9 ++++- 7 files changed, 58 insertions(+), 82 deletions(-) delete mode 100644 www/webkit/patches/patch-GNUmakefile_am create mode 100644 www/webkit/patches/patch-GNUmakefile_in delete mode 100644 www/webkit/patches/patch-JavaScriptCore_GNUmakefile_am delete mode 100644 www/webkit/patches/patch-autogen_sh diff --git a/www/webkit/Makefile b/www/webkit/Makefile index 1b79f0ba56d..c6d90a08195 100644 --- a/www/webkit/Makefile +++ b/www/webkit/Makefile @@ -1,20 +1,18 @@ -# $OpenBSD: Makefile,v 1.11 2009/04/06 07:40:30 landry Exp $ +# $OpenBSD: Makefile,v 1.12 2009/04/27 19:25:08 landry Exp $ COMMENT = open source web browser engine -V = 41894 -DISTNAME = WebKit-r${V} -PKGNAME = webkit-${V}p0 +V = 1.1.5 +DISTNAME = webkit-${V} +PKGNAME = webkit-${V}v0 CATEGORIES = www -EXTRACT_SUFX = .tar.bz2 -HOMEPAGE = http://webkit.org/ -MASTER_SITES = http://builds.nightly.webkit.org/files/trunk/src/ +HOMEPAGE = http://webkitgtk.org/ +MASTER_SITES = ${HOMEPAGE} MAINTAINER = Landry Breuil -SHARED_LIBS = webkit-1.0 0.0 \ - testnetscapeplugin 0.0 +SHARED_LIBS = webkit-1.0 0.1 # LGPLv2 / BSD PERMIT_PACKAGE_CDROM = Yes @@ -35,8 +33,6 @@ MODULES = converters/libiconv \ MODGCC4_ARCHES =* MODGCC4_LANGS = c c++ -AUTOMAKE_VERSION = 1.9 -AUTOCONF_VERSION = 2.59 CONFIGURE_STYLE = gnu CONFIGURE_ARGS = --disable-video @@ -61,12 +57,6 @@ LIB_DEPENDS = gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2,-main \ BUILD_DEPENDS = ::devel/bison \ - ::devel/gperf \ - ${MODGNU_AUTOCONF_DEPENDS} \ - ${MODGNU_AUTOMAKE_DEPENDS} - -pre-configure: - cd ${WRKSRC} && AUTOCONF_VERSION=${AUTOCONF_VERSION} \ - AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh + ::devel/gperf .include diff --git a/www/webkit/distinfo b/www/webkit/distinfo index a50916b1202..496fc956507 100644 --- a/www/webkit/distinfo +++ b/www/webkit/distinfo @@ -1,5 +1,5 @@ -MD5 (WebKit-r41894.tar.bz2) = zklaQuxP6+RPYEcIE06k5Q== -RMD160 (WebKit-r41894.tar.bz2) = wG6e+dLXFUsCb8lYPIssWh+BbZg= -SHA1 (WebKit-r41894.tar.bz2) = 0AWry+MFwqeoAM9yIgG1Sw1WttM= -SHA256 (WebKit-r41894.tar.bz2) = MN1Ngi5iiuBiexeLm5ACaS8kv7voOQPqiUUzAKJd3Iw= -SIZE (WebKit-r41894.tar.bz2) = 10553068 +MD5 (webkit-1.1.5.tar.gz) = XKfELIMBDUufXu0Vq7XvQg== +RMD160 (webkit-1.1.5.tar.gz) = aSUVZicaj2R1jHB09p7tYG1HyWg= +SHA1 (webkit-1.1.5.tar.gz) = CYfOSplQG+nlsv8jNiXkZCMdy1M= +SHA256 (webkit-1.1.5.tar.gz) = iZ0lmyTzsnwNT6ziwW47+l5lbGgql4AHOTB36KuYnU8= +SIZE (webkit-1.1.5.tar.gz) = 5878572 diff --git a/www/webkit/patches/patch-GNUmakefile_am b/www/webkit/patches/patch-GNUmakefile_am deleted file mode 100644 index 771cd1092a3..00000000000 --- a/www/webkit/patches/patch-GNUmakefile_am +++ /dev/null @@ -1,28 +0,0 @@ -$OpenBSD: patch-GNUmakefile_am,v 1.3 2009/04/04 10:35:26 landry Exp $ ---- GNUmakefile.am.orig Sun Mar 22 03:21:11 2009 -+++ GNUmakefile.am Mon Mar 23 23:08:39 2009 -@@ -123,9 +123,10 @@ libJavaScriptCore_la_SOURCES = \ - - libJavaScriptCore_la_LIBADD = \ - $(UNICODE_LIBS) \ -- $(GLIB_LIBS) \ -- -lpthread -+ $(GLIB_LIBS) - -+libJavaScriptCore_la_LDFLAGS = -pthread -+ - libJavaScriptCore_la_CXXFLAGS = \ - $(global_cxxflags) \ - $(libJavaScriptCore_la_CFLAGS) -@@ -211,8 +212,9 @@ libWebCore_la_LIBADD = \ - $(HILDON_LIBS) \ - $(JPEG_LIBS) \ - $(PNG_LIBS) \ -- $(GEOCLUE_LIBS) \ -- -lpthread -+ $(GEOCLUE_LIBS) -+ -+libWebCore_la_LDFLAGS = -pthread - - # WebKit - webkitgtk_h_api := diff --git a/www/webkit/patches/patch-GNUmakefile_in b/www/webkit/patches/patch-GNUmakefile_in new file mode 100644 index 00000000000..317cb7372d5 --- /dev/null +++ b/www/webkit/patches/patch-GNUmakefile_in @@ -0,0 +1,37 @@ +$OpenBSD: patch-GNUmakefile_in,v 1.1 2009/04/27 19:25:09 landry Exp $ +--- GNUmakefile.in.orig Tue Apr 14 23:39:16 2009 ++++ GNUmakefile.in Fri Apr 24 13:51:52 2009 +@@ -5966,9 +5966,10 @@ libJavaScriptCore_la_SOURCES = \ + + libJavaScriptCore_la_LIBADD = \ + $(UNICODE_LIBS) \ +- $(GLIB_LIBS) \ +- -lpthread ++ $(GLIB_LIBS) + ++libJavaScriptCore_la_LDFLAGS = -pthread ++ + libJavaScriptCore_la_CXXFLAGS = \ + $(global_cxxflags) \ + $(libJavaScriptCore_la_CFLAGS) +@@ -7481,9 +7482,9 @@ libWebCore_la_LIBADD = \ + $(HILDON_LIBS) \ + $(JPEG_LIBS) \ + $(PNG_LIBS) \ +- $(GEOCLUE_LIBS) \ +- -lpthread ++ $(GEOCLUE_LIBS) + ++libWebCore_la_LDFLAGS = -pthread + + # WebKit + webkitgtk_h_api := WebKit/gtk/webkit/webkit.h \ +@@ -7664,7 +7665,7 @@ Programs_minidom_CFLAGS = \ + Programs_minidom_LDADD = \ + libJavaScriptCore.la \ + -lm \ +- -lstdc++ ++ -lestdc++ + + + # jsc diff --git a/www/webkit/patches/patch-JavaScriptCore_GNUmakefile_am b/www/webkit/patches/patch-JavaScriptCore_GNUmakefile_am deleted file mode 100644 index 308e337dbf2..00000000000 --- a/www/webkit/patches/patch-JavaScriptCore_GNUmakefile_am +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-JavaScriptCore_GNUmakefile_am,v 1.5 2009/04/04 10:35:26 landry Exp $ ---- JavaScriptCore/GNUmakefile.am.orig Thu Feb 26 07:17:57 2009 -+++ JavaScriptCore/GNUmakefile.am Mon Mar 23 23:08:39 2009 -@@ -495,7 +495,7 @@ Programs_minidom_CFLAGS = \ - Programs_minidom_LDADD = \ - libJavaScriptCore.la \ - -lm \ -- -lstdc++ -+ -lestdc++ - - # jsc - Programs_jsc_SOURCES = \ diff --git a/www/webkit/patches/patch-autogen_sh b/www/webkit/patches/patch-autogen_sh deleted file mode 100644 index 104458e7255..00000000000 --- a/www/webkit/patches/patch-autogen_sh +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-autogen_sh,v 1.1 2009/03/08 20:00:41 landry Exp $ ---- autogen.sh.orig Sun Feb 15 09:48:56 2009 -+++ autogen.sh Mon Feb 23 19:21:15 2009 -@@ -46,8 +46,6 @@ if test "$DIE" -eq 1; then - exit 1 - fi - --rm -rf $top_srcdir/autom4te.cache -- - touch README INSTALL - - aclocal $ACLOCAL_FLAGS || exit $? -@@ -57,5 +55,3 @@ automake $AUTOMAKE_FLAGS || exit $? - autoconf || exit $? - - cd $ORIGDIR || exit 1 -- --$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? diff --git a/www/webkit/pkg/PLIST b/www/webkit/pkg/PLIST index 6f69717d5e9..30207eef002 100644 --- a/www/webkit/pkg/PLIST +++ b/www/webkit/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2009/04/04 10:35:26 landry Exp $ +@comment $OpenBSD: PLIST,v 1.6 2009/04/27 19:25:09 landry Exp $ %%SHARED%% @bin bin/jsc include/webkit-1.0/ @@ -34,6 +34,13 @@ lib/libwebkit-1.0.a lib/libwebkit-1.0.la lib/pkgconfig/ lib/pkgconfig/webkit-1.0.pc +share/locale/ +share/locale/de/ +share/locale/de/LC_MESSAGES/ +share/locale/de/LC_MESSAGES/webkit.mo +share/locale/pt_BR/ +share/locale/pt_BR/LC_MESSAGES/ +share/locale/pt_BR/LC_MESSAGES/webkit.mo share/webkit-1.0/ share/webkit-1.0/webinspector/ share/webkit-1.0/webinspector/Breakpoint.js