summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO17
-rw-r--r--PKGBUILD19
-rw-r--r--gimp-2.8.10-device_info.patch33
-rw-r--r--gimp-2.8.10-freetype.patch22
4 files changed, 13 insertions, 78 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 813afc18b052..b7eb50b6b0ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri May 27 20:54:58 UTC 2016
pkgbase = gimp-light
pkgdesc = A trimmed down install of the GNU Image Manipulation Program
- pkgver = 2.8.10
- pkgrel = 4
+ pkgver = 2.8.16
+ pkgrel = 1
url = http://www.gimp.org/
arch = i686
arch = x86_64
@@ -10,7 +12,7 @@ pkgbase = gimp-light
makedepends = intltool
depends = gtk2
depends = babl
- depends = gegl
+ depends = gegl02
depends = libexif
depends = libxpm
depends = libjpeg
@@ -21,15 +23,12 @@ pkgbase = gimp-light
options = strip
options = !docs
options = !libtool
+ options = !makeflags
options = !staticlibs
options = emptydirs
- source = http://download.gimp.org/pub/gimp/v2.8/gimp-2.8.10.tar.bz2
- source = gimp-2.8.10-freetype.patch
- source = gimp-2.8.10-device_info.patch
+ source = http://download.gimp.org/pub/gimp/v2.8/gimp-2.8.16.tar.bz2
source = sessionrc
- md5sums = 84c964aab7044489af69f7319bb59b47
- md5sums = 1697c634d69cb77f75f6db84f49222d6
- md5sums = 39737fc47ee4556740790e9d3a243bf1
+ md5sums = 30e0a1b7c18b0e3415f4ac54567252ac
md5sums = 37996178b9a5854b89db6d518cfd23fc
pkgname = gimp-light
diff --git a/PKGBUILD b/PKGBUILD
index dc10569dd317..1780c24c6e0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,23 @@
# Maintainer: Steven Honeyman <stevenhoneyman at gmail com>
pkgname=gimp-light
-pkgver=2.8.10
-pkgrel=4
+pkgver=2.8.16
+pkgrel=1
pkgdesc="A trimmed down install of the GNU Image Manipulation Program"
arch=('i686' 'x86_64')
url="http://www.gimp.org/"
license=('GPL')
-depends=('gtk2' 'babl' 'gegl' 'libexif' 'libxpm' 'libjpeg' 'libpng')
+depends=('gtk2' 'babl' 'gegl02' 'libexif' 'libxpm' 'libjpeg' 'libpng')
makedepends=('pkgconfig' 'intltool')
provides=(gimp)
conflicts=('gimp-devel' 'gimp')
-options=(strip !docs !libtool !staticlibs emptydirs)
+options=(strip !docs !libtool !makeflags !staticlibs emptydirs)
source=(http://download.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2
- gimp-2.8.10-freetype.patch
- gimp-2.8.10-device_info.patch
sessionrc
)
-md5sums=('84c964aab7044489af69f7319bb59b47'
- '1697c634d69cb77f75f6db84f49222d6'
- '39737fc47ee4556740790e9d3a243bf1'
+md5sums=('30e0a1b7c18b0e3415f4ac54567252ac'
'37996178b9a5854b89db6d518cfd23fc')
-prepare() {
- cd "$srcdir/gimp-$pkgver"
- patch -p1 -i "$srcdir/gimp-2.8.10-freetype.patch"
- patch -p1 -i "$srcdir/gimp-2.8.10-device_info.patch"
-}
build() {
cd "$srcdir/gimp-$pkgver"
diff --git a/gimp-2.8.10-device_info.patch b/gimp-2.8.10-device_info.patch
deleted file mode 100644
index 1fb2c15db268..000000000000
--- a/gimp-2.8.10-device_info.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br>
-Date: 2013-11-30
-Initial Package Version: 2.8.10
-Upstream Status: Unknown
-Origin: ubuntuforums
-URL: http://ubuntuforums.org/showthread.php?t=1984743&page=8&p=12273558#post12273558
-Description: Fixes "Gimp-Widgets-CRITICAL **: gimp_device_info_set_device ..." annoying message by making "sure the configure input device dialog displays all of the devices" and fixes tests
-
---- gimp-2.8.10/app/widgets/gimpdevicemanager.c.orig 2012-11-22 21:21:24.000000000 -0300
-+++ gimp-2.8.10/app/widgets/gimpdevicemanager.c 2013-11-30 11:54:30.275906582 -0300
-@@ -321,19 +321,19 @@
- GIMP_DEVICE_INFO (gimp_container_get_child_by_name (GIMP_CONTAINER (manager),
- device->name));
-
-- if (device_info)
-+ /* if (device_info)
- {
- gimp_device_info_set_device (device_info, device, gdk_display);
- }
- else
-- {
-+ {*/
- device_info = gimp_device_info_new (private->gimp, device, gdk_display);
-
- gimp_device_info_set_default_tool (device_info);
-
- gimp_container_add (GIMP_CONTAINER (manager), GIMP_OBJECT (device_info));
- g_object_unref (device_info);
-- }
-+ //}
- }
-
- static void
diff --git a/gimp-2.8.10-freetype.patch b/gimp-2.8.10-freetype.patch
deleted file mode 100644
index 7f2c3940533e..000000000000
--- a/gimp-2.8.10-freetype.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br>
-Date: 2013-11-30
-Initial Package Version: 2.8.10
-Upstream Status: Committed
-Origin: gnome
-URL: http://osdir.com/ml/commits.gnome/2013-11/msg07247.html
-Description: Fixes build with FreeType-2.5.1
-
-diff -Naur gimp-2.8.10/app/text/gimpfont.c.orig gimp-2.8.10/app/text/gimpfont.c
---- gimp-2.8.10/app/text/gimpfont.c.orig 2012-05-08 03:05:46.000000000 -0300
-+++ gimp-2.8.10/app/text/gimpfont.c 2013-11-30 10:44:21.996609469 -0300
-@@ -27,7 +27,9 @@
-
- #define PANGO_ENABLE_ENGINE 1 /* Argh */
- #include <pango/pango-ot.h>
--#include <freetype/tttables.h>
-+
-+#include <ft2build.h>
-+#include FT_TRUETYPE_TABLES_H
-
- #include "text-types.h"
-