[SCM] rekonq packaging branch, master, updated. d251ed767c445687be42155f535d180a77083a43
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Wed Nov 23 18:12:17 UTC 2011
The following commit has been merged in the master branch:
commit 5699a38c0b3b185f2297bf87b75a4a41b2906523
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Wed Nov 23 19:00:11 2011 +0100
Remove obsolete patches.
---
debian/changelog | 3 +
debian/patches/dont_set_app_as_parent.diff | 97 ---------------------
debian/patches/fix_history_ordering.diff | 126 ----------------------------
debian/patches/series | 2 -
4 files changed, 3 insertions(+), 225 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 07befb4..961b306 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ rekonq (0.8.0-0r0) UNRELEASED; urgency=low
[ 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.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 28 May 2011 01:56:24 +0200
diff --git a/debian/patches/dont_set_app_as_parent.diff b/debian/patches/dont_set_app_as_parent.diff
deleted file mode 100644
index 0e799e8..0000000
--- a/debian/patches/dont_set_app_as_parent.diff
+++ /dev/null
@@ -1,97 +0,0 @@
-Origin: https://git.reviewboard.kde.org/r/101027/
-Description: Avoid a crash on exit.
-index 7fcbfe8..a1f239a 100644
---- a/src/application.cpp
-+++ b/src/application.cpp
-@@ -93,6 +93,37 @@ Application::~Application()
- delete window.data();
- window.clear();
- }
-+
-+ if (!m_historyManager.isNull()) {
-+ delete m_historyManager.data();
-+ m_historyManager.clear();
-+ }
-+
-+ if (!m_bookmarkProvider.isNull()) {
-+ delete m_bookmarkProvider.data();
-+ m_bookmarkProvider.clear();
-+ }
-+
-+ if (!m_sessionManager.isNull()) {
-+ delete m_sessionManager.data();
-+ m_sessionManager.clear();
-+ }
-+
-+ if (!m_opensearchManager.isNull()) {
-+ delete m_opensearchManager.data();
-+ m_opensearchManager.clear();
-+ }
-+
-+ if (!m_iconManager.isNull()) {
-+ delete m_iconManager.data();
-+ m_iconManager.clear();
-+ }
-+
-+ if (!m_adblockManager.isNull()) {
-+ delete m_adblockManager.data();
-+ m_adblockManager.clear();
-+ }
-+
- }
-
-
-@@ -272,7 +303,7 @@ HistoryManager *Application::historyManager()
- {
- if (m_historyManager.isNull())
- {
-- m_historyManager = new HistoryManager(instance());
-+ m_historyManager = new HistoryManager;
- }
- return m_historyManager.data();
- }
-@@ -282,7 +313,7 @@ BookmarkProvider *Application::bookmarkProvider()
- {
- if (m_bookmarkProvider.isNull())
- {
-- m_bookmarkProvider = new BookmarkProvider(instance());
-+ m_bookmarkProvider = new BookmarkProvider;
- }
- return m_bookmarkProvider.data();
- }
-@@ -292,7 +323,7 @@ SessionManager *Application::sessionManager()
- {
- if (m_sessionManager.isNull())
- {
-- m_sessionManager = new SessionManager(instance());
-+ m_sessionManager = new SessionManager;
- }
- return m_sessionManager.data();
- }
-@@ -302,7 +333,7 @@ OpenSearchManager *Application::opensearchManager()
- {
- if (m_opensearchManager.isNull())
- {
-- m_opensearchManager = new OpenSearchManager(instance());
-+ m_opensearchManager = new OpenSearchManager;
- }
- return m_opensearchManager.data();
- }
-@@ -312,7 +343,7 @@ IconManager *Application::iconManager()
- {
- if (m_iconManager.isNull())
- {
-- m_iconManager = new IconManager(instance());
-+ m_iconManager = new IconManager;
- }
- return m_iconManager.data();
- }
-@@ -407,7 +438,7 @@ AdBlockManager *Application::adblockManager()
- {
- if (m_adblockManager.isNull())
- {
-- m_adblockManager = new AdBlockManager(instance());
-+ m_adblockManager = new AdBlockManager;
- }
- return m_adblockManager.data();
- }
diff --git a/debian/patches/fix_history_ordering.diff b/debian/patches/fix_history_ordering.diff
deleted file mode 100644
index 6f7103a..0000000
--- a/debian/patches/fix_history_ordering.diff
+++ /dev/null
@@ -1,126 +0,0 @@
-From 4e956fe2423d963a60b249707c22d731585f403d Mon Sep 17 00:00:00 2001
-From: Andrea Diamantini <adjam7 at gmail.com>
-Date: Sun, 10 Apr 2011 00:52:06 +0200
-Subject: [PATCH] Fix History ordering (check about:history page before and
- after this patch) and remove the "provileged" item in the
- urlbar suggestions as it was NOT really working. Reduce min
- suggestion list from 3 to 2 to enable more history
- suggestions. .
-
----
- src/history/historymanager.h | 2 +-
- src/urlbar/urlresolver.cpp | 57 ++++++++++++++---------------------------
- src/urlbar/urlresolver.h | 2 +-
- 3 files changed, 22 insertions(+), 39 deletions(-)
-
-diff --git a/src/history/historymanager.h b/src/history/historymanager.h
-index eb8d78d..8650bd1 100644
---- a/src/history/historymanager.h
-+++ b/src/history/historymanager.h
-@@ -84,7 +84,7 @@ public:
- // history is sorted in reverse
- inline bool operator <(const HistoryItem &other) const
- {
-- return relevance() > other.relevance();
-+ return dateTime > other.dateTime;
- }
-
- QString title;
-diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
-index ee01599..d89f27d 100644
---- a/src/urlbar/urlresolver.cpp
-+++ b/src/urlbar/urlresolver.cpp
-@@ -47,7 +47,7 @@
-
- // defines
- #define MAX_ELEMENTS 8
--#define MIN_SUGGESTIONS 3
-+#define MIN_SUGGESTIONS 2
-
- // NOTE
- // default kurifilter plugin list (at least in my box):
-@@ -173,26 +173,9 @@ UrlSearchList UrlResolver::orderLists()
- list << _qurlFromUserInput;
- }
-
-- //find the history items that match the typed string
-- UrlSearchItem privileged = privilegedItem(&_history);
- int historyCount = _history.count();
--
-- //find the bookmarks items that match the typed string
-- if (privileged.type == UrlSearchItem::Undefined)
-- {
-- privileged = privilegedItem(&_bookmarks);
-- }
-- else if (privileged.type == UrlSearchItem::History && _bookmarks.removeOne(privileged))
-- {
-- privileged.type |= UrlSearchItem::Bookmark;
-- }
- int bookmarksCount = _bookmarks.count();
-
-- if (privileged.type != UrlSearchItem::Undefined)
-- {
-- list.prepend(privileged);
-- }
--
- int availableEntries = MAX_ELEMENTS - list.count() - MIN_SUGGESTIONS;
-
- UrlSearchList common;
-@@ -436,22 +419,22 @@ void UrlResolver::suggestionsReceived(const QString &text, const ResponseList &s
- }
-
-
--UrlSearchItem UrlResolver::privilegedItem(UrlSearchList* list)
--{
-- UrlSearchItem item;
-- QString dot = QString(QL1C('.'));
-- QString test1 = QString(QL1C('/')) + _typedString + dot;
-- QString test2 = dot + _typedString + dot;
--
-- for (int i = 0; i < list->count(); i++)
-- {
-- item = list->at(i);
-- //TODO: move this to AwesomeUrlCompletion::substringCompletion and add a priviledged flag to UrlSearchItem
-- if (item.url.contains(test1) || item.url.contains(test2))
-- {
-- list->removeAt(i);
-- return item;
-- }
-- }
-- return UrlSearchItem();
--}
-+// UrlSearchItem UrlResolver::privilegedItem(UrlSearchList* list)
-+// {
-+// UrlSearchItem item;
-+// QString dot = QString(QL1C('.'));
-+// QString test1 = QString(QL1C('/')) + _typedString + dot;
-+// QString test2 = dot + _typedString + dot;
-+//
-+// for (int i = 0; i < list->count(); i++)
-+// {
-+// item = list->at(i);
-+// //TODO: move this to AwesomeUrlCompletion::substringCompletion and add a priviledged flag to UrlSearchItem
-+// if (item.url.contains(test1) || item.url.contains(test2))
-+// {
-+// list->removeAt(i);
-+// return item;
-+// }
-+// }
-+// return UrlSearchItem();
-+// }
-diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
-index 7054909..030d1de 100644
---- a/src/urlbar/urlresolver.h
-+++ b/src/urlbar/urlresolver.h
-@@ -150,7 +150,7 @@ private:
- void computeQurlFromUserInput();
- void computeBookmarks();
-
-- UrlSearchItem privilegedItem(UrlSearchList* list);
-+// UrlSearchItem privilegedItem(UrlSearchList* list);
- UrlSearchList orderLists();
-
- QString _typedString;
---
-1.7.5.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 093c144..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-dont_set_app_as_parent.diff
-fix_history_ordering.diff
--
rekonq packaging
More information about the pkg-kde-commits
mailing list