[arch-commits] Commit in kdelibs/repos (10 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Thu May 9 08:05:56 UTC 2013
Date: Thursday, May 9, 2013 @ 10:05:55
Author: andrea
Revision: 184822
archrelease: copy trunk to testing-i686, testing-x86_64
Deleted:
kdelibs/repos/testing-i686/PKGBUILD
kdelibs/repos/testing-i686/archlinux-menu.patch
kdelibs/repos/testing-i686/kde-applications-menu.patch
kdelibs/repos/testing-i686/kdelibs.install
kdelibs/repos/testing-i686/qt4.patch
kdelibs/repos/testing-x86_64/PKGBUILD
kdelibs/repos/testing-x86_64/archlinux-menu.patch
kdelibs/repos/testing-x86_64/kde-applications-menu.patch
kdelibs/repos/testing-x86_64/kdelibs.install
kdelibs/repos/testing-x86_64/qt4.patch
--------------------------------------------+
testing-i686/PKGBUILD | 67 ---------------------------
testing-i686/archlinux-menu.patch | 22 --------
testing-i686/kde-applications-menu.patch | 22 --------
testing-i686/kdelibs.install | 13 -----
testing-i686/qt4.patch | 11 ----
testing-x86_64/PKGBUILD | 67 ---------------------------
testing-x86_64/archlinux-menu.patch | 22 --------
testing-x86_64/kde-applications-menu.patch | 22 --------
testing-x86_64/kdelibs.install | 13 -----
testing-x86_64/qt4.patch | 11 ----
10 files changed, 270 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2013-05-09 08:05:42 UTC (rev 184821)
+++ testing-i686/PKGBUILD 2013-05-09 08:05:55 UTC (rev 184822)
@@ -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=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'
- '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
-}
Deleted: testing-i686/archlinux-menu.patch
===================================================================
--- testing-i686/archlinux-menu.patch 2013-05-09 08:05:42 UTC (rev 184821)
+++ testing-i686/archlinux-menu.patch 2013-05-09 08:05:55 UTC (rev 184822)
@@ -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/>
Deleted: testing-i686/kde-applications-menu.patch
===================================================================
--- testing-i686/kde-applications-menu.patch 2013-05-09 08:05:42 UTC (rev 184821)
+++ testing-i686/kde-applications-menu.patch 2013-05-09 08:05:55 UTC (rev 184822)
@@ -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);
Deleted: testing-i686/kdelibs.install
===================================================================
--- testing-i686/kdelibs.install 2013-05-09 08:05:42 UTC (rev 184821)
+++ testing-i686/kdelibs.install 2013-05-09 08:05:55 UTC (rev 184822)
@@ -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
-}
Deleted: testing-i686/qt4.patch
===================================================================
--- testing-i686/qt4.patch 2013-05-09 08:05:42 UTC (rev 184821)
+++ testing-i686/qt4.patch 2013-05-09 08:05:55 UTC (rev 184822)
@@ -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"
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2013-05-09 08:05:42 UTC (rev 184821)
+++ testing-x86_64/PKGBUILD 2013-05-09 08:05:55 UTC (rev 184822)
@@ -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=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'
- '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
-}
Deleted: testing-x86_64/archlinux-menu.patch
===================================================================
--- testing-x86_64/archlinux-menu.patch 2013-05-09 08:05:42 UTC (rev 184821)
+++ testing-x86_64/archlinux-menu.patch 2013-05-09 08:05:55 UTC (rev 184822)
@@ -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/>
Deleted: testing-x86_64/kde-applications-menu.patch
===================================================================
--- testing-x86_64/kde-applications-menu.patch 2013-05-09 08:05:42 UTC (rev 184821)
+++ testing-x86_64/kde-applications-menu.patch 2013-05-09 08:05:55 UTC (rev 184822)
@@ -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);
Deleted: testing-x86_64/kdelibs.install
===================================================================
--- testing-x86_64/kdelibs.install 2013-05-09 08:05:42 UTC (rev 184821)
+++ testing-x86_64/kdelibs.install 2013-05-09 08:05:55 UTC (rev 184822)
@@ -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
-}
Deleted: testing-x86_64/qt4.patch
===================================================================
--- testing-x86_64/qt4.patch 2013-05-09 08:05:42 UTC (rev 184821)
+++ testing-x86_64/qt4.patch 2013-05-09 08:05:55 UTC (rev 184822)
@@ -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"
More information about the arch-commits
mailing list