Merge branch 'master' of gitorious.org:chakra-packages/apps

This commit is contained in:
Adrian Chaves Fernandez (Gallaecio) 2012-09-20 07:51:16 +00:00
commit 7af399179a
4 changed files with 17 additions and 23 deletions

View File

@ -7,7 +7,7 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=clamav
pkgver=0.97.5
pkgver=0.97.6
pkgrel=1
pkgdesc='Anti-virus toolkit for Unix'
arch=('i686' 'x86_64')
@ -24,7 +24,7 @@ source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.
'clamav.logrotate'
'config.patch')
sha1sums=('1bb317ead4a1a677a9a11a063fc35a63f22309e9'
sha1sums=('528f774b14b95fdfb8b377f8b41859c48b165e34'
'7f15f0b13a1c11235bc99ef0add01efd8a442f07'
'cb116cdab49a810381a515cbcfb6a6c148547f07'
'be3310d2b41a68ce06e33c84ab68ffe59fdce104'

View File

@ -2,9 +2,9 @@
# Contributor: Fabian Kosmale <0inkane@googlemail.com>
pkgname=qupzilla
pkgver=1.3.1
pkgver=1.3.5
pkgrel=1
_commit=0a7741c
_commit=e59241f
pkgdesc="A very fast open source browser based on WebKit core"
url="http://www.qupzilla.com"
arch=('i686' 'x86_64')
@ -17,19 +17,19 @@ source=("https://github.com/QupZilla/QupZilla/tarball/master/QupZilla-qupzilla-$
'preferences.diff'
'qupzilla.diff'
'start-white.png')
md5sums=('fd4b8e0024acbb48b6464895caeb93f4'
'9ba76131a4480f421cea8116bf2fe684'
'05550d47d4c84efada2f65b31a3ab148'
md5sums=('31843d47ab680a41503275495d874427'
'7e1b3743fba94b54ab0858e7588cca83'
'b58d03f2e52ea3391e63c0eeea3e82a4'
'ac98b9f9cc45df18070eabee518c0049'
'fc0aa2bef51e5488f129b4618ee18545'
'fc705d7aba952361a626a2c79726bbfa')
build() {
cd "${srcdir}/QupZilla-qupzilla-${_commit}/"
patch -Np0 -i "${srcdir}/searchenginesmanager.diff"
patch -Np0 -i "${srcdir}/speeddial.diff"
patch -Np0 -i "${srcdir}/preferences.diff"
patch -Np0 -i "${srcdir}/qupzilla.diff"
patch -p0 -i "${srcdir}/searchenginesmanager.diff"
patch -p0 -i "${srcdir}/speeddial.diff"
patch -p0 -i "${srcdir}/preferences.diff"
patch -p0 -i "${srcdir}/qupzilla.diff"
export USE_WEBGL="true"
export KDE="true"
qmake QupZilla.pro

View File

@ -9,13 +9,6 @@
settings.endGroup();
connect(this, SIGNAL(enginesChanged()), this, SLOT(scheduleSave()));
@@ -73,7 +73,7 @@
// TODO: Remove when releasing new version
// and move into profile updater
if (en.name == "DuckDuckGo") {
- en.url = "https://duckduckgo.com/?q=%s&t=qupzilla";
+ en.url = "https://duckduckgo.com/?t=chakra&q=%s";
}
m_allEngines.append(en);
@@ -141,7 +141,7 @@

View File

@ -1,16 +1,17 @@
--- src/lib/plugins/speeddial.cpp 2012-04-24 10:40:21.000000000 -0400
+++ src/lib/plugins/speeddial.cpp 2012-04-24 11:30:07.226119371 -0400
@@ -46,18 +46,17 @@
--- src/lib/plugins/speeddial.cpp 2012-09-17 12:03:30.000000000 -0400
+++ src/lib/plugins/speeddial.cpp 2012-09-17 15:51:19.070088443 -0400
@@ -46,19 +46,18 @@
Settings settings;
settings.beginGroup("SpeedDial");
QString allPages = settings.value("pages", "").toString();
- m_backgroundImage = settings.value("background", "").toString();
QString allPages = settings.value("pages", QString()).toString();
- m_backgroundImage = settings.value("background", QString()).toString();
- m_backgroundImageSize = settings.value("backsize", "auto").toString();
+ m_backgroundImage = settings.value("background", "file:///usr/share/icons/start-white.png").toString();
+ m_backgroundImageSize = settings.value("backsize", "contain").toString();
m_maxPagesInRow = settings.value("pagesrow", 4).toInt();
- m_sizeOfSpeedDials = settings.value("sdsize", 231).toInt();
+ m_sizeOfSpeedDials = settings.value("sdsize", 150).toInt();
m_sdcentered = settings.value("sdcenter", 0).toInt();
settings.endGroup();
if (allPages.isEmpty()) {