diff options
Diffstat (limited to 'extra')
87 files changed, 1205 insertions, 363 deletions
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index a277edadc..0d905661b 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 172156 2012-11-30 08:00:25Z ronald $ +# $Id: PKGBUILD 175688 2013-01-19 15:34:07Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') -pkgver=2.6.0 -pkgrel=3 +pkgver=2.7.0 +pkgrel=1 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64" 'mips64el') url="http://amarok.kde.org" license=('GPL2' 'LGPL2.1' 'FDL') depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras' - 'liblastfm' 'ffmpeg' 'libofa' 'qjson' 'mesa') + 'liblastfm' 'ffmpeg' 'libofa' 'qjson') makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' - 'libmygpo-qt') + 'libmygpo-qt' 'mesa') optdepends=("libgpod: support for Apple iPod audio devices" "libmtp: support for portable media devices" "loudmouth: backend needed by mp3tunes for syncing" @@ -22,8 +22,8 @@ optdepends=("libgpod: support for Apple iPod audio devices" "libmygpo-qt: gpodder.net Internet Service") install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('2cfcdabb67436418ba0012075ba105bbb630b48d') - +sha1sums=('d0ae4a2cb81a54ae94ca24fdb3aed88d7f3a921e') + build() { cd "${srcdir}" @@ -31,6 +31,7 @@ build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/extra/appmenu-qt/PKGBUILD b/extra/appmenu-qt/PKGBUILD index 3cb3b4dad..a501eb811 100644 --- a/extra/appmenu-qt/PKGBUILD +++ b/extra/appmenu-qt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174631 2013-01-05 12:47:25Z andrea $ +# $Id: PKGBUILD 175130 2013-01-14 17:12:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=appmenu-qt pkgver=0.2.6 -pkgrel=2 +pkgrel=3 pkgdesc="Allows Qt applications to export menus over DBus to a menu applet" arch=('i686' 'x86_64' 'mips64el') url='https://launchpad.net/appmenu-qt' @@ -14,7 +14,7 @@ source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${ 'appmenu-async.diff') md5sums=('90cce750e5412d43ce075b0a9bdb6782' 'de499d01369fc85040f5bbfc53ae1700' - '82947207881702d88403c149406b502a') + '5db00ca92274c8b1797c204321961189') build() { # FS#33286 diff --git a/extra/appmenu-qt/appmenu-async.diff b/extra/appmenu-qt/appmenu-async.diff index c4bc509d7..59e3ce791 100644 --- a/extra/appmenu-qt/appmenu-async.diff +++ b/extra/appmenu-qt/appmenu-async.diff @@ -119,3 +119,31 @@ + </interface> +</node> +=== modified file 'src/appmenuplatformmenubar.cpp' +--- src/appmenuplatformmenubar.cpp 2013-01-11 15:05:38 +0000 ++++ src/appmenuplatformmenubar.cpp 2013-01-14 16:01:25 +0000 +@@ -410,6 +410,10 @@ + registrar = new com::canonical::AppMenu::Registrar(REGISTRAR_SERVICE, REGISTRAR_PATH, QDBusConnection::sessionBus(), 0); + } + ++ if (!registrar || !registrar->isValid()) { ++ return false; ++ } ++ + Q_FOREACH(QAction *action, m_menuBar->actions()) { + if (!action->isSeparator()) { + m_rootMenu->addAction(action); +@@ -430,9 +434,9 @@ + } + + m_registeredWinId = winId; +- if (registrar) { +- registrar->RegisterWindow(winId, QDBusObjectPath(m_objectPath)); +- } ++ ++ registrar->RegisterWindow(winId, QDBusObjectPath(m_objectPath)); ++ + return true; + } + + diff --git a/extra/baobab/PKGBUILD b/extra/baobab/PKGBUILD index 7c9ae5a38..adcfce1d8 100644 --- a/extra/baobab/PKGBUILD +++ b/extra/baobab/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 171029 2012-11-15 14:16:00Z heftig $ +# $Id: PKGBUILD 175196 2013-01-16 11:12:55Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=baobab -pkgver=3.6.3 +pkgver=3.6.4 pkgrel=1 pkgdesc="A graphical directory tree analyzer" arch=(i686 x86_64 mips64el) @@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection') groups=('gnome-extra') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('24ec516b12da234f1bd7bff3ccb2be9a46dff0b1fb0fa6cd79ff50549a295eb1') +sha256sums=('e5539558ef3411e14cb165a3e77f2d0451e984722a71a7a7d0f72fe29360cb2e') build() { cd "$pkgname-$pkgver" diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 7c3d541d5..5abf9bdf7 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171683 2012-11-21 11:19:58Z andrea $ +# $Id: PKGBUILD 175030 2013-01-12 08:15:19Z andyrtr $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -18,13 +18,13 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.5.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'lcms2' 'libmysqlclient' 'freetds' 'xbase' 'libwpg' - 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw' + 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt>=0.22.0' 'libkdcraw' 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") @@ -135,8 +135,7 @@ package_calligra-plan() { package_calligra-stage() { pkgdesc="Write presentation documents" - depends=('calligra-libs' 'kdebase-runtime') - optdepends=('calligra-plugins: extra calligra plugins') + depends=('calligra-plugins' 'kdebase-runtime') conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') install=calligra-stage.install @@ -177,7 +176,7 @@ package_calligra-sheets() { package_calligra-words() { pkgdesc="Word Processor" - depends=('calligra-libs' 'kdegraphics-okular') + depends=('calligra-plugins' 'kdegraphics-okular') optdepends=('calligra-tools: extra calligra tools') conflicts=('koffice-kword') replaces=('koffice-kword') diff --git a/extra/dmapi/PKGBUILD b/extra/dmapi/PKGBUILD index 79bf8314e..43f43cc5f 100644 --- a/extra/dmapi/PKGBUILD +++ b/extra/dmapi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137722 2011-09-10 14:14:07Z pierre $ +# $Id: PKGBUILD 175121 2013-01-14 07:38:26Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=dmapi -pkgver=2.2.10 -pkgrel=3.1 +pkgver=2.2.12 +pkgrel=1 pkgdesc="Data migration API" arch=('i686' 'x86_64' 'mips64el') url="http://oss.sgi.com/projects/xfs/" @@ -15,7 +15,6 @@ conflicts=('xfsdmapi') replaces=('xfsdmapi') options=('!libtool') source=("ftp://oss.sgi.com/projects/xfs/cmd_tars/$pkgname-$pkgver.tar.gz") -md5sums=('c6e4ace10c446bbb92576e5dd19aec24') build() { cd $srcdir/dmapi-$pkgver @@ -38,3 +37,4 @@ package() { # kill libexec dir rm -rf $pkgdir/usr/libexec } +md5sums=('cd825d4e141c16011367e0a0dd98c9c5') diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index 7296cadaa..a28ee8295 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 174826 2013-01-07 19:40:46Z ronald $ +# $Id: PKGBUILD 175032 2013-01-12 08:15:25Z andyrtr $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas_generic_loaders pkgver=1.7.5 -pkgrel=1 +pkgrel=2 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index 76576ab8a..4f384f226 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 174012 2013-01-01 13:02:26Z bisson $ +# $Id: PKGBUILD 175213 2013-01-16 21:13:09Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -6,7 +6,7 @@ pkgname=feh pkgver=2.8 -pkgrel=1 +pkgrel=2 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' license=('custom:MIT') @@ -20,7 +20,7 @@ sha1sums=('eeb251d5971cf07e632661ef0b514fc3b0c7aca6') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX=/usr exif=1 help=1 + make PREFIX=/usr exif=1 help=1 stat64=1 } package() { diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD index 3ea5317d4..a1b5b0062 100644 --- a/extra/fontconfig/PKGBUILD +++ b/extra/fontconfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172072 2012-11-27 15:23:20Z andyrtr $ +# $Id: PKGBUILD 175209 2013-01-16 17:39:36Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=fontconfig pkgver=2.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64 'mips64el') url="http://www.fontconfig.org/release/" @@ -21,7 +21,7 @@ build() { # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well libtoolize -f - autoreconf -f + autoreconf -fi ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index bdb4ced38..375e1c1b6 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 174135 2013-01-02 14:21:11Z dan $ +# $Id: PKGBUILD 175132 2013-01-14 22:24:03Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.1 +pkgver=1.8.1.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -28,13 +28,11 @@ source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" git-daemon git-daemon.conf git-daemon@.service - git-daemon.socket - fix-git-build-python.patch) + git-daemon.socket) build() { export PYTHON_PATH='/usr/bin/python2' cd "$srcdir/$pkgname-$pkgver" - patch -Np1 < ../fix-git-build-python.patch make prefix=/usr gitexecdir=/usr/lib/git-core \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ USE_LIBPCRE=1 \ @@ -111,10 +109,9 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('a2c6f4404c5e432b47474d246ca83c7e' - '8da825142aed9f37f80ad67164990373' +md5sums=('2bf7fd005ecf2e0a311b849e6add7994' + '4ac4ea5a72ec96ac24b7d6fba9ad1277' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78' '042524f942785772d7bd52a1f02fe5ae' - 'f67869315c2cc112e076f0c73f248002' - '7fd505fdcd0cd0223e5b8ad641090de8') + 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD index 8ef55d234..0fce0fd62 100644 --- a/extra/gnome-color-manager/PKGBUILD +++ b/extra/gnome-color-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169889 2012-10-30 22:33:42Z heftig $ +# $Id: PKGBUILD 175200 2013-01-16 13:44:28Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-color-manager -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="Color profile manager for the GNOME desktop" arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ install=gnome-color-manager.install options=('!libtool' '!emptydirs') groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('c4e9d63c53061c65c4d1bcdd14952dd01aed7332c2e36d34f4a243a9e5097ec9') +sha256sums=('c5fb0903d5570c50fbb2347db2222314bef0c57b293302e48e0b73f57f426fb7') build(){ cd $pkgname-$pkgver diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD index d0ec12f60..3a561a5f5 100644 --- a/extra/gnome-menus/PKGBUILD +++ b/extra/gnome-menus/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 170973 2012-11-14 07:13:15Z heftig $ +# $Id: PKGBUILD 175187 2013-01-16 10:52:05Z jgc $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-menus -pkgver=3.6.1 +pkgver=3.6.2 pkgrel=1 pkgdesc="GNOME menu specifications" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz menus.patch) -sha256sums=('1615f6852280a161cd137d5b8b59f35519a3a7ba89738f55c578325b0512043e' +sha256sums=('f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f' 'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc') build() { diff --git a/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch index 03b662c86..eb77bada2 100644 --- a/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch +++ b/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch @@ -1412,9 +1412,9 @@ index 1c594d8..bb7224c 100644 g_signal_connect (manager->priv->up_client, "device-added", G_CALLBACK (engine_device_added_cb), manager); @@ -3895,6 +4119,9 @@ gsd_power_manager_start (GsdPowerManager *manager, - manager->priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error); - if (manager->priv->x11_screen == NULL) - return FALSE; + G_CALLBACK (idle_idletime_reset_cb), manager); + g_signal_connect (manager->priv->idletime, "alarm-expired", + G_CALLBACK (idle_idletime_alarm_expired_cb), manager); + g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager); + /* set up initial state */ + on_randr_event (manager->priv->x11_screen, manager); diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index 6ee46d6b9..263b5d9cc 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170991 2012-11-14 14:29:35Z ibiru $ +# $Id: PKGBUILD 175198 2013-01-16 13:36:50Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.6.3 -pkgrel=2 +pkgver=3.6.4 +pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,8 +16,8 @@ url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch) -sha256sums=('606aaaba9cc7f51035702aead46c8bb595917a09cb947b396a579ea443328cdc' - 'c4aab9b45346fbae18808358346208f989cce8bf9c9eb753e2af7eca73715109') +sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15' + '5572b5b3f554ce361353a8db42c26a8f789606f65acc5943a286271603fcb8eb') build() { cd $pkgname-$pkgver @@ -25,8 +25,10 @@ build() { # logind key handling FS#31801, patch from Fedora # rebased onto screensaver.patch patch -Np1 -i ../0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch + aclocal - automake + autoconf + automake --add-missing ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \ diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD index c0e5362f4..35c7fd8cd 100644 --- a/extra/gst-plugins-ugly/PKGBUILD +++ b/extra/gst-plugins-ugly/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 173512 2012-12-19 19:49:27Z heftig $ +# $Id: PKGBUILD 175143 2013-01-15 11:34:05Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-ugly -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Ugly Plugins" arch=('i686' 'x86_64' 'mips64el') @@ -11,12 +11,14 @@ url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('509ec52b58523e6ab1f9d9facdbbf8417fb95bbcb1a90e1ec53f90019da710d8') +sha256sums=('a62a182ea96d9b2783b493b46d531914db9d2ebb9e537e9c84668fe752791331') build() { cd $pkgname-$pkgver sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf + aclocal -I m4 -I common/m4 + autoconf + automake --add-missing ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index aa92ed560..ac8eb9344 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 171265 2012-11-16 23:35:43Z ibiru $ +# $Id: PKGBUILD 175144 2013-01-15 11:34:09Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.19 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') url="http://gstreamer.freedesktop.org/" options=(!libtool) source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz - opencore-amr.patch) + opencore-amr.patch + cdio-cd-text-api.patch) md5sums=('ba26045c8c8c91f0d48d327ccf53ac0c' - 'd8feb6c99bfaff8be6b2c48ea4e98e47') + 'd8feb6c99bfaff8be6b2c48ea4e98e47' + '6c1c665f864387f3a77d32231fedeaab') build() { cd "${srcdir}/gst-plugins-ugly-${pkgver}" patch -Np0 -i "${srcdir}/opencore-amr.patch" + patch -Np1 -i "${srcdir}/cdio-cd-text-api.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --with-package-name="GStreamer Ugly Plugins (Parabola GNU/Linux-libre)" \ diff --git a/extra/gstreamer0.10-ugly/cdio-cd-text-api.patch b/extra/gstreamer0.10-ugly/cdio-cd-text-api.patch new file mode 100644 index 000000000..cbd16b8e4 --- /dev/null +++ b/extra/gstreamer0.10-ugly/cdio-cd-text-api.patch @@ -0,0 +1,183 @@ +From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 2001 +From: Leon Merten Lohse <leon@green-side.de> +Date: Thu, 03 May 2012 22:50:30 +0000 +Subject: cdio: compensate for libcdio's recent cd-text api changes + +https://bugzilla.gnome.org/show_bug.cgi?id=675112 + +Conflicts: + + ext/cdio/gstcdiocddasrc.c +--- +diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c +index 2f58d18..483ebf5 100644 +--- a/ext/cdio/gstcdio.c ++++ b/ext/cdio/gstcdio.c +@@ -30,12 +30,16 @@ + GST_DEBUG_CATEGORY (gst_cdio_debug); + + void +-gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, ++gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track, + cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags) + { + const gchar *txt; + ++#if LIBCDIO_VERSION_NUM > 83 ++ txt = cdtext_get_const (cdtext, field, track); ++#else + txt = cdtext_get_const (field, cdtext); ++#endif + if (txt == NULL || *txt == '\0') { + GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag); + return; +@@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, + } + + GstTagList * ++#if LIBCDIO_VERSION_NUM > 83 ++gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track) ++{ ++ GstTagList *tags = NULL; ++ ++#else + gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) + { + GstTagList *tags = NULL; +@@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) + GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track); + return NULL; + } ++#endif + +- gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags); +- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags); ++ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER, ++ GST_TAG_ARTIST, &tags); ++ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE, ++ &tags); + + return tags; + } + + void ++#if LIBCDIO_VERSION_NUM > 83 ++gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t, ++ GstTagList * tags) ++{ ++#else + gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) + { + cdtext_t *t; +@@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) + GST_DEBUG_OBJECT (src, "no CD-TEXT for album"); + return; + } ++#endif + +- /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */ +- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags); +- gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags); +- ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER, ++ GST_TAG_ALBUM_ARTIST, &tags); ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM, ++ &tags); ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE, ++ &tags); + GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags); + } + +diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h +index ef31ed0..c6da580 100644 +--- a/ext/cdio/gstcdio.h ++++ b/ext/cdio/gstcdio.h +@@ -24,22 +24,38 @@ + #include <gst/gst.h> + #include <cdio/cdio.h> + #include <cdio/cdtext.h> ++#include <cdio/version.h> ++ ++#if LIBCDIO_VERSION_NUM <= 83 ++ #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER ++ #define CDTEXT_FIELD_GENRE CDTEXT_GENRE ++ #define CDTEXT_FIELD_TITLE CDTEXT_TITLE ++#endif + + GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug); + #define GST_CAT_DEFAULT gst_cdio_debug + + void gst_cdio_add_cdtext_field (GstObject * src, + cdtext_t * cdtext, ++ track_t track, + cdtext_field_t field, + const gchar * gst_tag, + GstTagList ** p_tags); + + GstTagList * gst_cdio_get_cdtext (GstObject * src, ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t * t, ++#else + CdIo * cdio, ++#endif + track_t track); + + void gst_cdio_add_cdtext_album_tags (GstObject * src, ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t * t, ++#else + CdIo * cdio, ++#endif + GstTagList * tags); + + #endif /* __GST_CDIO_H__ */ +diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c +index 615a0c8..830839e 100644 +--- a/ext/cdio/gstcdiocddasrc.c ++++ b/ext/cdio/gstcdiocddasrc.c +@@ -206,6 +206,9 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + GstCdioCddaSrc *src; + discmode_t discmode; + gint first_track, num_tracks, i; ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t *cdtext; ++#endif + + src = GST_CDIO_CDDA_SRC (audiocdsrc); + +@@ -232,8 +235,18 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + if (src->read_speed != -1) + cdio_set_speed (src->cdio, src->read_speed); + ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext = cdio_get_cdtext (src->cdio); ++ ++ if (NULL == cdtext) ++ GST_DEBUG_OBJECT (src, "no CD-TEXT on disc"); ++ else ++ gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext, ++ cddabasesrc->tags); ++#else + gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio, + cddabasesrc->tags); ++#endif + + GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track); + +@@ -250,8 +263,14 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + * the right thing here (for cddb id calculations etc. as well) */ + track.start = cdio_get_track_lsn (src->cdio, i + first_track); + track.end = track.start + len_sectors - 1; /* -1? */ ++#if LIBCDIO_VERSION_NUM > 83 ++ if (NULL != cdtext) ++ track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext, ++ i + first_track); ++#else + track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio, + i + first_track); ++#endif + + gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track); + } +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD index ba439dd43..d04173aa9 100644 --- a/extra/gtkhtml4/PKGBUILD +++ b/extra/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170809 2012-11-12 02:14:23Z heftig $ +# $Id: PKGBUILD 175194 2013-01-16 11:05:56Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.6.1 +pkgver=4.6.2 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool') url="http://www.gnome.org" options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('36670a268f3fd437ddb8c4e7f127d6fb0c09a6fe23a431bede0fc3213c75db98') +sha256sums=('d0578892a5755f3ab661f0312d1a1376f4926afe72e65d83b6890011bc1f9fd7') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD index 6b14b32b4..ac67fdbd3 100644 --- a/extra/gtkpod/PKGBUILD +++ b/extra/gtkpod/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170131 2012-11-03 12:34:41Z ibiru $ +# $Id: PKGBUILD 175123 2013-01-14 08:37:19Z eric $ # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=gtkpod -pkgver=2.1.2 -pkgrel=4 +pkgver=2.1.3 +pkgrel=1 pkgdesc="A platform independent GUI for Apple's iPod using GTK3" arch=('i686' 'x86_64' 'mips64el') url="http://gtkpod.sourceforge.net" @@ -19,13 +19,13 @@ optdepends=('libmp4v2: MP4/h264 support' install=gtkpod.install options=('!libtool') source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz" - "gtkpod-2.1.2-anjuta.patch") -md5sums=('88fef3f947cbb7ae6b714080733a3b6b' - '0a5f4ce0c9ef3d4d8db57290df43db27') + gtkpod-2.1.3-gdl-3.6.patch) +md5sums=('57f04578de6e3262a436ec574422b144' + '8d725015081bd89bc8f9a4521d170aef') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/gtkpod-2.1.2-anjuta.patch" + patch -p1 -i "${srcdir}/gtkpod-2.1.3-gdl-3.6.patch" sed -i 's#python#python2#' scripts/sync-palm-jppy.py ./configure --prefix=/usr make diff --git a/extra/gtkpod/gtkpod-2.1.3-gdl-3.6.patch b/extra/gtkpod/gtkpod-2.1.3-gdl-3.6.patch new file mode 100644 index 000000000..b794fa11b --- /dev/null +++ b/extra/gtkpod/gtkpod-2.1.3-gdl-3.6.patch @@ -0,0 +1,44 @@ +Index: gtkpod-2.1.2/src/anjuta-action-callbacks.c +=================================================================== +--- gtkpod-2.1.2.orig/src/anjuta-action-callbacks.c ++++ gtkpod-2.1.2/src/anjuta-action-callbacks.c +@@ -65,7 +65,7 @@ void + on_layout_lock_toggle (GtkAction *action, AnjutaApp *app) + { + if (app->layout_manager) +- g_object_set (app->layout_manager->master, "locked", ++ g_object_set (gdl_dock_layout_get_master (app->layout_manager), "locked", + gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)), + NULL); + } +Index: gtkpod-2.1.2/src/anjuta-app.c +=================================================================== +--- gtkpod-2.1.2.orig/src/anjuta-app.c ++++ gtkpod-2.1.2/src/anjuta-app.c +@@ -252,7 +252,7 @@ static void on_gdl_style_changed(GSettin + else if (g_strcmp0(pr_style, "Tabs") == 0) + style = GDL_SWITCHER_STYLE_TABS; + +- g_object_set(G_OBJECT(app->layout_manager->master), "switcher-style", style, NULL); ++ g_object_set(G_OBJECT(gdl_dock_layout_get_master (app->layout_manager)), "switcher-style", style, NULL); + g_free(pr_style); + } + +@@ -478,14 +478,14 @@ static void anjuta_app_instance_init(Anj + gtk_widget_show(app->dock); + gtk_box_pack_end(GTK_BOX (hbox), app->dock, TRUE, TRUE, 0); + +- dockbar = gdl_dock_bar_new(GDL_DOCK(app->dock)); ++ dockbar = gdl_dock_bar_new(G_OBJECT(app->dock)); + gtk_widget_show(dockbar); + gtk_box_pack_start(GTK_BOX (hbox), dockbar, FALSE, FALSE, 0); + +- app->layout_manager = gdl_dock_layout_new(GDL_DOCK (app->dock)); ++ app->layout_manager = gdl_dock_layout_new(G_OBJECT (app->dock)); + g_signal_connect (app->layout_manager, "notify::dirty", + G_CALLBACK (on_layout_dirty_notify), app); +- g_signal_connect (app->layout_manager->master, "notify::locked", ++ g_signal_connect (gdl_dock_layout_get_master (app->layout_manager), "notify::locked", + G_CALLBACK (on_layout_locked_notify), app); + + /* UI engine */ diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 22276c35f..c4af1c2b7 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 173130 2012-12-11 14:42:18Z jgc $ +# $Id: PKGBUILD 175145 2013-01-15 11:34:12Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') pkgver=1.14.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3') +makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3') url="http://www.gnome.org" options=(!libtool) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz + fix-paranoia-include.patch) +sha256sums=('c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc' + '4385f9c5100bc0e01c59d07bef07737bb8155e60b56d3ee948e0b48ff207ff76') build() { cd "$pkgbase-$pkgver" + patch -Np0 -i ../fix-paranoia-include.patch ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gvfs \ @@ -24,7 +27,7 @@ build() { package_gvfs() { pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" - depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2' 'libsecret') + depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup-gnome' 'udisks2' 'libsecret') optdepends=('gvfs-afc: AFC (mobile devices) support' 'gvfs-smb: SMB/CIFS (Windows client) support' 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' diff --git a/extra/gvfs/fix-paranoia-include.patch b/extra/gvfs/fix-paranoia-include.patch new file mode 100644 index 000000000..02856a06f --- /dev/null +++ b/extra/gvfs/fix-paranoia-include.patch @@ -0,0 +1,11 @@ +--- daemon/gvfsbackendcdda.c.orig 2013-01-08 11:19:52.311593338 +0000 ++++ daemon/gvfsbackendcdda.c 2013-01-08 11:20:05.778169190 +0000 +@@ -55,7 +55,7 @@ + #include "gvfsjobenumerate.h" + + #define DO_NOT_WANT_PARANOIA_COMPATIBILITY +-#include <cdio/paranoia.h> ++#include <cdio/paranoia/paranoia.h> + #include <cdio/cdio.h> + + /* TODO: diff --git a/extra/hydrogen/PKGBUILD b/extra/hydrogen/PKGBUILD index 5d2845d50..bce36b141 100644 --- a/extra/hydrogen/PKGBUILD +++ b/extra/hydrogen/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 146711 2012-01-16 19:49:24Z dreisner $ -# Maintainer: tobias <tobias@archlinux.org> +# $Id: PKGBUILD 175681 2013-01-19 13:13:55Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: tobias <tobias@archlinux.org> # Contributor: K. Piche <kpiche@rogers.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=hydrogen -pkgver=0.9.5 -pkgrel=2 +pkgver=0.9.5.1 +pkgrel=1 pkgdesc="Advanced Drum Machine" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -17,7 +17,7 @@ makedepends=('scons') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz lrdf_raptor2.patch install.patch) -md5sums=('e96f291d60e58f5d62fe616cee577dc0' +md5sums=('52f3a528705818c65acf546a3be4c6fb' '2124851e890f46158189b5fa90006d40' 'ce3a83a069b55e46aa532b55e803c9a5') diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index cf6ac1c10..aef40371f 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 173270 2012-12-18 01:27:21Z bisson $ +# $Id: PKGBUILD 175033 2013-01-12 08:15:28Z andyrtr $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Contributor: tobias <tobias@archlinux.org> pkgname=inkscape pkgver=0.48.4 -pkgrel=1 +pkgrel=2 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') arch=('i686' 'x86_64' 'mips64el') makedepends=('boost' 'intltool') -depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib' 'popt' +depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.22.0' 'popt' 'python2' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('pstoedit: latex formulas' 'texlive-core: latex formulas' diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 99c677557..b611231dc 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 169300 2012-10-18 22:41:27Z andyrtr $ +# $Id: PKGBUILD 175162 2013-01-15 18:14:28Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> -pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') - # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7 +pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' + 'openjdk7-src' 'openjdk7-doc') pkgbase=java7-openjdk _java_ver=7 _updatever=u9 -_icedtea_ver=2.3.3 +_icedtea_ver=2.3.4 # check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=9a95d714d136 -_HOTSPOT_CHANGESET=d2d0a106917c # see "${srcdir}/icedtea7"/hotspot.map -_JAXP_CHANGESET=f45296ac69be -_JAXWS_CHANGESET=03f54ef33914 -_JDK_CHANGESET=5ec94d162f05 -_LANGTOOLS_CHANGESET=ec73c6927fb7 -_OPENJDK_CHANGESET=301e79a966b4 +_CORBA_CHANGESET=dc9234e25ab0 +_JAXP_CHANGESET=aa3654afea12 +_JAXWS_CHANGESET=7182233cc27e +_JDK_CHANGESET=96d4f04f2b7c +_LANGTOOLS_CHANGESET=946195011b30 +_OPENJDK_CHANGESET=8bd8e70d4a03 + +_HOTSPOT_CHANGESET=beecf0b9e760 # see "${srcdir}/icedtea7"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap @@ -49,14 +50,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('e5ac5564e00c4a8d7b3376ed6de91b18a2587c8abdad802ccc92c780765b1073' - 'dce85d9bcc6e213240b6ad49755bf57fc60a515461664890efcce2ed615ca70b' - '4ad0ab1e0ab6f1e0402fd5a5f0b388bb33cc2c553df867e4c5e6ca78a4ede9bb' - 'b088dd5d383f27b2ccd433eebcbf3f73c016b3359abdae2a5575455d56668141' - '86dfb4fda79de7459b17b6efac6b8d5d6fd7bb1175b7e4ff22ba2ce4a903c05a' - '11a77a35661b2239e73c3fb1318fb6371d0cd7130594d1405df1cb1b17040ea6' - 'c7c67f6805d05c0fa5ddd2a7e406a6adcd0823dd008005563f2b2a88d1f3e6b6' - '872e9e0c36b9fd93e81ac131e60deadb0afa22aa77447150bb45ede77ee6db8b' +sha256sums=('ea859f37fb20904ffd40802a41396326f7e301fa6873d88d01bf4afef5a60ca8' + '3ea7c4acd4c2f7b91588231427a8685010f8ce7eb0b9610457d6a35bf2afd6bd' + '911a049e735c1ab0dfa65426ada7a11494d51fec88126d34588b23f06ef7acf8' + 'cc9a95c09be36753f9dd5aacd961400deddbdb757f8ea547cd7073f7ab7b87b7' + '7e694d90969413972a51ad1202f3c042b1eca92591e43f1f94f4421a6be5c590' + 'afba9798a4f2407bdf2cd58d0a99d94bb76ae15aec6ad9cfa0375fb255b0032b' + 'a9f56fbd58047adc9296800cd9c534375ef052074cd40ebc0da1f7db6ce09144' + 'de7a5397a83bb7c7be2458809b576133e8a3b75dc62d62d2f2983b97c220dc4f' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' @@ -296,7 +297,7 @@ package_jdk7-openjdk() { # Main files install -m755 -d ${pkgdir}/${_jvmdir}/ - cp -a demo include lib sample ${pkgdir}/${_jvmdir} + cp -a include lib ${pkgdir}/${_jvmdir} # 'bin' files pushd bin @@ -340,3 +341,12 @@ package_openjdk7-src() { install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \ ${pkgdir}/${_jvmdir}/src.zip } + +package_openjdk7-doc() { + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - documentation" + + install -m755 -d ${pkgdir}/usr/share/doc/openjdk7-doc + for i in ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/docs/*; do + cp -a $i ${pkgdir}/usr/share/doc/openjdk7-doc/ + done +} diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 8221c55f6..a3e780d31 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 174649 2013-01-05 13:04:41Z andrea $ +# $Id: PKGBUILD 175099 2013-01-13 15:03:44Z foutrelis $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.9.5 -pkgrel=1 +pkgrel=2 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-workspace' @@ -18,7 +18,7 @@ depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz' 'polkit-kde' 'xorg-xprop' 'libxdamage' 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'xorg-xrdb' 'libgles' 'libegl' 'libxres' 'xorg-xrandr' - 'xorg-xmessage' 'libusb-compat' 'kde-base-artwork') + 'xorg-xmessage' 'libusb-compat' 'kde-base-artwork' 'ttf-font') makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager' 'mesa') optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces') install="${pkgname}.install" diff --git a/extra/libcdio-paranoia/PKGBUILD b/extra/libcdio-paranoia/PKGBUILD new file mode 100644 index 000000000..c66286d89 --- /dev/null +++ b/extra/libcdio-paranoia/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 174870 2013-01-08 10:06:34Z jgc $ +# Maintainer: +# Contributor: damir <damir@archlinux.org> + +pkgname=libcdio-paranoia +pkgver=10.2+0.90 +pkgrel=1 +pkgdesc="CD paranoia libraries from libcdio" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +url="http://www.gnu.org/software/libcdio/" +depends=('libcdio') +options=('!libtool') +source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2{,.sig} + header-fix.patch) +md5sums=('432e9f1c5ceb645c4bca9db3f9297437' + '39766404d473ecda66c2f3a932d1c57c' + '1ebb33a1cfe00181de31138ef001e01b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np0 -i ../header-fix.patch + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + aclocal + autoconf + automake --add-missing + ./configure --prefix=/usr --enable-cpp-progs --disable-static --disable-example-progs + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -j1 DESTDIR="${pkgdir}" install + + #sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \ + # $pkgdir/usr/include/cdio/cdio_config.h +} diff --git a/extra/libcdio-paranoia/header-fix.patch b/extra/libcdio-paranoia/header-fix.patch new file mode 100644 index 000000000..15cf0e0e2 --- /dev/null +++ b/extra/libcdio-paranoia/header-fix.patch @@ -0,0 +1,13 @@ +--- include/cdio/paranoia/Makefile.am.orig 2013-01-08 10:40:32.237218755 +0000 ++++ include/cdio/paranoia/Makefile.am 2013-01-08 10:41:22.269997804 +0000 +@@ -3,8 +3,8 @@ + ######################################################## + # + +-libcdioincludedir=$(includedir)/cdio +-dist_libcdioinclude_HEADERS = cdda.h paranoia.h ++cdio_paranoia_includedir=$(includedir)/cdio/paranoia ++dist_cdio_paranoia_include_HEADERS = cdda.h paranoia.h + + EXTRA_DIST = version.h.in + BUILT_SOURCES = version.h diff --git a/extra/libcdio/PKGBUILD b/extra/libcdio/PKGBUILD index 18ac17f3f..9c9c4b7db 100644 --- a/extra/libcdio/PKGBUILD +++ b/extra/libcdio/PKGBUILD @@ -1,27 +1,30 @@ -# $Id: PKGBUILD 150880 2012-02-23 13:48:06Z allan $ +# $Id: PKGBUILD 175152 2013-01-15 11:44:42Z jgc $ # Maintainer: # Contributor: damir <damir@archlinux.org> pkgname=libcdio -pkgver=0.83 -pkgrel=1.1 +pkgver=0.90 +pkgrel=2 pkgdesc="GNU Compact Disc Input and Control Library" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') url="http://www.gnu.org/software/libcdio/" -depends=('libcddb' 'ncurses') +depends=('libcddb' 'ncurses' 'gcc-libs') options=('!libtool') install=libcdio.install source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig} - libcdio-0.83-linking.patch) -md5sums=('b9e0f1bccb142e697cd834fe56b6e6fb' - 'a7864a4b572a1e2a28cc0a05aa4a67d3' - '5a7f50209c03d5919d5b932f07871af7') + libcdio-0.83-linking.patch + udf-Dont-return-freed-memory-from-udf_fopen.patch) +md5sums=('1b245b023fb03a58d030fd2800db3247' + '45100d90ea49d6f8481eddf709655c0f' + '5a7f50209c03d5919d5b932f07871af7' + 'b7b50c989575e5484d3992b455c9df48') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i $srcdir/libcdio-0.83-linking.patch - ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs + patch -Np1 -i ../libcdio-0.83-linking.patch + patch -Np1 -i ../udf-Dont-return-freed-memory-from-udf_fopen.patch + ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs --disable-static make } diff --git a/extra/libcdio/udf-Dont-return-freed-memory-from-udf_fopen.patch b/extra/libcdio/udf-Dont-return-freed-memory-from-udf_fopen.patch new file mode 100644 index 000000000..191e35341 --- /dev/null +++ b/extra/libcdio/udf-Dont-return-freed-memory-from-udf_fopen.patch @@ -0,0 +1,33 @@ +From 6c0251d145e44b7cdfeb9767c615646fb8f51320 Mon Sep 17 00:00:00 2001 +From: Christophe Fergeau <cfergeau@redhat.com> +Date: Thu, 22 Nov 2012 13:53:15 +0100 +Subject: [PATCH] udf: Don't return freed memory from udf_fopen + +When trying to open a file located in the root directory of the +UDF filesystem, we call udf_ff_open with the dirent corresponding +to the root dir and the filename. In this case, udf_ff_open will +return the same dirent as the one that was passed as argument, so +we must not free it as we'll be returning it. +This causes a crash with iso-read when trying to read a file located +at the root of the image. +--- + lib/udf/udf_fs.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/lib/udf/udf_fs.c b/lib/udf/udf_fs.c +index 5f5add7..1e0601e 100644 +--- a/lib/udf/udf_fs.c ++++ b/lib/udf/udf_fs.c +@@ -257,7 +257,8 @@ udf_fopen(udf_dirent_t *p_udf_root, const char *psz_name) + p_udf_root->psz_name, p_udf_root->b_dir, + p_udf_root->b_parent); + p_udf_file = udf_ff_traverse(p_udf_dirent, psz_token); +- udf_dirent_free(p_udf_dirent); ++ if (p_udf_file != p_udf_dirent) ++ udf_dirent_free(p_udf_dirent); + } + else if ( 0 == strncmp("/", psz_name, sizeof("/")) ) { + return udf_new_dirent(&p_udf_root->fe, p_udf_root->p_udf, +-- +1.7.2.5 + diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 7912597db..2aefac902 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 170783 2012-11-11 10:23:15Z andyrtr $ +# $Id: PKGBUILD 175502 2013-01-17 14:41:27Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.40 +pkgver=2.4.41 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') @@ -15,15 +15,20 @@ options=('!libtool') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 no-pthread-stubs.patch - COPYING) -sha256sums=('48c14e4600ea0fde522292893eb4055d2f6d86a69d093d379c827deaccffaa1f' + COPYING + buildfix.diff) +sha256sums=('52b3ca670df43fc9f5164f0f55fa40b008de297c0ceedab7c77c30bf9022f212' '3915aaff4d5b0ed523c3144911e7f79ee812dece0e3933c13a88dddcf5912ded' - '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') + '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93' + '9b293bbe682381b6822b5abfb1b1ce713185bcefde255d300367b26f47102ddc') build() { cd $pkgname-$pkgver patch -Np1 -i ../no-pthread-stubs.patch + # man/Makefile,in is missing + patch -Np1 -i ${srcdir}/buildfix.diff + #libtoolize --force autoreconf --force --install ./configure --prefix=/usr \ diff --git a/extra/libdrm/buildfix.diff b/extra/libdrm/buildfix.diff new file mode 100644 index 000000000..879fbf1b8 --- /dev/null +++ b/extra/libdrm/buildfix.diff @@ -0,0 +1,11 @@ +diff --git a/configure.ac b/configure.ac +index 10cc9a4..1776610 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -348,7 +348,6 @@ AC_CONFIG_FILES([ + tests/vbltest/Makefile + include/Makefile + include/drm/Makefile +- man/Makefile + libdrm.pc]) + AC_OUTPUT diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 3df07831f..c7d4da8b8 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173765 2012-12-22 16:44:33Z andyrtr $ +# $Id: PKGBUILD 175034 2013-01-12 08:15:36Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -26,13 +26,13 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=3.6.4.3 pkgver=3.6.4 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost' - 'apache-ant' 'gperf' 'poppler>=0.20.5' 'kdelibs' 'gconf' 'cppunit' + 'apache-ant' 'gperf' 'poppler>=0.22.0' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' 'glu' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' # the runtime dependencies diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD index 2b81a94d4..454c97b0f 100644 --- a/extra/libsoup/PKGBUILD +++ b/extra/libsoup/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170892 2012-11-12 22:13:35Z heftig $ +# $Id: PKGBUILD 175189 2013-01-16 10:55:26Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libsoup pkgname=('libsoup' 'libsoup-gnome') -pkgver=2.40.2 +pkgver=2.40.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -11,7 +11,7 @@ makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-i url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('32e81220f53abb1f5bbe7d8b0717119df70667fc48e2342d82209ed1593e71dc') +sha256sums=('82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9') build() { cd "$pkgbase-$pkgver" diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index 6b4e246a8..73aa25371 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 170197 2012-11-04 18:02:05Z ibiru $ +# $Id: PKGBUILD 175075 2013-01-12 16:47:42Z eric $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar -pkgver=0.16.5 +pkgver=0.16.6 pkgrel=1 epoch=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" arch=('i686' 'x86_64' 'mips64el') -license=('custom') +license=('BSD') depends=('boost-libs' 'geoip' 'python2') makedepends=('boost') options=('!libtool' '!emptydirs') source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('dde29c7a51392d9098de23e2e69a993a5c380016') +sha1sums=('baf95f53be99a90c4bb1488a72e9d625684bbbd2') build() { cd $pkgname-$pkgver diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD index 90b195551..154b784de 100644 --- a/extra/libxi/PKGBUILD +++ b/extra/libxi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 158868 2012-05-12 16:25:29Z andyrtr $ +# $Id: PKGBUILD 175509 2013-01-17 15:47:55Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxi -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=1 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'xorg-util-macros') options=(!libtool) license=('custom') source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) -sha1sums=('4b53b41fdaa3acc86606c696c68d5eed11454612') +sha256sums=('3250fd34cdd099a15b78abdb87c7e1a9b7a2188ab893f273e90d831dbc604058') build() { cd "${srcdir}/libXi-${pkgver}" diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index 9f48c3ece..f04e4010b 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173988 2012-12-31 11:59:46Z foutrelis $ +# $Id: PKGBUILD 175116 2013-01-14 06:46:10Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sebastian Nowicki <sebnow@gmail.com> @@ -11,7 +11,7 @@ pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') pkgver=3.2 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') @@ -26,7 +26,7 @@ source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz enable-lto.patch llvm-3.1-fix-debug-line-info.patch clang-3.1-fix-libprofile_rt.a-location.patch) -sha256sums=('125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343' +sha256sums=('378f9ed7126409785aa399bf367762753dbda563b60612dae1a92d5263ab8130' '2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658' 'a9a6b73a1bd5fc763f3b3826a6ce796cb150042d37d319e06e72d3d9778aaac1' '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3' @@ -228,6 +228,9 @@ package_clang-analyzer() { ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/" done + # scan-build looks for clang within the same directory + ln -s /usr/bin/clang "$pkgdir/usr/lib/clang-analyzer/scan-build/" + # Relocate man page install -d "$pkgdir/usr/share/man/man1" mv "$pkgdir/usr/lib/clang-analyzer/scan-build/scan-build.1" \ diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD index 6170cb7b6..1dc7e8fae 100644 --- a/extra/monodevelop-debugger-gdb/PKGBUILD +++ b/extra/monodevelop-debugger-gdb/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 165115 2012-08-11 08:21:45Z andyrtr $ +# $Id: PKGBUILD 175074 2013-01-12 15:33:07Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=monodevelop-debugger-gdb -pkgver=3.0.3.5 +pkgver=3.0.6 pkgrel=1 pkgdesc="Mono Debugger support" arch=('i686' 'x86_64') # also "any" pkg? url="http://monodevelop.com" license=('GPL') -depends=('monodevelop>=3.0.3.5-2' 'gdb') +depends=('monodevelop>=3.0.6' 'gdb') makedepends=('mono') options=('!makeflags') source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('c16da5cdbda46fb32e0dc730bb433203') +md5sums=('9f3d08104d01e536342ffe15bdd5727c') build() { export MONO_SHARED_DIR="${srcdir}/.wabi" diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index 2ba30d678..85c19338a 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165114 2012-08-11 08:21:42Z andyrtr $ +# $Id: PKGBUILD 175072 2013-01-12 15:31:21Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=monodevelop -pkgver=3.0.3.5 -pkgrel=2 +pkgver=3.0.6 +pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" # should probably changed to "any" - no ELF files - OpenSUSE builds it as NOARCH @@ -14,11 +14,12 @@ arch=('i686' 'x86_64') url="http://www.monodevelop.com" license=('GPL') depends=('mono>=2.10.8' 'mono-addins>=0.6.2' 'gnome-sharp' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('rsync') options=(!makeflags) install=monodevelop.install source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 monodevelop-core-addins.pc.in.patch) -md5sums=('ca46b77b49266112b63a8f5c451c5565' +md5sums=('748d0fb89c40c2cb5a9267c8635eb55d' '8466d032735130e37d4091a793a7966c') build() { @@ -27,7 +28,7 @@ build() { cd $srcdir/$pkgname-$pkgver # fix location for MonoDevelop.Gettext.dll - breaks gdb build - patch -Np0 -i ${srcdir}/monodevelop-core-addins.pc.in.patch + # patch -Np0 -i ${srcdir}/monodevelop-core-addins.pc.in.patch ./configure --prefix=/usr --disable-update-mimedb --disable-update-desktopdb LD_PRELOAD="" make diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD index b7b774084..df2d09d9f 100644 --- a/extra/nettle/PKGBUILD +++ b/extra/nettle/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163476 2012-07-12 19:05:48Z andyrtr $ +# $Id: PKGBUILD 175512 2013-01-17 18:26:40Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: bender02 at gmx dot com pkgname=nettle -pkgver=2.5 +pkgver=2.6 pkgrel=1 pkgdesc="A low-level cryptographic library" arch=('i686' 'x86_64' 'mips64el') @@ -12,13 +12,12 @@ license=('GPL2') install=$pkgname.install depends=('gmp') source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz) -md5sums=('d66882e6ad31a9f651b73d7a1a93bd4c') +md5sums=('02f76b668855c4da67186c04cd3a222f') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --libdir=/usr/lib \ - --enable-shared \ - --disable-static # <-- seems not working now + --enable-shared make } @@ -31,6 +30,6 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install - # remove static libs + # remove static libs #--disable-static - build would break (since nettle 2.6) - and had no effect before rm -f ${pkgdir}/usr/lib/{libhogweed,libnettle}.a } diff --git a/extra/numactl/PKGBUILD b/extra/numactl/PKGBUILD index 62ec53dbe..030e175d4 100644 --- a/extra/numactl/PKGBUILD +++ b/extra/numactl/PKGBUILD @@ -3,7 +3,7 @@ pkgname=numactl pkgver=2.0.8 -pkgrel=1 +pkgrel=2 pkgdesc="Simple NUMA policy support" arch=('i686' 'x86_64' 'mips64el') url="http://oss.sgi.com/projects/libnuma/" @@ -14,6 +14,7 @@ sha1sums=('f7bf06caea29669992fd3540a4c864a32615b5a1') build() { cd "$srcdir/$pkgname-${pkgver/_/-}" + rm numastat make } diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD index c8951a808..4893e36fd 100644 --- a/extra/nx/PKGBUILD +++ b/extra/nx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 174924 2013-01-09 04:17:18Z andyrtr $ +# $Id: PKGBUILD 175081 2013-01-13 09:33:31Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=nx pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers') pkgver=3.5.0.17 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://wiki.x2go.org/" license=('GPL') @@ -34,14 +34,16 @@ build() { echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF} popd - # fix two broken Makefiles - sed -i "s:/usr/local:/usr:" Makefile + # fix a broken Makefiles sed -i "s:-o root -g root ::" nxcompshad/Makefile.in - make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include" + make \ + PREFIX=/usr \ + CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include" + # fake install mkdir $srcdir/fakeinstall - make DESTDIR="$srcdir/fakeinstall" install + make PREFIX=/usr DESTDIR="$srcdir/fakeinstall" install } package_libxcomp() { @@ -119,6 +121,8 @@ package_x2go-agent() { pkgdesc="Wrapper arround nxagent to use with x2goserver" depends=('nxagent') + provides=('x2goagent') + replaces=('x2goagent') install -dm755 ${pkgdir}/usr/{bin,lib/x2go/bin,share/{pixmaps,x2go/versions}} # this is a nxagent symlink diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD index 874c0381a..d16369f13 100644 --- a/extra/ocaml/PKGBUILD +++ b/extra/ocaml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173841 2012-12-25 00:34:23Z foutrelis $ +# $Id: PKGBUILD 175505 2013-01-17 15:01:31Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgbase='ocaml' @@ -6,7 +6,7 @@ pkgname=('ocaml') # Needs optimized build. [ "$CARCH" = "mips64el" ] || pkgname+=('ocaml-compiler-libs') pkgver=4.00.1 -pkgrel=2 +pkgrel=3 pkgdesc="A functional language with OO extensions" arch=('i686' 'x86_64' 'mips64el') license=('LGPL2' 'custom: QPL-1.0') @@ -15,7 +15,8 @@ depends=('gdbm') makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11') optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features') source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz - fix-caml_int64_float_of_bits-n32.patch) + fix-caml_int64_float_of_bits-n32.patch + tk8.6-build.patch) options=('!makeflags' '!emptydirs') build() { @@ -31,6 +32,8 @@ build() { package_ocaml() { cd "${srcdir}/${pkgbase}-${pkgver}" + # fix https://bugs.archlinux.org/task/33302 + patch -Np2 -i ../tk8.6-build.patch make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install # Save >10MB with this one, makepkg only strips debug symbols. @@ -62,5 +65,3 @@ optdepends=() install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7' - 'e2c8bc316efe40532c5b9d7f9a1d8d62') diff --git a/extra/ocaml/tk8.6-build.patch b/extra/ocaml/tk8.6-build.patch new file mode 100644 index 000000000..439a930f0 --- /dev/null +++ b/extra/ocaml/tk8.6-build.patch @@ -0,0 +1,20 @@ +--- src/ocaml-4.00.1/configure 2012-06-26 08:33:50.000000000 -0700 ++++ p/src/ocaml-4.00.1/configure 2013-01-05 17:06:54.877900143 -0800 +@@ -804,6 +804,9 @@ + echo "ARCMD=ar" >> Makefile + + ++bytecccompopts="$bytecccompopts -DUSE_INTERP_RESULT" ++nativecccompopts="$nativecccompopts -DUSE_INTERP_RESULT" ++ + # Do #! scripts work? + + if (SHELL=/bin/sh; export SHELL; (./sharpbang || ./sharpbang2) >/dev/null); then +@@ -1450,6 +1453,7 @@ + if test -n "$tcl_version" && test "x$tcl_version" != "xnone"; then + echo "tcl.h and tk.h version $tcl_version found with \"$tk_defs\"." + case $tcl_version in ++ 8.6) tclmaj=8 tclmin=6 tkmaj=8 tkmin=6 ;; + 8.5) tclmaj=8 tclmin=5 tkmaj=8 tkmin=5 ;; + 8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;; + 8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;; diff --git a/extra/pgbouncer/PKGBUILD b/extra/pgbouncer/PKGBUILD new file mode 100644 index 000000000..fb0277192 --- /dev/null +++ b/extra/pgbouncer/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Dan McGee <dan@archlinux.org> + +pkgname=pgbouncer +_dlid=3393 +pkgver=1.5.4 +pkgrel=4 +pkgdesc="A lightweight connection pooler for PostgreSQL" +arch=('i686' 'x86_64') +url="http://pgfoundry.org/projects/pgbouncer" +license=('BSD') +depends=('libevent>=2.0' 'postgresql') +makedepends=('asciidoc' 'xmlto') +backup=('etc/pgbouncer/pgbouncer.ini') +install=$pkgname.install +source=("http://pgfoundry.org/frs/download.php/${_dlid}/${pkgname}-${pkgver}.tar.gz" + pgbouncer.ini + pgbouncer.service + pgbouncer.tmpfiles.conf) +md5sums=('9ffaf2e6232e18e676651429813732df' + '810813b9ef8891be382be9ffdd425edc' + 'eede238f5ff3709dbfeef6dad3fbefc7' + '472659f4c5de2b59a420f5ca42327ec1') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --disable-debug + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + install -D -m644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -D -m644 ../pgbouncer.ini "$pkgdir/etc/pgbouncer/pgbouncer.ini" + install -D -m644 ../pgbouncer.service "$pkgdir/usr/lib/systemd/system/pgbouncer.service" + install -D -m644 ../pgbouncer.tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/pgbouncer.conf" + mkdir -p "$pkgdir/var/log/pgbouncer" +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/pgbouncer/pgbouncer.ini b/extra/pgbouncer/pgbouncer.ini new file mode 100644 index 000000000..183c9c39d --- /dev/null +++ b/extra/pgbouncer/pgbouncer.ini @@ -0,0 +1,52 @@ +[pgbouncer] +logfile = /var/log/pgbouncer/pgbouncer.log +pidfile = /run/pgbouncer/pgbouncer.pid + +;; ip address or * which means all ip-s +;listen_addr = 127.0.0.1 +;listen_port = 6432 + +unix_socket_dir = /run/postgresql +unix_socket_mode = 0777 + +; any, trust, plain, crypt, md5 +auth_type = trust +auth_file = /etc/pgbouncer/userlist.txt + +; comma-separated list of users, who are allowed to change settings +admin_users = postgres + +; comma-separated list of users who are just allowed to use SHOW command +stats_users = stats, postgres + +; total number of clients that can connect +max_client_conn = 100 + +; default pool size. 20 is good number when transaction pooling +; is in use, in session pooling it needs to be the number of +; max clients you want to handle at any moment +default_pool_size = 20 + + +;; database name = connect string +;; +;; connect string params: +;; dbname= host= port= user= password= +;; client_encoding= datestyle= timezone= +;; pool_size= connect_query= +[databases] + +; foodb over unix socket +;foodb = + +; redirect bardb to bazdb on localhost +;bardb = host=localhost dbname=bazdb + +; acceess to dest database will go with single user +;forcedb = host=127.0.0.1 port=300 user=baz password=foo client_encoding=UNICODE datestyle=ISO connect_query='SELECT 1' + +; use custom pool sizes +;nondefaultdb = pool_size=50 reserve_pool=10 + +; fallback connect string +;* = host=testserver diff --git a/extra/pgbouncer/pgbouncer.install b/extra/pgbouncer/pgbouncer.install new file mode 100644 index 000000000..2f77ae50f --- /dev/null +++ b/extra/pgbouncer/pgbouncer.install @@ -0,0 +1,25 @@ +post_install() { + if ! getent group pgbouncer >/dev/null; then + groupadd -r pgbouncer + fi + if ! getent passwd pgbouncer >/dev/null; then + useradd -c 'PGBouncer user' -r -g pgbouncer -d '/etc/pgbouncer' -s /bin/bash pgbouncer + passwd -l pgbouncer >/dev/null + fi + chown pgbouncer:pgbouncer /var/log/pgbouncer + systemd-tmpfiles --create pgbouncer.conf + post_update +} + +post_update() { + gpasswd -a pgbouncer postgres +} + +post_remove() { + if getent passwd pgbouncer >/dev/null; then + userdel pgbouncer + fi + if getent group pgbouncer >/dev/null; then + groupdel pgbouncer + fi +} diff --git a/extra/pgbouncer/pgbouncer.service b/extra/pgbouncer/pgbouncer.service new file mode 100644 index 000000000..f5baad52b --- /dev/null +++ b/extra/pgbouncer/pgbouncer.service @@ -0,0 +1,11 @@ +[Unit] +Description=A lightweight connection pooler for PostgreSQL +After=network.target + +[Service] +User=pgbouncer +ExecStart=/usr/bin/pgbouncer /etc/pgbouncer/pgbouncer.ini +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/extra/pgbouncer/pgbouncer.tmpfiles.conf b/extra/pgbouncer/pgbouncer.tmpfiles.conf new file mode 100644 index 000000000..c8f708372 --- /dev/null +++ b/extra/pgbouncer/pgbouncer.tmpfiles.conf @@ -0,0 +1 @@ +d /run/pgbouncer 0755 pgbouncer pgbouncer - diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD index ef8da365c..ceb74d23e 100644 --- a/extra/php-apc/PKGBUILD +++ b/extra/php-apc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166404 2012-09-07 16:52:02Z pierre $ +# $Id: PKGBUILD 175091 2013-01-13 14:39:03Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=php-apc -pkgver=3.1.13 +pkgver=3.1.14 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code' @@ -11,7 +11,7 @@ depends=('php') license=('PHP') source=("http://pecl.php.net/get/APC-${pkgver}.tgz") backup=('etc/php/conf.d/apc.ini') -md5sums=('c9e47002e3a67ebde3a6f81437c7b6e0') +md5sums=('4e9111f9e2bdc219107e98beffc3751e') build() { cd $srcdir/APC-$pkgver diff --git a/extra/php-xcache/PKGBUILD b/extra/php-xcache/PKGBUILD index 6d7f6800b..973fdc58d 100644 --- a/extra/php-xcache/PKGBUILD +++ b/extra/php-xcache/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170770 2012-11-11 06:21:29Z pierre $ +# $Id: PKGBUILD 175092 2013-01-13 14:39:10Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=php-xcache -pkgver=3.0.0 -pkgrel=2 +pkgver=3.0.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A PHP opcode cacher' url='http://xcache.lighttpd.net/' @@ -12,7 +12,7 @@ license=('custom') source=("http://xcache.lighttpd.net/pub/Releases/${pkgver}/xcache-${pkgver}.tar.bz2" 'xcache.ini') backup=('etc/php/conf.d/xcache.ini') -md5sums=('63be7c8b14ffc01babe5378111f13228' +md5sums=('45086010bc4f82f506c08be1c556941b' '8fd9ce537ada9463c4b0c042243158c0') build() { diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index c9249be7d..ff800f317 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173514 2012-12-20 05:52:50Z pierre $ +# $Id: PKGBUILD 175519 2013-01-17 21:13:35Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.10 +pkgver=5.4.11 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') @@ -31,14 +31,13 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" - 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' + 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('cb716b657a30570b9b468b9e7bc551a1' +md5sums=('9975e68c22b86b013b934743ad2d2276' '0b0bc7a917fc592bdf11dcd3c5c255e9' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' - '3cfde0cc4ed09b55f1ce531437a4eb88' '5c1f4c967b66ce3eaf819b46951dcbf5' - 'f56b5bb7e93c802ae8519182fbea3387' + 'e036c721e5ad927cd1613c7475a58b3a' 'f8b206cb8fecb05cb1ded8bee45633ff' 'c60343df74f8e1afb13b084d5c0e47ed') @@ -240,7 +239,6 @@ package_php-fpm() { install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf - install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm install -d -m755 ${pkgdir}/etc/php/fpm.d install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/php-fpm.conf diff --git a/extra/php/logrotate.d.php-fpm b/extra/php/logrotate.d.php-fpm index ac2d92a36..1895c5b97 100644 --- a/extra/php/logrotate.d.php-fpm +++ b/extra/php/logrotate.d.php-fpm @@ -3,6 +3,6 @@ notifempty delaycompress postrotate - kill -USR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true + systemctl reload php-fpm.service || true endscript } diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 37ad46c3e..e24fd89ce 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169388 2012-10-20 09:31:48Z andyrtr $ +# $Id: PKGBUILD 175029 2013-01-12 08:15:09Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.20.5 +pkgver=0.22.0 pkgrel=1 arch=(i686 x86_64 mips64el) license=('GPL') @@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('8a80ae83eb7a327b031808d09ee1d54d' +md5sums=('c7038be37a7d446544e83a7df3c26196' '9dc64c254a31e570507bdd4ad4ba629a') build() { @@ -36,7 +36,7 @@ check() { cd "${srcdir}" ln -sf test-${_testtag} test cd ${pkgbase}-${pkgver} - LANG=en_US.UTF8 make check || /bin/true + LANG=en_US.UTF8 make check } package_poppler() { diff --git a/extra/python-urwid/PKGBUILD b/extra/python-urwid/PKGBUILD index a17f52206..a3c68875c 100644 --- a/extra/python-urwid/PKGBUILD +++ b/extra/python-urwid/PKGBUILD @@ -4,15 +4,15 @@ # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com> pkgname=('python-urwid' 'python2-urwid') -pkgver=1.0.2 -pkgrel=2 +pkgver=1.1.1 +pkgrel=1 pkgdesc="Urwid is a curses-based user interface library." license=('LGPL') arch=('i686' 'x86_64' 'mips64el') makedepends=('python2-distribute' 'python-distribute') url="http://excess.org/urwid/" source=(http://excess.org/urwid/urwid-$pkgver.tar.gz) -md5sums=('00542bbd15fae7ea60b02a7570edee2b') +md5sums=('eca2e0413cf7216b01c84b99e0f2576d') build() { cp -r urwid-$pkgver python2-urwid-$pkgver diff --git a/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD index abde6eacb..47d9f24f2 100644 --- a/extra/qpdf/PKGBUILD +++ b/extra/qpdf/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166374 2012-09-07 06:46:11Z andyrtr $ +# $Id: PKGBUILD 175524 2013-01-18 19:34:24Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Miguel Revilla <yo at miguelrevilla.com> # Contributor: David Sotelo <dvsotelo at gmail.com> # Contributor: Nuno Araujo <nuno.araujo@russo79.com> pkgname=qpdf -pkgver=3.0.2 +pkgver=4.0.1 pkgrel=1 pkgdesc="QPDF: A Content-Preserving PDF Transformation System" arch=('i686' 'x86_64' 'mips64el') @@ -15,12 +15,10 @@ depends=('pcre' 'perl') makedepends=('make') options=('!libtool') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('af6f6f964481295a6ca0766185bfa274') +md5sums=('093baece867a0a7e07774bd4008156b3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # fix rpath errors (from Fedora spec) - autoreconf -vfi ./configure --prefix=/usr --disable-static make } diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index 5f4f6538c..22a314014 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,28 +1,30 @@ -# $Id: PKGBUILD 159414 2012-05-23 22:31:17Z andrea $ +# $Id: PKGBUILD 175166 2013-01-15 21:24:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtwebkit -pkgver=2.2.2 +pkgver=2.3git20130115 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://trac.webkit.org/wiki/QtWebKit' pkgdesc='An open source web browser engine (Qt port)' license=('LGPL2.1' 'GPL3') -depends=('qt' 'gstreamer0.10-base') -makedepends=('python2' 'mesa' 'gperf') +depends=('qt' 'systemd' 'gstreamer0.10-base') +makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa') conflicts=('qt<4.8') -_qtver=4.8.2 -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-source.tar.gz" - "ftp://ftp.archlinux.org/other/${pkgname}/qwebview-${_qtver}.tar.xz" - 'glibc.patch' - 'fix-build.patch') -sha1sums=('914d7cc099e5b6181c2d74fc7a74e1b4478b75a4' - '33c83272ed8110180ee6e7e3733e68cc513e2802' - '9e47ba5725a2ebd072b8bff31fa2f71aa83f0333' - 'c6dfb001b0412a8adfcb7f1f565a24314a753448') +_qtver=4.8.4 +source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-2.3" + "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz" + 'use-python2.patch' + 'qwebview.patch' + 'enable-accelerated-compositing.patch') +sha1sums=('8d74fdb4354d1f1b4f3df0ec7b057a7516350372' + 'f5880f11c139d7d8d01ecb8d874535f7d9553198' + '315b6ff603f35e5492a036f7082f6aa075dfb607' + 'fed0c1a90e3997b5575dbc83d6ea23bc46097a6f' + '471032229c61a0f95e142c21370aab6d3f00ff7e') build() { - cd "${srcdir}"/${pkgname}-${pkgver}-source + cd webkit-qtwebkit-23 if [ "$CARCH" = "mips64el" ]; then # Fix MIPS N32 support. @@ -33,83 +35,33 @@ build() { Source/JavaScriptCore/wtf/Platform.h fi - patch -p1 -i "${srcdir}"/glibc.patch - patch -p1 -i "${srcdir}"/fix-build.patch + patch -p1 -i "${srcdir}"/use-python2.patch - # move headers - mv include Source/ + # Fixed upstream, https://bugs.webkit.org/show_bug.cgi?id=106892 + patch -p1 -i "${srcdir}"/enable-accelerated-compositing.patch - cd Source - qmake - cd ../ + export QTDIR=/usr + Tools/Scripts/build-webkit --qt \ + --makeargs="${MAKEFLAGS}" \ + --prefix=/usr \ + --no-webkit2 - make -C Source + cd ../ # Build the QWebView plugin (FS#27914) - cd "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview + cd qt-everywhere-opensource-src-${_qtver} + patch -p1 -i "${srcdir}"/qwebview.patch + cd tools/designer/src/plugins/qwebview qmake make } package() { - cd "${srcdir}"/${pkgname}-${pkgver}-source - make INSTALL_ROOT="${pkgdir}" -C Source install - - cd "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview - make INSTALL_ROOT="${pkgdir}" install -} - -_source() { - local _current_dir=$(pwd) - local _tmp=$(mktemp -d --tmpdir) - - cd _tmp - git clone git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git - - # fetch the make-package.py script - git clone git://qt.gitorious.org/qtwebkit/tools.git - - # create the qtwebkit tarball - cd qtwebkit - git checkout -b ${pkgname}-${pkgver} ${pkgname}-${pkgver} - - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - ../tools/make-package.py - python2 ../tools/make-package.py + cd webkit-qtwebkit-23 + make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install - mv ${pkgname}-${pkgver}-source.tar.gz ${_current_dir}/ - - cd .. - - # create the qwebview plugin tarball - mkdir qwebview-${_qtver} - cd qwebview-${_qtver} - wget http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz - tar xf qt-everywhere-opensource-src-${_qtver}.tar.gz - mkdir -p ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/ - cp -ra qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview \ - ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/ - - cat > ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pro <<"EOF" -TEMPLATE = subdirs -CONFIG += ordered - -REQUIRES = !CONFIG(static,shared|static) -contains(QT_CONFIG, webkit): SUBDIRS += qwebview -EOF - - cat > $(_tmp)/header.txt <<"EOF" -INCLUDEPATH += ../../../Source/include -LIBS += -L../../../Source/lib - -EOF - - cat $(_tmp)/header.txt qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/plugins.pri > \ - ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pri - - tar cJf qwebview-${_qtver}.tar.xz ${pkgname}-${pkgver}-source - - mv qwebview-${_qtver}.tar.xz ${_current_dir}/ + cd ../ - rm -rf ${_tmp} + cd qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview + make INSTALL_ROOT="${pkgdir}" install } diff --git a/extra/qtwebkit/enable-accelerated-compositing.patch b/extra/qtwebkit/enable-accelerated-compositing.patch new file mode 100644 index 000000000..13474cd6a --- /dev/null +++ b/extra/qtwebkit/enable-accelerated-compositing.patch @@ -0,0 +1,11 @@ +Index: trunk/Source/WebCore/html/HTMLCanvasElement.cpp
+===================================================================
+--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp (revision 139541)
++++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp (revision 139742)
+@@ -190,5 +190,5 @@
+ Settings* settings = document()->settings();
+ if (settings && settings->webGLEnabled()
+-#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL)
++#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(QT)
+ && settings->acceleratedCompositingEnabled()
+ #endif
diff --git a/extra/qtwebkit/qwebview.patch b/extra/qtwebkit/qwebview.patch new file mode 100644 index 000000000..73d5d5032 --- /dev/null +++ b/extra/qtwebkit/qwebview.patch @@ -0,0 +1,21 @@ +--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000 ++++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000 +@@ -1,3 +1,6 @@ ++INCLUDEPATH += ../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/include ++LIBS += -L../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/lib ++ + CONFIG += designer + win32|mac: CONFIG+= debug_and_release + QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000 ++++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000 +@@ -2,9 +2,4 @@ + CONFIG += ordered + + REQUIRES = !CONFIG(static,shared|static) +-contains(QT_CONFIG, qt3support): SUBDIRS += widgets +-win32: SUBDIRS += activeqt +-# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d + contains(QT_CONFIG, webkit): SUBDIRS += qwebview +-contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets +-contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview diff --git a/extra/qtwebkit/use-python2.patch b/extra/qtwebkit/use-python2.patch new file mode 100644 index 000000000..b1444435b --- /dev/null +++ b/extra/qtwebkit/use-python2.patch @@ -0,0 +1,57 @@ +--- webkit-qtwebkit-23/Source/JavaScriptCore/DerivedSources.pri~ 2013-01-09 11:29:16.452266719 +0000 ++++ webkit-qtwebkit-23/Source/JavaScriptCore/DerivedSources.pri 2013-01-09 11:30:18.188538725 +0000 +@@ -85,14 +85,14 @@ + retgen.output = RegExpJitTables.h + retgen.script = $$PWD/create_regex_tables + retgen.input = retgen.script +-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT} ++retgen.commands = python2 $$retgen.script > ${QMAKE_FILE_OUT} + GENERATORS += retgen + + #GENERATOR: "KeywordLookup.h": decision tree used by the lexer + klgen.output = KeywordLookup.h + klgen.script = $$PWD/KeywordLookupGenerator.py + klgen.input = KEYWORDLUT_FILES +-klgen.commands = python $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT} ++klgen.commands = python2 $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT} + GENERATORS += klgen + + EXTRACTOR_BINARY = LLIntOffsetsExtractor$$BIN_EXTENSION +@@ -117,7 +117,7 @@ + disassembler.input = DISASSEMBLER_FILES + disassembler.script = $$PWD/disassembler/udis86/itab.py + disassembler.depends = $$DISASSEMBLER_DEPENDENCY +- disassembler.commands = python $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH} ++ disassembler.commands = python2 $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH} + disassembler.CONFIG += no_link + GENERATORS += disassembler + } +--- webkit-qtwebkit-23/Source/WebCore/DerivedSources.pri~ 2013-01-09 11:46:01.165612894 +0000 ++++ webkit-qtwebkit-23/Source/WebCore/DerivedSources.pri 2013-01-09 11:46:27.465404725 +0000 +@@ -779,7 +779,7 @@ + inspectorValidate.output = InspectorProtocolVersion.h + inspectorValidate.input = INSPECTOR_JSON + inspectorValidate.script = $$PWD/inspector/generate-inspector-protocol-version +-inspectorValidate.commands = python $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} ++inspectorValidate.commands = python2 $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} + inspectorValidate.depends = $$PWD/inspector/generate-inspector-protocol-version + inspectorValidate.add_output_to_sources = false + GENERATORS += inspectorValidate +@@ -787,7 +787,7 @@ + inspectorJSON.output = InspectorFrontend.cpp InspectorBackendDispatcher.cpp InspectorTypeBuilder.cpp + inspectorJSON.input = INSPECTOR_JSON + inspectorJSON.script = $$PWD/inspector/CodeGeneratorInspector.py +-inspectorJSON.commands = python $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH} ++inspectorJSON.commands = python2 $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH} + inspectorJSON.depends = $$inspectorJSON.script + GENERATORS += inspectorJSON + +@@ -908,7 +908,7 @@ + entities.output = HTMLEntityTable.cpp + entities.input = HTML_ENTITIES + entities.script = $$PWD/html/parser/create-html-entity-table +-entities.commands = python $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES ++entities.commands = python2 $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES + entities.clean = ${QMAKE_FILE_OUT} + entities.depends = $$PWD/html/parser/create-html-entity-table + GENERATORS += entities diff --git a/extra/sharutils/PKGBUILD b/extra/sharutils/PKGBUILD index 41f10cbcd..f24e51a2e 100644 --- a/extra/sharutils/PKGBUILD +++ b/extra/sharutils/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 174014 2013-01-01 13:05:38Z bisson $ +# $Id: PKGBUILD 175104 2013-01-13 20:19:27Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sharutils -pkgver=4.13 +pkgver=4.13.3 pkgrel=1 pkgdesc='Makes so-called shell archives out of many files' url='http://www.gnu.org/software/sharutils/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('perl' 'gettext' 'texinfo') -source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('8c1531846bc397c2afbbbf2ca33c8d5fd78bbc3d') +source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz") +sha1sums=('50582fcededd1891c47ec1caa98491e280950cbd') install=install diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD index e411312a5..345b7d049 100644 --- a/extra/telepathy-qt/PKGBUILD +++ b/extra/telepathy-qt/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 171095 2012-11-16 16:58:51Z andrea $ +# $Id: PKGBUILD 175068 2013-01-12 13:26:14Z andrea $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-qt pkgver=0.9.3 -pkgrel=2 +pkgrel=3 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64' 'mips64el') url="http://telepathy.freedesktop.org/wiki/" license=('LGPL') options=('!libtool') -depends=('qt' 'telepathy-glib') -#depends=('qt' 'telepathy-farstream') +depends=('qt' 'telepathy-farstream' 'farstream-0.1') makedepends=('libxslt' 'python2' 'cmake' 'doxygen') conflicts=('telepathy-qt4') replaces=('telepathy-qt4') provides=('telepathy-qt4') -source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('94ac93aedf5f6fff49837bc8368e5a37') +source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc}) +md5sums=('94ac93aedf5f6fff49837bc8368e5a37' + 'e1b851b08b159fca39596ff8395ca53a') build() { cd "$srcdir" @@ -26,6 +26,7 @@ build() { cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ -DENABLE_TESTS=OFF make } diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index b036d7a33..e2f69c635 100644 --- a/extra/tumbler/PKGBUILD +++ b/extra/tumbler/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 173054 2012-12-09 18:45:26Z foutrelis $ +# $Id: PKGBUILD 175134 2013-01-15 01:39:25Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan Jezek <honzin.jezek@gmail.com> pkgname=tumbler -pkgver=0.1.26 -pkgrel=1 +pkgver=0.1.27 +pkgrel=2 pkgdesc="D-Bus service for applications to request thumbnails" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" license=('GPL2' 'LGPL') groups=('xfce4') depends=('dbus-glib' 'gdk-pixbuf2') -makedepends=('intltool' 'ffmpegthumbnailer' 'gst-plugins-base-libs' - 'poppler-glib' 'libgsf' 'libopenraw' 'freetype2') +makedepends=('intltool' 'ffmpegthumbnailer' 'poppler-glib' 'libgsf' + 'libopenraw' 'freetype2') optdepends=('ffmpegthumbnailer: for video thumbnails' - 'gstreamer: for video thumbnails' 'poppler-glib: for PDF thumbnails' 'libgsf: for ODF thumbnails' 'libopenraw: for RAW thumbnails' 'freetype2: for font thumbnails') options=('!libtool') source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2) -sha256sums=('6602ce700160d09edd88ea0b9bcb16abbc28974f372e646709e0ed8fbacc8a78') +sha256sums=('4c60b3b92877257fcc54d18acbbe4ad73c84a7ff7608a430ad5a05b452923869') build() { cd "$srcdir/$pkgname-$pkgver" @@ -32,7 +31,8 @@ build() { --sysconfdir=/etc \ --libexecdir=/usr/lib/xfce4 \ --disable-static \ - --disable-debug + --disable-debug \ + --disable-gstreamer-thumbnailer make } diff --git a/extra/vcdimager/PKGBUILD b/extra/vcdimager/PKGBUILD index a833bf7ba..35e536cb3 100644 --- a/extra/vcdimager/PKGBUILD +++ b/extra/vcdimager/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 150884 2012-02-23 13:48:13Z allan $ +# $Id: PKGBUILD 175148 2013-01-15 11:34:24Z jgc $ # Maintainer: damir <damir@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=vcdimager pkgver=0.7.24 -pkgrel=2.1 +pkgrel=3 pkgdesc="A full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's" arch=('i686' 'x86_64' 'mips64el') url="http://www.vcdimager.org/" license=('GPL') -depends=('libcdio>=0.82' 'libxml2>=2.7.3' 'popt') +depends=('libcdio' 'libxml2' 'popt') options=('!libtool') install=vcdimager.install source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz @@ -24,11 +24,6 @@ build() { make } -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 6652c39c7..61b1b7eb6 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 173231 2012-12-14 20:30:38Z giovanni $ +# $Id: PKGBUILD 175149 2013-01-15 11:34:26Z jgc $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=2.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" diff --git a/extra/w3m/PKGBUILD b/extra/w3m/PKGBUILD index ac7d8c12e..f9660f6d6 100644 --- a/extra/w3m/PKGBUILD +++ b/extra/w3m/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149346 2012-02-07 01:25:49Z bisson $ +# $Id: PKGBUILD 175136 2013-01-15 01:58:54Z bisson $ # Contributor: dorphell <dorphell@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=w3m pkgver=0.5.3 -pkgrel=3.1 +pkgrel=4 pkgdesc='Text-based Web browser, as well as pager' url='http://w3m.sourceforge.net/' license=('custom') @@ -13,18 +13,20 @@ makedepends=('imlib2') optdepends=('imlib2: for graphics support') depends=('openssl' 'gc' 'ncurses') source=("http://downloads.sourceforge.net/sourceforge/w3m/${pkgname}-${pkgver}.tar.gz" - 'https-segfault.patch' - 'GC_set_warn_proc.patch') + 'file_handle.patch' + 'https.patch' + 'gc72.patch') sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237' + '457de43be7eabc652614461a7ab25e3ba76b2aff' '66affb2f695fe0bdde25cf774642bfd6a9404e88' - '8bf1eae3241f5781d121319c8ee9bcda32d1f7bd') + '7baa06ca684fd140503a2adc65e2d606970c4662') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed 's/file_handle/file_handle_rofl/g' -i istream.* - patch -p1 -i ../https-segfault.patch - patch -Np0 -i "${srcdir}/GC_set_warn_proc.patch" + patch -p1 -i ../file_handle.patch + patch -p1 -i ../https.patch + patch -p1 -i ../gc72.patch ./configure \ --prefix=/usr \ @@ -42,6 +44,6 @@ package() { make DESTDIR="${pkgdir}" install install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" - find doc/* | grep -v CVS | xargs -i install "{}" "${pkgdir}/usr/share/doc/${pkgname}" + find doc/* | grep -v CVS | xargs -i install -m644 "{}" "${pkgdir}/usr/share/doc/${pkgname}" ln -s ../../doc/"${pkgname}"/README "${pkgdir}/usr/share/licenses/${pkgname}" } diff --git a/extra/w3m/file_handle.patch b/extra/w3m/file_handle.patch new file mode 100644 index 000000000..15422294f --- /dev/null +++ b/extra/w3m/file_handle.patch @@ -0,0 +1,60 @@ +diff -Naur old/istream.c new/istream.c +--- old/istream.c 2011-01-04 20:22:22.000000000 +1100 ++++ new/istream.c 2012-07-04 21:50:51.529661517 +1000 +@@ -22,8 +22,8 @@ + static void basic_close(int *handle); + static int basic_read(int *handle, char *buf, int len); + +-static void file_close(struct file_handle *handle); +-static int file_read(struct file_handle *handle, char *buf, int len); ++static void file_close(struct file_handle_rofl *handle); ++static int file_read(struct file_handle_rofl *handle, char *buf, int len); + + static int str_read(Str handle, char *buf, int len); + +@@ -114,7 +114,7 @@ + stream = New(union input_stream); + init_base_stream(&stream->base, STREAM_BUF_SIZE); + stream->file.type = IST_FILE; +- stream->file.handle = New(struct file_handle); ++ stream->file.handle = New(struct file_handle_rofl); + stream->file.handle->f = f; + if (closep) + stream->file.handle->close = closep; +@@ -658,13 +658,13 @@ + } + + static void +-file_close(struct file_handle *handle) ++file_close(struct file_handle_rofl *handle) + { + handle->close(handle->f); + } + + static int +-file_read(struct file_handle *handle, char *buf, int len) ++file_read(struct file_handle_rofl *handle, char *buf, int len) + { + return fread(buf, 1, len, handle->f); + } +diff -Naur old/istream.h new/istream.h +--- old/istream.h 2003-10-21 02:41:56.000000000 +1000 ++++ new/istream.h 2012-07-04 21:50:51.529661517 +1000 +@@ -20,7 +20,7 @@ + + typedef struct stream_buffer *StreamBuffer; + +-struct file_handle { ++struct file_handle_rofl { + FILE *f; + void (*close) (); + }; +@@ -53,7 +53,7 @@ + + struct file_stream { + struct stream_buffer stream; +- struct file_handle *handle; ++ struct file_handle_rofl *handle; + char type; + char iseos; + int (*read) (); diff --git a/extra/w3m/gc72.patch b/extra/w3m/gc72.patch new file mode 100644 index 000000000..47bd4c85c --- /dev/null +++ b/extra/w3m/gc72.patch @@ -0,0 +1,13 @@ +diff -Naur old/main.c new/main.c +--- old/main.c 2011-01-04 20:42:19.000000000 +1100 ++++ new/main.c 2012-07-04 21:49:10.136212236 +1000 +@@ -833,7 +833,8 @@ + mySignal(SIGPIPE, SigPipe); + #endif + +- orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); ++ orig_GC_warn_proc = GC_get_warn_proc(); ++ GC_set_warn_proc(wrap_GC_warn_proc); + err_msg = Strnew(); + if (load_argc == 0) { + /* no URL specified */ diff --git a/extra/w3m/https.patch b/extra/w3m/https.patch new file mode 100644 index 000000000..31286a70d --- /dev/null +++ b/extra/w3m/https.patch @@ -0,0 +1,19 @@ +Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994 + +--- old/url.c 2011-01-04 14:52:24.000000000 +0530 ++++ new/url.c 2011-09-02 18:25:43.305652690 +0530 +@@ -82,11 +82,11 @@ + {"ftp", SCM_FTP}, + {"local", SCM_LOCAL}, + {"file", SCM_LOCAL}, +- /* {"exec", SCM_EXEC}, */ ++ {"exec", SCM_EXEC}, + {"nntp", SCM_NNTP}, +- /* {"nntp", SCM_NNTP_GROUP}, */ ++ {"nntp", SCM_NNTP_GROUP}, + {"news", SCM_NEWS}, +- /* {"news", SCM_NEWS_GROUP}, */ ++ {"news", SCM_NEWS_GROUP}, + {"data", SCM_DATA}, + #ifndef USE_W3MMAILER + {"mailto", SCM_MAILTO}, diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD index 0d7cea185..42e4bb5e9 100644 --- a/extra/windowmaker/PKGBUILD +++ b/extra/windowmaker/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 159727 2012-05-26 10:06:04Z daniel $ +# $Id: PKGBUILD 175070 2013-01-12 14:16:01Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=windowmaker -pkgver=0.95.3 +pkgver=0.95.4 pkgrel=1 pkgdesc="An X11 window manager with a NEXTSTEP look and feel" arch=(i686 x86_64 'mips64el') @@ -11,7 +11,7 @@ license=('GPL' 'custom') depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib') options=('!libtool') source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz wmaker.desktop) -md5sums=('305af9d862e853a5d7977e801cb66ca3' +md5sums=('640b8ea5b1a875440aa48eaab09c5f00' '2fba97bebfd691836b92b8f0db79ff13') build() { diff --git a/extra/x2goclient/PKGBUILD b/extra/x2goclient/PKGBUILD new file mode 100644 index 000000000..41394e64e --- /dev/null +++ b/extra/x2goclient/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 175060 2013-01-12 11:27:38Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Contributor: Gerhard Brauer <gerbra@archlinux.de> +# Contributor: Richard Murri <admin@richardmurri.com> + +pkgname=x2goclient +pkgver=4.0.0.1 +pkgrel=1 +pkgdesc="x2go qt4 client" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.x2go.org" +depends=('qt' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('man2html') +install=x2goclient.install +source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('e8786329cfe97652d337f71caa71f432') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i "s:qmake-qt4:qmake:g" Makefile + sed -i "s:-o root -g root ::" Makefile + make PREFIX=/usr +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=/usr DESTDIR="$pkgdir" install +} diff --git a/extra/x2goclient/x2goclient.install b/extra/x2goclient/x2goclient.install new file mode 100644 index 000000000..51c21a337 --- /dev/null +++ b/extra/x2goclient/x2goclient.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor +} + +post_upgrade() { + xdg-icon-resource forceupdate --theme hicolor +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor +} diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD new file mode 100644 index 000000000..3f483146d --- /dev/null +++ b/extra/x2goserver/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 175694 2013-01-19 17:56:40Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> + +# Contributor: Gerhard Brauer <gerbra@archlinux.de> +# Contributor: Richard Murri <admin@richardmurri.com> +# Contributor: Markus Opitz <mastero23 at gmail dot com> +# Contributor: Milan Knížek <knizek@volny.cz> + +pkgname=x2goserver +pkgver=4.0.0.0 +pkgrel=4 +pkgdesc="Open source terminal server" +arch=('i686' 'x86_64') +url="http://www.x2go.org/" +license=('GPL') +depends=('openssh' 'perl-config-simple' 'perl-dbd-sqlite' 'python' 'x2go-agent' 'xorg-xauth') +makedepends=('man2html') +#optdepends=('cups-x2go: printing support') +options=('emptydirs') +install=x2goserver.install +backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') +source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) +md5sums=('1fc38566832c30897c6583e7ffa1fda3' + 'b09799f9203150dc1277a56058be48a8') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # -r option does not exist in Arch linux + # (However, html man pages do not get installed anyway...) + for Makefile in $(find . -type f -name Makefile); do + sed -i 's@(MAN2HTML_BIN) -r @(MAN2HTML_BIN) < @g' $Makefile + sed -i 's@ \$(MAN2HTML_SRC)/@ < \$(MAN2HTML_SRC)/@g' $Makefile + done + + # fix some Makefile permission options + for Makefile in $(find . -type f -name Makefile); do + sed -i "s:-o root -g root ::g" $Makefile + done + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=/usr DESTDIR="$pkgdir" install + + # systemd service file - only runs x2gocleansessions + install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service" + + # X2go homedir + printing spool dir + #install -dm 755 $pkgdir/var/lib/x2go + install -dm 770 $pkgdir/var/lib/x2go + install -dm 755 $pkgdir/var/spool/x2go + + # load fuse module at system start + install -dm755 $pkgdir/lib/modules-load.d + echo "fuse" > $pkgdir/lib/modules-load.d/x2goserver.conf + + install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}" + install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN" + install -m 644 "debian/copyright" "${pkgdir}/usr/share/doc/${pkgname}/copyright.DEBIAN" +} diff --git a/extra/x2goserver/x2goserver.install b/extra/x2goserver/x2goserver.install new file mode 100644 index 000000000..cac06dac8 --- /dev/null +++ b/extra/x2goserver/x2goserver.install @@ -0,0 +1,61 @@ +pre_install() { + cat << 'EOM' + ==> Use the following command to setup sqlite database: + ==> x2godbadmin --createdb +EOM +} + + +post_install() { + + # Make sure the group and user "x2gouser"(111) +"x2goprint"(112) exists on this system and have the correct values + + # x2gouser + if grep -q "^x2gouser:" /etc/group &> /dev/null ; then + groupmod -g 111 -n x2gouser x2gouser &> /dev/null + else + groupadd -g 111 x2gouser &> /dev/null + fi + + if grep -q "^x2gouser:" /etc/passwd 2> /dev/null ; then + usermod -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser x2gouser &> /dev/null + else + useradd -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null + fi + + # x2goprint + if grep -q "^x2goprint:" /etc/group &> /dev/null ; then + groupmod -g 112 -n x2goprint x2goprint &> /dev/null + else + groupadd -g 112 x2goprint &> /dev/null + fi + + if grep -q "^x2goprint:" /etc/passwd 2> /dev/null ; then + usermod -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint x2goprint &> /dev/null + else + useradd -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null + fi + + # fix permissions - see INSTALL file + chown -R x2goprint:x2goprint /var/spool/x2go + chmod 0770 /var/spool/x2go + + chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper + chmod 2755 /usr/lib/x2go/x2gosqlitewrapper + + chown root:x2goprint /usr/bin/x2goprint + chmod 2755 /usr/bin/x2goprint +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + userdel x2gouser &> /dev/null + userdel x2goprint &> /dev/null + groupdel x2gouser &> /dev/null || /bin/true + groupdel x2goprint &> /dev/null || /bin/true + rm -rf /var/lib/x2go/* &> /dev/null || /bin/true + rm -rf /var/spool/x2go/* &> /dev/null || /bin/true +} diff --git a/extra/x2goserver/x2goserver.service b/extra/x2goserver/x2goserver.service new file mode 100644 index 000000000..393d841c5 --- /dev/null +++ b/extra/x2goserver/x2goserver.service @@ -0,0 +1,10 @@ +[Unit] +Description=x2go - remote desktop server +After=syslog.target network.target + +[Service] +ExecStart=/usr/sbin/x2gocleansessions +PIDFile=/run/x2goserver.pid + +[Install] +WantedBy=multi-user.target diff --git a/extra/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD index fbcf063ec..013696d26 100644 --- a/extra/xf86-input-joystick/PKGBUILD +++ b/extra/xf86-input-joystick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173112 2012-12-11 10:08:00Z jgc $ +# $Id: PKGBUILD 175202 2013-01-16 16:15:44Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-joystick -pkgver=1.6.1 -pkgrel=3 +pkgver=1.6.2 +pkgrel=1 pkgdesc="X.Org Joystick input driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -16,7 +16,7 @@ groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 50-joystick.conf) -sha1sums=('0712652ec6cdb2fca6ad888548b232a4de9cf580' +sha1sums=('61658b8d829fdaed6064c7c26232c3884d359187' 'e1ff3699a0470c6bb78a53f718df9d8521621e11') build() { diff --git a/extra/xf86-input-vmmouse/PKGBUILD b/extra/xf86-input-vmmouse/PKGBUILD index f55f8d22c..009a20aba 100644 --- a/extra/xf86-input-vmmouse/PKGBUILD +++ b/extra/xf86-input-vmmouse/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168561 2012-10-13 11:43:53Z andyrtr $ +# $Id: PKGBUILD 175179 2013-01-16 09:55:26Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-vmmouse -pkgver=12.9.0 -pkgrel=2 +pkgver=13.0.0 +pkgrel=1 pkgdesc="X.org VMWare Mouse input driver" arch=(i686 x86_64) license=('custom') @@ -15,7 +15,7 @@ groups=('xorg-drivers' 'xorg') backup=('etc/X11/xorg.conf.d/50-vmmouse.conf') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('83500beddba2da390389705d482131872fe9be8b') +sha256sums=('04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index f20b720e3..5f86e44fb 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173952 2012-12-29 16:02:27Z andyrtr $ +# $Id: PKGBUILD 175503 2013-01-17 14:41:29Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.20.17 +pkgver=2.20.18 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('0bf5e9bd82b2643e06503665545f5cc8c3e24ab48ca4fe84f4e9e7ebbb9e7dbc') +sha256sums=('f3daedf9571b04234053507940ba0a221abfcd294c3c350ff49eaf499b8437b5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD index fe5546265..47905d4e6 100644 --- a/extra/xf86-video-vmware/PKGBUILD +++ b/extra/xf86-video-vmware/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168595 2012-10-13 11:46:27Z andyrtr $ +# $Id: PKGBUILD 175177 2013-01-16 09:39:57Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-vmware -pkgver=12.0.2 -pkgrel=2 +pkgver=13.0.0 +pkgrel=1 pkgdesc="X.org vmware video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -13,13 +13,11 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'sc conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff) -sha1sums=('efa47f365d88da245804a9934719ff860ed04f95' - 'ad475b37e2614f365533a40da0fb5b9e2709e3c6') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/git_fixes.diff ./configure --prefix=/usr --enable-vmwarectrl-client make } diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 7a52abee7..2d744a5d7 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169760 2012-10-27 23:42:28Z eric $ +# $Id: PKGBUILD 175150 2013-01-15 11:34:28Z jgc $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib pkgver=1.2.2 -pkgrel=3 +pkgrel=4 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.xine-project.org" diff --git a/extra/xorg-bdftopcf/PKGBUILD b/extra/xorg-bdftopcf/PKGBUILD index 0597c1fda..188b0e283 100644 --- a/extra/xorg-bdftopcf/PKGBUILD +++ b/extra/xorg-bdftopcf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150979 2012-02-24 12:29:18Z allan $ +# $Id: PKGBUILD 175183 2013-01-16 10:19:35Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-bdftopcf -pkgver=1.0.3 -pkgrel=2.1 +pkgver=1.0.4 +pkgrel=1 pkgdesc="Convert X font from Bitmap Distribution Format to Portable Compiled Format" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libxfont') makedepends=('xorg-util-macros' 'xproto') groups=('xorg' 'xorg-apps') source=(http://xorg.freedesktop.org/archive/individual/app/bdftopcf-${pkgver}.tar.bz2) -sha1sums=('146b4ece2867479045c3b4593b22c9f1d21da14a') +sha256sums=('eaf59057ba3d7cffe29526562ce50868da7da823487a4cfb3e16946e5ffd2798') build() { cd "${srcdir}/bdftopcf-${pkgver}" diff --git a/extra/xorg-xcalc/PKGBUILD b/extra/xorg-xcalc/PKGBUILD index a8e1ab01b..71a746d92 100644 --- a/extra/xorg-xcalc/PKGBUILD +++ b/extra/xorg-xcalc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151172 2012-02-25 06:55:40Z allan $ +# $Id: PKGBUILD 175181 2013-01-16 10:11:05Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xcalc -pkgver=1.0.4.1 -pkgrel=2.1 +pkgver=1.0.5 +pkgrel=1 pkgdesc="Scientific calculator for X" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -11,7 +11,7 @@ license=('custom') depends=('libxaw') makedepends=('xorg-util-macros') source=(http://xorg.freedesktop.org/archive/individual/app/xcalc-${pkgver}.tar.bz2) -sha1sums=('2206fc4bf3719c43fa13a6c64a37b40607d8e5e2') +sha256sums=('448f3aca106e86fbc051172cc4ea51eebce2fac096a7a971b8561b9b85697ae4') build() { cd "${srcdir}/xcalc-${pkgver}" diff --git a/extra/xorg-xconsole/PKGBUILD b/extra/xorg-xconsole/PKGBUILD index 939678cd7..5ca23dfab 100644 --- a/extra/xorg-xconsole/PKGBUILD +++ b/extra/xorg-xconsole/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151170 2012-02-25 06:52:57Z allan $ +# $Id: PKGBUILD 175083 2013-01-13 09:45:06Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xconsole -pkgver=1.0.4 -pkgrel=2.1 +pkgver=1.0.5 +pkgrel=1 pkgdesc="Monitor system console messages with X" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -11,7 +11,7 @@ license=('custom') depends=('libxaw' 'libxmu' 'libxt' 'libx11') makedepends=('xorg-util-macros') source=(http://xorg.freedesktop.org/archive/individual/app/xconsole-${pkgver}.tar.bz2) -sha1sums=('195299d4948ba4c62e961ddd0bd4572283244715') +sha256sums=('195fad7a1ca274835fc346c82acce90a0c2e9f288e85bd1a3c256dbc1c8c11e5') build() { cd "${srcdir}/xconsole-${pkgver}" diff --git a/extra/xorg-xedit/PKGBUILD b/extra/xorg-xedit/PKGBUILD index 4e8a7d2e7..0246a8ce3 100644 --- a/extra/xorg-xedit/PKGBUILD +++ b/extra/xorg-xedit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: $ +# $Id: PKGBUILD 175085 2013-01-13 09:47:49Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xedit -pkgver=1.2.0 -pkgrel=2.1 +pkgver=1.2.1 +pkgrel=1 pkgdesc="Simple text editor for X" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -11,7 +11,7 @@ license=('custom') depends=('libxaw' 'libxmu' 'libxt' 'libx11') makedepends=('xorg-util-macros') source=(http://xorg.freedesktop.org/archive/individual/app/xedit-${pkgver}.tar.bz2) -sha1sums=('e6f8735d09c9da67bba3cd3c39f34f5d1fc79a70') +sha256sums=('89b0b0f86b0b5ab2898ee669d394b28c6ac5a9a53f8fae1726ba5664cd36c98e') build() { cd "${srcdir}/xedit-${pkgver}" diff --git a/extra/xorg-xmag/PKGBUILD b/extra/xorg-xmag/PKGBUILD index 028caad33..501d5e12f 100644 --- a/extra/xorg-xmag/PKGBUILD +++ b/extra/xorg-xmag/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: $ +# $Id: PKGBUILD 175087 2013-01-13 09:49:37Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xmag -pkgver=1.0.4 -pkgrel=2.1 +pkgver=1.0.5 +pkgrel=1 pkgdesc="Magnify parts of the screen" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -11,7 +11,7 @@ license=('custom') depends=('libxaw' 'libxmu' 'libxt' 'libx11') makedepends=('xorg-util-macros') source=(http://xorg.freedesktop.org/archive/individual/app/xmag-${pkgver}.tar.bz2) -sha1sums=('95695d4d4a731e5deb4196a0cc6d04ecaba023fe') +sha256sums=('4ace8795cf756be4ba387f30366045594ce26adda2f5ffe1f8e896825d0932c6') build() { cd "${srcdir}/xmag-${pkgver}" diff --git a/extra/xorg-xmessage/PKGBUILD b/extra/xorg-xmessage/PKGBUILD index 42189581d..de79d4648 100644 --- a/extra/xorg-xmessage/PKGBUILD +++ b/extra/xorg-xmessage/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151011 2012-02-24 13:16:39Z allan $ +# $Id: PKGBUILD 175089 2013-01-13 09:51:21Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xmessage -pkgver=1.0.3 -pkgrel=2.1 +pkgver=1.0.4 +pkgrel=1 pkgdesc="Display a message or query in a window" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -11,7 +11,7 @@ license=('custom') depends=('libxaw') makedepends=('xorg-util-macros') source=(http://xorg.freedesktop.org/archive/individual/app/xmessage-${pkgver}.tar.bz2) -sha1sums=('a8bfefbbe7785fa0e58ed4f596f4d79ba0b4d9b2') +sha256sums=('bcdf4b461c439bb3ade6e1e41c47d6218b912da8e9396b7ad70856db2f95ab68') build() { cd "${srcdir}/xmessage-${pkgver}" diff --git a/extra/xorg-xvidtune/PKGBUILD b/extra/xorg-xvidtune/PKGBUILD index 227f5cd43..16efa8c97 100644 --- a/extra/xorg-xvidtune/PKGBUILD +++ b/extra/xorg-xvidtune/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xvidtune -pkgver=1.0.2 -pkgrel=2.1 +pkgver=1.0.3 +pkgrel=1 pkgdesc="Video mode tuner for Xorg" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -11,7 +11,7 @@ license=('custom') depends=('libxxf86vm' 'libxt' 'libxaw' 'libxmu' 'libx11') makedepends=('xorg-util-macros') source=("http://xorg.freedesktop.org/archive/individual/app/xvidtune-${pkgver}.tar.bz2") -sha1sums=('2f3f821943018c07efd4547afa4313ac92718b1e') +sha256sums=('24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01') build() { cd "${srcdir}/xvidtune-${pkgver}" |