diff options
Diffstat (limited to 'extra')
33 files changed, 57 insertions, 821 deletions
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index 519423761..f17b7e395 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185936 2013-05-19 21:23:57Z dan $ +# $Id: PKGBUILD 193586 2013-08-24 16:53:45Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=doxygen pkgname=('doxygen' 'doxygen-docs') -pkgver=1.8.4 +pkgver=1.8.5 pkgrel=1 license=('GPL') arch=(i686 x86_64) @@ -11,8 +11,8 @@ url="http://www.doxygen.org/" makedepends=('gcc-libs' 'flex' 'qt4' 'texlive-core' 'ghostscript' 'texlive-latexextra' 'graphviz') source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) -md5sums=('5f460b91c0d8c34a76173cf22015c2fc') -sha1sums=('a363811b932e44d479addbadffcc8257cde60b44') +md5sums=('db51274568755e2c75c2657e30a78a55') +sha1sums=('1fc5ceec21122fe5037edee4c308ac94b59ee33e') build() { export PATH=$PATH:/usr/lib/qt4/bin diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index db9e2ba91..6a827b46e 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178956 2013-03-01 10:20:17Z andrea $ +# $Id: PKGBUILD 193564 2013-08-24 05:33:50Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin -pkgver=2.8.0 -pkgrel=2 +pkgver=2.8.1 +pkgrel=1 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' license=('LGPL') @@ -17,21 +17,22 @@ optdepends=('qt4: support for qt4 input method' 'anthy: support for anthy input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz") -sha1sums=('69fe604939bc013f043ff0b4baa63b7951b26c95') +sha1sums=('fc7323f1e0558675a94e91de2166c484c72d464d') install=install -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - - source /etc/profile.d/qt4.sh sed 's/lib64/lib/g' -i configure sed '/include suffixes-rule/a \ CFLAGS+='"${CFLAGS}"' \ LDFLAGS+='"${LDFLAGS}"' \ OPTFLAGS=' \ -i Makefile +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --use_i18n=Y make } diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index dd226717f..28ebc9cd9 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 191563 2013-07-25 14:47:59Z dan $ +# $Id: PKGBUILD 193588 2013-08-24 16:58:24Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.3.4 +pkgver=1.8.4 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -86,13 +86,13 @@ package() { cp -a ./contrib/* $pkgdir/usr/share/git/ # scripts are for python 2.x - sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ + sed -i 's|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|' \ $(find "$pkgdir" -name '*.py') \ "$pkgdir"/usr/lib/git-core/git-p4 \ "$pkgdir"/usr/share/git/gitview/gitview \ "$pkgdir"/usr/share/git/remote-helpers/git-remote-bzr \ "$pkgdir"/usr/share/git/remote-helpers/git-remote-hg - sed -i 's|#![ ]*/usr/bin/python|#!/usr/bin/python2|' \ + sed -i 's|#![ ]*/usr/bin/python$|#!/usr/bin/python2|' \ "$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py @@ -111,7 +111,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('80eec3201a5d012913d287b85adaee8e' - '86fd812754d25201fd72c7476045dfec' +md5sums=('355768a1c70d0cb4fedf4b598ac1375b' + 'e3720f56e18a5ab8ee1871ac9c72ca7c' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD index 3dca99e8e..0a7733c79 100644 --- a/extra/glsof/PKGBUILD +++ b/extra/glsof/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174150 2013-01-03 05:50:14Z eric $ +# $Id: PKGBUILD 193595 2013-08-24 22:19:33Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glsof -pkgver=2.2.0 -_fmver=2.2.0 +pkgver=2.4.0 +_fmver=2.4.0 _qver=1.0.0 pkgrel=1 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility" @@ -15,17 +15,19 @@ source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \ http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \ glsof-filemonitor glsof-queries) -sha1sums=('01697febfacc466b1cf0d7932c83ffd24b6e6784' +sha1sums=('a605167063492da724ae75fab0492b9cc44fa93f' 'd5a17d66dd02cd78bad5ffdda0b936c7848e4890' 'c5dd12e9b2860f1c427ed7cd482e898978051d2c' - '197b58f40880995d6442fd42a58fa1f4594fd19d' + '9c3097119aa98723c5c59196e6089226829cf09d' '2797c326904af16a254c3e39b8c529ea14ef37e5') package() { cd "${srcdir}" install -D -m755 glsof-filemonitor "${pkgdir}/usr/bin/glsof-filemonitor" install -D -m755 glsof-queries "${pkgdir}/usr/bin/glsof-queries" - install -D -m644 filemonitor/filemonitor.jar "${pkgdir}/usr/share/java/glsof/filemonitor.jar" + install -d "${pkgdir}/usr/share/java/glsof" + install -D -m644 filemonitor/*.jar "${pkgdir}/usr/share/java/glsof" + install -D -m644 filemonitor/*.txt "${pkgdir}/usr/share/java/glsof" if [ "$CARCH" = "i686" ]; then install -D -m644 queries_linux32/queries.jar "${pkgdir}/usr/share/java/glsof/queries.jar" install -D -m644 queries_linux32/queries.pdf "${pkgdir}/usr/share/doc/glsof/queries.pdf" diff --git a/extra/glsof/glsof-filemonitor b/extra/glsof/glsof-filemonitor index 616e23ac7..9dff4c0e7 100644 --- a/extra/glsof/glsof-filemonitor +++ b/extra/glsof/glsof-filemonitor @@ -1,2 +1,2 @@ #!/bin/sh -java -jar /usr/share/java/glsof/filemonitor.jar +java -Djava.security.policy=/usr/share/java/glsof/security-client.txt -jar /usr/share/java/glsof/filemonitor.jar diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD deleted file mode 100644 index ccb74805f..000000000 --- a/extra/kdeadmin/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 189522 2013-07-03 17:01:18Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdeadmin -pkgname=('kdeadmin-kcron' - 'kdeadmin-ksystemlog' - 'kdeadmin-kuser') -pkgver=4.10.5 -pkgrel=1 -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeadmin') -makedepends=('cmake' 'automoc4' 'kdepimlibs') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'syslog-path.patch') -sha1sums=('0b809772effe249d1ec581902fcecb73e7761134' - '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') - -prepare() { - cd ${pkgbase}-${pkgver} - patch -p1 -i ${srcdir}/syslog-path.patch -} - -build() { - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_strigi-analyzer=OFF - make -} - -package_kdeadmin-kcron() { - pkgdesc='Configure and schedule tasks' - url='http://userbase.kde.org/KCron' - depends=('kdelibs') - cd $srcdir/build/kcron - make DESTDIR=$pkgdir install - cd $srcdir/build/kcron/doc - make DESTDIR=$pkgdir install -} - -package_kdeadmin-ksystemlog() { - pkgdesc='System log viewer tool' - depends=('kdebase-runtime') - url="http://kde.org/applications/system/ksystemlog/" - cd $srcdir/build/ksystemlog - make DESTDIR=$pkgdir install - cd $srcdir/build/ksystemlog/doc - make DESTDIR=$pkgdir install -} - -package_kdeadmin-kuser() { - pkgdesc='User Manager' - depends=('kdebase-runtime' 'kdepimlibs') - url="http://kde.org/applications/system/kuser/" - install='kdeadmin.install' - cd $srcdir/build/kuser - make DESTDIR=$pkgdir install - cd $srcdir/build/kuser/doc - make DESTDIR=$pkgdir install -} diff --git a/extra/kdeadmin/kdeadmin.install b/extra/kdeadmin/kdeadmin.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/kdeadmin/kdeadmin.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdeadmin/syslog-path.patch b/extra/kdeadmin/syslog-path.patch deleted file mode 100644 index 8a9142bf6..000000000 --- a/extra/kdeadmin/syslog-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~ 2011-01-27 14:24:29.840000005 +0100 -+++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h 2011-01-27 14:24:53.803333335 +0100 -@@ -39,7 +39,7 @@ - SystemConfiguration() : - GenericLogModeConfiguration( - QLatin1String( SYSTEM_LOG_MODE_ID ), -- QStringList() << QLatin1String( "/var/log/syslog" ), -+ QStringList() << QLatin1String( "/var/log/messages.log" ), - QList<int>() << INFORMATION_LOG_LEVEL_ID - ) { - diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD deleted file mode 100644 index 7ffb94ae6..000000000 --- a/extra/kdenetwork/PKGBUILD +++ /dev/null @@ -1,122 +0,0 @@ -# $Id: PKGBUILD 191923 2013-08-01 06:59:53Z bpiotrowski $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdenetwork -pkgname=('kdenetwork-filesharing' - 'kdenetwork-kdnssd' - 'kdenetwork-kget' - 'kdenetwork-kopete' - 'kdenetwork-kppp' - 'kdenetwork-krdc' - 'kdenetwork-krfb') -pkgver=4.10.5 -pkgrel=2 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdenetwork') -makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp' - 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' - 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' - 'libktorrent' 'libmms' 'telepathy-qt') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'use-libotr3.patch' - 'giflib5.patch') -sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4' - '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384' - '388319373e96e6f44446ea1132c35ae9f660e01c') - -prepare() { - cd ${pkgbase}-${pkgver} - patch -p1 -i "${srcdir}"/use-libotr3.patch - cd kopete - patch -p1 -i "${srcdir}"/giflib5.patch -} - -build() { - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \ - -DWITH_Xmms=OFF \ - -DWITH_LibMeanwhile=OFF \ - -DWITH_qq=OFF - make -} - -package_kdenetwork-filesharing() { - pkgdesc='Konqueror properties dialog plugin to share a directory with the local network' - depends=('kdelibs' 'smbclient') - install='kdenetwork.install' - cd $srcdir/build/kdenetwork-filesharing - make DESTDIR=$pkgdir install -} - -package_kdenetwork-kdnssd() { - pkgdesc='Monitors the network for DNS-SD services' - depends=('kdelibs') - cd $srcdir/build/kdnssd - make DESTDIR=$pkgdir install -} - -package_kdenetwork-kget() { - pkgdesc='Download Manager' - depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms') - url="http://kde.org/applications/internet/kget/" - install='kdenetwork-kget.install' - cd $srcdir/build/kget - make DESTDIR=$pkgdir install -} - -package_kdenetwork-kopete() { - pkgdesc='Instant Messenger' - depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn' - 'libidn' 'qimageblitz' 'libgadu') - url="http://kde.org/applications/internet/kopete/" - install='kdenetwork-kopete.install' - cd $srcdir/build/kopete - make DESTDIR=$pkgdir install - cd $srcdir/build/kopete/doc - make DESTDIR=$pkgdir install -} - -package_kdenetwork-kppp() { - pkgdesc='Internet Dial-Up Tool' - depends=('kdebase-runtime' 'ppp') - url="http://kde.org/applications/internet/kppp/" - install='kdenetwork-kppp.install' - cd $srcdir/build/kppp - make DESTDIR=$pkgdir install - cd $srcdir/build/kppp/doc - make DESTDIR=$pkgdir install -} - -package_kdenetwork-krdc() { - pkgdesc='Remote Desktop Client' - depends=('kdebase-runtime' 'telepathy-qt') - optdepends=('libvncserver: VNC support' - 'rdesktop: RDP support' - 'kdebase-keditbookmarks: to edit bookmarks') - url="http://kde.org/applications/internet/krdc/" - cd $srcdir/build/krdc - make DESTDIR=$pkgdir install - cd $srcdir/build/krdc/doc - make DESTDIR=$pkgdir install -} - -package_kdenetwork-krfb() { - pkgdesc='Desktop Sharing' - # note on libxdamage: - # not detected by namcap because libgl depends on it - # but nvidia providing libgl does not depend on libxdamage - depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt') - cd $srcdir/build/krfb - make DESTDIR=$pkgdir install - cd $srcdir/build/krfb/doc - make DESTDIR=$pkgdir install -} diff --git a/extra/kdenetwork/giflib5.patch b/extra/kdenetwork/giflib5.patch deleted file mode 100644 index 231aefbc2..000000000 --- a/extra/kdenetwork/giflib5.patch +++ /dev/null @@ -1,67 +0,0 @@ -From: Raymond Wooninck <tittiatcoke@gmail.com> -Date: Sun, 17 Mar 2013 12:24:09 +0000 -Subject: Enable building with giflib v5 -X-Git-Tag: v4.10.80 -X-Git-Url: http://quickgit.kde.org/?p=kopete.git&a=commitdiff&h=47ceec53aa5ee6b84a753fdbf735e44558513fe2 ---- -Enable building with giflib v5 - -REVIEW: 7066 - -svn path=/trunk/KDE/kdenetwork/kopete/; revision=1344846 ---- - - ---- a/protocols/wlm/wlmchatsession.cpp -+++ b/protocols/wlm/wlmchatsession.cpp -@@ -65,6 +65,10 @@ - #include "wlmchatsessioninkaction.h" - #ifdef HAVE_GIFLIB - #include <gif_lib.h> -+/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */ -+#ifndef GIFLIB_MAJOR -+#define GIFLIB_MAJOR 4 -+#endif - #endif - - WlmChatSession::WlmChatSession (Kopete::Protocol * protocol, -@@ -467,11 +471,15 @@ - { - #ifdef HAVE_GIFLIB - #ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+ -+#if GIFLIB_MAJOR >= 5 -+ fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n"); -+#else - const char * errorString = GifErrorString(); - if (errorString) - fprintf(stderr, "GIF-LIB error: %s\n", errorString); - else - fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError()); -+#endif - #else // older giflib versions, libungif - PrintGifError(); - #endif // HAVE_GIF_ERROR_STRING -@@ -483,6 +491,10 @@ - WlmChatSession::convertToGif( const QPixmap & ink, QString filename) - { - #ifdef HAVE_GIFLIB -+#if GIFLIB_MAJOR >= 5 -+#define FreeMapObject GifFreeMapObject -+#define MakeMapObject GifMakeMapObject -+#endif - int i, status; - GifFileType *GifFile; - ColorMapObject *screenColourmap; -@@ -525,7 +537,11 @@ - } - } - -+#if GIFLIB_MAJOR >= 5 -+ GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL); -+#else - GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0); -+#endif - if (!GifFile) { - FreeMapObject(imageColourmap); - FreeMapObject(screenColourmap); - diff --git a/extra/kdenetwork/kdenetwork-kget.install b/extra/kdenetwork/kdenetwork-kget.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdenetwork/kdenetwork-kget.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdenetwork/kdenetwork-kopete.install b/extra/kdenetwork/kdenetwork-kopete.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdenetwork/kdenetwork-kopete.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdenetwork/kdenetwork-kppp.install b/extra/kdenetwork/kdenetwork-kppp.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdenetwork/kdenetwork-kppp.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdenetwork/kdenetwork.install b/extra/kdenetwork/kdenetwork.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/kdenetwork/kdenetwork.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdenetwork/use-libotr3.patch b/extra/kdenetwork/use-libotr3.patch deleted file mode 100644 index 1e96c98d6..000000000 --- a/extra/kdenetwork/use-libotr3.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake ---- a/kopete/cmake/modules/FindLibOTR.cmake 2012-08-12 18:08:59.000000000 -0600 -+++ b/kopete/cmake/modules/FindLibOTR.cmake 2012-11-09 12:14:24.251450904 -0700 -@@ -13,13 +13,13 @@ - SET(LIBOTR_FIND_QUIETLY TRUE) - ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY) - --FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h) -+FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h) - --FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr) -+FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3) - --# Determine version information from libotr/version.h -+# Determine version information from libotr3/version.h - IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY ) -- EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output) -+ EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output) - STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}") - STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}") - # Check if version is at least 3.2.0 -diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h ---- a/kopete/plugins/otr/authenticationwizard.h 2012-08-12 18:09:00.000000000 -0600 -+++ b/kopete/plugins/otr/authenticationwizard.h 2012-11-09 12:15:11.181265336 -0700 -@@ -26,7 +26,7 @@ - */ - - extern "C"{ --#include "libotr/proto.h" -+#include "libotr3/proto.h" - } - - #include "kopetechatsession.h" -diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h ---- a/kopete/plugins/otr/otrlchatinterface.h 2012-08-12 18:09:00.000000000 -0600 -+++ b/kopete/plugins/otr/otrlchatinterface.h 2012-11-09 12:16:10.141032744 -0700 -@@ -36,10 +36,10 @@ - #include "authenticationwizard.h" - - extern "C" { --#include <libotr/privkey.h> --#include <libotr/proto.h> --#include <libotr/message.h> --#include <libotr/userstate.h> -+#include <libotr3/privkey.h> -+#include <libotr3/proto.h> -+#include <libotr3/message.h> -+#include <libotr3/userstate.h> - } - - -diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h ---- a/kopete/plugins/otr/otrlconfinterface.h 2012-08-12 18:09:00.000000000 -0600 -+++ b/kopete/plugins/otr/otrlconfinterface.h 2012-11-09 12:15:56.961084991 -0700 -@@ -32,11 +32,11 @@ - #include <kopetechatsession.h> - - extern "C" { --#include <libotr/privkey.h> --#include <libotr/proto.h> --#include <libotr/message.h> --#include <libotr/userstate.h> --#include <libotr/context.h> -+#include <libotr3/privkey.h> -+#include <libotr3/proto.h> -+#include <libotr3/message.h> -+#include <libotr3/userstate.h> -+#include <libotr3/context.h> - } - - class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD deleted file mode 100644 index 9438c55f0..000000000 --- a/extra/kdesdk/PKGBUILD +++ /dev/null @@ -1,199 +0,0 @@ -# $Id: PKGBUILD 189610 2013-07-03 17:03:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdesdk -pkgname=('kdesdk-cervisia' - 'kdesdk-dolphin-plugins' - 'kdesdk-dev-utils' - 'kdesdk-dev-scripts' - 'kdesdk-kapptemplate' - 'kdesdk-kcachegrind' - 'kdesdk-kioslaves' - 'kdesdk-kompare' - 'kdesdk-lokalize' - 'kdesdk-okteta' - 'kdesdk-poxml' - 'kdesdk-strigi-analyzers' - 'kdesdk-umbrello') -pkgver=4.10.5 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdesdk') -makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' - 'kdebase-lib') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'fix-python2-path.patch') -sha1sums=('e14780cfd63f14cc4b5ec2f769af6a5e9b416940' - '07db42bbcae402c292eebf002e549b04162621c5') - -prepare() { - cd ${pkgbase}-${pkgver} - - # Fix hardcoded python2 cmd - patch -Np1 -i ${srcdir}/fix-python2-path.patch -} - -build() { - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdesdk-cervisia() { - pkgdesc='CVS Frontend' - depends=('kdebase-runtime') - url="http://kde.org/applications/development/cervisia/" - install='kdesdk-cervisia.install' - cd $srcdir/build/cervisia - make DESTDIR=$pkgdir install -} - -package_kdesdk-dev-utils() { - pkgdesc='Small utilities for developers using KDE/Qt libs/frameworks' - url="https://projects.kde.org/projects/kde/kdesdk/kde-dev-utils" - depends=('kdebase-runtime') - conflicts=('kdesdk-kmtrace' 'kdesdk-kpartloader' 'kdesdk-kprofilemethod' - 'kdesdk-kstartperf' 'kdesdk-kuiviewer') - replaces=('kdesdk-kmtrace' 'kdesdk-kpartloader' 'kdesdk-kprofilemethod' - 'kdesdk-kstartperf' 'kdesdk-kuiviewer') - install='kdesdk-dev-utils.install' - cd $srcdir/build/kde-dev-utils - make DESTDIR=$pkgdir install -} - -package_kdesdk-dolphin-plugins() { - pkgdesc='Extra Dolphin plugins' - url="https://projects.kde.org/projects/kde/kdesdk/dolphin-plugins" - depends=('kdebase-dolphin') - optdepends=('bzr: bazaar support' - 'git: git support' - 'mercurial: hg support' - 'subversion: svn support') - install='kdesdk.install' - cd $srcdir/build/dolphin-plugins - make DESTDIR=$pkgdir install -} - -package_kdesdk-kapptemplate() { - pkgdesc='KDE Template Generator' - depends=('kdebase-runtime') - url="http://kde.org/applications/development/kapptemplate/" - install='kdesdk.install' - cd $srcdir/build/kapptemplate - make DESTDIR=$pkgdir install -} - -package_kdesdk-kcachegrind() { - pkgdesc='Visualization of Performance Profiling Data' - depends=('kdebase-runtime' 'python2') - optdepends=('php: PHP support') - url="http://kde.org/applications/development/kcachegrind/" - install='kdesdk-kcachegrind.install' - cd $srcdir/build/kcachegrind - make DESTDIR=$pkgdir install - - # Fix python 2 path - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/bin/hotshot2calltree -} - -package_kdesdk-kioslaves() { - pkgdesc='KIO-Slaves' - url="https://projects.kde.org/projects/kde/kdesdk/kdesdk-kioslaves" - depends=('kdebase-runtime' 'subversion') - install='kdesdk.install' - replaces=('kdesdk-kioslave') - conflicts=('kdesdk-kioslave') - cd $srcdir/build/kdesdk-kioslaves - make DESTDIR=$pkgdir install -} - -package_kdesdk-kompare() { - pkgdesc='Diff/Patch Frontend' - depends=('kdebase-runtime') - url="http://kde.org/applications/development/kompare/" - install='kdesdk-kompare.install' - cd $srcdir/build/kompare - make DESTDIR=$pkgdir install -} - -package_kdesdk-lokalize() { - pkgdesc='Computer-Aided Translation System' - depends=('kdebase-runtime' 'kdebindings-python2' 'kdesdk-strigi-analyzers') - url="http://kde.org/applications/development/lokalize/" - optdepends=('translate-toolkit: enable extra python script') - install='kdesdk-lokalize.install' - cd $srcdir/build/lokalize - make DESTDIR=$pkgdir install - - # Fix python 2 path - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/share/apps/lokalize/scripts/odf/xliffmerge.py -} - -package_kdesdk-okteta() { - pkgdesc='Hex Editor' - depends=('kdebase-runtime') - replaces=('kdeutils-okteta') - conflicts=('kdeutils-okteta') - url="http://kde.org/applications/utilities/okteta/" - install='kdesdk-okteta.install' - cd $srcdir/build/okteta - make DESTDIR=$pkgdir install -} - -package_kdesdk-poxml() { - pkgdesc='Translates DocBook XML files using gettext po files' - url="https://projects.kde.org/projects/kde/kdesdk/poxml" - depends=('qt4') - optdepends=('antlr2: required for po2xml and swappo tool') - cd $srcdir/build/poxml - make DESTDIR=$pkgdir install -} - -package_kdesdk-dev-scripts() { - pkgdesc='Scripts and setting files useful during development of KDE software' - url="https://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts" - depends=('python2') - replaces=('kdesdk-scripts') - conflicts=('kdesdk-scripts') - cd $srcdir/build/kde-dev-scripts - make DESTDIR=$pkgdir install - - # Fix python 2 path - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/bin/{zonetab2pot,kde-systemsettings-tree}.py - sed -i 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/bin/{kdelnk2desktop.py,kde_generate_export_header} -} - -package_kdesdk-strigi-analyzers() { - pkgdesc='Analyzer plugins for strigi' - url="https://projects.kde.org/projects/kde/kdesdk/kdesdk-strigi-analyzers" - depends=('kdelibs') - conflicts=('kdesdk-strigi-analyzer') - replaces=('kdesdk-strigi-analyzer') - cd $srcdir/build/kdesdk-strigi-analyzers - make DESTDIR=$pkgdir install -} - -package_kdesdk-umbrello() { - pkgdesc='UML Modeller' - depends=('kdebase-runtime') - optdepends=('ruby') - url="http://kde.org/applications/development/umbrello/" - install='kdesdk-umbrello.install' - cd $srcdir/build/umbrello - make DESTDIR=$pkgdir install - - # Fix python 2 path - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/share/apps/umbrello/headings/heading.py -} diff --git a/extra/kdesdk/fix-python2-path.patch b/extra/kdesdk/fix-python2-path.patch deleted file mode 100644 index 9e9a442c0..000000000 --- a/extra/kdesdk/fix-python2-path.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kdesdk-4.5.80/lokalize/scripts/msgmerge.py~ 2010-11-24 11:22:42.120000002 +0100 -+++ kdesdk-4.5.80/lokalize/scripts/msgmerge.py 2010-11-24 11:22:42.146666670 +0100 -@@ -114,7 +114,7 @@ - print >>sys.stderr, "Execution failed:", e - - cmd='%s/odf/xliffmerge.py -i %s -t %s -o %s' % (ourPath,xliffpathname,xlifftemplatepathname,xliffpathname) -- if os.name!='nt': cmd='python '+cmd -+ if os.name!='nt': cmd='python2 '+cmd - else: cmd=cmd.replace('/','\\') - os.system(cmd) - ---- kdesdk-4.5.80/lokalize/scripts/xliff2odf.py~ 2010-11-24 11:24:10.853333336 +0100 -+++ kdesdk-4.5.80/lokalize/scripts/xliff2odf.py 2010-11-24 11:24:10.883333336 +0100 -@@ -42,7 +42,7 @@ - xliff2odf.convertxliff(xliffinput, translatedodfpathname, odf) - - ourpath=([p for p in sys.path if os.path.exists(p+'/xliff2odf.py')]+[''])[0] -- os.system('python "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId())) -+ os.system('python2 "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId())) - - try: convert() - except: print 'error occured' diff --git a/extra/kdesdk/kdesdk-cervisia.install b/extra/kdesdk/kdesdk-cervisia.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdesdk/kdesdk-cervisia.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdesdk/kdesdk-dev-utils.install b/extra/kdesdk/kdesdk-dev-utils.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdesdk/kdesdk-dev-utils.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdesdk/kdesdk-kcachegrind.install b/extra/kdesdk/kdesdk-kcachegrind.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdesdk/kdesdk-kcachegrind.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdesdk/kdesdk-kompare.install b/extra/kdesdk/kdesdk-kompare.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdesdk/kdesdk-kompare.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdesdk/kdesdk-lokalize.install b/extra/kdesdk/kdesdk-lokalize.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdesdk/kdesdk-lokalize.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdesdk/kdesdk-okteta.install b/extra/kdesdk/kdesdk-okteta.install deleted file mode 100644 index 3f06b8deb..000000000 --- a/extra/kdesdk/kdesdk-okteta.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdesdk/kdesdk-umbrello.install b/extra/kdesdk/kdesdk-umbrello.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/extra/kdesdk/kdesdk-umbrello.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdesdk/kdesdk.install b/extra/kdesdk/kdesdk.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/kdesdk/kdesdk.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD deleted file mode 100644 index 983557a0b..000000000 --- a/extra/kdetoys/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 189611 2013-07-03 17:03:53Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdetoys -pkgname=('kdetoys-amor' - 'kdetoys-kteatime' - 'kdetoys-ktux') -pkgver=4.10.5 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdetoys') -makedepends=('cmake' 'automoc4' 'kdebase-workspace') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('acecc68284addf327b70a72c787befd2cc0f28d2') - -build() { - cd $srcdir - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdetoys-amor() { - pkgdesc='On-Screen Creature' - depends=('kdebase-runtime') - install='kdetoys.install' - cd $srcdir/build/amor - make DESTDIR=$pkgdir install -} - -package_kdetoys-kteatime() { - pkgdesc='Tea Cooker' - depends=('kdebase-runtime') - install='kdetoys.install' - cd $srcdir/build/kteatime - make DESTDIR=$pkgdir install -} - -package_kdetoys-ktux() { - pkgdesc='KTux' - depends=('kdebase-workspace' ) - install='kdetoys.install' - cd $srcdir/build/ktux - make DESTDIR=$pkgdir install -} diff --git a/extra/kdetoys/kdetoys.install b/extra/kdetoys/kdetoys.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/kdetoys/kdetoys.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index 1a492c40b..2dbafdc8c 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186572 2013-05-29 15:13:14Z andyrtr $ +# $Id: PKGBUILD 193566 2013-08-24 08:12:15Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.4.8 +pkgver=4.4.9 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2 ) -md5sums=('7140263fbe12f17f74183cf065a7d381') +md5sums=('f942d632d71b7bf35dca2e75a8432b83') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libwpd/PKGBUILD b/extra/libwpd/PKGBUILD index 306b7fc68..2f53ac4ac 100644 --- a/extra/libwpd/PKGBUILD +++ b/extra/libwpd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183192 2013-04-18 16:39:00Z andyrtr $ +# $Id: PKGBUILD 193569 2013-08-24 08:25:38Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=libwpd -pkgver=0.9.6 +pkgver=0.9.9 pkgrel=1 pkgdesc="Library for importing WordPerfect (tm) documents" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('gcc-libs' 'zlib') makedepends=('libgsf>=1.14.26') options=('!libtool' '!emptydirs') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz) -md5sums=('63f476b892bf783072854b98d2fc4fa2') +md5sums=('6b74a863c957563924546e16cc833591') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 312a32bcc..de942b78f 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 193531 2013-08-22 14:49:14Z andrea $ +# $Id: PKGBUILD 193580 2013-08-24 12:37:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> pkgbase=sip pkgname=('sip' 'python-sip' 'python2-sip') -pkgver=4.15 +pkgver=4.15.1 pkgrel=1 arch=('i686' 'x86_64') url='http://www.riverbankcomputing.com/software/sip/intro' license=('custom:"sip"') makedepends=('python' 'python2') source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz") -md5sums=('8c1133c96c9ddec92c0ab429dec96fe6') +md5sums=('ec1ce361ac3618fe05359ec6f5368463') build() { cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} diff --git a/extra/suil/PKGBUILD b/extra/suil/PKGBUILD index dfd2e2323..98320b3f2 100644 --- a/extra/suil/PKGBUILD +++ b/extra/suil/PKGBUILD @@ -4,12 +4,12 @@ pkgname=suil pkgver=0.6.14 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs" arch=('i686' 'x86_64') url="http://drobilla.net/software/suil/" license=('custom:ISC') -depends=('lv2') +depends=('lv2>=1.6.0') makedepends=('python2' 'qt4' 'gtk2') optdepends=('qt4: Qt 4.x UI wrapping support' 'gtk2: GTK+ 2.x UI wrapping support') @@ -23,7 +23,7 @@ build() { sed -i "/ldconfig/d" wscript python2 waf configure --prefix=/usr - python2 waf + python2 waf build $MAKEFLAGS } package() { diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 962feec51..f7f2d4f4b 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 192403 2013-08-10 17:30:29Z lcarlier $ +# $Id: PKGBUILD 193567 2013-08-24 08:12:29Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.14 -pkgrel=2 +pkgver=2.21.15 +pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') install=$pkgname.install pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" -depends=('intel-dri' 'libxvmc' 'xcb-util>=0.3.9' 'systemd') +depends=('intel-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9') makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender') replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna') provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna') @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('cc74d482dfd1f6b87773233a6d5c36118039b42fe7f8d99ee28bda7b78aa3b49') +sha256sums=('7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-intel/xf86-video-intel.install b/extra/xf86-video-intel/xf86-video-intel.install index b03eea8aa..661387906 100644 --- a/extra/xf86-video-intel/xf86-video-intel.install +++ b/extra/xf86-video-intel/xf86-video-intel.install @@ -1,12 +1,19 @@ post_upgrade() { - post_install + if (( $(vercmp $2 2.21.15) < 0 )); then + post_install + fi } post_install() { - echo ">>> This driver now uses sna as the default" - echo ">>> acceleration methods." - echo ">>> You can use uxa method if you run into trouble." - echo ">>> Add to the device section in /etc/X11/xorg.conf" - echo ">>> Option \"AccelMethod\" \"uxa\"" + cat <<MSG +>>> This driver now uses SNA as the default acceleration method. You can + still fall back to UXA if you run into trouble. To do so, save a file + with the following content as /etc/X11/xorg.conf.d/20-intel.conf : + Section "Device" + Identifier "Intel Graphics" + Driver "intel" + Option "AccelMethod" "uxa" + EndSection +MSG } |