Date: Friday, July 25, 2014 @ 16:48:41 Author: svenstaro Revision: 217842
archrelease: copy kde-unstable to kde-unstable-i686, kde-unstable-x86_64 Added: kdelibs/repos/kde-unstable-i686/ kdelibs/repos/kde-unstable-i686/PKGBUILD (from rev 217841, kdelibs/kde-unstable/PKGBUILD) kdelibs/repos/kde-unstable-i686/archlinux-menu.patch (from rev 217841, kdelibs/kde-unstable/archlinux-menu.patch) kdelibs/repos/kde-unstable-i686/kde-applications-menu.patch (from rev 217841, kdelibs/kde-unstable/kde-applications-menu.patch) kdelibs/repos/kde-unstable-i686/kdelibs.install (from rev 217841, kdelibs/kde-unstable/kdelibs.install) kdelibs/repos/kde-unstable-i686/pyqt.patch (from rev 217841, kdelibs/kde-unstable/pyqt.patch) kdelibs/repos/kde-unstable-i686/qt4.patch (from rev 217841, kdelibs/kde-unstable/qt4.patch) kdelibs/repos/kde-unstable-x86_64/ kdelibs/repos/kde-unstable-x86_64/PKGBUILD (from rev 217841, kdelibs/kde-unstable/PKGBUILD) kdelibs/repos/kde-unstable-x86_64/archlinux-menu.patch (from rev 217841, kdelibs/kde-unstable/archlinux-menu.patch) kdelibs/repos/kde-unstable-x86_64/kde-applications-menu.patch (from rev 217841, kdelibs/kde-unstable/kde-applications-menu.patch) kdelibs/repos/kde-unstable-x86_64/kdelibs.install (from rev 217841, kdelibs/kde-unstable/kdelibs.install) kdelibs/repos/kde-unstable-x86_64/pyqt.patch (from rev 217841, kdelibs/kde-unstable/pyqt.patch) kdelibs/repos/kde-unstable-x86_64/qt4.patch (from rev 217841, kdelibs/kde-unstable/qt4.patch) -------------------------------------------------+ kde-unstable-i686/PKGBUILD | 60 ++++++++ kde-unstable-i686/archlinux-menu.patch | 22 +++ kde-unstable-i686/kde-applications-menu.patch | 22 +++ kde-unstable-i686/kdelibs.install | 13 + kde-unstable-i686/pyqt.patch | 161 ++++++++++++++++++++++ kde-unstable-i686/qt4.patch | 11 + kde-unstable-x86_64/PKGBUILD | 60 ++++++++ kde-unstable-x86_64/archlinux-menu.patch | 22 +++ kde-unstable-x86_64/kde-applications-menu.patch | 22 +++ kde-unstable-x86_64/kdelibs.install | 13 + kde-unstable-x86_64/pyqt.patch | 161 ++++++++++++++++++++++ kde-unstable-x86_64/qt4.patch | 11 + 12 files changed, 578 insertions(+) Copied: kdelibs/repos/kde-unstable-i686/PKGBUILD (from rev 217841, kdelibs/kde-unstable/PKGBUILD) =================================================================== --- kde-unstable-i686/PKGBUILD (rev 0) +++ kde-unstable-i686/PKGBUILD 2014-07-25 14:48:41 UTC (rev 217842) @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=kdelibs +pkgver=4.13.95 +pkgrel=1 +pkgdesc="KDE Core Libraries" +arch=('i686' 'x86_64') +url='https://projects.kde.org/projects/kde/kdelibs' +license=('GPL' 'LGPL' 'FDL') +depends=('attica' 'libxss' 'krb5' 'grantlee' 'qca' 'libdbusmenu-qt' 'polkit-qt' + 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi' + 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4' + 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'icu') +makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" + 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch') +sha1sums=('f869fb030d637cd8dcc85dcaedb3d973a0f35a20' + '86ee8c8660f19de8141ac99cd6943964d97a1ed7' + '63a850ab4196b9d06934f2b4a13acd9f7739bc67' + 'ed1f57ee661e5c7440efcaba7e51d2554709701c') + +prepare() { + mkdir 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 +} + +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_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/kde-unstable-i686/archlinux-menu.patch (from rev 217841, kdelibs/kde-unstable/archlinux-menu.patch) =================================================================== --- kde-unstable-i686/archlinux-menu.patch (rev 0) +++ kde-unstable-i686/archlinux-menu.patch 2014-07-25 14:48:41 UTC (rev 217842) @@ -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/kde-unstable-i686/kde-applications-menu.patch (from rev 217841, kdelibs/kde-unstable/kde-applications-menu.patch) =================================================================== --- kde-unstable-i686/kde-applications-menu.patch (rev 0) +++ kde-unstable-i686/kde-applications-menu.patch 2014-07-25 14:48:41 UTC (rev 217842) @@ -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); Copied: kdelibs/repos/kde-unstable-i686/kdelibs.install (from rev 217841, kdelibs/kde-unstable/kdelibs.install) =================================================================== --- kde-unstable-i686/kdelibs.install (rev 0) +++ kde-unstable-i686/kdelibs.install 2014-07-25 14:48:41 UTC (rev 217842) @@ -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 +} Copied: kdelibs/repos/kde-unstable-i686/pyqt.patch (from rev 217841, kdelibs/kde-unstable/pyqt.patch) =================================================================== --- kde-unstable-i686/pyqt.patch (rev 0) +++ kde-unstable-i686/pyqt.patch 2014-07-25 14:48:41 UTC (rev 217842) @@ -0,0 +1,161 @@ +From: Raphael Kubo da Costa <rak...@freebsd.org> +Date: Wed, 16 Jul 2014 19:29:40 +0000 +Subject: Make FindPyQt4 work with PyQt's new build system. +X-Git-Tag: v4.13.90 +X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=a7e47438d4e3469dc9df70d613826cb360fc8d19 +--- +Make FindPyQt4 work with PyQt's new build system. + +Since PyQt 4.10, PyQt.pyqtconfig is deprecated and not available unless +PyQt is built using the old configure script. + +There is no direct replacement for it, as PyQt's new build system does +not provide as much information as before by design. Luckily, most of +the variables we are interested in can be obtained from PyQt's QtCore +module itself even if its old build system is used. + +The only exception is pyqt_sip_dir, which cannot be determined at all if +pyqtconfig is not available. In this case, the most we can do is guess +the default path like QScintilla2 does, and fail if it does not exist. +The user then needs to specify it manually via CMake with something like +-DPYQT4_SIP_DIR=/usr/share/sip/PyQt4. To this effect, all variables set +by FindPyQt4.cmake have been made cache variables, which means their +values can be overriden by the user, thus ignoring the contents read via +FindPyQt.py. + +BUG: 337462 +FIXED-IN: 4.14.0 +REVIEW: 119302 +--- + + +--- a/cmake/modules/FindPyQt4.cmake ++++ b/cmake/modules/FindPyQt4.cmake +@@ -9,16 +9,20 @@ + # Find the installed version of PyQt4. FindPyQt4 should only be called after + # Python has been found. + # +-# This file defines the following variables: ++# This file defines the following variables, which can also be overriden by ++# users: + # + # PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number + # suitable for comparison as a string + # + # PYQT4_VERSION_STR - The version of PyQt4 as a human readable string. + # +-# PYQT4_VERSION_TAG - The PyQt version tag using by PyQt's sip files. ++# PYQT4_VERSION_TAG - The Qt4 version tag used by PyQt's sip files. + # +-# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. ++# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. This can be unset ++# if PyQt4 was built using its new build system and pyqtconfig.py is not ++# present on the system, as in this case its value cannot be determined ++# automatically. + # + # PYQT4_SIP_FLAGS - The SIP flags used to build PyQt. + +@@ -31,13 +35,27 @@ + + EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt_py} OUTPUT_VARIABLE pyqt_config) + IF(pyqt_config) +- STRING(REGEX REPLACE "^pyqt_version:([^\n]+).*$" "\\1" PYQT4_VERSION ${pyqt_config}) +- STRING(REGEX REPLACE ".*\npyqt_version_str:([^\n]+).*$" "\\1" PYQT4_VERSION_STR ${pyqt_config}) +- STRING(REGEX REPLACE ".*\npyqt_version_tag:([^\n]+).*$" "\\1" PYQT4_VERSION_TAG ${pyqt_config}) +- STRING(REGEX REPLACE ".*\npyqt_sip_dir:([^\n]+).*$" "\\1" PYQT4_SIP_DIR ${pyqt_config}) +- STRING(REGEX REPLACE ".*\npyqt_sip_flags:([^\n]+).*$" "\\1" PYQT4_SIP_FLAGS ${pyqt_config}) ++ STRING(REGEX MATCH "^pyqt_version:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_VERSION "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as a 6-digit hexadecimal number") + +- SET(PYQT4_FOUND TRUE) ++ STRING(REGEX MATCH ".*\npyqt_version_str:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_VERSION_STR "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as a human-readable string") ++ ++ STRING(REGEX MATCH ".*\npyqt_version_tag:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_VERSION_TAG "${CMAKE_MATCH_1}" CACHE STRING "The Qt4 version tag used by PyQt4's .sip files") ++ ++ STRING(REGEX MATCH ".*\npyqt_sip_dir:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_SIP_DIR "${CMAKE_MATCH_1}" CACHE FILEPATH "The base directory where PyQt4's .sip files are installed") ++ ++ STRING(REGEX MATCH ".*\npyqt_sip_flags:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_SIP_FLAGS "${CMAKE_MATCH_1}" CACHE STRING "The SIP flags used to build PyQt4") ++ ++ IF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") ++ MESSAGE(WARNING "The base directory where PyQt4's SIP files are installed could not be determined. This usually means PyQt4 was built with its new build system and pyqtconfig.py is not present.\n" ++ "Please set the PYQT4_SIP_DIR variable manually.") ++ ELSE(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") ++ SET(PYQT4_FOUND TRUE) ++ ENDIF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") + ENDIF(pyqt_config) + + IF(PYQT4_FOUND) + +--- kdelibs-4.13.3/cmake/modules/FindPyQt.py~ 2014-07-11 06:42:13.000000000 +0000 ++++ kdelibs-4.13.3/cmake/modules/FindPyQt.py 2014-07-18 13:04:32.070296111 +0000 +@@ -1,24 +1,49 @@ + # Copyright (c) 2007, Simon Edwards <si...@simonzone.com> ++# Copyright (c) 2014, Raphael Kubo da Costa <rak...@freebsd.org> + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +-import PyQt4.pyqtconfig ++import PyQt4.QtCore ++import os ++import sys + +-pyqtcfg = PyQt4.pyqtconfig.Configuration() +-print("pyqt_version:%06.0x" % pyqtcfg.pyqt_version) +-print("pyqt_version_str:%s" % pyqtcfg.pyqt_version_str) +- +-pyqt_version_tag = "" +-in_t = False +-for item in pyqtcfg.pyqt_sip_flags.split(' '): +- if item=="-t": +- in_t = True +- elif in_t: +- if item.startswith("Qt_4"): +- pyqt_version_tag = item ++def get_default_sip_dir(): ++ # This is based on QScintilla's configure.py, and only works for the ++ # default case where installation paths have not been changed in PyQt's ++ # configuration process. ++ if sys.platform == 'win32': ++ pyqt_sip_dir = os.path.join(sys.platform, 'sip', 'PyQt4') + else: +- in_t = False +-print("pyqt_version_tag:%s" % pyqt_version_tag) ++ pyqt_sip_dir = os.path.join(sys.platform, 'share', 'sip', 'PyQt4') ++ return pyqt_sip_dir ++ ++def get_qt4_tag(sip_flags): ++ in_t = False ++ for item in sip_flags.split(' '): ++ if item == '-t': ++ in_t = True ++ elif in_t: ++ if item.startswith('Qt_4'): ++ return item ++ else: ++ in_t = False ++ raise ValueError('Cannot find Qt\'s tag in PyQt4\'s SIP flags.') ++ ++if __name__ == '__main__': ++ try: ++ import PyQt4.pyqtconfig ++ pyqtcfg = PyQt4.pyqtconfig.Configuration() ++ sip_dir = pyqtcfg.pyqt_sip_dir ++ sip_flags = pyqtcfg.pyqt_sip_flags ++ except ImportError: ++ # PyQt4 >= 4.10.0 was built with configure-ng.py instead of ++ # configure.py, so pyqtconfig.py is not installed. ++ sip_dir = get_default_sip_dir() ++ sip_flags = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags'] ++ ++ print('pyqt_version:%06.x' % PyQt4.QtCore.PYQT_VERSION) ++ print('pyqt_version_str:%s' % PyQt4.QtCore.PYQT_VERSION_STR) ++ print('pyqt_version_tag:%s' % get_qt4_tag(sip_flags)) ++ print('pyqt_sip_dir:%s' % sip_dir) ++ print('pyqt_sip_flags:%s' % sip_flags) + +-print("pyqt_sip_dir:%s" % pyqtcfg.pyqt_sip_dir) +-print("pyqt_sip_flags:%s" % pyqtcfg.pyqt_sip_flags) Copied: kdelibs/repos/kde-unstable-i686/qt4.patch (from rev 217841, kdelibs/kde-unstable/qt4.patch) =================================================================== --- kde-unstable-i686/qt4.patch (rev 0) +++ kde-unstable-i686/qt4.patch 2014-07-25 14:48:41 UTC (rev 217842) @@ -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" Copied: kdelibs/repos/kde-unstable-x86_64/PKGBUILD (from rev 217841, kdelibs/kde-unstable/PKGBUILD) =================================================================== --- kde-unstable-x86_64/PKGBUILD (rev 0) +++ kde-unstable-x86_64/PKGBUILD 2014-07-25 14:48:41 UTC (rev 217842) @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=kdelibs +pkgver=4.13.95 +pkgrel=1 +pkgdesc="KDE Core Libraries" +arch=('i686' 'x86_64') +url='https://projects.kde.org/projects/kde/kdelibs' +license=('GPL' 'LGPL' 'FDL') +depends=('attica' 'libxss' 'krb5' 'grantlee' 'qca' 'libdbusmenu-qt' 'polkit-qt' + 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi' + 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4' + 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'icu') +makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" + 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch') +sha1sums=('f869fb030d637cd8dcc85dcaedb3d973a0f35a20' + '86ee8c8660f19de8141ac99cd6943964d97a1ed7' + '63a850ab4196b9d06934f2b4a13acd9f7739bc67' + 'ed1f57ee661e5c7440efcaba7e51d2554709701c') + +prepare() { + mkdir 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 +} + +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_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/kde-unstable-x86_64/archlinux-menu.patch (from rev 217841, kdelibs/kde-unstable/archlinux-menu.patch) =================================================================== --- kde-unstable-x86_64/archlinux-menu.patch (rev 0) +++ kde-unstable-x86_64/archlinux-menu.patch 2014-07-25 14:48:41 UTC (rev 217842) @@ -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/kde-unstable-x86_64/kde-applications-menu.patch (from rev 217841, kdelibs/kde-unstable/kde-applications-menu.patch) =================================================================== --- kde-unstable-x86_64/kde-applications-menu.patch (rev 0) +++ kde-unstable-x86_64/kde-applications-menu.patch 2014-07-25 14:48:41 UTC (rev 217842) @@ -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); Copied: kdelibs/repos/kde-unstable-x86_64/kdelibs.install (from rev 217841, kdelibs/kde-unstable/kdelibs.install) =================================================================== --- kde-unstable-x86_64/kdelibs.install (rev 0) +++ kde-unstable-x86_64/kdelibs.install 2014-07-25 14:48:41 UTC (rev 217842) @@ -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 +} Copied: kdelibs/repos/kde-unstable-x86_64/pyqt.patch (from rev 217841, kdelibs/kde-unstable/pyqt.patch) =================================================================== --- kde-unstable-x86_64/pyqt.patch (rev 0) +++ kde-unstable-x86_64/pyqt.patch 2014-07-25 14:48:41 UTC (rev 217842) @@ -0,0 +1,161 @@ +From: Raphael Kubo da Costa <rak...@freebsd.org> +Date: Wed, 16 Jul 2014 19:29:40 +0000 +Subject: Make FindPyQt4 work with PyQt's new build system. +X-Git-Tag: v4.13.90 +X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=a7e47438d4e3469dc9df70d613826cb360fc8d19 +--- +Make FindPyQt4 work with PyQt's new build system. + +Since PyQt 4.10, PyQt.pyqtconfig is deprecated and not available unless +PyQt is built using the old configure script. + +There is no direct replacement for it, as PyQt's new build system does +not provide as much information as before by design. Luckily, most of +the variables we are interested in can be obtained from PyQt's QtCore +module itself even if its old build system is used. + +The only exception is pyqt_sip_dir, which cannot be determined at all if +pyqtconfig is not available. In this case, the most we can do is guess +the default path like QScintilla2 does, and fail if it does not exist. +The user then needs to specify it manually via CMake with something like +-DPYQT4_SIP_DIR=/usr/share/sip/PyQt4. To this effect, all variables set +by FindPyQt4.cmake have been made cache variables, which means their +values can be overriden by the user, thus ignoring the contents read via +FindPyQt.py. + +BUG: 337462 +FIXED-IN: 4.14.0 +REVIEW: 119302 +--- + + +--- a/cmake/modules/FindPyQt4.cmake ++++ b/cmake/modules/FindPyQt4.cmake +@@ -9,16 +9,20 @@ + # Find the installed version of PyQt4. FindPyQt4 should only be called after + # Python has been found. + # +-# This file defines the following variables: ++# This file defines the following variables, which can also be overriden by ++# users: + # + # PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number + # suitable for comparison as a string + # + # PYQT4_VERSION_STR - The version of PyQt4 as a human readable string. + # +-# PYQT4_VERSION_TAG - The PyQt version tag using by PyQt's sip files. ++# PYQT4_VERSION_TAG - The Qt4 version tag used by PyQt's sip files. + # +-# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. ++# PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. This can be unset ++# if PyQt4 was built using its new build system and pyqtconfig.py is not ++# present on the system, as in this case its value cannot be determined ++# automatically. + # + # PYQT4_SIP_FLAGS - The SIP flags used to build PyQt. + +@@ -31,13 +35,27 @@ + + EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_pyqt_py} OUTPUT_VARIABLE pyqt_config) + IF(pyqt_config) +- STRING(REGEX REPLACE "^pyqt_version:([^\n]+).*$" "\\1" PYQT4_VERSION ${pyqt_config}) +- STRING(REGEX REPLACE ".*\npyqt_version_str:([^\n]+).*$" "\\1" PYQT4_VERSION_STR ${pyqt_config}) +- STRING(REGEX REPLACE ".*\npyqt_version_tag:([^\n]+).*$" "\\1" PYQT4_VERSION_TAG ${pyqt_config}) +- STRING(REGEX REPLACE ".*\npyqt_sip_dir:([^\n]+).*$" "\\1" PYQT4_SIP_DIR ${pyqt_config}) +- STRING(REGEX REPLACE ".*\npyqt_sip_flags:([^\n]+).*$" "\\1" PYQT4_SIP_FLAGS ${pyqt_config}) ++ STRING(REGEX MATCH "^pyqt_version:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_VERSION "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as a 6-digit hexadecimal number") + +- SET(PYQT4_FOUND TRUE) ++ STRING(REGEX MATCH ".*\npyqt_version_str:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_VERSION_STR "${CMAKE_MATCH_1}" CACHE STRING "PyQt4's version as a human-readable string") ++ ++ STRING(REGEX MATCH ".*\npyqt_version_tag:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_VERSION_TAG "${CMAKE_MATCH_1}" CACHE STRING "The Qt4 version tag used by PyQt4's .sip files") ++ ++ STRING(REGEX MATCH ".*\npyqt_sip_dir:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_SIP_DIR "${CMAKE_MATCH_1}" CACHE FILEPATH "The base directory where PyQt4's .sip files are installed") ++ ++ STRING(REGEX MATCH ".*\npyqt_sip_flags:([^\n]+).*$" _dummy ${pyqt_config}) ++ SET(PYQT4_SIP_FLAGS "${CMAKE_MATCH_1}" CACHE STRING "The SIP flags used to build PyQt4") ++ ++ IF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") ++ MESSAGE(WARNING "The base directory where PyQt4's SIP files are installed could not be determined. This usually means PyQt4 was built with its new build system and pyqtconfig.py is not present.\n" ++ "Please set the PYQT4_SIP_DIR variable manually.") ++ ELSE(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") ++ SET(PYQT4_FOUND TRUE) ++ ENDIF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") + ENDIF(pyqt_config) + + IF(PYQT4_FOUND) + +--- kdelibs-4.13.3/cmake/modules/FindPyQt.py~ 2014-07-11 06:42:13.000000000 +0000 ++++ kdelibs-4.13.3/cmake/modules/FindPyQt.py 2014-07-18 13:04:32.070296111 +0000 +@@ -1,24 +1,49 @@ + # Copyright (c) 2007, Simon Edwards <si...@simonzone.com> ++# Copyright (c) 2014, Raphael Kubo da Costa <rak...@freebsd.org> + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +-import PyQt4.pyqtconfig ++import PyQt4.QtCore ++import os ++import sys + +-pyqtcfg = PyQt4.pyqtconfig.Configuration() +-print("pyqt_version:%06.0x" % pyqtcfg.pyqt_version) +-print("pyqt_version_str:%s" % pyqtcfg.pyqt_version_str) +- +-pyqt_version_tag = "" +-in_t = False +-for item in pyqtcfg.pyqt_sip_flags.split(' '): +- if item=="-t": +- in_t = True +- elif in_t: +- if item.startswith("Qt_4"): +- pyqt_version_tag = item ++def get_default_sip_dir(): ++ # This is based on QScintilla's configure.py, and only works for the ++ # default case where installation paths have not been changed in PyQt's ++ # configuration process. ++ if sys.platform == 'win32': ++ pyqt_sip_dir = os.path.join(sys.platform, 'sip', 'PyQt4') + else: +- in_t = False +-print("pyqt_version_tag:%s" % pyqt_version_tag) ++ pyqt_sip_dir = os.path.join(sys.platform, 'share', 'sip', 'PyQt4') ++ return pyqt_sip_dir ++ ++def get_qt4_tag(sip_flags): ++ in_t = False ++ for item in sip_flags.split(' '): ++ if item == '-t': ++ in_t = True ++ elif in_t: ++ if item.startswith('Qt_4'): ++ return item ++ else: ++ in_t = False ++ raise ValueError('Cannot find Qt\'s tag in PyQt4\'s SIP flags.') ++ ++if __name__ == '__main__': ++ try: ++ import PyQt4.pyqtconfig ++ pyqtcfg = PyQt4.pyqtconfig.Configuration() ++ sip_dir = pyqtcfg.pyqt_sip_dir ++ sip_flags = pyqtcfg.pyqt_sip_flags ++ except ImportError: ++ # PyQt4 >= 4.10.0 was built with configure-ng.py instead of ++ # configure.py, so pyqtconfig.py is not installed. ++ sip_dir = get_default_sip_dir() ++ sip_flags = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags'] ++ ++ print('pyqt_version:%06.x' % PyQt4.QtCore.PYQT_VERSION) ++ print('pyqt_version_str:%s' % PyQt4.QtCore.PYQT_VERSION_STR) ++ print('pyqt_version_tag:%s' % get_qt4_tag(sip_flags)) ++ print('pyqt_sip_dir:%s' % sip_dir) ++ print('pyqt_sip_flags:%s' % sip_flags) + +-print("pyqt_sip_dir:%s" % pyqtcfg.pyqt_sip_dir) +-print("pyqt_sip_flags:%s" % pyqtcfg.pyqt_sip_flags) Copied: kdelibs/repos/kde-unstable-x86_64/qt4.patch (from rev 217841, kdelibs/kde-unstable/qt4.patch) =================================================================== --- kde-unstable-x86_64/qt4.patch (rev 0) +++ kde-unstable-x86_64/qt4.patch 2014-07-25 14:48:41 UTC (rev 217842) @@ -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"