Merge remote-tracking branch 'origin/master'

This commit is contained in:
Fabian 2012-07-15 15:17:03 +00:00
commit 7c08d1d87c
3 changed files with 22 additions and 23 deletions

View File

@ -5,7 +5,7 @@
# contributor Michael Kutschall <michaelkutschall@web.de>
pkgname=nepoogle
pkgver=0.9.2
pkgver=0.9.3.1
pkgrel=1
pkgdesc="A search utility for Nepomuk inspired in Google's search syntax."
arch=('any')
@ -13,15 +13,14 @@ url="http://kde-apps.org/content/show.php/Nepoogle?content=145505"
screenshot="http://opendesktop.org/CONTENT/content-pre2/145505-2.jpeg"
license=('GPL')
depends=('kdebindings-pykde4')
source=("http://kde-apps.org/CONTENT/content-files/145505-nepoogle_v$pkgver.tar.gz"
#source=("http://kde-apps.org/CONTENT/content-files/145505-nepoogle_v$pkgver.tar.gz"
source=('serantes-nepoogle-v0.9.3-87-gbc7d007.tar.gz'
'nepoogle.desktop')
md5sums=('2f991c5847b36f89f1c4f9ffa282bb05'
md5sums=('539083f2f38f8e0ea69655c60d0ee757'
'ceb6bb8059658686b4e13abd66a61445')
build() {
cd $srcdir/serantes-nepoogle-bc7d007
./build.py nepoogle nepoogle.py
}
package() {
mkdir -p $pkgdir/usr/share/applications/kde4
cp nepoogle.desktop $pkgdir/usr/share/applications/kde4/nepoogle.desktop
mkdir -p $pkgdir/usr/bin
cp $srcdir/nepoogle $pkgdir/usr/bin/nepoogle
}

View File

@ -1,24 +1,24 @@
# Contributor: Neophytos Kolokotronis <tetris4@gmail.com>
pkgname=qupzilla
pkgver=1.2.0
pkgrel=2
pkgver=1.3.0
pkgrel=1
commit=g${_commit}
_commit=642f424
_commit=625c9a3
pkgdesc="A very fast open source browser based on WebKit core"
url="http://www.qupzilla.com"
arch=('i686' 'x86_64')
license=('GPL3')
depends=('qt')
categories=('network')
source=("https://github.com/QupZilla/QupZilla/tarball/master/QupZilla-qupzilla-v1.2.0-53-g642f424.tar.gz"
source=("https://github.com/QupZilla/QupZilla/tarball/master/QupZilla-qupzilla-1.3.0.tar.gz"
'searchenginesmanager.diff'
'speeddial.diff'
'preferences.diff'
'qupzilla.diff'
'start-white.png')
md5sums=('2b939284130c853175ebbd7ee3388c4f'
'a879b2f492264841d384e91dda611b4b'
md5sums=('406b311569ea5c8e03eff8705d5d9b7a'
'9ba76131a4480f421cea8116bf2fe684'
'05550d47d4c84efada2f65b31a3ab148'
'ac98b9f9cc45df18070eabee518c0049'
'fc0aa2bef51e5488f129b4618ee18545'

View File

@ -1,6 +1,6 @@
--- src/lib/opensearch/searchenginesmanager.cpp.orig 2012-03-05 08:33:24.000000000 -0500
+++ src/lib/opensearch/searchenginesmanager.cpp 2012-03-05 14:07:15.125791995 -0500
@@ -46,7 +46,7 @@
--- src/lib/opensearch/searchenginesmanager.cpp.orig 2012-07-11 12:37:18.000000000 -0400
+++ src/lib/opensearch/searchenginesmanager.cpp 2012-07-11 22:34:37.935484692 -0400
@@ -50,7 +50,7 @@
{
Settings settings;
settings.beginGroup("SearchEngines");
@ -9,7 +9,7 @@
settings.endGroup();
connect(this, SIGNAL(enginesChanged()), this, SLOT(scheduleSave()));
@@ -69,7 +69,7 @@
@@ -73,7 +73,7 @@
// TODO: Remove when releasing new version
// and move into profile updater
if (en.name == "DuckDuckGo") {
@ -18,12 +18,12 @@
}
m_allEngines.append(en);
@@ -137,7 +137,7 @@
@@ -141,7 +141,7 @@
Engine duck;
duck.name = "DuckDuckGo";
duck.icon = QIcon(":/icons/menu/duck.png");
duck.icon = QIcon(":/icons/sites/duck.png");
- duck.url = "https://duckduckgo.com/?q=%s&t=qupzilla";
+ duck.url = "https://duckduckgo.com/?t=chakra&q=%s";
duck.shortcut = "d";
addEngine(google, false);
addEngine(google);