diff options
| author | Cedric Schieli <cschieli@gmail.com> | 2010-06-01 12:37:47 +0000 |
|---|---|---|
| committer | Cedric Schieli <cschieli@gmail.com> | 2010-06-01 12:37:47 +0000 |
| commit | 10b8b99e48384b4470cac1330080c12d2ade01de (patch) | |
| tree | 7bb4ad6cd94a2c9a960fd9a4532d123eee5151d5 /main/thunar | |
| parent | 9252f1cfd78299b137400ed8169a79f7f833daac (diff) | |
| parent | c6c0b6f9dbde1244e7b31f74c703178a867e873f (diff) | |
| download | aports-to-upstream.tar.bz2 aports-to-upstream.tar.xz | |
Merge remote branch 'upstream/master' into to-upstreamto-upstream
Diffstat (limited to 'main/thunar')
| -rw-r--r-- | main/thunar/APKBUILD | 13 | ||||
| -rw-r--r-- | main/thunar/libpng-1.4.patch | 12 |
2 files changed, 5 insertions, 20 deletions
diff --git a/main/thunar/APKBUILD b/main/thunar/APKBUILD index f99a0410..7dcc1b29 100644 --- a/main/thunar/APKBUILD +++ b/main/thunar/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=thunar -pkgver=1.0.1 -pkgrel=6 +pkgver=1.0.2 +pkgrel=1 pkgdesc="File manager for Xfce" url="http://thunar.xfce.org" license="GPL2 LGPL2" @@ -11,15 +11,13 @@ makedepends="pkgconfig libexif-dev xfce4-panel-dev exo-dev pcre-dev intltool gettext-dev libiconv-dev expat-dev startup-notification-dev libsm-dev e2fsprogs-dev gamin-dev libexif-dev jpeg-dev" install= -source="http://archive.xfce.org/src/xfce/thunar/${pkgver%.*}/Thunar-$pkgver.tar.bz2 - libpng-1.4.patch" +source="http://archive.xfce.org/src/xfce/thunar/${pkgver%.*}/Thunar-$pkgver.tar.bz2" -depends_dev="exo-dev glib-dev gamin-dev jpeg-dev" +depends_dev="exo-dev glib-dev gamin-dev jpeg-dev startup-notification-dev" _builddir="$srcdir"/Thunar-$pkgver prepare() { cd "$_builddir" - patch -p1 -i "$srcdir"/libpng-1.4.patch } build() { @@ -41,5 +39,4 @@ package() { sed -i 's:x-directory/gnome-default-handler;::' "$pkgdir"/usr/share/applications/Thunar-folder-handler.desktop } -md5sums="218373aa45d74b6ba8c69c4d5af3bb19 Thunar-1.0.1.tar.bz2 -ee998c20ba13d0cb18741da8b7d67328 libpng-1.4.patch" +md5sums="c91073202d373a1f9951a1240083c36d Thunar-1.0.2.tar.bz2" diff --git a/main/thunar/libpng-1.4.patch b/main/thunar/libpng-1.4.patch deleted file mode 100644 index 7f38165f..00000000 --- a/main/thunar/libpng-1.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur Thunar-1.0.1.orig/thunar-vfs/thunar-vfs-thumb.c Thunar-1.0.1/thunar-vfs/thunar-vfs-thumb.c ---- Thunar-1.0.1.orig/thunar-vfs/thunar-vfs-thumb.c 2010-01-20 21:31:35.000000000 -0500 -+++ Thunar-1.0.1/thunar-vfs/thunar-vfs-thumb.c 2010-01-20 21:34:51.000000000 -0500 -@@ -1169,7 +1169,7 @@ - goto done0; - - /* verify the png signature */ -- if (G_LIKELY (png_check_sig ((png_bytep) signature, sizeof (signature)))) -+ if (G_LIKELY (!png_sig_cmp ((png_bytep) signature, 0, sizeof (signature)))) - rewind (fp); - else - goto done0; |