diff options
Diffstat (limited to 'main')
94 files changed, 4628 insertions, 247 deletions
diff --git a/main/acf-skins/APKBUILD b/main/acf-skins/APKBUILD index 88dc980520..8832617b36 100644 --- a/main/acf-skins/APKBUILD +++ b/main/acf-skins/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ted Trask <ttrask01@yahoo.com> # Maintainer: Ted Trask <ttrask01@yahoo.com> pkgname=acf-skins -pkgver=0.4.1 +pkgver=0.4.2 pkgrel=0 pkgdesc="Skins for ACF" url="http://git.alpinelinux.org/cgit/acf-skins" @@ -14,4 +14,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums="cbfeab06f1b82d906ac459225d897dd2 acf-skins-0.4.1.tar.bz2" +md5sums="507b98b802457910ea060638d1f08a76 acf-skins-0.4.2.tar.bz2" diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD index 053dbfe2d6..2b2bc7e995 100644 --- a/main/alpine-base/APKBUILD +++ b/main/alpine-base/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-base -pkgver=2.3.0_git20111111 +pkgver=2.3.0_git20120104 pkgrel=0 pkgdesc="Meta package for minimal alpine base" url="http://alpinelinux.org" diff --git a/main/alpine/APKBUILD b/main/alpine/APKBUILD index cc2204a354..a0de072be7 100644 --- a/main/alpine/APKBUILD +++ b/main/alpine/APKBUILD @@ -3,17 +3,21 @@ pkgname=alpine pkgver=2.00_p84 _ver=${pkgver%_p*} _pver=${pkgver##*_p} -pkgrel=1 +pkgrel=2 pkgdesc="Text-based email client, friendly for novices but powerful" url="http://www.washington.edu/alpine/" arch="all" license="APACHE" depends="" -makedepends="openldap-dev heimdal-dev ncurses-dev openssl-dev" +makedepends="openldap-dev heimdal-dev ncurses-dev openssl-dev + automake autoconf libtool" subpackages="$pkgname-doc" source="ftp://ftp.cac.washington.edu/alpine/alpine.tar.bz2 all_p84.patch - CVE-2008-5514.patch" + CVE-2008-5514.patch + libcrypt-underlinking.patch + libcrypto-underlinking.patch + " _builddir="$srcdir"/$pkgname-$_ver prepare() { @@ -26,6 +30,7 @@ prepare() { ;; esac done + libtoolize --force && aclocal -I m4 && autoconf && automake || return 1 } build() { @@ -46,4 +51,6 @@ package() { md5sums="84e44cbf71ed674800a5d57eed9c1c52 alpine.tar.bz2 785cea92b11d6655c183f3379468a643 all_p84.patch -1b52a54a656979116c09fb1d948a4325 CVE-2008-5514.patch" +1b52a54a656979116c09fb1d948a4325 CVE-2008-5514.patch +c0afe83884124c8945db376e91863a83 libcrypt-underlinking.patch +1db0d3aad97a0e11c6910234a802264c libcrypto-underlinking.patch" diff --git a/main/alpine/libcrypt-underlinking.patch b/main/alpine/libcrypt-underlinking.patch new file mode 100644 index 0000000000..b6c7836c07 --- /dev/null +++ b/main/alpine/libcrypt-underlinking.patch @@ -0,0 +1,11 @@ +--- ./alpine/Makefile.am.orig ++++ ./alpine/Makefile.am +@@ -35,7 +35,7 @@ + LDADD = ../pico/libpico.a ../pico/osdep/libpicoosd.a \ + ../pith/libpith.a ../pith/osdep/libpithosd.a \ + ../pith/charconv/libpithcc.a \ +- osdep/libpineosd.a ../c-client/c-client.a ++ osdep/libpineosd.a ../c-client/c-client.a -lcrypt + + AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -DLOCALEDIR=\"$(localedir)\" + diff --git a/main/alpine/libcrypto-underlinking.patch b/main/alpine/libcrypto-underlinking.patch new file mode 100644 index 0000000000..5007f7ead3 --- /dev/null +++ b/main/alpine/libcrypto-underlinking.patch @@ -0,0 +1,11 @@ +--- ./configure.ac.orig ++++ ./configure.ac +@@ -954,7 +954,7 @@ + if test "x$alpine_SSLTYPE" != "xnone" ; then + AC_SEARCH_LIBS(SSL_library_init,ssl, + [ +- LIBS="$LIBS -lssl" ++ LIBS="$LIBS -lssl -lcrypto" + ]) + if test "x$alpine_SSLTYPE" = "xnone" ; then + AC_MSG_NOTICE([OpenSSL libraries NOT found]) diff --git a/main/bacula-client/APKBUILD b/main/bacula-client/APKBUILD index 2bd9e744b6..337cb6a601 100644 --- a/main/bacula-client/APKBUILD +++ b/main/bacula-client/APKBUILD @@ -3,7 +3,7 @@ pkgname="bacula-client" _realname="bacula" pkgver=5.0.3 -pkgrel=9 +pkgrel=8 pkgdesc="Client (File Daemon) of Bacula, a network based backup program" url="http://www.bacula.org" arch="all" @@ -77,7 +77,6 @@ package() { $pkgdir/etc/init.d/bacula-fd install -Dm644 $srcdir/bacula-fd-conf \ $pkgdir/etc/conf.d/bacula-fd - mkdir -p $pkgdir/var/run/bacula find "$pkgdir" -iname *.la -delete } diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index 88c11a30c1..e942e696a1 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.19.3 -pkgrel=1 +pkgrel=3 _bbsuidver=0.6 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net @@ -87,7 +87,7 @@ md5sums="c3938e1ac59602387009bbf1dd1af7f6 busybox-1.19.3.tar.bz2 968b3a058db04f95e9c4cdb44d7d3ddb bbsuid-0.6.tar.bz2 4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch b5375210f13fd6e1ca61a565e8fabd35 busybox-uname-is-not-gnu.patch -9f73c26999ce4651e4d97f91da122813 bb-app-location.patch +754916e52fa11d3fe7c29c93248b6707 bb-app-location.patch 784383013b8f015fb0d214618c46b4b8 0001-loginutils-use-sha512.patch 5ed72ca85b8fba4598d64a550210b31f busybox-1.19.3-getty.patch 41636628e481f22b8774b6bee1eebfb1 busybox-1.19.3-modinfo.patch diff --git a/main/busybox/bb-app-location.patch b/main/busybox/bb-app-location.patch index 95a9d8daee..acad1f3313 100644 --- a/main/busybox/bb-app-location.patch +++ b/main/busybox/bb-app-location.patch @@ -18,3 +18,14 @@ IF_LSUSB(APPLET(lsusb, BB_DIR_USR_BIN, BB_SUID_DROP)) IF_UNLZMA(APPLET_ODDNAME(lzcat, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzcat)) IF_LZMA(APPLET_ODDNAME(lzma, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzma)) +--- ./editors/vi.c.orig ++++ ./editors/vi.c +@@ -145,7 +145,7 @@ + //config: This will make the cursor movement faster, but requires more memory + //config: and it makes the applet a tiny bit larger. + +-//applet:IF_VI(APPLET(vi, BB_DIR_BIN, BB_SUID_DROP)) ++//applet:IF_VI(APPLET(vi, BB_DIR_USR_BIN, BB_SUID_DROP)) + + //kbuild:lib-$(CONFIG_VI) += vi.o + diff --git a/main/busybox/busybox.post-upgrade b/main/busybox/busybox.post-upgrade index c55561cc11..268f22d408 100644 --- a/main/busybox/busybox.post-upgrade +++ b/main/busybox/busybox.post-upgrade @@ -1,9 +1,11 @@ #!/bin/sh -# /bin/install has moved to /usr/bin/install, but we need remove old link -if [ -L /bin/install ] && [ "$(readlink /bin/install)" = "/bin/busybox" ]; then - rm /bin/install -fi +# remove links that has been relocated +for link in /bin/install /bin/ip /bin/vi /usr/bin/lspci; do + if [ -L "$link" ] && [ "$(readlink $link)" = "/bin/busybox" ]; then + rm "$link" + fi +done # We need the symlinks early exec /bin/busybox --install -s diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD index 1654e92958..2585afa289 100644 --- a/main/cmake/APKBUILD +++ b/main/cmake/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cmake -pkgver=2.8.6 +pkgver=2.8.7 pkgrel=0 pkgdesc="CMake is a cross-platform open-source make system" url="http://www.cmake.org" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="2147da452fd9212bb9b4542a9eee9d5b cmake-2.8.6.tar.gz" +md5sums="e1b237aeaed880f65dec9c20602452f6 cmake-2.8.7.tar.gz" diff --git a/main/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD index 0d6d3d8b4e..5d78780d66 100644 --- a/main/conntrack-tools/APKBUILD +++ b/main/conntrack-tools/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=conntrack-tools -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=0 pkgdesc="Connection tracking userspace tools" url="http://conntrack-tools.netfilter.org" @@ -29,6 +29,6 @@ package() { install -Dm644 ../conntrackd.confd "$pkgdir"/etc/conf.d/conntrackd install -Dm644 doc/stats/conntrackd.conf "$pkgdir"/etc/conntrackd } -md5sums="5add24d4761baf17af630d5627a71752 conntrack-tools-1.0.0.tar.bz2 +md5sums="8a60f02a177fc31fe40cc992c4de90e2 conntrack-tools-1.0.1.tar.bz2 a97e0b7f1339d93caf929fb4767141e1 conntrackd.initd 8ebf3838b69d20e6bb4a173844502039 conntrackd.confd" diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD index a846d197ba..0c3f63c4d2 100644 --- a/main/dahdi-linux-grsec/APKBUILD +++ b/main/dahdi-linux-grsec/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> _flavor=grsec -_kver=3.0.14 +_kver=3.0.15 _kpkgrel=0 _mypkgrel=0 diff --git a/main/dahdi-linux-vserver/APKBUILD b/main/dahdi-linux-vserver/APKBUILD index ff010f92ce..05142e2287 100644 --- a/main/dahdi-linux-vserver/APKBUILD +++ b/main/dahdi-linux-vserver/APKBUILD @@ -4,7 +4,7 @@ _flavor=${FLAVOR:-vserver} _realname=dahdi-linux _name=$_realname-$_flavor -_kver=3.0.14 +_kver=3.0.15 _kpkgrel=0 _myvsver=vs2.3.2.1 diff --git a/main/desktop-file-utils/APKBUILD b/main/desktop-file-utils/APKBUILD index 519876c6b4..51d18f558b 100644 --- a/main/desktop-file-utils/APKBUILD +++ b/main/desktop-file-utils/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=desktop-file-utils -pkgver=0.18 +pkgver=0.19 pkgrel=0 pkgdesc="Command line utilities for working with desktop entries" url="http://www.freedesktop.org/wiki/Software/desktop-file-utils" @@ -9,7 +9,7 @@ license="GPL" depends= makedepends="glib-dev libiconv-dev gettext-dev pkgconfig" triggers="$pkgname.trigger=/usr/share/applications" -source="http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.bz2" +source="http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.xz" build () { @@ -23,4 +23,4 @@ package() { cd "$srcdir"/desktop-file-utils-$pkgver make DESTDIR="$pkgdir" install || return 1 } -md5sums="d966b743eb394650f98d5dd56b9aece1 desktop-file-utils-0.18.tar.bz2" +md5sums="cbb2427593b7f6d36e52e9d221fce82f desktop-file-utils-0.19.tar.xz" diff --git a/main/distcc/APKBUILD b/main/distcc/APKBUILD index 8d2212c0c6..0ba9a0966d 100644 --- a/main/distcc/APKBUILD +++ b/main/distcc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=distcc pkgver=3.1 -pkgrel=6 +pkgrel=7 pkgdesc="A distributed C, C++, Obj C compiler" url="http://distcc.org" arch="all" @@ -13,20 +13,31 @@ source="http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2 distcc-hardened.patch distccd.initd distccd.confd" subpackages="$pkgname-doc $pkgname-pump" - -build () -{ - cd "$srcdir/$pkgname-$pkgver" - for i in ../*.patch; do - msg "applying $i" - patch -p1 < $i || return 1 + +_builddir="$srcdir/$pkgname-$pkgver" +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac done +} + +build() { + cd "$_builddir" ./configure --prefix=/usr \ --without-gtk \ --sysconfdir=/etc \ - --mandir=/usr/share/man + --disable-Werror \ + --mandir=/usr/share/man \ + || return 1 make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install install -D -m644 ../distccd.confd "$pkgdir"/etc/conf.d/distccd diff --git a/main/djbdns/APKBUILD b/main/djbdns/APKBUILD index 61ef9475c6..148ab2ec3d 100644 --- a/main/djbdns/APKBUILD +++ b/main/djbdns/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=djbdns pkgver=1.05 -pkgrel=39 +pkgrel=40 pkgdesc="Excellent high-performance DNS services" url="http://cr.yp.to/djbdns.html" arch="all" @@ -9,7 +9,7 @@ license="public-domain" depends= subpackages="djbdns-common tinydns dnscache" source="http://cr.yp.to/djbdns/$pkgname-$pkgver.tar.gz -http://www.fefe.de/dns/djbdns-1.05-test24.diff.bz2 +http://www.fefe.de/dns/djbdns-1.05-test25.diff.bz2 headtail.patch dnsroots.patch dnstracesort.patch @@ -100,7 +100,7 @@ dnscache() { } md5sums="3147c5cd56832aa3b41955c7a51cbeb2 djbdns-1.05.tar.gz -2bd0616d5eb4cc7734e96e032e846613 djbdns-1.05-test24.diff.bz2 +4593ed6a189a8bad8b58671841d36732 djbdns-1.05-test25.diff.bz2 0d2adaf9f1626043e8702b825cdccdd6 headtail.patch 7565048ebc981238879122c7f88cc143 dnsroots.patch 6fe7f473233f1c86b76261afd8345bf0 dnstracesort.patch diff --git a/main/espeak/APKBUILD b/main/espeak/APKBUILD index 6e05c3909a..25661da8f3 100644 --- a/main/espeak/APKBUILD +++ b/main/espeak/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=espeak -pkgver=1.45.05 +pkgver=1.46.01 pkgrel=0 pkgdesc="Speech synthesizer for English and other languages" url="http://espeak.sourceforge.net/" @@ -23,4 +23,4 @@ package() { make AUDIO=none DESTDIR="$pkgdir" install || return 1 } -md5sums="00692552d54f1849a1a0ad21ae3fc820 espeak-1.45.05-source.zip" +md5sums="a3e9de4b2a56ec19c059115dca587494 espeak-1.46.01-source.zip" diff --git a/main/feh/APKBUILD b/main/feh/APKBUILD index 044d05a500..e4189679d0 100644 --- a/main/feh/APKBUILD +++ b/main/feh/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=feh -pkgver=2.1 +pkgver=2.2 pkgrel=0 pkgdesc="feh is a fast, lightweight image viewer which uses imlib2" url="http://www.linuxbrit.co.uk/feh/" @@ -24,4 +24,4 @@ package() { make DESTDIR=$pkgdir docsdir=/usr/share/doc/feh install || return 1 install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -md5sums="b7fe5db6d7239902c9ed52733e978b3a feh-2.1.tar.bz2" +md5sums="7dee285e8dd34f69058b0977283b3a8a feh-2.2.tar.bz2" diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index fd82922a3a..b0efb2e2fb 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=ffmpeg -pkgver=0.9 +pkgver=0.9.1 pkgrel=0 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" url="http://ffmpeg.org/" @@ -59,5 +59,5 @@ package() { install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" || return 1 # strip --strip-debug "$pkgdir"/usr/lib/*.a || return 1 } -md5sums="795058de6fc432aa11271408273a0535 ffmpeg-0.9.tar.bz2 +md5sums="41ae6cfdef81a54835b914f523e575cf ffmpeg-0.9.1.tar.bz2 2cdc11a99bf97c63c7cca27b073cb47c configure-dlvsym.patch" diff --git a/main/file/APKBUILD b/main/file/APKBUILD index feca7ee072..41c41d6c25 100644 --- a/main/file/APKBUILD +++ b/main/file/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=file -pkgver=5.09 -pkgrel=1 +pkgver=5.10 +pkgrel=0 pkgdesc="File type identification utility" url="http://www.darwinsys.com/file/" arch="all" @@ -21,4 +21,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/*.la || return 1 } -md5sums="6fd7cd6c4281e68fe9ec6644ce0fac6f file-5.09.tar.gz" +md5sums="4cea34b087b060772511e066e2038196 file-5.10.tar.gz" diff --git a/main/galculator/APKBUILD b/main/galculator/APKBUILD index 1bfff07d46..529559c1bb 100644 --- a/main/galculator/APKBUILD +++ b/main/galculator/APKBUILD @@ -1,18 +1,30 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=galculator pkgver=1.3.4 -pkgrel=2 +pkgrel=3 pkgdesc="GTK+ based scientific calculator" url="http://galculator.sourceforge.net/" arch="all" license="GPL" depends= -makedepends="intltool libglade-dev gtk+-dev" -subpackages="$pkgname-doc" -source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" +makedepends="intltool libglade-dev gtk+-dev autoconf automake libtool flex bison" +subpackages="$pkgname-doc $pkgname-lang" +source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 + galculator-1.3.4-libm.patch" + +_builddir="$srcdir/galculator-$pkgver" +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + libtoolize --force && aclocal && autoconf && automake --add-missing +} build() { - cd "$srcdir/galculator-$pkgver" + cd "$_builddir" ./configure --prefix=/usr || return 1 make || return 1 } @@ -21,4 +33,5 @@ package() { cd "$srcdir/galculator-$pkgver" make DESTDIR="$pkgdir" install || return 1 } -md5sums="d30e6fbf5947bb1c873bc9d5a21046f1 galculator-1.3.4.tar.bz2" +md5sums="d30e6fbf5947bb1c873bc9d5a21046f1 galculator-1.3.4.tar.bz2 +467de62f8737c800eb1db93e501de3cb galculator-1.3.4-libm.patch" diff --git a/main/galculator/galculator-1.3.4-libm.patch b/main/galculator/galculator-1.3.4-libm.patch new file mode 100644 index 0000000000..e7472fe83c --- /dev/null +++ b/main/galculator/galculator-1.3.4-libm.patch @@ -0,0 +1,11 @@ +diff -up galculator-1.3.4/configure.in.libm galculator-1.3.4/configure.in +--- galculator-1.3.4/configure.in.libm 2010-02-16 11:22:31.000000000 +0100 ++++ galculator-1.3.4/configure.in 2010-02-16 11:22:12.000000000 +0100 +@@ -11,6 +11,7 @@ AC_PROG_INTLTOOL(, no-xml) + AC_ISC_POSIX + + AC_HEADER_STDC ++AC_CHECK_LIB([m],[tan]) + + pkg_modules="gtk+-2.0 >= 2.6.0 libglade-2.0 >= 2.0.0" + PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) diff --git a/main/gimp/APKBUILD b/main/gimp/APKBUILD index d297aae275..208d164f7d 100644 --- a/main/gimp/APKBUILD +++ b/main/gimp/APKBUILD @@ -1,20 +1,24 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gimp pkgver=2.6.11 -pkgrel=6 +pkgrel=7 pkgdesc="GNU Image Manipulation Program" url="http://www.gimp.org/" arch="all" license="GPL" makedepends="gtk+-dev libxpm-dev libxmu-dev librsvg-dev dbus-glib-dev libexif-dev desktop-file-utils intltool gegl-dev tiff-dev - jpeg-dev libpng-dev" + jpeg-dev libpng-dev iso-codes lcms-dev poppler-gtk-dev + autoconf automake libtool" install= subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="ftp://ftp.$pkgname.org/pub/$pkgname/v2.6/$pkgname-$pkgver.tar.bz2 gimp-libpng1.5-compat.patch gimp-curl-fix.patch - cve-2011-2896.patch" + cve-2011-2896.patch + gimp-poppler-0.18.patch + gimp-2.6.11-underlinking.patch + " _builddir="${srcdir}/${pkgname}-${pkgver}" prepare() { @@ -28,18 +32,20 @@ prepare() { ;; esac done + libtoolize --force || return 1 + aclocal -I m4macros && autoconf && automake || return 1 } build() { cd "$_builddir" ./configure --prefix=/usr \ + --disable-dependency-tracking \ --sysconfdir=/etc \ --enable-mp \ --enable-gimp-console \ --enable-gimp-remote \ - --disable-devel-docs \ --disable-python \ - --without-gvfs \ + --with-gvfs \ --without-gnomevfs \ --with-gif-compression=lzw \ --without-aa || return 1 @@ -56,4 +62,6 @@ package() { md5sums="bb2939fe13e54fc7255cef5d097bb5dd gimp-2.6.11.tar.bz2 7dfc4006676fdea887f1883ccc6c7772 gimp-libpng1.5-compat.patch 678010acec374e06140e65f7de24ff69 gimp-curl-fix.patch -c317eae455c808b8434e9b600afee648 cve-2011-2896.patch" +c317eae455c808b8434e9b600afee648 cve-2011-2896.patch +bfc73f80e911ed7a7d500d80973469f1 gimp-poppler-0.18.patch +b1fde5d284544440ae2c556b380800ab gimp-2.6.11-underlinking.patch" diff --git a/main/gimp/gimp-2.6.11-underlinking.patch b/main/gimp/gimp-2.6.11-underlinking.patch new file mode 100644 index 0000000000..99ed46be6c --- /dev/null +++ b/main/gimp/gimp-2.6.11-underlinking.patch @@ -0,0 +1,3021 @@ + libgimpthumb/Makefile.am | 2 +- + libgimpthumb/Makefile.in | 2 +- + plug-ins/Makefile.am | 1 + + plug-ins/color-rotate/Makefile.am | 3 +- + plug-ins/color-rotate/Makefile.in | 3 +- + plug-ins/common/Makefile.am | 316 +++++++++++++++++-------------- + plug-ins/common/Makefile.in | 294 +++++++++++++++-------------- + plug-ins/flame/Makefile.am | 3 +- + plug-ins/flame/Makefile.in | 3 +- + plug-ins/fractal-explorer/Makefile.am | 3 +- + plug-ins/fractal-explorer/Makefile.in | 3 +- + plug-ins/gfig/Makefile.am | 3 +- + plug-ins/gfig/Makefile.in | 3 +- + plug-ins/gimpressionist/Makefile.am | 3 +- + plug-ins/gimpressionist/Makefile.in | 3 +- + plug-ins/gradient-flare/Makefile.am | 3 +- + plug-ins/gradient-flare/Makefile.in | 3 +- + plug-ins/ifs-compose/Makefile.am | 3 +- + plug-ins/ifs-compose/Makefile.in | 3 +- + plug-ins/imagemap/Makefile.am | 3 +- + plug-ins/imagemap/Makefile.in | 3 +- + plug-ins/lighting/Makefile.am | 3 +- + plug-ins/lighting/Makefile.in | 3 +- + plug-ins/map-object/Makefile.am | 3 +- + plug-ins/map-object/Makefile.in | 3 +- + plug-ins/pagecurl/Makefile.am | 3 +- + plug-ins/pagecurl/Makefile.in | 3 +- + plug-ins/script-fu/Makefile.am | 3 +- + plug-ins/script-fu/Makefile.in | 3 +- + plug-ins/selection-to-path/Makefile.am | 3 +- + plug-ins/selection-to-path/Makefile.in | 3 +- + 31 files changed, 381 insertions(+), 312 deletions(-) + +diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am +index 2e7b531..1572fa7 100644 +--- a/libgimpthumb/Makefile.am ++++ b/libgimpthumb/Makefile.am +@@ -86,7 +86,7 @@ noinst_PROGRAMS = gimp-thumbnail-list + + gimp_thumbnail_list_SOURCES = gimp-thumbnail-list.c + +-gimp_thumbnail_list_LDADD = libgimpthumb-$(GIMP_API_VERSION).la ++gimp_thumbnail_list_LDADD = libgimpthumb-$(GIMP_API_VERSION).la $(GLIB_LIBS) + + + install-data-local: install-ms-lib install-libtool-import-lib +diff --git a/libgimpthumb/Makefile.in b/libgimpthumb/Makefile.in +index 92ec7d4..d3f333f 100644 +--- a/libgimpthumb/Makefile.in ++++ b/libgimpthumb/Makefile.in +@@ -462,7 +462,7 @@ libgimpthumb_2_0_la_LDFLAGS = \ + + libgimpthumb_2_0_la_LIBADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS) + gimp_thumbnail_list_SOURCES = gimp-thumbnail-list.c +-gimp_thumbnail_list_LDADD = libgimpthumb-$(GIMP_API_VERSION).la ++gimp_thumbnail_list_LDADD = libgimpthumb-$(GIMP_API_VERSION).la $(GLIB_LIBS) + + # + # rules to generate built sources +diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am +index 25eab53..922ce65 100644 +--- a/plug-ins/Makefile.am ++++ b/plug-ins/Makefile.am +@@ -3,6 +3,7 @@ + EXTRA_DIST = \ + makefile.msc + ++LDADD = -lm + + if BUILD_HELP_BROWSER + help_browser = help-browser +diff --git a/plug-ins/color-rotate/Makefile.am b/plug-ins/color-rotate/Makefile.am +index c713c8c..34366cb 100644 +--- a/plug-ins/color-rotate/Makefile.am ++++ b/plug-ins/color-rotate/Makefile.am +@@ -49,4 +49,5 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm +diff --git a/plug-ins/color-rotate/Makefile.in b/plug-ins/color-rotate/Makefile.in +index 0d8ae02..763aac7 100644 +--- a/plug-ins/color-rotate/Makefile.in ++++ b/plug-ins/color-rotate/Makefile.in +@@ -460,7 +460,8 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + all: all-recursive + +diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am +index 66dc6dd..7c39a1f 100644 +--- a/plug-ins/common/Makefile.am ++++ b/plug-ins/common/Makefile.am +@@ -35,6 +35,7 @@ INCLUDES = \ + $(GTK_CFLAGS) \ + -I$(includedir) + ++ + libexec_PROGRAMS = \ + alien-map \ + align-layers \ +@@ -222,7 +223,8 @@ alien_map_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + align_layers_SOURCES = \ + align-layers.c +@@ -238,7 +240,8 @@ align_layers_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + animation_optimize_SOURCES = \ + animation-optimize.c +@@ -251,7 +254,7 @@ animation_optimize_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + animation_play_SOURCES = \ + animation-play.c +@@ -267,7 +270,8 @@ animation_play_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + antialias_SOURCES = \ + antialias.c +@@ -280,7 +284,8 @@ antialias_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + apply_canvas_SOURCES = \ + apply-canvas.c +@@ -296,7 +301,8 @@ apply_canvas_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) ++ -lm + + blinds_SOURCES = \ + blinds.c +@@ -312,7 +318,8 @@ blinds_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + blur_SOURCES = \ + blur.c +@@ -325,7 +332,8 @@ blur_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + blur_gauss_SOURCES = \ + blur-gauss.c +@@ -341,7 +349,8 @@ blur_gauss_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + blur_gauss_selective_CFLAGS = $(MMX_EXTRA_CFLAGS) + +@@ -359,7 +368,8 @@ blur_gauss_selective_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + blur_motion_SOURCES = \ + blur-motion.c +@@ -375,7 +385,8 @@ blur_motion_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + border_average_SOURCES = \ + border-average.c +@@ -391,7 +402,8 @@ border_average_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + bump_map_SOURCES = \ + bump-map.c +@@ -407,7 +419,8 @@ bump_map_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + cartoon_SOURCES = \ + cartoon.c +@@ -423,7 +436,8 @@ cartoon_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + channel_mixer_SOURCES = \ + channel-mixer.c +@@ -439,7 +453,8 @@ channel_mixer_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + checkerboard_SOURCES = \ + checkerboard.c +@@ -455,7 +470,8 @@ checkerboard_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + cml_explorer_SOURCES = \ + cml-explorer.c +@@ -471,7 +487,8 @@ cml_explorer_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + color_cube_analyze_SOURCES = \ + color-cube-analyze.c +@@ -487,7 +504,8 @@ color_cube_analyze_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + color_enhance_SOURCES = \ + color-enhance.c +@@ -503,7 +521,8 @@ color_enhance_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + color_exchange_SOURCES = \ + color-exchange.c +@@ -519,7 +538,8 @@ color_exchange_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + color_to_alpha_SOURCES = \ + color-to-alpha.c +@@ -535,7 +555,8 @@ color_to_alpha_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + colorify_SOURCES = \ + colorify.c +@@ -551,7 +572,8 @@ colorify_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + colormap_remap_SOURCES = \ + colormap-remap.c +@@ -567,7 +589,8 @@ colormap_remap_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + compose_SOURCES = \ + compose.c +@@ -583,7 +606,8 @@ compose_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) ++ -lm + + contrast_normalize_SOURCES = \ + contrast-normalize.c +@@ -596,7 +620,8 @@ contrast_normalize_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) ++ -lm + + contrast_retinex_SOURCES = \ + contrast-retinex.c +@@ -612,7 +637,8 @@ contrast_retinex_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + contrast_stretch_SOURCES = \ + contrast-stretch.c +@@ -625,7 +651,8 @@ contrast_stretch_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + contrast_stretch_hsv_SOURCES = \ + contrast-stretch-hsv.c +@@ -638,7 +665,8 @@ contrast_stretch_hsv_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + convolution_matrix_SOURCES = \ + convolution-matrix.c +@@ -654,7 +682,8 @@ convolution_matrix_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) ++ -lm + + crop_auto_SOURCES = \ + crop-auto.c +@@ -667,7 +696,8 @@ crop_auto_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + crop_zealous_SOURCES = \ + crop-zealous.c +@@ -696,7 +726,7 @@ cubism_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + curve_bend_SOURCES = \ + curve-bend.c +@@ -712,7 +742,7 @@ curve_bend_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + decompose_SOURCES = \ + decompose.c +@@ -728,7 +758,7 @@ decompose_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + deinterlace_SOURCES = \ + deinterlace.c +@@ -744,7 +774,7 @@ deinterlace_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + depth_merge_SOURCES = \ + depth-merge.c +@@ -760,7 +790,7 @@ depth_merge_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + despeckle_SOURCES = \ + despeckle.c +@@ -776,7 +806,7 @@ despeckle_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + destripe_SOURCES = \ + destripe.c +@@ -792,7 +822,7 @@ destripe_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + diffraction_SOURCES = \ + diffraction.c +@@ -808,7 +838,7 @@ diffraction_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + displace_SOURCES = \ + displace.c +@@ -824,7 +854,7 @@ displace_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + edge_SOURCES = \ + edge.c +@@ -840,7 +870,7 @@ edge_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + edge_dog_SOURCES = \ + edge-dog.c +@@ -856,7 +886,7 @@ edge_dog_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + edge_laplace_SOURCES = \ + edge-laplace.c +@@ -869,7 +899,7 @@ edge_laplace_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + edge_neon_SOURCES = \ + edge-neon.c +@@ -885,7 +915,7 @@ edge_neon_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + edge_sobel_SOURCES = \ + edge-sobel.c +@@ -901,7 +931,7 @@ edge_sobel_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + emboss_SOURCES = \ + emboss.c +@@ -917,7 +947,7 @@ emboss_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + engrave_SOURCES = \ + engrave.c +@@ -933,7 +963,7 @@ engrave_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_aa_SOURCES = \ + file-aa.c +@@ -950,7 +980,7 @@ file_aa_LDADD = \ + $(GTK_LIBS) \ + $(AA_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_cel_SOURCES = \ + file-cel.c +@@ -966,7 +996,7 @@ file_cel_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_compressor_SOURCES = \ + file-compressor.c +@@ -979,7 +1009,7 @@ file_compressor_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_csource_SOURCES = \ + file-csource.c +@@ -995,7 +1025,7 @@ file_csource_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_desktop_link_SOURCES = \ + file-desktop-link.c +@@ -1008,7 +1038,7 @@ file_desktop_link_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_dicom_SOURCES = \ + file-dicom.c +@@ -1024,7 +1054,7 @@ file_dicom_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_gbr_SOURCES = \ + file-gbr.c +@@ -1040,7 +1070,7 @@ file_gbr_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_gif_load_SOURCES = \ + file-gif-load.c +@@ -1053,7 +1083,7 @@ file_gif_load_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_gif_save_SOURCES = \ + file-gif-save.c +@@ -1069,7 +1099,7 @@ file_gif_save_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_gih_SOURCES = \ + file-gih.c +@@ -1085,7 +1115,7 @@ file_gih_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_glob_SOURCES = \ + file-glob.c +@@ -1098,7 +1128,7 @@ file_glob_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_header_SOURCES = \ + file-header.c +@@ -1114,7 +1144,7 @@ file_header_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_html_table_SOURCES = \ + file-html-table.c +@@ -1130,7 +1160,7 @@ file_html_table_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_mng_SOURCES = \ + file-mng.c +@@ -1147,7 +1177,7 @@ file_mng_LDADD = \ + $(GTK_LIBS) \ + $(MNG_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_pat_SOURCES = \ + file-pat.c +@@ -1163,7 +1193,7 @@ file_pat_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_pcx_SOURCES = \ + file-pcx.c +@@ -1179,7 +1209,7 @@ file_pcx_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_pdf_CFLAGS = $(POPPLER_CFLAGS) + +@@ -1198,7 +1228,7 @@ file_pdf_LDADD = \ + $(GTK_LIBS) \ + $(POPPLER_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_pix_SOURCES = \ + file-pix.c +@@ -1214,7 +1244,7 @@ file_pix_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_png_CFLAGS = $(PNG_CFLAGS) + +@@ -1233,7 +1263,7 @@ file_png_LDADD = \ + $(GTK_LIBS) \ + $(PNG_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_pnm_SOURCES = \ + file-pnm.c +@@ -1249,7 +1279,7 @@ file_pnm_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_ps_SOURCES = \ + file-ps.c +@@ -1265,7 +1295,7 @@ file_ps_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_psp_SOURCES = \ + file-psp.c +@@ -1282,7 +1312,7 @@ file_psp_LDADD = \ + $(GTK_LIBS) \ + $(Z_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_raw_SOURCES = \ + file-raw.c +@@ -1298,7 +1328,7 @@ file_raw_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_sunras_SOURCES = \ + file-sunras.c +@@ -1314,7 +1344,7 @@ file_sunras_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_svg_CFLAGS = $(SVG_CFLAGS) + +@@ -1333,7 +1363,7 @@ file_svg_LDADD = \ + $(GTK_LIBS) \ + $(SVG_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_tga_SOURCES = \ + file-tga.c +@@ -1349,7 +1379,7 @@ file_tga_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_tiff_load_SOURCES = \ + file-tiff-load.c +@@ -1366,7 +1396,7 @@ file_tiff_load_LDADD = \ + $(GTK_LIBS) \ + $(TIFF_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_tiff_save_SOURCES = \ + file-tiff-save.c +@@ -1383,7 +1413,7 @@ file_tiff_save_LDADD = \ + $(GTK_LIBS) \ + $(TIFF_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_wmf_CFLAGS = $(WMF_CFLAGS) + +@@ -1402,7 +1432,7 @@ file_wmf_LDADD = \ + $(GTK_LIBS) \ + $(WMF_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_xbm_SOURCES = \ + file-xbm.c +@@ -1418,7 +1448,7 @@ file_xbm_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_xpm_SOURCES = \ + file-xpm.c +@@ -1435,7 +1465,7 @@ file_xpm_LDADD = \ + $(GTK_LIBS) \ + $(XPM_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_xwd_SOURCES = \ + file-xwd.c +@@ -1451,7 +1481,7 @@ file_xwd_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + film_SOURCES = \ + film.c +@@ -1467,7 +1497,7 @@ film_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + filter_pack_SOURCES = \ + filter-pack.c +@@ -1483,7 +1513,7 @@ filter_pack_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + fractal_trace_SOURCES = \ + fractal-trace.c +@@ -1499,7 +1529,7 @@ fractal_trace_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + gee_SOURCES = \ + gee.c +@@ -1515,7 +1545,7 @@ gee_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + gee_zoom_SOURCES = \ + gee-zoom.c +@@ -1531,7 +1561,7 @@ gee_zoom_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + gradient_map_SOURCES = \ + gradient-map.c +@@ -1544,7 +1574,7 @@ gradient_map_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + grid_SOURCES = \ + grid.c +@@ -1560,7 +1590,7 @@ grid_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + guillotine_SOURCES = \ + guillotine.c +@@ -1573,7 +1603,7 @@ guillotine_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + hot_SOURCES = \ + hot.c +@@ -1589,7 +1619,7 @@ hot_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + illusion_SOURCES = \ + illusion.c +@@ -1605,7 +1635,7 @@ illusion_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + iwarp_SOURCES = \ + iwarp.c +@@ -1621,7 +1651,7 @@ iwarp_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + jigsaw_SOURCES = \ + jigsaw.c +@@ -1637,7 +1667,7 @@ jigsaw_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + lcms_CFLAGS = $(LCMS_CFLAGS) + +@@ -1656,7 +1686,7 @@ lcms_LDADD = \ + $(GTK_LIBS) \ + $(LCMS_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + lens_apply_SOURCES = \ + lens-apply.c +@@ -1672,7 +1702,7 @@ lens_apply_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + lens_distortion_SOURCES = \ + lens-distortion.c +@@ -1688,7 +1718,7 @@ lens_distortion_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + lens_flare_SOURCES = \ + lens-flare.c +@@ -1704,7 +1734,7 @@ lens_flare_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + mail_SOURCES = \ + mail.c +@@ -1720,7 +1750,7 @@ mail_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + max_rgb_SOURCES = \ + max-rgb.c +@@ -1736,7 +1766,7 @@ max_rgb_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + mosaic_SOURCES = \ + mosaic.c +@@ -1752,7 +1782,7 @@ mosaic_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + newsprint_SOURCES = \ + newsprint.c +@@ -1768,7 +1798,7 @@ newsprint_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + nl_filter_SOURCES = \ + nl-filter.c +@@ -1784,7 +1814,7 @@ nl_filter_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + noise_hsv_SOURCES = \ + noise-hsv.c +@@ -1800,7 +1830,7 @@ noise_hsv_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + noise_randomize_SOURCES = \ + noise-randomize.c +@@ -1816,7 +1846,7 @@ noise_randomize_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + noise_rgb_SOURCES = \ + noise-rgb.c +@@ -1832,7 +1862,7 @@ noise_rgb_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + noise_solid_SOURCES = \ + noise-solid.c +@@ -1848,7 +1878,7 @@ noise_solid_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + noise_spread_SOURCES = \ + noise-spread.c +@@ -1864,7 +1894,7 @@ noise_spread_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + nova_SOURCES = \ + nova.c +@@ -1880,7 +1910,7 @@ nova_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + oilify_SOURCES = \ + oilify.c +@@ -1896,7 +1926,7 @@ oilify_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + photocopy_SOURCES = \ + photocopy.c +@@ -1912,7 +1942,7 @@ photocopy_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + pixelize_SOURCES = \ + pixelize.c +@@ -1928,7 +1958,7 @@ pixelize_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + plasma_SOURCES = \ + plasma.c +@@ -1944,7 +1974,7 @@ plasma_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + plugin_browser_SOURCES = \ + plugin-browser.c +@@ -1960,7 +1990,7 @@ plugin_browser_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + polar_coords_SOURCES = \ + polar-coords.c +@@ -1976,7 +2006,7 @@ polar_coords_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + procedure_browser_SOURCES = \ + procedure-browser.c +@@ -1992,7 +2022,7 @@ procedure_browser_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + qbist_SOURCES = \ + qbist.c +@@ -2008,7 +2038,7 @@ qbist_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + red_eye_removal_SOURCES = \ + red-eye-removal.c +@@ -2024,7 +2054,7 @@ red_eye_removal_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + ripple_SOURCES = \ + ripple.c +@@ -2040,7 +2070,7 @@ ripple_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + rotate_SOURCES = \ + rotate.c +@@ -2053,7 +2083,7 @@ rotate_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + sample_colorize_SOURCES = \ + sample-colorize.c +@@ -2069,7 +2099,7 @@ sample_colorize_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + screenshot_CFLAGS = $(XFIXES_CFLAGS) + +@@ -2088,7 +2118,7 @@ screenshot_LDADD = \ + $(GTK_LIBS) \ + $(SCREENSHOT_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + semi_flatten_SOURCES = \ + semi-flatten.c +@@ -2101,7 +2131,7 @@ semi_flatten_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + sharpen_SOURCES = \ + sharpen.c +@@ -2117,7 +2147,7 @@ sharpen_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + shift_SOURCES = \ + shift.c +@@ -2133,7 +2163,7 @@ shift_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + sinus_SOURCES = \ + sinus.c +@@ -2149,7 +2179,7 @@ sinus_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + smooth_palette_SOURCES = \ + smooth-palette.c +@@ -2165,7 +2195,7 @@ smooth_palette_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + softglow_SOURCES = \ + softglow.c +@@ -2181,7 +2211,7 @@ softglow_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + sparkle_SOURCES = \ + sparkle.c +@@ -2197,7 +2227,7 @@ sparkle_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + sphere_designer_SOURCES = \ + sphere-designer.c +@@ -2213,7 +2243,7 @@ sphere_designer_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + threshold_alpha_SOURCES = \ + threshold-alpha.c +@@ -2229,7 +2259,7 @@ threshold_alpha_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + tile_SOURCES = \ + tile.c +@@ -2245,7 +2275,7 @@ tile_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + tile_glass_SOURCES = \ + tile-glass.c +@@ -2261,7 +2291,7 @@ tile_glass_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + tile_paper_SOURCES = \ + tile-paper.c +@@ -2277,7 +2307,7 @@ tile_paper_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + tile_seamless_SOURCES = \ + tile-seamless.c +@@ -2290,7 +2320,7 @@ tile_seamless_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + tile_small_SOURCES = \ + tile-small.c +@@ -2306,7 +2336,7 @@ tile_small_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + unit_editor_SOURCES = \ + unit-editor.c +@@ -2322,7 +2352,7 @@ unit_editor_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + unsharp_mask_SOURCES = \ + unsharp-mask.c +@@ -2338,7 +2368,7 @@ unsharp_mask_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + value_invert_SOURCES = \ + value-invert.c +@@ -2351,7 +2381,7 @@ value_invert_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + value_propagate_SOURCES = \ + value-propagate.c +@@ -2367,7 +2397,7 @@ value_propagate_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + van_gogh_lic_SOURCES = \ + van-gogh-lic.c +@@ -2383,7 +2413,7 @@ van_gogh_lic_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + video_SOURCES = \ + video.c +@@ -2399,7 +2429,7 @@ video_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + warp_SOURCES = \ + warp.c +@@ -2415,7 +2445,7 @@ warp_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + waves_SOURCES = \ + waves.c +@@ -2431,7 +2461,7 @@ waves_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + web_browser_SOURCES = \ + web-browser.c +@@ -2444,7 +2474,7 @@ web_browser_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + whirl_pinch_SOURCES = \ + whirl-pinch.c +@@ -2460,7 +2490,7 @@ whirl_pinch_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + wind_SOURCES = \ + wind.c +@@ -2476,4 +2506,4 @@ wind_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm +diff --git a/plug-ins/common/Makefile.in b/plug-ins/common/Makefile.in +index 5fb299c..47811b0 100644 +--- a/plug-ins/common/Makefile.in ++++ b/plug-ins/common/Makefile.in +@@ -1458,6 +1458,8 @@ INCLUDES = \ + alien_map_SOURCES = \ + alien-map.c + ++LD = -lm ++ + alien_map_LDADD = \ + $(libgimpui) \ + $(libgimpwidgets) \ +@@ -1469,7 +1471,7 @@ alien_map_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + align_layers_SOURCES = \ + align-layers.c +@@ -1485,7 +1487,8 @@ align_layers_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + animation_optimize_SOURCES = \ + animation-optimize.c +@@ -1498,7 +1501,7 @@ animation_optimize_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + animation_play_SOURCES = \ + animation-play.c +@@ -1514,7 +1517,8 @@ animation_play_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + antialias_SOURCES = \ + antialias.c +@@ -1527,7 +1531,7 @@ antialias_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + apply_canvas_SOURCES = \ + apply-canvas.c +@@ -1559,7 +1563,7 @@ blinds_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + blur_SOURCES = \ + blur.c +@@ -1572,7 +1576,8 @@ blur_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + blur_gauss_SOURCES = \ + blur-gauss.c +@@ -1588,7 +1593,8 @@ blur_gauss_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + blur_gauss_selective_CFLAGS = $(MMX_EXTRA_CFLAGS) + blur_gauss_selective_SOURCES = \ +@@ -1605,7 +1611,7 @@ blur_gauss_selective_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + blur_motion_SOURCES = \ + blur-motion.c +@@ -1621,7 +1627,8 @@ blur_motion_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + border_average_SOURCES = \ + border-average.c +@@ -1637,7 +1644,8 @@ border_average_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + bump_map_SOURCES = \ + bump-map.c +@@ -1653,7 +1661,8 @@ bump_map_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + cartoon_SOURCES = \ + cartoon.c +@@ -1669,7 +1678,8 @@ cartoon_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + channel_mixer_SOURCES = \ + channel-mixer.c +@@ -1685,7 +1695,8 @@ channel_mixer_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + checkerboard_SOURCES = \ + checkerboard.c +@@ -1701,7 +1712,7 @@ checkerboard_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + cml_explorer_SOURCES = \ + cml-explorer.c +@@ -1717,7 +1728,7 @@ cml_explorer_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + color_cube_analyze_SOURCES = \ + color-cube-analyze.c +@@ -1733,7 +1744,7 @@ color_cube_analyze_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + color_enhance_SOURCES = \ + color-enhance.c +@@ -1749,7 +1760,8 @@ color_enhance_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + color_exchange_SOURCES = \ + color-exchange.c +@@ -1765,7 +1777,7 @@ color_exchange_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + color_to_alpha_SOURCES = \ + color-to-alpha.c +@@ -1797,7 +1809,7 @@ colorify_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + colormap_remap_SOURCES = \ + colormap-remap.c +@@ -1829,7 +1841,7 @@ compose_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + contrast_normalize_SOURCES = \ + contrast-normalize.c +@@ -1842,7 +1854,7 @@ contrast_normalize_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + contrast_retinex_SOURCES = \ + contrast-retinex.c +@@ -1858,7 +1870,7 @@ contrast_retinex_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + contrast_stretch_SOURCES = \ + contrast-stretch.c +@@ -1871,7 +1883,7 @@ contrast_stretch_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + contrast_stretch_hsv_SOURCES = \ + contrast-stretch-hsv.c +@@ -1884,7 +1896,7 @@ contrast_stretch_hsv_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + convolution_matrix_SOURCES = \ + convolution-matrix.c +@@ -1900,7 +1912,7 @@ convolution_matrix_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + crop_auto_SOURCES = \ + crop-auto.c +@@ -1913,7 +1925,7 @@ crop_auto_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + crop_zealous_SOURCES = \ + crop-zealous.c +@@ -1926,7 +1938,7 @@ crop_zealous_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + cubism_SOURCES = \ + cubism.c +@@ -1942,7 +1954,7 @@ cubism_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + curve_bend_SOURCES = \ + curve-bend.c +@@ -1958,7 +1970,7 @@ curve_bend_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + decompose_SOURCES = \ + decompose.c +@@ -1974,7 +1986,7 @@ decompose_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + deinterlace_SOURCES = \ + deinterlace.c +@@ -1990,7 +2002,7 @@ deinterlace_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + depth_merge_SOURCES = \ + depth-merge.c +@@ -2006,7 +2018,7 @@ depth_merge_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + despeckle_SOURCES = \ + despeckle.c +@@ -2022,7 +2034,7 @@ despeckle_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + destripe_SOURCES = \ + destripe.c +@@ -2038,7 +2050,7 @@ destripe_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + diffraction_SOURCES = \ + diffraction.c +@@ -2054,7 +2066,7 @@ diffraction_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + displace_SOURCES = \ + displace.c +@@ -2070,7 +2082,7 @@ displace_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + edge_SOURCES = \ + edge.c +@@ -2086,7 +2098,7 @@ edge_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + edge_dog_SOURCES = \ + edge-dog.c +@@ -2102,7 +2114,7 @@ edge_dog_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + edge_laplace_SOURCES = \ + edge-laplace.c +@@ -2115,7 +2127,7 @@ edge_laplace_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + edge_neon_SOURCES = \ + edge-neon.c +@@ -2131,7 +2143,7 @@ edge_neon_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + edge_sobel_SOURCES = \ + edge-sobel.c +@@ -2147,7 +2159,7 @@ edge_sobel_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + emboss_SOURCES = \ + emboss.c +@@ -2163,7 +2175,7 @@ emboss_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + engrave_SOURCES = \ + engrave.c +@@ -2179,7 +2191,7 @@ engrave_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_aa_SOURCES = \ + file-aa.c +@@ -2196,7 +2208,7 @@ file_aa_LDADD = \ + $(GTK_LIBS) \ + $(AA_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_cel_SOURCES = \ + file-cel.c +@@ -2212,7 +2224,7 @@ file_cel_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_compressor_SOURCES = \ + file-compressor.c +@@ -2225,7 +2237,7 @@ file_compressor_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_csource_SOURCES = \ + file-csource.c +@@ -2241,7 +2253,7 @@ file_csource_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_desktop_link_SOURCES = \ + file-desktop-link.c +@@ -2254,7 +2266,7 @@ file_desktop_link_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_dicom_SOURCES = \ + file-dicom.c +@@ -2270,7 +2282,7 @@ file_dicom_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_gbr_SOURCES = \ + file-gbr.c +@@ -2286,7 +2298,7 @@ file_gbr_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_gif_load_SOURCES = \ + file-gif-load.c +@@ -2299,7 +2311,7 @@ file_gif_load_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_gif_save_SOURCES = \ + file-gif-save.c +@@ -2315,7 +2327,7 @@ file_gif_save_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_gih_SOURCES = \ + file-gih.c +@@ -2331,7 +2343,7 @@ file_gih_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_glob_SOURCES = \ + file-glob.c +@@ -2344,7 +2356,7 @@ file_glob_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_header_SOURCES = \ + file-header.c +@@ -2360,7 +2372,7 @@ file_header_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_html_table_SOURCES = \ + file-html-table.c +@@ -2376,7 +2388,7 @@ file_html_table_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_mng_SOURCES = \ + file-mng.c +@@ -2393,7 +2405,7 @@ file_mng_LDADD = \ + $(GTK_LIBS) \ + $(MNG_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_pat_SOURCES = \ + file-pat.c +@@ -2409,7 +2421,7 @@ file_pat_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_pcx_SOURCES = \ + file-pcx.c +@@ -2425,7 +2437,7 @@ file_pcx_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_pdf_CFLAGS = $(POPPLER_CFLAGS) + file_pdf_SOURCES = \ +@@ -2443,7 +2455,7 @@ file_pdf_LDADD = \ + $(GTK_LIBS) \ + $(POPPLER_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_pix_SOURCES = \ + file-pix.c +@@ -2459,7 +2471,7 @@ file_pix_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_png_CFLAGS = $(PNG_CFLAGS) + file_png_SOURCES = \ +@@ -2477,7 +2489,7 @@ file_png_LDADD = \ + $(GTK_LIBS) \ + $(PNG_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_pnm_SOURCES = \ + file-pnm.c +@@ -2493,7 +2505,7 @@ file_pnm_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_ps_SOURCES = \ + file-ps.c +@@ -2509,7 +2521,7 @@ file_ps_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_psp_SOURCES = \ + file-psp.c +@@ -2526,7 +2538,7 @@ file_psp_LDADD = \ + $(GTK_LIBS) \ + $(Z_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_raw_SOURCES = \ + file-raw.c +@@ -2542,7 +2554,7 @@ file_raw_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_sunras_SOURCES = \ + file-sunras.c +@@ -2558,7 +2570,7 @@ file_sunras_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_svg_CFLAGS = $(SVG_CFLAGS) + file_svg_SOURCES = \ +@@ -2576,7 +2588,7 @@ file_svg_LDADD = \ + $(GTK_LIBS) \ + $(SVG_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_tga_SOURCES = \ + file-tga.c +@@ -2592,7 +2604,7 @@ file_tga_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_tiff_load_SOURCES = \ + file-tiff-load.c +@@ -2609,7 +2621,7 @@ file_tiff_load_LDADD = \ + $(GTK_LIBS) \ + $(TIFF_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_tiff_save_SOURCES = \ + file-tiff-save.c +@@ -2626,7 +2638,7 @@ file_tiff_save_LDADD = \ + $(GTK_LIBS) \ + $(TIFF_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_wmf_CFLAGS = $(WMF_CFLAGS) + file_wmf_SOURCES = \ +@@ -2644,7 +2656,7 @@ file_wmf_LDADD = \ + $(GTK_LIBS) \ + $(WMF_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_xbm_SOURCES = \ + file-xbm.c +@@ -2660,7 +2672,7 @@ file_xbm_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_xpm_SOURCES = \ + file-xpm.c +@@ -2677,7 +2689,7 @@ file_xpm_LDADD = \ + $(GTK_LIBS) \ + $(XPM_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + file_xwd_SOURCES = \ + file-xwd.c +@@ -2693,7 +2705,7 @@ file_xwd_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + film_SOURCES = \ + film.c +@@ -2709,7 +2721,7 @@ film_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + filter_pack_SOURCES = \ + filter-pack.c +@@ -2725,7 +2737,7 @@ filter_pack_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + fractal_trace_SOURCES = \ + fractal-trace.c +@@ -2741,7 +2753,7 @@ fractal_trace_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + gee_SOURCES = \ + gee.c +@@ -2757,7 +2769,7 @@ gee_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + gee_zoom_SOURCES = \ + gee-zoom.c +@@ -2773,7 +2785,7 @@ gee_zoom_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + gradient_map_SOURCES = \ + gradient-map.c +@@ -2786,7 +2798,7 @@ gradient_map_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + grid_SOURCES = \ + grid.c +@@ -2802,7 +2814,7 @@ grid_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + guillotine_SOURCES = \ + guillotine.c +@@ -2815,7 +2827,7 @@ guillotine_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + hot_SOURCES = \ + hot.c +@@ -2831,7 +2843,7 @@ hot_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + illusion_SOURCES = \ + illusion.c +@@ -2847,7 +2859,7 @@ illusion_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + iwarp_SOURCES = \ + iwarp.c +@@ -2863,7 +2875,7 @@ iwarp_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + jigsaw_SOURCES = \ + jigsaw.c +@@ -2879,7 +2891,7 @@ jigsaw_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + lcms_CFLAGS = $(LCMS_CFLAGS) + lcms_SOURCES = \ +@@ -2897,7 +2909,7 @@ lcms_LDADD = \ + $(GTK_LIBS) \ + $(LCMS_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + lens_apply_SOURCES = \ + lens-apply.c +@@ -2913,7 +2925,7 @@ lens_apply_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + lens_distortion_SOURCES = \ + lens-distortion.c +@@ -2929,7 +2941,7 @@ lens_distortion_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + lens_flare_SOURCES = \ + lens-flare.c +@@ -2945,7 +2957,7 @@ lens_flare_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + mail_SOURCES = \ + mail.c +@@ -2961,7 +2973,7 @@ mail_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + max_rgb_SOURCES = \ + max-rgb.c +@@ -2977,7 +2989,7 @@ max_rgb_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + mosaic_SOURCES = \ + mosaic.c +@@ -2993,7 +3005,7 @@ mosaic_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + newsprint_SOURCES = \ + newsprint.c +@@ -3009,7 +3021,7 @@ newsprint_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + nl_filter_SOURCES = \ + nl-filter.c +@@ -3025,7 +3037,7 @@ nl_filter_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + noise_hsv_SOURCES = \ + noise-hsv.c +@@ -3041,7 +3053,7 @@ noise_hsv_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + noise_randomize_SOURCES = \ + noise-randomize.c +@@ -3057,7 +3069,7 @@ noise_randomize_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + noise_rgb_SOURCES = \ + noise-rgb.c +@@ -3073,7 +3085,7 @@ noise_rgb_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + noise_solid_SOURCES = \ + noise-solid.c +@@ -3089,7 +3101,7 @@ noise_solid_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + noise_spread_SOURCES = \ + noise-spread.c +@@ -3105,7 +3117,7 @@ noise_spread_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + nova_SOURCES = \ + nova.c +@@ -3121,7 +3133,7 @@ nova_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + oilify_SOURCES = \ + oilify.c +@@ -3137,7 +3149,7 @@ oilify_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + photocopy_SOURCES = \ + photocopy.c +@@ -3153,7 +3165,7 @@ photocopy_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + pixelize_SOURCES = \ + pixelize.c +@@ -3169,7 +3181,7 @@ pixelize_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + plasma_SOURCES = \ + plasma.c +@@ -3185,7 +3197,7 @@ plasma_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + plugin_browser_SOURCES = \ + plugin-browser.c +@@ -3201,7 +3213,7 @@ plugin_browser_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + polar_coords_SOURCES = \ + polar-coords.c +@@ -3217,7 +3229,7 @@ polar_coords_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + procedure_browser_SOURCES = \ + procedure-browser.c +@@ -3233,7 +3245,7 @@ procedure_browser_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + qbist_SOURCES = \ + qbist.c +@@ -3249,7 +3261,7 @@ qbist_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + red_eye_removal_SOURCES = \ + red-eye-removal.c +@@ -3265,7 +3277,7 @@ red_eye_removal_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + ripple_SOURCES = \ + ripple.c +@@ -3281,7 +3293,7 @@ ripple_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + rotate_SOURCES = \ + rotate.c +@@ -3294,7 +3306,7 @@ rotate_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + sample_colorize_SOURCES = \ + sample-colorize.c +@@ -3310,7 +3322,7 @@ sample_colorize_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + screenshot_CFLAGS = $(XFIXES_CFLAGS) + screenshot_SOURCES = \ +@@ -3328,7 +3340,7 @@ screenshot_LDADD = \ + $(GTK_LIBS) \ + $(SCREENSHOT_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + semi_flatten_SOURCES = \ + semi-flatten.c +@@ -3341,7 +3353,7 @@ semi_flatten_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + sharpen_SOURCES = \ + sharpen.c +@@ -3357,7 +3369,7 @@ sharpen_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + shift_SOURCES = \ + shift.c +@@ -3373,7 +3385,7 @@ shift_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + sinus_SOURCES = \ + sinus.c +@@ -3389,7 +3401,7 @@ sinus_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + smooth_palette_SOURCES = \ + smooth-palette.c +@@ -3405,7 +3417,7 @@ smooth_palette_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + softglow_SOURCES = \ + softglow.c +@@ -3421,7 +3433,7 @@ softglow_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + sparkle_SOURCES = \ + sparkle.c +@@ -3437,7 +3449,7 @@ sparkle_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + sphere_designer_SOURCES = \ + sphere-designer.c +@@ -3453,7 +3465,7 @@ sphere_designer_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + threshold_alpha_SOURCES = \ + threshold-alpha.c +@@ -3469,7 +3481,7 @@ threshold_alpha_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + tile_SOURCES = \ + tile.c +@@ -3485,7 +3497,7 @@ tile_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + tile_glass_SOURCES = \ + tile-glass.c +@@ -3501,7 +3513,7 @@ tile_glass_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + tile_paper_SOURCES = \ + tile-paper.c +@@ -3517,7 +3529,7 @@ tile_paper_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + tile_seamless_SOURCES = \ + tile-seamless.c +@@ -3530,7 +3542,7 @@ tile_seamless_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + tile_small_SOURCES = \ + tile-small.c +@@ -3546,7 +3558,7 @@ tile_small_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + unit_editor_SOURCES = \ + unit-editor.c +@@ -3562,7 +3574,7 @@ unit_editor_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + unsharp_mask_SOURCES = \ + unsharp-mask.c +@@ -3578,7 +3590,7 @@ unsharp_mask_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + value_invert_SOURCES = \ + value-invert.c +@@ -3591,7 +3603,7 @@ value_invert_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + value_propagate_SOURCES = \ + value-propagate.c +@@ -3607,7 +3619,7 @@ value_propagate_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + van_gogh_lic_SOURCES = \ + van-gogh-lic.c +@@ -3623,7 +3635,7 @@ van_gogh_lic_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + video_SOURCES = \ + video.c +@@ -3639,7 +3651,7 @@ video_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + warp_SOURCES = \ + warp.c +@@ -3655,7 +3667,7 @@ warp_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + waves_SOURCES = \ + waves.c +@@ -3671,7 +3683,7 @@ waves_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + web_browser_SOURCES = \ + web-browser.c +@@ -3684,7 +3696,7 @@ web_browser_LDADD = \ + $(libgimpbase) \ + $(GLIB_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + whirl_pinch_SOURCES = \ + whirl-pinch.c +@@ -3700,7 +3712,7 @@ whirl_pinch_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + wind_SOURCES = \ + wind.c +@@ -3716,7 +3728,7 @@ wind_LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) -lm + + all: all-am + +diff --git a/plug-ins/flame/Makefile.am b/plug-ins/flame/Makefile.am +index 262a9aa..cf41f38 100644 +--- a/plug-ins/flame/Makefile.am ++++ b/plug-ins/flame/Makefile.am +@@ -45,4 +45,5 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm +diff --git a/plug-ins/flame/Makefile.in b/plug-ins/flame/Makefile.in +index 5ebbfa1..23c93ba 100644 +--- a/plug-ins/flame/Makefile.in ++++ b/plug-ins/flame/Makefile.in +@@ -416,7 +416,8 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + all: all-am + +diff --git a/plug-ins/fractal-explorer/Makefile.am b/plug-ins/fractal-explorer/Makefile.am +index 16ae83a..ac47d9f 100644 +--- a/plug-ins/fractal-explorer/Makefile.am ++++ b/plug-ins/fractal-explorer/Makefile.am +@@ -41,4 +41,5 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm +diff --git a/plug-ins/fractal-explorer/Makefile.in b/plug-ins/fractal-explorer/Makefile.in +index 0d9363c..c4753e2 100644 +--- a/plug-ins/fractal-explorer/Makefile.in ++++ b/plug-ins/fractal-explorer/Makefile.in +@@ -450,7 +450,8 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + all: all-recursive + +diff --git a/plug-ins/gfig/Makefile.am b/plug-ins/gfig/Makefile.am +index b0a3ae7..a3a7194 100644 +--- a/plug-ins/gfig/Makefile.am ++++ b/plug-ins/gfig/Makefile.am +@@ -72,4 +72,5 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm +diff --git a/plug-ins/gfig/Makefile.in b/plug-ins/gfig/Makefile.in +index 730291e..5bcb2a1 100644 +--- a/plug-ins/gfig/Makefile.in ++++ b/plug-ins/gfig/Makefile.in +@@ -485,7 +485,8 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + all: all-recursive + +diff --git a/plug-ins/gimpressionist/Makefile.am b/plug-ins/gimpressionist/Makefile.am +index bdca573..1decc10 100644 +--- a/plug-ins/gimpressionist/Makefile.am ++++ b/plug-ins/gimpressionist/Makefile.am +@@ -72,6 +72,7 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + EXTRA_DIST = README +diff --git a/plug-ins/gimpressionist/Makefile.in b/plug-ins/gimpressionist/Makefile.in +index 7428a5d..d539ec3 100644 +--- a/plug-ins/gimpressionist/Makefile.in ++++ b/plug-ins/gimpressionist/Makefile.in +@@ -487,7 +487,8 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + EXTRA_DIST = README + all: all-recursive +diff --git a/plug-ins/gradient-flare/Makefile.am b/plug-ins/gradient-flare/Makefile.am +index 8597665..958ec36 100644 +--- a/plug-ins/gradient-flare/Makefile.am ++++ b/plug-ins/gradient-flare/Makefile.am +@@ -37,4 +37,5 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm +diff --git a/plug-ins/gradient-flare/Makefile.in b/plug-ins/gradient-flare/Makefile.in +index 7682317..ae821fc 100644 +--- a/plug-ins/gradient-flare/Makefile.in ++++ b/plug-ins/gradient-flare/Makefile.in +@@ -444,7 +444,8 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + all: all-recursive + +diff --git a/plug-ins/ifs-compose/Makefile.am b/plug-ins/ifs-compose/Makefile.am +index 6e2de02..0acc963 100644 +--- a/plug-ins/ifs-compose/Makefile.am ++++ b/plug-ins/ifs-compose/Makefile.am +@@ -41,4 +41,5 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm +diff --git a/plug-ins/ifs-compose/Makefile.in b/plug-ins/ifs-compose/Makefile.in +index cd1fcf7..002cce2 100644 +--- a/plug-ins/ifs-compose/Makefile.in ++++ b/plug-ins/ifs-compose/Makefile.in +@@ -412,7 +412,8 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + all: all-am + +diff --git a/plug-ins/imagemap/Makefile.am b/plug-ins/imagemap/Makefile.am +index 1c06f94..940ad74 100644 +--- a/plug-ins/imagemap/Makefile.am ++++ b/plug-ins/imagemap/Makefile.am +@@ -139,7 +139,8 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + CLEANFILES = y.tab.c y.tab.h + +diff --git a/plug-ins/imagemap/Makefile.in b/plug-ins/imagemap/Makefile.in +index 11e3368..0273db1 100644 +--- a/plug-ins/imagemap/Makefile.in ++++ b/plug-ins/imagemap/Makefile.in +@@ -578,7 +578,8 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + CLEANFILES = y.tab.c y.tab.h + LEX = flex +diff --git a/plug-ins/lighting/Makefile.am b/plug-ins/lighting/Makefile.am +index 1bf79fc..2e2899b 100644 +--- a/plug-ins/lighting/Makefile.am ++++ b/plug-ins/lighting/Makefile.am +@@ -51,4 +51,5 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm +diff --git a/plug-ins/lighting/Makefile.in b/plug-ins/lighting/Makefile.in +index 53cf170..142433c 100644 +--- a/plug-ins/lighting/Makefile.in ++++ b/plug-ins/lighting/Makefile.in +@@ -462,7 +462,8 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + all: all-recursive + +diff --git a/plug-ins/map-object/Makefile.am b/plug-ins/map-object/Makefile.am +index 2f7b7bc..483b29b 100644 +--- a/plug-ins/map-object/Makefile.am ++++ b/plug-ins/map-object/Makefile.am +@@ -51,4 +51,5 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm +diff --git a/plug-ins/map-object/Makefile.in b/plug-ins/map-object/Makefile.in +index e270c37..ea59968 100644 +--- a/plug-ins/map-object/Makefile.in ++++ b/plug-ins/map-object/Makefile.in +@@ -425,7 +425,8 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + all: all-am + +diff --git a/plug-ins/pagecurl/Makefile.am b/plug-ins/pagecurl/Makefile.am +index 2a6eafb..40680c4 100644 +--- a/plug-ins/pagecurl/Makefile.am ++++ b/plug-ins/pagecurl/Makefile.am +@@ -42,7 +42,8 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + + PAGECURL_IMAGES = \ +diff --git a/plug-ins/pagecurl/Makefile.in b/plug-ins/pagecurl/Makefile.in +index c8bd4f2..c157820 100644 +--- a/plug-ins/pagecurl/Makefile.in ++++ b/plug-ins/pagecurl/Makefile.in +@@ -411,7 +411,8 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + PAGECURL_IMAGES = \ + curl0.png \ +diff --git a/plug-ins/script-fu/Makefile.am b/plug-ins/script-fu/Makefile.am +index 3075b83..692b86e 100644 +--- a/plug-ins/script-fu/Makefile.am ++++ b/plug-ins/script-fu/Makefile.am +@@ -74,4 +74,5 @@ LDADD = \ + $(SOCKET_LIBS) \ + $(WINSOCK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm +diff --git a/plug-ins/script-fu/Makefile.in b/plug-ins/script-fu/Makefile.in +index 65c8b31..3d0fd50 100644 +--- a/plug-ins/script-fu/Makefile.in ++++ b/plug-ins/script-fu/Makefile.in +@@ -487,7 +487,8 @@ LDADD = \ + $(SOCKET_LIBS) \ + $(WINSOCK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + all: all-recursive + +diff --git a/plug-ins/selection-to-path/Makefile.am b/plug-ins/selection-to-path/Makefile.am +index 7e3ac65..385f5ea 100644 +--- a/plug-ins/selection-to-path/Makefile.am ++++ b/plug-ins/selection-to-path/Makefile.am +@@ -59,4 +59,5 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm +diff --git a/plug-ins/selection-to-path/Makefile.in b/plug-ins/selection-to-path/Makefile.in +index d4cbdf1..e4b6d25 100644 +--- a/plug-ins/selection-to-path/Makefile.in ++++ b/plug-ins/selection-to-path/Makefile.in +@@ -433,7 +433,8 @@ LDADD = \ + $(libgimpbase) \ + $(GTK_LIBS) \ + $(RT_LIBS) \ +- $(INTLLIBS) ++ $(INTLLIBS) \ ++ -lm + + all: all-am + diff --git a/main/gimp/gimp-poppler-0.18.patch b/main/gimp/gimp-poppler-0.18.patch new file mode 100644 index 0000000000..0715460bca --- /dev/null +++ b/main/gimp/gimp-poppler-0.18.patch @@ -0,0 +1,476 @@ +From 69f69eed816b89be9a01a48a1f0643d1fd496118 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen <nils@redhat.com> +Date: Fri, 6 May 2011 11:58:44 +0200 +Subject: [PATCH] patch: poppler-0.17 + +Squashed commit of the following: + +commit 529d940222dfc352d41fbf72de29134421aa4002 +Author: Nils Philippsen <nils@redhat.com> +Date: Fri May 6 11:50:30 2011 +0200 + + use code based on pixbufs instead of cairo surfaces + + this is done to avoid adding to libgimp, thanks to Mukund Sivaraman for + hints how to do this + +commit f8671d8767d4cdab830dc06310e96c63a88ec0fd +Author: Mukund Sivaraman <muks@banu.com> +Date: Thu Apr 21 13:57:13 2011 +0530 + + file-pdf-load: Update attribution, removing bogus copyright + (cherry picked from commit e999122e0b20b6ccd6bde3ce039bb64068fc0019) + +commit 89a78f2590d298dac2f42e6d9a3016fc5d672c70 +Author: Nils Philippsen <nils@redhat.com> +Date: Thu Apr 21 13:52:18 2011 +0200 + + file-pdf-load: Use better API + cleanups + + * fixes issues with poppler 0.17 completely + * uses new libgimp API to pass surfaces instead of pixbufs + * uses GTK+ 3 API to convert surfaces to pixbufs where available + (backported from commit 7bdadd80ba479d6ff904e276d805e16f6b940ee2) + +commit 4e92302c4a14a961f112587a0ad86696c88da2f8 +Author: Nils Philippsen <nils@redhat.com> +Date: Thu Apr 21 13:38:08 2011 +0200 + + file-pdf-load: Don't use deprecated API (bug #646947) + + (cherry picked from commit 9b3e1c91fd2eac69da6947ec9c7fbf10096ba237) + + Conflicts: + + plug-ins/common/file-pdf.c +--- + plug-ins/common/file-pdf.c | 323 ++++++++++++++++++++++++++++++++++++++------ + 1 files changed, 283 insertions(+), 40 deletions(-) + +diff --git a/plug-ins/common/file-pdf.c b/plug-ins/common/file-pdf.c +index a43b459..43c2b7d 100644 +--- a/plug-ins/common/file-pdf.c ++++ b/plug-ins/common/file-pdf.c +@@ -4,6 +4,9 @@ + * + * Copyright (C) 2005 Nathan Summers + * ++ * Some code in render_page_to_surface() borrowed from ++ * poppler.git/glib/poppler-page.cc. ++ * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or +@@ -80,16 +83,20 @@ static gboolean load_dialog (PopplerDocument *doc, + static PopplerDocument * open_document (const gchar *filename, + GError **error); + +-static GdkPixbuf * get_thumbnail (PopplerDocument *doc, ++static cairo_surface_t * get_thumb_surface (PopplerDocument *doc, ++ gint page, ++ gint preferred_size); ++ ++static GdkPixbuf * get_thumb_pixbuf (PopplerDocument *doc, + gint page, + gint preferred_size); + + static gint32 layer_from_pixbuf (gint32 image, +- const gchar *layer_name, +- gint position, +- GdkPixbuf *buf, +- gdouble progress_start, +- gdouble progress_scale); ++ const gchar *layer_name, ++ gint position, ++ GdkPixbuf *pixbuf, ++ gdouble progress_start, ++ gdouble progress_scale); + + /** + ** the following was formerly part of +@@ -433,11 +440,12 @@ run (const gchar *name, + } + else + { +- gdouble width = 0; +- gdouble height = 0; +- gdouble scale; +- gint32 image = -1; +- GdkPixbuf *pixbuf = NULL; ++ gdouble width = 0; ++ gdouble height = 0; ++ gdouble scale; ++ gint32 image = -1; ++ gint num_pages = 0; ++ GdkPixbuf *pixbuf = NULL; + + /* Possibly retrieve last settings */ + gimp_get_data (LOAD_PROC, &loadvals); +@@ -455,7 +463,10 @@ run (const gchar *name, + g_object_unref (page); + } + +- pixbuf = get_thumbnail (doc, 0, param[1].data.d_int32); ++ num_pages = poppler_document_get_n_pages (doc); ++ ++ pixbuf = get_thumb_pixbuf (doc, 0, param[1].data.d_int32); ++ + g_object_unref (doc); + } + +@@ -548,6 +559,187 @@ open_document (const gchar *filename, + return doc; + } + ++/* FIXME: Remove this someday when we depend fully on GTK+ >= 3 */ ++ ++#if (!GTK_CHECK_VERSION (3, 0, 0)) ++ ++static cairo_format_t ++gdk_cairo_format_for_content (cairo_content_t content) ++{ ++ switch (content) ++ { ++ case CAIRO_CONTENT_COLOR: ++ return CAIRO_FORMAT_RGB24; ++ case CAIRO_CONTENT_ALPHA: ++ return CAIRO_FORMAT_A8; ++ case CAIRO_CONTENT_COLOR_ALPHA: ++ default: ++ return CAIRO_FORMAT_ARGB32; ++ } ++} ++ ++static cairo_surface_t * ++gdk_cairo_surface_coerce_to_image (cairo_surface_t *surface, ++ cairo_content_t content, ++ int src_x, ++ int src_y, ++ int width, ++ int height) ++{ ++ cairo_surface_t *copy; ++ cairo_t *cr; ++ ++ copy = cairo_image_surface_create (gdk_cairo_format_for_content (content), ++ width, ++ height); ++ ++ cr = cairo_create (copy); ++ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); ++ cairo_set_source_surface (cr, surface, -src_x, -src_y); ++ cairo_paint (cr); ++ cairo_destroy (cr); ++ ++ return copy; ++} ++ ++static void ++convert_alpha (guchar *dest_data, ++ int dest_stride, ++ guchar *src_data, ++ int src_stride, ++ int src_x, ++ int src_y, ++ int width, ++ int height) ++{ ++ int x, y; ++ ++ src_data += src_stride * src_y + src_x * 4; ++ ++ for (y = 0; y < height; y++) { ++ guint32 *src = (guint32 *) src_data; ++ ++ for (x = 0; x < width; x++) { ++ guint alpha = src[x] >> 24; ++ ++ if (alpha == 0) ++ { ++ dest_data[x * 4 + 0] = 0; ++ dest_data[x * 4 + 1] = 0; ++ dest_data[x * 4 + 2] = 0; ++ } ++ else ++ { ++ dest_data[x * 4 + 0] = (((src[x] & 0xff0000) >> 16) * 255 + alpha / 2) / alpha; ++ dest_data[x * 4 + 1] = (((src[x] & 0x00ff00) >> 8) * 255 + alpha / 2) / alpha; ++ dest_data[x * 4 + 2] = (((src[x] & 0x0000ff) >> 0) * 255 + alpha / 2) / alpha; ++ } ++ dest_data[x * 4 + 3] = alpha; ++ } ++ ++ src_data += src_stride; ++ dest_data += dest_stride; ++ } ++} ++ ++static void ++convert_no_alpha (guchar *dest_data, ++ int dest_stride, ++ guchar *src_data, ++ int src_stride, ++ int src_x, ++ int src_y, ++ int width, ++ int height) ++{ ++ int x, y; ++ ++ src_data += src_stride * src_y + src_x * 4; ++ ++ for (y = 0; y < height; y++) { ++ guint32 *src = (guint32 *) src_data; ++ ++ for (x = 0; x < width; x++) { ++ dest_data[x * 3 + 0] = src[x] >> 16; ++ dest_data[x * 3 + 1] = src[x] >> 8; ++ dest_data[x * 3 + 2] = src[x]; ++ } ++ ++ src_data += src_stride; ++ dest_data += dest_stride; ++ } ++} ++ ++/** ++ * gdk_pixbuf_get_from_surface: ++ * @surface: surface to copy from ++ * @src_x: Source X coordinate within @surface ++ * @src_y: Source Y coordinate within @surface ++ * @width: Width in pixels of region to get ++ * @height: Height in pixels of region to get ++ * ++ * Transfers image data from a #cairo_surface_t and converts it to an RGB(A) ++ * representation inside a #GdkPixbuf. This allows you to efficiently read ++ * individual pixels from cairo surfaces. For #GdkWindows, use ++ * gdk_pixbuf_get_from_window() instead. ++ * ++ * This function will create an RGB pixbuf with 8 bits per channel. ++ * The pixbuf will contain an alpha channel if the @surface contains one. ++ * ++ * Return value: (transfer full): A newly-created pixbuf with a reference ++ * count of 1, or %NULL on error ++ */ ++static GdkPixbuf * ++gdk_pixbuf_get_from_surface (cairo_surface_t *surface, ++ gint src_x, ++ gint src_y, ++ gint width, ++ gint height) ++{ ++ cairo_content_t content; ++ GdkPixbuf *dest; ++ ++ /* General sanity checks */ ++ g_return_val_if_fail (surface != NULL, NULL); ++ g_return_val_if_fail (width > 0 && height > 0, NULL); ++ ++ content = cairo_surface_get_content (surface) | CAIRO_CONTENT_COLOR; ++ dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, ++ !!(content & CAIRO_CONTENT_ALPHA), ++ 8, ++ width, height); ++ ++ surface = gdk_cairo_surface_coerce_to_image (surface, content, ++ src_x, src_y, ++ width, height); ++ cairo_surface_flush (surface); ++ if (cairo_surface_status (surface) || dest == NULL) ++ { ++ cairo_surface_destroy (surface); ++ return NULL; ++ } ++ ++ if (gdk_pixbuf_get_has_alpha (dest)) ++ convert_alpha (gdk_pixbuf_get_pixels (dest), ++ gdk_pixbuf_get_rowstride (dest), ++ cairo_image_surface_get_data (surface), ++ cairo_image_surface_get_stride (surface), ++ 0, 0, ++ width, height); ++ else ++ convert_no_alpha (gdk_pixbuf_get_pixels (dest), ++ gdk_pixbuf_get_rowstride (dest), ++ cairo_image_surface_get_data (surface), ++ cairo_image_surface_get_stride (surface), ++ 0, 0, ++ width, height); ++ ++ cairo_surface_destroy (surface); ++ return dest; ++} ++ ++#endif ++ + static gint32 + layer_from_pixbuf (gint32 image, + const gchar *layer_name, +@@ -566,6 +758,54 @@ layer_from_pixbuf (gint32 image, + return layer; + } + ++static cairo_surface_t * ++render_page_to_surface (PopplerPage *page, ++ int width, ++ int height, ++ double scale) ++{ ++ cairo_surface_t *surface; ++ cairo_t *cr; ++ ++ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); ++ cr = cairo_create (surface); ++ ++ cairo_save (cr); ++ cairo_translate (cr, 0.0, 0.0); ++ ++ if (scale != 1.0) ++ cairo_scale (cr, scale, scale); ++ ++ poppler_page_render (page, cr); ++ cairo_restore (cr); ++ ++ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); ++ cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); ++ cairo_paint (cr); ++ ++ cairo_destroy (cr); ++ ++ return surface; ++} ++ ++static GdkPixbuf * ++render_page_to_pixbuf (PopplerPage *page, ++ int width, ++ int height, ++ double scale) ++{ ++ GdkPixbuf *pixbuf; ++ cairo_surface_t *surface; ++ ++ surface = render_page_to_surface (page, width, height, scale); ++ pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, ++ cairo_image_surface_get_width (surface), ++ cairo_image_surface_get_height (surface)); ++ cairo_surface_destroy (surface); ++ ++ return pixbuf; ++} ++ + static gint32 + load_image (PopplerDocument *doc, + const gchar *filename, +@@ -597,7 +837,7 @@ load_image (PopplerDocument *doc, + gdouble page_width; + gdouble page_height; + +- GdkPixbuf *buf; ++ GdkPixbuf *pixbuf; + gint width; + gint height; + +@@ -627,15 +867,13 @@ load_image (PopplerDocument *doc, + gimp_image_set_resolution (image_ID, resolution, resolution); + } + +- buf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height); +- +- poppler_page_render_to_pixbuf (page, 0, 0, width, height, scale, 0, buf); ++ pixbuf = render_page_to_pixbuf (page, width, height, scale); + +- layer_from_pixbuf (image_ID, page_label, i, buf, ++ layer_from_pixbuf (image_ID, page_label, i, pixbuf, + doc_progress, 1.0 / pages->n_pages); + + g_free (page_label); +- g_object_unref (buf); ++ g_object_unref(pixbuf); + + doc_progress = (double) (i + 1) / pages->n_pages; + gimp_progress_update (doc_progress); +@@ -676,30 +914,22 @@ load_image (PopplerDocument *doc, + return image_ID; + } + +-static GdkPixbuf * +-get_thumbnail (PopplerDocument *doc, +- gint page_num, +- gint preferred_size) ++static cairo_surface_t * ++get_thumb_surface (PopplerDocument *doc, ++ gint page_num, ++ gint preferred_size) + { + PopplerPage *page; +- GdkPixbuf *pixbuf; ++ cairo_surface_t *surface; + + page = poppler_document_get_page (doc, page_num); + + if (! page) + return NULL; + +- /* XXX: Remove conditional when we depend on poppler 0.8.0, but also +- * add configure check to make sure POPPLER_WITH_GDK is enabled! +- */ +-#ifdef POPPLER_WITH_GDK +- pixbuf = poppler_page_get_thumbnail_pixbuf (page); +-#else +- pixbuf = poppler_page_get_thumbnail (page); +-#endif +- ++ surface = poppler_page_get_thumbnail (page); + +- if (! pixbuf) ++ if (! surface) + { + gdouble width; + gdouble height; +@@ -712,15 +942,28 @@ get_thumbnail (PopplerDocument *doc, + width *= scale; + height *= scale; + +- pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, +- width, height); +- +- poppler_page_render_to_pixbuf (page, +- 0, 0, width, height, scale, 0, pixbuf); ++ surface = render_page_to_surface (page, width, height, scale); + } + + g_object_unref (page); + ++ return surface; ++} ++ ++static GdkPixbuf * ++get_thumb_pixbuf (PopplerDocument *doc, ++ gint page_num, ++ gint preferred_size) ++{ ++ cairo_surface_t *surface; ++ GdkPixbuf *pixbuf; ++ ++ surface = get_thumb_surface (doc, page_num, preferred_size); ++ pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, ++ cairo_image_surface_get_width (surface), ++ cairo_image_surface_get_height (surface)); ++ cairo_surface_destroy (surface); ++ + return pixbuf; + } + +@@ -769,8 +1012,8 @@ thumbnail_thread (gpointer data) + idle_data->page_no = i; + + /* FIXME get preferred size from somewhere? */ +- idle_data->pixbuf = get_thumbnail (thread_data->document, i, +- THUMBNAIL_SIZE); ++ idle_data->pixbuf = get_thumb_pixbuf (thread_data->document, i, ++ THUMBNAIL_SIZE); + + g_idle_add (idle_set_thumbnail, idle_data); + +-- +1.7.5 diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 3e9ab632e4..a0e26ac14b 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=git -pkgver=1.7.8.1 +pkgver=1.7.8.2 pkgrel=0 pkgdesc="GIT - the stupid content tracker" url="http://git.or.cz/" @@ -52,7 +52,7 @@ perl() { } -md5sums="617fe0301390e98cfc5d665b2702254a git-1.7.8.1.tar.gz +md5sums="f9def92c4afb708f69006da841502b80 git-1.7.8.2.tar.gz e63a201556c4f089de790805c09a2e5b bb-tar.patch 3f0bdf6ca73bf4f015bc8565ab787969 git-daemon.initd 2258e95d389ccc6de0b5111d53d9eed6 git-daemon.confd" diff --git a/main/glib-networking/APKBUILD b/main/glib-networking/APKBUILD index 1d7d55009f..0d835d9c63 100644 --- a/main/glib-networking/APKBUILD +++ b/main/glib-networking/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=glib-networking -pkgver=2.30.1 +pkgver=2.30.2 _maj=${pkgver%%.*} _min=${pkgver#${_maj}.} _min=${_min%%.*} @@ -13,11 +13,10 @@ arch="all" license="LGPLv2+" depends="ca-certificates" depends_dev="glib-dev gnutls-dev libproxy-dev intltool" -makedepends="$depends_dev bash autoconf automake libtool" +makedepends="$depends_dev bash" install= subpackages="$pkgname-lang" -source="http://download.gnome.org/sources/glib-networking/$_ver/glib-networking-$pkgver.tar.bz2 - proxy-test.patch" +source="http://download.gnome.org/sources/glib-networking/$_ver/glib-networking-$pkgver.tar.xz" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -28,8 +27,6 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done - aclocal && libtoolize && autoconf && automake || return 1 - } build() { @@ -48,5 +45,4 @@ package() { "$pkgdir"/usr/lib/gio/modules/*.la } -md5sums="0b88f3d83586c706e5dbafe93494251c glib-networking-2.30.1.tar.bz2 -2aed5bdc525e68d2f0b70b76f3d6f8d6 proxy-test.patch" +md5sums="844886c099cbd3cbf43f52bac4da2ba7 glib-networking-2.30.2.tar.xz" diff --git a/main/gnomad2/APKBUILD b/main/gnomad2/APKBUILD new file mode 100644 index 0000000000..182bf842ed --- /dev/null +++ b/main/gnomad2/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=gnomad2 +pkgver=2.9.6 +pkgrel=0 +pkgdesc="A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs" +url="http://gnomad2.sourceforge.net" +arch="all" +license="GPLv2+" +depends="" +depends_dev="" +makedepends="$depends_dev gtk+2.0-dev libnjb-dev libmtp-dev libid3tag-dev + taglib-dev udev-dev" +install="" +subpackages="$pkgname-lang $pkgname-doc" +source="http://download.sourceforge.net/gnomad2/gnomad2-$pkgver.tar.gz" + +_builddir="$srcdir"/gnomad2-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/*.la +} + +md5sums="213bfee7d020aea092576b45691aba36 gnomad2-2.9.6.tar.gz" diff --git a/main/gpicview/APKBUILD b/main/gpicview/APKBUILD index 632e68cab3..3f4194d992 100644 --- a/main/gpicview/APKBUILD +++ b/main/gpicview/APKBUILD @@ -1,14 +1,26 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gpicview pkgver=0.2.2 -pkgrel=0 +pkgrel=1 pkgdesc="Picture viewer of the LXDE Desktop" url="http://wiki.lxde.org/en/GPicView" arch="all" license="GPL-2" depends= -makedepends="gtk+-dev intltool jpeg-dev" -source="http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz" +subpackages="$pkgname-lang" +makedepends="gtk+-dev intltool jpeg-dev autoconf automake libtool" +source="http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz + libm-underlinking.patch" + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + libtoolize --force && aclocal && autoconf && automake +} build() { cd "$srcdir/$pkgname-$pkgver" @@ -20,4 +32,5 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install || return 1 } -md5sums="943da9f4a23541accd5acdd4fb69966f gpicview-0.2.2.tar.gz" +md5sums="943da9f4a23541accd5acdd4fb69966f gpicview-0.2.2.tar.gz +99fb803a293c88a37b606136f6a5c6ca libm-underlinking.patch" diff --git a/main/gpicview/libm-underlinking.patch b/main/gpicview/libm-underlinking.patch new file mode 100644 index 0000000000..a73e0705e8 --- /dev/null +++ b/main/gpicview/libm-underlinking.patch @@ -0,0 +1,25 @@ +From 38cc56d08d243c886526d16bad3ee0b6571d6914 Mon Sep 17 00:00:00 2001 +From: Andrea Florio <andrea@opensuse.org> +Date: Sun, 18 Sep 2011 08:49:36 +0200 +Subject: [PATCH] fixed link with latest ld + +--- + src/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 4a750c5..0e2f058 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -27,7 +27,7 @@ gpicview_SOURCES = \ + + # the library search path. + # use -nodefaultlibs to prevent linking libstdc++ +-gpicview_LDADD = $(X11_LIBS) $(GTK_LIBS) ++gpicview_LDADD = $(X11_LIBS) $(GTK_LIBS) -lm + + noinst_HEADERS = \ + glib-mem.h \ +-- +1.7.4.1 + diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD index 9966e44625..11f189d3c2 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.4.0 +pkgver=6.7.4.4 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 pkgdesc="A collection of tools and libraries for many image formats" @@ -57,4 +57,4 @@ _cxx() { mv "$pkgdir"/usr/lib/libMagick++.so.* "$subpkgdir"/usr/lib/ } -md5sums="9fb18164dd136fafea08e7e4124690a3 ImageMagick-6.7.4-0.tar.gz" +md5sums="f62f6a136b5de692dda3d5318656e731 ImageMagick-6.7.4-4.tar.gz" diff --git a/main/iptables/APKBUILD b/main/iptables/APKBUILD index 273a4c079b..697c033228 100644 --- a/main/iptables/APKBUILD +++ b/main/iptables/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=iptables -pkgver=1.4.12.1 +pkgver=1.4.12.2 pkgrel=0 pkgdesc="Linux kernel firewall, NAT and packet mangling tools" url="http://www.iptables.org/" @@ -75,7 +75,7 @@ ip6tables() { "$subpkgdir"/etc/init.d/ip6tables } -md5sums="b08a1195ec2c1ebeaf072db3c55fdf43 iptables-1.4.12.1.tar.bz2 +md5sums="212112389c7f10c72efb31a4ed193a4c iptables-1.4.12.2.tar.bz2 ec3e80a1b0ea3e13e4e60824b7ebd1b9 iptables-1.4.2-include-in.patch 2202ac150a5dfe32a8363b0ad565ee1d iptables.initd 2ae5c23689c65ed7e827802c47acd426 iptables.confd diff --git a/main/kbd/APKBUILD b/main/kbd/APKBUILD new file mode 100644 index 0000000000..3a02a1e6c4 --- /dev/null +++ b/main/kbd/APKBUILD @@ -0,0 +1,97 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=kbd +pkgver=1.15.3 +pkgrel=0 +pkgdesc="Tools for configuring the console (keyboard, virtual terminals, etc.)" +url="http://ftp.altlinux.org/pub/people/legion/kbd" +arch="all" +license="GPLv2+" +depends="kbd-misc" +makedepends="bison flex autoconf automake" +install="" +subpackages="$pkgname-misc $pkgname-doc" +source="ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-$pkgver.tar.gz + kbd-1.15-resizecon-x86_64.patch + kbd-1.15.3-loadkeys-d.patch + " + +_builddir="$srcdir"/kbd-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + aclocal -I m4 && autoreconf || return 1 + + # fixes from fedora + # 7-bit maps are obsolete; so are non-euro maps + cd "$_builddir"/data/keymaps/i386 + mv qwerty/fi.map qwerty/fi-old.map + cp qwerty/fi-latin9.map qwerty/fi.map + cp qwerty/pt-latin9.map qwerty/pt.map + cp qwerty/sv-latin1.map qwerty/se-latin1.map + + mv azerty/fr.map azerty/fr-old.map + cp azerty/fr-latin9.map azerty/fr.map + + cp azerty/fr-latin9.map azerty/fr-latin0.map # legacy alias + + # Rename conflicting keymaps + mv dvorak/no.map dvorak/no-dvorak.map + mv fgGIod/trf.map fgGIod/trf-fgGIod.map + mv olpc/es.map olpc/es-olpc.map + mv olpc/pt.map olpc/pt-olpc.map + mv qwerty/cz.map qwerty/cz-qwerty.map +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --datadir=/lib/kbd \ + --localedir=/usr/share/locale \ + --disable-nls \ + --mandir=/usr/share/man \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/*.la + + # ro_win.map.gz is useless + rm -f "$pkgdir"/lib/kbd/keymaps/i386/qwerty/ro_win.map.gz + + # Create additional name for Serbian latin keyboard + ln -s sr-cy.map.gz "$pkgdir"/lib/kbd/keymaps/i386/qwerty/sr-latin.map.gz + + # The rhpl keyboard layout table is indexed by kbd layout names, + # so we need a Korean keyboard + ln -s us.map.gz "$pkgdir"/lib/kbd/keymaps/i386/qwerty/ko.map.gz + + # Move binaries which we use before /usr is mounted to /bin. + mkdir -p "$pkgdir"/bin + for binary in setfont dumpkeys kbd_mode unicode_start unicode_stop loadkeys ; do + mv "$pkgdir"/usr/bin/$binary "$pkgdir"/bin/ || return 1 + done + + # Link open to openvt + ln -s openvt "$pkgdir"/usr/bin/open + +} + +misc() { + pkgdesc="Data for kbd package" + arch="noarch" + mkdir -p "$subpkgdir"/lib + mv "$pkgdir"/lib/kbd "$subpkgdir"/lib/ +} + +md5sums="8143e179a0f3c25646ce5085e8777200 kbd-1.15.3.tar.gz +435755fb51017b17558f38a2a2c5074c kbd-1.15-resizecon-x86_64.patch +d7bb334afc00f7794774762a07dacaa7 kbd-1.15.3-loadkeys-d.patch" diff --git a/main/kbd/kbd-1.15-resizecon-x86_64.patch b/main/kbd/kbd-1.15-resizecon-x86_64.patch new file mode 100644 index 0000000000..3ce5a68688 --- /dev/null +++ b/main/kbd/kbd-1.15-resizecon-x86_64.patch @@ -0,0 +1,11 @@ +diff -up kbd-1.15.3/configure.ac.orig kbd-1.15.3/configure.ac +--- kbd-1.15.3/configure.ac.orig 2011-08-22 16:01:11.456165128 +0200 ++++ kbd-1.15.3/configure.ac 2011-08-22 16:01:38.878163675 +0200 +@@ -60,6 +60,7 @@ AM_CONDITIONAL(KEYCODES_PROGS, test "$KE + + case $host_cpu in + i?86*) RESIZECONS_PROGS=yes ;; ++ x86_64*) RESIZECONS_PROGS=yes ;; + *) RESIZECONS_PROGS=no ;; + esac + AM_CONDITIONAL(RESIZECONS_PROGS, test "$RESIZECONS_PROGS" = "yes") diff --git a/main/kbd/kbd-1.15.3-loadkeys-d.patch b/main/kbd/kbd-1.15.3-loadkeys-d.patch new file mode 100644 index 0000000000..73bb7c47fe --- /dev/null +++ b/main/kbd/kbd-1.15.3-loadkeys-d.patch @@ -0,0 +1,20 @@ +diff -up kbd-1.15.3/src/loadkeys.c.orig kbd-1.15.3/src/loadkeys.c +--- kbd-1.15.3/src/loadkeys.c.orig 2011-10-24 13:44:52.222401546 +0200 ++++ kbd-1.15.3/src/loadkeys.c 2011-10-24 13:47:52.413389029 +0200 +@@ -2958,7 +2958,7 @@ int main(int argc, char *argv[]) + close(fd); + } + +- for (i = optind; argv[i]; i++) { ++ for (i = optind; argv[i] || optd; i++) { + FILE *f; + char *ev; + +@@ -2974,6 +2974,7 @@ int main(int argc, char *argv[]) + if (optd) { + /* first read default map - search starts in . */ + optd = 0; ++ i--; + if ((f = findfile(DEFMAP, dirpath, suffixes)) == NULL) { + fprintf(stderr, _("Cannot find %s\n"), DEFMAP); + exit(EXIT_FAILURE); diff --git a/main/lftp/APKBUILD b/main/lftp/APKBUILD index 2b9bab956b..79d2386ecc 100644 --- a/main/lftp/APKBUILD +++ b/main/lftp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=lftp -pkgver=4.3.3 +pkgver=4.3.4 pkgrel=0 pkgdesc="LFTP is sophisticated ftp/http client" url="http://lftp.yar.ru/" @@ -33,4 +33,4 @@ package() { rm "$pkgdir"/usr/lib/*.la } -md5sums="91757a201c1030714ac1996f27437cc7 lftp-4.3.3.tar.bz2" +md5sums="4840d0d20fafff3792b0b8ac305ab01e lftp-4.3.4.tar.bz2" diff --git a/main/libc0.9.32/0012-getaddrinfo-allow-numeric-service-without-any-hints.patch b/main/libc0.9.32/0012-getaddrinfo-allow-numeric-service-without-any-hints.patch deleted file mode 100644 index 2cb303a943..0000000000 --- a/main/libc0.9.32/0012-getaddrinfo-allow-numeric-service-without-any-hints.patch +++ /dev/null @@ -1,41 +0,0 @@ -From eb5d129b641c644d82089c3ded3d36288c66123c Mon Sep 17 00:00:00 2001 -From: Natanael Copa <natanael.copa@gmail.com> -Date: Sun, 12 Jun 2011 12:09:04 +0000 -Subject: [PATCH] getaddrinfo: allow numeric service without any hints - -This appears to correspond to what glibc does and this fixes an -issue with iptables-1.4.11 with udp and raw port numbers. - -(see http://bugzilla.netfilter.org/show_bug.cgi?id=721) - -This fixes #3841 -https://bugs.busybox.net/show_bug.cgi?id=3841 - -Signed-off-by: Natanael Copa <natanael.copa@gmail.com> -Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> -(cherry picked from commit bc3be18145e4d57e7268506f123c0f0f373a15e2) ---- - libc/inet/getaddrinfo.c | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) - -diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c -index 1a77c51..e7511f6 100644 ---- a/libc/inet/getaddrinfo.c -+++ b/libc/inet/getaddrinfo.c -@@ -820,13 +820,6 @@ getaddrinfo(const char *name, const char *service, - if (hints->ai_flags & AI_NUMERICSERV) - return EAI_NONAME; - gaih_service.num = -1; -- } else { -- /* -- * Can't specify a numerical socket unless a protocol -- * family was given. -- */ -- if (hints->ai_socktype == 0 && hints->ai_protocol == 0) -- return EAI_SERVICE; - } - pservice = &gaih_service; - } else --- -1.7.8 - diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD index 6c6185ec70..0d0cb1215a 100644 --- a/main/libc0.9.32/APKBUILD +++ b/main/libc0.9.32/APKBUILD @@ -2,9 +2,9 @@ _abiver=0.9.32 pkgname=libc$_abiver _gitver= -pkgver=0.9.32 +pkgver=0.9.32.1 _ver=${pkgver/_/-} -pkgrel=15 +pkgrel=0 pkgdesc="C library for developing embedded Linux systems" url=http://uclibc.org license="LGPL-2" @@ -36,7 +36,6 @@ source="http://uclibc.org/downloads/uClibc-${_ver}.tar.bz2 0009-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch 0010-malloc-standard-synchronize-on-fork.patch 0011-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch -0012-getaddrinfo-allow-numeric-service-without-any-hints.patch 0013-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch 0014-libm-add-cabsf-and-cabsl-functions.patch 0015-libm-implement-generic-cexp-cexpf-and-cexpl.patch @@ -141,7 +140,7 @@ libthread_db() { mv "$pkgdir"/lib/libthread_db* "$subpkgdir"/lib/ } -md5sums="cfcb6c25d8ebe12817499d8749ee8ae1 uClibc-0.9.32.tar.bz2 +md5sums="ade6e441242be5cdd735fec97954a54a uClibc-0.9.32.1.tar.bz2 11c206cd4be86514dd9abd811429ad06 0001-Compatible-stack-protector-for-non-Thread-Local-stor.patch b905f5f0f27348cc91019275dcff51cb 0002-resolv-res_query-for-CNAMEs.patch 208f6ea0a97f2940319456d32549bfc5 0003-resolv-fix-memory-leak.patch @@ -153,7 +152,6 @@ afafe88bca1ffc1d4eb49de813c39c5b 0007-stdlib-fix-arc4random-return-type-to-u_in f0fc6dbeb1467812085b60a49654a955 0009-libdl-rudimentary-locking-for-dlopen-dlsym-dlclose.patch a1c5871c3b799cce8d1dfcf8ca0f3743 0010-malloc-standard-synchronize-on-fork.patch b2c09cdfc3116c6236dbe96697241a59 0011-time-fix-parsing-of-tzdata-files-where-off_t-is-64-b.patch -ddd3073f1a2696c1a9b40bfa81bfa5bf 0012-getaddrinfo-allow-numeric-service-without-any-hints.patch 78cdafafc99007da8cbdf8d2f841ea47 0013-libc-x86-fix-stack-unwinding-and-backtrace-informati.patch 63af22efb20d9dfd3cb10bc9900f1615 0014-libm-add-cabsf-and-cabsl-functions.patch 7158d0ae15ca742cc1577b47735751df 0015-libm-implement-generic-cexp-cexpf-and-cexpl.patch diff --git a/main/libmtp/APKBUILD b/main/libmtp/APKBUILD new file mode 100644 index 0000000000..af6165b964 --- /dev/null +++ b/main/libmtp/APKBUILD @@ -0,0 +1,51 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=libmtp +pkgver=1.1.1 +pkgrel=1 +pkgdesc="A software library for MTP media players" +url="http://libmtp.sourceforge.net/" +arch="all" +license="LGPLv2+" +depends="" +depends_dev="libusb-compat-dev" +makedepends="$depends_dev udev-dev libiconv-dev" +install="" +subpackages="$pkgname-dev $pkgname-examples" +source="http://download.sourceforge.net/libmtp/libmtp-$pkgver.tar.gz" + +_builddir="$srcdir"/libmtp-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/*.la +} + +examples() { + pkgdesc="Example programs for libmtp" + mkdir -p "$subpkgdir"/usr + mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ +} + +md5sums="073e1c2a00ba377f68dce47727e185ae libmtp-1.1.1.tar.gz" diff --git a/main/libnjb/APKBUILD b/main/libnjb/APKBUILD new file mode 100644 index 0000000000..186d87e744 --- /dev/null +++ b/main/libnjb/APKBUILD @@ -0,0 +1,51 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=libnjb +pkgver=2.2.7 +pkgrel=0 +pkgdesc="A software library for talking to the Creative Nomad Jukeboxes and Dell DJs" +url="http://libnjb.sourceforge.net/" +arch="all" +license="BSD" +depends="" +depends_dev="libusb-compat-dev" +makedepends="$depends_dev udev-dev zlib-dev ncurses-dev" +install="" +subpackages="$pkgname-dev $pkgname-examples" +source="http://download.sourceforge.net/libnjb/libnjb-$pkgver.tar.gz" + +_builddir="$srcdir"/libnjb-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/*.la +} + +examples() { + pkgdesc="Example programs for libnjb" + mkdir -p "$subpkgdir"/usr + mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ +} + +md5sums="73f25f3297abe316dd0abec921781d50 libnjb-2.2.7.tar.gz" diff --git a/main/libssh/APKBUILD b/main/libssh/APKBUILD index 8f15a4e98f..20d86171b7 100644 --- a/main/libssh/APKBUILD +++ b/main/libssh/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libssh pkgver=0.5.2 -pkgrel=0 +pkgrel=1 pkgdesc="Library for accessing ssh client services through C libraries" url="http://www.libssh.org/" arch="all" @@ -10,7 +10,8 @@ license="LGPL" depends= makedepends="openssl-dev cmake doxygen" subpackages="$pkgname-dev" -source="http://www.libssh.org/files/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz" +source="http://www.libssh.org/files/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz + link-pthread.patch" _builddir="$srcdir"/$pkgname-$pkgver @@ -41,4 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -md5sums="38b67c48af7a9204660a3e08f97ceba6 libssh-0.5.2.tar.gz" +md5sums="38b67c48af7a9204660a3e08f97ceba6 libssh-0.5.2.tar.gz +8d58b3391286de4dad3eb8a5b70171aa link-pthread.patch" diff --git a/main/libssh/link-pthread.patch b/main/libssh/link-pthread.patch new file mode 100644 index 0000000000..2e2c770f6a --- /dev/null +++ b/main/libssh/link-pthread.patch @@ -0,0 +1,63 @@ +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index aeff201..0191d5d 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -13,36 +13,36 @@ include_directories( + + if (LINUX) + add_executable(libssh_scp libssh_scp.c ${examples_SRCS}) +- target_link_libraries(libssh_scp ${LIBSSH_SHARED_LIBRARY}) ++ target_link_libraries(libssh_scp ${LIBSSH_SHARED_LIBRARY} pthread) + + add_executable(scp_download scp_download.c ${examples_SRCS}) +- target_link_libraries(scp_download ${LIBSSH_SHARED_LIBRARY}) ++ target_link_libraries(scp_download ${LIBSSH_SHARED_LIBRARY} pthread) + + add_executable(samplessh sample.c ${examples_SRCS}) +- target_link_libraries(samplessh ${LIBSSH_SHARED_LIBRARY}) ++ target_link_libraries(samplessh ${LIBSSH_SHARED_LIBRARY} pthread) + + add_executable(sshnetcat sshnetcat.c ${examples_SRCS}) +- target_link_libraries(sshnetcat ${LIBSSH_SHARED_LIBRARY}) ++ target_link_libraries(sshnetcat ${LIBSSH_SHARED_LIBRARY} pthread) + + if (WITH_SFTP) + add_executable(samplesftp samplesftp.c ${examples_SRCS}) +- target_link_libraries(samplesftp ${LIBSSH_SHARED_LIBRARY}) ++ target_link_libraries(samplesftp ${LIBSSH_SHARED_LIBRARY} pthread) + endif (WITH_SFTP) + + if (WITH_SERVER) + add_executable(samplesshd samplesshd.c) +- target_link_libraries(samplesshd ${LIBSSH_SHARED_LIBRARY}) ++ target_link_libraries(samplesshd ${LIBSSH_SHARED_LIBRARY} pthread) + endif (WITH_SERVER) + endif (LINUX) + + add_executable(exec exec.c ${examples_SRCS}) +-target_link_libraries(exec ${LIBSSH_SHARED_LIBRARY}) ++target_link_libraries(exec ${LIBSSH_SHARED_LIBRARY} pthread) + + add_executable(senddata senddata.c ${examples_SRCS}) +-target_link_libraries(senddata ${LIBSSH_SHARED_LIBRARY}) ++target_link_libraries(senddata ${LIBSSH_SHARED_LIBRARY} pthread) + + add_executable(libsshpp libsshpp.cpp) +-target_link_libraries(libsshpp ${LIBSSH_SHARED_LIBRARY}) ++target_link_libraries(libsshpp ${LIBSSH_SHARED_LIBRARY} pthread) + + add_executable(libsshpp_noexcept libsshpp_noexcept.cpp) +-target_link_libraries(libsshpp_noexcept ${LIBSSH_SHARED_LIBRARY}) ++target_link_libraries(libsshpp_noexcept ${LIBSSH_SHARED_LIBRARY} pthread) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e158665..ef2005d 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -40,6 +40,7 @@ if (HAVE_LIBSOCKET) + set(LIBSSH_LINK_LIBRARIES + ${LIBSSH_LINK_LIBRARIES} + socket ++ pthread + ) + endif (HAVE_LIBSOCKET) + diff --git a/main/libunwind/APKBUILD b/main/libunwind/APKBUILD new file mode 100644 index 0000000000..7fff5b1e31 --- /dev/null +++ b/main/libunwind/APKBUILD @@ -0,0 +1,51 @@ +# Contributor: William Pitcock <nenolod@dereferenced.org> +# Maintainer: William Pitcock <nenolod@dereferenced.org> +pkgname=libunwind +pkgver=1.0.1 +pkgrel=0 +pkgdesc="portable and efficient API to determine the call-chain of a program" +url="http://www.nongnu.org/libunwind/" +arch="x86_64" +license="MIT" +depends="" +depends_dev="" +makedepends="$depends_dev autoconf automake libtool" +install="" +subpackages="$pkgname-dev $pkgname-doc" +source="http://download.savannah.gnu.org/releases/libunwind/libunwind-$pkgver.tar.gz + disable-setjmp.patch" + +_builddir="$srcdir"/libunwind-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + + libtoolize --force + autoreconf +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --libdir=/lib \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + || return 1 + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/lib/*.la +} + +md5sums="993e47cca7315e22239c3e0d987e94e0 libunwind-1.0.1.tar.gz +43058a07e7648b0dcbb84890ccc8c760 disable-setjmp.patch" diff --git a/main/libunwind/disable-setjmp.patch b/main/libunwind/disable-setjmp.patch new file mode 100644 index 0000000000..442a5dfd7a --- /dev/null +++ b/main/libunwind/disable-setjmp.patch @@ -0,0 +1,37 @@ +http://cvs.fedoraproject.org/viewvc/rpms/libunwind/devel/libunwind-disable-setjmp.patch?revision=1.1&view=markup +http://bugs.gentoo.org/299344 + +At least x86_64 version cannot work, src/setjmp/setjmp.c and +src/setjmp/sigsetjmp.c are not even compiled, src/x86_64/longjmp.S does not +match src/setjmp/setjmp.c + include/tdep-x86_64/jmpbuf.h . + +--- libunwind-1.0.1/src/Makefile.am ++++ libunwind-1.0.1/src/Makefile.am +@@ -9,6 +9,3 @@ + # libunwind-setjmp depends on libunwind-$(arch). Therefore must be added + # at the end. +-if !REMOTE_ONLY +-lib_LTLIBRARIES += libunwind-setjmp.la +-endif + + # +--- libunwind-1.0.1/tests/Makefile.am ++++ libunwind-1.0.1/tests/Makefile.am +@@ -27,7 +27,7 @@ + Gia64-test-nat Lia64-test-nat \ + Gia64-test-rbs Lia64-test-rbs \ + Gia64-test-readonly Lia64-test-readonly \ +- ia64-test-setjmp ia64-test-sig ++ ia64-test-sig + else + if ARCH_PPC64 + if USE_ALTIVEC +@@ -44,7 +44,7 @@ + Gtest-dyn1 Ltest-dyn1 \ + Gtest-trace Ltest-trace \ + test-async-sig test-flush-cache test-init-remote \ +- test-mem test-setjmp test-ptrace \ ++ test-mem test-ptrace \ + Ltest-nomalloc Ltest-nocalloc rs-race + noinst_PROGRAMS_cdep = forker mapper test-ptrace-misc \ + Gperf-simple Lperf-simple diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index e16e6af24e..192af37373 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -2,7 +2,7 @@ _flavor=grsec pkgname=linux-${_flavor} -pkgver=3.0.14 +pkgver=3.0.15 _kernver=3.0 pkgrel=0 pkgdesc="Linux kernel with grsecurity" @@ -143,8 +143,8 @@ dev() { } md5sums="398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 -f2745bd4dcb3267414713adff403b54c patch-3.0.14.bz2 -3c0fcf923a27a963ae86a3e694cb6bbd grsecurity-2.2.2-3.0.14-unofficial.patch +759f5efe7eb8e8672041c1fe388d1ebe patch-3.0.15.bz2 +3c0fcf923a27a963ae86a3e694cb6bbd grsecurity-2.2.2-3.0.15-unofficial.patch c41cf0ee9794f393423c6b2093072260 grsec-timblogiw-noconst.patch ebb99ef6ad8cd2d9fd8f49d5c5849057 0001-ip_gre-dont-increase-dev-needed_headroom-on-a-live-d.patch 776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch diff --git a/main/linux-grsec/grsecurity-2.2.2-3.0.14-unofficial.patch b/main/linux-grsec/grsecurity-2.2.2-3.0.15-unofficial.patch index c4c0b6ef42..c4c0b6ef42 100644 --- a/main/linux-grsec/grsecurity-2.2.2-3.0.14-unofficial.patch +++ b/main/linux-grsec/grsecurity-2.2.2-3.0.15-unofficial.patch diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD index a4d74c54d0..2b02177011 100644 --- a/main/linux-vserver/APKBUILD +++ b/main/linux-vserver/APKBUILD @@ -2,7 +2,7 @@ _flavor=vserver pkgname=linux-${_flavor} -pkgver=3.0.14 +pkgver=3.0.15 pkgrel=0 _vsver=vs2.3.2.1 @@ -132,7 +132,7 @@ dev() { } md5sums="398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 -f2745bd4dcb3267414713adff403b54c patch-3.0.14.bz2 -7d49344644c0860707b9358bbb39768e patch-3.0.14-vs2.3.2.1-unofficial.diff +759f5efe7eb8e8672041c1fe388d1ebe patch-3.0.15.bz2 +17856f9963c56b31d18f6d7cc77ace5a patch-3.0.15-vs2.3.2.1-unofficial.diff 4baec73eeb0ddc1148d580a6d1e29b1f kernelconfig.x86 148b84ad28167290f2f7f0420945cb92 kernelconfig.x86_64" diff --git a/main/linux-vserver/patch-3.0.14-vs2.3.2.1-unofficial.diff b/main/linux-vserver/patch-3.0.15-vs2.3.2.1-unofficial.diff index 337cd011ef..d2e2f0d647 100644 --- a/main/linux-vserver/patch-3.0.14-vs2.3.2.1-unofficial.diff +++ b/main/linux-vserver/patch-3.0.15-vs2.3.2.1-unofficial.diff @@ -162,7 +162,7 @@ diff -NurpP --minimal linux-3.0.9/Makefile linux-3.0.9-vs2.3.2.1/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 0 - SUBLEVEL = 14 + SUBLEVEL = 15 -EXTRAVERSION = +EXTRAVERSION = -vs2.3.2.1 NAME = Sneaky Weasel diff --git a/main/lockfile-progs/APKBUILD b/main/lockfile-progs/APKBUILD index a1c5aad9f8..ce5d230c5a 100644 --- a/main/lockfile-progs/APKBUILD +++ b/main/lockfile-progs/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lockfile-progs pkgver=0.1.15 -pkgrel=0 +pkgrel=1 pkgdesc="Programs for locking and unlocking files and mailboxes" url="http://packages.debian.org/sid/lockfile-progs" arch="all" @@ -14,6 +14,12 @@ subpackages="$pkgname-doc" source="http://ftp.debian.org/debian/pool/main/l/lockfile-progs/${pkgname}_$pkgver.tar.gz" _builddir="$srcdir"/sid +prepare() { + cd "$_builddir" + # allow us to verride CFLAGS by using 'CFLAGS ?= ...' instead of + # 'CFLAGS := ...' in the Makefile + sed -i -e '/^CFLAGS/s/:=/?=/' Makefile || return 1 +} build() { cd "$_builddir" diff --git a/main/mesa-demos/APKBUILD b/main/mesa-demos/APKBUILD index 571bbe47df..f522392e6c 100644 --- a/main/mesa-demos/APKBUILD +++ b/main/mesa-demos/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mesa-demos pkgver=8.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Mesa demos and utils" url="http://mesa3d.sourceforge.net" arch="all" @@ -14,7 +14,9 @@ install="" subpackages= source="ftp://ftp.freedesktop.org/pub/mesa/demos/$pkgver/$pkgname-$pkgver.tar.bz2 sincos.patch - mesa-demos-gles.patch" + mesa-demos-gles.patch + link.patch + " _builddir="$srcdir/$pkgname-$pkgver" @@ -41,4 +43,5 @@ package() { md5sums="320c2a4b6edc6faba35d9cb1e2a30bf4 mesa-demos-8.0.1.tar.bz2 75be22556a657f0a157028233832d167 sincos.patch -dc89e44fed4a6c9d0ac3d8b88ddead91 mesa-demos-gles.patch" +dc89e44fed4a6c9d0ac3d8b88ddead91 mesa-demos-gles.patch +502885b11980be71712f6a33bfd1508d link.patch" diff --git a/main/mesa-demos/link.patch b/main/mesa-demos/link.patch new file mode 100644 index 0000000000..f19b6bbc95 --- /dev/null +++ b/main/mesa-demos/link.patch @@ -0,0 +1,15 @@ +--- ./src/egl/opengl/Makefile.in.orig ++++ ./src/egl/opengl/Makefile.in +@@ -111,10 +111,10 @@ + peglgears_LDADD = $(LDADD) + xeglgears_SOURCES = xeglgears.c + xeglgears_OBJECTS = xeglgears.$(OBJEXT) +-xeglgears_LDADD = $(LDADD) ++xeglgears_LDADD = $(LDADD) $(X11_LIBS) + xeglthreads_SOURCES = xeglthreads.c + xeglthreads_OBJECTS = xeglthreads.$(OBJEXT) +-xeglthreads_LDADD = $(LDADD) ++xeglthreads_LDADD = $(LDADD) $(X11_LIBS) -lpthread + DEFAULT_INCLUDES = -I.@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles diff --git a/main/mkinitfs/0001-init-generate-the-repositories-after-relocation.patch b/main/mkinitfs/0001-init-generate-the-repositories-after-relocation.patch new file mode 100644 index 0000000000..b5c14d8dd6 --- /dev/null +++ b/main/mkinitfs/0001-init-generate-the-repositories-after-relocation.patch @@ -0,0 +1,71 @@ +From eb96e64b989ae7cf39cd0cdf849104ac1d5ee655 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 4 Jan 2012 14:53:52 +0000 +Subject: [PATCH] init: generate the repositories after relocation + +This solves problem when UUID is used in syslinux.cfg when booting +USB devices. The generated repositories had /media/$UUID/apks but +the /media/$UUID got relocated to /media/usb +--- + initramfs-init.in | 24 +++++++++++++++--------- + 1 files changed, 15 insertions(+), 9 deletions(-) + +diff --git a/initramfs-init.in b/initramfs-init.in +index 98916d7..226872b 100755 +--- a/initramfs-init.in ++++ b/initramfs-init.in +@@ -269,6 +269,12 @@ find_fs_type() { + done + } + ++# find the dirs under ALPINE_MNT that are boot repositories ++find_boot_repositories() { ++ find $ALPINE_MNT -name .boot_repository -type f -maxdepth 3 \ ++ | sed 's:/.boot_repository$::' ++} ++ + # gotta start from somewhere :) + echo "Alpine Init $VERSION" + +@@ -429,8 +435,7 @@ retry_mount -o ro $mount_opts $ALPINE_DEV $ALPINE_MNT >/dev/null 2>&1 + eend $? + + # generate apk repositories file +-echo "$(find $ALPINE_MNT -name .boot_repository -type f -maxdepth 3 \ +- | sed 's:/.boot_repository$::')" > /tmp/repositories ++find_boot_repositories > /tmp/repositories + + # early console? + if [ "$SINGLEMODE" = "yes" ]; then +@@ -526,13 +531,9 @@ mkdir -p $sysroot/etc/apk/keys/ + cp -a /etc/apk/keys $sysroot/etc/apk + + # generate repo opts for apk +-if [ ! -f $sysroot/etc/apk/repositories ]; then +- mv /tmp/repositories $sysroot/etc/apk/ +-else +- for i in $(cat /tmp/repositories); do +- repo_opt="$repo_opt --repository $i" +- done +-fi ++for i in $(cat /tmp/repositories); do ++ repo_opt="$repo_opt --repository $i" ++done + + # install new root + ebegin "Installing packages to root filesystem" +@@ -565,6 +566,11 @@ if [ -z "$has_fstab" ] && [ -f "$sysroot"/etc/fstab ]; then + relocate_alpine_mnt "$sysroot"/etc/fstab + fi + ++# generate repositories if none exists. this needs to be done after relocation ++if ! [ -f "$sysroot"/etc/apk/repositories ]; then ++ find_boot_repositories > "$sysroot"/etc/apk/repositories ++fi ++ + # respect mount options in fstab for ALPINE_MNT (e.g if user wants rw) + opts=$(awk "\$2 == \"$ALPINE_MNT\" {print \$4}" $sysroot/etc/fstab) + if [ -n "$opts" ]; then +-- +1.7.8.2 + diff --git a/main/mkinitfs/0001-init-try-detect-alpine_dev-filesystem-if-not-specifi.patch b/main/mkinitfs/0001-init-try-detect-alpine_dev-filesystem-if-not-specifi.patch new file mode 100644 index 0000000000..01cb2c2e3b --- /dev/null +++ b/main/mkinitfs/0001-init-try-detect-alpine_dev-filesystem-if-not-specifi.patch @@ -0,0 +1,60 @@ +From 60821c8ba0118d231cd3b4fd008cd42868337439 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 27 Oct 2011 09:54:59 +0000 +Subject: [PATCH 1/2] init: try detect alpine_dev filesystem if not specified + +Note that ext4 will be detected as ext3 +--- + initramfs-init.in | 22 +++++++++++++++++++++- + 1 files changed, 21 insertions(+), 1 deletions(-) + +diff --git a/initramfs-init.in b/initramfs-init.in +index 0e30137..7c477c7 100755 +--- a/initramfs-init.in ++++ b/initramfs-init.in +@@ -255,6 +255,20 @@ relocate_alpine_mnt() { + fi + } + ++# detect filesystem type on given device/UUID ++find_fs_type() { ++ local dev=$(findfs $1) ++ local i= ++ for i in $(blkid $dev); do ++ case $i in ++ TYPE=*) eval "$i" ++ echo $TYPE ++ return ++ ;; ++ esac ++ done ++} ++ + # gotta start from somewhere :) + echo "Alpine Init $VERSION" + +@@ -314,7 +328,7 @@ case "$ALPINE_DEV" in + UUID=*|LABEL=*) ;; + *) ALPINE_DEV=/dev/$ALPINE_DEV ;; + esac +- ++ + # look for standard mountpoint locations + ALPINE_MNT=$(find_mnt $ALPINE_DEV /etc/fstab) + [ -z "$ALPINE_MNT" ] && ALPINE_MNT=/media/${ALPINE_DEV##*/} +@@ -398,6 +412,12 @@ start_lvm + # locate boot media and mount it + ebegin "Mounting boot media" + mkdir -p $ALPINE_MNT ++ ++# try detect the filesystem ++if [ -z "$ALPINE_DEV_FS" ]; then ++ ALPINE_DEV_FS=$(find_fs_type $ALPINE_DEV) ++fi ++ + if [ -n "$ALPINE_DEV_FS" ]; then + mount_opts="-t $ALPINE_DEV_FS" + fi +-- +1.7.7.1 + diff --git a/main/mkinitfs/0002-init-new-boot-option-debug_init.patch b/main/mkinitfs/0002-init-new-boot-option-debug_init.patch new file mode 100644 index 0000000000..361c1da239 --- /dev/null +++ b/main/mkinitfs/0002-init-new-boot-option-debug_init.patch @@ -0,0 +1,27 @@ +From 8ff0a825348f5a0c628540d3a859a73624c7f066 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 27 Oct 2011 12:05:27 +0000 +Subject: [PATCH 2/2] init: new boot option: debug_init + +will enable lots of verbose debugging +--- + initramfs-init.in | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/initramfs-init.in b/initramfs-init.in +index 7c477c7..69e8d27 100755 +--- a/initramfs-init.in ++++ b/initramfs-init.in +@@ -289,6 +289,9 @@ while [ $# -gt 0 ]; do + shift + done + ++# enable debugging if requested ++[ -n "$KOPT_debug_init" ] && set -x ++ + # pick first keymap if found + for map in /etc/keymap/*; do + if [ -f "$map" ]; then +-- +1.7.7.1 + diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index f5727b61a0..b06ff573a9 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -1,12 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mkinitfs pkgver=2.4.2 -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs depends="busybox apk-tools>=2.0" triggers="$pkgname.trigger=/usr/share/kernel/*" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 + 0001-init-generate-the-repositories-after-relocation.patch eglibc.patch " arch="noarch" @@ -43,4 +44,5 @@ package() { make install DESTDIR="$pkgdir" || return 1 } md5sums="0a2306eefdeb8a92121eae6546d0d873 mkinitfs-2.4.2.tar.bz2 +f2719523ec4c5e877ae46e70e6f85edb 0001-init-generate-the-repositories-after-relocation.patch e59c2f7de496fe430b07e32fd812ebe0 eglibc.patch" diff --git a/main/open-iscsi-grsec/APKBUILD b/main/open-iscsi-grsec/APKBUILD index c1c133f7d1..c3f61e8931 100644 --- a/main/open-iscsi-grsec/APKBUILD +++ b/main/open-iscsi-grsec/APKBUILD @@ -3,7 +3,7 @@ _flavor=grsec _realname=open-iscsi _realver=2.0-872 -_kver=3.0.14 +_kver=3.0.15 _kpkgrel=0 # verify the kernel version before entering chroot @@ -56,4 +56,4 @@ package() { } md5sums="b4df94f08c241352bb964043b3e44779 open-iscsi-2.0-872.tar.gz -05cd4034bf4fbb3b77ee800c6bdda3d3 Makefile-Alpine-kernels-support.patch" +ad24a4eebe2102cd630880b2bfed9909 Makefile-Alpine-kernels-support.patch" diff --git a/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch b/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch index 7d48db534c..3f12cf4794 100644 --- a/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch +++ b/main/open-iscsi-grsec/Makefile-Alpine-kernels-support.patch @@ -26,7 +26,7 @@ linux_2_6_35: $(unpatch_code) + -+linux_3_0_14: $(unpatch_code) ++linux_3_0_15: $(unpatch_code) do_unpatch_code: echo "Un-patching source code for use with linux-2.6.14 and up ..." diff --git a/main/open-iscsi-grsec/Makefile.kernel.patch b/main/open-iscsi-grsec/Makefile.kernel.patch deleted file mode 100644 index 23ef208332..0000000000 --- a/main/open-iscsi-grsec/Makefile.kernel.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/open-iscsi-2.0-871/kernel/Makefile -+++ Makefile -@@ -102,6 +102,8 @@ - - linux_2_6_30: $(unpatch_code) - -+linux_2_6_38: $(unpatch_code) -+ - - do_unpatch_code: - echo "Un-patching source code for use with linux-2.6.14 and up ..." diff --git a/main/open-vm-tools-grsec/APKBUILD b/main/open-vm-tools-grsec/APKBUILD index 245b00573e..47dc9ee02c 100644 --- a/main/open-vm-tools-grsec/APKBUILD +++ b/main/open-vm-tools-grsec/APKBUILD @@ -7,7 +7,7 @@ _mypkgrel=0 _realver=2011.11.20 _realsubver=535097 -_kver=3.0.14 +_kver=3.0.15 _kpkgrel=0 # source open-vm-tools version diff --git a/main/open-vm-tools-vserver/APKBUILD b/main/open-vm-tools-vserver/APKBUILD index 16d8e2885d..3a23a4f9a8 100644 --- a/main/open-vm-tools-vserver/APKBUILD +++ b/main/open-vm-tools-vserver/APKBUILD @@ -3,7 +3,7 @@ _flavor=vserver _realname=open-vm-tools _name=$_realname-$_flavor -_kver=3.0.14 +_kver=3.0.15 _kpkgrel=0 _myvsver=vs2.3.2.1 _mypkgrel=0 diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD index dbec01100b..eb46a7ab31 100644 --- a/main/openssl/APKBUILD +++ b/main/openssl/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=openssl -pkgver=1.0.0e +pkgver=1.0.0f pkgrel=0 pkgdesc="Toolkit for SSL v2/v3 and TLS v1" url="http://openssl.org" @@ -69,7 +69,7 @@ libssl() { done } -md5sums="7040b89c4c58c7a1016c0dfa6e821c86 openssl-1.0.0e.tar.gz +md5sums="e358705fb4a8827b5e9224a73f442025 openssl-1.0.0f.tar.gz 115c481cd59b3dba631364e8fb1778f5 fix-manpages.patch c6a9857a5dbd30cead0404aa7dd73977 openssl-bb-basename.patch 1f607b8e11347e56a0906756f3d6928a 0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch diff --git a/main/perl-test-tester/APKBUILD b/main/perl-test-tester/APKBUILD index bb541ce618..52bc2895ae 100644 --- a/main/perl-test-tester/APKBUILD +++ b/main/perl-test-tester/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=perl-test-tester -pkgver=0.107 +pkgver=0.108 pkgrel=0 pkgdesc="Test::Tester perl module" url="http://search.cpan.org/dist/Test-Tester/" @@ -36,4 +36,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -md5sums="998a8abe241992faaa3e90f330800840 Test-Tester-0.107.tar.gz" +md5sums="939d4fb9ad04b8b5a746cdd09040ea0b Test-Tester-0.108.tar.gz" diff --git a/main/postgresql/APKBUILD b/main/postgresql/APKBUILD index 5a18e510c4..ee3d0491e3 100644 --- a/main/postgresql/APKBUILD +++ b/main/postgresql/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=postgresql pkgver=9.1.2 -pkgrel=0 +pkgrel=1 pkgdesc="A sophisticated object-relational DBMS" url="http://www.postgresql.org/" arch="all" @@ -60,5 +60,5 @@ client() { md5sums="7dbff52221954c46595313eb7f92c3e0 postgresql-9.1.2.tar.bz2 7d7b7815f2bf133830f65ed9830ce461 postgresql.initd b609795f715cefcc30b08e4ed01f4416 postgresql.confd -5f6d10a6a3d71dcee856fa6671954ab4 pg-restore.initd +df2d90fc713b4e89fd21abb9e36cd688 pg-restore.initd bf45384752b320b369f1425939763178 pg-restore.confd" diff --git a/main/postgresql/pg-restore.initd b/main/postgresql/pg-restore.initd index 3d1ad50f6d..1cc4da5c8f 100644 --- a/main/postgresql/pg-restore.initd +++ b/main/postgresql/pg-restore.initd @@ -37,8 +37,3 @@ purge() { start() { restore } - -stop() { - dump -} - diff --git a/main/privoxy/APKBUILD b/main/privoxy/APKBUILD index 61cff17d11..2395185bc9 100644 --- a/main/privoxy/APKBUILD +++ b/main/privoxy/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=privoxy -pkgver=3.0.18 +pkgver=3.0.19 pkgrel=0 pkgdesc="A web proxy with advanced filtering capabilities" url="http://www.privoxy.org" @@ -55,7 +55,7 @@ package() { "$pkgdir"/etc/privoxy } -md5sums="baf0b13bb591ec6e1ba15b720ddea65c privoxy-3.0.18-stable-src.tar.gz +md5sums="57acc79059565cc42eda67982842785d privoxy-3.0.19-stable-src.tar.gz 170d5679e4c3504f07ef1a4c9859e9b8 privoxy.initd f2b6a652dbfbc65e5b89024a8ea3da7e privoxy.logrotate cb233d3e5b13027557a405f467ee307c privoxy-alpine.patch" diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD index 99b60bf9cc..ec2fea7dcf 100644 --- a/main/qemu/APKBUILD +++ b/main/qemu/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qemu pkgver=1.0 -pkgrel=3 +pkgrel=4 pkgdesc="QEMU is a generic machine emulator and virtualizer" url="http://www.nongnu.org/qemu/" arch="all" @@ -88,7 +88,7 @@ package() { _subsys() { pkgdesc="Qemu $1 system emulator" - depend="qemu" + depends="qemu" mkdir -p "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/qemu-system-$1 "$subpkgdir"/usr/bin/ } diff --git a/main/recordmydesktop/APKBUILD b/main/recordmydesktop/APKBUILD index 6d07961b5e..d67a5ec9bf 100644 --- a/main/recordmydesktop/APKBUILD +++ b/main/recordmydesktop/APKBUILD @@ -1,24 +1,30 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=recordmydesktop pkgver=0.3.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="Produces a OGG encapsulated Theora/Vorbis recording of your desktop" url="http://recordmydesktop.sourceforge.net" arch="all" license="GPL" depends="" makedepends="alsa-lib-dev zlib-dev libvorbis-dev libxdamage-dev libxext-dev - libtheora-dev libsm-dev" + libtheora-dev libsm-dev autoconf automake libtool" subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/recordmydesktop/recordmydesktop-$pkgver.tar.gz shmstr-to-shmproto.patch - recordmydesktop-bitrate.patch" + recordmydesktop-bitrate.patch + libm-underlinking.patch + " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - patch -p0 < $srcdir/shmstr-to-shmproto.patch - patch -p1 < $srcdir/recordmydesktop-bitrate.patch + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + libtoolize --force && aclocal && autoconf && automake || return 1 } build() { @@ -34,5 +40,6 @@ package() { } md5sums="6998b165540598965499bd99d8aa0eef recordmydesktop-0.3.8.1.tar.gz -211a1773f223b3f281520aa1056395e6 shmstr-to-shmproto.patch -b0794a769efd287e9e8c5fb8c3299b35 recordmydesktop-bitrate.patch" +7aa0bb8a8821b7178137e5293d1046a7 shmstr-to-shmproto.patch +b0794a769efd287e9e8c5fb8c3299b35 recordmydesktop-bitrate.patch +28ed60c8c7c5a139a14a74fa228f2d0b libm-underlinking.patch" diff --git a/main/recordmydesktop/libm-underlinking.patch b/main/recordmydesktop/libm-underlinking.patch new file mode 100644 index 0000000000..04036b86e8 --- /dev/null +++ b/main/recordmydesktop/libm-underlinking.patch @@ -0,0 +1,11 @@ +--- ./src/Makefile.am.orig ++++ ./src/Makefile.am +@@ -76,7 +76,7 @@ + skeleton.h + + recordmydesktop_CPPFLAGS = -D_THREAD_SAFE -pthread -Wall +-recordmydesktop_LDFLAGS = @X_LIBS@ @X_EXTRA_LIBS@ @X_PRE_LIBS@ ++recordmydesktop_LDFLAGS = -lm @X_LIBS@ @X_EXTRA_LIBS@ @X_PRE_LIBS@ + + + # RectInsert test diff --git a/main/recordmydesktop/shmstr-to-shmproto.patch b/main/recordmydesktop/shmstr-to-shmproto.patch index 6fc446e9a8..8dff417685 100644 --- a/main/recordmydesktop/shmstr-to-shmproto.patch +++ b/main/recordmydesktop/shmstr-to-shmproto.patch @@ -1,5 +1,5 @@ ---- src/rmd_getzpixmap.c 2008-12-13 17:04:10.000000000 +0100 -+++ src/rmd_getzpixmap.c 2009-11-11 11:30:18.000000000 +0100 +--- a/src/rmd_getzpixmap.c 2008-12-13 17:04:10.000000000 +0100 ++++ b/src/rmd_getzpixmap.c 2009-11-11 11:30:18.000000000 +0100 @@ -32,7 +32,7 @@ #include <X11/Xlib.h> @@ -9,8 +9,8 @@ #include <X11/extensions/XShm.h> ---- src/rmd_update_image.c 2008-12-13 17:20:49.000000000 +0100 -+++ src/rmd_update_image.c 2009-11-11 11:30:34.000000000 +0100 +--- a/src/rmd_update_image.c 2008-12-13 17:20:49.000000000 +0100 ++++ b/src/rmd_update_image.c 2009-11-11 11:30:34.000000000 +0100 @@ -32,7 +32,7 @@ #include "rmd_types.h" diff --git a/main/rrdtool/APKBUILD b/main/rrdtool/APKBUILD index ea250f81dc..d300dbc763 100644 --- a/main/rrdtool/APKBUILD +++ b/main/rrdtool/APKBUILD @@ -1,14 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=rrdtool pkgver=1.4.5 -pkgrel=0 +pkgrel=1 pkgdesc="Data logging and graphing application" url="http://www.rrdtool.org" arch="all" license="GPL" depends= -makedepends="libart-lgpl-dev libpng-dev freetype-dev perl-dev cairo-dev pango-dev lua-dev man" -subpackages="$pkgname-dev $pkgname-doc perl-rrd:perl_rrd" +makedepends="libart-lgpl-dev libpng-dev freetype-dev perl-dev cairo-dev + pango-dev lua-dev man" +subpackages="$pkgname-dev $pkgname-doc perl-rrd:perl_rrd lua-rrd:lua_rrd" source="http://oss.oetiker.ch/$pkgname/pub/$pkgname-$pkgver.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver @@ -50,4 +51,11 @@ perl_rrd() { mv "$pkgdir"/usr/share/perl* "$subpkgdir"/usr/share/ } +lua_rrd() { + pkgdesc="Lua interface for rrdtool" + mkdir -p "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/lib/lua "$subpkgdir"/usr/lib/ +} + + md5sums="4d116dba9a0888d8aaac179e35d3980a rrdtool-1.4.5.tar.gz" diff --git a/main/shorewall-shell/APKBUILD b/main/shorewall-shell/APKBUILD index c2e1eefa1c..c23e11d146 100644 --- a/main/shorewall-shell/APKBUILD +++ b/main/shorewall-shell/APKBUILD @@ -2,7 +2,7 @@ pkgname=shorewall-shell _v=4.2.11 pkgver=4.2.11 -pkgrel=3 +pkgrel=4 pkgdesc="Shoreline Firewall shell-based compiler." url="http://www.shorewall.net/" arch="noarch" @@ -34,5 +34,5 @@ build() { md5sums="518a7f389a6f606c109acb7dfbe18372 shorewall-shell-4.2.11.tar.bz2 64c01bc4f57203fb877bb334994eac38 shorewall-policyrouting.patch 79745ea284a08cb167b9a356ee0bff3b shorewall-shell-ipset.patch -66b7249c5c56d104f62676c175e222d3 shorewall-shell-providers-gateway-none.patch +0c6106a8cbb95d21c0c878a6235a65ac shorewall-shell-providers-gateway-none.patch d5eadb6be45aa41f80669452baa853a6 shorewall-shell-rp_filter.patch" diff --git a/main/shorewall-shell/shorewall-shell-providers-gateway-none.patch b/main/shorewall-shell/shorewall-shell-providers-gateway-none.patch index 531c37ed77..53459ab5f5 100644 --- a/main/shorewall-shell/shorewall-shell-providers-gateway-none.patch +++ b/main/shorewall-shell/shorewall-shell-providers-gateway-none.patch @@ -36,3 +36,14 @@ fi save_command "if [ -w /etc/iproute2/rt_tables ]; then" +--- ./lib.providers.orig ++++ ./lib.providers +@@ -267,7 +267,7 @@ + rulenum=\$((\$rulenum + 1)) + done + __EOF__ +- elif [ -n "$DELETE_THEN_ADD" ]; then ++ elif [ -n "$DELETE_THEN_ADD" ] && [ -n "$gateway" ]; then + indent >&3 << __EOF__ + + find_interface_addresses $interface | while read address; do diff --git a/main/slim/APKBUILD b/main/slim/APKBUILD index 55ebe923b4..bce7f473ed 100644 --- a/main/slim/APKBUILD +++ b/main/slim/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=slim pkgver=1.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="Desktop-independent graphical login manager for X11" url="http://slim.berlios.de/" arch="all" @@ -15,12 +15,16 @@ source="http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz $pkgname.logrotate $pkgname.initd slim-restart.patch - slim-png15.patch" + slim-png15.patch + pthread.patch + " prepare() { cd "$srcdir/slim-$pkgver" - for i in ../*.patch; do - patch -p1 -i $i || return 1 + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac done #libpng 1.4.0 @@ -63,4 +67,5 @@ cd63232c7770b0e67a009a94c2a46b82 slim-alpinelinux.tar.gz 43da096480bf72c3ccec8ad8400f34f0 slim.logrotate 6ee3a023e56052528295034be809cfc6 slim.initd 648d871fe7d2a97b7d7b928019e2feee slim-restart.patch -8f63afd7cd390cb8d65f10fb167d4a71 slim-png15.patch" +8f63afd7cd390cb8d65f10fb167d4a71 slim-png15.patch +49cb6cae0b8aa6980b88f90dad2524cf pthread.patch" diff --git a/main/slim/pthread.patch b/main/slim/pthread.patch new file mode 100644 index 0000000000..9a1379ad10 --- /dev/null +++ b/main/slim/pthread.patch @@ -0,0 +1,11 @@ +--- ./Makefile.orig ++++ ./Makefile +@@ -7,7 +7,7 @@ + CC=/usr/bin/gcc + CFLAGS=-Wall -I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include + CXXFLAGS=$(CFLAGS) +-LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt ++LDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg -lrt -lpthread + CUSTOM=-DHAVE_SHADOW + ifdef USE_PAM + LDFLAGS+= -lpam diff --git a/main/ssmtp/APKBUILD b/main/ssmtp/APKBUILD index d21dac8b0c..d8ee553a24 100644 --- a/main/ssmtp/APKBUILD +++ b/main/ssmtp/APKBUILD @@ -3,22 +3,32 @@ pkgname=ssmtp pkgver=2.64 -pkgrel=4 +pkgrel=5 pkgdesc="Extremely simple MTA to get mail off the system to a mail hub" subpackages="$pkgname-doc" arch="all" url="http://packages.debian.org/source/lenny/ssmtp" license="GPL-2" depends= -makedepends="openssl-dev" +makedepends="openssl-dev autoconf" install= source="http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2 generate_config.patch + libcrypto-underlinking.patch " +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + autoconf +} build() { - cd "$srcdir"/$pkgname-$pkgver - patch generate_config ../generate_config.patch || return 1 + cd "$_builddir" sed -i -e 's:$(CC) -o:$(CC) @LDFLAGS@ -o:' Makefile.in ./configure --prefix=/usr \ @@ -38,4 +48,5 @@ package() { } md5sums="65b4e0df4934a6cd08c506cabcbe584f ssmtp_2.64.orig.tar.bz2 -c70c395fe71589ca8b10b666455d5071 generate_config.patch" +a9ea0b998975e51b37a8946f5ea977db generate_config.patch +d782db1a953c6d48b63353d71f0c52f5 libcrypto-underlinking.patch" diff --git a/main/ssmtp/CVE-2008-3962.patch b/main/ssmtp/CVE-2008-3962.patch deleted file mode 100644 index fca144fa68..0000000000 --- a/main/ssmtp/CVE-2008-3962.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ssmtp.orig/ssmtp.c -+++ ssmtp/ssmtp.c -@@ -485,6 +485,11 @@ char *from_format(char *str, bool_t over - die("from_format() -- snprintf() failed"); - } - } -+ else { -+ if(snprintf(buf, BUF_SZ, "%s", str) == -1) { -+ die("from_format() -- snprintf() failed"); -+ } -+ } - } - - #if 0 diff --git a/main/ssmtp/generate_config.patch b/main/ssmtp/generate_config.patch index dd4baf9f8a..23285b193a 100644 --- a/main/ssmtp/generate_config.patch +++ b/main/ssmtp/generate_config.patch @@ -1,5 +1,5 @@ ---- src/ssmtp/generate_config 2004-07-23 05:58:48.000000000 +0000 -+++ generate_config 2009-01-27 10:09:11.000000000 +0000 +--- ./generate_config 2004-07-23 05:58:48.000000000 +0000 ++++ ./generate_config 2009-01-27 10:09:11.000000000 +0000 @@ -4,7 +4,7 @@ # Figure out the system's mailname # diff --git a/main/ssmtp/libcrypto-underlinking.patch b/main/ssmtp/libcrypto-underlinking.patch new file mode 100644 index 0000000000..4928f271cf --- /dev/null +++ b/main/ssmtp/libcrypto-underlinking.patch @@ -0,0 +1,11 @@ +--- ./configure.in.orig ++++ ./configure.in +@@ -52,7 +52,7 @@ + [ --enable-ssl support for secure connection to mail server]) + if test x$enableval = xyes ; then + AC_DEFINE(HAVE_SSL) +- LIBS="$LIBS -lssl" ++ LIBS="$LIBS -lssl -lcrypto" + fi + enableval="" + diff --git a/main/tcpdump/APKBUILD b/main/tcpdump/APKBUILD index b86328fbc5..2228a23244 100644 --- a/main/tcpdump/APKBUILD +++ b/main/tcpdump/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tcpdump -pkgver=4.1.1 -pkgrel=2 +pkgver=4.2.1 +pkgrel=0 pkgdesc="A tool for network monitoring and data acquisition" url="http://www.tcpdump.org" arch="all" @@ -26,4 +26,4 @@ package() { rm -f "$pkgdir"/usr/sbin/tcpdump.4* } -md5sums="d0dd58bbd6cd36795e05c6f1f74420b0 tcpdump-4.1.1.tar.gz" +md5sums="c202878c6db054767b52651041b9e60e tcpdump-4.2.1.tar.gz" diff --git a/main/wavpack/APKBUILD b/main/wavpack/APKBUILD index f9c850cdbc..def61f19c7 100644 --- a/main/wavpack/APKBUILD +++ b/main/wavpack/APKBUILD @@ -2,25 +2,31 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wavpack pkgver=4.60.1 -pkgrel=2 +pkgrel=3 pkgdesc="Audio compression format with lossless, lossy, and hybrid compression modes" url="http://www.wavpack.com/" arch="all" license="custom" depends= -makedepends= +makedepends="autoconf automake libtool" if [ "$ALPINE_LIBC" != eglibc ]; then - makedepends="$makdepends libiconv-dev" + makedepends="$makedepends libiconv-dev" fi install= subpackages="$pkgname-dev $pkgname-doc" -source="http://www.wavpack.com/${pkgname}-${pkgver}.tar.bz2" +source="http://www.wavpack.com/${pkgname}-${pkgver}.tar.bz2 + iconv-underlinking.patch" _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - # apply patches here + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + libtoolize --force && aclocal && autoconf && automake || return 1 } build() { @@ -42,4 +48,5 @@ package() { rm "$pkgdir"/usr/lib/*.la } -md5sums="7bb1528f910e4d0003426c02db856063 wavpack-4.60.1.tar.bz2" +md5sums="7bb1528f910e4d0003426c02db856063 wavpack-4.60.1.tar.bz2 +262979a78da1ff825243352c7bfb691e iconv-underlinking.patch" diff --git a/main/wavpack/iconv-underlinking.patch b/main/wavpack/iconv-underlinking.patch new file mode 100644 index 0000000000..1d920a1905 --- /dev/null +++ b/main/wavpack/iconv-underlinking.patch @@ -0,0 +1,21 @@ +--- ./cli/Makefile.am.orig ++++ ./cli/Makefile.am +@@ -2,15 +2,15 @@ + + wavpack_SOURCES = wavpack.c utils.c md5.c + wavpack_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include +-wavpack_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) ++wavpack_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) $(ICONV_LIBS) + + wvunpack_SOURCES = wvunpack.c utils.c md5.c + wvunpack_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include +-wvunpack_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) ++wvunpack_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) $(ICONV_LIBS) + + wvgain_SOURCES = wvgain.c utils.c + wvgain_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include +-wvgain_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) ++wvgain_LDADD = $(AM_LDADD) $(top_builddir)/src/.libs/libwavpack.la $(LIBM) $(ICONV_LIBS) + + noinst_HEADERS = \ + utils.h \ diff --git a/main/wine/APKBUILD b/main/wine/APKBUILD index 0f64c8c18a..04b788d100 100644 --- a/main/wine/APKBUILD +++ b/main/wine/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=wine -pkgver=1.3.35 +pkgver=1.3.36 pkgrel=0 pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" @@ -12,7 +12,8 @@ makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev libpng-dev jpeg-dev freetype-dev ncurses-dev openssl-dev libxcomposite-dev libxrender-dev libxinerama-dev zlib-dev cups-dev alsa-lib-dev lcms-dev libxml2-dev - gstreamer-dev gst-plugins-base-dev paxctl + gstreamer-dev gst-plugins-base-dev paxctl dbus-dev libxi-dev gnutls-dev + tiff-dev v4l-utils-dev autoconf automake" source="http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$pkgver.tar.bz2 " @@ -34,6 +35,7 @@ prepare() { build() { cd "$_builddir" ./configure --prefix=/usr \ + --with-dbus \ --with-x make } @@ -46,4 +48,4 @@ package() { "$pkgdir"/usr/bin/wine } -md5sums="5833787fcd7fee5a2299fade10a2760d wine-1.3.35.tar.bz2" +md5sums="51e20231aa72a7b9db89aefdae8e92e3 wine-1.3.36.tar.bz2" diff --git a/main/wipe/APKBUILD b/main/wipe/APKBUILD new file mode 100644 index 0000000000..ac59ea3457 --- /dev/null +++ b/main/wipe/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +pkgname=wipe +pkgver=0.22 +pkgrel=0 +pkgdesc="tool for securely erasing files from magnetic media" +url="http://lambda-diode.com/software/wipe/" +arch="all" +license="GPL" +depends="" +depends_dev="" +makedepends="$depends_dev" +install="" +subpackages="" +source="http://lambda-diode.com/resources/wipe/wipe-$pkgver.tar.gz" + +_builddir="$srcdir"/wipe-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + make linux || return 1 +} + +package() { + cd "$_builddir" + install -d "$pkgdir"/usr/bin + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/*.la +} + +md5sums="d5e0b2cdea9846f370f3b3f3b91fd593 wipe-0.22.tar.gz" diff --git a/main/xfce4-screenshooter/APKBUILD b/main/xfce4-screenshooter/APKBUILD index d43ff17325..d75aaaf9da 100644 --- a/main/xfce4-screenshooter/APKBUILD +++ b/main/xfce4-screenshooter/APKBUILD @@ -1,21 +1,32 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-screenshooter pkgver=1.8.0 -pkgrel=0 +pkgrel=1 pkgdesc="screenshot application for Xfce4" url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter" arch="all" license="GPL2" -subpackages="$pkgname-doc" +subpackages="$pkgname-doc $pkgname-lang" depends= makedepends="xfce4-panel-dev hicolor-icon-theme libsoup-dev libxfce4ui-dev exo-dev libxext-dev" -install="xfce4-screenshooter.post-install xfce4-screenshooter.post-upgrade - xfce4-screenshooter.post-deinstall" -source="http://archive.xfce.org/src/apps/xfce4-screenshooter/${pkgver%.*}/xfce4-screenshooter-$pkgver.tar.bz2" +install= +source="http://archive.xfce.org/src/apps/xfce4-screenshooter/${pkgver%.*}/xfce4-screenshooter-$pkgver.tar.bz2 + fs-25873-segfault-in-awesome-wm.patch + xfce4-screenshooter-1.7.9-dsofix.patch" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build () { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -25,8 +36,10 @@ build () { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 } -md5sums="b51ab5725418e7258273c4a6402adb02 xfce4-screenshooter-1.8.0.tar.bz2" +md5sums="b51ab5725418e7258273c4a6402adb02 xfce4-screenshooter-1.8.0.tar.bz2 +18042622c40c37a13da958aee216cafb fs-25873-segfault-in-awesome-wm.patch +a8a30afa060e0f65cbc8a0809f2d8c31 xfce4-screenshooter-1.7.9-dsofix.patch" diff --git a/main/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch b/main/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch new file mode 100644 index 0000000000..47e0671446 --- /dev/null +++ b/main/xfce4-screenshooter/fs-25873-segfault-in-awesome-wm.patch @@ -0,0 +1,21 @@ +--- a/lib/screenshooter-capture.c ++++ a/lib/screenshooter-capture.c +@@ -381,6 +381,18 @@ static GdkPixbuf + rec_height += rectangle.y; + } + ++ if (rec_x < 0) ++ { ++ rec_width = rec_width + rec_x; ++ rec_x = 0; ++ } ++ ++ if (rec_y < 0) ++ { ++ rec_height = rec_height + rec_y; ++ rec_y = 0; ++ } ++ + if (x_orig + rec_x + rec_width > gdk_screen_width ()) + rec_width = gdk_screen_width () - x_orig - rec_x; + diff --git a/main/xfce4-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch b/main/xfce4-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch new file mode 100644 index 0000000000..c383b2e52a --- /dev/null +++ b/main/xfce4-screenshooter/xfce4-screenshooter-1.7.9-dsofix.patch @@ -0,0 +1,13 @@ +Upstream: https://bugzilla.xfce.org/show_bug.cgi?id=7985 + +--- xfce4-screenshooter-1.7.9.orig/Makefile.in 2010-02-07 14:45:15.000000000 +0100 ++++ xfce4-screenshooter-1.7.9/Makefile.in 2010-02-16 23:57:31.000000000 +0100 +@@ -282,7 +282,7 @@ + INTLTOOL_PERL = @INTLTOOL_PERL@ + INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ + LD = @LD@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = @LDFLAGS@ -lm -lX11 + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ diff --git a/main/xfce4-screenshooter/xfce4-screenshooter.install b/main/xfce4-screenshooter/xfce4-screenshooter.install new file mode 100644 index 0000000000..e4f8fd06c1 --- /dev/null +++ b/main/xfce4-screenshooter/xfce4-screenshooter.install @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/main/xfce4-screenshooter/xfce4-screenshooter.post-deinstall b/main/xfce4-screenshooter/xfce4-screenshooter.post-deinstall deleted file mode 120000 index 735306e31d..0000000000 --- a/main/xfce4-screenshooter/xfce4-screenshooter.post-deinstall +++ /dev/null @@ -1 +0,0 @@ -xfce4-screenshooter.post-install
\ No newline at end of file diff --git a/main/xfce4-screenshooter/xfce4-screenshooter.post-install b/main/xfce4-screenshooter/xfce4-screenshooter.post-install deleted file mode 100644 index c523d78da0..0000000000 --- a/main/xfce4-screenshooter/xfce4-screenshooter.post-install +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - diff --git a/main/xfce4-screenshooter/xfce4-screenshooter.post-upgrade b/main/xfce4-screenshooter/xfce4-screenshooter.post-upgrade deleted file mode 120000 index 735306e31d..0000000000 --- a/main/xfce4-screenshooter/xfce4-screenshooter.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -xfce4-screenshooter.post-install
\ No newline at end of file diff --git a/main/xfce4-wavelan-plugin/APKBUILD b/main/xfce4-wavelan-plugin/APKBUILD index 4dd8240aff..274c4f10f6 100644 --- a/main/xfce4-wavelan-plugin/APKBUILD +++ b/main/xfce4-wavelan-plugin/APKBUILD @@ -1,17 +1,32 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xfce4-wavelan-plugin pkgver=0.5.6 -pkgrel=0 +pkgrel=1 pkgdesc="plugin to monitor wifi connectivity for the Xfce4 panel" url="http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin/" arch="all" license="custom" depends= -makedepends="pkgconfig xfce4-panel-dev intltool libsm-dev libxfcegui4-dev" -source="http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" +subpackages="$pkgname-lang" +makedepends="pkgconfig xfce4-panel-dev intltool libsm-dev libxfcegui4-dev + xfce4-dev-tools" +source="http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 + xfce4-wavelan-plugin-0.5.6-fix-libm-underlinking.patch + " + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + xdt-autogen +} build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -22,9 +37,10 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="b23a4c9c2a206242ee4db8186dd01801 xfce4-wavelan-plugin-0.5.6.tar.bz2" +md5sums="b23a4c9c2a206242ee4db8186dd01801 xfce4-wavelan-plugin-0.5.6.tar.bz2 +826ac10d3daab247abadaf9797bcf22e xfce4-wavelan-plugin-0.5.6-fix-libm-underlinking.patch" diff --git a/main/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.6-fix-libm-underlinking.patch b/main/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.6-fix-libm-underlinking.patch new file mode 100644 index 0000000000..32d17a8402 --- /dev/null +++ b/main/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.6-fix-libm-underlinking.patch @@ -0,0 +1,11 @@ +diff -ur xfce4-wavelan-plugin-0.5.6.orig/configure.ac xfce4-wavelan-plugin-0.5.6/configure.ac +--- xfce4-wavelan-plugin-0.5.6.orig/configure.ac 2010-12-04 01:51:47.000000000 +0100 ++++ xfce4-wavelan-plugin-0.5.6/configure.ac 2011-09-21 08:55:53.549999963 +0200 +@@ -41,6 +41,7 @@ + sys/socket.h sys/ioctl.h linux/types.h linux/if.h \ + linux/wireless.h string.h \ + ctype.h], [], [], [#include <sys/socket.h>]) ++AC_SEARCH_LIBS(sin, m) + + dnl Check for i18n support + XDT_I18N([ar ast be ca cs da de en_GB es eu fr gl hu id it ja kk ko lv nb pl pt_BR pt ru sq sv tr ug uk ur_PK ur vi zh_CN ]) diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD index a03e80b272..b7df8de2dc 100644 --- a/main/xtables-addons-grsec/APKBUILD +++ b/main/xtables-addons-grsec/APKBUILD @@ -3,7 +3,7 @@ _flavor=${FLAVOR:-grsec} _realname=xtables-addons _name=$_realname-$_flavor -_kver=3.0.14 +_kver=3.0.15 _kpkgrel=0 # source the kernel version diff --git a/main/yasm/APKBUILD b/main/yasm/APKBUILD index 5ec0ba6ecf..0b1a1f2ab1 100644 --- a/main/yasm/APKBUILD +++ b/main/yasm/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=yasm -pkgver=1.1.0 -pkgrel=1 +pkgver=1.2.0 +pkgrel=0 pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)" url="http://www.tortall.net/projects/yasm/" arch="all" @@ -23,4 +23,4 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="8392e5f2235c2c2a981e1a633f2698cb yasm-1.1.0.tar.gz" +md5sums="4cfc0686cf5350dd1305c4d905eb55a6 yasm-1.2.0.tar.gz" |