Date: Thursday, July 23, 2015 @ 08:12:54 Author: arojas Revision: 242460
archrelease: copy trunk to extra-i686, extra-x86_64 Added: kinfocenter/repos/extra-i686/PKGBUILD (from rev 242459, kinfocenter/trunk/PKGBUILD) kinfocenter/repos/extra-i686/fix-opengl-freeze.patch (from rev 242459, kinfocenter/trunk/fix-opengl-freeze.patch) kinfocenter/repos/extra-i686/kcm-about-distrorc (from rev 242459, kinfocenter/trunk/kcm-about-distrorc) kinfocenter/repos/extra-x86_64/PKGBUILD (from rev 242459, kinfocenter/trunk/PKGBUILD) kinfocenter/repos/extra-x86_64/fix-opengl-freeze.patch (from rev 242459, kinfocenter/trunk/fix-opengl-freeze.patch) kinfocenter/repos/extra-x86_64/kcm-about-distrorc (from rev 242459, kinfocenter/trunk/kcm-about-distrorc) Deleted: kinfocenter/repos/extra-i686/PKGBUILD kinfocenter/repos/extra-i686/kcm-about-distrorc kinfocenter/repos/extra-x86_64/PKGBUILD kinfocenter/repos/extra-x86_64/kcm-about-distrorc --------------------------------------+ /PKGBUILD | 100 +++++++++++++++++++++++++++++++++ /kcm-about-distrorc | 4 + extra-i686/PKGBUILD | 45 -------------- extra-i686/fix-opengl-freeze.patch | 33 ++++++++++ extra-i686/kcm-about-distrorc | 2 extra-x86_64/PKGBUILD | 45 -------------- extra-x86_64/fix-opengl-freeze.patch | 33 ++++++++++ extra-x86_64/kcm-about-distrorc | 2 8 files changed, 170 insertions(+), 94 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-07-23 06:12:18 UTC (rev 242459) +++ extra-i686/PKGBUILD 2015-07-23 06:12:54 UTC (rev 242460) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Antonio Rojas - -pkgname=kinfocenter -pkgver=5.3.2 -pkgrel=1 -pkgdesc='A utility that provides information about a computer system' -arch=('i686' 'x86_64') -url='https://www.kde.org/applications/system/kinfocenter/' -license=('LGPL') -depends=('kdelibs4support' 'kcmutils' 'pciutils' 'glu' 'libraw1394' 'kwayland') -makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'plasma-framework') -conflicts=('kdebase-workspace') -groups=('plasma') -source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz" -'archlinux-logo.svg::https://sources.archlinux.org/other/artwork/archlinux-logo-dark-scalable.svg' 'kcm-about-distrorc') -md5sums=('baf95f4bd09e886f3d25b5f2799cf2d8' - '518881f04ca9d4bd8526008767e40ba7' - '4b4e2496ea1de3a09de501b5d508f666') - -prepare() { - mkdir build -} - -build() { - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=lib \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DBUILD_TESTING=OFF - make -} - -package() { - cd build - make DESTDIR="${pkgdir}" install - -# Install Arch logo - install -Dm644 "$srcdir"/archlinux-logo.svg "$pkgdir"/usr/share/about-distro/archlinux-logo.svg - install -Dm644 "$srcdir"/kcm-about-distrorc "$pkgdir"/etc/xdg/kcm-about-distrorc -} Copied: kinfocenter/repos/extra-i686/PKGBUILD (from rev 242459, kinfocenter/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-07-23 06:12:54 UTC (rev 242460) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Antonio Rojas + +pkgname=kinfocenter +pkgver=5.3.2 +pkgrel=2 +pkgdesc='A utility that provides information about a computer system' +arch=('i686' 'x86_64') +url='https://www.kde.org/applications/system/kinfocenter/' +license=('LGPL') +depends=('kdelibs4support' 'kcmutils' 'pciutils' 'glu' 'libraw1394' 'kwayland') +makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'plasma-framework') +conflicts=('kdebase-workspace') +groups=('plasma') +source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz" +'archlinux-logo.svg::https://sources.archlinux.org/other/artwork/archlinux-logo-dark-scalable.svg' 'kcm-about-distrorc' 'fix-opengl-freeze.patch') +md5sums=('baf95f4bd09e886f3d25b5f2799cf2d8' + '518881f04ca9d4bd8526008767e40ba7' + '4b4e2496ea1de3a09de501b5d508f666' + '5f2f0db6fec3f6dcd0857122918a0e3d') + +prepare() { + mkdir -p build + +# Fix freeze in OpenGL module https://bugs.kde.org/show_bug.cgi?id=344971 + cd $pkgname-$pkgver + patch -p1 -i "$srcdir"/fix-opengl-freeze.patch +} + +build() { + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install + +# Install Arch logo + install -Dm644 "$srcdir"/archlinux-logo.svg "$pkgdir"/usr/share/about-distro/archlinux-logo.svg + install -Dm644 "$srcdir"/kcm-about-distrorc "$pkgdir"/etc/xdg/kcm-about-distrorc +} Copied: kinfocenter/repos/extra-i686/fix-opengl-freeze.patch (from rev 242459, kinfocenter/trunk/fix-opengl-freeze.patch) =================================================================== --- extra-i686/fix-opengl-freeze.patch (rev 0) +++ extra-i686/fix-opengl-freeze.patch 2015-07-23 06:12:54 UTC (rev 242460) @@ -0,0 +1,33 @@ +From: Martin Gräßlin <mgraess...@kde.org> +Date: Wed, 03 Jun 2015 15:37:28 +0000 +Subject: Remove querying the indirect rendering context +X-Git-Url: http://quickgit.kde.org/?p=kinfocenter.git&a=commitdiff&h=9f9814219d899a64dd5b68711534ec7206858147 +--- +Remove querying the indirect rendering context + +Mesa fails to make an indirect rendering context current and freezes +in the next X11 call. + +Removing indirect rendering support seems like a workaround for the +problem, but realisticly it's no longer interesting what indirect +rendering provides if direct rendering is available. If direct +rendering is not available, it will pick indirect instead. + +BUG: 344971 +FIXED-IN: 5.4.0 +REVIEW: 123995 +--- + + +--- a/Modules/opengl/opengl.cpp ++++ b/Modules/opengl/opengl.cpp +@@ -933,8 +933,6 @@ + + l2 = get_gl_info_glx(dpy, scrnum, true, l1, l2); + if (l2) l2->setExpanded(true); +- +- if (IsDirect) l2 = get_gl_info_glx(dpy, scrnum, false, l1, l2); + #endif + #if KCM_HAVE_EGL + l2 = get_gl_info_egl(dpy, scrnum, l1, l2); + Deleted: extra-i686/kcm-about-distrorc =================================================================== --- extra-i686/kcm-about-distrorc 2015-07-23 06:12:18 UTC (rev 242459) +++ extra-i686/kcm-about-distrorc 2015-07-23 06:12:54 UTC (rev 242460) @@ -1,2 +0,0 @@ -[General] -LogoPath=/usr/share/about-distro/archlinux-logo.svg Copied: kinfocenter/repos/extra-i686/kcm-about-distrorc (from rev 242459, kinfocenter/trunk/kcm-about-distrorc) =================================================================== --- extra-i686/kcm-about-distrorc (rev 0) +++ extra-i686/kcm-about-distrorc 2015-07-23 06:12:54 UTC (rev 242460) @@ -0,0 +1,2 @@ +[General] +LogoPath=/usr/share/about-distro/archlinux-logo.svg Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-07-23 06:12:18 UTC (rev 242459) +++ extra-x86_64/PKGBUILD 2015-07-23 06:12:54 UTC (rev 242460) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Antonio Rojas - -pkgname=kinfocenter -pkgver=5.3.2 -pkgrel=1 -pkgdesc='A utility that provides information about a computer system' -arch=('i686' 'x86_64') -url='https://www.kde.org/applications/system/kinfocenter/' -license=('LGPL') -depends=('kdelibs4support' 'kcmutils' 'pciutils' 'glu' 'libraw1394' 'kwayland') -makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'plasma-framework') -conflicts=('kdebase-workspace') -groups=('plasma') -source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz" -'archlinux-logo.svg::https://sources.archlinux.org/other/artwork/archlinux-logo-dark-scalable.svg' 'kcm-about-distrorc') -md5sums=('baf95f4bd09e886f3d25b5f2799cf2d8' - '518881f04ca9d4bd8526008767e40ba7' - '4b4e2496ea1de3a09de501b5d508f666') - -prepare() { - mkdir build -} - -build() { - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=lib \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DBUILD_TESTING=OFF - make -} - -package() { - cd build - make DESTDIR="${pkgdir}" install - -# Install Arch logo - install -Dm644 "$srcdir"/archlinux-logo.svg "$pkgdir"/usr/share/about-distro/archlinux-logo.svg - install -Dm644 "$srcdir"/kcm-about-distrorc "$pkgdir"/etc/xdg/kcm-about-distrorc -} Copied: kinfocenter/repos/extra-x86_64/PKGBUILD (from rev 242459, kinfocenter/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-07-23 06:12:54 UTC (rev 242460) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Antonio Rojas + +pkgname=kinfocenter +pkgver=5.3.2 +pkgrel=2 +pkgdesc='A utility that provides information about a computer system' +arch=('i686' 'x86_64') +url='https://www.kde.org/applications/system/kinfocenter/' +license=('LGPL') +depends=('kdelibs4support' 'kcmutils' 'pciutils' 'glu' 'libraw1394' 'kwayland') +makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'plasma-framework') +conflicts=('kdebase-workspace') +groups=('plasma') +source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz" +'archlinux-logo.svg::https://sources.archlinux.org/other/artwork/archlinux-logo-dark-scalable.svg' 'kcm-about-distrorc' 'fix-opengl-freeze.patch') +md5sums=('baf95f4bd09e886f3d25b5f2799cf2d8' + '518881f04ca9d4bd8526008767e40ba7' + '4b4e2496ea1de3a09de501b5d508f666' + '5f2f0db6fec3f6dcd0857122918a0e3d') + +prepare() { + mkdir -p build + +# Fix freeze in OpenGL module https://bugs.kde.org/show_bug.cgi?id=344971 + cd $pkgname-$pkgver + patch -p1 -i "$srcdir"/fix-opengl-freeze.patch +} + +build() { + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install + +# Install Arch logo + install -Dm644 "$srcdir"/archlinux-logo.svg "$pkgdir"/usr/share/about-distro/archlinux-logo.svg + install -Dm644 "$srcdir"/kcm-about-distrorc "$pkgdir"/etc/xdg/kcm-about-distrorc +} Copied: kinfocenter/repos/extra-x86_64/fix-opengl-freeze.patch (from rev 242459, kinfocenter/trunk/fix-opengl-freeze.patch) =================================================================== --- extra-x86_64/fix-opengl-freeze.patch (rev 0) +++ extra-x86_64/fix-opengl-freeze.patch 2015-07-23 06:12:54 UTC (rev 242460) @@ -0,0 +1,33 @@ +From: Martin Gräßlin <mgraess...@kde.org> +Date: Wed, 03 Jun 2015 15:37:28 +0000 +Subject: Remove querying the indirect rendering context +X-Git-Url: http://quickgit.kde.org/?p=kinfocenter.git&a=commitdiff&h=9f9814219d899a64dd5b68711534ec7206858147 +--- +Remove querying the indirect rendering context + +Mesa fails to make an indirect rendering context current and freezes +in the next X11 call. + +Removing indirect rendering support seems like a workaround for the +problem, but realisticly it's no longer interesting what indirect +rendering provides if direct rendering is available. If direct +rendering is not available, it will pick indirect instead. + +BUG: 344971 +FIXED-IN: 5.4.0 +REVIEW: 123995 +--- + + +--- a/Modules/opengl/opengl.cpp ++++ b/Modules/opengl/opengl.cpp +@@ -933,8 +933,6 @@ + + l2 = get_gl_info_glx(dpy, scrnum, true, l1, l2); + if (l2) l2->setExpanded(true); +- +- if (IsDirect) l2 = get_gl_info_glx(dpy, scrnum, false, l1, l2); + #endif + #if KCM_HAVE_EGL + l2 = get_gl_info_egl(dpy, scrnum, l1, l2); + Deleted: extra-x86_64/kcm-about-distrorc =================================================================== --- extra-x86_64/kcm-about-distrorc 2015-07-23 06:12:18 UTC (rev 242459) +++ extra-x86_64/kcm-about-distrorc 2015-07-23 06:12:54 UTC (rev 242460) @@ -1,2 +0,0 @@ -[General] -LogoPath=/usr/share/about-distro/archlinux-logo.svg Copied: kinfocenter/repos/extra-x86_64/kcm-about-distrorc (from rev 242459, kinfocenter/trunk/kcm-about-distrorc) =================================================================== --- extra-x86_64/kcm-about-distrorc (rev 0) +++ extra-x86_64/kcm-about-distrorc 2015-07-23 06:12:54 UTC (rev 242460) @@ -0,0 +1,2 @@ +[General] +LogoPath=/usr/share/about-distro/archlinux-logo.svg