From f6a87e830de32f58d2ffc8b32f72cc9fa3d25349a778da603a0140397b071d09 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 23 Dec 2013 18:33:11 +0000 Subject: [PATCH] Accepting request 212065 from GNOME:Apps - Add gimp-use-recommended-freetype-include.patch: Freetype upstream recommends using their macros together with ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions. - Update to version 2.8.10: + Core: - Set manifest as Windows 8 compatible. + GUI: - Indicate if a file was exported in the Quit dialog. - Add shortcuts and hint labels to the close and quit dialogs that make closing and quitting easier and more consistent. - Rename the File->Export menu labels to match Save/Save as. - Fix keyboard shortcuts on OSX Mavericks. - Don't open lots of progress popups when opening many files. - Correctly restore the hidden state of docks in single window mode. + Libgimp: - Fix exporting an image consisting of a single layer group. - Don't attempt to pick transparent colors. + Plug-ins: Fix crash in LCMS plugin if RGB profile was missing. + General: - Fix compile on NetBSD (missing -lexecinfo). - Bug fixes. + Updated translations. OBS-URL: https://build.opensuse.org/request/show/212065 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp?expand=0&rev=89 --- gimp-2.8.10.tar.bz2 | 3 ++ gimp-2.8.8.tar.bz2 | 3 -- gimp-use-recommended-freetype-include.patch | 28 ++++++++++++++++++ gimp.changes | 32 +++++++++++++++++++++ gimp.spec | 7 ++++- 5 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 gimp-2.8.10.tar.bz2 delete mode 100644 gimp-2.8.8.tar.bz2 create mode 100644 gimp-use-recommended-freetype-include.patch diff --git a/gimp-2.8.10.tar.bz2 b/gimp-2.8.10.tar.bz2 new file mode 100644 index 0000000..e39648e --- /dev/null +++ b/gimp-2.8.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7fd8b19f989138d826003c75f56bd5b6f136eef597e86e3978ede0bba470ae6 +size 20343461 diff --git a/gimp-2.8.8.tar.bz2 b/gimp-2.8.8.tar.bz2 deleted file mode 100644 index fad0049..0000000 --- a/gimp-2.8.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74c4509bae55f07140bc46f16100fc1e0e052829c13d4d87dc31d07d3e696a67 -size 20345808 diff --git a/gimp-use-recommended-freetype-include.patch b/gimp-use-recommended-freetype-include.patch new file mode 100644 index 0000000..dc36f2a --- /dev/null +++ b/gimp-use-recommended-freetype-include.patch @@ -0,0 +1,28 @@ +From 6c73f28b6d87a2afd11974552a075bffec52347f Mon Sep 17 00:00:00 2001 +From: Michael Natterer +Date: Fri, 29 Nov 2013 20:57:46 +0000 +Subject: Bug 719560 - Build failure with freetype 2.5.1 + +Apply patch from su-v that fixes the freetype include to +the madness devised and recommended by freetype. +--- +(limited to 'app/text/gimpfont.c') + +diff --git a/app/text/gimpfont.c b/app/text/gimpfont.c +index 4045ca9..66c6e52 100644 +--- a/app/text/gimpfont.c ++++ b/app/text/gimpfont.c +@@ -28,7 +28,9 @@ + + #define PANGO_ENABLE_ENGINE 1 /* Argh */ + #include +-#include ++ ++#include ++#include FT_TRUETYPE_TABLES_H + + #include "text-types.h" + +-- +cgit v0.9.2 + diff --git a/gimp.changes b/gimp.changes index b961be5..6dbf946 100644 --- a/gimp.changes +++ b/gimp.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Wed Dec 11 17:18:44 UTC 2013 - hrvoje.senjan@gmail.com + +- Add gimp-use-recommended-freetype-include.patch: + Freetype upstream recommends using their macros together with + ft2build include. Positive sideeffect is that this patch makes + it build with both freetype2 2.5.1, and older versions. + +------------------------------------------------------------------- +Sun Dec 1 21:49:27 UTC 2013 - dimstar@opensuse.org + +- Update to version 2.8.10: + + Core: + - Set manifest as Windows 8 compatible. + + GUI: + - Indicate if a file was exported in the Quit dialog. + - Add shortcuts and hint labels to the close and quit dialogs + that make closing and quitting easier and more consistent. + - Rename the File->Export menu labels to match Save/Save as. + - Fix keyboard shortcuts on OSX Mavericks. + - Don't open lots of progress popups when opening many files. + - Correctly restore the hidden state of docks in single window + mode. + + Libgimp: + - Fix exporting an image consisting of a single layer group. + - Don't attempt to pick transparent colors. + + Plug-ins: Fix crash in LCMS plugin if RGB profile was missing. + + General: + - Fix compile on NetBSD (missing -lexecinfo). + - Bug fixes. + + Updated translations. + ------------------------------------------------------------------- Tue Nov 26 11:12:21 UTC 2013 - dimstar@opensuse.org diff --git a/gimp.spec b/gimp.spec index 73fec2f..cbea7a3 100644 --- a/gimp.spec +++ b/gimp.spec @@ -20,7 +20,7 @@ %global apiver 2.0 Name: gimp -Version: 2.8.8 +Version: 2.8.10 Release: 0 Summary: The GNU Image Manipulation Program License: GPL-3.0+ @@ -31,6 +31,8 @@ Source1: macros.gimp # openSUSE palette file Source2: openSUSE.gpl Source99: baselibs.conf +# PATCH-FIX-UPSTREAM gimp-use-recommended-freetype-include.patch bgo#719560 hrvoje.senjan@gmail.com -- Use freetype upstream recommended #include style, taken from git +Patch0: gimp-use-recommended-freetype-include.patch BuildRequires: aalib-devel BuildRequires: alsa-devel >= 1.0.0 BuildRequires: babl-devel >= 0.1.10 @@ -222,6 +224,7 @@ This package contains the help browser for the GIMP. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream translation-update-upstream po-libgimp gimp20-libgimp translation-update-upstream po-python gimp20-python @@ -316,6 +319,8 @@ rm -rf %{buildroot} %{_bindir}/gimp-2.? %{_bindir}/gimp-console %{_bindir}/gimp-console-2.? +%dir %{_datadir}/appdata +%{_datadir}/appdata/gimp.appdata.xml %{_datadir}/applications/gimp.desktop %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/gimp/