This commit is contained in:
moonman 2013-05-23 04:24:17 -06:00
commit 46e4cb1163
53 changed files with 1097 additions and 415 deletions

View file

@ -1,17 +1,15 @@
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Lothar Gesslein <ulmen@cryptomilch.de>
plugrel=1
pkgname=aoetools
pkgver=32
pkgver=35
pkgrel=1
pkgdesc="ATA over Ethernet Tools"
arch=('i686' 'x86_64')
url="http://aoetools.sourceforge.net/"
license=('GPL')
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
md5sums=('62c8b5664d413019d0008f27ab5dc4d1')
sha256sums=('837684fd8c5ccd15ce82d8e01e5e68e59b3045df200d5d68dc09f458baf33c7c')
build() {
cd ${srcdir}/$pkgname-$pkgver

View file

@ -2,34 +2,33 @@
# Previous Maintainer: Valère Monseur <valere dot monseur at ymail dot com>
pkgname=compton-git
pkgver=290.dfd4dd1
pkgver() {
cd $srcdir/compton
echo $(git rev-list --count master).$(git rev-parse --short master)
}
epoch=1
_gitname=compton
pkgver=2013.04.21.g85e7d18
pkgrel=1
pkgdesc="X Compositor (a fork of xcompmgr-dana)"
arch=(i686 x86_64)
url="https://github.com/chjj/compton"
license=('MIT')
depends=('libx11' 'libxcomposite' 'libxdamage' 'libxfixes' 'libxext' 'libxrender' 'libxrandr' 'xproto' 'bash' 'xorg-xprop' 'xorg-xwininfo' 'pcre' 'libconfig')
makedepends=('git' 'make' 'pkg-config' 'asciidoc' 'libgl')
source=("compton::git://github.com/chjj/compton.git")
_gitname="compton"
depends=('libgl' 'dbus' 'libxcomposite' 'libxdamage' 'libxrandr' 'pcre' 'libconfig')
makedepends=('git' 'asciidoc')
source=("git://github.com/chjj/compton.git")
md5sums=("SKIP")
pkgver() {
cd "${srcdir}/${_gitname}"
git log -1 --format="%cd.g%h" --date=short | sed 's/-/./g'
}
build() {
cd "$_gitname"
make
cd "$srcdir/$_gitname"
make PREFIX=/usr
make docs
}
package() {
cd "$_gitname"
cd "$srcdir/$_gitname"
make DESTDIR="$pkgdir" PREFIX=/usr install
make PREFIX="$pkgdir/usr" install
# install license
install -D -m644 "LICENSE" "$pkgdir/usr/share/licenses/$_gitname/LICENSE"
@ -37,4 +36,3 @@ package() {
# example conf
install -D -m644 "compton.sample.conf" "$pkgdir/etc/xdg/compton.conf.example"
}
md5sums=('SKIP')

View file

@ -1,37 +1,27 @@
# Maintainer: Ben Ruijl <benruyl at gmail>
pkgname=couchpotato-git
pkgver=1796.0eff4f0
pkgver() {
cd "$srcdir/$pkgname"
echo $(git rev-list --count master).$(git rev-parse --short master)
}
epoch=1
_gitname=CouchPotatoServer
pkgver=f1dde5c
pkgrel=1
pkgdesc="Automatic Movie Downloading via NZBs & Torrent"
arch=('i686' 'x86_64')
arch=('any')
url="http://couchpota.to/"
license=('unknown')
license=('GPL3')
depends=('python2')
makedepends=('git')
install='couchpotato.install'
backup=('etc/conf.d/couchpotato' 'etc/conf.d/couchpotato_systemd')
source=('couchpotato' 'couchpotato.init' 'couchpotato.conf' 'couchpotato_systemd.conf' 'couchpotato.service' "$pkgname::git://github.com/RuudBurger/CouchPotatoServer.git")
md5sums=('a7db842a8af532847ef41890f6714819'
'a7711d04d2db7de96f067e484c29f709'
'2c3c045ae9c5f5bf4bc0972917c19071'
'c22c7a797415131baf0fbe092132abda'
'bdedef6bcb8d04c534bd094047885fa7'
'SKIP')
source=('git://github.com/RuudBurger/CouchPotatoServer.git' 'couchpotato.service')
md5sums=('SKIP' '82813cd00a17dd78f10756d71c7eb848')
pkgver() {
cd $_gitname
git describe --always | sed 's|-|.|g'
}
package() {
install -d "${pkgdir}/opt/"
cp -dpr --no-preserv=ownership "$srcdir/$pkgname" "${pkgdir}/opt/couchpotato"
mkdir -p "${pkgdir}/opt/"
cp -r "$srcdir/$_gitname" "${pkgdir}/opt/couchpotato"
install -D -m755 "${srcdir}/couchpotato" "${pkgdir}/usr/bin/couchpotato"
install -D -m755 "${srcdir}/couchpotato.init" "${pkgdir}/etc/rc.d/couchpotato"
install -D -m644 "${srcdir}/couchpotato.conf" "${pkgdir}/etc/conf.d/couchpotato"
install -D -m644 "${srcdir}/couchpotato_systemd.conf" "${pkgdir}/etc/conf.d/couchpotato_systemd"
install -D -m644 "${srcdir}/couchpotato.service" "${pkgdir}/usr/lib/systemd/system/couchpotato.service"
install -Dm644 "${srcdir}/couchpotato.service" "${pkgdir}/usr/lib/systemd/system/couchpotato.service"
}

View file

@ -1,18 +1,22 @@
CP_USER="couchpotato"
CP_GROUP="couchpotato"
CP_DIR="/opt/couchpotato"
## arg 1: the new package version
post_install() {
groupadd couchpotato &> /dev/null
useradd -g couchpotato -d /opt/couchpotato -s /bin/false couchpotato &> /dev/null
chown -R couchpotato:couchpotato /opt/couchpotato
echo " >> If you change CouchPotato's port in the general configuration page, you will need to edit /etc/conf.d/couchpotato (or /etc/conf.d/couchpotato_systemd) to have it point to the new port number"
groupadd ${CP_GROUP} &> /dev/null
useradd -g ${CP_GROUP} -d ${CP_DIR} -s /bin/false ${CP_USER} &> /dev/null
chown -R ${CP_USER}:${CP_GROUP} ${CP_DIR}
echo " >> If you want a custom user or path for CouchPotato, remember to edit the service file as well."
}
## arg 1: the new package version
## arg 2: the old package version
post_upgrade() {
chown -R couchpotato:couchpotato /opt/couchpotato
chown -R ${CP_USER}:${CP_GROUP} ${CP_DIR}
}
## arg 1: the old package version
post_remove() {
userdel couchpotato &> /dev/null
groupdel sabnzbd &> /dev/null || /bin/true
userdel ${CP_USER} &> /dev/null
groupdel ${CP_GROUP} &> /dev/null || /bin/true
}

View file

@ -2,8 +2,7 @@
Description=An automatic NZB and torrent movie downloader
[Service]
EnvironmentFile=/etc/conf.d/couchpotato_systemd
ExecStart=/usr/bin/python2 /opt/couchpotato/CouchPotato.py $CP_OPTS
ExecStart=/usr/bin/python2 /opt/couchpotato/CouchPotato.py --config_file /opt/couchpotato/config.ini --data_dir /opt/couchpotato/data --daemon --quiet
GuessMainPID=no
Type=forking
User=couchpotato

View file

@ -2,7 +2,7 @@
pkgname=reaver-wps-svn
pkgver=113
pkgrel=1
pkgrel=2
pkgdesc="Brute force attack against Wifi Protected Setup (WPS) registrar PINs in order to recover WPA/WPA2 passphrases"
arch=('i686' 'x86_64' 'mips64el')
url="http://code.google.com/p/reaver-wps/"
@ -11,35 +11,23 @@ depends=('libpcap' 'sqlite')
makedepends=('subversion')
provides=('reaver-wps')
conflicts=('reaver-wps')
source=('svn+http://reaver-wps.googlecode.com/svn/trunk/')
sha512sums=('SKIP')
_svntrunk='http://reaver-wps.googlecode.com/svn/trunk/'
_svnmod='reaver-wps'
pkgver() {
cd "${SRCDEST}/trunk/"
svnversion
}
build() {
cd "${srcdir}"
msg "Connecting to SVN server...."
cd "${srcdir}/trunk/src/"
if [[ -d "${_svnmod}/.svn" ]]; then
(cd "${_svnmod}" && svn up -r "${pkgver}")
else
svn co "${_svntrunk}" --config-dir ./ -r "${pkgver}" "${_svnmod}"
fi
msg "SVN checkout done or server timeout"
msg "Starting build..."
rm -rf "${srcdir}/${_svnmod}-build"
cp -r "${srcdir}/${_svnmod}" "${srcdir}/${_svnmod}-build"
cd "${srcdir}/${_svnmod}-build"
cd 'src'
./configure --prefix=/usr
./configure --prefix=/usr --sysconfdir=/etc
make
}
package() {
cd "${srcdir}/${_svnmod}-build"
cd "${srcdir}/trunk/"
pushd src
install -dm755 "${pkgdir}/usr/bin/"
install -m755 reaver "${pkgdir}/usr/bin/"

View file

@ -4,7 +4,7 @@
pkgname=tt-rss
_realname=Tiny-Tiny-RSS
pkgver=1.7.8
pkgver=1.7.9
pkgrel=1
pkgdesc="Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible."
arch=('any')
@ -16,7 +16,7 @@ backup=()
install=tt-rss.install
source=(https://github.com/gothfox/Tiny-Tiny-RSS/archive/${pkgver}.tar.gz tt-rss-updated.rc tt-rss-updated.service)
md5sums=('efd7eec1629db379896fb7e74bba400e'
md5sums=('d4980f9646cf588ada3956ca9ffba754'
'd4dbb037f2392eb9f4a91c6ae96863cc'
'd3ba69d6f0d0a6bce7fab7f235d6afdf')

View file

@ -0,0 +1,37 @@
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Dumitru Ursu <dima@ceata.org>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - turn off using sse, x86 only
pkgname=opencolorio
pkgver=1.0.8
pkgrel=1
pkgdesc="A color management framework for visual effects and animation"
arch=('i686' 'x86_64')
url="http://opencolorio.org"
license=('BSD')
depends=('python')
makedepends=('cmake')
source=(http://github.com/imageworks/OpenColorIO/tarball/v$pkgver)
sha1sums=('9b9bac9ed85c84f53775686eb72f3d612b148fef')
build()
{
mv imageworks-OpenColorIO-* $pkgname-$pkgver
cd $pkgname-$pkgver
cmake -DCMAKE_INSTALL_PREFIX=/usr -DOCIO_USE_SSE=off .
make
}
package()
{
cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
}
# vim:set ts=2 sw=2 et:

View file

@ -0,0 +1,52 @@
# $Id: PKGBUILD 90071 2013-05-06 19:38:49Z foutrelis $
# Contributor: SpepS <dreamspepser at yahoo dot it>
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - removed intel-tbb from deps, set -DUSE_TBB=0
# - patch to block out x86 asm (https://github.com/OpenImageIO/oiio/pull/546)
pkgname=openimageio
pkgver=1.1.10
pkgrel=2
pkgdesc="A library for reading and writing images, including classes, utilities, and applications"
arch=(i686 x86_64)
url="http://www.openimageio.org/"
license=('custom')
depends=('openexr' 'boost-libs' 'jasper' 'glew' 'libtiff' 'opencolorio')
makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa')
optdepends=('qt4: iv image viewer'
'python2: bindings support')
source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver
arm.patch)
md5sums=('e5c5cd77238f74c3a6a3610c211430f2'
'7cf2d71031c5f970edf481f55a594ecc')
build() {
cd "$srcdir"/$_pkgname*
patch -p1 -i "$srcdir"/arm.patch
cd src
[[ -d build ]] && rm -r build
mkdir build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DPYLIB_INSTALL_DIR=lib/python2.7/site-packages \
-DUSE_EXTERNAL_TBB=ON \
-DUSE_TBB=0 \
..
make
}
package() {
cd "$srcdir"/$_pkgname*/src/build
make DESTDIR="$pkgdir" install
# license
cd ../..
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}

View file

@ -0,0 +1,28 @@
diff -urN a/src/include/thread.h b/src/include/thread.h
--- a/src/include/thread.h 2013-04-12 21:30:27.000000000 -0500
+++ b/src/include/thread.h 2013-05-21 15:15:04.021631910 -0500
@@ -338,7 +338,11 @@
__TBB_Pause(delay);
#elif defined(__GNUC__)
for (int i = 0; i < delay; ++i) {
+#if defined __arm__
+ __asm__ __volatile__("NOP;");
+#else
__asm__ __volatile__("pause;");
+#endif
}
#elif defined(_MSC_VER)
for (int i = 0; i < delay; ++i) {
@@ -453,7 +457,12 @@
// Disallow copy construction by making private and unimplemented.
atomic (atomic const &);
+
+#if defined __arm__
+} __attribute__((aligned(8)));
+#else
};
+#endif
#endif /* ! USE_TBB */

View file

@ -0,0 +1,13 @@
--- orig/src/libutil/SHA1.cpp 2012-11-17 01:02:42.000000000 +0200
+++ fixed/src/libutil/SHA1.cpp 2012-12-14 14:37:37.552042793 +0200
@@ -8,9 +8,9 @@
// If compiling with MFC, you might want to add #include "StdAfx.h"
+#include "SHA1.h"
#include "hash.h"
#include "dassert.h"
-#include "SHA1.h"
#ifdef SHA1_UTILITY_FUNCTIONS
#define SHA1_MAX_FILE_BUFFER 8000

View file

@ -0,0 +1,48 @@
# $Id: PKGBUILD 88615 2013-04-20 16:45:08Z heftig $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - removed intel-tbb from deps, set -DUSE_TBB=0
pkgname=openshadinglanguage
pkgver=1.3.0
pkgrel=4
pkgdesc="Advanced shading language for production GI renderers"
arch=(i686 x86_64)
url="http://code.google.com/p/openshadinglanguage/"
license=('custom')
depends=('boost-libs' 'openimageio' 'openexr' 'llvm' 'freetype2' 'libpng' 'libtiff')
makedepends=('boost' 'cmake' 'clang')
source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz)
md5sums=('1e8c47475cb092cec0aada843b2893ed')
build() {
cd OpenShadingLanguage-Release-$pkgver/src
[[ -d build ]] && rm -r build
mkdir build && cd build
# TODO: Remove LLVM_STATIC with llvm 3.3 when we'll have shared libs
# Check blender for crash with llvm pipe (run LIBGL_ALWAYS_SOFTWARE=1 blender)
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLLVM_STATIC=ON \
-DUSE_TBB=0 \
..
make
}
package() {
cd OpenShadingLanguage-Release-$pkgver/src/build
make DESTDIR="$pkgdir/" install
mkdir -p "$pkgdir"/usr/share/OSL/
mkdir -p "$pkgdir"/usr/share/licenses/$pkgname
mv "$pkgdir"/usr/LICENSE "$pkgdir"/usr/share/licenses/$pkgname # TODO: Tell upstream about this shit
mv "$pkgdir"/usr/{CHANGES,README.md,INSTALL} "$pkgdir"/usr/share/OSL/
mv "$pkgdir"/usr/doc "$pkgdir"/usr/share/OSL/doc
mv "$pkgdir"/usr/shaders "$pkgdir"/usr/share/OSL/shaders
}
# vim:set ts=2 sw=2 et:

View file

@ -0,0 +1,71 @@
commit c391ceb1936459b70147d6f8ac389ded26a7e028
Author: Sven-Hendrik Haase <sh@lutzhaase.com>
Date: Fri Dec 28 09:00:33 2012 +0100
Fix for LLVM 3.2
diff --git a/src/liboslexec/llvm_headers.h b/src/liboslexec/llvm_headers.h
index 41a7a11..5ff4384 100644
--- a/src/liboslexec/llvm_headers.h
+++ b/src/liboslexec/llvm_headers.h
@@ -45,10 +45,18 @@ namespace llvm = LLVM_NAMESPACE;
#include <llvm/LLVMContext.h>
#include <llvm/Module.h>
#include <llvm/PassManager.h>
+#if OSL_LLVM_VERSION >= 32
+#include <llvm/IRBuilder.h>
+#else
#include <llvm/Support/IRBuilder.h>
+#endif
#include <llvm/Support/ManagedStatic.h>
#include <llvm/Support/MemoryBuffer.h>
#include <llvm/Support/raw_ostream.h>
+#if OSL_LLVM_VERSION >= 32
+#include <llvm/DataLayout.h>
+#else
#include <llvm/Target/TargetData.h>
+#endif
#endif /* OSL_LLVM_HEADERS_H */
diff --git a/src/liboslexec/llvm_instance.cpp b/src/liboslexec/llvm_instance.cpp
index 8709c8b..3e42557 100644
--- a/src/liboslexec/llvm_instance.cpp
+++ b/src/liboslexec/llvm_instance.cpp
@@ -1273,13 +1273,21 @@ RuntimeOptimizer::llvm_setup_optimization_passes ()
//
m_llvm_func_passes = new llvm::FunctionPassManager(llvm_module());
llvm::FunctionPassManager &fpm (*m_llvm_func_passes);
+#if OSL_LLVM_VERSION >= 32
+ fpm.add (new llvm::DataLayout(llvm_module()));
+#else
fpm.add (new llvm::TargetData(llvm_module()));
+#endif
// Specify module-wide (interprocedural optimization) passes
//
m_llvm_passes = new llvm::PassManager;
llvm::PassManager &passes (*m_llvm_passes);
+#if OSL_LLVM_VERSION >= 32
+ passes.add (new llvm::DataLayout(llvm_module()));
+#else
passes.add (new llvm::TargetData(llvm_module()));
+#endif
if (shadingsys().llvm_optimize() >= 1 && shadingsys().llvm_optimize() <= 3) {
// For LLVM 3.0 and higher, llvm_optimize 1-3 means to use the
diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
index 135da2e..4e0eefe 100644
--- a/src/liboslexec/llvm_util.cpp
+++ b/src/liboslexec/llvm_util.cpp
@@ -42,7 +42,11 @@ namespace pvt {
llvm::Type *
RuntimeOptimizer::llvm_type_union(const std::vector<llvm::Type *> &types)
{
+#if OSL_LLVM_VERSION >= 32
+ llvm::DataLayout target(llvm_module());
+#else
llvm::TargetData target(llvm_module());
+#endif
size_t max_size = 0;
size_t max_align = 1;
for (size_t i = 0; i < types.size(); ++i) {

View file

@ -0,0 +1,61 @@
# $Id: PKGBUILD 91302 2013-05-20 23:13:17Z bgyorgy $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Gilles Gagniard <gilles@gagniard.org>
# Contributor: JD Steffen <jd at steffennet dot org>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - get rid of a bad gcc flag in Makefile
pkgname=simutrans
pkgver=112.3
_pkgver=112-3
pkgrel=1
pkgdesc="An open source transportation simulation game"
arch=('i686' 'x86_64')
url="http://simutrans.com/"
license=('PerlArtistic')
depends=('gcc-libs' 'zlib' 'sdl_mixer' 'bzip2' 'simutrans-pak64')
makedepends=('imagemagick')
optdepends=('timidity++: play MIDI music')
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-src-$_pkgver.zip
http://downloads.sourceforge.net/$pkgname/simulinux-$_pkgver.zip
settings-folder.patch
path-for-game-data.patch
config.patch
simutrans.desktop)
md5sums=('4963f0ad0da5f622f67b7c1fb888a264'
'8e09f450173110fec097497c7198e50c'
'c87d9a9910bc371df5d50f7f1ec298bb'
'4648680290b44775b9c47d3758d3bd6c'
'd11bc8ee33a34e33341f6ccd90a44dba'
'f41f7a08ad517ef2b60412859eb49963')
build() {
cd "$srcdir"
cp config.template config.default
patch -Np0 -i "$srcdir/settings-folder.patch"
patch -Np1 -i "$srcdir/path-for-game-data.patch"
patch -Np0 -i "$srcdir/config.patch"
convert simutrans.ico -alpha on simutrans.png
sed -i 's/-minline-all-stringops/-O3/' Makefile
make
}
package() {
cd "$srcdir"
#binary
install -Dm755 build/default/sim "$pkgdir/usr/bin/simutrans"
#data
mkdir -p "$pkgdir/usr/share/games/$pkgname"
cp -r "$pkgname"/{config,font,music,script,skin,text} "$pkgdir/usr/share/games/$pkgname"
#desktop file and icon
install -Dm644 simutrans.png "$pkgdir/usr/share/pixmaps/simutrans.png"
install -Dm644 simutrans.desktop "$pkgdir/usr/share/applications/simutrans.desktop"
}

View file

@ -0,0 +1,52 @@
--- config.default.orig 2011-11-10 21:48:01.000000000 +0100
+++ config.default 2011-11-10 21:51:58.383221979 +0100
@@ -6,23 +6,23 @@
#BACKEND = allegro
#BACKEND = gdi
#BACKEND = sdl
-#BACKEND = mixer_sdl
+BACKEND = mixer_sdl
#BACKEND = posix
#COLOUR_DEPTH = 0
-#COLOUR_DEPTH = 16
+COLOUR_DEPTH = 16
#OSTYPE = amiga
#OSTYPE = beos
#OSTYPE = cygwin
#OSTYPE = freebsd
#OSTYPE = haiku
-#OSTYPE = linux
+OSTYPE = linux
#OSTYPE = mingw
#OSTYPE = mac
#DEBUG = 3 # Level 1-3, higher number means more debug-friendly, see Makefile
-#OPTIMISE = 1 # Add umpteen optimisation flags
+OPTIMISE = 1 # Add umpteen optimisation flags
#PROFILE = 1 # Enable profiling
#PROFILE = 2 # Enable profiling with optimisation flags, can be used with `OPTIMISE = 1'
@@ -34,9 +34,9 @@
# Define these as empty strings, if you don't have the respective config program
#ALLEGRO_CONFIG = allegro-config
#PNG_CONFIG = pkg-config libpng
-#SDL_CONFIG = sdl-config
+SDL_CONFIG = sdl-config
-#VERBOSE = 1
+VERBOSE = 1
# The following useful conditional compilation flags exist
#
@@ -65,6 +65,9 @@
#
# In order to use the flags, add a line like this: (-Dxxx)
# FLAGS = -DUSE_C
+ifeq ($(shell uname -m),x86_64)
+ FLAGS += -DUSE_C
+endif
# Output directories:
#

View file

@ -0,0 +1,18 @@
look in /usr/share/games/simutrans for game data
@DPATCH@
--- simutrans.orig/simmain.cc
+++ simutrans/simmain.cc
@@ -437,8 +437,9 @@
strcat( umgebung_t::program_dir, path_sep );
}
else {
- strcpy( umgebung_t::program_dir, argv[0] );
- *(strrchr( umgebung_t::program_dir, path_sep[0] )+1) = 0;
+ // strcpy( umgebung_t::program_dir, argv[0] );
+ // *(strrchr( umgebung_t::program_dir, path_sep[0] )+1) = 0;
+ strcpy(umgebung_t::program_dir, "/usr/share/games/simutrans/");
chdir( umgebung_t::program_dir );
}

View file

@ -0,0 +1,12 @@
--- simsys.cc.orig 2011-10-28 20:32:25.000000000 +0200
+++ simsys.cc 2011-11-10 23:09:10.380031846 +0100
@@ -47,7 +47,7 @@
#elif defined __APPLE__
sprintf(buffer, "%s/Library/Simutrans", getenv("HOME"));
#else
- sprintf(buffer, "%s/simutrans", getenv("HOME"));
+ sprintf(buffer, "%s/.simutrans", getenv("HOME"));
#endif
dr_mkdir(buffer);

View file

@ -0,0 +1,9 @@
[Desktop Entry]
Name=Simutrans
Comment=Transportation simulator
Exec=simutrans
Icon=simutrans
Terminal=false
Type=Application
Categories=Game;Simulation;

View file

@ -9,7 +9,7 @@ pkgname=('linux-kirkwood' 'linux-headers-kirkwood')
_kernelname=${pkgname#linux}
_basekernel=3.9.3
pkgver=${_basekernel}
pkgrel=1
pkgrel=2
cryptover=1.6
bfqver=v6r1
arch=('arm')
@ -28,7 +28,8 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2
'aufs3-3.9.patch.xz'
"http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-$(echo $_basekernel | cut -c 1-3).patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-3).patch")
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-3).patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-$(echo $_basekernel |cut -c 1-3).0.patch")
md5sums=('7b4ec4367917d9f3dfbcf5545533b546'
'a47687b9b52ec74bf833851b918fa8b5'
@ -41,7 +42,8 @@ md5sums=('7b4ec4367917d9f3dfbcf5545533b546'
'30ed1ba9b6c391e371d022fbcf79f7ed'
'eade38998313c25fd7934719cdf8a2ea'
'62dff7101a1381d33faf2e1f101ba684'
'2c719719165dccf5fc52705e59797d26')
'2c719719165dccf5fc52705e59797d26'
'9ed2a747850739647673d019af378e1a')
build() {
cd "${srcdir}/linux-${_basekernel}"
@ -66,7 +68,8 @@ msg2 "Add AUFS3 patches"
msg2 "Add BFQ patches"
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-$(echo $_basekernel | cut -c 1-3).patch"
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-3).patch"
patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-$(echo $_basekernel |cut -c 1-3).0.patch"
# add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git

View file

@ -22,9 +22,9 @@ source=('config'
'args-uncompressed.txt'
'boot-uncompressed.txt'
'imagetool-uncompressed.py'
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-$(echo $_basekernel | cut -c 1-3).patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-3).patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-$(echo $_basekernel |cut -c 1-3).0.patch")
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${_basekernel}.patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${_basekernel}.patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${_basekernel}.0.patch")
md5sums=('ab8ba3443399f12cb76bac844f87af9b'
'9d3c56a4b999c8bfbd4018089a62f662'
@ -50,9 +50,9 @@ msg "Patches:"
patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
msg2 "Add BFQ patches"
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-$(echo $_basekernel | cut -c 1-3).patch"
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-3).patch"
patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-$(echo $_basekernel |cut -c 1-3).0.patch"
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${_basekernel}.patch"
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${_basekernel}.patch"
patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${_basekernel}.0.patch"
# add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git

View file

@ -1,122 +0,0 @@
diff -urN linux-3.1-rc4-a/arch/arm/include/asm/dma-mapping.h linux-3.1-rc4-b/arch/arm/include/asm/dma-mapping.h
--- linux-3.1-rc4-a/arch/arm/include/asm/dma-mapping.h 2011-08-29 05:16:01.000000000 +0100
+++ linux-3.1-rc4-b/arch/arm/include/asm/dma-mapping.h 2011-09-02 12:09:00.000000000 +0100
@@ -205,6 +205,15 @@
int dma_mmap_writecombine(struct device *, struct vm_area_struct *,
void *, dma_addr_t, size_t);
+#ifdef CONFIG_ARM_DMA_MEM_BUFFERABLE
+#define ARCH_HAS_DMA_COHERENT_WRITE_SYNC
+
+static inline void dma_coherent_write_sync(void)
+{
+ dsb();
+ outer_sync();
+}
+#endif
#ifdef CONFIG_DMABOUNCE
/*
diff -urN linux-3.1-rc4-a/Documentation/DMA-API-HOWTO.txt linux-3.1-rc4-b/Documentation/DMA-API-HOWTO.txt
--- linux-3.1-rc4-a/Documentation/DMA-API-HOWTO.txt 2011-08-29 05:16:01.000000000 +0100
+++ linux-3.1-rc4-b/Documentation/DMA-API-HOWTO.txt 2011-09-02 12:01:09.000000000 +0100
@@ -400,6 +400,22 @@
from a pool before you destroy the pool. This function may not
be called in interrupt context.
+Some architectures which supporting DMA coherent memory may still have write
+buffering between the CPU and DMA memory. This buffering may delay CPU writes
+from reaching coherent memory in a timely manner. These delays in turn can
+lead lead to dramatic performance issues in certain cases. An architecture
+may mitigate this problem to a large degree by having a write buffer flush
+implicit in the MMIO functions used to write to device registers. This works
+for the most common cases where a driver needs to write to a register to tell
+a device that something was written to the shared coherent memory. There are
+other cases where the device polls the dma-coherent memory for data written
+by the driver. In such cases, the driver needs to explicity force write buffer
+data to memory by calling:
+
+ dma_coherent_write_sync();
+
+
+
DMA Direction
The interfaces described in subsequent portions of this document
diff -urN linux-3.1-rc4-a/Documentation/DMA-API.txt linux-3.1-rc4-b/Documentation/DMA-API.txt
--- linux-3.1-rc4-a/Documentation/DMA-API.txt 2011-08-29 05:16:01.000000000 +0100
+++ linux-3.1-rc4-b/Documentation/DMA-API.txt 2011-09-02 12:03:06.000000000 +0100
@@ -418,6 +418,18 @@
....
+Part Ie - Write buffering to dma-coherent memory
+------------------------------------------------
+
+Some architectures supporting DMA coherent memory may have write
+buffering between the CPU and DMA memory. This buffering may delay
+CPU writes from reaching coherent memory in a timely manner.
+
+ void
+ dma_coherent_write_sync()
+
+Force any outstanding coherent writes to memory.
+
Part II - Advanced dma_ usage
-----------------------------
diff -urN linux-3.1-rc4-a/drivers/usb/host/ehci-q.c linux-3.1-rc4-b/drivers/usb/host/ehci-q.c
--- linux-3.1-rc4-a/drivers/usb/host/ehci-q.c 2011-08-29 05:16:01.000000000 +0100
+++ linux-3.1-rc4-b/drivers/usb/host/ehci-q.c 2011-09-02 12:17:20.000000000 +0100
@@ -114,6 +114,7 @@
/* HC must see latest qtd and qh data before we clear ACTIVE+HALT */
wmb ();
hw->hw_token &= cpu_to_hc32(ehci, QTD_TOGGLE | QTD_STS_PING);
+ dma_coherent_write_sync();
}
/* if it weren't for a common silicon quirk (writing the dummy into the qh
@@ -404,6 +405,7 @@
wmb();
hw->hw_token = cpu_to_hc32(ehci,
token);
+ dma_coherent_write_sync();
goto retry_xacterr;
}
stopped = 1;
@@ -753,8 +755,10 @@
}
/* by default, enable interrupt on urb completion */
- if (likely (!(urb->transfer_flags & URB_NO_INTERRUPT)))
+ if (likely(!(urb->transfer_flags & URB_NO_INTERRUPT))) {
qtd->hw_token |= cpu_to_hc32(ehci, QTD_IOC);
+ dma_coherent_write_sync();
+ }
return head;
cleanup:
@@ -1081,6 +1085,7 @@
/* let the hc process these next qtds */
wmb ();
dummy->hw_token = token;
+ dma_coherent_write_sync();
urb->hcpriv = qh_get (qh);
}
diff -urN linux-3.1-rc4-a/include/linux/dma-mapping.h linux-3.1-rc4-b/include/linux/dma-mapping.h
--- linux-3.1-rc4-a/include/linux/dma-mapping.h 2011-08-29 05:16:01.000000000 +0100
+++ linux-3.1-rc4-b/include/linux/dma-mapping.h 2011-09-02 12:06:06.000000000 +0100
@@ -154,6 +154,12 @@
}
#endif
+#ifndef ARCH_HAS_DMA_COHERENT_WRITE_SYNC
+static inline void dma_coherent_write_sync(void)
+{
+}
+#endif
+
/*
* Managed DMA API
*/

View file

@ -13,7 +13,7 @@ pkgname=("linux-${_mach}" "linux-headers-${_mach}")
_kernelname=${pkgname#linux}
_basekernel=3.0
pkgver=${_basekernel}.57
pkgrel=2
pkgrel=3
arch=('armv7h')
url="http://www.kernel.org/"
license=('GPL2')
@ -22,7 +22,7 @@ options=('!strip')
source=('config'
'change-default-console-loglevel.patch'
"linux.tar.gz::https://github.com/${_github_user}/${_github_repo}/tarball/${_github_commitID}")
md5sums=('4bed917577fd5be8fbaefba38f99036b'
md5sums=('491bb0d9bd64df02c052720f76e91b07'
'9d3c56a4b999c8bfbd4018089a62f662'
'1d57b811237d5447bedacf74be15808e')

View file

@ -2191,7 +2191,7 @@ CONFIG_USB_SW_SUN4I_HCD0=y
# USB Device Class drivers
#
CONFIG_USB_ACM=m
# CONFIG_USB_PRINTER is not set
CONFIG_USB_PRINTER=m
# CONFIG_USB_WDM is not set
# CONFIG_USB_TMC is not set

View file

@ -1,7 +1,7 @@
# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
pkgname=pacman-mirrorlist
pkgver=20130424
pkgver=20130521
pkgrel=1
pkgdesc="Arch Linux ARM mirror list for use by pacman"
arch=('arm' 'armv7h')
@ -10,7 +10,7 @@ license=('GPL')
groups=('base')
backup=(etc/pacman.d/mirrorlist)
source=(mirrorlist)
md5sums=('a610c6b17b93de3768d7d6ffb210453b')
md5sums=('afc7a60554f3776686f624d2b8d61618')
build() {
mkdir -p $pkgdir/etc/pacman.d

View file

@ -1,6 +1,6 @@
#
# Arch Linux ARM repository mirrorlist
# Generated on 2013-03-23
# Generated on 2013-05-21
#
## Geo-IP based mirror selection and load balancing
@ -40,6 +40,10 @@ Server = http://mirror.archlinuxarm.org/@carch@/$repo
## Haarlem
# Server = http://nl.mirror.archlinuxarm.org/@carch@/$repo
### Norway
## Trondheim
# Server = http://no.mirror.archlinuxarm.org/@carch@/$repo
### Taiwan
## New Taipei City
# Server = http://tw.mirror.archlinuxarm.org/@carch@/$repo

232
extra/calligra/PKGBUILD Normal file
View file

@ -0,0 +1,232 @@
# $Id: PKGBUILD 184364 2013-05-06 19:36:46Z foutrelis $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - removed makedepend on vc - not for ARM
# - patch to fix qreal ARMisms
pkgbase=calligra
pkgname=('calligra-filters'
'calligra-libs'
'calligra-plugins'
'calligra-tools'
'calligra-karbon'
'calligra-kexi'
'calligra-plan'
'calligra-stage'
'calligra-krita'
'calligra-sheets'
'calligra-words'
'calligra-handbook'
'calligra-braindump'
'calligra-flow')
pkgver=2.6.3
pkgrel=4
arch=('i686' 'x86_64')
url='http://www.calligra-suite.org/'
license=('FDL1.2' 'GPL2' 'LGPL')
makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio'
'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw'
'openjpeg' 'kdegraphics-okular' 'pstoedit')
groups=('calligra')
source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
"arm.patch")
md5sums=('90d6bb619191abbcc94094379d47e225'
'51f443435a0cf022bec3db041b4047bb')
build() {
cd $pkgbase-$pkgver
patch -p1 -i "$srcdir"/arm.patch
cd ..
mkdir build
cd build
cmake ../${pkgbase}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_active=OFF
make
}
package_calligra-filters() {
pkgdesc="Filters for the Calligra office suite"
optdepends=('libwpg: Corel WordPerfect Graphics image importer'
'libwps: Microsoft Works file word processor format import')
conflicts=('koffice-filters')
replaces=('koffice-filters')
install=calligra-filters.install
cd "${srcdir}"/build/filters
make DESTDIR="${pkgdir}" install
}
package_calligra-libs() {
pkgdesc="Libraries for the Calligra office suite"
depends=('kdepimlibs' 'lcms2' 'kactivities')
conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces'
'calligra-pics' 'calligra-servicetypes' 'calligra-templates')
replaces=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces'
'calligra-pics' 'calligra-servicetypes' 'calligra-templates')
for d in interfaces libs pics servicetypes templates; do
cd "${srcdir}"/build/${d}
make DESTDIR="${pkgdir}" install
done
}
package_calligra-plugins() {
pkgdesc="Plugins for the Calligra office suite"
depends=('calligra-libs' 'calligra-filters')
optdepends=('kdeedu-marble: map shape for Calligra')
conflicts=('koffice-plugins' 'koffice-kchart')
replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula')
install=calligra-plugins.install
cd "${srcdir}"/build/plugins
make DESTDIR="${pkgdir}" install
}
package_calligra-tools() {
pkgdesc="Tools for the Calligra office suite"
depends=('calligra-libs')
conflicts=('koffice-tools')
replaces=('koffice-tools')
install=calligra-tools.install
cd "${srcdir}"/build/tools
make DESTDIR="${pkgdir}" install
}
package_calligra-karbon() {
pkgdesc="Create scalable vector drawings"
depends=('calligra-libs' 'kdebase-runtime' 'pstoedit')
optdepends=('calligra-filters: import/export filters'
'calligra-tools: extra calligra tools')
conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
install=calligra-karbon.install
cd "${srcdir}"/build/karbon
make DESTDIR="${pkgdir}" install
}
package_calligra-kexi() {
pkgdesc="Develop desktop database applications"
depends=('calligra-libs' 'glew' 'fftw')
optdepends=('libmariadbclient: MariaDB driver'
'freetds: Sybase & MS SQL driver'
'xbase: XBase driver'
'calligra-sheets: Spreadsheet-to-Kexi-table import plugin'
'kdeedu-marble: map form widget'
'calligra-plugins: extra calligra plugins')
conflicts=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
replaces=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
install=calligra-kexi.install
cd "${srcdir}"/build/kexi
make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/doc/kexi
make DESTDIR="${pkgdir}" install
}
package_calligra-plan() {
pkgdesc="Calligra Project Management Component"
depends=('calligra-words')
conflicts=('koffice-kplato' 'calligra-kplato')
replaces=('koffice-kplato' 'calligra-kplato')
install=calligra-plan.install
cd "${srcdir}"/build/plan
make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/3rdparty/kdgantt
make DESTDIR="${pkgdir}" install
}
package_calligra-stage() {
pkgdesc="Write presentation documents"
depends=('calligra-plugins' 'kdebase-runtime')
conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
install=calligra-stage.install
cd "${srcdir}"/build/stage
make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/doc/stage
make DESTDIR="${pkgdir}" install
}
package_calligra-krita() {
pkgdesc="Edit and paint images"
depends=('calligra-plugins' 'kdebase-runtime' 'eigen2'
'opencolorio' 'libkdcraw' 'fftw' 'glew' 'opengtl')
conflicts=('koffice-krita' 'calligra-krita-doc')
replaces=('koffice-krita' 'calligra-krita-doc')
install=calligra-krita.install
cd "${srcdir}"/build/krita
make DESTDIR="${pkgdir}" install
}
package_calligra-sheets() {
pkgdesc="Write spreadsheet documents"
depends=('calligra-libs' 'gsl' 'kdebase-runtime')
optdepends=('calligra-filters: import/export filters'
'calligra-plugins: extra calligra plugins'
'calligra-tools: extra calligra tools')
conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
install=calligra-sheets.install
cd "${srcdir}"/build/sheets
make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/doc/sheets
make DESTDIR="${pkgdir}" install
}
package_calligra-words() {
pkgdesc="Word Processor"
depends=('calligra-plugins' 'kdegraphics-okular')
optdepends=('calligra-tools: extra calligra tools')
conflicts=('koffice-kword')
replaces=('koffice-kword')
install=calligra-words.install
cd "${srcdir}"/build/words
make DESTDIR="${pkgdir}" install
}
package_calligra-handbook() {
pkgdesc="Documentation for Calligra"
conflicts=('koffice-handbook')
replaces=('koffice-handbook')
options=('docs')
cd "${srcdir}"/build/doc/calligra
make DESTDIR="${pkgdir}" install
}
package_calligra-braindump() {
pkgdesc="Notes and idea gathering"
depends=('calligra-libs' 'kdebase-runtime')
install=calligra-braindump.install
cd "${srcdir}"/build/braindump
make DESTDIR="${pkgdir}" install
}
package_calligra-flow() {
pkgdesc="Flowchart & Diagram Editing"
depends=('calligra-words')
conflicts=('calligra-flow-doc')
replaces=('calligra-flow-doc')
install=calligra-flow.install
optdepends=('calligra-karbon: to export the charts in various formats')
cd "${srcdir}"/build/flow
make DESTDIR="${pkgdir}" install
}

