author | Antonio Rojas
<arojas@archlinux.org> 2015-08-24 19:32:59 UTC |
committer | Antonio Rojas
<arojas@archlinux.org> 2015-08-24 19:32:59 UTC |
parent | 9582fdb6608532e4bf27a2a2b7b898d3ff515deb |
PKGBUILD | +5 | -10 |
fix-opengl-freeze.patch | +0 | -33 |
diff --git a/PKGBUILD b/PKGBUILD index 82951c3..b8e40f3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Antonio Rojas pkgname=kinfocenter -pkgver=5.3.2 -pkgrel=2 +pkgver=5.4.0 +pkgrel=1 pkgdesc='A utility that provides information about a computer system' arch=('i686' 'x86_64') url='https://www.kde.org/applications/system/kinfocenter/' @@ -14,18 +14,13 @@ 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' +'archlinux-logo.svg::https://sources.archlinux.org/other/artwork/archlinux-logo-dark-scalable.svg' 'kcm-about-distrorc') +md5sums=('1e14ae65b6ef0b069c56585fd76083be' '518881f04ca9d4bd8526008767e40ba7' - '4b4e2496ea1de3a09de501b5d508f666' - '5f2f0db6fec3f6dcd0857122918a0e3d') + '4b4e2496ea1de3a09de501b5d508f666') 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() { diff --git a/fix-opengl-freeze.patch b/fix-opengl-freeze.patch deleted file mode 100644 index 2b101cb..0000000 --- a/fix-opengl-freeze.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Martin Gräßlin <mgraesslin@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); -