mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-02-03 22:07:18 +08:00
proper rebuild for rekonq on qtwebkit/kde-unstable, kde-workspace fix bug http://chakra-linux.org/bugs/index.php?do=details&task_id=508&project=0
This commit is contained in:
parent
93582c8258
commit
7741d17c79
@ -8,7 +8,7 @@
|
||||
# better use the Autostart folder.
|
||||
|
||||
-libpath=`kde4-config --path lib | tr : '\n'`
|
||||
+libpath=`kde4-config --path lib | tr : '\n'`'\n/etc/kde/lib/'
|
||||
+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
|
||||
|
||||
for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
|
||||
for file in "$prefix"*.sh; do
|
||||
|
@ -75,7 +75,7 @@ md5sums=(`grep ${pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
|
||||
'c4b5f1b342b3dad38642318ca077daee' # kdm.service
|
||||
|
||||
'721e97031b62aee8914e8617e86f9235' # 01_kdm_zsh_profile.patch
|
||||
'707275a64742e888da99d334237c847e' # 02_sane_env_and_shutdown_path.patch
|
||||
'4515dd57d5ba395f03708129d56db7e1' # 02_sane_env_and_shutdown_path.patch
|
||||
'8e623bb5608025417ff9ed061e5a03f1' # 03_plasma_menubutton_branding.patch
|
||||
'd4d7d3fc3ac072a8ca848e9c96e517dc' # 06_kickoff_default_favourites.patch
|
||||
'89d96455c6a446ef59b0620d1b8606af' # 07_always_show_kickoff_subtext.patch
|
||||
|
47
rekonq/PKGBUILD
Normal file
47
rekonq/PKGBUILD
Normal file
@ -0,0 +1,47 @@
|
||||
#
|
||||
# Apps Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer: abveritas@chakra-project.org
|
||||
|
||||
pkgname=rekonq
|
||||
pkgver=2.0
|
||||
pkgrel=3
|
||||
pkgdesc='A WebKit based web browser for KDE'
|
||||
arch=('x86_64')
|
||||
url='http://rekonq.sourceforge.net/'
|
||||
license=('GPL')
|
||||
depends=('kde-baseapps' 'qoauth' 'qca-ossl')
|
||||
makedepends=('cmake' 'automoc4' 'docbook-xsl')
|
||||
categories=('network')
|
||||
screenshot=('http://rekonq.kde.org/sites/rekonq.kde.org/files/images/Rekonq-0.6.0.png')
|
||||
install=${pkgname}.install
|
||||
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
|
||||
'background.png'
|
||||
'background.diff'
|
||||
'searchengine.diff')
|
||||
md5sums=('d73e3fdeefaaa4d9cf51dd4ba4395bd7'
|
||||
'cd493df91e34030a8195eaf8b6d68140'
|
||||
'5d7bab51b8f4b78c0f7cd94c885f22c3'
|
||||
'7ab9dc2e4397a66c7a64e08265171996')
|
||||
|
||||
build(){
|
||||
cd ${srcdir}/${pkgname}-${pkgver}
|
||||
# Chakra theme:
|
||||
patch -p1 -i "${srcdir}/background.diff"
|
||||
|
||||
cd ${srcdir}
|
||||
mkdir -p build
|
||||
cd build
|
||||
cmake ../${pkgname}-${pkgver} \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd ${srcdir}/build
|
||||
|
||||
make DESTDIR=${pkgdir} install
|
||||
rm ${pkgdir}/usr/share/apps/rekonq/pics/background.png
|
||||
install -m 644 -p ${srcdir}/background.png ${pkgdir}/usr/share/apps/rekonq/pics/background.png
|
||||
}
|
23
rekonq/background.diff
Normal file
23
rekonq/background.diff
Normal file
@ -0,0 +1,23 @@
|
||||
--- a/src/data/home.html 2012-07-09 18:15:31.000000000 -0400
|
||||
+++ b/src/data/home.html 2012-07-20 18:24:19.650246881 -0400
|
||||
@@ -35,7 +35,7 @@
|
||||
}
|
||||
|
||||
body {
|
||||
- background: url($DEFAULT_PATH/pics/background.png) repeat-y center #fff;
|
||||
+ background: url($DEFAULT_PATH/pics/background.png) no-repeat center #fff;
|
||||
font-family: 'Nunito', sans-serif;
|
||||
font-size: 0.9em;
|
||||
border: 0;
|
||||
|
||||
--- a/src/data/rekonqinfo.html 2012-07-20 18:25:08.594903239 -0400
|
||||
+++ b/src/data/rekonqinfo.html 2012-07-20 18:25:21.325242141 -0400
|
||||
@@ -35,7 +35,7 @@
|
||||
}
|
||||
|
||||
body{
|
||||
- background: url($DEFAULT_PATH/pics/background.png) repeat-y center #bbb;
|
||||
+ background: url($DEFAULT_PATH/pics/background.png) no-repeat center #bbb;
|
||||
margin:0;
|
||||
padding:0;
|
||||
font-family: 'Nunito', sans-serif;
|
BIN
rekonq/background.png
Normal file
BIN
rekonq/background.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 82 KiB |
11
rekonq/rekonq.install
Normal file
11
rekonq/rekonq.install
Normal file
@ -0,0 +1,11 @@
|
||||
post_install() {
|
||||
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install
|
||||
}
|
||||
|
||||
post_remove() {
|
||||
post_install
|
||||
}
|
35
rekonq/searchengine.diff
Normal file
35
rekonq/searchengine.diff
Normal file
@ -0,0 +1,35 @@
|
||||
diff --git a/src/opensearch/searchengine.cpp b/src/opensearch/searchengine.cpp
|
||||
index aef06a7..2adb2a5 100644
|
||||
--- a/src/opensearch/searchengine.cpp
|
||||
+++ b/src/opensearch/searchengine.cpp
|
||||
@@ -61,7 +61,7 @@ void SearchEngine::reload()
|
||||
|
||||
//load favorite engines
|
||||
QStringList favoriteEngines;
|
||||
- favoriteEngines = cg.readEntry("FavoriteSearchEngines", favoriteEngines);
|
||||
+ favoriteEngines = cg.readEntry("PreferredWebShortcuts", favoriteEngines);
|
||||
KService::List favorites;
|
||||
KService::Ptr service;
|
||||
Q_FOREACH(const QString & engine, favoriteEngines)
|
||||
@@ -78,7 +78,7 @@ void SearchEngine::reload()
|
||||
d->favorites = favorites;
|
||||
|
||||
//load default engine
|
||||
- QString dse = cg.readEntry("DefaultSearchEngine");
|
||||
+ QString dse = cg.readEntry("DefaultWebShortcut");
|
||||
d->defaultEngine = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(dse));
|
||||
|
||||
d->isLoaded = true;
|
||||
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
|
||||
index 21debce..f5b47b8 100644
|
||||
--- a/src/urlbar/urlbar.cpp
|
||||
+++ b/src/urlbar/urlbar.cpp
|
||||
@@ -293,6 +293,8 @@ void UrlBar::keyPressEvent(QKeyEvent *event)
|
||||
if (currentText.isEmpty())
|
||||
return KLineEdit::keyPressEvent(event);
|
||||
|
||||
+ activateSuggestions(true);
|
||||
+
|
||||
// this handles the Modifiers + Return key combinations
|
||||
if (event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter)
|
||||
{
|
Loading…
Reference in New Issue
Block a user