36
extra/calligra/arm.patch Normal file
View file

@ -0,0 +1,36 @@
diff -urN a/krita/ui/kis_image_view_converter.cpp b/krita/ui/kis_image_view_converter.cpp
--- a/krita/ui/kis_image_view_converter.cpp 2013-04-08 03:23:17.000000000 -0500
+++ b/krita/ui/kis_image_view_converter.cpp 2013-05-21 17:20:34.227367776 -0500
@@ -40,7 +40,7 @@
// remember here; document is postscript points; view is krita pixels.
-void KisImageViewConverter::zoom(qreal *zoomX, qreal *zoomY) const
+void KisImageViewConverter::zoom(double *zoomX, double *zoomY) const
{
Q_ASSERT(zoomX);
Q_ASSERT(zoomY);
diff -urN a/krita/ui/kis_image_view_converter.h b/krita/ui/kis_image_view_converter.h
--- a/krita/ui/kis_image_view_converter.h 2013-04-08 03:23:17.000000000 -0500
+++ b/krita/ui/kis_image_view_converter.h 2013-05-21 17:19:52.171064761 -0500
@@ -52,7 +52,7 @@
using KoViewConverter::viewToDocument;
/// reimplemented from superclass
- void zoom(qreal *zoomX, qreal *zoomY) const;
+ void zoom(double *zoomX, double *zoomY) const;
qreal documentToViewX(qreal documentX) const;
qreal documentToViewY(qreal documentY) const;
diff -urN a/krita/ui/tests/kis_zoom_and_pan_test.cpp b/krita/ui/tests/kis_zoom_and_pan_test.cpp
--- a/krita/ui/tests/kis_zoom_and_pan_test.cpp 2013-04-08 03:24:15.000000000 -0500
+++ b/krita/ui/tests/kis_zoom_and_pan_test.cpp 2013-05-21 19:09:55.408078960 -0500
@@ -220,7 +220,7 @@
qreal oldPreferredCenterFractionY = 1.0 * oldPreferredCenter.y() / oldDocumentSize.height();
qreal roundingTolerance =
- qMax(1.0, qMax(oldPreferredCenterFractionX, oldPreferredCenterFractionY) / k);
+ qMax((float)1.0, qMax(oldPreferredCenterFractionX, oldPreferredCenterFractionY) / k);
/**
* In the computation of the offset two roundings happen:

View file

@ -0,0 +1,12 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-desktop-database -q
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}

View file

@ -0,0 +1,11 @@
post_install() {
update-mime-database usr/share/mime &> /dev/null
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}

View file

@ -0,0 +1,12 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-desktop-database -q
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}

View file

@ -0,0 +1,12 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-desktop-database -q
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}

View file

@ -0,0 +1,12 @@
post_install() {
update-desktop-database -q
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}

View file

@ -0,0 +1,13 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-mime-database usr/share/mime &> /dev/null
update-desktop-database -q
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}

View file

@ -0,0 +1,12 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-desktop-database -q
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}

View file

@ -0,0 +1,11 @@
post_install() {
update-mime-database usr/share/mime &> /dev/null
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}

View file

@ -0,0 +1,12 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-desktop-database -q
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}

View file

@ -0,0 +1,12 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-desktop-database -q
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}

View file

@ -0,0 +1,12 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-desktop-database -q
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}

View file

@ -0,0 +1,12 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-desktop-database -q
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}

View file

@ -0,0 +1,11 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}

View file

@ -16,15 +16,15 @@ buildarch=4
highmem=1
pkgname=chromium
pkgver=26.0.1410.63
pkgrel=2
pkgver=27.0.1453.93
pkgrel=1
pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
arch=('i686' 'x86_64')
url="http://www.chromium.org/"
license=('BSD')
depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss'
'libgcrypt' 'ttf-font' 'udev' 'dbus' 'flac' 'opus' 'libwebp'
'speech-dispatcher' 'pciutils' 'desktop-file-utils'
'speech-dispatcher' 'pciutils' 'libpulse' 'desktop-file-utils'
'hicolor-icon-theme')
makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring'
'elfutils' 'subversion')
@ -39,44 +39,29 @@ source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgna
chromium.desktop
chromium.default
chromium.sh
chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
chromium-25.0.1364.152-fix-crash-when-cups-is-down.patch
chromium-ppapi-r0.patch
chromium-26.0.1410.43-audio-buffer-size.patch
chromium-pnacl-r0.patch
chromium-26.0.1410.43-speechd-0.8.patch
die-sysroot-die.patch)
sha256sums=('7af8f70745992afdee0196039b5beab1b86b6de7fa70ca4f4a04dc335f034b3f'
'09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
'478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
'4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
'c1baf14121502efbc2a31b64029dcafa0e28ca5b71ad0e28a3c6342d18198615'
'36ff43d8e85a7eac305727057c4ffd45eb7a357ce212a4a3f153037bc34a5ace'
'1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7ed540cdb502fa0aa99c81bd'
'5af41119d383b10c21f98f0e02d2259cc8cf60eefdb2fa737d8ed87d4c01f056'
'9875ffcc0e9ae9420876ac66b130b1b017d445a031d43cbe0119793e1fb3781c'
'23b04468881642ffdc8457016c8f91df395dfccb4af2ad6b758168180ae070f3'
'66705264d9e679a58ed522b4475a06c8a5a4fe52a709c537b1a7d5aa43fb6c84')
build() {
cd "$srcdir/chromium-$pkgver"
prepare() {
cd "$srcdir/$pkgname-$pkgver"
# Remove ARM sysroot garbage
patch -Np1 -i "$srcdir/die-sysroot-die.patch"
# Fix build with glibc 2.16
patch -Np1 -i "$srcdir/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch"
# http://code.google.com/p/chromium/issues/detail?id=160574
patch -Np1 -i "$srcdir/chromium-25.0.1364.152-fix-crash-when-cups-is-down.patch"
# Fix build without NaCl glibc toolchain (patch from Gentoo)
patch -Np0 -i "$srcdir/chromium-ppapi-r0.patch"
# Fix build without pnacl (patch from Gentoo)
patch -Np0 -i "$srcdir/chromium-pnacl-r0.patch"
# Fix header location for speech-dispatcher 0.8 (patch from PLD Linux)
patch -Np2 -i "$srcdir/chromium-26.0.1410.43-speechd-0.8.patch"
# http://code.google.com/p/chromium/issues/detail?id=178626
patch -Np1 -i "$srcdir/chromium-26.0.1410.43-audio-buffer-size.patch"
# Use Python 2
find . -type f -exec sed -i -r \
-e 's|/usr/bin/python$|&2|g' \
@ -85,10 +70,12 @@ build() {
# There are still a lot of relative calls which need a workaround
mkdir "$srcdir/python2-path"
ln -s /usr/bin/python2 "$srcdir/python2-path/python"
export PATH="$srcdir/python2-path:$PATH"
}
ln -s "$srcdir/pepper_${_nacl_sdk%%.*}/toolchain/linux_x86_newlib" \
native_client/toolchain/linux_x86_newlib
build() {
cd "$srcdir/$pkgname-$pkgver"
export PATH="$srcdir/python2-path:$PATH"
# CFLAGS are passed through release_extra_cflags below
export -n CFLAGS CXXFLAGS
@ -101,6 +88,7 @@ build() {
-Dlinux_link_gsettings=1 \
-Dlinux_link_libpci=1 \
-Dlinux_link_libspeechd=1 \
-Dlinux_link_pulseaudio=1 \
-Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
-Dlinux_strip_binary=1 \
-Dlinux_use_gold_binary=0 \
@ -139,7 +127,7 @@ build() {
}
package() {
cd "$srcdir/chromium-$pkgver"
cd "$srcdir/$pkgname-$pkgver"
install -D out/Release/chrome "$pkgdir/usr/lib/chromium/chromium"

View file

@ -1,35 +0,0 @@
diff -upr chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
--- chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-10 10:48:31.000000000 +0300
+++ chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-11 23:44:11.000000000 +0300
@@ -243,14 +243,13 @@ struct kernel_rusage {
long ru_nivcsw;
};
-struct siginfo;
#if defined(__i386__) || defined(__arm__) || defined(__PPC__)
/* include/asm-{arm,i386,mips,ppc}/signal.h */
struct kernel_old_sigaction {
union {
void (*sa_handler_)(int);
- void (*sa_sigaction_)(int, struct siginfo *, void *);
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
};
unsigned long sa_mask;
unsigned long sa_flags;
@@ -287,13 +286,13 @@ struct kernel_sigaction {
unsigned long sa_flags;
union {
void (*sa_handler_)(int);
- void (*sa_sigaction_)(int, struct siginfo *, void *);
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
};
struct kernel_sigset_t sa_mask;
#else
union {
void (*sa_handler_)(int);
- void (*sa_sigaction_)(int, struct siginfo *, void *);
+ void (*sa_sigaction_)(int, siginfo_t *, void *);
};
unsigned long sa_flags;
void (*sa_restorer)(void);

View file

@ -1,68 +0,0 @@
From b824ad5ee90704db9942857145f04b8542924b12 Mon Sep 17 00:00:00 2001
From: "noamsml@google.com"
<noamsml@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 28 Feb 2013 19:00:49 +0000
Subject: [PATCH] Fix crash in chrome when trying to print with CUPS down
This is a workaround for GTK bug https://bugzilla.gnome.org/show_bug.cgi?id=686838.
Removed listing of printers when setting up default settings in native print dialog,
as it is not necessary (behavior verified to be unchanged). Added check to ensure
print preview dialog does not try to instantiate a printer list when selecting a
cloud printer, as this is also unnecessary (again, no behavior change).
BUG=160574
Review URL: https://chromiumcodereview.appspot.com/12374003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185284 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/browser/printing/print_dialog_gtk.cc | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/chrome/browser/printing/print_dialog_gtk.cc b/chrome/browser/printing/print_dialog_gtk.cc
index 70fe427..d8cb419 100644
--- a/chrome/browser/printing/print_dialog_gtk.cc
+++ b/chrome/browser/printing/print_dialog_gtk.cc
@@ -130,21 +130,11 @@ PrintDialogGtk::~PrintDialogGtk() {
void PrintDialogGtk::UseDefaultSettings() {
DCHECK(!page_setup_);
+ DCHECK(!printer_);
// |gtk_settings_| is a new object.
gtk_settings_ = gtk_print_settings_new();
-
- scoped_ptr<GtkPrinterList> printer_list(new GtkPrinterList);
- printer_ = printer_list->default_printer();
- if (printer_) {
- g_object_ref(printer_);
- gtk_print_settings_set_printer(gtk_settings_,
- gtk_printer_get_name(printer_));
- page_setup_ = gtk_printer_get_default_page_size(printer_);
- }
-
- if (!page_setup_)
- page_setup_ = gtk_page_setup_new();
+ page_setup_ = gtk_page_setup_new();
// No page range to initialize for default settings.
PageRanges ranges_vector;
@@ -173,10 +163,12 @@ bool PrintDialogGtk::UpdateSettings(const base::DictionaryValue& job_settings,
return false;
}
+ bool is_cloud_print = job_settings.HasKey(printing::kSettingCloudPrintId);
+
if (!gtk_settings_)
gtk_settings_ = gtk_print_settings_new();
- if (!print_to_pdf) {
+ if (!print_to_pdf && !is_cloud_print) {
scoped_ptr<GtkPrinterList> printer_list(new GtkPrinterList);
printer_ = printer_list->GetPrinterWithName(device_name.c_str());
if (printer_) {
--
1.7.10

View file

@ -1,12 +0,0 @@
diff -upr chromium-26.0.1410.43.orig/media/audio/audio_util.cc chromium-26.0.1410.43/media/audio/audio_util.cc
--- chromium-26.0.1410.43.orig/media/audio/audio_util.cc 2013-03-29 02:10:07.000000000 +0200
+++ chromium-26.0.1410.43/media/audio/audio_util.cc 2013-03-29 02:21:41.000000000 +0200
@@ -201,8 +201,6 @@ size_t GetAudioHardwareBufferSize() {
HRESULT hr = CoreAudioUtil::GetPreferredAudioParameters(eRender, eConsole,
&params);
return FAILED(hr) ? kFallbackBufferSize : params.frames_per_buffer();
-#elif defined(OS_LINUX)
- return 512;
#else
return 2048;
#endif

View file

@ -0,0 +1,11 @@
--- ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp.orig 2013-03-27 19:49:17.000000000 +0100
+++ ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp 2013-03-27 19:49:59.000000000 +0100
@@ -13,7 +13,7 @@
'target_name': 'pnacl_support_extension',
'type': 'none',
'conditions': [
- ['disable_nacl==0 and disable_nacl_untrusted==0', {
+ ['disable_nacl==0 and disable_pnacl==0 and disable_nacl_untrusted==0', {
'dependencies': [
'../../../../../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim',
'../../../../../native_client/tools.gyp:prep_toolchain',

View file

@ -1,11 +0,0 @@
--- ppapi/ppapi_untrusted.gyp.orig 2012-06-12 10:20:16.000000000 +0200
+++ ppapi/ppapi_untrusted.gyp 2012-06-12 10:20:52.000000000 +0200
@@ -80,7 +80,7 @@
],
},
'conditions': [
- ['target_arch!="arm"', {
+ ['target_arch!="arm" and disable_glibc==0', {
'variables': {
'build_glibc': 1,
# NOTE: Use /lib, not /lib64 here; it is a symbolic link which

View file

@ -9,8 +9,6 @@
# - fix_build_system.patch to use libtool for compilation
# - removed making libcryptopp.so, adjusted packaging for .libs
plugrel=1
pkgname=crypto++
pkgver=5.6.2
_srcver=562
@ -24,15 +22,15 @@ makedepends=('unzip')
source=("http://www.cryptopp.com/cryptopp${_srcver}.zip"
'libcrypto++.pc'
'fix_build_system.patch')
md5sums=('96cbeba0907562b077e26bcffb483828'
md5sums=('7ed022585698df48e65ce9218f6c6a67'
'46de3847c59ad16456fa863eb33e73b2'
'8d454c524bafc05aa842ddfc63d8431d')
'7ba22254fea73c1a9bd308ff6e034856')
build() {
cd ${srcdir}
# ALARM
patch -p0 -i fix_build_system.patch
patch -p1 -i fix_build_system.patch
sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"

View file

@ -1,10 +1,10 @@
--- GNUmakefile
+++ GNUmakefile
--- cryptopp562/GNUmakefile
+++ cryptopp562/GNUmakefile
@@ -1,3 +1,5 @@
+LIBTOOL = libtool
+LIBDIR = lib
CXXFLAGS = -DNDEBUG -g -O2
#CXXFLAGS = -g
# -O3 fails to link on Cygwin GCC version 4.5.3
# -fPIC is supported. Please report any breakage of -fPIC as a bug.
@@ -7,8 +9,9 @@
# LDFLAGS += -Wl,--gc-sections
@ -17,35 +17,19 @@
EGREP = egrep
UNAME = $(shell uname)
ISX86 = $(shell uname -m | $(EGREP) -c "i.86|x86|i86|amd64")
@@ -77,8 +80,11 @@
CXXFLAGS += -pipe
@@ -79,8 +82,11 @@
LDLIBS += -lws2_32
endif
+THREAD_LIBS =
+
ifeq ($(UNAME),Linux)
ifeq ($(IS_LINUX),1)
LDFLAGS += -pthread
+THREAD_LIBS += -lpthread
ifneq ($(shell uname -i | $(EGREP) -c "(_64|d64)"),0)
M32OR64 = -m64
endif
@@ -99,8 +105,6 @@
ifeq ($(UNAME),SunOS)
LDLIBS += -lnsl -lsocket
M32OR64 = -m$(shell isainfo -b)
-endif
-
ifneq ($(IS_SUN_CC),0) # override flags for CC Sun C++ compiler
CXXFLAGS = -DNDEBUG -O -g0 -native -template=no%extdef $(M32OR64)
LDFLAGS =
@@ -114,52 +118,52 @@
CXXFLAGS += -DCRYPTOPP_INCLUDE_VECTOR_CC
endif
endif
+endif
SRCS = $(wildcard *.cpp)
ifeq ($(SRCS),) # workaround wildcard function bug in GNU Make 3.77
@@ -126,54 +132,52 @@
SRCS = $(shell echo *.cpp)
endif
@ -62,12 +46,15 @@
-LIBIMPORTOBJS = $(LIBOBJS:.o=.import.o)
-TESTIMPORTOBJS = $(TESTOBJS:.o=.import.o)
-DLLTESTOBJS = dlltest.dllonly.o
-
-all: cryptest.exe
-static: libcryptopp.a
-dynamic: libcryptopp.so
+DLLOBJS = $(DLLSRCS:.cpp=.export.lo)
+LIBIMPORTOBJS = $(LIBOBJS:.lo=.import.lo)
+TESTIMPORTOBJS = $(TESTOBJS:.lo=.import.lo)
+DLLTESTOBJS = dlltest.dllonly.lo
-all: cryptest.exe
+
+all: libcryptopp.la
-test: cryptest.exe
@ -76,27 +63,38 @@
+ ./cryptest v
clean:
- $(RM) cryptest.exe libcryptopp.a $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS)
+ $(RM) -f .libs cryptest libcrypto++.* libcryptopp.* $(LIBOBJS) $(TESTOBJS) cryptopp.dll cryptest.import dlltest $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS)
- -$(RM) cryptest.exe libcryptopp.a libcryptopp.so $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTI MPORTOBJS) $(DLLTESTOBJS)
+ $(RM) -f .libs cryptest libcryptopp.* libcryptopp.* $(LIBOBJS) $(TESTOBJS) cryptopp.dll cryptest.import dlltest $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS)
+
install:
- $(MKDIR) -p $(PREFIX)/include/cryptopp $(PREFIX)/lib $(PREFIX)/bin
- $(CP) *.h $(PREFIX)/include/cryptopp
- $(CP) *.a $(PREFIX)/lib
- $(CP) *.so $(PREFIX)/lib
- $(CP) *.exe $(PREFIX)/bin
- -$(CP) *.h $(PREFIX)/include/cryptopp
- -$(CP) *.a $(PREFIX)/lib
- -$(CP) *.so $(PREFIX)/lib
- -$(CP) *.exe $(PREFIX)/bin
+ $(MKDIR) -p $(DESTDIR)$(PREFIX)/include/cryptopp $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ $(INSTALL) -m 644 *.h $(DESTDIR)$(PREFIX)/include/cryptopp
+ $(LN_S) cryptopp $(DESTDIR)$(PREFIX)/include/cryptopp
+ $(LIBTOOL) --mode=install $(INSTALL) libcryptopp.la $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ $(LN_S) libcryptopp.a $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.a
+ $(LN_S) libcryptopp.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so
+ $(LN_S) libcryptopp.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0
+ $(LN_S) libcryptopp.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0.0.0
remove:
- -$(RM) -rf $(PREFIX)/include/cryptopp
- -$(RM) $(PREFIX)/lib/libcryptopp.a
- -$(RM) $(PREFIX)/lib/libcryptopp.so
- -$(RM) $(PREFIX)/bin/cryptest.exe
-
-libcryptopp.a: $(LIBOBJS)
- $(AR) $(ARFLAGS) $@ $(LIBOBJS)
- $(RANLIB) $@
+ $(MKDIR) -p $(DESTDIR)$(PREFIX)/include/crypto++ $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ $(INSTALL) -m 644 *.h $(DESTDIR)$(PREFIX)/include/crypto++
+ $(LN_S) crypto++ $(DESTDIR)$(PREFIX)/include/cryptopp
+ $(LIBTOOL) --mode=install $(INSTALL) libcrypto++.la $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ $(LN_S) libcrypto++.a $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.a
+ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so
+ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0
+ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0.0.0
+ $(RM) -rf $(DESTDIR)$(PREFIX)/include/cryptopp
+ $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.a
+ $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so*
+ $(RM) $(DESTDIR)$(PREFIX)/bin/cryptest
-libcryptopp.so: $(LIBOBJS)
- $(CXX) -shared -o $@ $(LIBOBJS)
@ -104,7 +102,7 @@
+ $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(LDFLAGS) -rpath $(PREFIX)/$(LIBDIR) -o $@ $(LIBOBJS) $(THREAD_LIBS)
-cryptest.exe: libcryptopp.a $(TESTOBJS)
- $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS)
- $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(LDLIBS)
+cryptest: libcryptopp.la $(TESTOBJS)
+ $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(LDFLAGS) -o $@ $(TESTOBJS) -L. -lcryptopp $(LDLIBS) $(THREAD_LIBS)
@ -117,7 +115,7 @@
cryptopp.dll: $(DLLOBJS)
$(CXX) -shared -o $@ $(CXXFLAGS) $(DLLOBJS) $(LDFLAGS) $(LDLIBS) -Wl,--out-implib=libcryptopp.dll.a
@@ -168,10 +172,10 @@
@@ -182,10 +186,10 @@
$(AR) $(ARFLAGS) $@ $(LIBIMPORTOBJS)
$(RANLIB) $@
@ -130,7 +128,7 @@
$(CXX) -o $@ $(CXXFLAGS) $(DLLTESTOBJS) -L. -lcryptopp.dll $(LDFLAGS) $(LDLIBS)
adhoc.cpp: adhoc.cpp.proto
@@ -181,14 +185,14 @@
@@ -195,14 +199,14 @@
touch adhoc.cpp
endif

View file

@ -0,0 +1,41 @@
# $Id: PKGBUILD 184890 2013-05-09 09:43:04Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - patch and cmake define to disable opengl for ARM
pkgname=kdeedu-kalgebra
pkgver=4.10.3
pkgrel=1
pkgdesc="Graph Calculator"
url="http://kde.org/applications/education/kalgebra/"
arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdeedu')
depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz"
"kalgebra-opengl_optional.patch")
sha1sums=('c3c237cdf891259b2bef399d2b5c75a420e21d55'
'ae1b75e5192f8519517134447b481421112a6dd7')
build() {
cd "${srcdir}/kalgebra-${pkgver}"
patch -p1 -i ../kalgebra-opengl_optional.patch
cd "${srcdir}"
mkdir build
cd build
cmake ../kalgebra-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DKDE4_BUILD_TESTS=OFF \
-DCMAKE_INSTALL_PREFIX=/usr \
-DSHOULD_BUILD_OPENGL=OFF
make
}
package() {
cd "${srcdir}"/build
make DESTDIR="${pkgdir}" install
}

View file

@ -0,0 +1,17 @@
diff -urN a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2013-05-02 23:37:45.511551937 -0500
+++ b/CMakeLists.txt 2013-05-21 19:51:54.124577735 -0500
@@ -11,8 +11,11 @@
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${LIBKDEEDU_INCLUDE_DIR}/qtmml ${ANALITZA_INCLUDE_DIR})
macro_optional_find_package(OpenGL)
-macro_bool_to_01(OPENGL_FOUND HAVE_OPENGL)
-macro_log_feature(OPENGL_FOUND "OpenGL" "Support for 3D graphs in KAlgebra" "http://mesa3d.sourceforge.net" FALSE "" "")
+option(SHOULD_BUILD_OPENGL "Build OpenGL support" ON)
+if(SHOULD_BUILD_OPENGL)
+ macro_bool_to_01(OPENGL_FOUND HAVE_OPENGL)
+endif(SHOULD_BUILD_OPENGL)
+macro_log_feature(HAVE_OPENGL "OpenGL" "Support for 3D graphs in KAlgebra" "http://mesa3d.sourceforge.net" FALSE "" "")
macro_log_feature(QTMML_LIBRARY "QtMathML Widget" "Supports displaying some formulas in a mathematic form" "http://doc.qt.nokia.com/solutions/4/qtmmlwidget/qtmmlwidget.html" FALSE "" "")

View file

@ -0,0 +1,12 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
update-desktop-database -q
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}

38
extra/nettle/PKGBUILD Normal file
View file

@ -0,0 +1,38 @@
# $Id: PKGBUILD 183668 2013-04-26 12:45:09Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: bender02 at gmx dot com
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - disable neon, assembler
pkgname=nettle
pkgver=2.7
pkgrel=1.1
pkgdesc="A low-level cryptographic library"
arch=('i686' 'x86_64')
url="http://www.lysator.liu.se/~nisse/nettle/"
license=('GPL2')
install=$pkgname.install
depends=('gmp')
source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
md5sums=('2caa1bd667c35db71becb93c5d89737f')
build() {
cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr --libdir=/usr/lib \
--enable-shared --disable-arm-neon --disable-assembler
make
}
check() {
cd "$srcdir/$pkgname-$pkgver"
make -k check
}
package() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir/" install
# remove static libs #--disable-static - build would break (since nettle 2.6) - and had no effect before
rm -f ${pkgdir}/usr/lib/{libhogweed,libnettle}.a
}

View file

@ -0,0 +1,20 @@
infodir=/usr/share/info
filelist=(nettle.info)
post_install() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
done
}
post_upgrade() {
post_install $1
}
pre_remove() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
done
}