diff options
author | Francesco Colista <francesco.colista@gmail.com> | 2012-07-25 13:39:51 +0000 |
---|---|---|
committer | Francesco Colista <francesco.colista@gmail.com> | 2012-07-25 13:39:51 +0000 |
commit | 388752fa23fb4c776fbbb2a0ad7b04d16c336b4c (patch) | |
tree | 297d754fbe98e595a46a89c1521336f08bec3bc0 | |
parent | 2817dcbd8611bec09cd7436771fc4d248ddfc732 (diff) | |
parent | 694f922569d04fef76eb881f5a660df8342e30f5 (diff) | |
download | aports-388752fa23fb4c776fbbb2a0ad7b04d16c336b4c.tar.bz2 aports-388752fa23fb4c776fbbb2a0ad7b04d16c336b4c.tar.xz |
Merge git://dev.alpinelinux.org/aports
43 files changed, 133 insertions, 185 deletions
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD index 0d329748be..0bb79acb68 100644 --- a/main/bash/APKBUILD +++ b/main/bash/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bash -pkgver=4.2.036 +pkgver=4.2.037 _patchlevel=${pkgver##*.} _myver=${pkgver%.*} _patchbase=${_myver%.*}${_myver#*.} @@ -103,4 +103,5 @@ eee08003395c417f677d1a4bf8c548ee bash42-032 2fe070dd6d75d8ff16f269184a16e9c4 bash42-033 4e610506c1711bf3483b965800ac3d5d bash42-034 7cd9bfdf7cbfd45274d07620ee94c8d9 bash42-035 -9c3142956064d175a880bcb186e51ef9 bash42-036" +9c3142956064d175a880bcb186e51ef9 bash42-036 +c10692f447d4966c879f8fb8d7c8ebc9 bash42-037" diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD index 1e0d6eb147..a5231b3302 100644 --- a/main/bind/APKBUILD +++ b/main/bind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bind -pkgver=9.9.1_p1 +pkgver=9.9.1_p2 _ver=${pkgver%_p*} _p=${pkgver#*_p} [ "$_p" != "$pkgver" ] && _ver="${_ver}-P$_p" @@ -112,7 +112,7 @@ tools() { done } -md5sums="4ed20e77f2967c13eaab5563d0c45c76 bind-9.9.1-P1.tar.gz +md5sums="5f2f9ec0f1f1c67beaada349cdac0c15 bind-9.9.1-P2.tar.gz f270a5b0a28ab6e818840c5c368ddbcc bind.so_bsdcompat.patch 1e77ad70d15546ae5e2527892b867580 named.initd 418a367cecfdf8760c92235d3967867e named.confd diff --git a/main/bison/APKBUILD b/main/bison/APKBUILD index 63ea16bd02..89c47d543f 100644 --- a/main/bison/APKBUILD +++ b/main/bison/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bison -pkgver=2.5.1 +pkgver=2.6 pkgrel=0 pkgdesc="The GNU general-purpose parser generator" arch="all" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="8fedf916f1aa2c4a31441d8f8bbc603c bison-2.5.1.tar.gz" +md5sums="823ee3d582a526b436409506005c9550 bison-2.6.tar.gz" diff --git a/main/dbus/APKBUILD b/main/dbus/APKBUILD index 612af112a7..800b7b3678 100644 --- a/main/dbus/APKBUILD +++ b/main/dbus/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dbus -pkgver=1.6.2 +pkgver=1.6.4 pkgrel=0 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" @@ -56,5 +56,5 @@ x11() { mv "$pkgdir"/usr/bin/dbus-launch "$subpkgdir"/usr/bin/ } -md5sums="7fbf877ed6ff7da6df90f07158373829 dbus-1.6.2.tar.gz +md5sums="5ec43dc4554cba638917317b2b4f7640 dbus-1.6.4.tar.gz bc835765907698a95da8d8e5bf199378 dbus.initd" diff --git a/main/evince/APKBUILD b/main/evince/APKBUILD index 606991e6e9..1dbcbf9f07 100644 --- a/main/evince/APKBUILD +++ b/main/evince/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=evince pkgver=2.32.0 -pkgrel=9 +pkgrel=10 pkgdesc="simple document viewer for GTK+" url="http://projects.gnome.org/evince/" arch="all" diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD index b25c2ff949..3fc61625ed 100644 --- a/main/firefox/APKBUILD +++ b/main/firefox/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=firefox -pkgver=13.0.1 +pkgver=14.0.1 _pkgver=$pkgver _xulver=$pkgver pkgrel=0 @@ -89,7 +89,10 @@ build() { package() { cd "$_builddir" - make -j1 DESTDIR="$pkgdir" -f client.mk install || return 1 + make -j1 -f client.mk install \ + DESTDIR="$pkgdir" \ + MOZ_MAKE_FLAGS="$MAKEOPTS" \ + || return 1 install -m755 -d ${pkgdir}/usr/share/applications install -m755 -d ${pkgdir}/usr/share/pixmaps @@ -115,8 +118,8 @@ __EOF__ chmod 755 "$pkgdir"/usr/bin/firefox } -md5sums="82deadb501c7fc0e9fa6b025f51f05a1 firefox-13.0.1.source.tar.bz2 -3ba2cb7cda675e78eb0eeb0652ee3457 mozconfig +md5sums="c2f884f0f6c41c65cf20f678a1ee7191 firefox-14.0.1.source.tar.bz2 +98bcd8b2d33037f12ca513882fc5d831 mozconfig 2328df219e042f6aaec361cbf83cf9e9 firefox-5.0-asciidel.patch ba96924ece1d77453e462429037a2ce5 firefox.desktop 6f38a5899034b7786cb1f75ad42032b8 firefox-safe.desktop" diff --git a/main/firefox/mozconfig b/main/firefox/mozconfig index f1b23fae9a..dd7460ea68 100644 --- a/main/firefox/mozconfig +++ b/main/firefox/mozconfig @@ -22,6 +22,7 @@ ac_add_options --enable-svg ac_add_options --enable-canvas ac_add_options --enable-startup-notification ac_add_options --enable-libxul +ac_add_options --with-system-libxul ac_add_options --disable-crashreporter ac_add_options --disable-updater ac_add_options --enable-safe-browsing diff --git a/main/flex/APKBUILD b/main/flex/APKBUILD index 7bb369ae6e..735686320f 100644 --- a/main/flex/APKBUILD +++ b/main/flex/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncop@alpinelinux.org> pkgname=flex -pkgver=2.5.35 -pkgrel=4 +pkgver=2.5.36 +pkgrel=0 pkgdesc="A tool for generating text-scanning programs" url="http://flex.sourceforge.net" arch="all" @@ -20,7 +20,11 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make install DESTDIR="$pkgdir" } -md5sums="10714e50cea54dc7a227e3eddcd44d57 flex-2.5.35.tar.bz2" +md5sums="5e637290609fd3c2f1f2e75ac2bce1c5 flex-2.5.36.tar.bz2" diff --git a/main/gdk-pixbuf/APKBUILD b/main/gdk-pixbuf/APKBUILD index e00eb4b8d7..5bdc1addd2 100644 --- a/main/gdk-pixbuf/APKBUILD +++ b/main/gdk-pixbuf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gdk-pixbuf pkgver=2.26.1 -pkgrel=1 +pkgrel=2 pkgdesc="GDK Pixbuf library" url="http://www.gtk.org/" arch="all" diff --git a/main/ghostscript/APKBUILD b/main/ghostscript/APKBUILD index 67ee47e0f8..969379d472 100644 --- a/main/ghostscript/APKBUILD +++ b/main/ghostscript/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Cameron Banta <cbanta@gmail.com> pkgname=ghostscript pkgver=9.05 -pkgrel=0 +pkgrel=1 pkgdesc="An interpreter for the PostScript language and for PDF" url="http://ghostscript.com/" arch="all" diff --git a/main/gimp/APKBUILD b/main/gimp/APKBUILD index 6fc5731c02..3eac1878b7 100644 --- a/main/gimp/APKBUILD +++ b/main/gimp/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gimp pkgver=2.8.0 -pkgrel=0 +pkgrel=1 pkgdesc="GNU Image Manipulation Program" url="http://www.gimp.org/" arch="all" diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 132071d42c..b74eec12c1 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=git -pkgver=1.7.11.2 +pkgver=1.7.11.3 pkgrel=0 pkgdesc="A distributed version control system" url="http://git.or.cz/" @@ -72,7 +72,7 @@ svn() { mv "$pkgdir"/usr/libexec/git-core/git-svn "$subpkgdir"/usr/libexec/git-core } -md5sums="91e01a22032f5d0ca2941ae7fd49d587 git-1.7.11.2.tar.gz +md5sums="23caacd9f3f421b6c05b40796df3505d git-1.7.11.3.tar.gz e63a201556c4f089de790805c09a2e5b bb-tar.patch 3f0bdf6ca73bf4f015bc8565ab787969 git-daemon.initd 2258e95d389ccc6de0b5111d53d9eed6 git-daemon.confd" diff --git a/main/glproto/APKBUILD b/main/glproto/APKBUILD index f0335e68b9..a6f91e3e5c 100644 --- a/main/glproto/APKBUILD +++ b/main/glproto/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=glproto -pkgver=1.4.15 +pkgver=1.4.16 pkgrel=0 pkgdesc="X11 OpenGL extension wire protocol" url="http://xorg.freedesktop.org/" @@ -20,4 +20,4 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="d1ff0c1acc605689919c1ee2fc9b5582 glproto-1.4.15.tar.bz2" +md5sums="3847963c1b88fd04a030b932b0aece07 glproto-1.4.16.tar.bz2" diff --git a/main/gradm/APKBUILD b/main/gradm/APKBUILD index c78402297d..2f7b113873 100644 --- a/main/gradm/APKBUILD +++ b/main/gradm/APKBUILD @@ -1,7 +1,6 @@ -# Contributor: William Pitcock <nenolod@dereferenced.org> -# Maintainer: William Pitcock <nenolod@dereferenced.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gradm -pkgver=2.2.2 +pkgver=2.9.1 pkgrel=0 pkgdesc="administrative utility for grsecurity kernels" url="http://www.grsecurity.org/" @@ -10,7 +9,7 @@ license="GPL" makedepends="bison flex" install="" subpackages="$pkgname-doc" -source="http://grsecurity.net/test/gradm-2.2.2-201103262019.tar.gz +source="http://grsecurity.net/test/gradm-2.9.1-201207201554.tar.gz policy base.policyd grsec-rbac.initd" @@ -51,7 +50,7 @@ package() { install -m755 "$srcdir"/grsec-rbac.initd "$pkgdir"/etc/init.d/grsec-rbac } -md5sums="72c5bce632fb40dff814e0f1f955cab7 gradm-2.2.2-201103262019.tar.gz +md5sums="b0ae140e30629988a773decf27638e0c gradm-2.9.1-201207201554.tar.gz 38ee3aef884bdcfe6a5b925760f6220b policy 1d4a2c2e522b7124ad901ae102181e72 base.policyd 2fc5d055dd43a2d9e1bed378dcab8641 grsec-rbac.initd" diff --git a/main/hylafax/APKBUILD b/main/hylafax/APKBUILD index a4317908df..418027766f 100644 --- a/main/hylafax/APKBUILD +++ b/main/hylafax/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Cameron Banta <cbanta@gmail.com> # Maintainer: Cameron Banta <cbanta@gmail.com> pkgname=hylafax -pkgver=6.0.5 -pkgrel=2 +pkgver=6.0.6 +pkgrel=0 pkgdesc="Sends and receives faxes" url="http://www.hylafax.org/" arch="all" @@ -13,15 +13,12 @@ makedepends="zlib-dev tiff-dev" install="hylafax.post-install" subpackages="$pkgname-doc" source="ftp://ftp.hylafax.org/source/$pkgname-$pkgver.tar.gz - gcc4.5.1.patch - $install " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - patch -p1 < $startdir/gcc4.5.1.patch } build() { @@ -87,6 +84,4 @@ package(){ # - which the user runs after install } -md5sums="eb9ac942354ad708e20e4583cec6615f hylafax-6.0.5.tar.gz -bca78921c75448f63b451098528f5296 gcc4.5.1.patch -a3553e6fc4de30e80759abe5c663c85b hylafax.post-install" +md5sums="d063d45049c8fcbabefe09d662313067 hylafax-6.0.6.tar.gz" diff --git a/main/hylafax/gcc4.5.1.patch b/main/hylafax/gcc4.5.1.patch deleted file mode 100644 index 0ac556a3ca..0000000000 --- a/main/hylafax/gcc4.5.1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure b/configure -index e49c08f..c6976fd 100755 ---- a/configure -+++ b/configure -@@ -2882,7 +2882,7 @@ BuildPortDotH() - echo '#define HAS_FCHMOD 1' - Note "... configure use of fchmod" - CheckFuncDecl fchmod 'extern int fchmod(int, mode_t);' \ -- unistd.h libc.h $OSFCNH sys/stat.h -+ unistd.h $OSFCNH sys/stat.h libc.h - } - CheckFuncDecl mknod 'extern int mknod(const char*, mode_t, dev_t);' \ - unistd.h sys/stat.h diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD index b263c22270..8a923cb964 100644 --- a/main/imagemagick/APKBUILD +++ b/main/imagemagick/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=imagemagick -pkgver=6.7.8.3 +pkgver=6.7.8.6 _abiver=5 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 @@ -63,4 +63,4 @@ _cxx() { mv "$pkgdir"/usr/lib/libMagick++.so.* "$subpkgdir"/usr/lib/ } -md5sums="2bd5087654a4e6cde9bc15c95923dd50 ImageMagick-6.7.8-3.tar.xz" +md5sums="1dc4fb3febd1db7e0ab47c877f66eb09 ImageMagick-6.7.8-6.tar.xz" diff --git a/main/imlib2/APKBUILD b/main/imlib2/APKBUILD index 68c569e132..9536f2c99c 100644 --- a/main/imlib2/APKBUILD +++ b/main/imlib2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=imlib2 pkgver=1.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" url="http://sourceforge.net/projects/enlightenment/" arch="all" diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD index 30139a0bda..33d6390c52 100644 --- a/main/iproute2/APKBUILD +++ b/main/iproute2/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iproute2 -pkgver=3.3.0 +pkgver=3.4.0 _realver=$pkgver pkgrel=0 pkgdesc="IP Routing Utilities" @@ -39,4 +39,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -md5sums="39a7ff2c5149475c710365954e2ce49b iproute2-3.3.0.tar.xz" +md5sums="879d3fac4e90809598b2864ec4a0cbf8 iproute2-3.4.0.tar.xz" diff --git a/main/lcms/APKBUILD b/main/lcms/APKBUILD index 94e50ce470..a14fa5b753 100644 --- a/main/lcms/APKBUILD +++ b/main/lcms/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lcms pkgver=1.19 -pkgrel=2 +pkgrel=3 pkgdesc="Lightweight color management development library/engine" url="http://www.littlecms.com" arch="all" diff --git a/main/libmicrohttpd/APKBUILD b/main/libmicrohttpd/APKBUILD index 2a7b324468..8429af1c84 100644 --- a/main/libmicrohttpd/APKBUILD +++ b/main/libmicrohttpd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libmicrohttpd -pkgver=0.9.20 +pkgver=0.9.21 pkgrel=0 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." url="http://www.gnu.org/software/libmicrohttpd/" @@ -43,4 +43,4 @@ package() { "$pkgdir"/usr/include/plibc.h } -md5sums="ede6ad4a07a8a0794c42e4ef356ee27c libmicrohttpd-0.9.20.tar.gz" +md5sums="2bf97219d1137d26711ead48d11ebcdd libmicrohttpd-0.9.21.tar.gz" diff --git a/main/qt/APKBUILD b/main/qt/APKBUILD index ff49d4f710..b7eef6d17c 100644 --- a/main/qt/APKBUILD +++ b/main/qt/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt pkgver=4.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="A cross-platform application and UI framework" url="http://qt.nokia.com/" arch="all" diff --git a/main/readline/APKBUILD b/main/readline/APKBUILD index bb0fee0564..4fa4dc6232 100644 --- a/main/readline/APKBUILD +++ b/main/readline/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=readline -pkgver=6.2.003 +pkgver=6.2.004 _myver=${pkgver%.*} _patchver=${pkgver##*.} _suff=${_myver%.*}${_myver#*.} @@ -50,4 +50,5 @@ package() { md5sums="67948acb2ca081f23359d0256e9a271c readline-6.2.tar.gz 83287d52a482f790dfb30ec0a8746669 readline62-001 0665020ea118e8434bd145fb71f452cc readline62-002 -c9d5d79718856e711667dede87cb7622 readline62-003" +c9d5d79718856e711667dede87cb7622 readline62-003 +c08e787f50579ce301075c523fa660a4 readline62-004" diff --git a/main/spandsp/APKBUILD b/main/spandsp/APKBUILD index 1ca450d9ae..182c8ed4c9 100644 --- a/main/spandsp/APKBUILD +++ b/main/spandsp/APKBUILD @@ -3,7 +3,7 @@ pkgname=spandsp pkgver=0.0.6_pre20 _ver=${pkgver/_/} -pkgrel=0 +pkgrel=1 pkgdesc="SpanDSP is a library of DSP functions for telephony" url="http://www.soft-switch.org/installing-spandsp.html" arch="all" diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD index cca84020db..41b83891bc 100644 --- a/main/syslinux/APKBUILD +++ b/main/syslinux/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=syslinux pkgver=4.05 -pkgrel=1 +pkgrel=2 pkgdesc="Boot loader for the Linux operating system" url="http://syslinux.org" arch="x86 x86_64" @@ -38,4 +38,4 @@ package() { md5sums="82299242418385da1274c9479a778cb2 syslinux-4.05.tar.bz2 7ef73a7a858b8aa1ac6635d6391ac8e5 update-extlinux.conf -b242e393a677ed924dd60ff5195f59ef update-extlinux" +7bf8f54cedf0bd30909e61559d19dc9c update-extlinux" diff --git a/main/syslinux/update-extlinux b/main/syslinux/update-extlinux index dafe8bb189..d96713ae30 100755 --- a/main/syslinux/update-extlinux +++ b/main/syslinux/update-extlinux @@ -92,7 +92,7 @@ echo "TIMEOUT $rtimeout" >> $conf.new lst=0 if [ -f "/boot/xen.gz" ]; then - for kernel in $(find /boot -name vmlinuz-* -type f); do + for kernel in $(find /boot -name "vmlinuz-*" -type f); do tag=$(basename $kernel | cut -b9-) everbose "Found Xen hypervisor: /boot/xen.gz, kernel: $kernel" @@ -118,7 +118,7 @@ if [ -f "/boot/xen.gz" ]; then done fi -for kernel in $(find /boot -name vmlinuz-* -type f); do +for kernel in $(find /boot -name "vmlinuz-*" -type f); do tag=$(basename $kernel | cut -b9-) everbose "Found kernel: $kernel" diff --git a/main/tiff/APKBUILD b/main/tiff/APKBUILD index 854f24a3ae..3548da488f 100644 --- a/main/tiff/APKBUILD +++ b/main/tiff/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=tiff -pkgver=3.9.5 -pkgrel=1 +pkgver=4.0.1 +pkgrel=0 pkgdesc="Provides support for the Tag Image File Format or TIFF" url="http://www.libtiff.org/" arch="all" @@ -25,13 +25,6 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || _failed="$_failed $i";; esac done - - rm -f libtool.m4 - libtoolize --force --copy \ - && aclocal -I . -I m4 \ - && automake --add-missing --copy \ - && autoconf \ - && autoheader } build() { @@ -57,4 +50,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -md5sums="8fc7ce3b4e1d0cc8a319336967815084 tiff-3.9.5.tar.gz" +md5sums="fae149cc9da35c598d8be897826dfc63 tiff-4.0.1.tar.gz" diff --git a/main/transmission/APKBUILD b/main/transmission/APKBUILD index 65608b9e72..4a840a4a97 100644 --- a/main/transmission/APKBUILD +++ b/main/transmission/APKBUILD @@ -1,6 +1,6 @@ # Maintainer:Carlo Landmeter pkgname=transmission -pkgver=2.60 +pkgver=2.61 pkgrel=0 pkgdesc="Lightweight GTK BitTorrent client" url="http://www.tansmissionbt.com" @@ -10,7 +10,7 @@ license="MIT" depends= pkgusers="transmission" pkggroups="transmission" -makedepends="openssl-dev pkgconfig curl-dev gtk+-dev intltool libevent-dev +makedepends="openssl-dev pkgconfig curl-dev gtk+3.0-dev intltool libevent-dev libnotify-dev dbus-glib-dev autoconf automake tar libcanberra-dev gconf-dev" source="http://download.m0k.org/transmission/files/transmission-$pkgver.tar.bz2 transmission-daemon.initd @@ -69,6 +69,6 @@ cli() { "$subpkgdir"/usr/bin/ } -md5sums="8fbc9365fc24d2e6336975ccfb9a235e transmission-2.60.tar.bz2 +md5sums="a7849550d82d8a51ddaacd35edc8afe0 transmission-2.61.tar.bz2 b44e7e7bcfb7fd1c59b3e1191d4dabb9 transmission-daemon.initd 5caf0fc25dfd67c61627f1e0313f4245 transmission-daemon.confd" diff --git a/main/ttf-liberation/APKBUILD b/main/ttf-liberation/APKBUILD index 25597b96ee..63e08e58a7 100644 --- a/main/ttf-liberation/APKBUILD +++ b/main/ttf-liberation/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ttf-liberation -pkgver=1.07.2 +pkgver=2.00.0 pkgrel=0 pkgdesc="Red Hats Liberation fonts" url="https://fedorahosted.org/liberation-fonts/" license="custom GPL2" arch="noarch" depends="" -makedepends="wget" +makedepends="" install= source="https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-$pkgver.tar.gz" @@ -22,4 +22,4 @@ package() { cp -a *.ttf "$pkgdir"/usr/share/fonts/truetype/liberation/ } -md5sums="274ba7088e294d5dd27616aabbd88d34 liberation-fonts-ttf-1.07.2.tar.gz" +md5sums="cfbf1ac6f61bf6cf45342a0cc9381be5 liberation-fonts-ttf-2.00.0.tar.gz" diff --git a/main/tzdata/APKBUILD b/main/tzdata/APKBUILD index 386cf89e85..b5d5f1bc2c 100644 --- a/main/tzdata/APKBUILD +++ b/main/tzdata/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tzdata -pkgver=2012c +pkgver=2012d _tzcodever=2011i _ptzver=0.3 pkgrel=0 @@ -48,7 +48,7 @@ package() { } md5sums="cf7f4335b7c8682899fa2814e711c1b2 tzcode2011i.tar.gz -cfdc2710bd05c26dbd624441d57028f6 tzdata2012c.tar.gz +fc0f54b76054800394f8c366ea1eeea7 tzdata2012d.tar.gz 99efce32b3f870e1b071ce47f3a98a18 posixtz-0.3.tar.bz2 a64ed97d1fc03c66ee8612c0d9f40507 Makefile.patch 0b4d86d855f7daa3f79c9f28f04a48f9 0001-posixtz-fix-up-lseek.patch" diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD index c318c31bfc..acd480e472 100644 --- a/main/wireshark/APKBUILD +++ b/main/wireshark/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wireshark -pkgver=1.6.8 -pkgrel=1 +pkgver=1.8.1 +pkgrel=0 pkgdesc="network protocol analyzer - GTK version" url="http://www.wireshark.org" arch="all" @@ -77,6 +77,6 @@ tshark() { mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark } -md5sums="dcdc5f4904af5804b622c955a30974e2 wireshark-1.6.8.tar.bz2 +md5sums="629fe03f4a64eb8c7bd9308ee4e22e2e wireshark-1.8.1.tar.bz2 504ede44c02b2a52f6cbd3bffdf93b8d wireshark.desktop e771800a8c977fe223583a453bc27397 wireshark.png" diff --git a/main/wxgtk/APKBUILD b/main/wxgtk/APKBUILD index 62dbbbde02..dd1a2f1852 100644 --- a/main/wxgtk/APKBUILD +++ b/main/wxgtk/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wxgtk pkgver=2.8.12 -pkgrel=0 +pkgrel=1 pkgdesc="GTK2 port of the wxWidgets GUI library" url="http://www.wxwidgets.org/" arch="all" diff --git a/main/xulrunner/0002-Use-C99-math-isfinite.patch b/main/xulrunner/0002-Use-C99-math-isfinite.patch index 3d85a69288..03f830bcae 100644 --- a/main/xulrunner/0002-Use-C99-math-isfinite.patch +++ b/main/xulrunner/0002-Use-C99-math-isfinite.patch @@ -4,23 +4,9 @@ Date: Fri, 25 Nov 2011 08:30:51 +0000 Subject: [PATCH 2/4] Use C99 math isfinite --- - js/src/ctypes/CTypes.cpp | 2 +- xpcom/ds/nsMathUtils.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) -diff --git a/js/src/ctypes/CTypes.cpp b/js/src/ctypes/CTypes.cpp -index 5c0f886..a3b1ae6 100644 ---- a/js/src/ctypes/CTypes.cpp -+++ b/js/src/ctypes/CTypes.cpp -@@ -467,7 +467,7 @@ static inline bool FloatIsFinite(jsdouble f) { - #ifdef WIN32 - return _finite(f) != 0; - #else -- return finite(f); -+ return isfinite(f); - #endif - } - diff --git a/xpcom/ds/nsMathUtils.h b/xpcom/ds/nsMathUtils.h index 21ffbec..2e80476 100644 --- a/xpcom/ds/nsMathUtils.h diff --git a/main/xulrunner/0004-xulrunner-malloc_usable_size.patch b/main/xulrunner/0004-xulrunner-malloc_usable_size.patch deleted file mode 100644 index 986b183ece..0000000000 --- a/main/xulrunner/0004-xulrunner-malloc_usable_size.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Timo Teräs <timo.teras@iki.fi> - -malloc_usable_size is not defined on uclibc, so workaround -that in jemalloc. Fix mozalloc linking. - ---- mozilla-release-old/memory/jemalloc/jemalloc.h -+++ mozilla-release/memory/jemalloc/jemalloc.h -@@ -75,8 +75,12 @@ - /* Linux has memalign and malloc_usable_size */ - #if !defined(MOZ_MEMORY_LINUX) - void *memalign(size_t alignment, size_t size); --size_t malloc_usable_size(const void *ptr); - #endif /* MOZ_MEMORY_LINUX */ -+ -+#include <features.h> -+#if defined(__UCLIBC__) || !defined(MOZ_MEMORY_LINUX) -+size_t malloc_usable_size(const void *ptr); -+#endif - - void jemalloc_stats(jemalloc_stats_t *stats); - ---- mozilla-release-old/memory/mozalloc/Makefile.in -+++ mozilla-release/memory/mozalloc/Makefile.in -@@ -43,6 +43,10 @@ - - include $(DEPTH)/config/autoconf.mk - -+ifdef MOZ_MEMORY -+SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,../jemalloc) -+endif -+ - VISIBILITY_FLAGS= - STL_FLAGS = - ifdef _MSC_VER diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD index a282831fea..95db8b77d9 100644 --- a/main/xulrunner/APKBUILD +++ b/main/xulrunner/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=xulrunner -pkgver=13.0.1 +pkgver=14.0.1 _ffoxver=$pkgver pkgrel=0 pkgdesc="runtime environment for xul-based applications" @@ -48,7 +48,7 @@ source="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver} mozconfig 0002-Use-C99-math-isfinite.patch 0003-xulrunner-jemalloc-aslr.patch - 0004-xulrunner-malloc_usable_size.patch + uclibc-malloc_usable_size.patch cairo.patch " @@ -104,9 +104,9 @@ dev() { mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include } -md5sums="82deadb501c7fc0e9fa6b025f51f05a1 firefox-13.0.1.source.tar.bz2 +md5sums="c2f884f0f6c41c65cf20f678a1ee7191 firefox-14.0.1.source.tar.bz2 b0f7d491bc800b69ec718667a4b08acb mozconfig -1867db217d10722675c88b655db8c2d7 0002-Use-C99-math-isfinite.patch +f43c1f0ae57aa8289b130c6de8caf3ce 0002-Use-C99-math-isfinite.patch 7faa279d64c9ec2e7abc7c0497c7e07e 0003-xulrunner-jemalloc-aslr.patch -d12e0636e1f9877ef2d1df45d5834c87 0004-xulrunner-malloc_usable_size.patch +48b7d0404b45b15b8ae4a7d08ac95db3 uclibc-malloc_usable_size.patch 6a3942d96c7ce3c63251761cc12c8349 cairo.patch" diff --git a/main/xulrunner/uclibc-malloc_usable_size.patch b/main/xulrunner/uclibc-malloc_usable_size.patch new file mode 100644 index 0000000000..b198e2cc56 --- /dev/null +++ b/main/xulrunner/uclibc-malloc_usable_size.patch @@ -0,0 +1,37 @@ +--- ./memory/mozalloc/mozalloc.cpp.orig ++++ ./memory/mozalloc/mozalloc.cpp +@@ -63,7 +63,7 @@ + #include "mozilla/mozalloc_oom.h" // for mozalloc_handle_oom + + /* Windows doesn't have malloc_usable_size, but jemalloc has */ +-#if defined(MOZ_MEMORY_WINDOWS) ++#if defined(MOZ_MEMORY_WINDOWS) || defined(__UCLIBC__) + extern "C" size_t malloc_usable_size(const void *ptr); + #endif + +@@ -243,10 +243,10 @@ + + #if defined(XP_MACOSX) + return malloc_size(ptr); +-#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) ++#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID) &&!defined(__UCLIBC__)) + // Android bionic libc doesn't have malloc_usable_size. + return malloc_usable_size(ptr); +-#elif defined(XP_WIN) ++#elif defined(XP_WIN) || defined(__UCLIBC__) + return _msize(ptr); + #else + return 0; +--- mozilla-release-old/memory/mozalloc/Makefile.in ++++ mozilla-release/memory/mozalloc/Makefile.in +@@ -43,6 +43,10 @@ + + include $(DEPTH)/config/autoconf.mk + ++ifdef MOZ_MEMORY ++SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,../jemalloc) ++endif ++ + VISIBILITY_FLAGS= + STL_FLAGS = + ifdef _MSC_VER diff --git a/testing/evas/APKBUILD b/testing/evas/APKBUILD index d200b6c52e..7f0dc9d1a2 100644 --- a/testing/evas/APKBUILD +++ b/testing/evas/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=evas pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="hardware-accelerated retained canvas API" url="http://trac.enlightenment.org/e/wiki/Evas" arch="all" diff --git a/testing/fotoxx/APKBUILD b/testing/fotoxx/APKBUILD index 0edb118536..d327ae72ff 100644 --- a/testing/fotoxx/APKBUILD +++ b/testing/fotoxx/APKBUILD @@ -1,18 +1,18 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=fotoxx -pkgver=11.06 +pkgver=12.07.1 pkgrel=0 pkgdesc="Photo editing and collection management" url="http://kornelix.squarespace.com/fotoxx" arch="all" license="GPL-3" depends="xdg-utils exiftool" -makedepends="gtk+-dev tiff-dev" +makedepends="gtk+3.0-dev tiff-dev" install= subpackages="$pkgname-doc" source="http://kornelix.squarespace.com/storage/downloads/fotoxx-$pkgver.tar.gz - no-execinfo.patch" + no-xdg-desktop-menu.patch" _builddir="$srcdir"/$pkgname-$pkgver @@ -23,7 +23,6 @@ prepare() { *.patch) patch -p1 -i "$srcdir"/$i || return 1;; esac done - sed -e 's:/bin/bash:/bin/sh:' -i dependencies.sh } build() { @@ -36,5 +35,5 @@ package() { make PREFIX=/usr DESTDIR="$pkgdir" install } -md5sums="e636e10f6a46f0a813e704f18eac3176 fotoxx-11.06.tar.gz -981323960d1316051b898ba194085205 no-execinfo.patch" +md5sums="56022f26a3db1fdc62024027fe73901e fotoxx-12.07.1.tar.gz +8c988a8ced48cfe3a5a49be4a705b045 no-xdg-desktop-menu.patch" diff --git a/testing/fotoxx/no-execinfo.patch b/testing/fotoxx/no-execinfo.patch deleted file mode 100644 index c0e43a9f7c..0000000000 --- a/testing/fotoxx/no-execinfo.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/zfuncs.cc b/zfuncs.cc -index 1398557..c504bbf 100644 ---- a/zfuncs.cc -+++ b/zfuncs.cc -@@ -77,6 +77,7 @@ void zappcrash(cchar *pMess, ... ) // v - - printf("zappcrash: \n %s \n",message); // output message to stdout - -+#ifndef __UCLIBC__ - nstack = backtrace(stacklist,nstack); // get traceback data - stackents = backtrace_symbols(stacklist,nstack); - -@@ -113,6 +114,7 @@ void zappcrash(cchar *pMess, ... ) // v - fclose(fid1); - - err = system("xdg-open zappcrash"); // display in editor -+#endif - abort(); - } - -diff --git a/zfuncs.h b/zfuncs.h -index e415adb..b6f02ac 100644 ---- a/zfuncs.h -+++ b/zfuncs.h -@@ -34,7 +34,9 @@ - #include <pthread.h> - #include <errno.h> - #include <signal.h> -+#ifndef __UCLIBC__ - #include <execinfo.h> -+#endif - #include <locale.h> - #include <sys/inotify.h> - diff --git a/testing/fotoxx/no-xdg-desktop-menu.patch b/testing/fotoxx/no-xdg-desktop-menu.patch new file mode 100644 index 0000000000..0e2813fb81 --- /dev/null +++ b/testing/fotoxx/no-xdg-desktop-menu.patch @@ -0,0 +1,10 @@ +--- ./Makefile.orig ++++ ./Makefile +@@ -76,7 +76,6 @@ + rm -f fotoxx.1.gz + # menu (desktop) file + cp -f desktop $(DESTDIR)$(MENUFILE) +- xdg-desktop-menu install $(DESTDIR)$(MENUFILE) + + uninstall: + rm -f $(DESTDIR)$(BINDIR)/fotoxx diff --git a/testing/openjpeg/APKBUILD b/testing/openjpeg/APKBUILD index d2e3912bbd..dda2a4102a 100644 --- a/testing/openjpeg/APKBUILD +++ b/testing/openjpeg/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=openjpeg pkgver=1.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="Open-source implementation of JPEG2000 image codec" url="http://www.openjpeg.org/" arch="all" diff --git a/testing/podofo/APKBUILD b/testing/podofo/APKBUILD index 1b413ebf1a..e7b12d1c25 100644 --- a/testing/podofo/APKBUILD +++ b/testing/podofo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=podofo pkgver=0.9.1 -pkgrel=0 +pkgrel=1 pkgdesc="A C++ library to work with the PDF file format" url="http://podofo.sourceforge.net" arch="all" diff --git a/testing/rxvt-unicode/APKBUILD b/testing/rxvt-unicode/APKBUILD index f4a03602cf..2f67a0d616 100644 --- a/testing/rxvt-unicode/APKBUILD +++ b/testing/rxvt-unicode/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Moritz Wilhelmy # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=rxvt-unicode -pkgver=9.11 +pkgver=9.15 pkgrel=0 pkgdesc='rxvt fork with improved unicode support' arch=all @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="1bed5bfeed026e0bfafa0e9e4f62aa37 rxvt-unicode-9.11.tar.bz2" +md5sums="15595aa326167ac5eb68c28d95432faf rxvt-unicode-9.15.tar.bz2" |