summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2015-12-05 02:35:28 +0100
committerSebastian Pipping <sping@gentoo.org>2015-12-05 02:42:16 +0100
commitbfa2ea1e5cda2965eb51f61ab0070a6508e50d74 (patch)
treebd0b616a3c7ce445c27dfb535b18188e7e8e75cf /media-gfx/gimp/files
parentmedia-libs/gegl: 0.3.4 (bug #567366) (diff)
downloadgentoo-bfa2ea1e5cda2965eb51f61ab0070a6508e50d74.tar.gz
gentoo-bfa2ea1e5cda2965eb51f61ab0070a6508e50d74.tar.bz2
gentoo-bfa2ea1e5cda2965eb51f61ab0070a6508e50d74.zip
media-gfx/gimp: 2.9.2 (bug #567366)
Package-Manager: portage-2.2.24
Diffstat (limited to 'media-gfx/gimp/files')
-rw-r--r--media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch50
-rw-r--r--media-gfx/gimp/files/gimp-2.9.2-version.patch28
2 files changed, 78 insertions, 0 deletions
diff --git a/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch b/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch
new file mode 100644
index 000000000000..441298a08fde
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch
@@ -0,0 +1,50 @@
+From 81d7607e5159275a9b693a170f7767ffcb548a1b Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 5 Dec 2015 01:14:37 +0100
+Subject: [PATCH] Do not disable deprecated APIs
+
+---
+ configure.ac | 27 ---------------------------
+ 1 file changed, 27 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4de6e53..8528e87 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2111,33 +2111,6 @@ MIME_TYPES="$MIME_TYPES;"
+ AC_SUBST(MIME_TYPES)
+
+
+-#########################
+-# Disable deprecated APIs
+-#########################
+-
+-CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DBABL_DISABLE_DEPRECATED -DGSEAL_ENABLE"
+-
+-# Make sure not to disable deprecated APIs for unreleased versions.
+-# We must build without problems with future releases of libraries
+-# and disabling deprecated API risks breaking the build
+-
+-if test "x$have_glib_2_43" != "xyes"; then
+- CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
+-fi
+-
+-if test "x$have_gtk_2_26" != "xyes"; then
+- CPPFLAGS="${CPPFLAGS} -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+-fi
+-
+-if test "x$have_gdk_pixbuf_2_31" != "xyes"; then
+- CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED"
+-fi
+-
+-if test "x$have_pango_1_32" != "xyes"; then
+- CPPFLAGS="${CPPFLAGS} -DPANGO_DISABLE_DEPRECATED"
+-fi
+-
+-
+ ############################
+ # Require multihead safe API
+ ############################
+--
+2.6.3
+
diff --git a/media-gfx/gimp/files/gimp-2.9.2-version.patch b/media-gfx/gimp/files/gimp-2.9.2-version.patch
new file mode 100644
index 000000000000..e48614455577
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.9.2-version.patch
@@ -0,0 +1,28 @@
+From f2f7a29ba5aceaa38a285f15c3fe8b481d05b357 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 5 Dec 2015 01:15:22 +0100
+Subject: [PATCH] Sync version string
+
+.. with
+m4_define([gimp_micro_version], [2])
+above
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8528e87..21d86a3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,7 +20,7 @@ m4_define([gimp_binary_age],
+ [m4_eval(100 * gimp_minor_version + gimp_micro_version)])
+
+ # For overriding the version string. Comment out if not needed.
+-# m4_define([gimp_version], [2.9.1])
++# m4_define([gimp_version], [2.9.2])
+
+ # This is the X.Y used in -lgimp-X.Y
+ m4_define([gimp_api_version], [2.0])
+--
+2.6.3
+