[arch-commits] Commit in kdelibs/repos/extra-x86_64 (13 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Fri May 10 17:29:02 UTC 2013
Date: Friday, May 10, 2013 @ 19:29:02
Author: andrea
Revision: 185048
archrelease: copy trunk to extra-x86_64
Added:
kdelibs/repos/extra-x86_64/PKGBUILD
(from rev 185047, kdelibs/trunk/PKGBUILD)
kdelibs/repos/extra-x86_64/archlinux-menu.patch
(from rev 185047, kdelibs/trunk/archlinux-menu.patch)
kdelibs/repos/extra-x86_64/fix-xfreepixmap-call.patch
(from rev 185047, kdelibs/trunk/fix-xfreepixmap-call.patch)
kdelibs/repos/extra-x86_64/kde-applications-menu.patch
(from rev 185047, kdelibs/trunk/kde-applications-menu.patch)
kdelibs/repos/extra-x86_64/kdelibs.install
(from rev 185047, kdelibs/trunk/kdelibs.install)
kdelibs/repos/extra-x86_64/qt4.patch
(from rev 185047, kdelibs/trunk/qt4.patch)
kdelibs/repos/extra-x86_64/security-fix.patch
(from rev 185047, kdelibs/trunk/security-fix.patch)
Deleted:
kdelibs/repos/extra-x86_64/PKGBUILD
kdelibs/repos/extra-x86_64/archlinux-menu.patch
kdelibs/repos/extra-x86_64/kde-applications-menu.patch
kdelibs/repos/extra-x86_64/kdelibs.install
kdelibs/repos/extra-x86_64/qt4.patch
kdelibs/repos/extra-x86_64/security-fix.patch
-----------------------------+
PKGBUILD | 138 +++++++++++++++++++++---------------------
archlinux-menu.patch | 44 ++++++-------
fix-xfreepixmap-call.patch | 24 +++++++
kde-applications-menu.patch | 44 ++++++-------
kdelibs.install | 26 +++----
qt4.patch | 22 +++---
security-fix.patch | 64 +++++++++----------
7 files changed, 195 insertions(+), 167 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-10 17:09:39 UTC (rev 185047)
+++ PKGBUILD 2013-05-10 17:29:02 UTC (rev 185048)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.10.3
-pkgrel=2
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kdelibs'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
- 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
- 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
- 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon'
- 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
- 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch'
- 'security-fix.patch')
-sha1sums=('aa154998e227121be82f5b04442e908e7dece01b'
- '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'ed1f57ee661e5c7440efcaba7e51d2554709701c'
- '506562009a667f18481be0d2c5035b181fce38bb')
-
-build() {
- cd ${pkgname}-${pkgver}
- # avoid file conflict with gnome-menus
- patch -p1 -i "${srcdir}"/kde-applications-menu.patch
- # add Archlinux menu entry
- patch -p1 -i "${srcdir}"/archlinux-menu.patch
- # qmake refers to Qt5
- patch -p1 -i "${srcdir}"/qt4.patch
-
- # KDEBUG#319428
- patch -p1 -i "${srcdir}"/security-fix.patch
-
- cd ../
-
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_SKIP_RPATH=ON \
- -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
- -DKDE_DEFAULT_HOME='.kde4' \
- -DWITH_FAM=OFF \
- -DWITH_HUpnp=OFF \
- -DWITH_SOLID_UDISKS2=ON
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- # cert bundle seems to be hardcoded
- # link it to the one from ca-certificates
- rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
- ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-}
Copied: kdelibs/repos/extra-x86_64/PKGBUILD (from rev 185047, kdelibs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-05-10 17:29:02 UTC (rev 185048)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.10.3
+pkgrel=3
+pkgdesc="KDE Core Libraries"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/kdelibs'
+license=('GPL' 'LGPL' 'FDL')
+depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
+ 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
+ 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
+ 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon'
+ 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
+ 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch'
+ 'security-fix.patch'
+ 'fix-xfreepixmap-call.patch')
+sha1sums=('aa154998e227121be82f5b04442e908e7dece01b'
+ '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+ '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+ 'ed1f57ee661e5c7440efcaba7e51d2554709701c'
+ '506562009a667f18481be0d2c5035b181fce38bb'
+ '556c5473219d8208ec920f46c08bf61fda5b60d9')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ # avoid file conflict with gnome-menus
+ patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+ # add Archlinux menu entry
+ patch -p1 -i "${srcdir}"/archlinux-menu.patch
+ # qmake refers to Qt5
+ patch -p1 -i "${srcdir}"/qt4.patch
+
+ # KDEBUG#319428
+ patch -p1 -i "${srcdir}"/security-fix.patch
+ # KDEBUG#319137
+ patch -p1 -i "${srcdir}"/fix-xfreepixmap-call.patch
+
+ cd ../
+
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
+ -DKDE_DEFAULT_HOME='.kde4' \
+ -DWITH_FAM=OFF \
+ -DWITH_HUpnp=OFF \
+ -DWITH_SOLID_UDISKS2=ON
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+
+ # cert bundle seems to be hardcoded
+ # link it to the one from ca-certificates
+ rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+ ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+}
Deleted: archlinux-menu.patch
===================================================================
--- archlinux-menu.patch 2013-05-10 17:09:39 UTC (rev 185047)
+++ archlinux-menu.patch 2013-05-10 17:29:02 UTC (rev 185048)
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000
-+++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000
-@@ -16,11 +16,19 @@
- </DefaultLayout>
- <Layout>
- <Merge type="menus"/>
-+ <Menuname>Arch Linux</Menuname>
- <Menuname>Applications</Menuname>
- <Merge type="files"/>
- </Layout>
-
- <Menu>
-+ <Name>Arch Linux</Name>
-+ <Directory>Archlinux.directory</Directory>
-+ <Include>
-+ <Category>Archlinux</Category>
-+ </Include>
-+ </Menu>
-+ <Menu>
- <Name>Applications</Name>
- <Directory>kde-unknown.directory</Directory>
- <OnlyUnallocated/>
Copied: kdelibs/repos/extra-x86_64/archlinux-menu.patch (from rev 185047, kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- archlinux-menu.patch (rev 0)
+++ archlinux-menu.patch 2013-05-10 17:29:02 UTC (rev 185048)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000
++++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000
+@@ -16,11 +16,19 @@
+ </DefaultLayout>
+ <Layout>
+ <Merge type="menus"/>
++ <Menuname>Arch Linux</Menuname>
+ <Menuname>Applications</Menuname>
+ <Merge type="files"/>
+ </Layout>
+
+ <Menu>
++ <Name>Arch Linux</Name>
++ <Directory>Archlinux.directory</Directory>
++ <Include>
++ <Category>Archlinux</Category>
++ </Include>
++ </Menu>
++ <Menu>
+ <Name>Applications</Name>
+ <Directory>kde-unknown.directory</Directory>
+ <OnlyUnallocated/>
Copied: kdelibs/repos/extra-x86_64/fix-xfreepixmap-call.patch (from rev 185047, kdelibs/trunk/fix-xfreepixmap-call.patch)
===================================================================
--- fix-xfreepixmap-call.patch (rev 0)
+++ fix-xfreepixmap-call.patch 2013-05-10 17:29:02 UTC (rev 185048)
@@ -0,0 +1,24 @@
+commit 9323adac35d40da69e3cb18504340e984c4afd05
+Author: Anne-Marie Mahfouf <annma at kde.org>
+Date: Fri May 10 17:12:33 2013 +0200
+
+ Fix crash when quitting apps
+
+ Backport to 4.10 branch
+
+ CCBUG: 319137
+
+diff --git a/plasma/private/dialogshadows.cpp b/plasma/private/dialogshadows.cpp
+index b54fb1a..1925670 100644
+--- a/plasma/private/dialogshadows.cpp
++++ b/plasma/private/dialogshadows.cpp
+@@ -336,6 +336,9 @@ void DialogShadows::Private::freeX11Pixmaps()
+ {
+ #ifdef Q_WS_X11
+ foreach (const QPixmap &pixmap, m_shadowPixmaps) {
++ if (!QX11Info::display()) {
++ return;
++ }
+ if (!pixmap.isNull()) {
+ XFreePixmap(QX11Info::display(), pixmap.handle());
+ }
Deleted: kde-applications-menu.patch
===================================================================
--- kde-applications-menu.patch 2013-05-10 17:09:39 UTC (rev 185047)
+++ kde-applications-menu.patch 2013-05-10 17:29:02 UTC (rev 185048)
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000
-@@ -302,7 +302,7 @@
- if (!m_trackId.isEmpty())
- g_vfolder->setTrackId(m_trackId);
-
-- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
-
- KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
- entry->setLayoutInfo(kdeMenu->layoutList);
Copied: kdelibs/repos/extra-x86_64/kde-applications-menu.patch (from rev 185047, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- kde-applications-menu.patch (rev 0)
+++ kde-applications-menu.patch 2013-05-10 17:29:02 UTC (rev 185048)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000
++++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000
+@@ -69,7 +69,7 @@
+ if (WIN32)
+ install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
+ else (WIN32)
+-install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
+ endif (WIN32)
+ install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+--- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000
++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000
+@@ -302,7 +302,7 @@
+ if (!m_trackId.isEmpty())
+ g_vfolder->setTrackId(m_trackId);
+
+- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
+
+ KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
+ entry->setLayoutInfo(kdeMenu->layoutList);
Deleted: kdelibs.install
===================================================================
--- kdelibs.install 2013-05-10 17:09:39 UTC (rev 185047)
+++ kdelibs.install 2013-05-10 17:29:02 UTC (rev 185048)
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kdelibs/repos/extra-x86_64/kdelibs.install (from rev 185047, kdelibs/trunk/kdelibs.install)
===================================================================
--- kdelibs.install (rev 0)
+++ kdelibs.install 2013-05-10 17:29:02 UTC (rev 185048)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: qt4.patch
===================================================================
--- qt4.patch 2013-05-10 17:09:39 UTC (rev 185047)
+++ qt4.patch 2013-05-10 17:29:02 UTC (rev 185048)
@@ -1,11 +0,0 @@
---- kdelibs-4.10.1/cmake/modules/FindQt4.cmake~ 2013-03-07 16:57:29.735552097 +0000
-+++ kdelibs-4.10.1/cmake/modules/FindQt4.cmake 2013-03-07 16:57:52.038725421 +0000
-@@ -446,7 +446,7 @@
- # check for qmake
- # Debian uses qmake-qt4
- # macports' Qt uses qmake-mac
--FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
-+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
Copied: kdelibs/repos/extra-x86_64/qt4.patch (from rev 185047, kdelibs/trunk/qt4.patch)
===================================================================
--- qt4.patch (rev 0)
+++ qt4.patch 2013-05-10 17:29:02 UTC (rev 185048)
@@ -0,0 +1,11 @@
+--- kdelibs-4.10.1/cmake/modules/FindQt4.cmake~ 2013-03-07 16:57:29.735552097 +0000
++++ kdelibs-4.10.1/cmake/modules/FindQt4.cmake 2013-03-07 16:57:52.038725421 +0000
+@@ -446,7 +446,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
Deleted: security-fix.patch
===================================================================
--- security-fix.patch 2013-05-10 17:09:39 UTC (rev 185047)
+++ security-fix.patch 2013-05-10 17:29:02 UTC (rev 185048)
@@ -1,32 +0,0 @@
-commit 65d736dab592bced4410ccfa4699de89f78c96ca
-Author: Grégory Oestreicher <greg at kamago.net>
-Date: Wed May 8 23:16:00 2013 +0200
-
- Don't show passwords contained in HTTP URLs in error messages
- BUG: 319428
-
-diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
-index 2d139a9..129fc7b 100644
---- a/kioslave/http/http.cpp
-+++ b/kioslave/http/http.cpp
-@@ -3056,7 +3056,7 @@ try_again:
- ; // Ignore error
- } else {
- if (!sendErrorPageNotification()) {
-- error(ERR_INTERNAL_SERVER, m_request.url.url());
-+ error(ERR_INTERNAL_SERVER, m_request.url.prettyUrl());
- return false;
- }
- }
-@@ -3072,9 +3072,9 @@ try_again:
- // Tell that we will only get an error page here.
- if (!sendErrorPageNotification()) {
- if (m_request.responseCode == 403)
-- error(ERR_ACCESS_DENIED, m_request.url.url());
-+ error(ERR_ACCESS_DENIED, m_request.url.prettyUrl());
- else
-- error(ERR_DOES_NOT_EXIST, m_request.url.url());
-+ error(ERR_DOES_NOT_EXIST, m_request.url.prettyUrl());
- return false;
- }
- } else if (m_request.responseCode >= 301 && m_request.responseCode<= 303) {
Copied: kdelibs/repos/extra-x86_64/security-fix.patch (from rev 185047, kdelibs/trunk/security-fix.patch)
===================================================================
--- security-fix.patch (rev 0)
+++ security-fix.patch 2013-05-10 17:29:02 UTC (rev 185048)
@@ -0,0 +1,32 @@
+commit 65d736dab592bced4410ccfa4699de89f78c96ca
+Author: Grégory Oestreicher <greg at kamago.net>
+Date: Wed May 8 23:16:00 2013 +0200
+
+ Don't show passwords contained in HTTP URLs in error messages
+ BUG: 319428
+
+diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
+index 2d139a9..129fc7b 100644
+--- a/kioslave/http/http.cpp
++++ b/kioslave/http/http.cpp
+@@ -3056,7 +3056,7 @@ try_again:
+ ; // Ignore error
+ } else {
+ if (!sendErrorPageNotification()) {
+- error(ERR_INTERNAL_SERVER, m_request.url.url());
++ error(ERR_INTERNAL_SERVER, m_request.url.prettyUrl());
+ return false;
+ }
+ }
+@@ -3072,9 +3072,9 @@ try_again:
+ // Tell that we will only get an error page here.
+ if (!sendErrorPageNotification()) {
+ if (m_request.responseCode == 403)
+- error(ERR_ACCESS_DENIED, m_request.url.url());
++ error(ERR_ACCESS_DENIED, m_request.url.prettyUrl());
+ else
+- error(ERR_DOES_NOT_EXIST, m_request.url.url());
++ error(ERR_DOES_NOT_EXIST, m_request.url.prettyUrl());
+ return false;
+ }
+ } else if (m_request.responseCode >= 301 && m_request.responseCode<= 303) {
More information about the arch-commits
mailing list