summaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
Diffstat (limited to 'network')
-rw-r--r--network/rekonq/README5
-rw-r--r--network/rekonq/doinst.sh1
-rw-r--r--network/rekonq/rekonq-CVE-2010-2536-fix.patch16
-rw-r--r--network/rekonq/rekonq.SlackBuild13
-rw-r--r--network/rekonq/rekonq.info10
-rw-r--r--network/rekonq/slack-desc6
6 files changed, 14 insertions, 37 deletions
diff --git a/network/rekonq/README b/network/rekonq/README
index c303e91411..372769c8ec 100644
--- a/network/rekonq/README
+++ b/network/rekonq/README
@@ -1,4 +1 @@
-rekonq is a KDE browser based on Webkit.
-Its code is based on Nokia QtDemoBrowser, just like Arora.
-Anyway its implementation is going to embrace KDE technologies
-to have a full-featured KDE web browser.
+rekonq is a KDE browser based on Webkit.
diff --git a/network/rekonq/doinst.sh b/network/rekonq/doinst.sh
index 1f8ff67ded..3e5691a052 100644
--- a/network/rekonq/doinst.sh
+++ b/network/rekonq/doinst.sh
@@ -7,4 +7,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
/usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
fi
fi
-
diff --git a/network/rekonq/rekonq-CVE-2010-2536-fix.patch b/network/rekonq/rekonq-CVE-2010-2536-fix.patch
deleted file mode 100644
index c9dce8e357..0000000000
--- a/network/rekonq/rekonq-CVE-2010-2536-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/webpage.cpp b/src/webpage.cpp
-index a63940b..ea2add6 100644
---- a/src/webpage.cpp
-+++ b/src/webpage.cpp
-@@ -577,8 +577,8 @@ QString WebPage::errorPage(QNetworkReply *reply)
- return QString("Couldn't open the rekonqinfo.html file");
- }
-
-- QString title = i18n("Error loading: %1", reply->url().toString());
-- QString urlString = reply->url().toString(QUrl::RemoveUserInfo | QUrl::RemoveQuery);
-+ QString title = i18n("There was a problem while loading the page");
-+ QString urlString = reply->url().toString(QUrl::RemoveUserInfo | QUrl::RemoveQuery | QUrl::RemovePath);
-
- QString iconPath = QString("file://") + KIconLoader::global()->iconPath("dialog-warning" , KIconLoader::Small);
- iconPath.replace(QL1S("16"), QL1S("128"));
-
diff --git a/network/rekonq/rekonq.SlackBuild b/network/rekonq/rekonq.SlackBuild
index f5435663b0..3af7f841fe 100644
--- a/network/rekonq/rekonq.SlackBuild
+++ b/network/rekonq/rekonq.SlackBuild
@@ -5,8 +5,8 @@
# Written by Branko Grubic <branko.grubic@gmail.com>
PRGNAM=rekonq
-VERSION=${VERSION:-0.5.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.7.0}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -51,18 +51,15 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-## patch to fix Multiple cross-site scripting (XSS) vulnerabilities (CVE-2010-2536)
-patch -p1 <$CWD/rekonq-CVE-2010-2536-fix.patch
-
mkdir -p build
cd build
cmake .. \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DCMAKE_BUILD_TYPE=Release
- make
+ make
make install DESTDIR=$PKG
cd ..
diff --git a/network/rekonq/rekonq.info b/network/rekonq/rekonq.info
index 2629986a3d..a1ba0b721f 100644
--- a/network/rekonq/rekonq.info
+++ b/network/rekonq/rekonq.info
@@ -1,10 +1,10 @@
PRGNAM="rekonq"
-VERSION="0.5.0"
-HOMEPAGE="http://rekonq.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/rekonq/rekonq-0.5.0.tar.bz2"
-MD5SUM="ffa227236b9e4aa6cca6851cc05855fb"
+VERSION="0.7.0"
+HOMEPAGE="http://rekonq.kde.org/"
+DOWNLOAD="http://downloads.sourceforge.net/rekonq/rekonq-0.7.0.tar.bz2"
+MD5SUM="73de712f71ea4caf2e66a92c77505da8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Branko Grubic"
EMAIL="branko.grubic@gmail.com"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/network/rekonq/slack-desc b/network/rekonq/slack-desc
index bc9c3ecca3..3ca222d19d 100644
--- a/network/rekonq/slack-desc
+++ b/network/rekonq/slack-desc
@@ -8,9 +8,9 @@
|-----handy-ruler------------------------------------------------------|
rekonq: rekonq (KDE browser based on Webkit)
rekonq:
-rekonq: rekonq is a KDE browser based on Webkit. Its code is based on
-rekonq: Nokia QtDemoBrowser, just like Arora. Its implementation is going
-rekonq: to embrace KDE technologies to have a full-featured KDE web browser.
+rekonq: rekonq is a KDE browser based on Webkit. Its code is based on
+rekonq: Nokia QtDemoBrowser, just like Arora. Its implementation is going
+rekonq: to embrace KDE technologies to have a full-featured KDE web browser.
rekonq:
rekonq:
rekonq: