Merge branch '3.1' into 3.2

This commit is contained in:
Juergen Daubert 2015-10-23 19:55:57 +02:00
commit 39c73a420a
14 changed files with 40 additions and 35 deletions

View File

@ -1,2 +1,2 @@
aadde3b8b956eb87b3df4a1be8b164ba 20150612.tar.gz
b83c567cc60a7a12fc179a10ba6a146a 20150824.tar.gz
063691163e592515b31514515bb3ce8c cidmaps.tgz

View File

@ -2,10 +2,10 @@
# URL: http://fontforge.sourceforge.net
# Maintainer: Danny Rawlins, monster dot romster at gmail dot com
# Packager: Antti Nykanen, aon at iki dot fi
# Depends on: giflib git libtiff pango
# Depends on: giflib git libspiro libtiff pango
name=fontforge
version=20150612
version=20150824
release=1
source=(https://github.com/fontforge/fontforge/archive/$version.tar.gz
http://fontforge.org/cidmaps.tgz)

View File

@ -6,8 +6,8 @@ drwxr-xr-x root/root usr/include/GL/
-rw-r--r-- root/root usr/include/GL/wglew.h
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libGLEW.a
lrwxrwxrwx root/root usr/lib/libGLEW.so -> libGLEW.so.1.10.0
lrwxrwxrwx root/root usr/lib/libGLEW.so.1.10 -> libGLEW.so.1.10.0
-rw-r--r-- root/root usr/lib/libGLEW.so.1.10.0
lrwxrwxrwx root/root usr/lib/libGLEW.so -> libGLEW.so.1.13.0
lrwxrwxrwx root/root usr/lib/libGLEW.so.1.13 -> libGLEW.so.1.13.0
-rw-r--r-- root/root usr/lib/libGLEW.so.1.13.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/glew.pc

View File

@ -1 +1 @@
2f09e5e6cb1b9f3611bcac79bc9c2d5d glew-1.10.0.tgz
7cbada3166d2aadfc4169c4283701066 glew-1.13.0.tgz

View File

@ -5,7 +5,7 @@
# Depends on: mesa3d xorg-libxi xorg-libxmu
name=glew
version=1.10.0
version=1.13.0
release=1
source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tgz)

View File

@ -161,6 +161,9 @@ drwxr-xr-x root/root usr/lib/gobject-introspection/giscanner/doctemplates/Python
-rw-r--r-- root/root usr/lib/gobject-introspection/giscanner/message.py
-rw-r--r-- root/root usr/lib/gobject-introspection/giscanner/message.pyc
-rw-r--r-- root/root usr/lib/gobject-introspection/giscanner/message.pyo
-rw-r--r-- root/root usr/lib/gobject-introspection/giscanner/msvccompiler.py
-rw-r--r-- root/root usr/lib/gobject-introspection/giscanner/msvccompiler.pyc
-rw-r--r-- root/root usr/lib/gobject-introspection/giscanner/msvccompiler.pyo
-rw-r--r-- root/root usr/lib/gobject-introspection/giscanner/scannermain.py
-rw-r--r-- root/root usr/lib/gobject-introspection/giscanner/scannermain.pyc
-rw-r--r-- root/root usr/lib/gobject-introspection/giscanner/scannermain.pyo

View File

@ -1 +1 @@
7ef8a1db7f74f4193a2397b1587eb913 gobject-introspection-1.44.0.tar.xz
adb40a31c7c80b65b0f4c8fd71b493dc gobject-introspection-1.46.0.tar.xz

View File

