[arch-commits] Commit in kdelibs/repos (18 files)
Antonio Rojas
arojas at archlinux.org
Tue May 10 16:16:11 UTC 2016
Date: Tuesday, May 10, 2016 @ 18:16:10
Author: arojas
Revision: 267356
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kdelibs/repos/extra-i686/PKGBUILD
(from rev 267355, kdelibs/trunk/PKGBUILD)
kdelibs/repos/extra-i686/archlinux-menu.patch
(from rev 267355, kdelibs/trunk/archlinux-menu.patch)
kdelibs/repos/extra-i686/kde-applications-menu.patch
(from rev 267355, kdelibs/trunk/kde-applications-menu.patch)
kdelibs/repos/extra-i686/kdelibs-gcc6.patch
(from rev 267355, kdelibs/trunk/kdelibs-gcc6.patch)
kdelibs/repos/extra-i686/qt4.patch
(from rev 267355, kdelibs/trunk/qt4.patch)
kdelibs/repos/extra-x86_64/PKGBUILD
(from rev 267355, kdelibs/trunk/PKGBUILD)
kdelibs/repos/extra-x86_64/archlinux-menu.patch
(from rev 267355, kdelibs/trunk/archlinux-menu.patch)
kdelibs/repos/extra-x86_64/kde-applications-menu.patch
(from rev 267355, kdelibs/trunk/kde-applications-menu.patch)
kdelibs/repos/extra-x86_64/kdelibs-gcc6.patch
(from rev 267355, kdelibs/trunk/kdelibs-gcc6.patch)
kdelibs/repos/extra-x86_64/qt4.patch
(from rev 267355, kdelibs/trunk/qt4.patch)
Deleted:
kdelibs/repos/extra-i686/PKGBUILD
kdelibs/repos/extra-i686/archlinux-menu.patch
kdelibs/repos/extra-i686/kde-applications-menu.patch
kdelibs/repos/extra-i686/qt4.patch
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/qt4.patch
------------------------------------------+
/PKGBUILD | 128 +++++++++++++++++++++++++++++
/archlinux-menu.patch | 44 +++++++++
/kde-applications-menu.patch | 44 +++++++++
/qt4.patch | 22 ++++
extra-i686/PKGBUILD | 61 -------------
extra-i686/archlinux-menu.patch | 22 ----
extra-i686/kde-applications-menu.patch | 22 ----
extra-i686/kdelibs-gcc6.patch | 65 ++++++++++++++
extra-i686/qt4.patch | 11 --
extra-x86_64/PKGBUILD | 61 -------------
extra-x86_64/archlinux-menu.patch | 22 ----
extra-x86_64/kde-applications-menu.patch | 22 ----
extra-x86_64/kdelibs-gcc6.patch | 65 ++++++++++++++
extra-x86_64/qt4.patch | 11 --
14 files changed, 368 insertions(+), 232 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-05-10 16:07:44 UTC (rev 267355)
+++ extra-i686/PKGBUILD 2016-05-10 16:16:10 UTC (rev 267356)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.14.19
-_kdeappver=16.04.0
-pkgrel=2
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='https://www.kde.org/'
-license=('GPL' 'LGPL' 'FDL')
-depends=('attica-qt4' 'libxss' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4'
- 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi'
- 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
- 'media-player-info' 'libutempter' 'qtwebkit' 'icu')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'mesa')
-source=("http://download.kde.org/stable/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz"
- 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
-sha1sums=('82a3db2c013d269ba850c06c9d1ac53ef6c44623'
- '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'ed1f57ee661e5c7440efcaba7e51d2554709701c')
-
-prepare() {
- mkdir -p build
- cd ${pkgname}-${pkgver}
- # avoid file conflict with gnome-menus
- patch -p1 -i ../kde-applications-menu.patch
- # add Archlinux menu entry
- patch -p1 -i ../archlinux-menu.patch
- # qmake refers to Qt5
- patch -p1 -i ../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 \
- -DLOCALE_INSTALL_DIR=/usr/share/locale/kde4 \
- -DKDE_DEFAULT_HOME='.kde4' \
- -DWITH_FAM=OFF \
- -DWITH_SOLID_UDISKS2=ON
- make
-}
-
-package() {
- cd 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-i686/PKGBUILD (from rev 267355, kdelibs/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-05-10 16:16:10 UTC (rev 267356)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.14.20
+_kdeappver=16.04.1
+pkgrel=1
+pkgdesc="KDE Core Libraries"
+arch=('i686' 'x86_64')
+url='https://www.kde.org/'
+license=('GPL' 'LGPL' 'FDL')
+depends=('attica-qt4' 'libxss' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4'
+ 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi'
+ 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
+ 'media-player-info' 'libutempter' 'qtwebkit' 'icu')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'mesa')
+source=("http://download.kde.org/stable/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz"
+ 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' kdelibs-gcc6.patch)
+sha1sums=('be5cf39d68ff43d01123e4926caf075ae7dc7a7b'
+ '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+ '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+ 'ed1f57ee661e5c7440efcaba7e51d2554709701c'
+ 'e9c02b761910c34d0f3470645ac4df102cfce5df')
+
+prepare() {
+ mkdir -p build
+ cd ${pkgname}-${pkgver}
+ # avoid file conflict with gnome-menus
+ patch -p1 -i ../kde-applications-menu.patch
+ # add Archlinux menu entry
+ patch -p1 -i ../archlinux-menu.patch
+ # qmake refers to Qt5
+ patch -p1 -i ../qt4.patch
+ # fix build with GCC 6 (Fedora)
+ patch -p1 -i ../kdelibs-gcc6.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 \
+ -DLOCALE_INSTALL_DIR=/usr/share/locale/kde4 \
+ -DKDE_DEFAULT_HOME='.kde4' \
+ -DWITH_FAM=OFF \
+ -DWITH_SOLID_UDISKS2=ON
+ make
+}
+
+package() {
+ cd 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: extra-i686/archlinux-menu.patch
===================================================================
--- extra-i686/archlinux-menu.patch 2016-05-10 16:07:44 UTC (rev 267355)
+++ extra-i686/archlinux-menu.patch 2016-05-10 16:16:10 UTC (rev 267356)
@@ -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-i686/archlinux-menu.patch (from rev 267355, kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- extra-i686/archlinux-menu.patch (rev 0)
+++ extra-i686/archlinux-menu.patch 2016-05-10 16:16:10 UTC (rev 267356)
@@ -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: extra-i686/kde-applications-menu.patch
===================================================================
--- extra-i686/kde-applications-menu.patch 2016-05-10 16:07:44 UTC (rev 267355)
+++ extra-i686/kde-applications-menu.patch 2016-05-10 16:16:10 UTC (rev 267356)
@@ -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-i686/kde-applications-menu.patch (from rev 267355, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- extra-i686/kde-applications-menu.patch (rev 0)
+++ extra-i686/kde-applications-menu.patch 2016-05-10 16:16:10 UTC (rev 267356)
@@ -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/extra-i686/kdelibs-gcc6.patch (from rev 267355, kdelibs/trunk/kdelibs-gcc6.patch)
===================================================================
--- extra-i686/kdelibs-gcc6.patch (rev 0)
+++ extra-i686/kdelibs-gcc6.patch 2016-05-10 16:16:10 UTC (rev 267356)
@@ -0,0 +1,65 @@
+diff -up kdelibs-4.14.17/solid/solid/backends/shared/cpufeatures.cpp.gcc6 kdelibs-4.14.17/solid/solid/backends/shared/cpufeatures.cpp
+--- kdelibs-4.14.17/khtml/dom/dom2_traversal.h.gcc6 2016-02-12 19:27:45.874888043 -0600
++++ kdelibs-4.14.17/khtml/dom/dom2_traversal.h 2016-02-12 19:26:11.777418711 -0600
+@@ -214,7 +214,7 @@ public:
+ *
+ */
+ enum ShowCode {
+- SHOW_ALL = 0xFFFFFFFF,
++ SHOW_ALL = (int)0xFFFFFFFF,
+ SHOW_ELEMENT = 0x00000001,
+ SHOW_ATTRIBUTE = 0x00000002,
+ SHOW_TEXT = 0x00000004,
+--- kdelibs-4.14.17/solid/solid/backends/shared/cpufeatures.cpp.gcc6 2016-02-11 23:06:08.000000000 -0600
++++ kdelibs-4.14.17/solid/solid/backends/shared/cpufeatures.cpp 2016-02-12 19:14:07.708788182 -0600
+@@ -51,23 +51,23 @@ static void sighandler( int )
+ #endif
+
+ #ifdef __i386__
+- #define ASM_REG(reg) "%e"reg
+- #define ASM_POP(reg) "popl %%e"reg" \n\t"
+- #define ASM_PUSH(reg) "pushl %%e"reg" \n\t"
+- #define ASM_XOR_REG(reg1, reg2) "xorl %%e"reg1", %%e"reg2" \n\t"
+- #define ASM_XOR_VAR(var, reg) "xorl "var", %%e"reg" \n\t"
+- #define ASM_CMP_REG(reg1, reg2) "cmpl %%e"reg1", %%e"reg2" \n\t"
+- #define ASM_MOV_REG(reg1, reg2) "movl %%e"reg1", %%e"reg2" \n\t"
+- #define ASM_MOV_VAR(var, reg) "movl "var", %%e"reg" \n\t"
++ #define ASM_REG(reg) "%e" reg
++ #define ASM_POP(reg) "popl %%e" reg " \n\t"
++ #define ASM_PUSH(reg) "pushl %%e" reg " \n\t"
++ #define ASM_XOR_REG(reg1, reg2) "xorl %%e" reg1 ", %%e" reg2 " \n\t"
++ #define ASM_XOR_VAR(var, reg) "xorl " var ", %%e" reg " \n\t"
++ #define ASM_CMP_REG(reg1, reg2) "cmpl %%e" reg1 ", %%e" reg2 " \n\t"
++ #define ASM_MOV_REG(reg1, reg2) "movl %%e" reg1 ", %%e" reg2 " \n\t"
++ #define ASM_MOV_VAR(var, reg) "movl " var ", %%e" reg " \n\t"
+ #elif defined(__x86_64__)
+- #define ASM_REG(reg) "%r"reg
+- #define ASM_POP(reg) "popq %%r"reg" \n\t"
+- #define ASM_PUSH(reg) "pushq %%r"reg" \n\t"
+- #define ASM_XOR_REG(reg1, reg2) "xorq %%r"reg1", %%r"reg2" \n\t"
+- #define ASM_XOR_VAR(var, reg) "xorq "var", %%r"reg" \n\t"
+- #define ASM_CMP_REG(reg1, reg2) "cmpq %%r"reg1", %%r"reg2" \n\t"
+- #define ASM_MOV_REG(reg1, reg2) "movq %%r"reg1", %%r"reg2" \n\t"
+- #define ASM_MOV_VAR(var, reg) "movq "var", %%r"reg" \n\t"
++ #define ASM_REG(reg) "%r" reg
++ #define ASM_POP(reg) "popq %%r" reg " \n\t"
++ #define ASM_PUSH(reg) "pushq %%r" reg " \n\t"
++ #define ASM_XOR_REG(reg1, reg2) "xorq %%r" reg1 ", %%r" reg2 " \n\t"
++ #define ASM_XOR_VAR(var, reg) "xorq " var ", %%r" reg " \n\t"
++ #define ASM_CMP_REG(reg1, reg2) "cmpq %%r" reg1 ", %%r" reg2 " \n\t"
++ #define ASM_MOV_REG(reg1, reg2) "movq %%r" reg1 ", %%r" reg2 " \n\t"
++ #define ASM_MOV_VAR(var, reg) "movq " var ", %%r" reg " \n\t"
+ #endif
+
+ #ifdef __PPC__
+--- kdelibs-4.14.17/ConfigureChecks.cmake.gcc6 2016-02-11 23:06:08.000000000 -0600
++++ kdelibs-4.14.17/ConfigureChecks.cmake 2016-02-12 19:14:07.707788177 -0600
+@@ -244,7 +244,7 @@ check_prototype_exists(unsetenv stdlib.h
+ check_prototype_exists(usleep unistd.h HAVE_USLEEP_PROTO)
+ check_prototype_exists(initgroups "unistd.h;sys/types.h;unistd.h;grp.h" HAVE_INITGROUPS_PROTO)
+ check_prototype_exists(setreuid unistd.h HAVE_SETREUID_PROTO)
+-check_prototype_exists(trunc math.h HAVE_TRUNC)
++check_prototype_exists(truncf math.h HAVE_TRUNC)
+
+ # check for existing datatypes
+
Deleted: extra-i686/qt4.patch
===================================================================
--- extra-i686/qt4.patch 2016-05-10 16:07:44 UTC (rev 267355)
+++ extra-i686/qt4.patch 2016-05-10 16:16:10 UTC (rev 267356)
@@ -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-i686/qt4.patch (from rev 267355, kdelibs/trunk/qt4.patch)
===================================================================
--- extra-i686/qt4.patch (rev 0)
+++ extra-i686/qt4.patch 2016-05-10 16:16:10 UTC (rev 267356)
@@ -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: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-05-10 16:07:44 UTC (rev 267355)
+++ extra-x86_64/PKGBUILD 2016-05-10 16:16:10 UTC (rev 267356)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.14.19
-_kdeappver=16.04.0
-pkgrel=2
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='https://www.kde.org/'
-license=('GPL' 'LGPL' 'FDL')
-depends=('attica-qt4' 'libxss' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4'
- 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi'
- 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
- 'media-player-info' 'libutempter' 'qtwebkit' 'icu')
-makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'mesa')
-source=("http://download.kde.org/stable/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz"
- 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
-sha1sums=('82a3db2c013d269ba850c06c9d1ac53ef6c44623'
- '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'ed1f57ee661e5c7440efcaba7e51d2554709701c')
-
-prepare() {
- mkdir -p build
- cd ${pkgname}-${pkgver}
- # avoid file conflict with gnome-menus
- patch -p1 -i ../kde-applications-menu.patch
- # add Archlinux menu entry
- patch -p1 -i ../archlinux-menu.patch
- # qmake refers to Qt5
- patch -p1 -i ../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 \
- -DLOCALE_INSTALL_DIR=/usr/share/locale/kde4 \
- -DKDE_DEFAULT_HOME='.kde4' \
- -DWITH_FAM=OFF \
- -DWITH_SOLID_UDISKS2=ON
- make
-}
-
-package() {
- cd 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 267355, kdelibs/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-05-10 16:16:10 UTC (rev 267356)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.14.20
+_kdeappver=16.04.1
+pkgrel=1
+pkgdesc="KDE Core Libraries"
+arch=('i686' 'x86_64')
+url='https://www.kde.org/'
+license=('GPL' 'LGPL' 'FDL')
+depends=('attica-qt4' 'libxss' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4'
+ 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi'
+ 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
+ 'media-player-info' 'libutempter' 'qtwebkit' 'icu')
+makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'mesa')
+source=("http://download.kde.org/stable/applications/${_kdeappver}/src/$pkgname-$pkgver.tar.xz"
+ 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' kdelibs-gcc6.patch)
+sha1sums=('be5cf39d68ff43d01123e4926caf075ae7dc7a7b'
+ '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+ '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+ 'ed1f57ee661e5c7440efcaba7e51d2554709701c'
+ 'e9c02b761910c34d0f3470645ac4df102cfce5df')
+
+prepare() {
+ mkdir -p build
+ cd ${pkgname}-${pkgver}
+ # avoid file conflict with gnome-menus
+ patch -p1 -i ../kde-applications-menu.patch
+ # add Archlinux menu entry
+ patch -p1 -i ../archlinux-menu.patch
+ # qmake refers to Qt5
+ patch -p1 -i ../qt4.patch
+ # fix build with GCC 6 (Fedora)
+ patch -p1 -i ../kdelibs-gcc6.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 \
+ -DLOCALE_INSTALL_DIR=/usr/share/locale/kde4 \
+ -DKDE_DEFAULT_HOME='.kde4' \
+ -DWITH_FAM=OFF \
+ -DWITH_SOLID_UDISKS2=ON
+ make
+}
+
+package() {
+ cd 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: extra-x86_64/archlinux-menu.patch
===================================================================
--- extra-x86_64/archlinux-menu.patch 2016-05-10 16:07:44 UTC (rev 267355)
+++ extra-x86_64/archlinux-menu.patch 2016-05-10 16:16:10 UTC (rev 267356)
@@ -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 267355, kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- extra-x86_64/archlinux-menu.patch (rev 0)
+++ extra-x86_64/archlinux-menu.patch 2016-05-10 16:16:10 UTC (rev 267356)
@@ -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: extra-x86_64/kde-applications-menu.patch
===================================================================
--- extra-x86_64/kde-applications-menu.patch 2016-05-10 16:07:44 UTC (rev 267355)
+++ extra-x86_64/kde-applications-menu.patch 2016-05-10 16:16:10 UTC (rev 267356)
@@ -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 267355, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- extra-x86_64/kde-applications-menu.patch (rev 0)
+++ extra-x86_64/kde-applications-menu.patch 2016-05-10 16:16:10 UTC (rev 267356)
@@ -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/extra-x86_64/kdelibs-gcc6.patch (from rev 267355, kdelibs/trunk/kdelibs-gcc6.patch)
===================================================================
--- extra-x86_64/kdelibs-gcc6.patch (rev 0)
+++ extra-x86_64/kdelibs-gcc6.patch 2016-05-10 16:16:10 UTC (rev 267356)
@@ -0,0 +1,65 @@
+diff -up kdelibs-4.14.17/solid/solid/backends/shared/cpufeatures.cpp.gcc6 kdelibs-4.14.17/solid/solid/backends/shared/cpufeatures.cpp
+--- kdelibs-4.14.17/khtml/dom/dom2_traversal.h.gcc6 2016-02-12 19:27:45.874888043 -0600
++++ kdelibs-4.14.17/khtml/dom/dom2_traversal.h 2016-02-12 19:26:11.777418711 -0600
+@@ -214,7 +214,7 @@ public:
+ *
+ */
+ enum ShowCode {
+- SHOW_ALL = 0xFFFFFFFF,
++ SHOW_ALL = (int)0xFFFFFFFF,
+ SHOW_ELEMENT = 0x00000001,
+ SHOW_ATTRIBUTE = 0x00000002,
+ SHOW_TEXT = 0x00000004,
+--- kdelibs-4.14.17/solid/solid/backends/shared/cpufeatures.cpp.gcc6 2016-02-11 23:06:08.000000000 -0600
++++ kdelibs-4.14.17/solid/solid/backends/shared/cpufeatures.cpp 2016-02-12 19:14:07.708788182 -0600
+@@ -51,23 +51,23 @@ static void sighandler( int )
+ #endif
+
+ #ifdef __i386__
+- #define ASM_REG(reg) "%e"reg
+- #define ASM_POP(reg) "popl %%e"reg" \n\t"
+- #define ASM_PUSH(reg) "pushl %%e"reg" \n\t"
+- #define ASM_XOR_REG(reg1, reg2) "xorl %%e"reg1", %%e"reg2" \n\t"
+- #define ASM_XOR_VAR(var, reg) "xorl "var", %%e"reg" \n\t"
+- #define ASM_CMP_REG(reg1, reg2) "cmpl %%e"reg1", %%e"reg2" \n\t"
+- #define ASM_MOV_REG(reg1, reg2) "movl %%e"reg1", %%e"reg2" \n\t"
+- #define ASM_MOV_VAR(var, reg) "movl "var", %%e"reg" \n\t"
++ #define ASM_REG(reg) "%e" reg
++ #define ASM_POP(reg) "popl %%e" reg " \n\t"
++ #define ASM_PUSH(reg) "pushl %%e" reg " \n\t"
++ #define ASM_XOR_REG(reg1, reg2) "xorl %%e" reg1 ", %%e" reg2 " \n\t"
++ #define ASM_XOR_VAR(var, reg) "xorl " var ", %%e" reg " \n\t"
++ #define ASM_CMP_REG(reg1, reg2) "cmpl %%e" reg1 ", %%e" reg2 " \n\t"
++ #define ASM_MOV_REG(reg1, reg2) "movl %%e" reg1 ", %%e" reg2 " \n\t"
++ #define ASM_MOV_VAR(var, reg) "movl " var ", %%e" reg " \n\t"
+ #elif defined(__x86_64__)
+- #define ASM_REG(reg) "%r"reg
+- #define ASM_POP(reg) "popq %%r"reg" \n\t"
+- #define ASM_PUSH(reg) "pushq %%r"reg" \n\t"
+- #define ASM_XOR_REG(reg1, reg2) "xorq %%r"reg1", %%r"reg2" \n\t"
+- #define ASM_XOR_VAR(var, reg) "xorq "var", %%r"reg" \n\t"
+- #define ASM_CMP_REG(reg1, reg2) "cmpq %%r"reg1", %%r"reg2" \n\t"
+- #define ASM_MOV_REG(reg1, reg2) "movq %%r"reg1", %%r"reg2" \n\t"
+- #define ASM_MOV_VAR(var, reg) "movq "var", %%r"reg" \n\t"
++ #define ASM_REG(reg) "%r" reg
++ #define ASM_POP(reg) "popq %%r" reg " \n\t"
++ #define ASM_PUSH(reg) "pushq %%r" reg " \n\t"
++ #define ASM_XOR_REG(reg1, reg2) "xorq %%r" reg1 ", %%r" reg2 " \n\t"
++ #define ASM_XOR_VAR(var, reg) "xorq " var ", %%r" reg " \n\t"
++ #define ASM_CMP_REG(reg1, reg2) "cmpq %%r" reg1 ", %%r" reg2 " \n\t"
++ #define ASM_MOV_REG(reg1, reg2) "movq %%r" reg1 ", %%r" reg2 " \n\t"
++ #define ASM_MOV_VAR(var, reg) "movq " var ", %%r" reg " \n\t"
+ #endif
+
+ #ifdef __PPC__
+--- kdelibs-4.14.17/ConfigureChecks.cmake.gcc6 2016-02-11 23:06:08.000000000 -0600
++++ kdelibs-4.14.17/ConfigureChecks.cmake 2016-02-12 19:14:07.707788177 -0600
+@@ -244,7 +244,7 @@ check_prototype_exists(unsetenv stdlib.h
+ check_prototype_exists(usleep unistd.h HAVE_USLEEP_PROTO)
+ check_prototype_exists(initgroups "unistd.h;sys/types.h;unistd.h;grp.h" HAVE_INITGROUPS_PROTO)
+ check_prototype_exists(setreuid unistd.h HAVE_SETREUID_PROTO)
+-check_prototype_exists(trunc math.h HAVE_TRUNC)
++check_prototype_exists(truncf math.h HAVE_TRUNC)
+
+ # check for existing datatypes
+
Deleted: extra-x86_64/qt4.patch
===================================================================
--- extra-x86_64/qt4.patch 2016-05-10 16:07:44 UTC (rev 267355)
+++ extra-x86_64/qt4.patch 2016-05-10 16:16:10 UTC (rev 267356)
@@ -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 267355, kdelibs/trunk/qt4.patch)
===================================================================
--- extra-x86_64/qt4.patch (rev 0)
+++ extra-x86_64/qt4.patch 2016-05-10 16:16:10 UTC (rev 267356)
@@ -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"
More information about the arch-commits
mailing list