From bceed102ef20163ec69542342988b89b9ceb1fcf Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sat, 25 Jan 2014 03:57:09 +0000 Subject: Sat Jan 25 03:51:36 UTC 2014 --- extra/calligra/PKGBUILD | 13 ++++++--- extra/enlightenment/PKGBUILD | 2 +- extra/gtk-vnc/PKGBUILD | 6 ++-- extra/lftp/PKGBUILD | 6 ++-- extra/libvorbis/PKGBUILD | 6 ++-- extra/oxygen-gtk2/PKGBUILD | 6 ++-- extra/oxygen-gtk3/PKGBUILD | 6 ++-- extra/quazip/PKGBUILD | 8 ++--- extra/redland/PKGBUILD | 10 +++---- extra/wayland/PKGBUILD | 6 ++-- extra/xfig/PKGBUILD | 19 +++++++----- .../xfig-fix_dash_list_for_different_styles.patch | 34 ++++++++++++++++++++++ 12 files changed, 82 insertions(+), 40 deletions(-) create mode 100644 extra/xfig/xfig-fix_dash_list_for_different_styles.patch (limited to 'extra') diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 176d85456..8ff992555 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203352 2014-01-08 14:45:06Z lcarlier $ +# $Id: PKGBUILD 204609 2014-01-24 07:32:37Z andyrtr $ # Maintainer: Andrea Scarpino # Contributor: Ronald van Haren @@ -18,20 +18,24 @@ pkgname=('calligra-braindump' 'calligra-stage' 'calligra-words') pkgver=2.7.5 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio' 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt' 'libkdcraw' - 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc') + 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc' 'libvisio') + # libpqxx is in community, move it to extra? groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz") md5sums=('05d1d0bac970d6dc68ffabc12fca2eb7') prepare() { mkdir build + # fix openjpeg detection + sed -i "s:/usr/include/openjpeg:/usr/include/openjpeg-1.5:" \ + ${srcdir}/${pkgbase}-${pkgver}/cmake/modules/FindOpenJPEG.cmake } build() { @@ -46,7 +50,8 @@ build() { package_calligra-filters() { pkgdesc="Filters for the Calligra office suite" optdepends=('libwpg: Corel WordPerfect Graphics image importer' - 'libwps: Microsoft Works file word processor format import') + 'libwps: Microsoft Works file word processor format import' + 'libvisio: Microsoft Visio import filter') conflicts=('koffice-filters') replaces=('koffice-filters') install=calligra-filters.install diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD index 06481e29f..6af489c9c 100644 --- a/extra/enlightenment/PKGBUILD +++ b/extra/enlightenment/PKGBUILD @@ -5,7 +5,7 @@ pkgname=enlightenment pkgver=0.18.2 pkgrel=1 pkgdesc="Enlightenment window manager" -arch=('i686' 'x86_64' 'arm') +arch=('i686' 'x86_64') url="http://www.enlightenment.org" license=('BSD') depends=('elementary' 'xcb-util-keysyms' 'hicolor-icon-theme' 'pixman' 'mesa' diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD index 913c57508..479693369 100644 --- a/extra/gtk-vnc/PKGBUILD +++ b/extra/gtk-vnc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203577 2014-01-13 17:12:08Z andyrtr $ +# $Id: PKGBUILD 204613 2014-01-24 10:08:11Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Allan McRae @@ -6,12 +6,12 @@ pkgname=gtk-vnc pkgver=0.5.3 -pkgrel=2 +pkgrel=3 pkgdesc="A VNC viewer widget for GTK" arch=('i686' 'x86_64') url="https://wiki.gnome.org/Projects/gtk-vnc" license=('LGPL') -depends=('libgcrypt' 'gtk3') +depends=('libgcrypt' 'gtk3' 'gnutls') optdepends=('gtk2: GTK2 widget') makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index e8688de88..98bf838ea 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 201537 2013-12-14 08:34:10Z andyrtr $ +# $Id: PKGBUILD 204639 2014-01-24 13:26:47Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Aaron Griffin pkgname=lftp -pkgver=4.4.14 +pkgver=4.4.15 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://lftp.yar.ru/ftp/${pkgname}-${pkgver}.tar.xz{,.asc}) -md5sums=('809544255f668a6d3af867f643cc321f' +md5sums=('f19cc0cea1d427aa2a952b27661b91e5' 'SKIP') build() { diff --git a/extra/libvorbis/PKGBUILD b/extra/libvorbis/PKGBUILD index 5e57d8167..027e60707 100644 --- a/extra/libvorbis/PKGBUILD +++ b/extra/libvorbis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198262 2013-10-30 13:48:00Z allan $ +# $Id: PKGBUILD 204644 2014-01-24 14:22:14Z tomegun $ # Maintainer: Tobias Kieslich # Contributor: dorphell # Contributor: John Proctor pkgname=libvorbis -pkgver=1.3.3 +pkgver=1.3.4 pkgrel=1 pkgdesc="Vorbis codec library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://www.xiph.org/vorbis/" license=('BSD') depends=('libogg') source=(http://downloads.xiph.org/releases/vorbis/${pkgname}-${pkgver}.tar.gz) -md5sums=('6b1a36f0d72332fae5130688e65efe1f') +md5sums=('8851c593a52d1ef9c526d95174873852') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD index e510f4e51..47b958936 100644 --- a/extra/oxygen-gtk2/PKGBUILD +++ b/extra/oxygen-gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 201423 2013-12-11 13:48:51Z andrea $ +# $Id: PKGBUILD 204679 2014-01-24 21:31:40Z andrea $ # Maintainer: Andrea Scarpino # Contributor: birdflesh pkgname=oxygen-gtk2 -pkgver=1.4.1 +pkgver=1.4.3 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ conflicts=('oxygen-gtk') replaces=('oxygen-gtk') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('27bb5826d936fe2bddab35057739908f') +md5sums=('822cedb3ae46907fd262487150a195d4') prepare() { mkdir build diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD index 845dc2fa5..4f8d2bd60 100644 --- a/extra/oxygen-gtk3/PKGBUILD +++ b/extra/oxygen-gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 201533 2013-12-14 07:15:21Z andrea $ +# $Id: PKGBUILD 204681 2014-01-24 21:32:34Z andrea $ # Maintainer: Andrea Scarpino pkgname=oxygen-gtk3 -pkgver=1.3.1 +pkgver=1.3.3 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') depends=('gtk3') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('a8ca81ea29a93c5859f179266f07c66e') +md5sums=('c849ca9ef925b2d967538b1b83b6e72a') prepare() { mkdir build diff --git a/extra/quazip/PKGBUILD b/extra/quazip/PKGBUILD index 78e0282a2..245a07b95 100644 --- a/extra/quazip/PKGBUILD +++ b/extra/quazip/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 199053 2013-11-07 23:52:10Z andrea $ +# $Id: PKGBUILD 204637 2014-01-24 13:14:32Z andrea $ # Maintainer: Andrea Scarpino # Contributor: trya pkgname=quazip -pkgver=0.5.1 -pkgrel=3 +pkgver=0.6 +pkgrel=1 pkgdesc="C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package" url="http://sourceforge.net/projects/quazip/" license=('LGPL') arch=('i686' 'x86_64') depends=('qt4') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('eec6b9b6f19654230dfcd158f29ea9d0') +md5sums=('5ad6f58e9bd6eddf11d8bf37ac995e9e') build() { cd ${pkgname}-${pkgver}/${pkgname} diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD index 849613af2..facd62271 100644 --- a/extra/redland/PKGBUILD +++ b/extra/redland/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198397 2013-10-30 14:37:22Z allan $ +# $Id: PKGBUILD 204645 2014-01-24 14:22:15Z tomegun $ # Maintainer: Tom Gundersen # Contributor: AndyRTR # Contributor: Francois Charette @@ -6,16 +6,16 @@ pkgbase=redland epoch=1 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite') -pkgver=1.0.16 -pkgrel=2 +pkgver=1.0.17 +pkgrel=1 url="http://librdf.org/" license=("GPL") arch=('i686' 'x86_64') makedepends=('rasqal' 'raptor' 'db' 'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite') source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc} rpath.diff) -sha256sums=('d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd' - '2955af40eb2fbffa6e1ef28f7f1b7f607a3958478a5080896b878da96605246d' +sha256sums=('de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681' + 'SKIP' '9ddf9f7581f5194d73ad908f3b26354c70d3079a7a87c8add8a0d0e4c6974fec') build() { diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD index 4729cd6b2..5defd4e30 100644 --- a/extra/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198481 2013-10-30 15:07:38Z allan $ +# $Id: PKGBUILD 204641 2014-01-24 14:01:34Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Sébastien Luttringer # Contributor: Joel Teichroeb pkgname=wayland -pkgver=1.3.0 +pkgver=1.4.0 pkgrel=1 pkgdesc='A computer display server protocol' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('MIT') depends=('libffi' 'expat') makedepends=('doxygen') source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('febbbfc8d76ed0b2157077d50cb6e5ceb1aa47de') +sha1sums=('bc91befb8386ec5c1ff4f24ad8464c24a7496ae2') build() { cd $pkgname-$pkgver diff --git a/extra/xfig/PKGBUILD b/extra/xfig/PKGBUILD index 832a84914..0bb6f5d7d 100644 --- a/extra/xfig/PKGBUILD +++ b/extra/xfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 194017 2013-09-10 00:31:09Z eric $ +# $Id: PKGBUILD 204604 2014-01-24 03:48:01Z eric $ # Maintainer: Eric Bélanger pkgname=xfig pkgver=3.2.5c -pkgrel=1 +pkgrel=2 pkgdesc="An interactive drawing tool" arch=('i686' 'x86_64') url="http://www.xfig.org/userman/" @@ -13,21 +13,24 @@ makedepends=('imake') optdepends=('transfig: to use the frontend to convert fig files') options=('!makeflags' '!emptydirs') install=xfig.install -source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz \ - xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch \ - xfig-3.2.5-urwfonts.patch \ +source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz + xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch + xfig-3.2.5-urwfonts.patch xfig-fix_dash_list_for_different_styles.patch LICENSE) sha1sums=('47d31dd9ad46819732ab74db340e11489db2c646' '926ad99c7221baa4aa9e9737722958860b2700fc' '45e7fb80193825b088d798089aeade2e1729c9ac' 'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb' + '6aa98ab4497c30d18b4d0599f9d943bf78991246' '31edf4cfab708820ea3f114d095dfef5aa88e5aa') prepare() { cd ${pkgname}.${pkgver} - patch -p1 < ../xfig-3.2.4-redhat.patch - patch -p1 < ../xfig-3.2.5-color-resources.patch - patch -p1 < ../xfig-3.2.5-urwfonts.patch + patch -p1 -i "${srcdir}/xfig-3.2.4-redhat.patch" + patch -p1 -i "${srcdir}/xfig-3.2.5-color-resources.patch" + patch -p1 -i "${srcdir}/xfig-3.2.5-urwfonts.patch" + patch -p1 -i "${srcdir}/xfig-fix_dash_list_for_different_styles.patch" + sed -i -e 's|X11R6/||' -e 's|image/x-xfig|image/fig;image/x-xfig|' xfig.desktop echo -e "Categories=Application;Graphics;\nIcon=xfig" >> xfig.desktop sed -i 's/#define XAW3D/XCOMM #define XAW3D/' Imakefile diff --git a/extra/xfig/xfig-fix_dash_list_for_different_styles.patch b/extra/xfig/xfig-fix_dash_list_for_different_styles.patch new file mode 100644 index 000000000..7c5aaa94f --- /dev/null +++ b/extra/xfig/xfig-fix_dash_list_for_different_styles.patch @@ -0,0 +1,34 @@ +--- xfig.3.2.5c/w_drawprim.c 2012-10-17 00:14:09.000000000 +0200 ++++ xfig.3.2.5c/w_drawprim.c 2013-11-29 02:45:36.950448714 +0100 +@@ -1292,14 +1292,23 @@ void set_fill_gc(int fill_style, int op, + } + + +-static unsigned char dash_list[16][2] = {{255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}}; ++static unsigned char dash_list[16][8] = { ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}}; + + static int join_styles[3] = { JoinMiter, JoinRound, JoinBevel }; + static int cap_styles[3] = { CapButt, CapRound, CapProjecting }; -- cgit v1.2.3-54-g00ecf