[arch-commits] Commit in kwebkitpart/repos (10 files)
Felix Yan
fyan at archlinux.org
Thu Apr 28 16:04:48 UTC 2016
Date: Thursday, April 28, 2016 @ 18:04:47
Author: fyan
Revision: 266529
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kwebkitpart/repos/extra-i686/PKGBUILD
(from rev 266528, kwebkitpart/trunk/PKGBUILD)
kwebkitpart/repos/extra-i686/sanitize-input.patch
(from rev 266528, kwebkitpart/trunk/sanitize-input.patch)
kwebkitpart/repos/extra-x86_64/PKGBUILD
(from rev 266528, kwebkitpart/trunk/PKGBUILD)
kwebkitpart/repos/extra-x86_64/sanitize-input.patch
(from rev 266528, kwebkitpart/trunk/sanitize-input.patch)
Deleted:
kwebkitpart/repos/extra-i686/PKGBUILD
kwebkitpart/repos/extra-i686/kwebkitpart.install
kwebkitpart/repos/extra-i686/sanitize-input.patch
kwebkitpart/repos/extra-x86_64/PKGBUILD
kwebkitpart/repos/extra-x86_64/kwebkitpart.install
kwebkitpart/repos/extra-x86_64/sanitize-input.patch
-----------------------------------+
/PKGBUILD | 78 +++++++++++++++++++++++++++++++
/sanitize-input.patch | 90 ++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 40 ----------------
extra-i686/kwebkitpart.install | 11 ----
extra-i686/sanitize-input.patch | 45 ------------------
extra-x86_64/PKGBUILD | 40 ----------------
extra-x86_64/kwebkitpart.install | 11 ----
extra-x86_64/sanitize-input.patch | 45 ------------------
8 files changed, 168 insertions(+), 192 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-04-28 16:03:53 UTC (rev 266528)
+++ extra-i686/PKGBUILD 2016-04-28 16:04:47 UTC (rev 266529)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kwebkitpart
-pkgver=1.3.4
-pkgrel=4
-pkgdesc="A WebKit browser component for KDE"
-url="https://projects.kde.org/projects/extragear/base/kwebkitpart/"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-# Generate using kde releaseme scripts
-source=("https://sources.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz"
- 'sanitize-input.patch')
-md5sums=('0a3e176a7c24f00e22c92a7b105585f8'
- 'f9ae9520069ffac4c5da1f408fd4bbdf')
-
-prepare() {
- mkdir build
-
- cd ${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}"/sanitize-input.patch
-
- sed -i '/add_subdirectory(kdelauncher)/d' CMakeLists.txt
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: kwebkitpart/repos/extra-i686/PKGBUILD (from rev 266528, kwebkitpart/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-04-28 16:04:47 UTC (rev 266529)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kwebkitpart
+pkgver=1.3.4
+pkgrel=5
+pkgdesc="A WebKit browser component for KDE"
+url="https://projects.kde.org/projects/extragear/base/kwebkitpart/"
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+# Generate using kde releaseme scripts
+source=("https://sources.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+ 'sanitize-input.patch')
+md5sums=('0a3e176a7c24f00e22c92a7b105585f8'
+ 'f9ae9520069ffac4c5da1f408fd4bbdf')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/sanitize-input.patch
+
+ sed -i '/add_subdirectory(kdelauncher)/d' CMakeLists.txt
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/kwebkitpart.install
===================================================================
--- extra-i686/kwebkitpart.install 2016-04-28 16:03:53 UTC (rev 266528)
+++ extra-i686/kwebkitpart.install 2016-04-28 16:04:47 UTC (rev 266529)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Deleted: extra-i686/sanitize-input.patch
===================================================================
--- extra-i686/sanitize-input.patch 2016-04-28 16:03:53 UTC (rev 266528)
+++ extra-i686/sanitize-input.patch 2016-04-28 16:04:47 UTC (rev 266529)
@@ -1,45 +0,0 @@
-From: Albert Astals Cid <aacid at kde.org>
-Date: Thu, 13 Nov 2014 14:06:01 +0000
-Subject: Sanitize html
-X-Git-Url: http://quickgit.kde.org/?p=kwebkitpart.git&a=commitdiff&h=641aa7c75631084260ae89aecbdb625e918c6689
----
-Sanitize html
-
-As discussed by the security team
----
-
-
---- a/src/webpage.cpp
-+++ b/src/webpage.cpp
-@@ -226,23 +226,26 @@
- doc += QL1S( "<h3>" );
- doc += i18n( "Details of the Request:" );
- doc += QL1S( "</h3><ul><li>" );
-- doc += i18n( "URL: %1", reqUrl.url() );
-+ // escape URL twice: once for i18n, and once for HTML.
-+ doc += i18n( "URL: %1", Qt::escape( Qt::escape( reqUrl.prettyUrl() ) ) );
- doc += QL1S( "</li><li>" );
-
- const QString protocol (reqUrl.protocol());
- if ( !protocol.isNull() ) {
-- doc += i18n( "Protocol: %1", protocol );
-+ // escape protocol twice: once for i18n, and once for HTML.
-+ doc += i18n( "Protocol: %1", Qt::escape( Qt::escape( protocol ) ) );
- doc += QL1S( "</li><li>" );
- }
-
- doc += i18n( "Date and Time: %1",
- KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), KLocale::LongDate) );
- doc += QL1S( "</li><li>" );
-- doc += i18n( "Additional Information: %1" , text );
-+ // escape text twice: once for i18n, and once for HTML.
-+ doc += i18n( "Additional Information: %1", Qt::escape( Qt::escape( text ) ) );
- doc += QL1S( "</li></ul><h3>" );
- doc += i18n( "Description:" );
- doc += QL1S( "</h3><p>" );
-- doc += description;
-+ doc += Qt::escape( description );
- doc += QL1S( "</p>" );
-
- if ( causes.count() ) {
-
Copied: kwebkitpart/repos/extra-i686/sanitize-input.patch (from rev 266528, kwebkitpart/trunk/sanitize-input.patch)
===================================================================
--- extra-i686/sanitize-input.patch (rev 0)
+++ extra-i686/sanitize-input.patch 2016-04-28 16:04:47 UTC (rev 266529)
@@ -0,0 +1,45 @@
+From: Albert Astals Cid <aacid at kde.org>
+Date: Thu, 13 Nov 2014 14:06:01 +0000
+Subject: Sanitize html
+X-Git-Url: http://quickgit.kde.org/?p=kwebkitpart.git&a=commitdiff&h=641aa7c75631084260ae89aecbdb625e918c6689
+---
+Sanitize html
+
+As discussed by the security team
+---
+
+
+--- a/src/webpage.cpp
++++ b/src/webpage.cpp
+@@ -226,23 +226,26 @@
+ doc += QL1S( "<h3>" );
+ doc += i18n( "Details of the Request:" );
+ doc += QL1S( "</h3><ul><li>" );
+- doc += i18n( "URL: %1", reqUrl.url() );
++ // escape URL twice: once for i18n, and once for HTML.
++ doc += i18n( "URL: %1", Qt::escape( Qt::escape( reqUrl.prettyUrl() ) ) );
+ doc += QL1S( "</li><li>" );
+
+ const QString protocol (reqUrl.protocol());
+ if ( !protocol.isNull() ) {
+- doc += i18n( "Protocol: %1", protocol );
++ // escape protocol twice: once for i18n, and once for HTML.
++ doc += i18n( "Protocol: %1", Qt::escape( Qt::escape( protocol ) ) );
+ doc += QL1S( "</li><li>" );
+ }
+
+ doc += i18n( "Date and Time: %1",
+ KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), KLocale::LongDate) );
+ doc += QL1S( "</li><li>" );
+- doc += i18n( "Additional Information: %1" , text );
++ // escape text twice: once for i18n, and once for HTML.
++ doc += i18n( "Additional Information: %1", Qt::escape( Qt::escape( text ) ) );
+ doc += QL1S( "</li></ul><h3>" );
+ doc += i18n( "Description:" );
+ doc += QL1S( "</h3><p>" );
+- doc += description;
++ doc += Qt::escape( description );
+ doc += QL1S( "</p>" );
+
+ if ( causes.count() ) {
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-04-28 16:03:53 UTC (rev 266528)
+++ extra-x86_64/PKGBUILD 2016-04-28 16:04:47 UTC (rev 266529)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kwebkitpart
-pkgver=1.3.4
-pkgrel=4
-pkgdesc="A WebKit browser component for KDE"
-url="https://projects.kde.org/projects/extragear/base/kwebkitpart/"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-# Generate using kde releaseme scripts
-source=("https://sources.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz"
- 'sanitize-input.patch')
-md5sums=('0a3e176a7c24f00e22c92a7b105585f8'
- 'f9ae9520069ffac4c5da1f408fd4bbdf')
-
-prepare() {
- mkdir build
-
- cd ${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}"/sanitize-input.patch
-
- sed -i '/add_subdirectory(kdelauncher)/d' CMakeLists.txt
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: kwebkitpart/repos/extra-x86_64/PKGBUILD (from rev 266528, kwebkitpart/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-04-28 16:04:47 UTC (rev 266529)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kwebkitpart
+pkgver=1.3.4
+pkgrel=5
+pkgdesc="A WebKit browser component for KDE"
+url="https://projects.kde.org/projects/extragear/base/kwebkitpart/"
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+# Generate using kde releaseme scripts
+source=("https://sources.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+ 'sanitize-input.patch')
+md5sums=('0a3e176a7c24f00e22c92a7b105585f8'
+ 'f9ae9520069ffac4c5da1f408fd4bbdf')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/sanitize-input.patch
+
+ sed -i '/add_subdirectory(kdelauncher)/d' CMakeLists.txt
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/kwebkitpart.install
===================================================================
--- extra-x86_64/kwebkitpart.install 2016-04-28 16:03:53 UTC (rev 266528)
+++ extra-x86_64/kwebkitpart.install 2016-04-28 16:04:47 UTC (rev 266529)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Deleted: extra-x86_64/sanitize-input.patch
===================================================================
--- extra-x86_64/sanitize-input.patch 2016-04-28 16:03:53 UTC (rev 266528)
+++ extra-x86_64/sanitize-input.patch 2016-04-28 16:04:47 UTC (rev 266529)
@@ -1,45 +0,0 @@
-From: Albert Astals Cid <aacid at kde.org>
-Date: Thu, 13 Nov 2014 14:06:01 +0000
-Subject: Sanitize html
-X-Git-Url: http://quickgit.kde.org/?p=kwebkitpart.git&a=commitdiff&h=641aa7c75631084260ae89aecbdb625e918c6689
----
-Sanitize html
-
-As discussed by the security team
----
-
-
---- a/src/webpage.cpp
-+++ b/src/webpage.cpp
-@@ -226,23 +226,26 @@
- doc += QL1S( "<h3>" );
- doc += i18n( "Details of the Request:" );
- doc += QL1S( "</h3><ul><li>" );
-- doc += i18n( "URL: %1", reqUrl.url() );
-+ // escape URL twice: once for i18n, and once for HTML.
-+ doc += i18n( "URL: %1", Qt::escape( Qt::escape( reqUrl.prettyUrl() ) ) );
- doc += QL1S( "</li><li>" );
-
- const QString protocol (reqUrl.protocol());
- if ( !protocol.isNull() ) {
-- doc += i18n( "Protocol: %1", protocol );
-+ // escape protocol twice: once for i18n, and once for HTML.
-+ doc += i18n( "Protocol: %1", Qt::escape( Qt::escape( protocol ) ) );
- doc += QL1S( "</li><li>" );
- }
-
- doc += i18n( "Date and Time: %1",
- KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), KLocale::LongDate) );
- doc += QL1S( "</li><li>" );
-- doc += i18n( "Additional Information: %1" , text );
-+ // escape text twice: once for i18n, and once for HTML.
-+ doc += i18n( "Additional Information: %1", Qt::escape( Qt::escape( text ) ) );
- doc += QL1S( "</li></ul><h3>" );
- doc += i18n( "Description:" );
- doc += QL1S( "</h3><p>" );
-- doc += description;
-+ doc += Qt::escape( description );
- doc += QL1S( "</p>" );
-
- if ( causes.count() ) {
-
Copied: kwebkitpart/repos/extra-x86_64/sanitize-input.patch (from rev 266528, kwebkitpart/trunk/sanitize-input.patch)
===================================================================
--- extra-x86_64/sanitize-input.patch (rev 0)
+++ extra-x86_64/sanitize-input.patch 2016-04-28 16:04:47 UTC (rev 266529)
@@ -0,0 +1,45 @@
+From: Albert Astals Cid <aacid at kde.org>
+Date: Thu, 13 Nov 2014 14:06:01 +0000
+Subject: Sanitize html
+X-Git-Url: http://quickgit.kde.org/?p=kwebkitpart.git&a=commitdiff&h=641aa7c75631084260ae89aecbdb625e918c6689
+---
+Sanitize html
+
+As discussed by the security team
+---
+
+
+--- a/src/webpage.cpp
++++ b/src/webpage.cpp
+@@ -226,23 +226,26 @@
+ doc += QL1S( "<h3>" );
+ doc += i18n( "Details of the Request:" );
+ doc += QL1S( "</h3><ul><li>" );
+- doc += i18n( "URL: %1", reqUrl.url() );
++ // escape URL twice: once for i18n, and once for HTML.
++ doc += i18n( "URL: %1", Qt::escape( Qt::escape( reqUrl.prettyUrl() ) ) );
+ doc += QL1S( "</li><li>" );
+
+ const QString protocol (reqUrl.protocol());
+ if ( !protocol.isNull() ) {
+- doc += i18n( "Protocol: %1", protocol );
++ // escape protocol twice: once for i18n, and once for HTML.
++ doc += i18n( "Protocol: %1", Qt::escape( Qt::escape( protocol ) ) );
+ doc += QL1S( "</li><li>" );
+ }
+
+ doc += i18n( "Date and Time: %1",
+ KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), KLocale::LongDate) );
+ doc += QL1S( "</li><li>" );
+- doc += i18n( "Additional Information: %1" , text );
++ // escape text twice: once for i18n, and once for HTML.
++ doc += i18n( "Additional Information: %1", Qt::escape( Qt::escape( text ) ) );
+ doc += QL1S( "</li></ul><h3>" );
+ doc += i18n( "Description:" );
+ doc += QL1S( "</h3><p>" );
+- doc += description;
++ doc += Qt::escape( description );
+ doc += QL1S( "</p>" );
+
+ if ( causes.count() ) {
+
More information about the arch-commits
mailing list