diff -Naur WebKit-r41128.orig/debian/changelog WebKit-r41128/debian/changelog --- WebKit-r41128.orig/debian/changelog 2009-06-24 08:52:31.000000000 +0100 +++ WebKit-r41128/debian/changelog 2009-06-24 09:24:23.000000000 +0100 @@ -1,3 +1,23 @@ +webkit (1.0-svn41137-8maemo1) unstable; urgency=low + + * debian/changelog: Add maemo1 epoch as per Maemo package policy. + * debian/rules: Don't strip dbg symbols (not sure on this as the file it produces is massive and hns says there's no point in them as gdb crashes when loading them...). + * debian/control: Change libwebkit-1.0-1 package section to libs, and source package section to web. + * debian/rules: Add VFP features to seperate DEB_BUILD_OPTION. + * debian/rules: Add -mcpu=arm1136jf-s -mtune=arm1136jf-s to VFP section (Any reason why you exclude this Bundyo?). + * debian/control: Replace bison Build-Dep with bison-2.2. + * debian/rules: Add hack which forces bison-2.2 to be invoked when running 'bison'. + * debian/control: Add alt build-dependency for libxslt. + * debian/control: Add libhildon-1 and to libidn11-dev to Build-Deps. + * debian/control: Bundyo is a maintainer, hns and I are uploaders. + * debian/control: Change Arch: any to Arch: armel - autobuilder chokes when building x86 version. + * debian/rules: Seperate autogen step into configure target. + * debian/rules: Change -j10 into -j4. (The Maemo package policy only shows 4 as an option for parallel, and having already killed the autobuilder once, I have no intention of giving it a test drive with 10) + * debian/rules: rm -rf more autotools stuff during clean + * debian/rules: Comment locale setting line + + -- Faheem Pervez Wed, 24 Jun 2009 08:56:36 +0100 + webkit (1.0-svn41137-8) unstable; urgency=high * Fix for slow resource loading after a while. diff -Naur WebKit-r41128.orig/debian/control WebKit-r41128/debian/control --- WebKit-r41128.orig/debian/control 2009-06-24 08:52:31.000000000 +0100 +++ WebKit-r41128/debian/control 2009-06-24 10:40:06.000000000 +0100 @@ -1,14 +1,16 @@ Source: webkit Priority: optional -Section: user/other -Uploaders: Bundyo -Build-Depends: debhelper (>= 5.0), libgtk2.0-dev (>= 2.10), libpango1.0-dev (>= 1.16), libxslt-dev, libcurl3-dev, libsqlite3-dev, bison, flex, libjpeg62-dev, libpng12-dev, autoconf, automake, libtool, libxt-dev +Architecture: armel +Section: web +Maintainer: Bundyo +Uploaders: Faheem Pervez , Hannes Wallnoefer +Build-Depends: debhelper (>= 5.0), libgtk2.0-dev (>= 2.10), libpango1.0-dev (>= 1.16), libxslt1-dev | libxslt-dev, libcurl3-dev, libsqlite3-dev, bison-2.2 | bison (= 2.2), flex, libjpeg62-dev, libpng12-dev, autoconf, automake, libtool, libxt-dev, libhildon1-dev, libidn11-dev Standards-Version: 3.8.0.1 Homepage: http://webkit.org/ Package: libwebkit-1.0-1 -Section: user/other -Architecture: any +Architecture: armel +Section: libs Depends: ${shlibs:Depends} Description: Web content engine library for Gtk+ WebKit is a web content engine, derived from KHTML and KJS from KDE, and @@ -23,7 +25,7 @@ Package: libwebkit-dev Section: libdevel Priority: extra -Architecture: all +Architecture: armel Depends: libwebkit-1.0-1 (>= ${source:Upstream-Version}), libgtk2.0-dev Conflicts: libwebkitgdk-dev Description: Web content engine library for Gtk+ - Development files @@ -40,7 +42,7 @@ Package: libwebkit-1.0-1-dbg Section: libdevel Priority: extra -Architecture: any +Architecture: armel Depends: libwebkit-1.0-1 (= ${binary:Version}) Description: Web content engine library for Gtk+ - Debugging symbols WebKit is a web content engine, derived from KHTML and KJS from KDE, and diff -Naur WebKit-r41128.orig/debian/files WebKit-r41128/debian/files --- WebKit-r41128.orig/debian/files 2009-06-24 08:52:31.000000000 +0100 +++ WebKit-r41128/debian/files 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -libwebkit-dev_1.0-svn41137-8_all.deb libdevel extra -libwebkit-1.0-1_1.0-svn41137-8_armel.deb user/other optional -libwebkit-1.0-1-dbg_1.0-svn41137-8_armel.deb libdevel extra diff -Naur WebKit-r41128.orig/debian/rules WebKit-r41128/debian/rules --- WebKit-r41128.orig/debian/rules 2009-06-24 08:52:31.000000000 +0100 +++ WebKit-r41128/debian/rules 2009-06-24 09:25:51.000000000 +0100 @@ -3,12 +3,12 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -export LC_ALL=en_US +#export LC_ALL=en_US CFLAGS = -g -Wall ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O2 -mfpu=vfp -mfloat-abi=softfp + CFLAGS += -O2 else CFLAGS += -O0 endif @@ -17,6 +17,22 @@ CFLAGS += -Wl,--no-relax endif +#Use hardware floating point +ifneq (,$(findstring vfp,$(DEB_BUILD_OPTIONS))) + CFLAGS += -mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s -mtune=arm1136jf-s +endif + +## + +#qwerty12 hack: Use bison-2.2 rather than scratchbox's internal one +SBOX_REDIRECT_IGNORE := /usr/bin/bison +export SBOX_REDIRECT_IGNORE + +PATH := /usr/bin:$(PATH) +export PATH + +#### + clean: dh_testdir dh_testroot @@ -25,26 +41,33 @@ # comment out next line for fast rebuilds rm -rf build - rm -f GNUmakefile.in INSTALL README aclocal.m4 aconfig.h.in compile config.guess config.sub configure depcomp install-sh ltmain.sh missing + rm -f GNUmakefile.in INSTALL README aclocal.m4 aconfig.h.in compile config.guess config.sub configure depcomp install-sh ltmain.sh missing autotools/compile autotools/config.guess autotools/install-sh autotools/ltmain.sh autotools/config.sub autotools/depcomp autotools/missing rm -rf autom4te.cache dh_clean -build: build-stamp - -build-stamp: +configure: configure-stamp +configure-stamp: dh_testdir + # Add here commands to configure the package. -# CPPFLAGS="-DMOBILE=1" [ ! -d build ] && mkdir build || true cd build && \ +# CPPFLAGS="-DMOBILE=1" \ CFLAGS="$(CFLAGS)" \ CXXFLAGS="$(CFLAGS)" \ CC="gcc -Wl,--as-needed" \ CXX="g++ -Wl,--as-needed" \ ../autogen.sh --prefix=/usr --with-hildon --with-unicode-backend=glib --disable-dashboard-support --enable-optimizations --enable-workers --with-http-backend=curl - $(MAKE) -j10 -C build + touch $@ + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + $(MAKE) -j4 -C build touch $@ @@ -56,7 +79,7 @@ dh_clean -k - $(MAKE) -j10 -C build install DESTDIR="$(CURDIR)"/debian/tmp + $(MAKE) -j4 -C build install DESTDIR="$(CURDIR)"/debian/tmp [ ! -d debian/tmp/usr/lib/webkit-1.0/libexec ] && install -d -m 755 debian/tmp/usr/lib/webkit-1.0/libexec || true build/libtool --mode=install install -m 755 build/Programs/DumpRenderTree "$(CURDIR)"/debian/tmp/usr/lib/webkit-1.0/libexec/DumpRenderTree build/libtool --mode=install install -m 755 build/Programs/GtkLauncher "$(CURDIR)"/debian/tmp/usr/lib/webkit-1.0/libexec/GtkLauncher @@ -86,8 +109,7 @@ dh_installchangelogs -a dh_install -a --sourcedir=debian/tmp dh_link -a - # dh_strip -a --dbg-package=libwebkit-1.0-1 - dh_strip -a + dh_strip -a --dbg-package=libwebkit-1.0-1 dh_compress -a dh_fixperms -a dh_makeshlibs -a -V 'libwebkit-1.0-1 (>= 1.0)' -- -c4 @@ -99,4 +121,4 @@ binary: binary-indep binary-arch -.PHONY: build clean install binary binary-indep binary-arch +.PHONY: build clean install binary binary-indep binary-arch configure