Date: Friday, November 15, 2013 @ 10:46:59
Author: andrea
Revision: 199544
archrelease: copy kde-unstable to kde-unstable-i686, kde-unstable-x86_64
Added:
kdelibs/repos/kde-unstable-i686/PKGBUILD
(from rev 199543, kdelibs/kde-unstable/PKGBUILD)
kdelibs/repos/kde-unstable-i686/archlinux-menu.patch
(from rev 199543, kdelibs/kde-unstable/archlinux-menu.patch)
kdelibs/repos/kde-unstable-i686/kde-applications-menu.patch
(from rev 199543, kdelibs/kde-unstable/kde-applications-menu.patch)
kdelibs/repos/kde-unstable-i686/kdelibs.install
(from rev 199543, kdelibs/kde-unstable/kdelibs.install)
kdelibs/repos/kde-unstable-i686/qt4.patch
(from rev 199543, kdelibs/kde-unstable/qt4.patch)
kdelibs/repos/kde-unstable-x86_64/PKGBUILD
(from rev 199543, kdelibs/kde-unstable/PKGBUILD)
kdelibs/repos/kde-unstable-x86_64/archlinux-menu.patch
(from rev 199543, kdelibs/kde-unstable/archlinux-menu.patch)
kdelibs/repos/kde-unstable-x86_64/kde-applications-menu.patch
(from rev 199543, kdelibs/kde-unstable/kde-applications-menu.patch)
kdelibs/repos/kde-unstable-x86_64/kdelibs.install
(from rev 199543, kdelibs/kde-unstable/kdelibs.install)
kdelibs/repos/kde-unstable-x86_64/qt4.patch
(from rev 199543, kdelibs/kde-unstable/qt4.patch)
Deleted:
kdelibs/repos/kde-unstable-i686/PKGBUILD
kdelibs/repos/kde-unstable-i686/archlinux-menu.patch
kdelibs/repos/kde-unstable-i686/kde-applications-menu.patch
kdelibs/repos/kde-unstable-i686/kdelibs.install
kdelibs/repos/kde-unstable-i686/qt4.patch
kdelibs/repos/kde-unstable-x86_64/PKGBUILD
kdelibs/repos/kde-unstable-x86_64/archlinux-menu.patch
kdelibs/repos/kde-unstable-x86_64/kde-applications-menu.patch
kdelibs/repos/kde-unstable-x86_64/kdelibs.install
kdelibs/repos/kde-unstable-x86_64/qt4.patch
-------------------------------------------------+
/PKGBUILD | 122 ++++++++++++++++++++++
/archlinux-menu.patch | 44 +++++++
/kde-applications-menu.patch | 44 +++++++
/kdelibs.install | 26 ++++
/qt4.patch | 22 +++
kde-unstable-i686/PKGBUILD | 61 -----------
kde-unstable-i686/archlinux-menu.patch | 22 ---
kde-unstable-i686/kde-applications-menu.patch | 22 ---
kde-unstable-i686/kdelibs.install | 13 --
kde-unstable-i686/qt4.patch | 11 -
kde-unstable-x86_64/PKGBUILD | 61 -----------
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/qt4.patch | 11 -
15 files changed, 258 insertions(+), 258 deletions(-)
Deleted: kde-unstable-i686/PKGBUILD
===================================================================
--- kde-unstable-i686/PKGBUILD 2013-11-15 09:39:54 UTC (rev 199543)
+++ kde-unstable-i686/PKGBUILD 2013-11-15 09:46:59 UTC (rev 199544)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <and...@archlinux.org
-# Contributor: Pierre Schmitz <pie...@archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.11.80
-pkgrel=1
-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-qt4'
- 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit')
-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=('24fafc0e3057a2d34a1a7515449bcb08a60d1726'
- '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'ed1f57ee661e5c7440efcaba7e51d2554709701c')
-
-prepare() {
- 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() {
- 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_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/PKGBUILD (from rev 199543,
kdelibs/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-i686/PKGBUILD (rev 0)
+++ kde-unstable-i686/PKGBUILD 2013-11-15 09:46:59 UTC (rev 199544)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Andrea Scarpino <and...@archlinux.org
+# Contributor: Pierre Schmitz <pie...@archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.11.90
+pkgrel=1
+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-qt4'
+ 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit')
+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=('e576c717a18aebd1c421f43a2ae46988a3a15e5f'
+ '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+ '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+ 'ed1f57ee661e5c7440efcaba7e51d2554709701c')
+
+prepare() {
+ 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() {
+ 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_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: kde-unstable-i686/archlinux-menu.patch
===================================================================
--- kde-unstable-i686/archlinux-menu.patch 2013-11-15 09:39:54 UTC (rev
199543)
+++ kde-unstable-i686/archlinux-menu.patch 2013-11-15 09:46:59 UTC (rev
199544)
@@ -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/kde-unstable-i686/archlinux-menu.patch (from rev 199543,
kdelibs/kde-unstable/archlinux-menu.patch)
===================================================================
--- kde-unstable-i686/archlinux-menu.patch (rev 0)
+++ kde-unstable-i686/archlinux-menu.patch 2013-11-15 09:46:59 UTC (rev
199544)
@@ -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/>
Deleted: kde-unstable-i686/kde-applications-menu.patch
===================================================================
--- kde-unstable-i686/kde-applications-menu.patch 2013-11-15 09:39:54 UTC
(rev 199543)
+++ kde-unstable-i686/kde-applications-menu.patch 2013-11-15 09:46:59 UTC
(rev 199544)
@@ -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/kde-unstable-i686/kde-applications-menu.patch (from rev
199543, kdelibs/kde-unstable/kde-applications-menu.patch)
===================================================================
--- kde-unstable-i686/kde-applications-menu.patch
(rev 0)
+++ kde-unstable-i686/kde-applications-menu.patch 2013-11-15 09:46:59 UTC
(rev 199544)
@@ -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: kde-unstable-i686/kdelibs.install
===================================================================
--- kde-unstable-i686/kdelibs.install 2013-11-15 09:39:54 UTC (rev 199543)
+++ kde-unstable-i686/kdelibs.install 2013-11-15 09:46:59 UTC (rev 199544)
@@ -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/kde-unstable-i686/kdelibs.install (from rev 199543,
kdelibs/kde-unstable/kdelibs.install)
===================================================================
--- kde-unstable-i686/kdelibs.install (rev 0)
+++ kde-unstable-i686/kdelibs.install 2013-11-15 09:46:59 UTC (rev 199544)
@@ -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: kde-unstable-i686/qt4.patch
===================================================================
--- kde-unstable-i686/qt4.patch 2013-11-15 09:39:54 UTC (rev 199543)
+++ kde-unstable-i686/qt4.patch 2013-11-15 09:46:59 UTC (rev 199544)
@@ -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/kde-unstable-i686/qt4.patch (from rev 199543,
kdelibs/kde-unstable/qt4.patch)
===================================================================
--- kde-unstable-i686/qt4.patch (rev 0)
+++ kde-unstable-i686/qt4.patch 2013-11-15 09:46:59 UTC (rev 199544)
@@ -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: kde-unstable-x86_64/PKGBUILD
===================================================================
--- kde-unstable-x86_64/PKGBUILD 2013-11-15 09:39:54 UTC (rev 199543)
+++ kde-unstable-x86_64/PKGBUILD 2013-11-15 09:46:59 UTC (rev 199544)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <and...@archlinux.org
-# Contributor: Pierre Schmitz <pie...@archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.11.80
-pkgrel=1
-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-qt4'
- 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit')
-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=('24fafc0e3057a2d34a1a7515449bcb08a60d1726'
- '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'ed1f57ee661e5c7440efcaba7e51d2554709701c')
-
-prepare() {
- 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() {
- 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_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/PKGBUILD (from rev 199543,
kdelibs/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-x86_64/PKGBUILD (rev 0)
+++ kde-unstable-x86_64/PKGBUILD 2013-11-15 09:46:59 UTC (rev 199544)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Andrea Scarpino <and...@archlinux.org
+# Contributor: Pierre Schmitz <pie...@archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.11.90
+pkgrel=1
+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-qt4'
+ 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit')
+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=('e576c717a18aebd1c421f43a2ae46988a3a15e5f'
+ '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+ '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+ 'ed1f57ee661e5c7440efcaba7e51d2554709701c')
+
+prepare() {
+ 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() {
+ 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_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: kde-unstable-x86_64/archlinux-menu.patch
===================================================================
--- kde-unstable-x86_64/archlinux-menu.patch 2013-11-15 09:39:54 UTC (rev
199543)
+++ kde-unstable-x86_64/archlinux-menu.patch 2013-11-15 09:46:59 UTC (rev
199544)
@@ -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/kde-unstable-x86_64/archlinux-menu.patch (from rev
199543, kdelibs/kde-unstable/archlinux-menu.patch)
===================================================================
--- kde-unstable-x86_64/archlinux-menu.patch (rev 0)
+++ kde-unstable-x86_64/archlinux-menu.patch 2013-11-15 09:46:59 UTC (rev
199544)
@@ -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/>
Deleted: kde-unstable-x86_64/kde-applications-menu.patch
===================================================================
--- kde-unstable-x86_64/kde-applications-menu.patch 2013-11-15 09:39:54 UTC
(rev 199543)
+++ kde-unstable-x86_64/kde-applications-menu.patch 2013-11-15 09:46:59 UTC
(rev 199544)
@@ -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/kde-unstable-x86_64/kde-applications-menu.patch (from rev
199543, 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 2013-11-15 09:46:59 UTC
(rev 199544)
@@ -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: kde-unstable-x86_64/kdelibs.install
===================================================================
--- kde-unstable-x86_64/kdelibs.install 2013-11-15 09:39:54 UTC (rev 199543)
+++ kde-unstable-x86_64/kdelibs.install 2013-11-15 09:46:59 UTC (rev 199544)
@@ -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/kde-unstable-x86_64/kdelibs.install (from rev 199543,
kdelibs/kde-unstable/kdelibs.install)
===================================================================
--- kde-unstable-x86_64/kdelibs.install (rev 0)
+++ kde-unstable-x86_64/kdelibs.install 2013-11-15 09:46:59 UTC (rev 199544)
@@ -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: kde-unstable-x86_64/qt4.patch
===================================================================
--- kde-unstable-x86_64/qt4.patch 2013-11-15 09:39:54 UTC (rev 199543)
+++ kde-unstable-x86_64/qt4.patch 2013-11-15 09:46:59 UTC (rev 199544)
@@ -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/kde-unstable-x86_64/qt4.patch (from rev 199543,
kdelibs/kde-unstable/qt4.patch)
===================================================================
--- kde-unstable-x86_64/qt4.patch (rev 0)
+++ kde-unstable-x86_64/qt4.patch 2013-11-15 09:46:59 UTC (rev 199544)
@@ -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"
