From 63ada1176a6c09bca0007f56db6997df76148bf9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 7 May 2010 14:23:08 +0200 Subject: [PATCH] Bump revision for all pkgs requiring libpng. --- srcpkgs/ImageMagick/libmagick.template | 1 + srcpkgs/SDL_image/template | 2 +- srcpkgs/Thunar/template | 2 +- srcpkgs/cairo/template | 7 +++++- srcpkgs/cairomm/template | 2 +- srcpkgs/compiz/template | 1 + srcpkgs/gd/gd-progs.template | 2 +- srcpkgs/gd/template | 2 +- srcpkgs/gegl/template | 1 + srcpkgs/gimp/patches/libpng-1.4.patch | 25 +++++++++++++++++++ srcpkgs/gimp/template | 11 ++++---- srcpkgs/graphviz/template | 1 + srcpkgs/gst-plugins-good/template | 1 + srcpkgs/gtk+/template | 4 +++ srcpkgs/lbreakout2/template | 1 + srcpkgs/librsvg/template | 1 + srcpkgs/libwmf/template | 2 +- srcpkgs/neverball/template | 2 +- srcpkgs/pekwm/template | 6 +++++ srcpkgs/poppler/template | 2 +- srcpkgs/qt/template | 2 +- srcpkgs/vlc/template | 1 + srcpkgs/webkit-gtk/template | 2 +- srcpkgs/xcursorgen/template | 17 ++++++++++--- .../xulrunner/patches/xulrunner-png14.patch | 11 ++++++++ srcpkgs/xulrunner/template | 9 ++++++- 26 files changed, 97 insertions(+), 21 deletions(-) create mode 100644 srcpkgs/gimp/patches/libpng-1.4.patch create mode 100644 srcpkgs/xulrunner/patches/xulrunner-png14.patch diff --git a/srcpkgs/ImageMagick/libmagick.template b/srcpkgs/ImageMagick/libmagick.template index f743401cf2..b711a988d0 100644 --- a/srcpkgs/ImageMagick/libmagick.template +++ b/srcpkgs/ImageMagick/libmagick.template @@ -6,6 +6,7 @@ long_desc="${long_desc} This package contains the C libraries needed to run executables that make use of MagickCore." +revision=1 replaces="ImageMagick<6.5.9" Add_dependency run lcms diff --git a/srcpkgs/SDL_image/template b/srcpkgs/SDL_image/template index a3432334f9..da6b56c6e8 100644 --- a/srcpkgs/SDL_image/template +++ b/srcpkgs/SDL_image/template @@ -1,7 +1,7 @@ # Template file for 'SDL_image' pkgname=SDL_image version=1.2.10 -revision=2 +revision=3 distfiles="http://www.libsdl.org/projects/$pkgname/release/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="Load images as SDL surfaces" diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template index 52e8736c53..827681692e 100644 --- a/srcpkgs/Thunar/template +++ b/srcpkgs/Thunar/template @@ -1,7 +1,7 @@ # Template file for 'Thunar' pkgname=Thunar version=1.0.1 -revision=4 +revision=5 distfiles="http://mocha.xfce.org/archive/xfce-4.6.1/src/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-gnome-thumbnailers --enable-exif --enable-pcre" diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template index 3f05a37fb4..24aa3d1a5f 100644 --- a/srcpkgs/cairo/template +++ b/srcpkgs/cairo/template @@ -1,7 +1,7 @@ # Template build file for 'cairo'. pkgname=cairo version=1.8.10 -revision=1 +revision=2 distfiles="http://cairographics.org/releases/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--enable-xlib=yes --enable-xlib-xrender=yes @@ -46,3 +46,8 @@ Add_dependency build libX11-devel Add_dependency build xcb-util-devel Add_dependency build libxcb-devel Add_dependency build libXrender-devel + +pre_configure() +{ + sed -i -e "s|libpng12|libpng14|g" ${wrksrc}/configure +} diff --git a/srcpkgs/cairomm/template b/srcpkgs/cairomm/template index 446ca64b5d..7d3c160cc7 100644 --- a/srcpkgs/cairomm/template +++ b/srcpkgs/cairomm/template @@ -1,7 +1,7 @@ # Template build file for 'cairomm'. pkgname=cairomm version=1.8.4 -revision=1 +revision=2 distfiles="http://cairographics.org/releases/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="C++ bindings to Cairo vector graphics library" diff --git a/srcpkgs/compiz/template b/srcpkgs/compiz/template index 9fbff3a2e9..bb377b6513 100644 --- a/srcpkgs/compiz/template +++ b/srcpkgs/compiz/template @@ -1,6 +1,7 @@ # Template file for 'compiz' pkgname=compiz version=0.8.6 +revision=1 distfiles="http://releases.compiz.org/$version/compiz-$version.tar.gz" build_style=gnu_configure configure_args="--disable-gconf --disable-schemas-install diff --git a/srcpkgs/gd/gd-progs.template b/srcpkgs/gd/gd-progs.template index fd2b339942..038805bbd3 100644 --- a/srcpkgs/gd/gd-progs.template +++ b/srcpkgs/gd/gd-progs.template @@ -6,7 +6,7 @@ long_desc="${long_desc} This package contains the utility programs that use the GD library." -revision=2 +revision=3 Add_dependency run libXpm Add_dependency run libX11 diff --git a/srcpkgs/gd/template b/srcpkgs/gd/template index f2b3b69ccd..1646f7be6b 100644 --- a/srcpkgs/gd/template +++ b/srcpkgs/gd/template @@ -1,7 +1,7 @@ # Template build file for 'gd'. pkgname=gd version=2.0.35 -revision=4 +revision=5 distfiles="http://www.libgd.org/releases/gd-$version.tar.bz2" build_style=gnu_configure short_desc="Graphics library for the dynamic creation of images" diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template index 960ababb99..b1347c1c32 100644 --- a/srcpkgs/gegl/template +++ b/srcpkgs/gegl/template @@ -1,6 +1,7 @@ # Template build file for 'gegl'. pkgname=gegl version=0.1.2 +revision=1 distfiles="ftp://ftp.gimp.org/pub/gegl/0.1/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-docs --without-sdl --without-libopenraw diff --git a/srcpkgs/gimp/patches/libpng-1.4.patch b/srcpkgs/gimp/patches/libpng-1.4.patch new file mode 100644 index 0000000000..4cad8ab03e --- /dev/null +++ b/srcpkgs/gimp/patches/libpng-1.4.patch @@ -0,0 +1,25 @@ +--- plug-ins/file-ico/ico-load.c 2010-01-18 19:01:46.000000000 -0500 ++++ plug-ins/file-ico/ico-load.c 2010-01-18 19:14:43.000000000 -0500 +@@ -286,14 +286,22 @@ + switch (color_type) + { + case PNG_COLOR_TYPE_GRAY: ++#if PNG_LIBPNG_VER < 10400 + png_set_gray_1_2_4_to_8 (png_ptr); ++#else ++ png_set_expand_gray_1_2_4_to_8(png_ptr); ++#endif + if ( bit_depth == 16 ) + png_set_strip_16 (png_ptr); + png_set_gray_to_rgb (png_ptr); + png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER); + break; + case PNG_COLOR_TYPE_GRAY_ALPHA: ++#if PNG_LIBPNG_VER < 10400 + png_set_gray_1_2_4_to_8 (png_ptr); ++#else ++ png_set_expand_gray_1_2_4_to_8(png_ptr); ++#endif + if ( bit_depth == 16 ) + png_set_strip_16 (png_ptr); + png_set_gray_to_rgb (png_ptr); diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index 7eb5fe0372..24c9ccda61 100644 --- a/srcpkgs/gimp/template +++ b/srcpkgs/gimp/template @@ -1,7 +1,7 @@ # Template build file for 'gimp'. pkgname=gimp version=2.6.8 -revision=1 +revision=2 distfiles="ftp://ftp.gimp.org/pub/gimp/v2.6/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--without-aa --without-gvfs --without-gnomevfs @@ -30,14 +30,14 @@ conf_files=" subpackages="gimp-devel gimp-python" -Add_dependency run atk +Add_dependency run glibc Add_dependency run glib +Add_dependency run atk Add_dependency run pango Add_dependency run cairo Add_dependency run freetype Add_dependency run fontconfig Add_dependency run gtk+ -Add_dependency run glibc Add_dependency run lcms Add_dependency run alsa-lib Add_dependency run dbus-glib @@ -68,13 +68,14 @@ Add_dependency run babl Add_dependency build pkg-config Add_dependency build intltool -Add_dependency build glib-devel +Add_dependency build gtk+-devel Add_dependency build atk-devel +Add_dependency build glib-devel Add_dependency build pango-devel Add_dependency build cairo-devel Add_dependency build freetype-devel Add_dependency build fontconfig-devel -Add_dependency build gtk+-devel +Add_dependency build glibc-devel Add_dependency build lcms-devel Add_dependency build alsa-lib-devel Add_dependency build dbus-glib-devel diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template index b456bdf03c..6be862b45a 100644 --- a/srcpkgs/graphviz/template +++ b/srcpkgs/graphviz/template @@ -1,6 +1,7 @@ # Template file for 'graphviz' pkgname=graphviz version=2.26.0 +revision=1 distfiles="http://www.graphviz.org/pub/graphviz/stable/SOURCES/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="Graph Visualization Software" diff --git a/srcpkgs/gst-plugins-good/template b/srcpkgs/gst-plugins-good/template index 8ae34e1290..1389d44869 100644 --- a/srcpkgs/gst-plugins-good/template +++ b/srcpkgs/gst-plugins-good/template @@ -1,6 +1,7 @@ # Template file for 'gst-plugins-good'. pkgname=gst-plugins-good version=0.10.22 +revision=1 distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--with-gudev --with-libv4l2 --enable-experimental diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template index 99d8ddd46b..0c881dbc1d 100644 --- a/srcpkgs/gtk+/template +++ b/srcpkgs/gtk+/template @@ -1,6 +1,7 @@ # Template build file for 'gtk+'. pkgname=gtk+ version=2.20.1 +revision=1 distfiles="${GNOME_SITE}/gtk+/2.20/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-cups --with-xinput --enable-introspection=no" @@ -23,6 +24,7 @@ triggers="gtk-pixbuf-loaders gtk-immodules" subpackages="$pkgname-devel" Add_dependency run glibc +Add_dependency run zlib Add_dependency run glib Add_dependency run atk Add_dependency run pango @@ -42,8 +44,10 @@ Add_dependency run libX11 Add_dependency run tiff Add_dependency run jpeg Add_dependency run libpng + Add_dependency build pkg-config Add_dependency build perl +Add_dependency build zlib-devel Add_dependency build glib-devel ">=2.24.0" Add_dependency build atk-devel ">=1.29.92" Add_dependency build pango-devel diff --git a/srcpkgs/lbreakout2/template b/srcpkgs/lbreakout2/template index f87534e9fb..76ebe6f25e 100644 --- a/srcpkgs/lbreakout2/template +++ b/srcpkgs/lbreakout2/template @@ -1,6 +1,7 @@ # Template file for 'lbreakout2' pkgname=lbreakout2 version=2.6.1 +revision=1 distfiles="${SOURCEFORGE_SITE}/lgames/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--disable-rpath --enable-sdl-net diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template index 1fea39ef95..8005fa10f9 100644 --- a/srcpkgs/librsvg/template +++ b/srcpkgs/librsvg/template @@ -1,6 +1,7 @@ # Template build file for 'librsvg'. pkgname=librsvg version=2.26.3 +revision=1 distfiles="${GNOME_SITE}/$pkgname/2.26/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="SVG library for GNOME2" diff --git a/srcpkgs/libwmf/template b/srcpkgs/libwmf/template index 2c0a57195f..7b27c67f9b 100644 --- a/srcpkgs/libwmf/template +++ b/srcpkgs/libwmf/template @@ -1,7 +1,7 @@ # Template build file for 'libwmf'. pkgname=libwmf version=0.2.8.4 -revision=4 +revision=5 distfiles="${SOURCEFORGE_SITE}/wvware/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--with-gsfontdir=/usr/share/fonts/Type1 diff --git a/srcpkgs/neverball/template b/srcpkgs/neverball/template index f20cd8dd40..6c7e610c56 100644 --- a/srcpkgs/neverball/template +++ b/srcpkgs/neverball/template @@ -1,7 +1,7 @@ # Template file for 'neverball' pkgname=neverball version=1.5.4 -revision=2 +revision=3 distfiles="http://www.neverball.org/$pkgname-$version.tar.gz" build_style=custom-install short_desc="Puzzle/action game similar to Super Monkey Ball" diff --git a/srcpkgs/pekwm/template b/srcpkgs/pekwm/template index f5cefd353b..c034315c8a 100644 --- a/srcpkgs/pekwm/template +++ b/srcpkgs/pekwm/template @@ -1,6 +1,7 @@ # Template build file for 'pekwm'. pkgname=pekwm version=0.1.12 +revision=1 distfiles="http://www.pekwm.org/projects/pekwm/files/pekwm-$version.tar.gz" build_style=gnu_configure short_desc="Window manager based on aewm++" @@ -59,3 +60,8 @@ Add_dependency build fontconfig-devel Add_dependency build freetype-devel Add_dependency build libXpm-devel Add_dependency build libXrandr-devel + +pre_configure() +{ + sed -i -e "s|libpng12|libpng14|g" ${wrksrc}/configure +} diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index 280533f743..fcb2305754 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -1,7 +1,7 @@ # Template build file for 'poppler'. pkgname=poppler version=0.12.4 -revision=1 +revision=2 distfiles="http://poppler.freedesktop.org/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--enable-zlib --disable-poppler-qt diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template index f1df61f86f..4b55e2f798 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -1,7 +1,7 @@ # Template file for 'qt' pkgname=qt version=4.6.2 -revision=2 +revision=3 _distname=qt-everywhere-opensource-src wrksrc=${_distname}-${version} distfiles="ftp://ftp.qt.nokia.com/qt/source/${_distname}-$version.tar.gz" diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 9023e950c8..d06155ef4b 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,6 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=1.0.6 +revision=1 distfiles="http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-hal --disable-mtp --disable-gme diff --git a/srcpkgs/webkit-gtk/template b/srcpkgs/webkit-gtk/template index b6fe41fed5..09ee4eb0d7 100644 --- a/srcpkgs/webkit-gtk/template +++ b/srcpkgs/webkit-gtk/template @@ -1,7 +1,7 @@ # Template file for 'webkit-gtk' pkgname=webkit-gtk version=1.2.0 -revision=1 +revision=2 wrksrc=webkit-${version} distfiles="http://www.webkitgtk.org/webkit-${version}.tar.gz" build_style=gnu_configure diff --git a/srcpkgs/xcursorgen/template b/srcpkgs/xcursorgen/template index a779cfaae0..33cf789f83 100644 --- a/srcpkgs/xcursorgen/template +++ b/srcpkgs/xcursorgen/template @@ -1,6 +1,7 @@ # Template build file for 'xcursorgen'. pkgname=xcursorgen version=1.0.3 +revision=1 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="X cursor generator" @@ -9,8 +10,16 @@ checksum=ed5f3ffe881c21ffca85406e5a5f553ed4985cc5e9acdb535f682c33bebac254 long_desc=" $pkgname creates an X cursor file from a collection of PNG images." +Add_dependency run glibc +Add_dependency run libX11 +Add_dependency run libXcursor +Add_dependency run libpng Add_dependency build pkg-config -Add_dependency full glibc -Add_dependency full libX11 -Add_dependency full libXcursor -Add_dependency full libpng +Add_dependency build libX11-devel +Add_dependency build libXcursor-devel +Add_dependency build libpng-devel + +pre_configure() +{ + sed -i -e "s|libpng12|libpng14|" ${wrksrc}/configure +} diff --git a/srcpkgs/xulrunner/patches/xulrunner-png14.patch b/srcpkgs/xulrunner/patches/xulrunner-png14.patch new file mode 100644 index 0000000000..f512416ad9 --- /dev/null +++ b/srcpkgs/xulrunner/patches/xulrunner-png14.patch @@ -0,0 +1,11 @@ +--- modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-01-17 00:15:53.979744638 +0100 ++++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-01-17 00:16:07.855993411 +0100 +@@ -135,7 +135,7 @@ + + // initialize + mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING, +- png_voidp_NULL, ++ NULL, + ErrorCallback, + ErrorCallback); + if (! mPNG) diff --git a/srcpkgs/xulrunner/template b/srcpkgs/xulrunner/template index 1b733ed9ad..b6c2e48a46 100644 --- a/srcpkgs/xulrunner/template +++ b/srcpkgs/xulrunner/template @@ -9,10 +9,10 @@ if [ -n "${_xulpatchver}" ]; then else version=${_xulver} fi +revision=1 wrksrc=mozilla-${_xulver} distfiles="${MOZILLA_SITE}/firefox/releases/${_ffver}/source/firefox-${_ffver}.source.tar.bz2" build_style=gnu_configure -LDFLAGS="-Wl,-R/usr/lib/${pkgname}-${_xulver}" configure_args="--enable-application=xulrunner --enable-libxul --disable-crashreporter --disable-tests --disable-debug --enable-dbus --enable-startup-notification --enable-canvas --enable-svg @@ -84,6 +84,13 @@ Add_dependency build nss-devel Add_dependency build libnotify-devel Add_dependency build dbus-glib-devel Add_dependency build startup-notification-devel +Add_dependency build diffutils + +pre_configure() +{ + # Use cmp(1) from diffutils + export PATH="/usr/bin:/bin:$PATH" +} post_install() {