aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-01-29 13:22:27 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-01-29 13:22:27 +0000
commitd4b33335f12be4a4eb4d3c5f855b4b17a73190ae (patch)
tree8c4526119ec1e56c7eafc029106e79091e4f23ca /main
parent425c9ab2e83c353f9716fc77db52a2d291e0f745 (diff)
downloadaports-d4b33335f12be4a4eb4d3c5f855b4b17a73190ae.tar.bz2
aports-d4b33335f12be4a4eb4d3c5f855b4b17a73190ae.tar.xz
main/thunar: buildfix: needs patch for libpng-1.4
Diffstat (limited to 'main')
-rw-r--r--main/thunar/APKBUILD11
-rw-r--r--main/thunar/libpng-1.4.patch12
2 files changed, 21 insertions, 2 deletions
diff --git a/main/thunar/APKBUILD b/main/thunar/APKBUILD
index c27bd11367..1968361533 100644
--- a/main/thunar/APKBUILD
+++ b/main/thunar/APKBUILD
@@ -11,11 +11,17 @@ 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"
install=
-source="http://archive.xfce.org/src/xfce/thunar/${pkgver%.*}/Thunar-$pkgver.tar.bz2"
+source="http://archive.xfce.org/src/xfce/thunar/${pkgver%.*}/Thunar-$pkgver.tar.bz2
+ libpng-1.4.patch"
depends_dev="exo-dev glib-dev gamin-dev"
_builddir="$srcdir"/Thunar-$pkgver
+prepare() {
+ cd "$_builddir"
+ patch -p1 -i "$srcdir"/libpng-1.4.patch
+}
+
build() {
cd "$_builddir"
./configure --prefix=/usr \
@@ -35,4 +41,5 @@ 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"
+md5sums="218373aa45d74b6ba8c69c4d5af3bb19 Thunar-1.0.1.tar.bz2
+ee998c20ba13d0cb18741da8b7d67328 libpng-1.4.patch"
diff --git a/main/thunar/libpng-1.4.patch b/main/thunar/libpng-1.4.patch
new file mode 100644
index 0000000000..7f38165f77
--- /dev/null
+++ b/main/thunar/libpng-1.4.patch
@@ -0,0 +1,12 @@
+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;