debian/0000775000000000000000000000000012277133764007204 5ustar debian/copyright0000664000000000000000000001237112277133072011133 0ustar This work was packaged for Debian by: Felix Geyer on Sun, 23 May 2010 00:01:39 +0200 It was downloaded from: http://sourceforge.net/projects/rekonq/ Upstream Authors: Andrea Diamantini Alexandr Domrachev Paweł Prażak Lionel Chauvin Copyright: Copyright (C) 2007-2008, Trolltech ASA. All rights reserved Copyright (C) 2008-2009, Benjamin C. Meyer Copyright (C) 2008-2011, Andrea Diamantini Copyright (C) 2009, Paweł Prażak Copyright (C) 2009, Nils Weigel Copyright (C) 2007, David Faure Copyright (C) 2009-2011, Lionel Chauvin Copyright (C) 2010-2011, Matthieu Gicquel Copyright (C) 2009, Alexandr Domrachev Copyright (C) 2009, Nokia Corporation Copyright (C) 2008, Urs Wolfer Copyright (C) 2008, Dirk Mueller Copyright (C) 2008, Michael Howell Copyright (C) 2009, Yoram Bar-Haim Copyright (C) 2009, Jakub Wieczorek Copyright (C) 2009, Christian Franke Copyright (C) 2009, Zsombor Gegesy Copyright (C) 2010-2011, Yoann Laissus Copyright (C) 2001-2010, Dawit Alemayehu Copyright (C) 2010-2011, Pierre Rossi Copyright (C) 2009-2010, Richard J. Moore Copyright (C) 2009, Fredy Yanardi Copyright (C) 2009, Domrachev Alexandr Copyright (C) 2010-2011 by Benjamin Poulain Copyright (C) 2011, Vyacheslav Blinov Copyright (C) 2011, Tröscher Johannes License: This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License or (at your option) version 3 or any later version accepted by the membership of KDE e.V. (or its successor approved by the membership of KDE e.V.), which shall act as a proxy defined in Section 14 of version 3 of the license. This program 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 General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . License of the file src/tests/listitem_test.cpp: This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program 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 General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA License of the files src/websslinfo.*: This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2', `/usr/share/common-licenses/GPL-3' and `/usr/share/common-licenses/LGPL-2'. The Debian packaging is: Copyright (C) 2009-2010, Anthony Mercatante Copyright (C) 2010-2011, Felix Geyer Copyright (C) 2011, Jonathan Kolberg and is licensed under the GPL version either version 2 of the License or (at your option) version 3 or any later version accepted by the membership of KDE e.V. (or its successor approved by the membership of KDE e.V.), which shall act as a proxy defined in Section 14 of version 3 of the license., see above. debian/rekonq.install0000664000000000000000000000000412277133072012055 0ustar usr debian/rekonq.postinst0000664000000000000000000000030612277133072012277 0ustar #!/bin/sh set -e #DEBHELPER# if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] ; then update-alternatives --install /usr/bin/x-www-browser \ x-www-browser /usr/bin/rekonq 40 fi debian/watch0000664000000000000000000000007112277133107010222 0ustar version=3 http://sf.net/rekonq/rekonq-([\d.-]+)\.tar\.xz debian/rules0000775000000000000000000000043612277133072010257 0ustar #!/usr/bin/make -f export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: dh $@ --parallel --with kde override_dh_strip: dh_strip --dbg-package=rekonq-dbg override_dh_auto_test: # disable tests as they require a running X server debian/source/0000775000000000000000000000000012277133072010474 5ustar debian/source/format0000664000000000000000000000001412277133072011702 0ustar 3.0 (quilt) debian/rekonq.manpages0000664000000000000000000000002012277133072012200 0ustar debian/rekonq.1 debian/changelog0000664000000000000000000003316012277133270011051 0ustar rekonq (2.4.2-0ubuntu1) trusty; urgency=medium * New upstream release LP: #1268650 -- Jonathan Riddell Thu, 13 Feb 2014 12:12:18 +0000 rekonq (2.4.0-0ubuntu1) trusty; urgency=low * New upstream release LP: #1256270 -- Jonathan Riddell Tue, 03 Dec 2013 10:52:38 +0000 rekonq (2.3.2-0ubuntu1) saucy; urgency=low * New upstream release. (LP: #1196237) -- Howard Chan Sun, 30 Jun 2013 21:25:41 +0800 rekonq (2.3.1-0ubuntu1) saucy; urgency=low * New upstream release. (LP: #1193833) * Build-depend on libkactivities-dev for KDE workspace activities support. -- Howard Chan Sun, 23 Jun 2013 22:06:09 +0800 rekonq (2.3.0-0ubuntu1) saucy; urgency=low * New upstream release (LP: #1174223) - refresh kubuntu_default_homepages.diff - drop upstream patches: + 0001-downloads-should-by-default-go-to-the-configured-dow.patch + 0001-honor-filetype-setting-WRT-embedding.patch + 0001-pass-menutitle-through-i18n-to-get-it-localized.patch + 0001-i18n-make-sure-text-passed-to-i18n-is-UTF-8.patch - build-depend on libx11-dev -- Philip Muškovac Wed, 01 May 2013 19:59:23 +0200 rekonq (2.2.1-0ubuntu5) raring; urgency=low * Add 0001-i18n-make-sure-text-passed-to-i18n-is-UTF-8.patch from upstream. Strings to i18n must be UTF-8. -- Harald Sitter Tue, 16 Apr 2013 12:35:35 +0200 rekonq (2.2.1-0ubuntu4) raring; urgency=low * Add 0001-pass-menutitle-through-i18n-to-get-it-localized.patch from upstream. rekonqrc.ui is parsed manually but did not localize the titles. -- Harald Sitter Tue, 16 Apr 2013 11:16:05 +0200 rekonq (2.2.1-0ubuntu3) raring; urgency=low * Add 0001-honor-filetype-setting-WRT-embedding.patch from upstream. This makes rekonq follow the KDE filetype settings for kpart embedding. -- Harald Sitter Fri, 12 Apr 2013 14:29:28 +0200 rekonq (2.2.1-0ubuntu2) raring; urgency=low * Add 0001-downloads-should-by-default-go-to-the-configured-dow.patch from upstream. This makes the download location default to the xdg downloads dir -- Harald Sitter Wed, 10 Apr 2013 10:52:14 +0200 rekonq (2.2.1-0ubuntu1) raring; urgency=low * New bugfix upstream release to fix bookmarks. -- Howard Chan Fri, 08 Mar 2013 18:36:38 +0800 rekonq (2.2-0ubuntu1) raring; urgency=low [ Howard Chan ] * New upstream release. * Updated debian/control to the latest standards version (version 3.9.4) * Updated debian/control to delete obsolete field [ Philip Muškovac ] * Add nepomuk-core-dev to Build-Depends for bookmark tagging support -- Howard Chan Fri, 01 Mar 2013 21:50:34 +0800 rekonq (2.1-0ubuntu1) raring; urgency=low * New upstream release. * Fixed patch kubuntu_no_default_bookmarks.diff -- Howard Chan Wed, 30 Jan 2013 21:39:37 +0800 rekonq (2.0-0ubuntu1) raring; urgency=low * New upstream release -- Jonathan Riddell Mon, 07 Jan 2013 16:13:31 +0000 rekonq (1.80-0ubuntu1) raring; urgency=low * New upstream alpha release (LP: #1082738) - build-depend on libqoauth-dev and shared-desktop-ontologies - port kubuntu_restricted_install.diff to the new code -- Philip Muškovac Sat, 15 Dec 2012 20:00:30 +0100 rekonq (1.3-0ubuntu1) raring; urgency=low * New upstream release -- Philip Muškovac Sat, 15 Dec 2012 13:14:17 +0100 rekonq (1.1-0ubuntu1) quantal; urgency=low * New upstream release -- Jonathan Riddell Wed, 29 Aug 2012 17:00:47 +0100 rekonq (1.0-0ubuntu2) quantal; urgency=low * experimentally add kubuntu_adblock.diff, no easy way to set this in kubuntu-default-settings -- Jonathan Riddell Fri, 10 Aug 2012 16:44:59 +0100 rekonq (1.0-0ubuntu1) quantal; urgency=low * New upstream release -- Jonathan Riddell Mon, 23 Jul 2012 11:23:24 +0100 rekonq (0.9.90-0ubuntu1) quantal; urgency=low * New upstream beta release * Merge with Debian, remaining changes: - keep kubuntu patches -- Jonathan Riddell Fri, 20 Jul 2012 13:55:25 +0100 rekonq (0.9.2-1) unstable; urgency=low * New upstream release. * Bump libqtwebkit-dev build dependency to 2.2.0. -- José Manuel Santamaría Lema Sat, 19 May 2012 16:14:21 +0200 rekonq (0.9.0-1-1) unstable; urgency=low * New upstream release. * Upload to unstable. * Bump debhelper build depend to 9. * Build depend on pkg-config. * Fix watch file. * Bump Standards-Version to 3.9.3, no changes needed. -- José Manuel Santamaría Lema Tue, 20 Mar 2012 23:06:33 +0100 rekonq (0.9.2-0ubuntu1) quantal; urgency=low * New upstream release -- Jonathan Kolberg Thu, 03 May 2012 21:31:53 +0200 rekonq (0.9.1-0ubuntu2) precise-proposed; urgency=low * Rebuild for .pot generation -- Jonathan Riddell Thu, 12 Apr 2012 16:32:11 +0100 rekonq (0.9.1-0ubuntu1) precise; urgency=low * New upstream release -- Philip Muškovac Tue, 10 Apr 2012 14:43:44 +0200 rekonq (0.9.0-1-0ubuntu1) precise; urgency=low * New upstream release -- Philip Muškovac Mon, 12 Mar 2012 19:57:30 +0100 rekonq (0.8.90-0ubuntu1) precise; urgency=low * New upstream release candidate -- Philip Muškovac Thu, 01 Mar 2012 21:47:33 +0100 rekonq (0.8.71-0ubuntu1) precise; urgency=low * Merge with debian, remaining changes: - keep kubuntu patches * New upstream beta release - refresh kubuntu_default_homepages.diff and kubuntu_restricted_install.diff * Bump minimum debhelper version to 9 to fix lintian warning * Add pkg-config to build-depends -- Philip Muškovac Sat, 11 Feb 2012 19:44:49 +0100 rekonq (0.8.1-1) experimental; urgency=low * New upstream release. [ Felix Geyer ] * Update copyright file. * Enable hardening build flags. - Switch to debhelper compat level v9. -- José Manuel Santamaría Lema Tue, 27 Dec 2011 01:26:30 +0100 rekonq (0.8.0-1ubuntu1) precise; urgency=low * Merge with Debian - Add back missing patches - kubuntu_default_homepages.diff - kubuntu_initial_preference.diff - kubuntu_no_default_bookmarks.diff - kubuntu_restricted_install.diff -- Jonathan Riddell Thu, 08 Dec 2011 10:44:45 +0000 rekonq (0.8.0-1) experimental; urgency=low * New upstream release (Closes: #647903) [ José Manuel Santamaría Lema ] * Add myself to Uploaders. * Bump kdelibs5-dev build depend to 4:4.7. * Remove patches: - dont_set_app_as_parent.diff, applied upstream. - fix_history_ordering.diff, applied upstream. * rekonq binary package depends on kde-baseapps-bin instead of kdebase-bin. -- Debian KDE Extras Team Sat, 03 Dec 2011 10:44:45 -0300 rekonq (0.8.0-0ubuntu2) precise; urgency=low * Remove auto-generated patch that got included by accident -- Philip Muškovac Mon, 24 Oct 2011 18:02:15 +0200 rekonq (0.8.0-0ubuntu1) precise; urgency=low * New upstream release - copyright was standardizized -- Jonathan Kolberg Sat, 15 Oct 2011 12:33:12 +0200 rekonq (0.7.90-0ubuntu1) oneiric; urgency=low * New upstream beta release (LP: #861631) * Dropped fix_history_ordering.diff * Refreshed dont_set_app_as_parent.diff * Updated the copyright -- Jonathan Kolberg Mon, 19 Sep 2011 11:36:20 +0200 rekonq (0.7.0-2) UNRELEASED; urgency=low [ José Manuel Santamaría Lema ] * Add myself to Uploaders. -- Debian Qt/KDE Maintainers Sat, 28 May 2011 01:56:24 +0200 rekonq (0.7.0-1) unstable; urgency=low * New upstream release. (Closes: #618906) [ Felix Geyer ] * Point Vcs fields to the git repository. * Add build dependency on libqtwebkit-dev. (Closes: #611270) * Drop build dependency on pkg-config and libgtk2.0-dev. * Set minimum version of kdelibs5-dev to 4.5.0. * Bump Standards-Version to 3.9.2, no changes needed. * Switch to debhelper compat level 8. * Set homepage to http://rekonq.kde.org/. * Add kget as a suggests of rekonq. * Drop CVE-2010-2536_fix_xss_vulnerabilities.diff, fixed upstream. * Add DM-Upload-Allowed: yes. [ José Manuel Santamaría Lema ] * Add libqtwebkit4-dbg to Recommends. * Add dont_set_app_as_parent.diff; fixes a crash on exit. * Add fix_history_ordering.diff in order to make history browsing work properly. -- Debian KDE Extras Team Sat, 28 May 2011 00:33:36 +0200 rekonq (0.5.0-2) unstable; urgency=medium * Fix CVE-2010-2536: multiple XSS vulnerabilities (Closes: #593300) - Add CVE-2010-2536_fix_xss_vulnerabilities.diff -- Felix Geyer Tue, 17 Aug 2010 11:16:04 +0200 rekonq (0.5.0-1) unstable; urgency=low * New upstream release. * Bump Standards-Version to 3.9.0, no changes needed. * Add "-Wl,--as-needed" to LDFLAGS. -- Felix Geyer Sun, 11 Jul 2010 12:51:01 +0200 rekonq (0.4.0-1) unstable; urgency=low * Upload to Debian. (Closes: #522396) * Set maintainer to Debian KDE Extras Team and add myself to uploaders. * Replace docbook manpage with one generated by kdemangen.pl. * Disable tests in debian/rules instead of patching the source. - Drop debian/patches * Enable parallel building. * Update debian/copyright. * Provide a debug package. -- Felix Geyer Sun, 23 May 2010 01:21:12 +0200 rekonq (0.4.0-0ubuntu2) maverick; urgency=low * Add cmake to build-dependencies as kdelibs5-dev no longer depends on it. * Register as x-www-browser alternative. (LP: #567211) - Add debian/rekonq.postinst and debian/rekonq.prerm -- Felix Geyer Wed, 19 May 2010 00:49:10 +0200 rekonq (0.4.0-0ubuntu1) lucid; urgency=low * New upstream release -- Jonathan Thomas Fri, 12 Mar 2010 08:35:40 -0500 rekonq (0.3.90-0ubuntu4) lucid; urgency=low * Fixed debian/control again: - rekonq depends on kdebase-bin, not konq-plugins... -- Anthony Mercatante Wed, 10 Mar 2010 23:58:12 +0100 rekonq (0.3.90-0ubuntu3) lucid; urgency=low * Fixed debian/control: - Recommends konq-plugins -- Anthony Mercatante Wed, 10 Mar 2010 23:49:42 +0100 rekonq (0.3.90-0ubuntu2) lucid; urgency=low * Make the rekonq package provide www-browser (LP: #523141) * Bump Standards-Version to 3.8.4 * Convert packaging to source format 3.0 (quilt), remove quilt build-dep, quilt addon in debian/rules, and README.source * Bump debhelper build-depend version to 7.3.16, and pkg-kde-tool to 0.5.0 for the above -- Jonathan Thomas Sat, 27 Feb 2010 14:25:06 -0500 rekonq (0.3.90-0ubuntu4) lucid; urgency=low * Fixed debian/control again: - rekonq depends on kdebase-bin, not konq-plugins... -- Anthony Mercatante Wed, 10 Mar 2010 23:58:12 +0100 rekonq (0.3.90-0ubuntu3) lucid; urgency=low * Fixed debian/control: - Recommends konq-plugins -- Anthony Mercatante Wed, 10 Mar 2010 23:49:42 +0100 rekonq (0.3.90-0ubuntu1) lucid; urgency=low * New upstream release * Drop kubuntu_01_polish_config_dialog.diff * Renamed kubuntu_01_disable_tests.diff to kubuntu_01_disable_tests.diff -- Anthony Mercatante Fri, 12 Feb 2010 16:42:44 -0500 rekonq (0.3.0-0ubuntu3) lucid; urgency=low * Add missing epoch to Qt build-depends version -- Jonathan Riddell Wed, 25 Nov 2009 13:47:10 +0000 rekonq (0.3.0-0ubuntu2) lucid; urgency=low * Rebuild against Qt 4.6 rc 1, which is binary incompatible with 4.6 beta -- Jonathan Riddell Tue, 24 Nov 2009 09:00:03 +0000 rekonq (0.3.0-0ubuntu1) lucid; urgency=low * New upstream release: - Disable tests with kubuntu_02_disable_tests.diff. We have no interest in these and they cause an FTBFS inside the chroot. * Transition from kde.mk to dh --with-kde: - debian/control: Remove cdbs build-dependency - debian/rules: Build with the dh7 kde and quilt addons * Add README.source for quilt -- Jonathan Thomas Wed, 18 Nov 2009 12:29:25 -0500 rekonq (0.2.90-0ubuntu1) lucid; urgency=low * New upstream beta release * Add kubuntu_01_polish_config_dialog.diff to polish up the config dialog. -- Jonathan Thomas Tue, 03 Nov 2009 17:15:00 -0500 rekonq (0.2.0-0ubuntu1) karmic; urgency=low * New upstream release * Bump Standards-Version to 3.8.3 -- Jonathan Thomas Fri, 21 Aug 2009 16:00:05 -0400 rekonq (0.1.98-0ubuntu1) karmic; urgency=low * New upstream release (LP: #413169) -- Alessandro Ghersi Thu, 13 Aug 2009 18:23:47 +0200 rekonq (0.1.95-0ubuntu1) karmic; urgency=low * New upstream release * Bump Standards-Version to 3.8.2 -- Jonathan Thomas Mon, 03 Aug 2009 12:39:22 -0400 rekonq (0.1-0ubuntu2) karmic; urgency=low * Fixed debian/copyright: - Fixed authors list, as some copyrighted code is from Arora and Arora authors shouldn't be mentionned as upstream -- Anthony Mercatante Tue, 02 Jun 2009 19:18:26 +0200 rekonq (0.1-0ubuntu1) karmic; urgency=low * Initial release -- Anthony Mercatante Mon, 2 May 2009 06:52:11 +0200 debian/rekonq.prerm0000664000000000000000000000023412277133072011541 0ustar #!/bin/sh set -e #DEBHELPER# if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then update-alternatives --remove x-www-browser /usr/bin/rekonq fi debian/compat0000664000000000000000000000000212277133072010372 0ustar 9 debian/control0000664000000000000000000000335312277133072010603 0ustar Source: rekonq Section: web Priority: optional Maintainer: Kubuntu Developers XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Felix Geyer , José Manuel Santamaría Lema Build-Depends: cmake, debhelper (>= 9), kdelibs5-dev (>= 4:4.7), libqoauth-dev, libqtwebkit-dev (>= 2.2.0), pkg-config, pkg-kde-tools (>= 0.5.0~), shared-desktop-ontologies, nepomuk-core-dev, libx11-dev, libkactivities-dev Standards-Version: 3.9.4 Homepage: http://rekonq.kde.org/ Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/rekonq.git Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/rekonq.git Package: rekonq Architecture: any Depends: kde-baseapps-bin, ${misc:Depends}, ${shlibs:Depends} Suggests: kget Provides: www-browser Description: KDE web browser based on Webkit rekonq is a web browser based on WebKit and the KDE technologies. Its aim is to integrate nicely in the KDE desktop while providing a lightweight experience. . Non-exhaustive list of features : - shares bookmarks and network settings with konqueror - uses the kwallet password manager - integrates with the kget download manager - anonymous browsing mode Package: rekonq-dbg Section: debug Priority: extra Architecture: any Depends: rekonq (= ${binary:Version}), ${misc:Depends} Recommends: kdelibs5-dbg, libqtwebkit4-dbg Description: debugging symbols for rekonq This package contains the debugging symbols associated with rekonq. They will automatically be used by gdb for debugging rekonq-related issues. debian/patches/0000775000000000000000000000000012277133072010623 5ustar debian/patches/kubuntu_adblock.diff0000664000000000000000000000065012277133072014632 0ustar Index: rekonq-2.0/src/data/adblockrc =================================================================== --- rekonq-2.0.orig/src/data/adblockrc 2013-01-07 16:14:16.099978525 +0000 +++ rekonq-2.0/src/data/adblockrc 2013-01-07 16:14:16.095978525 +0000 @@ -1,6 +1,6 @@ [Settings] -adBlockEnabled=false -hideAdsEnabled=false +adBlockEnabled=true +hideAdsEnabled=true updateInterval=7 lastUpdate=Mon Feb 13 11:58:51 2012 debian/patches/kubuntu_initial_preference.diff0000664000000000000000000000064012277133072017061 0ustar Index: rekonq/src/data/rekonq.desktop =================================================================== --- rekonq.orig/src/data/rekonq.desktop 2013-01-30 21:39:36.143260000 +0800 +++ rekonq/src/data/rekonq.desktop 2013-01-30 21:43:55.330721347 +0800 @@ -90,4 +90,4 @@ MimeType=text/html;application/xhtml+xml;application/xml; X-DBUS-StartupType=Unique X-DBUS-ServiceName=org.kde.rekonq - +InitialPreference=10 debian/patches/0001-downloads-should-by-default-go-to-the-configured-dow.patch0000664000000000000000000000461512277133072024263 0ustar From 79bf8e1febfcaef288a3fa64860266410c561e6c Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Wed, 10 Apr 2013 08:25:07 +0200 Subject: [PATCH] downloads should by default go to the configured downloads directory also fixed a yoda-style comment about not using getSaveFileName REVIEW: 109927 --- src/download/downloadmanager.cpp | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/download/downloadmanager.cpp b/src/download/downloadmanager.cpp index 95b3154..7bd217e 100644 --- a/src/download/downloadmanager.cpp +++ b/src/download/downloadmanager.cpp @@ -36,6 +36,8 @@ #include #include #include +#include + #include @@ -220,7 +222,29 @@ bool DownloadManager::downloadResource(const KUrl &srcUrl, const KIO::MetaData & if (forceDirRequest || ReKonfig::askDownloadPath()) { // follow bug:184202 fixes - destUrl = KFileDialog::getSaveFileName(fileName, QString(), parent); + + // Downloads should default to the default download directory. At the + // same time when the user has been using a different directory + // previously, it should be used instead. + // To enable this behavior we inject the default download path into + // KRecentDirs (which is internally used by KFileDialog to get the + // most recently used directory of a fileclass). + // If a user then uses a different directory it will replace the + // downloads directory in KRecentDirs and become the new default when + // trying to save a file. Also see KFileDialog, KFileWidget and + // KRecentDirs documentation. + + // If this is the first invocation insert the defaults downloads directory. + static const QString fileClass = QL1S(":download"); + if (KRecentDirs::list(fileClass).count() <= 1) // Always has one entry by default. + KRecentDirs::add(fileClass, KGlobalSettings::downloadPath()); + + const KUrl startDir(QString("kfiledialog:///download/%1").arg(fileName)); + + // NOTE: We used to use getSaveFileName here but it proved unable to + // handle remote URLs, which we need to handle here, making the use of + // getSaveUrl deliberate. + destUrl = KFileDialog::getSaveUrl(startDir, QString(), parent); } else { -- 1.8.1.2 debian/patches/0001-pass-menutitle-through-i18n-to-get-it-localized.patch0000664000000000000000000000144612277133072023207 0ustar From 824427e2fe2a840c53ec97d98c63ab8c1a988393 Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Tue, 16 Apr 2013 11:14:15 +0200 Subject: [PATCH] pass menutitle through i18n() to get it localized -.- --- src/webwindow/rekonqfactory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webwindow/rekonqfactory.cpp b/src/webwindow/rekonqfactory.cpp index af15bf4..86c60b5 100644 --- a/src/webwindow/rekonqfactory.cpp +++ b/src/webwindow/rekonqfactory.cpp @@ -322,7 +322,7 @@ void RekonqFactory::fillMenu(KMenu *m, QDomNode node) if (el.tagName() == QL1S("text")) { - const QString menuTitle = el.text(); + const QString menuTitle = i18n(qPrintable(el.text())); m->setTitle(menuTitle); } -- 1.8.1.2 debian/patches/series0000664000000000000000000000022612277133072012040 0ustar kubuntu_no_default_bookmarks.diff kubuntu_default_homepages.diff kubuntu_initial_preference.diff kubuntu_adblock.diff kubuntu_restricted_install.diff debian/patches/kubuntu_default_homepages.diff0000664000000000000000000000176612277133072016720 0ustar Index: b/src/rekonq.kcfg =================================================================== --- a/src/rekonq.kcfg +++ b/src/rekonq.kcfg @@ -72,10 +72,10 @@ - KDE Homepage,rekonq site + Google,UserBase,Kubuntu,Kubuntu Forums - http://www.kde.org/,http://rekonq.kde.org/ + http://www.google.com,http://userbase.kde.org,http://www.kubuntu.org,http://www.kubuntuforums.net @@ -86,7 +86,7 @@ 1 - http://www.kde.org/ + http://www.google.com/ KUrl(KGlobalSettings::downloadPath()) debian/patches/kubuntu_no_default_bookmarks.diff0000664000000000000000000000153212277133072017423 0ustar Index: rekonq/src/data/defaultbookmarks.xbel =================================================================== --- rekonq.orig/src/data/defaultbookmarks.xbel 2013-01-30 21:39:36.000000000 +0800 +++ rekonq/src/data/defaultbookmarks.xbel 2013-01-30 21:43:33.982721664 +0800 @@ -1,19 +1,4 @@ - - Qt site - - - WebKit.org - - - rekonq site - - - KDE-Apps.org - - - KDE site - debian/patches/kubuntu_restricted_install.diff0000664000000000000000000000252512277133072017134 0ustar Description: Make update-notifier-kde prompt for flash installation Origin: vendor Forwarded: not-needed Last-Update: 2012-12-15 Index: rekonq-2.0/src/application.cpp =================================================================== --- rekonq-2.0.orig/src/application.cpp 2013-01-07 16:13:53.143979025 +0000 +++ rekonq-2.0/src/application.cpp 2013-01-07 16:13:53.139979025 +0000 @@ -112,6 +112,18 @@ kDebug() << "are there arguments? " << areThereArguments; kDebug() << "is rekonq crashed? " << hasToBeRecoveredFromCrash; + // Added by Kubuntu for update-notifier-kde to prompt for restricted codec install + QDBusMessage m = QDBusMessage::createMethodCall(QLatin1String("org.kubuntu.restrictedInstall"), + QLatin1String("/org/kubuntu/restrictedInstall"), + QLatin1String("org.kubuntu.restrictedInstall"), + QLatin1String("installRestricted")); + QList dbusargs; + dbusargs.append(QLatin1String("rekonq Web Browser")); + dbusargs.append(QLatin1String("flashplugin-installer")); + m.setArguments(dbusargs); + QDBusConnection::sessionBus().send(m); + // End Kubuntu part + bool incognito = args->isSet("incognito"); bool webapp = args->isSet("webapp"); debian/patches/0001-honor-filetype-setting-WRT-embedding.patch0000664000000000000000000001234512277133072021234 0ustar From bc39368cde294b57dcdc255b42b7d719986c44e5 Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Thu, 11 Apr 2013 11:51:33 +0200 Subject: [PATCH] honor filetype setting WRT embedding there are 3 distinct states a filetype can have WRT kpart embeding - always embed - never embed - do whatever the parent node does (e.g. application/foo would take the setting of application) since the logic to determine which of those it is going to be we are using a bit of code imported from konqueror deciding in a boolean fashion whether or not we are supposed to embed or not. this is particularly non- intrusive as the decision directly relates to whether a kpart is created, if not the file will simply be krun'. this change is using static functions for the imported code. rationale being that they are in fact static and not having them reflected in the header makes them all the easier to remove should a better solution arise in the future. with that in mind: while the code is copy'n'pastable it seems like a good idea to move this into some shared library in the long term such that konqueror and rekonq (and any other kpart enabled app) can use the same code. REVIEW: 109942 BUG: 240400 BUG: 279423 --- src/webtab/webpage.cpp | 72 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/src/webtab/webpage.cpp b/src/webtab/webpage.cpp index b61f66c..968c659 100644 --- a/src/webtab/webpage.cpp +++ b/src/webtab/webpage.cpp @@ -64,6 +64,8 @@ #include #include #include +#include +#include #include #include @@ -335,6 +337,72 @@ WebPage *WebPage::createWindow(QWebPage::WebWindowType type) } +// From Konqueror's konqsettings.cpp +static bool alwaysEmbedMimeTypeGroup(const QString &mimeType) +{ + if (mimeType.startsWith("inode") || mimeType.startsWith("Browser")) + return true; + return false; +} + + +// From Konqueror's konqsettings.cpp. +// config and m_embedMap were manually added to make the function static. +// TODO: Probably should be moved into some library for KDE Frameworks... +static bool shouldEmbed(const QString &_mimeType) +{ + KSharedConfig::Ptr config = KSharedConfig::openConfig("filetypesrc", KConfig::NoGlobals); + QMap m_embedMap = config->entryMap("EmbedSettings"); + + KMimeType::Ptr mime = KMimeType::mimeType(_mimeType, KMimeType::ResolveAliases); + if (!mime) { + kWarning() << "Unknown mimetype" << _mimeType; + return false; // unknown mimetype! + } + const QString mimeType = mime->name(); + + // First check in user's settings whether to embed or not + // 1 - in the filetypesrc config file (written by the configuration module) + QMap::const_iterator it = m_embedMap.find( QString::fromLatin1("embed-")+mimeType ); + if ( it != m_embedMap.end() ) { + kDebug() << mimeType << it.value(); + return it.value() == QLatin1String("true"); + } + // 2 - in the configuration for the group if nothing was found in the mimetype + if (alwaysEmbedMimeTypeGroup(mimeType)) + return true; //always embed mimetype inode/*, Browser/* and Konqueror/* + const QString mimeTypeGroup = mimeType.left(mimeType.indexOf('/')); + it = m_embedMap.find( QString::fromLatin1("embed-")+mimeTypeGroup ); + if ( it != m_embedMap.end() ) { + kDebug() << mimeType << "group setting:" << it.value(); + return it.value() == QLatin1String("true"); + } + // 2 bis - configuration for group of parent mimetype, if different + if (mimeType[0].isLower()) { + QStringList parents; + parents.append(mimeType); + while (!parents.isEmpty()) { + const QString parent = parents.takeFirst(); + if (alwaysEmbedMimeTypeGroup(parent)) { + return true; + } + KMimeType::Ptr mime = KMimeType::mimeType(parent); + Q_ASSERT(mime); // how could the -parent- be null? + if (mime) + parents += mime->parentMimeTypes(); + } + } + + // 3 - if no config found, use default. + // Note: if you change those defaults, also change keditfiletype/mimetypedata.cpp ! + // Embedding is false by default except for image/* and for zip, tar etc. + const bool hasLocalProtocolRedirect = !KProtocolManager::protocolForArchiveMimetype(mimeType).isEmpty(); + if (mimeTypeGroup == "image" || mimeTypeGroup == "multipart" || hasLocalProtocolRedirect) + return true; + return false; +} + + void WebPage::handleUnsupportedContent(QNetworkReply *reply) { Q_ASSERT(reply); @@ -472,7 +540,9 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply) webAppMode = true; // case KParts::BrowserRun::Embed - KParts::ReadOnlyPart *pa = KMimeTypeTrader::createPartInstanceFromQuery(_mimeType, view(), this, QString()); + KParts::ReadOnlyPart *pa = 0; + if (shouldEmbed(_mimeType)) // Only create the KPart if we are actually supposed to embed. + pa = KMimeTypeTrader::createPartInstanceFromQuery(_mimeType, view(), this, QString()); if (pa && !webAppMode) { _isOnRekonqPage = true; -- 1.8.1.2 debian/patches/0001-i18n-make-sure-text-passed-to-i18n-is-UTF-8.patch0000664000000000000000000000146712277133072021546 0ustar From 42370825aca564fa8a3a21b9e3ce76f90570ffbc Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 16 Apr 2013 11:57:20 +0200 Subject: [PATCH] i18n: make sure text passed to i18n() is UTF-8 --- src/webwindow/rekonqfactory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webwindow/rekonqfactory.cpp b/src/webwindow/rekonqfactory.cpp index 86c60b5..75fd0ba 100644 --- a/src/webwindow/rekonqfactory.cpp +++ b/src/webwindow/rekonqfactory.cpp @@ -322,7 +322,7 @@ void RekonqFactory::fillMenu(KMenu *m, QDomNode node) if (el.tagName() == QL1S("text")) { - const QString menuTitle = i18n(qPrintable(el.text())); + const QString menuTitle = i18n(el.text().toUtf8().constData()); m->setTitle(menuTitle); } -- 1.8.1.2 debian/gbp.conf0000664000000000000000000000007512277133072010615 0ustar [git-buildpackage] compression = bzip2 no-create-orig = true debian/rekonq.10000664000000000000000000000755612277133072010572 0ustar .\" This file was generated by kdemangen.pl .TH REKONQ 1 "May 2010" "K Desktop Environment" "A lightweight Web Browser for KDE based on WebKit" .SH NAME rekonq \- A lightweight Web Browser for KDE based on WebKit .SH SYNOPSIS rekonq [Qt\-options] [KDE\-options] [URL] .SH DESCRIPTION rekonq is a web browser based on WebKit and the KDE technologies. Its aim is to integrate nicely in the KDE desktop while providing a lightweight experience. Non-exhaustive list of features : - shares bookmarks and network settings with konqueror - uses the kwallet password manager - integrates with the kget download manager - anonymous browsing mode .SH OPTIONS .SS .SS Arguments: .TP .B URL Location to open .SS Generic options: .TP .B \-\-help Show help about options .TP .B \-\-help\-qt Show Qt specific options .TP .B \-\-help\-kde Show KDE specific options .TP .B \-\-help\-all Show all options .TP .B \-\-author Show author information .TP .B \-v, \-\-version Show version information .TP .B \-\-license Show license information .TP .B \-\- End of options .SS .SS KDE options: .TP .B \-\-caption Use 'caption' as name in the titlebar .TP .B \-\-icon Use 'icon' as the application icon .TP .B \-\-config Use alternative configuration file .TP .B \-\-nocrashhandler Disable crash handler, to get core dumps .TP .B \-\-waitforwm Waits for a WM_NET compatible windowmanager .TP .B \-\-style