Date: Friday, July 2, 2010 @ 12:32:34 Author: eric Revision: 84649 upgpkg: gimp 2.6.9-1 Upstream update, Enabled gnome-vfs, Removed old patches, PKGBUILD clean up
Modified: gimp/trunk/PKGBUILD Deleted: gimp/trunk/gtk-2.19-statusbar.patch gimp/trunk/libpng-1.4.patch --------------------------+ PKGBUILD | 52 ++++++++++++++++------------------ gtk-2.19-statusbar.patch | 67 --------------------------------------------- libpng-1.4.patch | 26 ----------------- 3 files changed, 24 insertions(+), 121 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-07-02 14:08:05 UTC (rev 84648) +++ PKGBUILD 2010-07-02 16:32:34 UTC (rev 84649) @@ -2,19 +2,16 @@ # Maintainer: tobias <[email protected]> pkgname=gimp -pkgver=2.6.8 -pkgrel=4 +pkgver=2.6.9 +pkgrel=1 pkgdesc="GNU Image Manipulation Program" arch=('i686' 'x86_64') url="http://www.gimp.org/"; license=('GPL') -depends=('gtk2>=2.14.4' 'lcms>=1.17' 'libxpm>=3.5.7' 'libwmf>=0.2.8.4' - 'libxmu>=1.0.4' 'librsvg>=2.22.3' 'libmng>=1.0.10' 'dbus-glib>=0.76' - 'libexif>=0.6.16' 'pygtk>=2.13.0' 'desktop-file-utils' 'gegl>=0.1.2' - 'curl') -makedepends=('gutenprint>=5.0.2' 'intltool>=0.35.5' 'libwebkit' - 'gnome-python>=2.16.2' 'poppler-glib>=0.10.0' 'pkgconfig>=0.21' - 'alsa-lib>=1.0.16' 'libgnomeui>=2.22.1') +depends=('gtk2' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \ + 'libexif' 'pygtk' 'desktop-file-utils' 'gegl') +makedepends=('gutenprint' 'intltool' 'libwebkit' 'gnome-python' 'poppler-glib' \ + 'pkg-config' 'alsa-lib' 'libgnomeui') optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support' 'libwebkit: for the help browser' 'poppler-glib: for pdf support' @@ -23,26 +20,25 @@ options=('!libtool' '!makeflags') conflicts=('gimp-devel') install=gimp.install -source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - linux.gpl libpng-1.4.patch gtk-2.19-statusbar.patch) -md5sums=('a4d9462c9420954824a80c9b1963f9d9' 'bb27bc214261d36484093e857f015f38'\ - '211eccab51593526e852816e647f7da4' '8be7d21231e3032e4723cf86588375c0') -sha1sums=('a550943f086abc9bf6b96d576741337b7186a4f4' '110ce9798173b19a662d086ed7b882b4729f06cf'\ - '21c0fe284c39cc133ec977a48ec38220033020c5' '417eafb49d324a2dc40905b1c333887e6868eef4') +source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl) +md5sums=('e5d0cc6f3ce127e51d7f3d3124b16a99' 'bb27bc214261d36484093e857f015f38') +sha1sums=('df263086b92d093f1db65704f6945a2e69ae4ef3' '110ce9798173b19a662d086ed7b882b4729f06cf') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "../libpng-1.4.patch" || return 1 - patch -Np1 -i "${srcdir}/gtk-2.19-statusbar.patch" || return 1 - ./configure --prefix=/usr --sysconfdir=/etc \ - --enable-mp --enable-gimp-console --enable-gimp-remote \ - --disable-devel-docs --enable-python --without-gvfs \ - --without-gnomevfs --with-gif-compression=lzw --without-aa || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install-strip || return 1 - install -Dm644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl" || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --enable-mp --enable-gimp-console --enable-gimp-remote \ + --enable-python --with-gif-compression=lzw \ + --without-aa + make +} - ln -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1" || return 1 - ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool" || return 1 - ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1" || return 1 +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install-strip + install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl" + + ln -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1" + ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool" + ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1" } Deleted: gtk-2.19-statusbar.patch =================================================================== --- gtk-2.19-statusbar.patch 2010-07-02 14:08:05 UTC (rev 84648) +++ gtk-2.19-statusbar.patch 2010-07-02 16:32:34 UTC (rev 84649) @@ -1,67 +0,0 @@ -From 501c4f65f08c111df0654cb887d95c2c06e82710 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen <[email protected]> -Date: Wed, 24 Mar 2010 17:08:01 +0000 -Subject: backport statusbar code needed for GTK+ >= 2.19.1 - -Use the hbox that is provided via gtk_statusbar_get_message_area() -since GTK+ 2.19.1. ---- -diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c -index 5e89427..36651cd 100644 ---- a/app/display/gimpstatusbar.c -+++ b/app/display/gimpstatusbar.c -@@ -49,6 +49,9 @@ - /* maximal width of the string holding the cursor-coordinates */ - #define CURSOR_LEN 256 - -+/* the spacing of the hbox */ -+#define HBOX_SPACING 1 -+ - /* spacing between the icon and the statusbar label */ - #define ICON_SPACING 2 - -@@ -152,6 +155,7 @@ static void - gimp_statusbar_init (GimpStatusbar *statusbar) - { - GtkWidget *hbox; -+ GtkWidget *label; - GtkWidget *image; - GimpUnitStore *store; - -@@ -171,13 +175,27 @@ gimp_statusbar_init (GimpStatusbar *statusbar) - statusbar->progress_active = FALSE; - statusbar->progress_shown = FALSE; - -- /* remove the label and insert a hbox */ -- gtk_container_remove (GTK_CONTAINER (GTK_STATUSBAR (statusbar)->frame), -- g_object_ref (GTK_STATUSBAR (statusbar)->label)); -- -- hbox = gtk_hbox_new (FALSE, 1); -- gtk_container_add (GTK_CONTAINER (GTK_STATUSBAR (statusbar)->frame), hbox); -- gtk_widget_show (hbox); -+ label = g_object_ref (GTK_STATUSBAR (statusbar)->label); -+ -+ /* remove the message area or label and insert a hbox */ -+#if GTK_CHECK_VERSION (2, 19, 1) -+ { -+ hbox = gtk_statusbar_get_message_area (GTK_STATUSBAR (statusbar)); -+ gtk_box_set_spacing (GTK_BOX (hbox), HBOX_SPACING); -+ gtk_container_remove (GTK_CONTAINER (hbox), label); -+ } -+#else -+ { -+ GtkWidget *label_parent; -+ -+ label_parent = gtk_widget_get_parent (label); -+ gtk_container_remove (GTK_CONTAINER (label_parent), label); -+ -+ hbox = gtk_hbox_new (FALSE, HBOX_SPACING); -+ gtk_container_add (GTK_CONTAINER (label_parent), hbox); -+ gtk_widget_show (hbox); -+ } -+#endif - - statusbar->cursor_label = gtk_label_new ("8888, 8888"); - gtk_misc_set_alignment (GTK_MISC (statusbar->cursor_label), 0.5, 0.5); --- -cgit v0.8.3.1 Deleted: libpng-1.4.patch =================================================================== --- libpng-1.4.patch 2010-07-02 14:08:05 UTC (rev 84648) +++ libpng-1.4.patch 2010-07-02 16:32:34 UTC (rev 84649) @@ -1,26 +0,0 @@ -diff -Naur gimp-2.7.0-orig/plug-ins/file-ico/ico-load.c gimp-2.7.0/plug-ins/file-ico/ico-load.c ---- gimp-2.7.0-orig/plug-ins/file-ico/ico-load.c 2010-01-18 19:01:46.000000000 -0500 -+++ gimp-2.7.0/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);