@ -5,7 +5,7 @@
# Depends on: python glib
name=gobject-introspection
version=1.44.0
version=1.46.0
release=1
source=(http://ftp.gnome.org/pub/GNOME/sources/$name/${version::4}/$name-$version.tar.xz)

View File

@ -5,7 +5,10 @@ drwxr-xr-x root/root usr/include/
-rw-r--r-- root/root usr/include/spiro.h
-rw-r--r-- root/root usr/include/spiroentrypoints.h
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libspiro.a
-rwxr-xr-x root/root usr/lib/libspiro.la
lrwxrwxrwx root/root usr/lib/libspiro.so -> libspiro.so.0.0.1
lrwxrwxrwx root/root usr/lib/libspiro.so.0 -> libspiro.so.0.0.1
-rwxr-xr-x root/root usr/lib/libspiro.so.0.0.1
lrwxrwxrwx root/root usr/lib/libspiro.so -> libspiro.so.0.0.3
lrwxrwxrwx root/root usr/lib/libspiro.so.0 -> libspiro.so.0.0.3
-rwxr-xr-x root/root usr/lib/libspiro.so.0.0.3
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libspiro.pc

View File

@ -1 +1 @@
ab6aaa50bbd8fa55e78f8b8b0112f6cd libspiro_src-20071029.tar.bz2
fdb5068aeff7b45b6d9319f643b506b2 0.3.20150131.tar.gz

View File

@ -1,16 +1,25 @@
# Description: Simplifies the drawing of beautiful curves.
# URL: http://libspiro.sourceforge.net/
# URL: https://github.com/fontforge/libspiro
# Maintainer: Danny Rawlins, crux at romster dot me
# Packager: Danny Rawlins, crux at romster dot me
name=libspiro
version=20071029
version=0.3.20150131
release=1
source=(http://downloads.sourceforge.net/project/$name/$name/$version/libspiro_src-$version.tar.bz2)
source=(https://github.com/fontforge/libspiro/archive/$version.tar.gz)
build() {
cd $name-$version
./configure --prefix=/usr
autoreconf -i
automake --foreign -Wall
./configure \
--prefix=/usr \
--mandir=/usr/man
make
make install DESTDIR=$PKG
install -m 0644 -D libspiro.pc $PKG/usr/lib/pkgconfig/libspiro.pc
}

View File

@ -36,6 +36,8 @@ drwxr-xr-x root/root usr/share/task/rc/
-rw-r--r-- root/root usr/share/task/rc/holidays.en-NZ.rc
-rw-r--r-- root/root usr/share/task/rc/holidays.en-US.rc
-rw-r--r-- root/root usr/share/task/rc/holidays.en-ZA.rc
-rw-r--r-- root/root usr/share/task/rc/holidays.es-CO.rc
-rw-r--r-- root/root usr/share/task/rc/holidays.es-EC.rc
-rw-r--r-- root/root usr/share/task/rc/holidays.es-ES.rc
-rw-r--r-- root/root usr/share/task/rc/holidays.es-MX.rc
-rw-r--r-- root/root usr/share/task/rc/holidays.es-US.rc
@ -69,22 +71,9 @@ lrwxrwxrwx root/root usr/share/task/rc/holidays.por-PRT.rc -> holidays.pt-PT.rc
-rw-r--r-- root/root usr/share/task/rc/solarized-light-256.theme
drwxr-xr-x root/root usr/share/task/scripts/
drwxr-xr-x root/root usr/share/task/scripts/add-ons/
-rwxr-xr-x root/root usr/share/task/scripts/add-ons/export-csv.pl
-rwxr-xr-x root/root usr/share/task/scripts/add-ons/export-html.pl
-rwxr-xr-x root/root usr/share/task/scripts/add-ons/export-ical.pl
-rwxr-xr-x root/root usr/share/task/scripts/add-ons/export-sql.py
-rwxr-xr-x root/root usr/share/task/scripts/add-ons/export-tsv.pl
-rwxr-xr-x root/root usr/share/task/scripts/add-ons/export-xml.pl
-rwxr-xr-x root/root usr/share/task/scripts/add-ons/export-xml.py
-rwxr-xr-x root/root usr/share/task/scripts/add-ons/export-xml.rb
-rwxr-xr-x root/root usr/share/task/scripts/add-ons/export-yad.pl
-rwxr-xr-x root/root usr/share/task/scripts/add-ons/export-yaml.pl
-rwxr-xr-x root/root usr/share/task/scripts/add-ons/import-todo.sh.pl
-rwxr-xr-x root/root usr/share/task/scripts/add-ons/import-yaml.pl
-rwxr-xr-x root/root usr/share/task/scripts/add-ons/README
-rwxr-xr-x root/root usr/share/task/scripts/add-ons/update-holidays.pl
drwxr-xr-x root/root usr/share/task/scripts/bash/
-rw-r--r-- root/root usr/share/task/scripts/bash/context
lrwxrwxrwx root/root usr/share/task/scripts/bash/focus -> context
-rw-r--r-- root/root usr/share/task/scripts/bash/task.sh
-rw-r--r-- root/root usr/share/task/scripts/bash/task_functions.sh
drwxr-xr-x root/root usr/share/task/scripts/fish/

View File

@ -1 +1 @@
517450c4a23a5842df3e9905b38801b3 task-2.4.4.tar.gz
bca2a8a6f7727ccbcefd5e190d935910 task-2.5.0.tar.gz

View File

@ -4,7 +4,7 @@
# Depends on: util-linux cmake
name=task
version=2.4.4
version=2.5.0
release=1
source=(http://www.taskwarrior.org/download/$name-$version.tar.gz)
@ -15,7 +15,8 @@ build () {
-DCMAKE_INSTALL_PREFIX=/usr \
-DTASK_MAN1DIR=man/man1 \
-DTASK_MAN5DIR=man/man5 \
-DTASK_DOCDIR=share/task
-DTASK_DOCDIR=share/task \
-DENABLE_SYNC=OFF
make
make DESTDIR=$PKG install