diff options
33 files changed, 846 insertions, 153 deletions
diff --git a/community/lightdm-kde-greeter/PKGBUILD b/community/lightdm-kde-greeter/PKGBUILD index 8954c1d66..61b5a141a 100755 --- a/community/lightdm-kde-greeter/PKGBUILD +++ b/community/lightdm-kde-greeter/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90484 2013-05-12 21:57:59Z alucryd $ +# $Id: PKGBUILD 98490 2013-10-11 19:21:24Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Mladen Pejakovic <pejakm@gmail.com> @@ -6,7 +6,7 @@ pkgname=lightdm-kde-greeter pkgver=0.3.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="KDE greeter for LightDM" arch=('i686' 'x86_64') url="https://projects.kde.org/projects/playground/base/lightdm" @@ -16,24 +16,32 @@ makedepends=('cmake' 'automoc4') backup=('etc/lightdm/lightdm-kde-greeter.conf' 'etc/dbus-1/system.d/org.kde.kcontrol.kcmlightdm.conf') source=("ftp://ftp.kde.org/pub/kde/unstable/${pkgname%-*}/src/${pkgname%-*}-${pkgver}.tar.bz2" + 'findlightdm.patch' 'lightdm-kde-greeter.conf') sha256sums=('65b2a1bab2c88bf55a07e62cbe0eb8ac3660638636c5825e5925b28d03f12188' + '9a042204df841f93a817c0613284bb09006e5dc4af910648025e7ab1bb56e114' 'a8fe10ef68d553781b91b1377106f95915c3ca14d835bd66910e08f922ef64c8') +prepare() { + cd lightdm-${pkgver} + + patch -Np1 -i ../findlightdm.patch +} + build() { - cd "${srcdir}"/lightdm-${pkgver} + cd lightdm-${pkgver} if [[ -d build ]]; then rm -rf build fi mkdir build && cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' make } package() { - cd "${srcdir}"/lightdm-${pkgver}/build + cd lightdm-${pkgver}/build make DESTDIR="${pkgdir}" install mv "${pkgdir}"/usr/{sbin,bin} diff --git a/community/lightdm-kde-greeter/findlightdm.patch b/community/lightdm-kde-greeter/findlightdm.patch new file mode 100644 index 000000000..564dc3f84 --- /dev/null +++ b/community/lightdm-kde-greeter/findlightdm.patch @@ -0,0 +1,33 @@ +--- a/cmake/modules/FindQLightDM.cmake ++++ b/cmake/modules/FindQLightDM.cmake +@@ -19,10 +19,19 @@ + find_package(PkgConfig) + if(PKG_CONFIG_FOUND) + if (QLIGHTDM_MIN_VERSION) +- PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION}) ++ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3>=${QLIGHTDM_MIN_VERSION}) + else (QLIGHTDM_MIN_VERSION) +- PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2) ++ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3) + endif (QLIGHTDM_MIN_VERSION) ++ SET (QLIGHTDM_API 3) ++ if (NOT PC_QLIGHTDM_FOUND) ++ if (QLIGHTDM_MIN_VERSION) ++ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION}) ++ else (QLIGHTDM_MIN_VERSION) ++ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2) ++ endif (QLIGHTDM_MIN_VERSION) ++ SET (QLIGHTDM_API 2) ++ endif (NOT PC_QLIGHTDM_FOUND) + endif(PKG_CONFIG_FOUND) + + +@@ -34,7 +43,7 @@ + ) + + find_library(QLIGHTDM_LIBRARIES +- NAMES lightdm-qt-2 ++ NAMES lightdm-qt-${QLIGHTDM_API} + HINTS + ${PC_QLIGHTDM_LIBDIR} + ${PC_QLIGHTDM_LIBRARY_DIRS} diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD index c73581bcd..1dccc5945 100644 --- a/community/pgadmin3/PKGBUILD +++ b/community/pgadmin3/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 97840 2013-09-30 10:03:39Z spupykin $ +# $Id: PKGBUILD 98468 2013-10-11 10:07:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Benjamin Andresen <benny@klapmuetz.org> # Contributor: bekks <eduard.warkentin@gmx.de> pkgname=pgadmin3 -pkgver=1.18.0 -pkgrel=2 +pkgver=1.18.1 +pkgrel=1 pkgdesc="Comprehensive design and management interface for PostgreSQL" arch=('i686' 'x86_64') url="http://www.pgadmin.org" @@ -15,7 +15,7 @@ depends=('wxgtk' 'postgresql-libs' 'libxslt') makedepends=('libpqxx' 'krb5' 'postgresql' 'imagemagick') _categories="Development;Application" source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz) -md5sums=('ed1968a9abda0064be68bf57d7ccad43') +md5sums=('7dde96680407c900af72d0839a377de4') build() { cd "$srcdir" diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index bcb9e0d7e..f09d08dbc 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jakob Gruber <jakob.gruber@gmail.com> pkgname=stone-soup -pkgver=0.12.2 +pkgver=0.13.0 pkgrel=1 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' arch=('i686' 'x86_64') @@ -66,4 +66,4 @@ package() { } -md5sums=('a0d5e6f2c4e32c943eb82d9d655199a4') +md5sums=('120adc528f020a6440bf1dbc4ccb6abb') diff --git a/community/ude/PKGBUILD b/community/ude/PKGBUILD index 4a6a50f1a..f65998d88 100644 --- a/community/ude/PKGBUILD +++ b/community/ude/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 90591 2013-05-13 09:59:42Z spupykin $ +# $Id: PKGBUILD 98464 2013-10-11 09:25:30Z bgyorgy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: eric <eric@archlinux.org> # Contributor: dorphell <dorphell@gmx.net> pkgname=ude pkgver=0.2.11 -pkgrel=1 -pkgdesc="Unix Desktop Environment (GUI desktop environment)" -arch=('x86_64' 'i686') +pkgrel=2 +pkgdesc="The ultimate window manager for UDE" +arch=('i686' 'x86_64') license=('GPL') depends=('libjpeg' 'libxmu' 'libxpm' 'bash') makedepends=('gendesk') @@ -17,7 +17,7 @@ md5sums=('d4952a7edffd30ac07f32fce244c86d7') build() { cd "$srcdir" - gendesk + gendesk -n --pkgname=uwm --name=UWM --pkgdesc="$pkgdesc" cd "uwm-$pkgver" ./configure --prefix=/usr @@ -27,10 +27,7 @@ build() { package() { cd "$srcdir/uwm-$pkgver" - mkdir -p $pkgdir/etc/X11/sessions - make prefix=$pkgdir/usr install - install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/etc/X11/sessions" - install -Dm644 "$srcdir/$pkgname.png" \ - "$pkgdir/usr/share/pixmaps/$pkgname.png" - mv $pkgdir/usr/doc $pkgdir/usr/share/ + make prefix="$pkgdir/usr" install + install -Dm644 "$srcdir/uwm.desktop" "$pkgdir/usr/share/xsessions/uwm.desktop" + mv "$pkgdir/usr/doc" "$pkgdir/usr/share/" } diff --git a/community/vbam/PKGBUILD b/community/vbam/PKGBUILD new file mode 100755 index 000000000..3ea2ab4e0 --- /dev/null +++ b/community/vbam/PKGBUILD @@ -0,0 +1,106 @@ +# $Id: PKGBUILD 98482 2013-10-11 16:52:10Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd@gmail.com> +# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> + +pkgbase=vbam +pkgname=('vbam-cli' 'vbam-gtk' 'vbam-wx') +pkgver=1.8.0.1202 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://vba-m.com" +license=('GPL2') +makedepends=('cmake' 'desktop-file-utils' 'freetype2' 'gtkglextmm' 'imagemagick' 'glew' 'libjpeg' 'libpng' 'libsndfile' 'libxrandr' 'mesa' 'openal' 'wxgtk' 'zip') +[[ $CARCH == i686 ]] && makedepends+=('nasm') +source=("http://downloads.sourceforge.net/project/vbam/vbam-src/vbam-r${pkgver##*.}-src.tar.bz2" + 'http://downloads.sourceforge.net/sfml/SFML-1.6-sdk-linux-64.tar.gz' + 'http://www.lonesock.net/files/soil.zip' + 'sfml.patch' + 'soil.patch') +sha256sums=('148d866c08d7a810be5c845247d212f1d1d07395f2ccdecef10ad81a76072877' + '05bdc32286ab2ec8cb1ccdafe53f31830284e09e11ebfc3ab3836c99a0d9654b' + 'a2305b8d64f6d636e36d669bbdb0ca5445d1345c754b3d61d3f037dad2e5f701' + 'c3c2fc48f4edc303ad24d91583a57aef9b7ca3b78de1d6734cb666745fff9bad' + '65705aeef90667bd4e28dd03ac0b43685470f2925b642637b7ff6e2f3acd34c7') + +prepare() { + patch -Np0 -i soil.patch + patch -Np0 -i sfml.patch +} + +build() { +# Build static SOIL + pushd "Simple OpenGL Image Library/src" + make -f "../projects/makefile/alternate Makefile.txt" + make -f "../projects/makefile/alternate Makefile.txt" DESTDIR="${srcdir}/staging" install + popd + +# Build static SFML + pushd SFML-1.6 + make + make DESTDIR="${srcdir}/staging/usr" install + popd + +# Build VBA-M + if [[ -d build ]]; then + rm -rf build + fi + mkdir build && cd build + + local _cmakeargs="-DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_CXX_FLAGS=-I${srcdir}/staging/usr/include -DENABLE_GTK='ON' -DENABLE_WX='ON' \ + -DSFML_INCLUDE_DIR='../staging/usr/include/SFML' \ + -DSFML_AUDIO_INCLUDE_DIR='../staging/usr/include/SFML/Audio' \ + -DSFML_AUDIO_LIBRARY='../staging/usr/lib/libsfml-audio-s.a' \ + -DSFML_GRAPHICS_INCLUDE_DIR='../staging/usr/include/SFML/Graphics' \ + -DSFML_GRAPHICS_LIBRARY='../staging/usr/lib/libsfml-graphics-s.a' \ + -DSFML_NETWORK_INCLUDE_DIR='../staging/usr/include/SFML/Network' \ + -DSFML_NETWORK_LIBRARY='../staging/usr/lib/libsfml-network-s.a' \ + -DSFML_SYSTEM_INCLUDE_DIR='../staging/usr/include/SFML/System' \ + -DSFML_SYSTEM_LIBRARY='../staging/usr/lib/libsfml-system-s.a'" + + if [[ $CARCH == i686 ]]; then + cmake .. ${_cmakeargs} -DENABLE_ASM_{CORE,SCALERS}='ON' + else + cmake .. ${_cmakeargs} + fi + make +} + +package_vbam-cli() { +pkgdesc="Nintendo GameBoy Advance emulator - SDL version" +depends=('mesa' 'libpng' 'sdl') +backup=('etc/vbam.cfg') + + cd build + + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/{bin/{g,wx}vbam,share} +} + +package_vbam-gtk() { +pkgdesc="Nintendo GameBoy Advance emulator - GTK version" +depends=('desktop-file-utils' 'gtkglextmm' 'sdl') +conflicts=('vbam-wx') +install='vbam-gtk.install' + + cd build + + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/{etc,usr/bin/vbam} + find "${pkgdir}" -type f -regex .*wxvbam.* -exec rm {} + +} + +package_vbam-wx() { +pkgdesc="Nintendo GameBoy Advance emulator - wx version" +depends=('wxgtk') +conflicts=('vbam-gtk') +options=('!emptydirs') +install='vbam-wx.install' + + cd build + + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/{etc,usr/{bin,share}/vbam} + find "${pkgdir}" -type f -regex .*gvbam.* -exec rm {} + +} + +# vim: ts=2 sw=2 et: diff --git a/community/vbam/sfml.patch b/community/vbam/sfml.patch new file mode 100755 index 000000000..30e7c137b --- /dev/null +++ b/community/vbam/sfml.patch @@ -0,0 +1,181 @@ +diff -rupN SFML-1.6.orig/include/SFML/System/Resource.hpp SFML-1.6/include/SFML/System/Resource.hpp +--- SFML-1.6.orig/include/SFML/System/Resource.hpp 2010-01-27 14:53:54.000000000 +0100 ++++ SFML-1.6/include/SFML/System/Resource.hpp 2013-10-11 15:22:44.416388808 +0200 +@@ -29,7 +29,7 @@ + // Headers
+ ////////////////////////////////////////////////////////////
+ #include <set>
+-
++#include <cstddef>
+
+ namespace sf
+ {
+diff -rupN SFML-1.6.orig/src/SFML/Audio/Makefile SFML-1.6/src/SFML/Audio/Makefile +--- SFML-1.6.orig/src/SFML/Audio/Makefile 2010-01-27 15:00:19.000000000 +0100 ++++ SFML-1.6/src/SFML/Audio/Makefile 2013-10-11 15:24:44.588725944 +0200 +@@ -25,7 +25,7 @@ $(OBJ): %.o: %.cpp + $(CPP) -o $@ -c $< $(CFLAGS)
+
+ $(OBJVORBIS): %.o: %.c
+- $(CC) -o $@ -c $< $(CFLAGSEXT)
++ $(CC) -o $@ -c $< $(CFLAGS)
+
+ .PHONY: clean mrproper
+
+diff -rupN SFML-1.6.orig/src/SFML/Graphics/GraphicsContext.hpp SFML-1.6/src/SFML/Graphics/GraphicsContext.hpp +--- SFML-1.6.orig/src/SFML/Graphics/GraphicsContext.hpp 2010-01-27 15:00:05.000000000 +0100 ++++ SFML-1.6/src/SFML/Graphics/GraphicsContext.hpp 2013-10-11 15:22:44.419722114 +0200 +@@ -30,7 +30,7 @@ + ////////////////////////////////////////////////////////////
+ #include <SFML/Config.hpp>
+ #include <SFML/System/NonCopyable.hpp>
+-#include <SFML/Graphics/GLEW/glew.h>
++#include <GL/glew.h>
+ #include <iostream>
+ #include <string>
+
+diff -rupN SFML-1.6.orig/src/SFML/Graphics/ImageLoader.cpp SFML-1.6/src/SFML/Graphics/ImageLoader.cpp +--- SFML-1.6.orig/src/SFML/Graphics/ImageLoader.cpp 2010-01-27 15:00:05.000000000 +0100 ++++ SFML-1.6/src/SFML/Graphics/ImageLoader.cpp 2013-10-11 15:22:44.419722114 +0200 +@@ -28,11 +28,12 @@ + #include <SFML/Graphics/ImageLoader.hpp>
+ extern "C"
+ {
+- #include <SFML/Graphics/libjpeg/jpeglib.h>
+- #include <SFML/Graphics/libjpeg/jerror.h>
++ #include <jpeglib.h>
++ #include <jerror.h>
+ }
+-#include <SFML/Graphics/libpng/png.h>
+-#include <SFML/Graphics/SOIL/SOIL.h>
++#include <png.h>
++#include <SOIL/SOIL.h>
++#include <cstring>
+ #include <iostream>
+
+
+@@ -44,7 +45,7 @@ namespace + void PngErrorHandler(png_structp Png, png_const_charp Message)
+ {
+ std::cerr << "Failed to write PNG image. Reason : " << Message << std::endl;
+- longjmp(Png->jmpbuf, 1);
++ longjmp(png_jmpbuf(Png), 1);
+ }
+ }
+
+@@ -289,7 +290,7 @@ bool ImageLoader::WritePng(const std::st + }
+
+ // For proper error handling...
+- if (setjmp(Png->jmpbuf))
++ if (setjmp(png_jmpbuf(Png)))
+ {
+ png_destroy_write_struct(&Png, &PngInfo);
+ return false;
+diff -rupN SFML-1.6.orig/src/SFML/Graphics/Makefile SFML-1.6/src/SFML/Graphics/Makefile +--- SFML-1.6.orig/src/SFML/Graphics/Makefile 2010-01-27 15:00:05.000000000 +0100 ++++ SFML-1.6/src/SFML/Graphics/Makefile 2013-10-11 15:26:37.971432986 +0200 +@@ -1,15 +1,5 @@ + SRC = $(wildcard *.cpp)
+-SRCGLEW = $(wildcard ./GLEW/*.c)
+-SRCJPEG = $(wildcard ./libjpeg/*.c)
+-SRCPNG = $(wildcard ./libpng/*.c)
+-SRCSOIL = $(wildcard ./SOIL/*.c)
+-SRCZLIB = $(wildcard ./zlib/*.c)
+ OBJ = $(SRC:.cpp=.o)
+-OBJGLEW = $(SRCGLEW:.c=.o)
+-OBJJPEG = $(SRCJPEG:.c=.o)
+-OBJPNG = $(SRCPNG:.c=.o)
+-OBJSOIL = $(SRCSOIL:.c=.o)
+-OBJZLIB = $(SRCZLIB:.c=.o)
+
+ ifeq ($(STATIC), yes)
+ LIB = libsfml-graphics-s.a
+@@ -23,22 +13,19 @@ endif +
+ all: $(LIB)
+
+-libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
+- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
++libsfml-graphics-s.a: $(OBJ)
++ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
+
+-libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
+- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
++libsfml-graphics.so: $(OBJ)
++ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lGLEW -ljpeg -lpng -lz -lfreetype -lX11 -lGL
+
+ $(OBJ): %.o: %.cpp
+ $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
+
+-$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
+- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
+-
+ .PHONY: clean mrproper
+
+ clean:
+- @rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
++ @rm -rf $(OBJ)
+
+ mrproper: clean
+ @rm -rf $(LIBNAME)
+diff -rupN SFML-1.6.orig/src/SFML/Makefile SFML-1.6/src/SFML/Makefile +--- SFML-1.6.orig/src/SFML/Makefile 2010-01-27 15:00:37.000000000 +0100 ++++ SFML-1.6/src/SFML/Makefile 2013-10-11 15:29:14.687273136 +0200 +@@ -1,10 +1,10 @@ + export DEBUGBUILD = no
+-export STATIC = no
++export STATIC = yes
+
+ ifeq ($(DEBUGBUILD), yes)
+ DEBUGFLAGS = -g -DDEBUG
+ else
+- DEBUGFLAGS = -O2 -DNDEBUG
++ DEBUGFLAGS = -DNDEBUG
+ endif
+
+ ifeq ($(STATIC), no)
+@@ -17,9 +17,9 @@ endif +
+ export CC = gcc
+ export CPP = g++
+-export CFLAGS = -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS)
+-export CFLAGSEXT = -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS)
+-export LDFLAGS = $(LINKFLAGS)
++export CFLAGS += -W -Wall -pedantic -I../../../include -I../../../../staging/usr/include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS)
++export CFLAGSEXT = -I../../../include -I../../../../staging/usr/include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS)
++export LDFLAGS += $(LINKFLAGS)
+ export LIBPATH = ../../../lib
+ export VERSION = 1.6
+ export CP = cp
+diff -rupN SFML-1.6.orig/src/SFML/Window/Linux/Joystick.cpp SFML-1.6/src/SFML/Window/Linux/Joystick.cpp +--- SFML-1.6.orig/src/SFML/Window/Linux/Joystick.cpp 2010-01-27 15:00:27.000000000 +0100 ++++ SFML-1.6/src/SFML/Window/Linux/Joystick.cpp 2013-10-11 15:22:44.423055420 +0200 +@@ -27,7 +27,7 @@ + ////////////////////////////////////////////////////////////
+ #include <SFML/Window/Joystick.hpp>
+ #include <sstream>
+-
++#include <unistd.h>
+
+ namespace sf
+ {
+diff -rupN SFML-1.6.orig/src/SFML/Window/Makefile SFML-1.6/src/SFML/Window/Makefile +--- SFML-1.6.orig/src/SFML/Window/Makefile 2010-01-27 15:00:37.000000000 +0100 ++++ SFML-1.6/src/SFML/Window/Makefile 2013-10-11 15:31:52.909728371 +0200 +@@ -1,6 +1,5 @@ + SRC = $(wildcard *.cpp ./Linux/*.cpp)
+ OBJ = $(SRC:.cpp=.o)
+-OBJGLEW = $(SRCGLEW:.c=.o)
+
+ ifeq ($(STATIC), yes)
+ LIB = libsfml-window-s.a
+@@ -18,7 +17,7 @@ libsfml-window-s.a: $(OBJ) + $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
+
+ libsfml-window.so: $(OBJ)
+- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL
++ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lGLEW -lX11 -lXrandr -lGL
+
+ $(OBJ): %.o: %.cpp
+ $(CPP) -o $@ -c $< $(CFLAGS)
diff --git a/community/vbam/soil.patch b/community/vbam/soil.patch new file mode 100755 index 000000000..bf38faed3 --- /dev/null +++ b/community/vbam/soil.patch @@ -0,0 +1,51 @@ +diff -rupN "Simple OpenGL Image Library.orig/projects/makefile/alternate Makefile.txt" "Simple OpenGL Image Library/projects/makefile/alternate Makefile.txt" +--- "Simple OpenGL Image Library.orig/projects/makefile/alternate Makefile.txt" 2008-07-07 18:13:28.000000000 +0200 ++++ "Simple OpenGL Image Library/projects/makefile/alternate Makefile.txt" 2013-10-11 12:31:18.545860800 +0200 +@@ -1,7 +1,7 @@ + MAKE = make + CC = gcc +-INSTALL_FILE = install -p -o root -g root -m 644 +-INSTALL_DIR = install -p -o root -g root -d ++INSTALL_FILE = install -p -m 644 ++INSTALL_DIR = install -p -d + LN = ln -s + RM = rm -fv + CFLAGS += -c -O2 -Wall +@@ -10,13 +10,12 @@ LDFLAGS += + CFILES = image_DXT.c image_helper.c SOIL.c stb_image_aug.c + OFILES = $(CFILES:.c=.o) + LIBNAME = libSOIL +-VERSION = 1.07-20071110 ++VERSION = 1.16 + MAJOR = 1 + + HFILES = SOIL.h image_DXT.h image_helper.h \ + stbi_DDS_aug.h stbi_DDS_aug_c.h stb_image_aug.h + AFILE = libSOIL.a +-SOFILE = libSOIL.so.$(VERSION) + INCLUDEDIR = /usr/include/SOIL + LIBDIR = /usr/lib + +@@ -29,22 +28,17 @@ lib: $(OFILES) + # create static library + ar -cvq $(LIBNAME).a $(OFILES) + # create shared library +- gcc -shared -Wl,-soname,$(LIBNAME).so.$(MAJOR) -o $(LIBNAME).so.$(VERSION) $(OFILES) + + install: + $(INSTALL_DIR) $(DESTDIR)/$(INCLUDEDIR) + $(INSTALL_FILE) $(HFILES) $(DESTDIR)/$(INCLUDEDIR) + $(INSTALL_DIR) $(DESTDIR)/$(LIBDIR) + $(INSTALL_FILE) $(AFILE) $(DESTDIR)/$(LIBDIR) +- $(INSTALL_FILE) $(SOFILE) $(DESTDIR)/$(LIBDIR) +- ( cd $(DESTDIR)/$(LIBDIR) && $(LN) $(SOFILE) $(LIBNAME).so.$(MAJOR) \ +- && $(LN) $(SOFILE) $(LIBNAME).so ) + + clean: + $(RM) *.o + $(RM) *~ + + distclean: +- $(RM) $(AFILE) $(SOFILE) + + .PHONY: all lib clean distclean diff --git a/community/vbam/vbam-gtk.install b/community/vbam/vbam-gtk.install new file mode 100755 index 000000000..1ade13cc7 --- /dev/null +++ b/community/vbam/vbam-gtk.install @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -ftq usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim: ts=2 sw=2 et: diff --git a/community/vbam/vbam-wx.install b/community/vbam/vbam-wx.install new file mode 100755 index 000000000..11027f6ea --- /dev/null +++ b/community/vbam/vbam-wx.install @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -ftq usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim: ts=2 sw=2 et: diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD index 74a0f8f9f..bce4b994c 100644 --- a/core/kbd/PKGBUILD +++ b/core/kbd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193453 2013-08-20 12:18:42Z tpowa $ +# $Id: PKGBUILD 196308 2013-10-11 09:58:13Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kbd pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Keytable files and keyboard utilities" arch=('i686' 'x86_64') url="http://www.kbd-project.org" @@ -12,13 +12,17 @@ depends=('glibc' 'pam') makedepends=('check') source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz 'fix-dvorak-es.patch' - 'fix-euro2.patch') + 'fix-euro2.patch' + 'fix-alt_is_meta.patch' + 'merge-fullline_singleline.patch') provides=('vlock') conflicts=('vlock') replaces=('vlock') md5sums=('5ba259a0b2464196f6488a72070a3d60' '998957c4f815347dcc874c4d7555dc66' - 'd869200acbc0aab6a9cafa43cb140d4e') + 'd869200acbc0aab6a9cafa43cb140d4e' + '91de90cde763c7f704027c2837360098' + 'b21e24509ea9db206971ce8a02dfc46f') prepare() { cd ${srcdir}/${pkgname}-${pkgver} @@ -36,6 +40,9 @@ prepare() { patch -Np1 -i ../fix-dvorak-es.patch # fix euro2 #28213 patch -Np1 -i ../fix-euro2.patch + # fix #36689 + patch -Np1 -i ../fix-alt_is_meta.patch + patch -Np1 -i ../merge-fullline_singleline.patch } build() { diff --git a/core/kbd/fix-alt_is_meta.patch b/core/kbd/fix-alt_is_meta.patch new file mode 100644 index 000000000..865ea917b --- /dev/null +++ b/core/kbd/fix-alt_is_meta.patch @@ -0,0 +1,212 @@ +From f6d17ec929f59cc65a8c5f8a4918c1fe89e2b85a Mon Sep 17 00:00:00 2001 +From: Alexey Gladkov <gladkov.alexey@gmail.com> +Date: Mon, 7 Oct 2013 17:48:57 +0400 +Subject: [PATCH] Fix alt_is_meta regression + +Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com> +--- + src/libkeymap/kmap.c | 8 ++++---- + tests/Makefile.am | 8 ++++++-- + tests/alt-is-meta.in | 19 +++++++++++++++++++ + tests/alt-is-meta.map | 12 ++++++++++++ + tests/alt-is-meta.output | 42 ++++++++++++++++++++++++++++++++++++++++++ + tests/libkeymap-showmaps.c | 30 ++++++++++++++++++++++++++++++ + 6 files changed, 113 insertions(+), 6 deletions(-) + create mode 100755 tests/alt-is-meta.in + create mode 100644 tests/alt-is-meta.map + create mode 100644 tests/alt-is-meta.output + create mode 100644 tests/libkeymap-showmaps.c + +diff --git a/src/libkeymap/kmap.c b/src/libkeymap/kmap.c +index ca97ed5..c7945bc 100644 +--- a/src/libkeymap/kmap.c ++++ b/src/libkeymap/kmap.c +@@ -149,10 +149,10 @@ lk_add_key(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index, int k + int type = KTYP(keycode); + int val = KVAL(keycode); + +- if (alttable != k_table && !lk_key_exists(ctx, alttable, k_index) && +- (type == KT_LATIN || type == KT_LETTER) && val < 128) { +- if (lk_add_map(ctx, alttable) < 0) +- return -1; ++ if (alttable != k_table && lk_map_exists(ctx, alttable) && ++ !lk_key_exists(ctx, alttable, k_index) && ++ (type == KT_LATIN || type == KT_LETTER) && ++ val < 128) { + if (lk_add_key(ctx, alttable, k_index, K(KT_META, val)) < 0) + return -1; + } +diff --git a/tests/Makefile.am b/tests/Makefile.am +index e7d22c2..d9a9f61 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -7,10 +7,12 @@ AM_CFLAGS = $(CHECK_CFLAGS) + LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS) + + EXTRA_DIST = \ ++ alt-is-meta.in \ + dumpkeys-bkeymap.in \ + dumpkeys-fulltable.in \ + dumpkeys-mktable.in \ + \ ++ alt-is-meta.map \ + charset-keymap0.map \ + dumpkeys.full.ruwin_cplk-UTF-8.map \ + dumpkeys.qwerty-layout.map \ +@@ -19,15 +21,16 @@ EXTRA_DIST = \ + keymap0.map keymap1.map keymap2.map keymap3.map keymap4.map keymap5.map keymap6.map \ + VoidSymbol.map \ + \ ++ alt-is-meta.output \ + dumpkeys.bkeymap.bin \ + dumpkeys.defkeymap.c + +-check_SCRIPTS = dumpkeys-fulltable dumpkeys-mktable dumpkeys-bkeymap ++check_SCRIPTS = dumpkeys-fulltable dumpkeys-mktable dumpkeys-bkeymap alt-is-meta + check_PROGRAMS = libkeymap-init libkeymap-kmap libkeymap-keys libkeymap-parse \ + libkeymap-charset + + noinst_PROGRAMS = \ +- libkeymap-dumpkeys libkeymap-mktable libkeymap-bkeymap \ ++ libkeymap-dumpkeys libkeymap-mktable libkeymap-bkeymap libkeymap-showmaps \ + $(check_PROGRAMS) + + TESTS = $(check_PROGRAMS) $(check_SCRIPTS) +@@ -41,6 +44,7 @@ libkeymap_charset_SOURCES = libkeymap-charset.c + libkeymap_dumpkeys_SOURCES = libkeymap-dumpkeys.c + libkeymap_mktable_SOURCES = libkeymap-mktable.c + libkeymap_bkeymap_SOURCES = libkeymap-bkeymap.c ++libkeymap_showmaps_SOURCES = libkeymap-showmaps.c + + %: %.in + sed \ +diff --git a/tests/alt-is-meta.in b/tests/alt-is-meta.in +new file mode 100755 +index 0000000..ddd5ed8 +--- /dev/null ++++ b/tests/alt-is-meta.in +@@ -0,0 +1,19 @@ ++#!/bin/sh -efu ++ ++cwd="$(readlink -ev "${0%/*}")" ++ ++cd "$cwd" ++ ++rc=0 ++temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")" ++ ++./libkeymap-showmaps "@DATADIR@"/alt-is-meta.map > "$temp" || rc=$? ++cmp -s "@DATADIR@//alt-is-meta.output" "$temp" || rc=$? ++ ++if [ "$rc" != 0 ]; then ++ printf 'failed\n' ++else ++ rm -f -- "$temp" ++fi ++ ++exit $rc +diff --git a/tests/alt-is-meta.map b/tests/alt-is-meta.map +new file mode 100644 +index 0000000..fa182a5 +--- /dev/null ++++ b/tests/alt-is-meta.map +@@ -0,0 +1,12 @@ ++keymaps 0-9,12-13,16-20,22,24-25,28,32-41,44-45,48-52,54,56-57,60 ++alt_is_meta ++keycode 16 = +q Q backslash backslash Control_q \ ++ Control_q Control_backslash Control_backslash \ ++ Meta_q Meta_Q VoidSymbol VoidSymbol +Q \ ++ q VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Meta_Q Meta_q VoidSymbol \ ++ +q Q backslash backslash Control_q \ ++ Control_q Control_backslash Control_backslash \ ++ Meta_q Meta_Q VoidSymbol VoidSymbol +Q \ ++ q VoidSymbol VoidSymbol VoidSymbol VoidSymbol \ ++ Meta_Q Meta_q VoidSymbol +diff --git a/tests/alt-is-meta.output b/tests/alt-is-meta.output +new file mode 100644 +index 0000000..25abb20 +--- /dev/null ++++ b/tests/alt-is-meta.output +@@ -0,0 +1,42 @@ ++keymap 000 ++keymap 001 ++keymap 002 ++keymap 003 ++keymap 004 ++keymap 005 ++keymap 006 ++keymap 007 ++keymap 008 ++keymap 009 ++keymap 012 ++keymap 013 ++keymap 016 ++keymap 017 ++keymap 018 ++keymap 019 ++keymap 020 ++keymap 022 ++keymap 024 ++keymap 025 ++keymap 028 ++keymap 032 ++keymap 033 ++keymap 034 ++keymap 035 ++keymap 036 ++keymap 037 ++keymap 038 ++keymap 039 ++keymap 040 ++keymap 041 ++keymap 044 ++keymap 045 ++keymap 048 ++keymap 049 ++keymap 050 ++keymap 051 ++keymap 052 ++keymap 054 ++keymap 056 ++keymap 057 ++keymap 060 +diff --git a/tests/libkeymap-showmaps.c b/tests/libkeymap-showmaps.c +new file mode 100644 +index 0000000..acbf9f1 +--- /dev/null ++++ b/tests/libkeymap-showmaps.c +@@ -0,0 +1,30 @@ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <keymap.h> ++ ++#include "contextP.h" ++ ++int main(int argc, char **argv) ++{ ++ int i; ++ struct lk_ctx *ctx; ++ lkfile_t f; ++ ++ ctx = lk_init(); ++ ++ f.pipe = 0; ++ strcpy(f.pathname, argv[1]); ++ f.fd = fopen( argv[1], "r"); ++ ++ lk_parse_keymap(ctx, &f); ++ ++ for (i = 0; i < ctx->keymap->total; i++) { ++ if (!lk_map_exists(ctx, i)) ++ continue; ++ printf("keymap %03d\n", i); ++ } ++ ++ lk_free(ctx); ++ return 0; ++} +-- +1.7.3.3 + diff --git a/core/kbd/merge-fullline_singleline.patch b/core/kbd/merge-fullline_singleline.patch new file mode 100644 index 000000000..cc2b2c3b0 --- /dev/null +++ b/core/kbd/merge-fullline_singleline.patch @@ -0,0 +1,104 @@ +From 301cb9f132017ec67cc00681ca3f7a25f0d24ca2 Mon Sep 17 00:00:00 2001 +From: Alexey Gladkov <gladkov.alexey@gmail.com> +Date: Mon, 7 Oct 2013 18:11:45 +0400 +Subject: [PATCH] parser: Merge fullline and singleline rule + +Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com> +--- + src/libkeymap/parser.y | 59 ++++++++++++++++++++++++----------------------- + 1 files changed, 30 insertions(+), 29 deletions(-) + +diff --git a/src/libkeymap/parser.y b/src/libkeymap/parser.y +index 627494a..17d953a 100644 +--- a/src/libkeymap/parser.y ++++ b/src/libkeymap/parser.y +@@ -180,7 +180,6 @@ line : EOL + | usualstringsline + | usualcomposeline + | keymapline +- | fullline + | singleline + | strline + | compline +@@ -281,34 +280,7 @@ compline : COMPOSE compsym compsym TO compsym EOL + compsym : CCHAR { $$ = $1; } + | UNUMBER { $$ = $1 ^ 0xf000; } + ; +-singleline : { +- ctx->mod = 0; +- } +- modifiers KEYCODE NUMBER EQUALS rvalue EOL +- { +- if (lk_add_key(ctx, ctx->mod, $4, $6) < 0) +- YYERROR; +- } +- | PLAIN KEYCODE NUMBER EQUALS rvalue EOL +- { +- if (lk_add_key(ctx, 0, $3, $5) < 0) +- YYERROR; +- } +- ; +-modifiers : modifiers modifier +- | modifier +- ; +-modifier : SHIFT { ctx->mod |= M_SHIFT; } +- | CONTROL { ctx->mod |= M_CTRL; } +- | ALT { ctx->mod |= M_ALT; } +- | ALTGR { ctx->mod |= M_ALTGR; } +- | SHIFTL { ctx->mod |= M_SHIFTL; } +- | SHIFTR { ctx->mod |= M_SHIFTR; } +- | CTRLL { ctx->mod |= M_CTRLL; } +- | CTRLR { ctx->mod |= M_CTRLR; } +- | CAPSSHIFT { ctx->mod |= M_CAPSSHIFT; } +- ; +-fullline : KEYCODE NUMBER EQUALS rvalue0 EOL ++singleline : KEYCODE NUMBER EQUALS rvalue0 EOL + { + unsigned int j, i, keycode; + int *val; +@@ -367,6 +339,33 @@ fullline : KEYCODE NUMBER EQUALS rvalue0 EOL + } + } + } ++ ++ | modifiers KEYCODE NUMBER EQUALS rvalue EOL ++ { ++ if (lk_add_key(ctx, ctx->mod, $3, $5) < 0) ++ YYERROR; ++ ctx->mod = 0; ++ } ++ | PLAIN KEYCODE NUMBER EQUALS rvalue EOL ++ { ++ if (lk_add_key(ctx, 0, $3, $5) < 0) ++ YYERROR; ++ ctx->mod = 0; ++ } ++ ; ++modifiers : modifiers modifier ++ | modifier ++ ; ++modifier : SHIFT { ctx->mod |= M_SHIFT; } ++ | CONTROL { ctx->mod |= M_CTRL; } ++ | ALT { ctx->mod |= M_ALT; } ++ | ALTGR { ctx->mod |= M_ALTGR; } ++ | SHIFTL { ctx->mod |= M_SHIFTL; } ++ | SHIFTR { ctx->mod |= M_SHIFTR; } ++ | CTRLL { ctx->mod |= M_CTRLL; } ++ | CTRLR { ctx->mod |= M_CTRLR; } ++ | CAPSSHIFT { ctx->mod |= M_CAPSSHIFT; } ++ ; + ; + + rvalue0 : +@@ -393,6 +392,8 @@ lk_parse_keymap(struct lk_ctx *ctx, lkfile_t *f) + yyscan_t scanner; + int rc = -1; + ++ ctx->mod = 0; ++ + yylex_init(&scanner); + yylex_init_extra(ctx, &scanner); + +-- +1.7.3.3 + diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD index cfae85ce5..7d80549ae 100644 --- a/extra/fping/PKGBUILD +++ b/extra/fping/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186276 2013-05-23 15:38:45Z giovanni $ +# $Id: PKGBUILD 196316 2013-10-11 13:19:32Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fping -pkgver=3.5 +pkgver=3.6 pkgrel=1 pkgdesc="A utility to ping multiple hosts at once" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://www.fping.org/" license=('custom') depends=('glibc') source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz") -md5sums=('2e17cb655aa4eb59b5a4a38a89e746ed') +md5sums=('997b1e998caff6ad5b28c48a5a8bf84b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD index 618a08d28..f0bd28d0d 100644 --- a/extra/freetype2/PKGBUILD +++ b/extra/freetype2/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 188918 2013-06-25 14:14:01Z heftig $ +# $Id: PKGBUILD 196343 2013-10-11 16:51:57Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=freetype2 pkgver=2.5.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="TrueType font rendering library" arch=(i686 x86_64) license=('GPL') url="http://freetype.sourceforge.net" -depends=('zlib' 'bzip2' 'sh') +depends=('zlib' 'bzip2' 'sh' 'libpng') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 freetype-2.2.1-enable-valid.patch @@ -33,9 +33,7 @@ prepare() { build() { cd "${srcdir}/freetype-${pkgver}" - # PNG support is useless if FT_CONFIG_OPTION_USE_PNG is disabled - ./configure --prefix=/usr --disable-static \ - --without-png + ./configure --prefix=/usr --disable-static make } diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index 6b10de42d..f0650250c 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196047 2013-10-07 11:51:06Z jgc $ +# $Id: PKGBUILD 196330 2013-10-11 14:50:36Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.37.93 +pkgver=2.38.0 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') @@ -12,7 +12,7 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) options=('!libtool') url="http://www.gtkmm.org/" -sha256sums=('a01031d7d05ba9df5915fc84867303c93341a8dd13a2aa5af78a71dfb46842f6') +sha256sums=('f37bab6bedb7b68045e356feca9e27760a5ce50d95df07156656a0e1deabc402') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 2478e24a6..7b4748870 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196077 2013-10-07 11:51:51Z jgc $ +# $Id: PKGBUILD 196333 2013-10-11 14:58:47Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-session -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64) license=(GPL LGPL) @@ -16,7 +16,7 @@ url="http://www.gnome.org" groups=(gnome) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz timeout.patch) -sha256sums=('38d90c5d5a33ec8a3002f1e77e201c1554eeb8bbba8923d94fab81b3a8e0696e' +sha256sums=('f620704e07e6bbf49aa6c65897475a46f80f7ac5593606f2b6889c7cb4f6a9cc' '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc') prepare() { diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index e35ebeaf5..b533e863d 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196102 2013-10-07 11:52:32Z jgc $ +# $Id: PKGBUILD 196328 2013-10-11 14:41:41Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.21 -pkgrel=2 +pkgver=2.24.22 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' @@ -12,16 +12,14 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz - gtkrc xid-collision-debug.patch gtkrc-fix.patch) -sha256sums=('302e9216dd19ec4b5b9e2f77275e23758253f7e86b06287284d8e794ef38dce3' + gtkrc xid-collision-debug.patch) +sha256sums=('b114b6e9fb389bf3aa8a6d09576538f58dce740779653084046852fb4140ae7f' 'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' - '4038c0f1ef4cc052e469858abe32eaa8afc8d4f540760f18ad132986e396604d') + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') prepare() { cd gtk+-$pkgver patch -Np1 -i ../xid-collision-debug.patch - patch -Np1 -i ../gtkrc-fix.patch } build() { diff --git a/extra/gtk2/gtkrc-fix.patch b/extra/gtk2/gtkrc-fix.patch deleted file mode 100644 index 09e350e98..000000000 --- a/extra/gtk2/gtkrc-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 1b8d3b9210c1d2201bb01a748d748f5d17e9eb4f Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Mon, 30 Sep 2013 16:50:34 +0000 -Subject: Actually look in /usr/share/gtk-2.0 for default rc files - -I managed to forget the 'share' component of the path. ---- -diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c -index b1f68e2..50b2563 100644 ---- a/gtk/gtkrc.c -+++ b/gtk/gtkrc.c -@@ -525,7 +525,7 @@ gtk_rc_add_initial_default_files (void) - const gchar * const *config_dirs; - const gchar *config_dir; - -- str = g_build_filename (GTK_DATA_PREFIX, "gtk-2.0", "gtkrc", NULL); -+ str = g_build_filename (GTK_DATA_PREFIX, "share", "gtk-2.0", "gtkrc", NULL); - gtk_rc_add_default_file (str); - g_free (str); - --- -cgit v0.9.2 diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index e18b144ef..fd2ff13e8 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 196103 2013-10-07 11:52:34Z jgc $ +# $Id: PKGBUILD 196329 2013-10-11 14:46:45Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gtk3 -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=(i686 x86_64) url="http://www.gtk.org/" @@ -17,7 +18,7 @@ options=('!libtool') license=(LGPL) source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz settings.ini) -sha256sums=('6559feb360cd935d341cd7a0b69a72f8f4346ed6ee9b7c4040c02b73b75c53fe' +sha256sums=('c12e6897fb1ec8d8f1a6de6cd0ac1372fee6fd63ee3a5a63813dc5f3473e6ab8' '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119') build() { diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD index 679789bef..46a64a402 100644 --- a/extra/gtkmm3/PKGBUILD +++ b/extra/gtkmm3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196104 2013-10-07 11:52:35Z jgc $ +# $Id: PKGBUILD 196332 2013-10-11 14:56:43Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=gtkmm3 _pkgbasename=gtkmm pkgname=('gtkmm3' 'gtkmm3-docs') -pkgver=3.9.16 +pkgver=3.10.0 pkgrel=1 arch=('i686' 'x86_64') makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt') @@ -12,7 +12,7 @@ license=('LGPL') options=('!libtool' '!emptydirs') url="http://www.gtkmm.org/" source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('3a07679530c0c58ddaf3b2bdc7859d8f7050a1057ae99e2d3857004e36e7c879') +sha256sums=('5e45fed4a7cff1baa72d1ef67e0d9883063d3a575cb53190e7ecf27047d241f8') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index 2dbafdc8c..ac3eb7fee 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193566 2013-08-24 08:12:15Z andyrtr $ +# $Id: PKGBUILD 196341 2013-10-11 16:33:42Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.4.9 +pkgver=4.4.10 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64') @@ -12,8 +12,9 @@ depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh') optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') -source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2 ) -md5sums=('f942d632d71b7bf35dca2e75a8432b83') +source=(http://lftp.yar.ru/ftp/${pkgname}-${pkgver}.tar.xz{,.asc}) +md5sums=('1b8d77f1a5a9cfe4e48e45636b775101' + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 1cf70e551..6fe19bbc7 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 192520 2013-08-13 12:39:35Z juergen $ +# $Id: PKGBUILD 196297 2013-10-11 08:53:38Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima pkgver=5.30.0 -pkgrel=3 +pkgrel=4 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64') license=('GPL') url="http://maxima.sourceforge.net" -depends=('sbcl=1.1.10' 'texinfo' 'sh') +depends=('sbcl=1.1.12' 'texinfo' 'sh') makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') # needs rebuild when bash changes version diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index fd11b12ec..e136d6d1c 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196155 2013-10-07 12:16:03Z jgc $ +# $Id: PKGBUILD 196312 2013-10-11 11:02:08Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -8,7 +8,7 @@ pkgname=networkmanager _pkgname=NetworkManager -pkgver=0.9.8.6 +pkgver=0.9.8.8 pkgrel=1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') @@ -28,7 +28,7 @@ install=networkmanager.install #source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz NetworkManager.conf disable_set_hostname.patch) -sha256sums=('2289800de66fd7f8c141e029923beb39f43952e442b3cb864e3bf73b26c0c369' +sha256sums=('8a0a3de9cd2897f778193aa5f04c8a6f6f87fe07f7a088aab26d2b35baa17a55' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') diff --git a/extra/php-xcache/PKGBUILD b/extra/php-xcache/PKGBUILD index a995f2197..22393296e 100644 --- a/extra/php-xcache/PKGBUILD +++ b/extra/php-xcache/PKGBUILD @@ -1,20 +1,18 @@ -# $Id: PKGBUILD 195126 2013-09-25 11:18:14Z pierre $ +# $Id: PKGBUILD 196293 2013-10-11 06:26:09Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=php-xcache -pkgver=3.1.0dev -_svnrev=1394 -pkgrel=14 +pkgver=3.1.0 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc='A PHP opcode cacher' url='http://xcache.lighttpd.net/' depends=('php') -makedepends=('subversion') license=('custom') -source=("xcache-${pkgver}::svn://svn.lighttpd.net/xcache/trunk/#revision=${_svnrev}" +source=("http://xcache.lighttpd.net/pub/Releases/${pkgver}/xcache-${pkgver}.tar.bz2" 'xcache.ini') backup=('etc/php/conf.d/xcache.ini') -md5sums=('SKIP' +md5sums=('e5816d47d52be200b959bf69a673ff74' '8fd9ce537ada9463c4b0c042243158c0') build() { diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index 8f0e8bb0c..3588b03fc 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186424 2013-05-26 09:25:57Z bluewind $ +# $Id: PKGBUILD 196303 2013-10-11 09:53:41Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=postgresql-old-upgrade -pkgver=9.1.9 +pkgver=9.2.5 _majorver=${pkgver%.*} -pkgrel=2 +pkgrel=1 pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade" arch=('i686' 'x86_64') url="http://www.postgresql.org/" @@ -47,5 +47,5 @@ package() { rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/" } -md5sums=('6b5ea53dde48fcd79acfc8c196b83535') -sha256sums=('28a533e181009308722e8b3c51f1ea7224ab910c380ac1a86f07118667602dd8') +md5sums=('e8438e0ed5e6371741be7697886e7340') +sha256sums=('22c1edfd6a404bb15fba655863e94f09a10716ded1910a8bc98ee85f413007a4') diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index da4a4c307..76e87a8d7 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186423 2013-05-26 09:25:56Z bluewind $ +# $Id: PKGBUILD 196301 2013-10-11 09:52:27Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.2.4 +pkgver=9.3.1 _majorver=${pkgver%.*} -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.postgresql.org/" license=('custom:PostgreSQL') @@ -14,20 +14,20 @@ source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar postgresql-run-socket.patch postgresql.pam postgresql.logrotate postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir) -md5sums=('6ee5bb53b97da7c6ad9cb0825d3300dd' +md5sums=('c003d871f712d4d3895956b028a96e74' '75c579eed03ffb2312631f0b649175b4' '96f82c38f3f540b53f3e5144900acf17' 'd28e443f9f65a5712c52018b84e27137' '89b48774b0dae7c37fbb0e907c3c1db8' '1c5a1f99e8e93776c593c468e2612985' - '505e0e4abfc746cae9558584d471a03c') -sha256sums=('d97dd918a88a4449225998f46aafa85216a3f89163a3411830d6890507ffae93' + 'ea7f9f914900e60835d20cb95010e63c') +sha256sums=('8ea4a7a92a6f5a79359b02e683ace335c5eb45dffe7f8a681a9ce82470a8a0b8' '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9' '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' 'c69b614731fdd3f4e127540814f5999f423363523c5209e252e19b1d4362ad68' '7e086d70e0dcaa6ce45693b4e826ce92d770192b3aff5642319b1ef279d88dc4' - '3a3279d290f556bf7a362670e32b491794f47ed218f6b8c6acef366a3291f669') + 'b3ed31e5882e5bdf4515d488d3f2db874ff5561be3091eab29810f831038a888') build() { cd "${srcdir}/postgresql-${pkgver}" @@ -64,11 +64,14 @@ package_postgresql-libs() { install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE" # install libs - for dir in src/interfaces src/bin/pg_config src/bin/psql; do + for dir in src/interfaces src/bin/pg_config src/bin/psql src/bin/pg_dump; do make -C ${dir} DESTDIR="${pkgdir}" install done install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1" + install -D -m644 doc/src/sgml/man1/pg_dump.1 "${pkgdir}/usr/share/man/man1/pg_dump.1" + install -D -m644 doc/src/sgml/man1/pg_dumpall.1 "${pkgdir}/usr/share/man/man1/pg_dumpall.1" + install -D -m644 doc/src/sgml/man1/pg_restore.1 "${pkgdir}/usr/share/man/man1/pg_restore.1" install -D -m644 doc/src/sgml/man1/psql.1 "${pkgdir}/usr/share/man/man1/psql.1" cd src/include @@ -78,6 +81,7 @@ package_postgresql-libs() { # these headers are needed by the public headers of the interfaces install -m644 pg_config.h "${pkgdir}/usr/include/" install -m644 pg_config_os.h "${pkgdir}/usr/include/" + install -m644 pg_config_ext.h "${pkgdir}/usr/include/" install -m644 postgres_ext.h "${pkgdir}/usr/include/" install -m644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/" install -m644 pg_config_manual.h "${pkgdir}/usr/include/" @@ -108,7 +112,7 @@ package_postgresql-docs() { package_postgresql() { pkgdesc="A sophisticated object-relational DBMS" - backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql') + backup=('etc/pam.d/postgresql' 'etc/logrotate.d/postgresql') depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0') optdepends=('python2: for PL/Python support' 'perl: for PL/Perl support' @@ -124,10 +128,13 @@ package_postgresql() { make -C doc/src/sgml DESTDIR="${pkgdir}" install-man # we don't want these, they are in the -libs package - for dir in src/interfaces src/bin/pg_config src/bin/psql; do + for dir in src/interfaces src/bin/pg_config src/bin/psql src/bin/pg_dump; do make -C ${dir} DESTDIR="${pkgdir}" uninstall done rm "${pkgdir}/usr/share/man/man1/pg_config.1" + rm "${pkgdir}/usr/share/man/man1/pg_dump.1" + rm "${pkgdir}/usr/share/man/man1/pg_dumpall.1" + rm "${pkgdir}/usr/share/man/man1/pg_restore.1" rm "${pkgdir}/usr/share/man/man1/psql.1" # install license diff --git a/extra/postgresql/postgresql-check-db-dir b/extra/postgresql/postgresql-check-db-dir index 542c82209..e563d114c 100755 --- a/extra/postgresql/postgresql-check-db-dir +++ b/extra/postgresql/postgresql-check-db-dir @@ -16,9 +16,9 @@ then fi # PGMAJORVERSION is major version -PGMAJORVERSION=9.2 +PGMAJORVERSION=9.3 # PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades -PREVMAJORVERSION=9.1 +PREVMAJORVERSION=9.2 # Check for the PGDATA structure if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ] @@ -35,7 +35,7 @@ then else echo $"An old version of the database format was found." echo $"You need to dump and reload before using PostgreSQL $PGMAJORVERSION." - echo $"See http://www.postgresql.org/docs/9.2/static/upgrading.html" + echo $"See http://www.postgresql.org/docs/$PGMAJORVERSION/static/upgrading.html" exit 1 fi else diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index a01ad7671..725ef5738 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 192518 2013-08-13 12:04:18Z juergen $ +# $Id: PKGBUILD 196298 2013-10-11 08:53:55Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.1.10 +pkgver=1.1.12 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -16,30 +16,13 @@ provides=('common-lisp' 'cl-asdf') makedepends=('sbcl') install=sbcl.install source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" - "arch-fixes.lisp" - "ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-4.13a.tar.gz" - "texinfo-4.13a-data_types.patch") -md5sums=('ccec396f1bef6468be1f18bcc60231fe' - '7ac0c1936547f4278198b8bf7725204d' - '71ba711519209b5fb583fed2b3d86fcb' - 'd8574782ff7def1e2dc5c291dbeaec18') - - -# Temporary Texinfo legacy build -# See: http://sourceforge.net/mailarchive/message.php?msg_id=30747919 - -build-texinfo-legacy() { - cd ${srcdir}/texinfo-4.13 - patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch - mkdir -p $srcdir/texinfo-instroot - ./configure --prefix=$srcdir/texinfo-instroot - make install -} + "arch-fixes.lisp") +md5sums=('817e0606e4615e758c0bf3d381197711' + '7ac0c1936547f4278198b8bf7725204d') -build() { - build-texinfo-legacy - export PATH=$srcdir/texinfo-instroot/bin:$PATH + +build() { cd "$srcdir/$pkgname-$pkgver" export CFLAGS+=" -D_GNU_SOURCE -fno-omit-frame-pointer -DSBCL_HOME=/usr/lib/sbcl" diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD index 94ad1cf44..3d2f80c41 100644 --- a/extra/v4l-utils/PKGBUILD +++ b/extra/v4l-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187074 2013-06-03 11:16:59Z allan $ +# $Id: PKGBUILD 196345 2013-10-11 18:25:19Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils -pkgver=0.9.5 -pkgrel=2 +pkgver=1.0.0 +pkgrel=1 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64') url="http://freshmeat.net/projects/libv4l" @@ -16,7 +16,7 @@ optdepends=('qt4') depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo') source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2 http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc) -sha256sums=('6c9f1be981d5763069e0969ebe426c39da5a7d738865367e390e3b486f1b502c' +sha256sums=('1de3882099e04e89e354675ee408b82c8ac8afd3ca6ab27ea321771901285f30' 'SKIP') options=(!libtool) diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD index 05ae4ae53..5815b82d2 100644 --- a/extra/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 193712 2013-08-28 20:08:20Z lcarlier $ +# $Id: PKGBUILD 196331 2013-10-11 14:56:14Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=wayland -pkgver=1.2.1 +pkgver=1.3.0 pkgrel=1 pkgdesc='A computer display server protocol' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('libffi' 'expat') makedepends=('doxygen') options=(!libtool) source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('2214b690cb5a4f9695d287f27730c4368e6ef829') +sha1sums=('febbbfc8d76ed0b2157077d50cb6e5ceb1aa47de') build() { cd $pkgname-$pkgver diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index f1eab5401..ce9cfa040 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98047 2013-10-04 15:29:48Z jelle $ +# $Id: PKGBUILD 98485 2013-10-11 18:19:46Z jelle $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,8 +9,8 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.5 -pkgrel=2 +pkgver=1.6 +pkgrel=1 pkgdesc="Ebook management application, with unar support" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" @@ -27,13 +27,14 @@ replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver install=calibre.install -source=('http://download.calibre-ebook.com/1.5.0/calibre-1.5.0.tar.xz' +source=('http://download.calibre-ebook.com/1.6.0/calibre-1.6.0.tar.xz' 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('adb8543044f81f93d6faef372710bcb5' +md5sums=('d4fc03a2bec211324897cbb916c6eb89' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') + prepare(){ cd "${srcdir}/${_pkgname}" #rm -rf src/{cherrypy,pyPdf} diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 2d081f8e3..52019ab59 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97769 2013-09-29 14:35:16Z fyan $ +# $Id: PKGBUILD 98455 2013-10-11 07:59:42Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: monson <holymonson@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ _pkgname=cgminer pkgname=cgminer-libre -pkgver=3.5.0 +pkgver=3.5.1 pkgrel=1 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' @@ -54,6 +54,8 @@ build() { --enable-modminer \ --enable-ztex \ --enable-avalon \ + --enable-klondike \ + --enable-bitfury \ --disable-adl # For license issues make @@ -73,6 +75,6 @@ package() { install -Dm644 $_pkgname.conf "$pkgdir"/etc/$_pkgname.conf } -sha512sums=('21dbf036012e331676e6dfd85501f04f10e1f0ae7f4fce3bffd3ffe4ccd8c9544b0166f0024cba00177edbe6b70c4d02803ca05af33a2612a5be7bb5a8ec11fc' +sha512sums=('c8fe532b1086e3f2beb69b7f5e75e8ad9aab137c0db1a920de8e222ea2a4bf62ef608bec4b85cdf0f76162c53e5999677e326bb0b567abe26dd14eca52e28bdf' '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41' '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f') |