diff options
50 files changed, 485 insertions, 814 deletions
diff --git a/community/arm-elf-binutils/PKGBUILD b/community/arm-elf-binutils/PKGBUILD deleted file mode 100644 index 15768e09e..000000000 --- a/community/arm-elf-binutils/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 79080 2012-10-30 09:53:07Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=arm-elf-binutils -pkgver=2.23 -pkgrel=1 -_xprefix=/usr -pkgdesc="A set of programs to assemble and manipulate binary and object files" -arch=(i686 x86_64) -license=(GPL) -options=(!libtool) -url="http://sources.redhat.com/binutils" -depends=('glibc' 'zlib') -source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz) -md5sums=('ed58f50d8920c3f1d9cb110d5c972c27') - -build() { - cd $srcdir/binutils-${pkgver} - - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=${_xprefix} \ - --program-prefix=arm-elf- \ - --enable-shared \ - --disable-multilib \ - --with-lib-path=${_xprefix}/lib/binutils/arm-elf \ - --disable-nls \ - --target=arm-elf \ - --host=$CHOST \ - --build=$CHOST \ - --with-sysroot=/usr/$CHOST/arm-elf \ -# --with-build-sysroot=/usr/i686-pc-linux-gnu/arm-elf/ - -# mkdir -p $pkgdir/${_xprefix}/lib/binutils -# sed -i 's|know (S_GET_VALUE (frag->tc_frag_data.last_map) < S_GET_VALUE (symbolP));|{know (S_GET_VALUE (frag->tc_frag_data.last_map) < S_GET_VALUE (symbolP));}|' gas/config/tc-arm.c - - make configure-host - make tooldir=$pkgdir/${_xprefix} - make prefix=$pkgdir/${_xprefix} tooldir=$pkgdir/${_xprefix} install - - mkdir -p $pkgdir/${_xprefix}/lib/binutils/arm-elf - cp -v include/libiberty.h $pkgdir/${_xprefix}/lib/binutils/arm-elf - - rm -f $pkgdir/${_xprefix}/man/man1/{dlltool,nlmconv,windres}* - - rm -f $pkgdir/usr/bin/ar - rm -f $pkgdir/usr/bin/as - rm -f $pkgdir/usr/bin/ld - rm -f $pkgdir/usr/bin/nm - rm -f $pkgdir/usr/bin/objdump - rm -f $pkgdir/usr/bin/ranlib - rm -f $pkgdir/usr/bin/strip - rm -f $pkgdir/usr/bin/objcopy - rm -f $pkgdir/usr/lib/libiberty.a - rm -rf $pkgdir/usr/share -} diff --git a/community/arm-elf-gcc-base/PKGBUILD b/community/arm-elf-gcc-base/PKGBUILD deleted file mode 100644 index 5627f8c6e..000000000 --- a/community/arm-elf-gcc-base/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 82198 2013-01-11 12:12:37Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=arm-elf-gcc-base -pkgver=4.7.2 -pkgrel=1 -pkgdesc="The GNU Compiler Collection" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -url="http://gcc.gnu.org" -depends=('arm-elf-binutils' 'libmpc' 'libelf') -options=(!libtool !emptydirs zipman docs !strip) -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) -md5sums=('cc308a0891e778cfda7a151ab8a6e762') - -build() { - cd $srcdir/gcc-$pkgver - - export CFLAGS="-O2 -pipe" - export CXXFLAGS="-O2 -pipe" - - rm -rf build - mkdir build - cd build - - ../configure --prefix=/usr \ - --target=arm-elf \ - --enable-obsolete \ - --host=$CHOST \ - --build=$CHOST \ - --enable-shared --disable-nls --enable-languages=c --enable-multilib \ - --with-local-prefix=/usr/lib/arm-elf \ - --with-as=/usr/bin/arm-elf-as --with-ld=/usr/bin/arm-elf-ld \ - --enable-softfloat \ - --with-float=soft \ - --with-newlib \ - --with-sysroot=/usr/$CHOST/arm-elf - - make all-gcc all-target-libgcc -} - -package() { - cd $srcdir/gcc-$pkgver/build - - export CFLAGS="-O2 -pipe" - export CXXFLAGS="-O2 -pipe" - - make DESTDIR=$pkgdir install-gcc install-target-libgcc - - rm -f $pkgdir/usr/share/man/man7/fsf-funding.7* - rm -f $pkgdir/usr/share/man/man7/gfdl.7* - rm -f $pkgdir/usr/share/man/man7/gpl.7* - rm -rf $pkgdir/usr/share/info - - cp -r $pkgdir/usr/libexec/* $pkgdir/usr/lib/ - rm -rf $pkgdir/usr/libexec - - # strip it manually - strip $pkgdir/usr/bin/* 2>/dev/null || true - find $pkgdir/usr/lib -type f -exec arm-elf-strip --strip-debug --strip-unneeded {} \; 2>/dev/null || true -} diff --git a/community/gimp-refocus/PKGBUILD b/community/gimp-refocus/PKGBUILD index 5cc3b5703..28a68328a 100644 --- a/community/gimp-refocus/PKGBUILD +++ b/community/gimp-refocus/PKGBUILD @@ -4,7 +4,7 @@ pkgname=gimp-refocus pkgver=0.9.0 -pkgrel=3 +pkgrel=4 pkgdesc="A sharpen plugin for gimp using FIR Wiener filtering" arch=('i686' 'x86_64') url="http://refocus.sourceforge.net/" @@ -13,7 +13,7 @@ depends=('gimp') source=(http://downloads.sourceforge.net/sourceforge/refocus/refocus-${pkgver}.tar.gz \ refocus-gimp-2.0.patch refocus-mirror-fix.patch refocus-gimp-preview.patch) md5sums=('8d4eac4ef45c904fb5e73021696bec94' - '8ef9dfe697cd20be2be14c1ee53a240a' + '1b7bc13154f483994af3846c7ee29ad7' '532593cba030feab8ffa7800fc9cd782' '6b55dbdc656646c765064cf21e1a3c57') diff --git a/community/gimp-refocus/refocus-gimp-2.0.patch b/community/gimp-refocus/refocus-gimp-2.0.patch index 259ee9f87..454b8d999 100644 --- a/community/gimp-refocus/refocus-gimp-2.0.patch +++ b/community/gimp-refocus/refocus-gimp-2.0.patch @@ -68,7 +68,7 @@ diff -u -u -r1.1.1.1 Makefile.am refocus_SOURCES = refocus.c conv.c gimppreview.c prevman.c util.c matrix.c tilebuf.c bdclosure.c fwlapack.c -refocus_LDADD = @GTK_LIBS@ -lgimp ${ldadd_atlas} -+refocus_LDADD = @GIMP_LIBS@ ${ldadd_atlas} ++refocus_LDADD = @GIMP_LIBS@ ${ldadd_atlas} -lm refocus_DEPENDENCIES=@LAPACK_LIB_DIR@/liblapack.a test_matrix_SOURCES = matrix.c test-matrix.c fwlapack.c diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD index bcb2fb7c5..71e6e5072 100644 --- a/community/glusterfs/PKGBUILD +++ b/community/glusterfs/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 92260 2013-06-03 11:49:45Z foutrelis $ +# $Id: PKGBUILD 94386 2013-07-22 14:09:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributors: # Andrei Antoukh - niwi@niwi.be - http://www.niwi.be # henning mueller <henning@orgizm.net> pkgname=glusterfs -pkgver=3.3.1 +pkgver=3.4.0 _basever=`echo $pkgver | cut -f1-2 -d.` -pkgrel=5 +pkgrel=1 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.' arch=(i686 x86_64) url='http://www.gluster.org/' @@ -17,9 +17,7 @@ makedepends=(flex bison) options=(!libtool) source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz glusterd.service) -sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' - 'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7') -sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' +sha256sums=('2a2a43fb52a7f6b8b00331acc5ea2c86a067a2f2901cca886a2348e919c0cbd8' '18e6c3bcca396a4524d866977d3fa86135377d7bf5d28a130e697ae2e85f043b') build() { @@ -46,7 +44,7 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + make -j1 DESTDIR=$pkgdir install install -D -m 644 \ $srcdir/$pkgname-$pkgver/{README,INSTALL,COPYING*} \ diff --git a/community/guvcview/PKGBUILD b/community/guvcview/PKGBUILD index b63e5b471..26fd5b405 100644 --- a/community/guvcview/PKGBUILD +++ b/community/guvcview/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90045 2013-05-06 19:37:46Z foutrelis $ +# $Id: PKGBUILD 94403 2013-07-22 17:10:07Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Maxwell Pray a.k.a. Synthead <synthead@gmail.com> pkgname=guvcview -pkgver=1.7.0 -pkgrel=2 +pkgver=1.7.1 +pkgrel=1 pkgdesc="A video viewer and capturer for the linux uvc driver" arch=('i686' 'x86_64') url="http://guvcview.sourceforge.net/" @@ -14,7 +14,7 @@ makedepends=('pkg-config' 'intltool') optdepends=('pulseaudio: for PulseAudio support') options=('!docs') source=("http://downloads.sourceforge.net/project/${pkgname}/source/${pkgname}-src-${pkgver}.tar.gz") -md5sums=('fe141fe2fe2a16df69f7866c27334a56') +md5sums=('5ca1b9c89d2b9370ee203dcc24efd695') build() { cd "${srcdir}/${pkgname}-src-${pkgver}" diff --git a/community/id3lib-rcc/PKGBUILD b/community/id3lib-rcc/PKGBUILD deleted file mode 100644 index cb62b1ef9..000000000 --- a/community/id3lib-rcc/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 55559 2011-09-14 10:08:38Z andrea $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=id3lib-rcc -pkgver=3.8.3 -pkgrel=7 -pkgdesc="id3lib with librcc patch" -arch=('i686' 'x86_64') -url="http://id3lib.sourceforge.net/" -license=('GPL') -depends=('libxml2' 'librcc' 'gcc-libs') -provides=('id3lib') -conflicts=('id3lib') -options=('!libtool') -source=(http://downloads.sourceforge.net/id3lib/id3lib-$pkgver.tar.gz - http://downloads.sourceforge.net/rusxmms/id3lib-csa2.tar.bz2 - arch.patch - id3lib-gcc4.patch) -md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7' - '608a475f119974c8f72406fd84e1030f' - '8b503330d653578f75fc9f2bf3c3833d' - '94191cf1fe6f5fd391d95a6de81a48b9') - -build() { - cd "${srcdir}"/id3lib-$pkgver - - patch -Np1 -i "${srcdir}"/id3lib/id3lib-ds-rcc.patch - patch -Np1 -i "${srcdir}"/id3lib-gcc4.patch - cd src - patch -Np0 -i "${srcdir}"/arch.patch - cd .. - - sed -i 's#iomanip.h##' configure - sed -i 's|size_t size_t, size_t \*size_t|size_t s1, size_t *s2|' src/rccpatch.h - - ./configure --prefix=/usr - make LDFLAGS=-lrcc -} - -package() { - cd "${srcdir}"/id3lib-$pkgver - make DESTDIR="${pkgdir}" install -} diff --git a/community/id3lib-rcc/arch.patch b/community/id3lib-rcc/arch.patch deleted file mode 100644 index 2732fde5e..000000000 --- a/community/id3lib-rcc/arch.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- Makefile.in.org 2003-03-02 03:23:00.000000000 +0300 -+++ Makefile.in 2006-07-14 08:33:40.000000000 +0400 -@@ -172,7 +172,8 @@ - tag_parse_v1.cpp \ - tag_render.cpp \ - utils.cpp \ -- writers.cpp -+ writers.cpp \ -+ rccpatch.cpp - - - lib_LTLIBRARIES = libid3.la -@@ -200,7 +201,7 @@ - io_decorators.lo io_helpers.lo misc_support.lo mp3_parse.lo \ - readers.lo spec.lo tag.lo tag_file.lo tag_find.lo tag_impl.lo \ - tag_parse.lo tag_parse_lyrics3.lo tag_parse_musicmatch.lo \ -- tag_parse_v1.lo tag_render.lo utils.lo writers.lo -+ tag_parse_v1.lo tag_render.lo utils.lo writers.lo rccpatch.lo - am_libid3_la_OBJECTS = $(am__objects_1) - libid3_la_OBJECTS = $(am_libid3_la_OBJECTS) - -@@ -233,7 +234,8 @@ - @AMDEP_TRUE@ ./$(DEPDIR)/tag_parse_musicmatch.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/tag_parse_v1.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/tag_render.Plo ./$(DEPDIR)/utils.Plo \ --@AMDEP_TRUE@ ./$(DEPDIR)/writers.Plo -+@AMDEP_TRUE@ ./$(DEPDIR)/writers.Plo \ -+@AMDEP_TRUE@ ./$(DEPDIR)/rccpatch.Plo - CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ -@@ -328,6 +330,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tag_render.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writers.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rccpatch.Plo@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) diff --git a/community/id3lib-rcc/id3lib-gcc4.patch b/community/id3lib-rcc/id3lib-gcc4.patch deleted file mode 100644 index 7f4ef666a..000000000 --- a/community/id3lib-rcc/id3lib-gcc4.patch +++ /dev/null @@ -1,189 +0,0 @@ -diff -wbBur id3lib-3.8.3/configure.in id3lib-3.8.3.my/configure.in ---- id3lib-3.8.3/configure.in 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/configure.in 2009-09-08 15:09:40.000000000 +0000 -@@ -227,7 +227,6 @@ - ) - AC_CHECK_HEADERS( \ - string \ -- iomanip.h \ - ,,AC_MSG_ERROR([Missing a vital header file for id3lib]) - ) - -@@ -296,11 +295,11 @@ - AC_DEFINE_UNQUOTED(_ID3LIB_BINARY_AGE, $ID3LIB_BINARY_AGE) - AC_DEFINE_UNQUOTED(_ID3_COMPILED_WITH_DEBUGGING, "${enable_debug}") - --CONDITIONAL_SUBDIRS= --if test "x$ac_cv_lib_z_uncompress" = "xno"; then -- CONDITIONAL_SUBDIRS="$CONDITIONAL_SUBDIRS zlib" --fi --AC_CONFIG_SUBDIRS(zlib) -+#CONDITIONAL_SUBDIRS= -+#if test "x$ac_cv_lib_z_uncompress" = "xno"; then -+# CONDITIONAL_SUBDIRS="$CONDITIONAL_SUBDIRS zlib" -+#fi -+#AC_CONFIG_SUBDIRS(zlib) - - CFLAGS="$CFLAGS -Wall" - -diff -wbBur id3lib-3.8.3/doc/Doxyfile.in id3lib-3.8.3.my/doc/Doxyfile.in ---- id3lib-3.8.3/doc/Doxyfile.in 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/doc/Doxyfile.in 2009-09-08 15:10:40.000000000 +0000 -@@ -263,8 +263,10 @@ - - INPUT = ../src \ - ../include/id3/field.h \ -- ../include/id3/frame.h \ - ../include/id3/globals.h \ -+ ../include/id3/io_decorators.h \ -+ ../include/id3/io_helpers.h \ -+ ../include/id3/io_strings.h \ - ../include/id3/misc_support.h \ - ../include/id3/reader.h \ - ../include/id3/readers.h \ -diff -wbBur id3lib-3.8.3/examples/demo_convert.cpp id3lib-3.8.3.my/examples/demo_convert.cpp ---- id3lib-3.8.3/examples/demo_convert.cpp 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/examples/demo_convert.cpp 2009-09-08 15:09:26.000000000 +0000 -@@ -84,7 +84,7 @@ - } - } - --int main( unsigned int argc, char * const argv[]) -+int main( int argc, char * const argv[]) - { - flags_t ulFlag = ID3TT_ALL; - gengetopt_args_info args; -diff -wbBur id3lib-3.8.3/examples/demo_copy.cpp id3lib-3.8.3.my/examples/demo_copy.cpp ---- id3lib-3.8.3/examples/demo_copy.cpp 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/examples/demo_copy.cpp 2009-09-08 15:09:26.000000000 +0000 -@@ -81,7 +81,7 @@ - } - } - --int main( unsigned int argc, char * const argv[]) -+int main( int argc, char * const argv[]) - { - int ulFlag = ID3TT_ID3; - ID3D_INIT_DOUT(); -diff -wbBur id3lib-3.8.3/examples/demo_info.cpp id3lib-3.8.3.my/examples/demo_info.cpp ---- id3lib-3.8.3/examples/demo_info.cpp 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/examples/demo_info.cpp 2009-09-08 15:09:26.000000000 +0000 -@@ -309,7 +309,7 @@ - - #define DEBUG - --int main( unsigned int argc, char * const argv[]) -+int main( int argc, char * const argv[]) - { - ID3D_INIT_DOUT(); - -diff -wbBur id3lib-3.8.3/examples/demo_tag.cpp id3lib-3.8.3.my/examples/demo_tag.cpp ---- id3lib-3.8.3/examples/demo_tag.cpp 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/examples/demo_tag.cpp 2009-09-08 15:09:26.000000000 +0000 -@@ -46,7 +46,7 @@ - os << "v2"; - } - --int main( unsigned int argc, char * const argv[]) -+int main( int argc, char * const argv[]) - { - int ulFlag = ID3TT_ID3; - ID3D_INIT_DOUT(); -diff -wbBur id3lib-3.8.3/include/id3/id3lib_strings.h id3lib-3.8.3.my/include/id3/id3lib_strings.h ---- id3lib-3.8.3/include/id3/id3lib_strings.h 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/include/id3/id3lib_strings.h 2009-09-08 15:09:26.000000000 +0000 -@@ -30,6 +30,7 @@ - #define _ID3LIB_STRINGS_H_ - - #include <string> -+#include <cstring> - - #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) - namespace std -diff -wbBur id3lib-3.8.3/include/id3/writers.h id3lib-3.8.3.my/include/id3/writers.h ---- id3lib-3.8.3/include/id3/writers.h 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/include/id3/writers.h 2009-09-08 15:09:26.000000000 +0000 -@@ -30,7 +30,7 @@ - - #include "id3/writer.h" - #include "id3/id3lib_streams.h" --//#include <string.h> -+#include <string.h> - - class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer - { -diff -wbBur id3lib-3.8.3/src/Makefile.am id3lib-3.8.3.my/src/Makefile.am ---- id3lib-3.8.3/src/Makefile.am 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/src/Makefile.am 2009-09-08 15:09:49.000000000 +0000 -@@ -76,6 +76,8 @@ - LDADD = $(top_builddir)/zlib/src/libz.la - endif - -+libid3_la_LIBADD = -lz -lstdc++ -+ - libid3_la_LDFLAGS = \ - -version-info $(LT_VERSION) \ - -release $(LT_RELEASE) \ -diff -wbBur id3lib-3.8.3/src/Makefile.in id3lib-3.8.3.my/src/Makefile.in ---- id3lib-3.8.3/src/Makefile.in 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/src/Makefile.in 2009-09-08 15:09:49.000000000 +0000 -@@ -192,7 +192,8 @@ - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(lib_LTLIBRARIES) - --libid3_la_LIBADD = -+libid3_la_LIBADD = -lz -lstdc++ -+ - am__objects_1 = c_wrapper.lo field.lo field_binary.lo field_integer.lo \ - field_string_ascii.lo field_string_unicode.lo frame.lo \ - frame_impl.lo frame_parse.lo frame_render.lo globals.lo \ -diff -wbBur id3lib-3.8.3/src/tag_file.cpp id3lib-3.8.3.my/src/tag_file.cpp ---- id3lib-3.8.3/src/tag_file.cpp 2008-10-27 18:24:52.000000000 +0000 -+++ id3lib-3.8.3.my/src/tag_file.cpp 2009-09-08 15:10:22.000000000 +0000 -@@ -242,8 +242,8 @@ - strcpy(sTempFile, filename.c_str()); - strcat(sTempFile, sTmpSuffix.c_str()); - --#if ((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP)) -- // This section is for Windows folk && gcc 3.x folk -+#if !defined(HAVE_MKSTEMP) -+ // This section is for Windows folk - fstream tmpOut; - createFile(sTempFile, tmpOut); - -@@ -257,7 +257,7 @@ - tmpOut.write((char *)tmpBuffer, nBytes); - } - --#else //((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP)) -+#else //!defined(HAVE_MKSTEMP) - - // else we gotta make a temp file, copy the tag into it, copy the - // rest of the old file after the tag, delete the old file, rename -@@ -270,7 +270,7 @@ - //ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file"); - } - -- ofstream tmpOut(fd); -+ ofstream tmpOut(sTempFile); - if (!tmpOut) - { - tmpOut.close(); -@@ -285,14 +285,14 @@ - uchar tmpBuffer[BUFSIZ]; - while (file) - { -- file.read(tmpBuffer, BUFSIZ); -+ file.read((char *)tmpBuffer, BUFSIZ); - size_t nBytes = file.gcount(); -- tmpOut.write(tmpBuffer, nBytes); -+ tmpOut.write((char *)tmpBuffer, nBytes); - } - - close(fd); //closes the file - --#endif ////((defined(__GNUC__) && __GNUC__ >= 3 ) || !defined(HAVE_MKSTEMP)) -+#endif ////!defined(HAVE_MKSTEMP) - - tmpOut.close(); - file.close(); diff --git a/community/meterbridge/PKGBUILD b/community/meterbridge/PKGBUILD new file mode 100644 index 000000000..3cc12bb90 --- /dev/null +++ b/community/meterbridge/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 94414 2013-07-22 22:01:34Z speps $ +# Maintainer: speps <speps at aur dot archlinux dot org> + +pkgname=meterbridge +pkgver=0.9.2 +pkgrel=1 +pkgdesc="Collection of Audio meters for the JACK audio server" +arch=('i686' 'x86_64') +url="http://plugin.org.uk/meterbridge/" +license=('GPL') +depends=('jack' 'sdl_image') +source=("http://plugin.org.uk/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('ef5d20761755c88e5b5a0c35f11f670e') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # gcc 4.x fix + sed -i "s/ buf_rect.*,//" src/main.h + + # iec scale fix + # http://lists.linuxaudio.org/pipermail/linux-audio-dev/2012-June/032475.html + sed -i 's/ 5.0/ 2.5/' src/dpm_meters.c +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + aclocal && automake -a && autoconf + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index 201a434ae..be3e9f3cf 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87009 2013-03-25 19:16:48Z bpiotrowski $ +# $Id: PKGBUILD 94357 2013-07-22 11:20:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=myodbc -pkgver=5.2.4 -pkgrel=2 +pkgver=5.2.5 +pkgrel=1 pkgdesc="ODBC driver/connector for mariadb" arch=(i686 x86_64) url="http://dev.mysql.com/downloads/connector/odbc/" @@ -12,7 +12,7 @@ makedepends=('cmake') license=('GPL') options=('libtool') source=("http://cdn.mysql.com/Downloads/Connector-ODBC/5.2/mysql-connector-odbc-$pkgver-src.tar.gz") -md5sums=('0ace04820794ea1712b2a303ebd99dba') +md5sums=('909e0c3c9c341fe777d0a620c4084442') build() { cd $srcdir/mysql-connector-odbc-${pkgver}-src diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD index e5aee3cbc..9b6bee941 100644 --- a/community/oath-toolkit/PKGBUILD +++ b/community/oath-toolkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93727 2013-07-08 23:58:49Z seblu $ +# $Id: PKGBUILD 94352 2013-07-22 08:32:55Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Christian Hesse <mail@eworm.de> # Contributor: L42y <423300@gmail.com> pkgname=oath-toolkit -pkgver=2.2.0 +pkgver=2.4.0 pkgrel=1 pkgdesc='OATH one-time password toolkit' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL3') depends=('glibc' 'pam' 'xmlsec') options=('!libtool') source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('2afc64577936a1a79cff72b0718c9636') +md5sums=('456774fbc37d5267e4e8920694b7ad48') build() { cd $pkgname-$pkgver diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD index 70d01156c..781a46f6b 100644 --- a/community/pcmanfm/PKGBUILD +++ b/community/pcmanfm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79229 2012-11-01 10:32:52Z bpiotrowski $ +# $Id: PKGBUILD 94411 2013-07-22 20:03:04Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Unknown47 <unknown47r@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=pcmanfm -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="An extremely fast and lightweight file manager" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data') makedepends=('intltool' 'pkgconfig') install=$pkgname.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.gz) -md5sums=('af0cff78690e658f3c06ceabf27bc71a') +md5sums=('853ef5e3eba6bf36e15985bfe3170456') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/php-mongo/PKGBUILD b/community/php-mongo/PKGBUILD index 33213a413..7dffb0ade 100644 --- a/community/php-mongo/PKGBUILD +++ b/community/php-mongo/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 92665 2013-06-11 09:54:52Z idevolder $ # Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com > # Contributor: Jarek Sedlacek <jareksedlacek@gmail.com> pkgname=php-mongo -pkgver=1.4.1 -pkgrel=2 +pkgver=1.4.2 +pkgrel=1 pkgdesc="Officially supported PHP driver for MongoDB" arch=("i686" "x86_64") url="http://www.mongodb.org/display/DOCS/PHP+Language+Center" @@ -27,5 +26,5 @@ package() { make INSTALL_ROOT="$pkgdir" install install -Dm644 "$srcdir/mongo.ini" "$pkgdir/etc/php/conf.d/mongo.ini" } -sha256sums=('230e7d26eaa826c7aacfc90fd1128f8c390216abe7f588d3bbcd130bd1fb84b6' +sha256sums=('ecbf8621c418c35abb0d5e9719432a2f315db2559023861105635bae5bfbd120' 'c89685eee842d5c3a85149a5bb8e310e62bf1a17f94183bb66401593ab2b191b') diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD index ea6fa780e..0a90eae35 100644 --- a/community/poedit/PKGBUILD +++ b/community/poedit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87572 2013-04-03 10:14:55Z spupykin $ +# $Id: PKGBUILD 94359 2013-07-22 11:20:50Z spupykin $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alexander Fehr <pizzapunk@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=poedit -pkgver=1.5.5 +pkgver=1.5.7 pkgrel=1 pkgdesc="Cross-platform gettext catalogs (.po files) editor" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('wxgtk2.9' 'gtkspell' 'db>=5.1' 'hicolor-icon-theme' 'gettext') makedepends=('pkgconfig' 'boost') install=poedit.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('da86cb73cee9d006a42f9574811d13ab') +md5sums=('f5b53ec66a606f088b0aa388595ea5f9') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/rusxmms/PKGBUILD b/community/rusxmms/PKGBUILD deleted file mode 100644 index a9d9209e5..000000000 --- a/community/rusxmms/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 85265 2013-02-28 10:39:00Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=rusxmms -pkgver=1.2.11_csa43 -_xmmsver=1.2.11 -_csaver=csa43 -pkgrel=3 -pkgdesc="XMMS with librcc" -arch=(i686 x86_64) -license=(GPL) -url="http://rusxmms.sourceforge.net/" -depends=(libsm libxxf86vm zlib gtk libvorbis alsa-lib libgl librcc librcd openssl) -makedepends=(mesa patch) -provides=(xmms) -conflicts=(xmms) -options=('!libtool' '!distcc') -source=(http://xmms.org/files/1.2.x/xmms-${_xmmsver}.tar.bz2 \ - http://dside.dyndns.org/files/rusxmms/RusXMMS2-${_csaver}.tar.bz2) -md5sums=('f3e6dbaf0b3f571a532ab575656be506' - '8f387dd2e5c95f8730979e09687b6e02') - -build() { - cd "${srcdir}"/xmms-${_xmmsver} - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/g' configure.in libxmms/configure.in - - ln -s "$srcdir"/RusXMMS2 "$srcdir"/xmms-${_xmmsver}/RusXMMS2 - (cd "$srcdir"/xmms-${_xmmsver}/RusXMMS2 && ./apply.sh) - - mv "$srcdir"/RusXMMS2/source/* "$srcdir"/xmms-${_xmmsver}/libxmms/ - autoconf - sed -i 's/unicode.c//g' Input/mpg123/Makefile.in - sed -i 's/unicode.lo//g' Input/mpg123/Makefile.in - - (cd libxmms && aclocal && automake && autoconf) - - case $CARCH in - x86_64) - ./configure --prefix=/usr --disable-mikmod --disable-simd - ;; - i686) - ./configure --prefix=/usr --disable-mikmod --enable-simd --disable-vorbis --disable-vorbistest - ;; - *) - return 1 - ;; - esac - - make -} - -package(){ - cd "${srcdir}"/xmms-${_xmmsver} - make DESTDIR="$pkgdir" install - - mkdir -p "$pkgdir"/usr/share/{applications,pixmaps} - install -m 644 xmms/xmms.desktop "$pkgdir"/usr/share/applications - install -m 644 xmms/xmms_mini.xpm "$pkgdir"/usr/share/pixmaps/xmms.xpm - # don't want wmxmms - rm -rf "$pkgdir"/usr/bin/wmxmms "$pkgdir"/usr/share/xmms - rm -f "$pkgdir"/usr/share/man/man1/{gnomexmms.1,wmxmms.1} -} diff --git a/extra/scribus/PKGBUILD b/community/scribus/PKGBUILD index cc72b3aef..43cc53638 100644 --- a/extra/scribus/PKGBUILD +++ b/community/scribus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190048 2013-07-13 12:42:28Z svenstaro $ +# $Id: PKGBUILD 94350 2013-07-22 08:05:18Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Ronald van Haren <ronald.archlinux.org> @@ -7,14 +7,14 @@ pkgname=scribus pkgver=1.4.2 -pkgrel=3 +pkgrel=4 pkgdesc='Desktop publishing software' url="http://www.scribus.net/" license=('GPL') arch=('i686' 'x86_64') makedepends=('cmake' 'boost' 'mesa') depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen' - 'ghostscript' 'python2' 'aspell' 'boost-libs' + 'ghostscript' 'python2' 'aspell' 'podofo' 'boost-libs' 'desktop-file-utils' 'shared-mime-info') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz") sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb') diff --git a/extra/scribus/install b/community/scribus/install index 8040f715b..8040f715b 100644 --- a/extra/scribus/install +++ b/community/scribus/install diff --git a/community/taglib-rcc/PKGBUILD b/community/taglib-rcc/PKGBUILD deleted file mode 100644 index 673927582..000000000 --- a/community/taglib-rcc/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 59135 2011-11-21 12:15:14Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=taglib-rcc -pkgver=1.7 -pkgrel=1 -pkgdesc="taglib with librcc patch" -arch=('i686' 'x86_64') -url="http://developer.kde.org/~wheeler/taglib.html" -depends=('gcc-libs' 'zlib' 'bash' 'libxml2' 'db' 'librcc') -makedepends=('patch' 'cmake') -license=('GPL') -provides=("taglib=$pkgver") -conflicts=("taglib") -options=('!libtool') -source=(http://developer.kde.org/~wheeler/files/src/taglib-$pkgver.tar.gz - http://downloads.sourceforge.net/rusxmms/taglib-csa6.tar.bz2) -md5sums=('6a7e312668f153fa905a81714aebc257' - '0868d633843ecd87526c77d788b3d3b6') - -build() { - cd $srcdir/taglib-$pkgver - [ $NOEXTRACT -eq 1 ] || patch -Np1 <$srcdir/taglib/taglib-1.5-ds-rusxmms.patch || true - [ $NOEXTRACT -eq 1 ] || sed -i 's|#include <string>|#include <string.h>|' $srcdir/taglib-$pkgver/taglib/toolkit/rccpatch.cpp - - cd .. - mkdir build - cd build - - [ $NOEXTRACT -eq 1 ] || cmake ../taglib-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DWITH_MP4=ON \ - -DWITH_ASF=ON - make VERBOSE=1 - make DESTDIR=${pkgdir} install -} diff --git a/community/tigervnc/PKGBUILD b/community/tigervnc/PKGBUILD index 4e2ad657b..a37192c1e 100644 --- a/community/tigervnc/PKGBUILD +++ b/community/tigervnc/PKGBUILD @@ -1,50 +1,53 @@ -# $Id: PKGBUILD 93706 2013-07-08 14:56:58Z spupykin $ +# $Id: PKGBUILD 94384 2013-07-22 13:59:43Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com> pkgname=tigervnc pkgver=1.3.0 -pkgrel=1 +pkgrel=2 _xorgver=1.14.2 pkgdesc="suite of VNC servers and clients. VNC 4 branch of TightVNC." arch=('i686' 'x86_64') url="http://www.tigervnc.org" license=('GPL') -depends=('pam' 'gnutls' 'libjpeg-turbo' 'libxft' 'libxinerama' 'libxcursor' - 'libxtst' 'libxfont' 'pixman' 'xorg-xauth' 'xorg-xsetroot' - 'xkeyboard-config' 'libgl' 'libgcrypt' 'perl' 'xorg-xkbcomp' - 'fltk') +depends=('fltk' 'pam' 'gnutls' 'libjpeg-turbo' 'libxtst' 'libxfont' 'pixman' + 'xorg-xauth' 'xorg-xsetroot' 'xkeyboard-config' 'xorg-xkbcomp' + 'libgl' 'libgcrypt' 'perl' ) makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto' 'compositeproto' 'damageproto' 'randrproto' 'resourceproto' 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto' - 'xtrans' 'mesa' 'glproto' 'dri2proto' 'imagemagick' 'librsvg') + 'xtrans' 'mesa' 'glproto' 'dri2proto' 'imagemagick') options=(!libtool) conflicts=('tightvnc') source=(http://downloads.sourceforge.net/project/tigervnc/tigervnc/$pkgver/tigervnc-$pkgver.tar.bz2 ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2 vncserver.service vncviewer.desktop - xserver114.patch) + gethomedir.patch + getmaster.patch) md5sums=('a5158228e64d14496821a39bf3851f1b' '5d36a6483e8e301875131e8302c67727' '0903d5a0dfa38e0b04964505b644585c' - '15c0405f920c3dac250692e8922578d1' - '928faf837ba5b1b34283f9f018df2f5e') + '71cac0fb9701b0a041430f0fddfe00c8' + '22f1523a0eca56ad79cfabd0db6e2cf6' + 'e056a2502dfe0cb3b02e08cab689482f') prepare() { cd ${srcdir}/${pkgname}-${pkgver} cp -r ${srcdir}/xorg-server-${_xorgver}/* unix/xserver + + patch -Np1 -i ${srcdir}/gethomedir.patch + patch -Np1 -i ${srcdir}/getmaster.patch } build() { cd ${srcdir}/${pkgname}-${pkgver} - cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DUSE_INCLUDED_FLTK=yes + cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr make - make -C media cd unix/xserver - patch -Np1 -i ${srcdir}/xserver114.patch + patch -Np1 -i ../xserver114.patch autoreconf -fiv ./configure --prefix=/usr \ --disable-static --disable-xinerama --without-dtrace \ @@ -63,7 +66,5 @@ package() { make DESTDIR=${pkgdir} install sed -i 's/iconic/nowin/' ${pkgdir}/usr/bin/vncserver install -Dm0644 $srcdir/vncserver.service $pkgdir/usr/lib/systemd/system/vncserver.service - install -dm0755 $pkgdir/usr/share/icons - install -m0644 ${srcdir}/${pkgname}-${pkgver}/media/icons/* $pkgdir/usr/share/icons/ install -Dm0644 $srcdir/vncviewer.desktop $pkgdir/usr/share/applications/vncviewer.desktop } diff --git a/community/tigervnc/gethomedir.patch b/community/tigervnc/gethomedir.patch new file mode 100644 index 000000000..5f3542de8 --- /dev/null +++ b/community/tigervnc/gethomedir.patch @@ -0,0 +1,20 @@ +diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/Makefile.am tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am +--- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/Makefile.am 2011-10-31 09:14:40.000000000 +0100 ++++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am 2012-09-06 19:44:04.431123087 +0200 +@@ -5,6 +5,7 @@ + RDR_LIB=$(LIB_DIR)/rdr/librdr.la + NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la + XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la ++OS_LIB=$(LIB_DIR)/os/libos.la + COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) + + noinst_LTLIBRARIES = libvnccommon.la +@@ -55,7 +56,7 @@ + + libvnc_la_LDFLAGS = -module -avoid-version + +-libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) ++libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) + + EXTRA_DIST = Xvnc.man + diff --git a/community/tigervnc/getmaster.patch b/community/tigervnc/getmaster.patch new file mode 100644 index 000000000..cf6ce863f --- /dev/null +++ b/community/tigervnc/getmaster.patch @@ -0,0 +1,96 @@ +diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc +--- tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster 2013-07-12 09:30:50.551459439 +0100 ++++ tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc 2013-07-12 09:38:31.037480528 +0100 +@@ -232,10 +232,7 @@ void InputDevice::PrepareInputDevices(vo + + unsigned InputDevice::getKeyboardState(void) + { +- DeviceIntPtr master; +- +- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT); +- return XkbStateFieldFromRec(&master->key->xkbInfo->state); ++ return XkbStateFieldFromRec(&keyboardDev->master->key->xkbInfo->state); + } + + unsigned InputDevice::getLevelThreeMask(void) +@@ -256,7 +253,7 @@ unsigned InputDevice::getLevelThreeMask( + return 0; + } + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + + act = XkbKeyActionPtr(xkb, keycode, state); + if (act == NULL) +@@ -281,7 +278,7 @@ KeyCode InputDevice::pressShift(void) + if (state & ShiftMask) + return 0; + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) { + XkbAction *act; + unsigned char mask; +@@ -318,7 +315,7 @@ std::list<KeyCode> InputDevice::releaseS + if (!(state & ShiftMask)) + return keys; + +- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT); ++ master = keyboardDev->master; + xkb = master->key->xkbInfo->desc; + for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) { + XkbAction *act; +@@ -371,7 +368,7 @@ KeyCode InputDevice::pressLevelThree(voi + return 0; + } + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + + act = XkbKeyActionPtr(xkb, keycode, state); + if (act == NULL) +@@ -399,7 +396,7 @@ std::list<KeyCode> InputDevice::releaseL + if (!(state & mask)) + return keys; + +- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT); ++ master = keyboardDev->master; + xkb = master->key->xkbInfo->desc; + for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) { + XkbAction *act; +@@ -440,7 +437,7 @@ KeyCode InputDevice::keysymToKeycode(Key + if (new_state != NULL) + *new_state = state; + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) { + unsigned int state_out; + KeySym dummy; +@@ -497,7 +494,7 @@ bool InputDevice::isLockModifier(KeyCode + XkbDescPtr xkb; + XkbAction *act; + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + + act = XkbKeyActionPtr(xkb, keycode, state); + if (act == NULL) +@@ -535,7 +532,7 @@ bool InputDevice::isAffectedByNumLock(Ke + if (numlock_keycode == 0) + return false; + +- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc; ++ xkb = keyboardDev->master->key->xkbInfo->desc; + + act = XkbKeyActionPtr(xkb, numlock_keycode, state); + if (act == NULL) +@@ -569,7 +566,7 @@ KeyCode InputDevice::addKeysym(KeySym ke + KeySym *syms; + KeySym upper, lower; + +- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT); ++ master = keyboardDev->master; + xkb = master->key->xkbInfo->desc; + for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) { + if (XkbKeyNumGroups(xkb, key) == 0) diff --git a/community/tigervnc/vncviewer.desktop b/community/tigervnc/vncviewer.desktop index b14e4fe2a..5f6046db2 100644 --- a/community/tigervnc/vncviewer.desktop +++ b/community/tigervnc/vncviewer.desktop @@ -4,7 +4,7 @@ Type=Application Name=TigerVNC viewer Comment=TigerVNC viewer Exec=/usr/bin/vncviewer -Icon=tigervnc_32.png +Icon=tigervnc.png Terminal=false StartupNotify=false Categories=Application; Network; diff --git a/community/tigervnc/xserver114.patch b/community/tigervnc/xserver114.patch deleted file mode 100644 index 80dd6a225..000000000 --- a/community/tigervnc/xserver114.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -up xorg-server-20130109/configure.ac.vnc xorg-server-20130109/configure.ac ---- xorg-server-20130109/configure.ac.vnc 2013-01-24 13:01:31.013267503 +0100 -+++ xorg-server-20130109/configure.ac 2013-01-24 13:08:43.283941751 +0100 -@@ -72,6 +72,7 @@ dnl forcing an entire recompile.x - AC_CONFIG_HEADERS(include/version-config.h) - - AM_PROG_AS -+AC_PROG_CXX - AC_PROG_LN_S - AC_LIBTOOL_WIN32_DLL - AC_DISABLE_STATIC -@@ -1573,6 +1574,10 @@ if test "x$XVFB" = xyes; then - AC_SUBST([XVFB_SYS_LIBS]) - fi - -+dnl Xvnc DDX -+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"]) -+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) -+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) - - dnl Xnest DDX - -@@ -1608,6 +1613,8 @@ if test "x$XORG" = xauto; then - fi - AC_MSG_RESULT([$XORG]) - -+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) -+ - if test "x$XORG" = xyes; then - XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' - XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' -@@ -1826,7 +1833,6 @@ if test "x$XORG" = xyes; then - AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) - AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) - AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) -- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) - AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) - AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) - AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) -@@ -2291,6 +2297,7 @@ hw/dmx/Makefile - hw/dmx/man/Makefile - hw/vfb/Makefile - hw/vfb/man/Makefile -+hw/vnc/Makefile - hw/xnest/Makefile - hw/xnest/man/Makefile - hw/xwin/Makefile -diff -up xorg-server-20130109/hw/Makefile.am.vnc xorg-server-20130109/hw/Makefile.am ---- xorg-server-20130109/hw/Makefile.am.vnc 2013-01-10 06:06:16.000000000 +0100 -+++ xorg-server-20130109/hw/Makefile.am 2013-01-24 13:08:43.283941751 +0100 -@@ -33,7 +33,8 @@ SUBDIRS = \ - $(XNEST_SUBDIRS) \ - $(DMX_SUBDIRS) \ - $(KDRIVE_SUBDIRS) \ -- $(XQUARTZ_SUBDIRS) -+ $(XQUARTZ_SUBDIRS) \ -+ vnc - - DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive - -diff -up xorg-server-20130109/mi/miinitext.c.vnc xorg-server-20130109/mi/miinitext.c ---- xorg-server-20130109/mi/miinitext.c.vnc 2013-01-10 06:06:16.000000000 +0100 -+++ xorg-server-20130109/mi/miinitext.c 2013-01-24 13:08:43.283941751 +0100 -@@ -112,6 +112,10 @@ SOFTWARE. - #include "micmap.h" - #include "globals.h" - -+#ifdef TIGERVNC -+extern void vncExtensionInit(INITARGS); -+#endif -+ - /* The following is only a small first step towards run-time - * configurable extensions. - */ -@@ -302,6 +306,9 @@ static ExtensionModule staticExtensions[ - #ifdef XSELINUX - {SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension}, - #endif -+#ifdef TIGERVNC -+ {vncExtensionInit, "VNC-EXTENSION", NULL}, -+#endif - }; - - static ExtensionModule *ExtensionModuleList = NULL; diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD index 683a6c7ca..8296b7daa 100644 --- a/community/xcircuit/PKGBUILD +++ b/community/xcircuit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88341 2013-04-16 13:32:48Z spupykin $ +# $Id: PKGBUILD 94361 2013-07-22 11:21:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Giovanni Scafora <linuxmania@gmail.com> # Contributor: simo <simo@archlinux.org> pkgname=xcircuit -pkgver=3.7.48 +pkgver=3.7.51 pkgrel=1 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL2') depends=('tk' 'libxpm' 'zlib') makedepends=('chrpath') source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz) -md5sums=('efe537f908b12d30ef1aeebf77222fbf') +md5sums=('a3f5d10f6f96a6298505801f4d0f6190') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/a2ps/PKGBUILD b/extra/a2ps/PKGBUILD index ae316078b..2a1042678 100644 --- a/extra/a2ps/PKGBUILD +++ b/extra/a2ps/PKGBUILD @@ -1,50 +1,52 @@ -# $Id: PKGBUILD 123160 2011-05-09 02:11:04Z eric $ +# $Id: PKGBUILD 191229 2013-07-21 22:39:59Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=a2ps pkgver=4.14 -pkgrel=2 +pkgrel=3 pkgdesc="An Any to PostScript filter" arch=('i686' 'x86_64') url="http://www.gnu.org/software/a2ps/" license=('GPL3') -depends=('ghostscript' 'psutils' 'imagemagick' 'perl') +depends=('ghostscript' 'psutils' 'imagemagick') makedepends=('gperf') backup=('etc/a2ps/a2ps.cfg' 'etc/a2ps/a2ps-site.cfg') options=('!libtool') install=a2ps.install -source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz \ - a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch a2ps-4.13-manpage-chmod.patch \ +source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz{,.sig} + a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch a2ps-4.13-manpage-chmod.patch a2ps-4.14-check-mempcpy.patch a2ps-4.14-fix-stpcpy-proto.patch) -md5sums=('781ac3d9b213fa3e1ed0d79f986dc8c7' - '93011b58e9f20a7fafa31287a51884a4' - '2e493d0bc00d71eb3e8a9b6febc52b69' - '09cc5ed4d3d8ff1b2103e519191e8286' - '42aa39b74f6da8cf6e94185c4fc3e601' - '066f9327fee6b6eca3a57d657d1097d1') sha1sums=('365abbbe4b7128bf70dad16d06e23c5701874852' + 'SKIP' '8783952d3410d8d59ed953e1db45e2ef1a0b8f65' '94e35a6ad9268161bec22a56d4cfb696d635994a' '2bb3d0a2ef2f3ff9262723e35c742a80ab0235ce' '6aed29c1399e79f3914b408059610f9e7c0fc38e' '58fa90134f1027e3f05aeb08212cbcc10f420738') +prepare() { + cd ${pkgname}-${pkgver} + sed -i -e '/^AM_C_PROTOTYPES/d' -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \ + -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \ + configure.in {contrib/sample,lib,src}/Makefile.am m4/protos.m4 + sed -i "s:^countdictstack: \0:" contrib/psset.in + patch -p1 -i "${srcdir}/a2ps-4.13c-fnmatch-replacement.patch" + patch -p1 -i "${srcdir}/a2ps-4.13c-emacs.patch" + patch -p1 -i "${srcdir}/a2ps-4.13-manpage-chmod.patch" + patch -p1 -i "${srcdir}/a2ps-4.14-check-mempcpy.patch" + patch -p0 -i "${srcdir}/a2ps-4.14-fix-stpcpy-proto.patch" +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../a2ps-4.13c-fnmatch-replacement.patch - patch -p1 < ../a2ps-4.13c-emacs.patch - patch -p1 < ../a2ps-4.13-manpage-chmod.patch - patch -p1 < ../a2ps-4.14-check-mempcpy.patch - patch -p0 < ../a2ps-4.14-fix-stpcpy-proto.patch + cd ${pkgname}-${pkgver} libtoolize --force --copy - autoreconf -I m4 + autoreconf --force --install -I m4 ./configure --prefix=/usr --sysconfdir=/etc/a2ps \ --includedir=/usr/include --enable-nls make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - sed -i "s:^countdictstack: \0:" "${pkgdir}/usr/bin/psset" } diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index d6d1a8004..6a15b6b8c 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189213 2013-06-29 15:55:30Z schiv $ +# $Id: PKGBUILD 191251 2013-07-22 09:20:17Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: see .contrib pkgname=ardour _pkgname=Ardour3 -pkgver=3.2 +pkgver=3.3 pkgrel=1 pkgdesc="Professional-grade digital audio workstation" arch=('i686' 'x86_64') @@ -14,10 +14,11 @@ license=('GPL') depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0' 'aubio' 'libgnomecanvasmm' 'suil>=0.6.12') makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz') +optdepends=('xjadeo: video monitoring') install=$pkgname.install source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2" "$pkgname.desktop") -md5sums=('17028a3106f870cd62f6a60930a28590' +md5sums=('40edf6ab63488d52abf94a2a48d7ac97' '316bd21ece5e2208a104fd09cac521af') prepare() { diff --git a/extra/ardour/ardour.install b/extra/ardour/ardour.install index 78d8f7734..36da2e3ec 100644 --- a/extra/ardour/ardour.install +++ b/extra/ardour/ardour.install @@ -4,7 +4,7 @@ post_install() { > LXVST_PATH to include any custom directories of *.so VST plug-ins. > Ardour 3 also supports video (timeline and monitoring), but aside from - > xjadeo (AUR) the required external programs need to be retrieved from: + > xjadeo the required external programs need to be retrieved from: http://x42.github.io/harvid/ @@ -32,8 +32,7 @@ post_upgrade() { > Due to uncertainties with regards to program stability, 'harvid' is > currently not packaged in our repositories. - > In addition to the timeline, video can be monitored with xjadeo, which - > is presently available in the AUR. It will be in our repositories soon. + > In addition to the timeline, video can be monitored with xjadeo. MSG } diff --git a/extra/cln/PKGBUILD b/extra/cln/PKGBUILD index 30f69b7a9..fa2bd62bc 100644 --- a/extra/cln/PKGBUILD +++ b/extra/cln/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143665 2011-11-28 09:23:06Z eric $ +# $Id: PKGBUILD 191235 2013-07-22 00:17:17Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=cln -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=1 pkgdesc="Class library for numbers" arch=('i686' 'x86_64') @@ -13,16 +13,20 @@ makedepends=('texlive-core') options=('!libtool') install=cln.install source=(http://www.ginac.de/CLN/${pkgname}-${pkgver}.tar.bz2) -md5sums=('d897cce94d9c34d106575ed4ec865d71') -sha1sums=('c30dca80e75f45e2107f233075e6d0339ea884b0') +sha1sums=('11c56780eb83ed54f2ad1ecef7f0dc0f609c426d') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make all html pdf } +check() { + cd ${pkgname}-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install-html install-pdf } diff --git a/extra/glib/PKGBUILD b/extra/glib/PKGBUILD index 480a521e2..57be2dc1f 100644 --- a/extra/glib/PKGBUILD +++ b/extra/glib/PKGBUILD @@ -1,37 +1,50 @@ -# $Id: PKGBUILD 135061 2011-08-10 01:01:44Z eric $ +# $Id: PKGBUILD 191242 2013-07-22 06:31:51Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glib pkgver=1.2.10 -pkgrel=9 +pkgrel=10 pkgdesc="Common C routines used by Gtk+ and other libs" arch=('i686' 'x86_64') url="http://www.gtk.org/" license=('LGPL') -depends=('glibc') -options=('!libtool') +depends=('glibc' 'sh') +options=('!libtool' '!makeflags') install=glib.install -source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz \ - gcc340.patch aclocal-fixes.patch) -md5sums=('6fe30dad87c77b91b632def29dd69ef9' - '877b3330e822a4be69a0f8a8c268cfd7' - 'e52c4b88427b9785bb8049dbdc9ff6fb') +source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz + gcc340.patch aclocal-fixes.patch glib1-autotools.patch) sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa' 'a2cc224a66aeffdcac16ebd9e8af18143cf54918' - 'ae4438cf56c0c9264ee36f6973fb445f9a820be0') + 'ae4438cf56c0c9264ee36f6973fb445f9a820be0' + '8a25fde3c79567262b3024f4e74c9ca4ee8a6279') + +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i "${srcdir}/gcc340.patch" + patch -Np0 -i "${srcdir}/aclocal-fixes.patch" + patch -Np1 -i "${srcdir}/glib1-autotools.patch" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../gcc340.patch - patch -Np0 -i ../aclocal-fixes.patch + cd ${pkgname}-${pkgver} + if [[ $CARCH = "i686" ]]; then + CONFIGFLAG='--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu' + elif [[ $CARCH = "x86_64" ]]; then + CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu' + fi - [ "$CARCH" = 'x86_64' ] && CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu' + autoreconf --force --install ./configure --prefix=/usr --mandir=/usr/share/man \ --infodir=/usr/share/info $CONFIGFLAG make } +check() { + cd ${pkgname}-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/glib/glib1-autotools.patch b/extra/glib/glib1-autotools.patch new file mode 100644 index 000000000..1332c9639 --- /dev/null +++ b/extra/glib/glib1-autotools.patch @@ -0,0 +1,33 @@ +diff -Naur glib-1.2.10-orig/configure.in glib-1.2.10/configure.in +--- glib-1.2.10-orig/configure.in 2013-07-22 01:33:26.930091236 -0400 ++++ glib-1.2.10/configure.in 2013-07-22 01:35:19.988776415 -0400 +@@ -17,7 +17,7 @@ + + dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they + dnl are available for $ac_help expansion (don't we all *love* autoconf?) +-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl ++AC_DIVERT_PUSH()dnl + # + # The following version number definitions apply to GLib, GModule and GThread + # as a whole, so if changes occoured in any of them, they are all +@@ -81,7 +81,7 @@ + + dnl figure debugging default, prior to $ac_help setup + dnl +-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl ++AC_DIVERT_PUSH()dnl + if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then + debug_default=yes + else +diff -Naur glib-1.2.10-orig/gmodule/Makefile.am glib-1.2.10/gmodule/Makefile.am +--- glib-1.2.10-orig/gmodule/Makefile.am 2013-07-22 01:33:26.933424531 -0400 ++++ glib-1.2.10/gmodule/Makefile.am 2013-07-22 01:38:46.553041607 -0400 +@@ -42,7 +42,7 @@ + libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) + + noinst_PROGRAMS = testgmodule +-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ ++testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@ + testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@ + + .PHONY: files release diff --git a/extra/gnet/PKGBUILD b/extra/gnet/PKGBUILD index 60b952e00..b9b9a3647 100644 --- a/extra/gnet/PKGBUILD +++ b/extra/gnet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122722 2011-05-06 08:12:47Z eric $ +# $Id: PKGBUILD 191233 2013-07-21 23:25:28Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gnet pkgver=2.0.8 -pkgrel=2 +pkgrel=3 pkgdesc="A simple network library" arch=('i686' 'x86_64') url="http://live.gnome.org/GNetLibrary" @@ -11,16 +11,15 @@ license=('LGPL') depends=('glib2') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/gnet/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('93327d2fca333d7e54ba2cf54e071165') sha1sums=('74a33dd25cc594b874e3a5171795efd99e567387') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + cd ${pkgname}-${pkgver} + LIBS+="-lglib-2.0" ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/gtk/PKGBUILD b/extra/gtk/PKGBUILD index 30fc520a8..c218906e7 100644 --- a/extra/gtk/PKGBUILD +++ b/extra/gtk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137905 2011-09-12 10:53:48Z eric $ +# $Id: PKGBUILD 191240 2013-07-22 03:45:27Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gtk pkgver=1.2.10 -pkgrel=11 -pkgdesc="The GTK+ toolkit" +pkgrel=12 +pkgdesc="GTK+ is a multi-platform toolkit (v1)" arch=('i686' 'x86_64') url="http://www.gtk.org/" license=('LGPL') @@ -12,20 +12,21 @@ depends=('libxi' 'glib' 'sh') makedepends=('libxt') options=('!libtool') install=gtk.install -source=("ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz" - 'aclocal-fixes.patch') -md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20' - 'c59d4906602d99a7468f7334b6fc3b4e') +source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz + aclocal-fixes.patch) +sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c' + 'b034e33efb85d27f3f3fb082c404e3b6ea79259f') -build() { - cd "${srcdir}/gtk+-${pkgver}" - if [ "${CARCH}" = "x86_64" ]; then - rm config.guess config.sub - ln -s /usr/share/libtool/config/config.guess config.guess - ln -s /usr/share/libtool/config/config.sub config.sub - fi - patch -Np0 -i "${srcdir}/aclocal-fixes.patch" +prepare() { + cd gtk+-${pkgver} + cp /usr/share/libtool/config/config.guess . + cp /usr/share/libtool/config/config.sub . + patch -p0 -i "${srcdir}/aclocal-fixes.patch" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure +} +build() { + cd gtk+-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc \ --mandir=/usr/share/man --infodir=/usr/share/info \ --with-xinput=xfree @@ -33,6 +34,6 @@ build() { } package() { - cd "${srcdir}/gtk+-${pkgver}" + cd gtk+-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/idnkit/PKGBUILD b/extra/idnkit/PKGBUILD index 13135127c..eb42dafc1 100644 --- a/extra/idnkit/PKGBUILD +++ b/extra/idnkit/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 180328 2013-03-20 15:10:14Z bisson $ +# $Id: PKGBUILD 191237 2013-07-22 00:42:58Z eric $ # Contributor: Igor Nemilentsev <trezorg@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=idnkit pkgver=1.0 -pkgrel=2 +pkgrel=3 pkgdesc='Provides functionalities about Internationalized Domain Name processing' url='http://www.nic.ad.jp/ja/idn/idnkit/download/' license=('custom:BSD') arch=('i686' 'x86_64') depends=('glibc') +backup=('etc/idnalias.conf' 'etc/idn.conf') options=('!makeflags' '!libtool') source=("http://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-${pkgver}-src.tar.gz") sha1sums=('7d843ffcf9843b7af02079e5a160520f28c75048') -backup=('etc/idnalias.conf' 'etc/idn.conf') +prepare() { + cd idnkit-${pkgver}-src + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure +} build() { - cd "${srcdir}/idnkit-${pkgver}-src" + cd idnkit-${pkgver}-src ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -28,12 +32,12 @@ build() { } check() { - cd "${srcdir}/idnkit-${pkgver}-src" + cd idnkit-${pkgver}-src make check } package() { - cd "${srcdir}/idnkit-${pkgver}-src" + cd idnkit-${pkgver}-src make DESTDIR="${pkgdir}" install install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" rm "${pkgdir}"/etc/*.sample diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD index 41ab3ecba..de425926b 100644 --- a/extra/libxfont/PKGBUILD +++ b/extra/libxfont/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 151781 2012-03-02 18:55:43Z andyrtr $ +# $Id: PKGBUILD 191249 2013-07-22 08:12:34Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxfont -pkgver=1.4.5 +pkgver=1.4.6 pkgrel=1 pkgdesc="X11 font rasterisation library" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto') makedepends=('xorg-util-macros' 'xtrans') options=('!libtool') source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2) -sha1sums=('0bf3cb8aa192ab96bbaf384d1a4a00d15a40171e') +sha256sums=('d0cbfe4554dc17ceea413cdad5601d35ed8d05d5b880e60931a8775fd1157e9f') build() { cd "${srcdir}/libXfont-${pkgver}" diff --git a/extra/loudmouth/07-glib-single-include.patch b/extra/loudmouth/07-glib-single-include.patch new file mode 100644 index 000000000..074b29526 --- /dev/null +++ b/extra/loudmouth/07-glib-single-include.patch @@ -0,0 +1,17 @@ +Description: Fix build failure with glib 2.32 + where including individual glib headers is no longer allowed. +Author: Michael Biebl <biebl@debian.org> +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665576 +Index: loudmouth-1.4.3/loudmouth/lm-error.c +=================================================================== +--- loudmouth-1.4.3.orig/loudmouth/lm-error.c 2008-10-29 21:48:15.000000000 +0100 ++++ loudmouth-1.4.3/loudmouth/lm-error.c 2012-03-26 00:24:19.518939657 +0200 +@@ -19,7 +19,7 @@ + */ + + #include <config.h> +-#include <glib/gerror.h> ++#include <glib.h> + #include "lm-error.h" + + /** diff --git a/extra/loudmouth/08-fix-ipv6-connect.patch b/extra/loudmouth/08-fix-ipv6-connect.patch new file mode 100644 index 000000000..b8815a7de --- /dev/null +++ b/extra/loudmouth/08-fix-ipv6-connect.patch @@ -0,0 +1,28 @@ +Description: fix crash when falling back from IPv6 to IPv4 + Previously, loudmouth would set socket->watch_connect to NULL when + encountering an error. When the connection attempt (to a different IPv6) + succeeded later on, _lm_socket_succeeded would therefore not remove the + socket_connect_cb watcher, leading to socket_connect_cb being called upon + socket activity and segfaulting the program. +Author: Michael Stapelberg <stapelberg@debian.org> +Bug-Debian: http://bugs.debian.org/631729 +Forwarded: no +Last-Update: 2013-02-03 +--- a/loudmouth/lm-socket.c ++++ b/loudmouth/lm-socket.c +@@ -529,7 +529,6 @@ + /* error condition, but might be possible to recover + * from it (by connecting to the next host) */ + if (!_lm_socket_failed_with_error (connect_data, err)) { +- socket->watch_connect = NULL; + goto out; + } + } +@@ -560,7 +559,6 @@ + _lm_sock_close (connect_data->fd); + _lm_socket_failed_with_error (connect_data, err); + +- socket->watch_connect = NULL; + goto out; + } + } diff --git a/extra/loudmouth/PKGBUILD b/extra/loudmouth/PKGBUILD index d1686df56..159f31e5e 100644 --- a/extra/loudmouth/PKGBUILD +++ b/extra/loudmouth/PKGBUILD @@ -5,7 +5,7 @@ pkgname=loudmouth pkgver=1.4.3 -pkgrel=3 +pkgrel=4 pkgdesc="A lightweight Jabber client library written in C/Glib" arch=('i686' 'x86_64') license=('LGPL') @@ -16,19 +16,30 @@ makedepends=('intltool' 'pkgconfig' 'gtk-doc') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2 01-fix-sasl-md5-digest-uri.patch 03-drop-stanzas-on-fail.patch - 04-use-pkg-config-for-gnutls.patch) + 04-use-pkg-config-for-gnutls.patch + 07-glib-single-include.patch + 08-fix-ipv6-connect.patch) md5sums=('55339ca42494690c3942ee1465a96937' 'dc799cea18b24847b1e008c7424010a3' 'b7b2d81b01a5eee5fd5e21cae67b4af7' - 'bffb25b9551df43255fe1706588582f3') + 'bffb25b9551df43255fe1706588582f3' + 'd1546ed54740de536f6bb79a18c5dccb' + '8e3071299776d32b9be27bba7d3f9ae0') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/01-fix-sasl-md5-digest-uri.patch" - patch -Np1 -i "${srcdir}/03-drop-stanzas-on-fail.patch" - patch -Np1 -i "${srcdir}/04-use-pkg-config-for-gnutls.patch" + patch -Np1 -i ../01-fix-sasl-md5-digest-uri.patch + patch -Np1 -i ../03-drop-stanzas-on-fail.patch + patch -Np1 -i ../04-use-pkg-config-for-gnutls.patch + patch -Np1 -i ../07-glib-single-include.patch + patch -Np1 -i ../08-fix-ipv6-connect.patch libtoolize --force - autoreconf + aclocal + autoconf + automake --add-missing +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static make } diff --git a/extra/nedit/PKGBUILD b/extra/nedit/PKGBUILD index 250d5e2bd..90e40764f 100644 --- a/extra/nedit/PKGBUILD +++ b/extra/nedit/PKGBUILD @@ -1,35 +1,35 @@ -# $Id: PKGBUILD 135019 2011-08-09 21:15:50Z eric $ +# $Id: PKGBUILD 191231 2013-07-21 23:04:03Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=nedit pkgver=5.5 -pkgrel=6 +pkgrel=7 pkgdesc="A Unix text editor for programmers and general users" arch=('i686' 'x86_64') url="http://www.nedit.org/" license=('GPL') depends=('lesstif' 'libxpm') -source=(http://www.nedit.org/ftp/v5_5/${pkgname}-${pkgver}-src.tar.bz2 +source=(http://www.nedit.org/${pkgname}-${pkgver}-src.tar.bz2 nedit_xorg_composite_fix.patch) -md5sums=('48cb3dce52d44988f3a4d7c6f47b6bbe' - 'ae1f56ae9b23163882051720ac52412d') sha1sums=('7d3c87a793a5047cf857af1ac82e39f3b33e8a87' '1f6c75075a6bdc7b0dd8ca89d8117d68af8fc54e') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../nedit_xorg_composite_fix.patch +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/nedit_xorg_composite_fix.patch" sed -i 's/-Wl,-Bstatic//' makefiles/Makefile.linux sed -i 's|fgets|//fgets|' util/check_lin_tif.c sed -i "s/CFLAGS=-O/CFLAGS=${CFLAGS} -DBUILD_UNTESTED_NEDIT/" makefiles/Makefile.linux sed -i 's|"/bin/csh"|"/bin/sh"|' source/preferences.c +} +build() { + cd ${pkgname}-${pkgver} make linux docs } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - + cd ${pkgname}-${pkgver} install -Dm755 source/nedit "${pkgdir}/usr/bin/nedit" install -Dm755 source/nc "${pkgdir}/usr/bin/nedit-client" install -Dm644 doc/nedit.man "${pkgdir}/usr/share/man/man1/nedit.1" diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index 219a4fff2..53feb35fb 100644 --- a/extra/rosegarden/PKGBUILD +++ b/extra/rosegarden/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182809 2013-04-15 13:34:39Z schiv $ +# $Id: PKGBUILD 191263 2013-07-22 13:50:52Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=rosegarden -pkgver=13.04 +pkgver=13.06 pkgrel=1 pkgdesc="MIDI/audio sequencer and notation editor" arch=('i686' 'x86_64') @@ -23,7 +23,7 @@ optdepends=('lilypond: notation display' [ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support') install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('bcc9be7bf8c3945e0eefdb95dc037f0b') +md5sums=('67b110277718b6ef2ec098a8fc452340') build() { cd "$srcdir/$pkgname-$pkgver" @@ -38,7 +38,6 @@ build() { export lrdf_CFLAGS LRELEASE LUPDATE ./configure --prefix=/usr - make } diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 26a1e3f09..55204ff79 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190068 2013-07-14 09:54:17Z tpowa $ +# $Id: PKGBUILD 191254 2013-07-22 12:16:46Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -pkgver=${_basekernel}.1 +pkgver=${_basekernel}.2 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '5561eca43f9b46ad5a341b0cf59f3226' + '3d06da86aca3af3babcb23b98eeb5442' 'ead29a0206b79cc56ab97930e5d517ae' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index c41ade432..e78f09ee9 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190068 2013-07-14 09:54:17Z tpowa $ +# $Id: PKGBUILD 191254 2013-07-22 12:16:46Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -pkgver=${_basekernel}.1 +pkgver=${_basekernel}.2 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '5561eca43f9b46ad5a341b0cf59f3226' + '3d06da86aca3af3babcb23b98eeb5442' 'e2cb9d4092685c2a4216de9bbe8b72f1' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 9c0090083..37ec6585b 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190068 2013-07-14 09:54:17Z tpowa $ +# $Id: PKGBUILD 191254 2013-07-22 12:16:46Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=1 +_sublevel=2 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '5561eca43f9b46ad5a341b0cf59f3226' + '3d06da86aca3af3babcb23b98eeb5442' '542fc77350e62009bca7af080359b286' 'bd77b7112db61fb184139daaa1e390ac' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -39,7 +39,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '536d322b78a2bde29c0b49b577d8a43a') + '223606d6db3504732aab7711833a30fb') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index 96c0f3537..1dc040d92 100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD @@ -1,37 +1,38 @@ -# $Id: PKGBUILD 177534 2013-02-07 02:39:51Z eric $ +# $Id: PKGBUILD 190799 2013-07-16 22:56:09Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=xscreensaver pkgname=xscreensaver-libre -pkgver=5.21 +pkgver=5.22 pkgrel=1 pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files" arch=('i686' 'x86_64' 'mips64el') url="http://www.jwz.org/xscreensaver/" license=('BSD') -depends=('libxxf86vm' 'libglade' 'glu' 'xorg-appres' 'libxmu' \ - 'perl-libwww' 'perl-http-message') -makedepends=('bc' 'libxpm' 'gdm' 'mesa') +depends=('libglade' 'xorg-appres' 'perl-libwww') +makedepends=('bc' 'libxpm' 'gdm') optdepends=('gdm: for login manager support') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") backup=('etc/pam.d/xscreensaver') source=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz \ - add-electricsheep.diff xscreensaver.pam LICENSE) -sha1sums=('cc44ddc538ad5b59ff851f70e8a48633763ff077' - '677496218b81a42d90bee400026e94dd87fb8ffb' - '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' + xscreensaver-add-electricsheep.diff LICENSE) +sha1sums=('b1d7f97d9b60d9c68c0f3e019cad885f5c7bd6ec' + 'e8dc57b6471fb3867ee099304ac6bf628351cb98' '4209ea586b204fd1d81c382a0522c654f9fd9134') -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - patch -p0 -i "${srcdir}/add-electricsheep.diff" - - # Deleting dmsc.asm file due that don't have source code supplied +prepare() { + cd ${_pkgname}-${pkgver} + patch -p0 -i "${srcdir}/xscreensaver-add-electricsheep.diff" + + # Deleting dmsc.asm file due which don't have source code supplied rm -v hacks/images/m6502/dmsc.asm +} +build() { + cd ${_pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib --with-x-app-defaults=/usr/share/X11/app-defaults \ --with-pam --with-login-manager --with-gtk --with-gl \ @@ -40,10 +41,10 @@ build() { } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd ${_pkgname}-${pkgver} + install -d "${pkgdir}/etc/pam.d" make install_prefix="${pkgdir}" install install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" - install -D -m644 ../xscreensaver.pam "${pkgdir}/etc/pam.d/xscreensaver" chmod 755 "${pkgdir}/usr/bin/xscreensaver" echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop" } diff --git a/libre/xscreensaver-libre/add-electricsheep.diff b/libre/xscreensaver-libre/add-electricsheep.diff deleted file mode 100644 index 18b4dea97..000000000 --- a/libre/xscreensaver-libre/add-electricsheep.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- driver/XScreenSaver.ad.in-orig 2009-10-17 02:19:06.000000000 -0400 -+++ driver/XScreenSaver.ad.in 2009-10-17 02:21:16.000000000 -0400 -@@ -347,7 +347,8 @@ - @GL_KLUDGE@ GL: rubikblocks -root \n\ - @GL_KLUDGE@ GL: companioncube -root \n\ - @GL_KLUDGE@ GL: hilbert -root \n\ --@GL_KLUDGE@ GL: tronbit -root \n -+@GL_KLUDGE@ GL: tronbit -root \n\ -+ electricsheep --root 1 \n - - - diff --git a/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff b/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff new file mode 100644 index 000000000..0c5c3ff40 --- /dev/null +++ b/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff @@ -0,0 +1,10 @@ +--- driver/XScreenSaver.ad.in-orig 2013-07-16 16:47:10.183068023 -0400 ++++ driver/XScreenSaver.ad.in 2013-07-16 16:48:23.293473297 -0400 +@@ -157,6 +157,7 @@ + ! + *programs: \ + maze -root \n\ ++ electricsheep --root 1 \n\ + @GL_KLUDGE@ GL: superquadrics -root \n\ + attraction -root \n\ + blitspin -root \n\ diff --git a/libre/xscreensaver-libre/xscreensaver.pam b/libre/xscreensaver-libre/xscreensaver.pam deleted file mode 100644 index b4d80c21f..000000000 --- a/libre/xscreensaver-libre/xscreensaver.pam +++ /dev/null @@ -1 +0,0 @@ -auth required pam_unix_auth.so diff --git a/pcr/command-not-found/PKGBUILD b/pcr/command-not-found/PKGBUILD index d43b73c0e..e2131a3d5 100644 --- a/pcr/command-not-found/PKGBUILD +++ b/pcr/command-not-found/PKGBUILD @@ -1,47 +1,32 @@ +# Maintainer: Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: Diogo Leal <estranho@diogoleal.com> +# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> # Contributor: Matthias Maennich <arch@maennich.net> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> pkgname=command-not-found -pkgver=0.4.4 +pkgver=0.4.5 pkgrel=1 pkgdesc="In case a command could not be found this utility searches for packages containing this or a similar command (bash,zsh)." arch=('i686' 'x86_64') url="http://github.com/metti/command-not-found" -license=('GPL') +license=('GPL3') depends=('boost-libs' 'tdb' 'libarchive' 'wget') -makedepends=('boost' 'tdb' 'cmake' 'git') -source=('install') -md5sums=('2ea3c216fb0b7f8449f0225ece33210c') +makedepends=('boost' 'cmake') install='install' -_gitrepo="https://github.com/metti/$pkgname.git" +source=("libre://$pkgname-$pkgver.tar.gz") +mksource=("$pkgname-$pkgver::git+https://github.com/metti/$pkgname.git#tag=v${pkgver}") +mkmd5sums=('SKIP') build() { - cd $srcdir - msg "Connecting to the GIT server ..." - - if [[ -d $srcdir/$pkgname ]] ; then - cd $pkgname - git fetch origin - else - git clone $_gitrepo - cd $pkgname - fi - - git checkout v$pkgver - - msg "GIT checkout done" - - mkdir -p $srcdir/build - cd $srcdir/build - - cmake -D CMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="" $srcdir/$pkgname/src - make - + cd "$srcdir/$pkgname-$pkgver" + cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX="" src + make } package(){ - cd $srcdir/build - - make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +md5sums=('c055522251b2c58b9c6e0d0f0df481c0') diff --git a/pcr/command-not-found/install b/pcr/command-not-found/install index 26f49fa50..50e601258 100644 --- a/pcr/command-not-found/install +++ b/pcr/command-not-found/install @@ -7,8 +7,7 @@ post_upgrade() { } pre_remove() { - rm -rf /var/lib/cnf/*.db - rm -rf /var/lib/cnf/*.tdb + rm -f /var/lib/cnf/*.{db,tbd} } # vim:set ts=2 sw=2 et: diff --git a/pcr/etckeeper/PKGBUILD b/pcr/etckeeper/PKGBUILD index 163c320db..09a5d4d15 100644 --- a/pcr/etckeeper/PKGBUILD +++ b/pcr/etckeeper/PKGBUILD @@ -1,13 +1,12 @@ -# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> # Maintainer (AUR): Buce <dmbuce@gmail.com> # Contributor: Danie Roux <accounts@danieroux.com> - -# This requires makepkg newer than 4.0.3, which at this time means from git +# Contributor: Diogo Leal <estranho@diogoleal.com> pkgname=etckeeper -pkgver=0.64 -pkgdesc="collection of tools to let /etc be stored in a git, hg, bzr or darcs repository." -url="http://kitenet.net/~joey/code/etckeeper/" +pkgver=1.4 +pkgdesc="Collection of tools to let /etc be stored in a git, hg, bzr or darcs repository." +url="http://joeyh.name/code/etckeeper/" license=('GPL2') pkgrel=1 @@ -16,28 +15,28 @@ depends=('inetutils' 'python2') makedepends=('bzr') # bzr must be there at compile time to have bzr support optdepends=('git' 'hg' 'bzr' 'darcs') backup=(etc/etckeeper/etckeeper.conf) -source=("etckeeper-$pkgver::git://git.kitenet.net/etckeeper#tag=${pkgver}" - etckeeper-pacman.patch - etckeeper-archlinux.conf) +source=("libre://$pkgname-$pkgver.tar.gz" $pkgname-pacman.patch $pkgname-archlinux.conf) + +mksource=("$pkgname-$pkgver::git://git.kitenet.net/$pkgname#tag=${pkgver}") +mkmd5sums=('SKIP') build() { - cd "$srcdir/etckeeper-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" - # add pacman support to list-to `list-installed` - patch -p0 -i "$srcdir/etckeeper-pacman.patch" + # add pacman support to `list-installed` + patch -p0 -i "${srcdir}/${pkgname}-pacman.patch" # use python2 sed -i 's@^#!/usr/bin/python$@&2@' etckeeper-bzr/__init__.py - - make CONFFILE="$srcdir/etckeeper-archlinux.conf" build + make CONFFILE="${srcdir}/${pkgname}-archlinux.conf" build } package() { - cd "$srcdir/etckeeper-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" - make CONFFILE="$srcdir/etckeeper-archlinux.conf" DESTDIR=$pkgdir install + make CONFFILE="${srcdir}/${pkgname}-archlinux.conf" DESTDIR="$pkgdir" install } -md5sums=('SKIP' +md5sums=('74be692fdb2d3352324e9332a270635d' 'f1f00bf9331d1ef7f29b0ac29cdfcbda' '99d8d2838f49fa0f2f21c9e37948100d') |