pool/gimp
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 45219 from GNOME:Apps

Browse Source 
Copy from GNOME:Apps/gimp based on submit request 45219 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/45219
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp?expand=0&rev=45
This commit is contained in:
OBS User autobuild 2010-08-10 00:58:57 +00:00 committed by Git OBS Bridge
parent 6902547741
commit 5b596c620b
6 changed files with 48 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gimp-2.6.10.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ef7a3fe73b352d8afeda9a5358431ea64a1d4cf3ebab588167f6335cdb52e032
size 16445326

3
gimp-2.6.8.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d5d4218b742390157fca23a9d2cce436904546a2ea419ffeb44a5f43c99a3332
size 16342377

67
gimp-fix-statusbar.patch
View File

@ -1,67 +0,0 @@
From 501c4f65f08c111df0654cb887d95c2c06e82710 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
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

39
gimp-new-libpng.patch
View File

@ -1,39 +0,0 @@
From b22eb0a8271a99257fe214cbf0adda29cf9a39dd Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Sun, 31 Jan 2010 11:28:02 +0000
Subject: Bug 607242 - GIMP 2.7.0 fails to build against libpng 1.4.0
Use png_set_expand_gray_1_2_4_to_8() instead of the deprecated
png_set_gray_1_2_4_to_8() if libpng is at least 1.2.27 (which is in
debian stable), so plug-ins built against old versions contine to work
when libpng 1.4 gets installed.
---
diff --git a/plug-ins/file-ico/ico-load.c b/plug-ins/file-ico/ico-load.c
index 79512ae..4d894be 100644
--- a/plug-ins/file-ico/ico-load.c
+++ b/plug-ins/file-ico/ico-load.c
@@ -287,14 +287,22 @@ ico_read_png (FILE *fp,
switch (color_type)
{
case PNG_COLOR_TYPE_GRAY:
+#if PNG_LIBPNG_VER < 10227
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 < 10227
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);
--
cgit v0.8.3.1

41
gimp.changes
View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Mon Aug 9 20:11:10 CEST 2010 - vuntz@opensuse.org
- Add alsa-devel BuildRequires to build the MIDI Input module.
-------------------------------------------------------------------
Tue Aug 3 22:34:45 CEST 2010 - dimstar@opensuse.org
- Update to version 2.6.10:
+ bgo#613328: TGA files saved with incorrect header yOrigin data
+ bgo#623290: Save As... does not save Windows Bitmap as default
in dialog
+ bgo#621363: CMYK decompose broken
+ bgo#595170: brush - color from gradient works wrong in
greyscale
+ bgo#613838: Error in gimp-hue-saturation PDB call
+ bgo#622608: GIMP crashes when clicking any scroll bar from
combo boxes
+ bgo#565459: newly opened images are put into the background
- Changes from version 2.6.9:
+ bgo#612618: Font selection remains visible
+ bgo#620604: Description of "histogram" procedure is slightly
inaccurate
+ bgo#541586: Tool options not saved/loaded correctly?
+ bgo#614153: Importing PDF files with long titles
+ bgo#599233: Dialog of "Save as BMP" ignores changes which are
not made with a mouse
+ bgo#610478: Layer preview suddenly stops getting updated
+ bgo#609026: leaks shared memory
+ bgo#609056: Exporting to Alias PIX format fails
are always in English
+ bgo#607242: GIMP 2.7.0 fails to build against libpng 1.4.0
+ bgo#606372: Saving to .ppm fails on indexed colorspace
+ bgo#604508: gimp-layer-new-from-visible should work from
updated projection
+ Fix crashes: bgo#600112, bgo#565001, bgo#604820, bgo#603711
+ Other fixes: bgo#622234, bgo#622196, bgo#608188, bgo#605237
+ Updated translations.
- Drop gimp-new-libpng.patch and gimp-fix-statusbar.patch, both
came from upstream git and are now included.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 14 12:05:43 CEST 2010 - vuntz@opensuse.org Mon Jun 14 12:05:43 CEST 2010 - vuntz@opensuse.org

13
gimp.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gimp (Version 2.6.8) # spec file for package gimp (Version 2.6.10)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -22,6 +22,7 @@
Name: gimp Name: gimp
BuildRequires: aalib-devel BuildRequires: aalib-devel
BuildRequires: alsa-devel
BuildRequires: babl-devel BuildRequires: babl-devel
BuildRequires: cairo-devel BuildRequires: cairo-devel
BuildRequires: dbus-1-glib-devel BuildRequires: dbus-1-glib-devel
@ -47,8 +48,8 @@ BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: xorg-x11-libXfixes-devel BuildRequires: xorg-x11-libXfixes-devel
Url: http://www.gimp.org/ Url: http://www.gimp.org/
Version: 2.6.8 Version: 2.6.10
Release: 4 Release: 1
License: GPLv2+ License: GPLv2+
Group: Productivity/Graphics/Bitmap Editors Group: Productivity/Graphics/Bitmap Editors
Suggests: AdobeICCProfiles Suggests: AdobeICCProfiles
@ -61,10 +62,6 @@ Source: ftp://ftp.gimp.org/pub/gimp/v2.6/%{name}-%{version}.tar.bz2
Source1: macros.gimp Source1: macros.gimp
# openSUSE palette file # openSUSE palette file
Source2: openSUSE.gpl Source2: openSUSE.gpl
# PATCH-FIX-UPSTREAM gimp-new-libpng.patch vuntz@opensuse.org -- Taken from upstream, fix build with recent libpng
Patch0: gimp-new-libpng.patch
# PATCH-FIX-UPSTREAM gimp-fix-statusbar.patch bnc601712 vuntz@opensuse.org -- Taken from upstream, fix status bar not complete with recent gtk+
Patch1: gimp-fix-statusbar.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-branding >= 2.4 Requires: %{name}-branding >= 2.4
Recommends: %{name}-plugins-python = %{version} gimp-2.0-scanner-plugin %{name}-help-browser Recommends: %{name}-plugins-python = %{version} gimp-2.0-scanner-plugin %{name}-help-browser
@ -201,8 +198,6 @@ translation-update-upstream po-python gimp20-python
translation-update-upstream po-script-fu gimp20-script-fu translation-update-upstream po-script-fu gimp20-script-fu
translation-update-upstream po-plug-ins gimp20-std-plug-ins translation-update-upstream po-plug-ins gimp20-std-plug-ins
translation-update-upstream po-tips gimp20-tips translation-update-upstream po-tips gimp20-tips
%patch0 -p1
%patch1 -p1
# Safety check for ABI version change. # Safety check for ABI version change.
vabi=`printf "%d" $(sed -n '/#define GIMP_MODULE_ABI_VERSION/{s/.* //;p}' libgimpmodule/gimpmodule.h)` vabi=`printf "%d" $(sed -n '/#define GIMP_MODULE_ABI_VERSION/{s/.* //;p}' libgimpmodule/gimpmodule.h)`
if test "x${vabi}" != "x%{abiver}"; then if test "x${vabi}" != "x%{abiver}"; then