debian/0000755000000000000000000000000012050532722007164 5ustar debian/docs0000644000000000000000000000000712011054405010026 0ustar README debian/source/0000755000000000000000000000000012011054405010456 5ustar debian/source/format0000644000000000000000000000001412011054405011664 0ustar 3.0 (quilt) debian/changelog0000644000000000000000000002316712050532722011047 0ustar webkitkde (1.3~git20120518.9a111005-3) unstable; urgency=low * Team upload. [ Lisandro Damián Nicanor Pérez Meyer ] * Bump Build-Depends on kdelibs to 4:4.8.3. Thanks Nobuhiro for noticing! (Closes: #684436). [ Adrien Grellier ] * Backport fix 0821d519 to avoid a crash. -- Lisandro Damián Nicanor Pérez Meyer Tue, 13 Nov 2012 18:04:15 -0300 webkitkde (1.3~git20120518.9a111005-2) unstable; urgency=low * fix dh: Unknown sequence build-stamp (Closes: #679472) -- Adrien Grellier Fri, 29 Jun 2012 19:01:31 +0200 webkitkde (1.3~git20120518.9a111005-1) unstable; urgency=low [ Adrien Grellier ] * New Maintainer (Closes: #624448) * Correct lintian warnings * build with hardening flags * Update copyright file. [ Raúl Sánchez Siles ] * New upstream pre 1.3. - Fix "konqueror with webkit and rekonq both crashes in acid3 test at about 73/100" (Closes: #629986) * Update packaging to debhelper8. * Provide debug package. * Setting Debian KDE Extras Team as maintainer and adding Adrien and myself as uploaders. Thanks Adrian! * Update homepage. * Improved package description as per Michael Meskes suggestion. * Replacing obsolete libkwebkit packages. [ Adrian von Bidder ] * Drop library package, there's only the kpart anymore; conflict with the old libkwebkit-dev (FindKWebKitPart.cmake) -- Raúl Sánchez Siles Wed, 27 Jun 2012 20:46:02 +0200 webkitkde (0.9.6svn1187649-1) experimental; urgency=low * New upstream version. - Switch to the stable branch in subversion; trunk requires KDE 4.6 * Drop the libkwebkit0.9.5 name, new versions will change ABI anyway. * Drop mention of very old (used in sid only) package names * Build-Dependencies: QtWebkit is not in qt anymore. (Closes: #618133) -- Adrian von Bidder Sun, 13 Mar 2011 19:59:59 +0100 webkitkde (0.9.6svn1180498-1) unstable; urgency=low * New upstream version. - last version that can be built with KDE < 4.5.69 * debian/rules: Don't ignore build problems due to ABI changes anymore. -- Adrian von Bidder Tue, 28 Sep 2010 20:42:07 +0200 webkitkde (0.9.6svn1170614-1) unstable; urgency=low * New upstream version. - History fixes. * Merge NMU and adjust README.Debian to match the new reality * Convert symbol file to C++ * Update to Policy 3.9.1 -- Adrian von Bidder Sun, 05 Sep 2010 15:17:45 +0200 webkitkde (0.9.6svn1158036-2.1) unstable; urgency=low * Non-maintainer upload, acked by maintainer. * Revert the changes to upstream regarding priorities of plugins. -- Sune Vuorela Wed, 01 Sep 2010 23:42:47 +0200 webkitkde (0.9.6svn1158036-2) unstable; urgency=low * For now: only warn about ABI problems, don't fail the build. -- Adrian von Bidder Thu, 05 Aug 2010 14:33:58 +0200 webkitkde (0.9.6svn1158036-1) unstable; urgency=low * New upstream version. - Favicon and link color changes * Rename back to libkwebkit1 - Provide the 0.9.5 name to not break kdenetwork (kget); ABI didn't change - this hack will be removed after the next kdenetwork upload. * Generate a symbols file -- Adrian von Bidder Wed, 04 Aug 2010 19:37:14 +0200 webkitkde (0.9svn1148394-2) unstable; urgency=low * Add Replaces/Conflicts, sorry about that (closes: #588687) -- Adrian von Bidder Sun, 11 Jul 2010 21:28:47 +0200 webkitkde (0.9svn1148394-1) unstable; urgency=low * New upstream version. * restore libkwebkit1 package name (following upstream) -- Adrian von Bidder Sat, 10 Jul 2010 16:03:24 +0200 webkitkde (0.9svn1143138-1) unstable; urgency=low * New upstream version. * kdenetwork has migrated to testing, upload to unstable -- Adrian von Bidder Tue, 29 Jun 2010 07:20:17 +0200 webkitkde (0.9svn1136920-1) experimental; urgency=low * experimental: wait for kdenetwork to be in squeeze * New upstream version. - fixes konqueror history handling - warn before closing tab with unsent form data * Fixes from Ubuntu (typo, drop build-dependency on libwebkit-dev) * History fixes require soname change -- Adrian von Bidder Sat, 12 Jun 2010 12:59:34 +0200 webkitkde (0.9svn1133684-1) unstable; urgency=low * New upstream version. * Add pkg-kde-tools to build dependencies (Closes: #584389) -- Adrian von Bidder Thu, 03 Jun 2010 12:46:08 +0200 webkitkde (0.9svn1123738-1) unstable; urgency=low * New upstream version. - various small fixes * Upload to unstable -- Adrian von Bidder Sun, 09 May 2010 15:56:13 +0200 webkitkde (0.9svn1101082-1) experimental; urgency=low * New upstream version. - upstream is now in extragear, not playground. - source package includes only the kpart. KDE webkit stuff has moved to kdelibs. - depends on KDE 4.4 - various bugfixes & enhancements * libkwebkit-dbg now depends on libqt4-webkit-dbg -- Adrian von Bidder Fri, 12 Mar 2010 05:48:25 +0100 webkitkde (0.9svn1084767-1) unstable; urgency=low * New upstream version. * Add libwebkit-dev build dependency * prefer webkit kpart over khtml by default. -- Adrian von Bidder Wed, 03 Feb 2010 20:02:01 +0100 webkitkde (0.9svn1068256-2) unstable; urgency=low * kwebkitpart.desktop: change priority to 11, so kpart-webkit (when installed) takes precedence over khtml. * Drop pkg-kde-tools build dep (implicit through kdelibs5-dev) * add ${misc:Depends} to make lintian happy. -- Adrian von Bidder Fri, 22 Jan 2010 10:00:48 +0100 webkitkde (0.9svn1068256-1) unstable; urgency=low * New upstream version. * Switch to source format '3.0 (quilt)' -- Adrian von Bidder Sun, 03 Jan 2010 17:31:10 +0100 webkitkde (0.4svn1064400-1) unstable; urgency=low * New upstream version. - fix display of the error page. -- Adrian von Bidder Mon, 21 Dec 2009 11:32:00 +0100 webkitkde (0.4svn1064329-1) unstable; urgency=low * New upstream snapshot -- Adrian von Bidder Sun, 20 Dec 2009 17:48:51 +0100 webkitkde (0.4svn1059630-1) unstable; urgency=low * Let it migrate to testing normally (closes: #537226) * New upstream snapshot - there is a version number hidden in part/webkitpart.cpp - KWallet integration - fix a few crashes -- Adrian von Bidder Tue, 08 Dec 2009 12:39:06 +0100 webkitkde (0.0.20091202svn1057402-1) unstable; urgency=low * New upstream snapshot - fix compilation with gold (closes: 556675) (since r1052400) * library renaming from upstream, tracking this. -- Adrian von Bidder Wed, 02 Dec 2009 11:28:07 +0100 webkitkde (0.0.20091118svn1050980-1) unstable; urgency=low * New upstream snapshot - early version of KWallet integration -- Adrian von Bidder Thu, 19 Nov 2009 11:51:38 +0100 webkitkde (0.0.20091109svn1046903-1) unstable; urgency=low * New upstream snapshot - fix at least one crash -- Adrian von Bidder Wed, 11 Nov 2009 10:21:46 +0100 webkitkde (0.0.20091031svn1043455-1) unstable; urgency=low * New upstream snapshot -- Adrian von Bidder Sun, 01 Nov 2009 16:57:49 +0100 webkitkde (0.0.20091028svn1042284-1) unstable; urgency=low * New upstream snapshot -- Adrian von Bidder Thu, 29 Oct 2009 15:41:47 +0100 webkitkde (0.0.20091020svn1037794-1) unstable; urgency=low * New upstream snapshot - adds scrolling to right place after going back in history -- Adrian von Bidder Tue, 20 Oct 2009 16:31:08 +0200 webkitkde (0.0.20091013svn1034519-1) unstable; urgency=low * New upstream snapshot -- Adrian von Bidder Tue, 13 Oct 2009 08:38:22 +0200 webkitkde (0.0.20090930svn1029691-1) unstable; urgency=low * New upstream snapshot - mailto links - history with page anchors -- Adrian von Bidder Wed, 30 Sep 2009 21:39:46 +0200 webkitkde (0.0.20090925svn1027805-1) unstable; urgency=low * New upstream snapshot - properly abort page loading - better SSL info -- Adrian von Bidder Fri, 25 Sep 2009 14:19:33 +0200 webkitkde (0.0.20090917svn1024819-1) unstable; urgency=low * New upstream snapshot - calculates font size from DPI -- Adrian von Bidder Thu, 17 Sep 2009 13:38:03 +0200 webkitkde (0.0.20090824svn1015061-1) unstable; urgency=low * New upstream snapshot - Fixes "crash on exit" when using flash * Needs at least kdelibs 4.3.1 (see #540676) -- Adrian von Bidder Wed, 02 Sep 2009 14:43:00 +0200 webkitkde (0.0.20090715svn995948-1) unstable; urgency=low * New upstream snapshot * Upload to unstable to get wider testing audience. * Use -Wl,--as-needed to trim dependencies -- Adrian von Bidder Wed, 15 Jul 2009 14:51:22 +0200 webkitkde (0.0.20090529svn974351-3) experimental; urgency=low * create -dbg package * rename konq-plugin-webkit to kpart-webkit * improve dependencies -- Adrian von Bidder Fri, 12 Jun 2009 07:15:30 +0200 webkitkde (0.0.20090529svn974351-2) experimental; urgency=low * debian/rules: use dh_prep, not dh_clean -k * use pkg-kde-tools for cmake flags * split off libwebkitkde1{,-dev} packages -- Adrian von Bidder Mon, 08 Jun 2009 18:50:44 +0200 webkitkde (0.0.20090529svn974351-1) experimental; urgency=low * Initial packaging (closes: #531754) -- Adrian von Bidder Sat, 06 Jun 2009 15:20:44 +0200 debian/compat0000644000000000000000000000000212011054405010354 0ustar 8 debian/control0000644000000000000000000000262212011054661010567 0ustar Source: webkitkde Section: web Priority: optional Maintainer: Debian KDE Extras Team Uploaders: Adrien Grellier , Raúl Sánchez Siles , Build-Depends: cmake, debhelper (>= 9), kdelibs5-dev (>= 4:4.8.3), libqtwebkit-dev, pkg-kde-tools, dpkg-dev (>=1.16.1) Standards-Version: 3.9.3 Homepage: https://projects.kde.org/projects/extragear/base/kwebkitpart Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/webkitkde.git Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/webkitkde.git Package: kpart-webkit Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libkwebkit-dev, libkwebkit1 Replaces: libkwebkit1 Provides: libkwebkit1 Description: WebKit KPart This package contains a plug-In for alowing the Konqueror web browser and other KDE applications to use the WebKit HTML renderer instead of the traditional KHTML. Package: kpart-webkit-dbg Section: debug Priority: extra Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, kpart-webkit (= ${binary:Version}) Conflicts: libkwebkit-dbg Replaces: libkwebkit-dbg Provides: libkwebkit-dbg Description: WebKit KPart - debugging symbols This package contains a plug-In for alowing the Konqueror web browser and other KDE applications to use the WebKit HTML renderer instead of the traditional KHTML. . This package is part of Webkit KPart. debian/README0000644000000000000000000000075712011054405010047 0ustar WebKit KPart in Debian ---------------------- By default, the khtml rendering engine will take precedence over the webkit part (this is a choice by the KDE project.) This can be changed in the file type dialog ('keditfiletype text/html' command, but you'll probably want to set it for a number of other MIME Types as well), or you can set it globally by editing the file kwebkitpart.desktop in /usr/share/kde4/services/ and setting InitialPreference to a value higher than khtml's value (10.) debian/patches/0000755000000000000000000000000012046455004010615 5ustar debian/patches/series0000644000000000000000000000001612046455004012027 0ustar webview.diff debian/patches/webview.diff0000644000000000000000000000172012046455004013117 0ustar commit 0821d5191045306cecc0834929853c86ca085e03 Author: Dawit Alemayehu Date: Thu Sep 6 15:00:06 2012 -0400 Do not crash when QWebHitTestResult::frame() returns NULL. BUG: 306102 FIXED-IN: 1.3 diff --git a/src/webview.cpp b/src/webview.cpp index e0d2407..b6ba0e8 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -547,7 +547,7 @@ void WebView::partActionPopupMenu(KParts::BrowserExtension::ActionGroupMap& part partActions.append(action); } } - } else if (m_result.frame()->parentFrame() && !m_result.isContentSelected() && m_result.linkUrl().isEmpty()) { + } else if (m_result.frame() && m_result.frame()->parentFrame() && !m_result.isContentSelected() && m_result.linkUrl().isEmpty()) { KActionMenu * menu = new KActionMenu(i18nc("@title:menu HTML frame/iframe", "Frame"), this); KAction* action = new KAction(KIcon("window-new"), i18n("Open in New &Window"), this); debian/rules0000755000000000000000000000111012011054405010227 0ustar #! /usr/bin/make -f # DH_ALWAYS_EXCLUDE:=CVS:.svn:.svnignore:.hg:.hgignore:.git export DEB_LDFLAGS_MAINT_APPEND := "-Wl,--as-needed" "-Wl,--no-undefined" "-Wl,-z,defs" # enable hardening flags: DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk CFLAGS+=$(CPPFLAGS) CXXFLAGS+=$(CPPFLAGS) # override_dh_auto_configure: dh_auto_configure -Skde -- -DCMAKE_USE_RELATIVE_PATHS=ON -DCMAKE_BUILD_TYPE="RelWithDebInfo" override_dh_install: dh_install --autodest --list-missing %: dh $@ --parallel --dbg-package=kpart-webkit-dbg --with kde .PHONY: override_dh_auto_test debian/copyright0000644000000000000000000000436412011054405011120 0ustar This package was debianized by Adrian von Bidder and then Adrien Grellier The package is based on a git snapshot from https://projects.kde.org/projects/extragear/base/kwebkitpart Copyright and Upstream Authors: Copyright (C) 1998, 1999 Torben Weis Copyright (C) 1999 David Faure Copyright (C) 2000 Malte Starostik Copyright (C) 2000-2003,2006 George Staikos Copyright (C) 2005 Ivor Hewitt Copyright (C) 2006 Simon Hausmann Copyright (C) 2006 Zack Rusin Copyright (C) 2006, 2008 Dirk Mueller Copyright (C) 2007 Trolltech ASA Copyright (C) 2008 Michael Howell Copyright (C) 2008 Benjamin C. Meyer Copyright (C) 2008 Laurent Montel Copyright (C) 2008 Maksim Orlovich Copyright (C) 2008 Vyacheslav Tokarev Copyright (C) 2008-2010 Urs Wolfer Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) Copyright (C) 2009, 2012 Dawit Alemayehu License: This package is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL-2'. The Debian packaging is © 2009, Adrian von Bidder and © 2012, Adrien Grellier and is licensed under the same terms. debian/kpart-webkit.install0000644000000000000000000000067012011054405013155 0ustar usr/lib/kde4/kwebkitpart.so usr/share/icons/hicolor/128x128/apps/webkit.png usr/share/icons/hicolor/16x16/apps/webkit.png usr/share/icons/hicolor/22x22/apps/webkit.png usr/share/icons/hicolor/32x32/apps/webkit.png usr/share/icons/hicolor/48x48/apps/webkit.png usr/share/icons/hicolor/64x64/apps/webkit.png usr/share/kde4/apps/kwebkitpart/error.html usr/share/kde4/apps/kwebkitpart/kwebkitpart.rc usr/share/kde4/services/kwebkitpart.desktop