diff options
Diffstat (limited to 'libre/qupzilla-libre')
| -rw-r--r-- | libre/qupzilla-libre/PKGBUILD | 22 | ||||
| -rw-r--r-- | libre/qupzilla-libre/libre.patch | 89 | ||||
| -rw-r--r-- | libre/qupzilla-libre/searchenginesmanager.cpp.sed | 19 | ||||
| -rw-r--r-- | libre/qupzilla-libre/speeddial.cpp.sed | 4 | ||||
| -rw-r--r-- | libre/qupzilla-libre/start.html.sed | 1 |
5 files changed, 38 insertions, 97 deletions
diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD index 75945986a..d5bab2cde 100644 --- a/libre/qupzilla-libre/PKGBUILD +++ b/libre/qupzilla-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90358 2013-05-11 23:22:13Z speps $ +# $Id: PKGBUILD 96569 2013-09-01 16:36:10Z speps $ # Maintainer: speps <speps at aur dot archlinux dot org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> _name=QupZilla _pkgname=qupzilla pkgname=qupzilla-libre -pkgver=1.4.3 -pkgrel=1.2 +pkgver=1.4.4 +pkgrel=1 pkgdesc="Cross-platform QtWebKit browser, with DuckDuckGo HTML support" arch=(i686 x86_64 mips64el) url="http://www.qupzilla.com/" @@ -18,15 +18,21 @@ replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver source=("$_pkgname-$pkgver.tar.gz::https://github.com/$_name/$_pkgname/tarball/v$pkgver" - 'libre.patch') -md5sums=('20187fcce11dbba876e1ee7dc5e32583' - '20c8304eb790cda5491078bf5bf71d49') + 'searchenginesmanager.cpp.sed' + 'speeddial.cpp.sed' + 'start.html.sed') +md5sums=('cfbf5cd23d184275c389c79a39a28631' + '1d926e97a5b287d40fb695f6516f2a06' + '0f166fa102af975b3b8ac030d477e9b8' + '77120a0c39ba8254e5b2c273910f029a') prepare() { cd "$srcdir/$_name-$_pkgname-"* - # remove Google, Youtube and Facebook support, replaces it to DDG HTML - patch -Np1 -i $srcdir/libre.patch + # remove Google and Youtube support, replaces it to DDG HTML + sed -i -f $srcdir/searchenginesmanager.cpp.sed src/lib/opensearch/searchenginesmanager.cpp + sed -i -f $srcdir/speeddial.cpp.sed src/lib/plugins/speeddial.cpp + sed -i -f $srcdir/start.html.sed src/lib/data/html/start.html } build() { diff --git a/libre/qupzilla-libre/libre.patch b/libre/qupzilla-libre/libre.patch deleted file mode 100644 index 6db34dd8f..000000000 --- a/libre/qupzilla-libre/libre.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/src/lib/opensearch/searchenginesmanager.cpp b/src/lib/opensearch/searchenginesmanager.cpp -index 72ae7d4..cb42795 100644 ---- a/src/lib/opensearch/searchenginesmanager.cpp -+++ b/src/lib/opensearch/searchenginesmanager.cpp -@@ -55,8 +55,8 @@ SearchEnginesManager::SearchEnginesManager() - { - Settings settings; - settings.beginGroup("SearchEngines"); -- m_startingEngineName = settings.value("activeEngine", "Google").toString(); -- m_defaultEngineName = settings.value("DefaultEngine", "Google").toString(); -+ m_startingEngineName = settings.value("activeEngine", "DuckDuckGo HTML").toString(); -+ m_defaultEngineName = settings.value("DefaultEngine", "DuckDuckGo HTML").toString(); - settings.endGroup(); - - connect(this, SIGNAL(enginesChanged()), this, SLOT(scheduleSave())); -@@ -126,13 +126,6 @@ QUrl SearchEnginesManager::searchUrl(const QString &string) - - void SearchEnginesManager::restoreDefaults() - { -- Engine google; -- google.name = "Google"; -- google.icon = QIcon(":icons/sites/google.png"); -- google.url = "http://www.google.com/search?client=qupzilla&q=%s"; -- google.shortcut = "g"; -- google.suggestionsUrl = "http://suggestqueries.google.com/complete/search?output=firefox&q=%s"; -- - Engine wiki; - wiki.name = "Wikipedia (en)"; - wiki.icon = QIcon(":/icons/sites/wikipedia.png"); -@@ -140,25 +133,16 @@ void SearchEnginesManager::restoreDefaults() - wiki.shortcut = "w"; - wiki.suggestionsUrl = "http://en.wikipedia.org/w/api.php?action=opensearch&search=%s&namespace=0"; - -- Engine yt; -- yt.name = "YouTube"; -- yt.icon = QIcon(":/icons/sites/youtube.png"); -- yt.url = "http://www.youtube.com/results?search_query=%s&search=Search"; -- yt.shortcut = "yt"; -- yt.suggestionsUrl = "http://suggestqueries.google.com/complete/search?ds=yt&output=firefox&q=%s"; -- - Engine duck; -- duck.name = "DuckDuckGo"; -+ duck.name = "DuckDuckGo HTML"; - duck.icon = QIcon(":/icons/sites/duck.png"); -- duck.url = "https://duckduckgo.com/?q=%s&t=qupzilla"; -+ duck.url = "https://duckduckgo.com/html/?q=%s&t=qupzilla"; - duck.shortcut = "d"; - -- addEngine(google); - addEngine(wiki); -- addEngine(yt); - addEngine(duck); - -- m_defaultEngine = google; -+ m_defaultEngine = duck; - - emit enginesChanged(); - } -diff --git a/src/lib/plugins/speeddial.cpp b/src/lib/plugins/speeddial.cpp -index 2039921..52afa22 100644 ---- a/src/lib/plugins/speeddial.cpp -+++ b/src/lib/plugins/speeddial.cpp -@@ -54,11 +54,10 @@ void SpeedDial::loadSettings() - settings.endGroup(); - - if (allPages.isEmpty()) { -- allPages = "url:\"http://www.google.com\"|title:\"Google\";" -+ allPages = "url:\"https://duckduckgo.com/html\"|title:\"DuckDuckGo HTML\";" - "url:\"http://www.qupzilla.com\"|title:\"QupZilla\";" - "url:\"http://blog.qupzilla.com\"|title:\"QupZilla Blog\";" -- "url:\"https://github.com/QupZilla/qupzilla\"|title:\"QupZilla GitHub\";" -- "url:\"https://facebook.com\"|title:\"Facebook\";"; -+ "url:\"https://github.com/QupZilla/qupzilla\"|title:\"QupZilla GitHub\";"; - } - changed(allPages); - -diff --git a/src/lib/data/html/start.html b/src/lib/data/html/start.html -index 0e48ed2..eb7d793 100644 ---- a/src/lib/data/html/start.html -+++ b/src/lib/data/html/start.html -@@ -19,7 +19,7 @@ a {color: #1a4ba4;text-decoration: none;font-weight: bold;} - - <img src="%ABOUT-IMG%"> - %PRIVATE-BROWSING% --<form action="https://duckduckgo.com/" method="GET"> -+<form action="https://duckduckgo.com/html" method="GET"> - <input type="hidden" name="t" value="qupzilla" /> - <input class="line" id="inp" class="question" name="q"/> <br/> - <input class="submit" type="submit" value="%BUTTON-LABEL%"> diff --git a/libre/qupzilla-libre/searchenginesmanager.cpp.sed b/libre/qupzilla-libre/searchenginesmanager.cpp.sed new file mode 100644 index 000000000..76011d058 --- /dev/null +++ b/libre/qupzilla-libre/searchenginesmanager.cpp.sed @@ -0,0 +1,19 @@ +s|DuckDuckGo|DuckDuckGo HTML| +\|m_startingEngineName = settings[.]value("activeEngine", "Google")[.]toString();| s|Google|DuckDuckGo HTML| +\|m_defaultEngineName = settings[.]value("DefaultEngine", "Google")[.]toString();| s|Google|DuckDuckGo HTML| +\|Engine google;|d +\|google[.]name = "Google";|d +\|google[.]icon = QIcon(":icons/sites/google[.]png");|d +\|google[.]url = "http://www[.]google[.]com/search?client=qupzilla[&]q=%s";|d +\|google[.]shortcut = "g";|d +\|google[.]suggestionsUrl = "http://suggestqueries[.]google[.]com/complete/search?output=firefox[&]q=%s";|d +\|Engine yt;|d +\|yt[.]name = "YouTube";|d +\|yt[.]icon = QIcon(":/icons/sites/youtube.png");|d +\|yt[.]url = "http://www[.]youtube[.]com/results?search_query=%s[&]search=Search";|d +\|yt[.]shortcut = "yt";|d +\|yt[.]suggestionsUrl = "http://suggestqueries[.]google[.]com/complete/search?ds=yt[&]output=firefox[&]q=%s";|d +\|https://duckduckgo[.]com/?q=%s[&]t=qupzilla| s|duckduckgo[.]com|duckduckgo.com/html| +\|addEngine(google);|d +\|addEngine(yt);|d +\|m_defaultEngine = google;| s|google|duck| diff --git a/libre/qupzilla-libre/speeddial.cpp.sed b/libre/qupzilla-libre/speeddial.cpp.sed new file mode 100644 index 000000000..b8f591e87 --- /dev/null +++ b/libre/qupzilla-libre/speeddial.cpp.sed @@ -0,0 +1,4 @@ +s|www[.]google[.]com|duckduckgo.com/html| +s|Google|DuckDuckGo HTML| +\#"url:[\]"https://github[.]com/QupZilla/qupzilla[\]"|title:[\]"QupZilla GitHub[\]";"# s#$#;# +\#"url:[\]"https://duckduckgo[.]com[\]"|title:[\]"DuckDuckGo[\]";";#d diff --git a/libre/qupzilla-libre/start.html.sed b/libre/qupzilla-libre/start.html.sed new file mode 100644 index 000000000..f59a65979 --- /dev/null +++ b/libre/qupzilla-libre/start.html.sed @@ -0,0 +1 @@ +\|<form action="https://duckduckgo[.]com/" method="GET">| s|duckduckgo[.]com|duckduckgo.com/html| |