[gimp-lqr-plugin] Update to latest upstream release Change image-add-layer to image-insert-layer as suggested by gimp-

Sven Lankes slankes at fedoraproject.org
Sun Dec 18 20:14:39 UTC 2011


commit 98a450c8f6f69e87511e15c7940187511c54af09
Author: Sven Lankes <sven at lank.es>
Date:   Sun Dec 18 21:14:34 2011 +0100

    Update to latest upstream release
    Change image-add-layer to image-insert-layer as suggested by gimp-upstream

 .gitignore                                   |    1 +
 gimp-lqr-plugin-add_layer-insert_layer.patch |   57 ++++++++++++++++++++++++++
 gimp-lqr-plugin.spec                         |   12 +++++-
 sources                                      |    2 +-
 4 files changed, 69 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4add390..2bfb8c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gimp-lqr-plugin-0.6.1.tar.bz2
+/gimp-lqr-plugin-0.7.1.tar.bz2
diff --git a/gimp-lqr-plugin-add_layer-insert_layer.patch b/gimp-lqr-plugin-add_layer-insert_layer.patch
new file mode 100644
index 0000000..cf9458b
--- /dev/null
+++ b/gimp-lqr-plugin-add_layer-insert_layer.patch
@@ -0,0 +1,57 @@
+diff --git a/src/io_functions.c b/src/io_functions.c
+index 20917df..b159ed8 100644
+--- a/src/io_functions.c
++++ b/src/io_functions.c
+@@ -227,7 +227,7 @@ write_vmap_to_layer (LqrVMap * vmap, gpointer data)
+         gimp_layer_new (image_ID, name, w, h, GIMP_RGBA_IMAGE, 100,
+                         GIMP_NORMAL_MODE);
+       gimp_drawable_fill (seam_layer_ID, GIMP_TRANSPARENT_FILL);
+-      gimp_image_add_layer (image_ID, seam_layer_ID, -1);
++      gimp_image_insert_layer (image_ID, seam_layer_ID, -1, -1);
+       gimp_layer_translate (seam_layer_ID, x_off, y_off);
+       if (seam_layer_p)
+         {
+diff --git a/src/layers_combo.c b/src/layers_combo.c
+index 10d810e..e032eed 100644
+--- a/src/layers_combo.c
++++ b/src/layers_combo.c
+@@ -199,7 +199,7 @@ callback_new_mask_button (GtkWidget * button, gpointer data)
+     gimp_layer_new (p_data->image_ID, nl_data->name,
+ 		    p_data->old_width, p_data->old_height,
+ 		    image_type, 50, GIMP_NORMAL_MODE);
+-  gimp_image_add_layer (p_data->image_ID, layer_ID, -1);
++  gimp_image_insert_layer (p_data->image_ID, layer_ID, -1, -1);
+   gimp_drawable_fill (layer_ID, GIMP_TRANSPARENT_FILL);
+   gimp_layer_translate (layer_ID, p_data->x_off, p_data->y_off);
+   gimp_image_undo_group_end (p_data->image_ID);
+diff --git a/src/render.c b/src/render.c
+index f50fc8c..b7e8c7e 100644
+--- a/src/render.c
++++ b/src/render.c
+@@ -172,7 +172,7 @@ render_init_carver (PlugInImageVals * image_vals,
+     {
+       g_snprintf (new_layer_name, LQR_MAX_NAME_LENGTH, "%s LqR", layer_name);
+       layer_ID = gimp_layer_copy (layer_ID);
+-      gimp_image_add_layer (image_ID, layer_ID, -1);
++      gimp_image_insert_layer (image_ID, layer_ID, -1, -1);
+       gimp_drawable_set_name (layer_ID, new_layer_name);
+       gimp_drawable_set_visible (layer_ID, FALSE);
+     }
+@@ -181,7 +181,7 @@ render_init_carver (PlugInImageVals * image_vals,
+       image_ID = gimp_image_new (old_width, old_height, gimp_image_base_type(image_ID));
+       gimp_image_undo_group_start(image_ID);
+       layer_ID = gimp_layer_new_from_drawable (layer_ID, image_ID);
+-      gimp_image_add_layer (image_ID, layer_ID, -1);
++      gimp_image_insert_layer (image_ID, layer_ID, -1, -1);
+       gimp_layer_translate(layer_ID, -x_off, -y_off);
+       gimp_drawable_set_visible (layer_ID, TRUE);
+       if (vals->resize_aux_layers)
+@@ -858,7 +858,7 @@ static gboolean copy_aux_layer_to_new_image (gint32 image_ID, gint32 * layer_ID_
+   if (old_layer_ID)
+     {
+       new_layer_ID = gimp_layer_new_from_drawable (old_layer_ID, image_ID);
+-      gimp_image_add_layer (image_ID, new_layer_ID, -1);
++      gimp_image_insert_layer (image_ID, new_layer_ID, -1, -1);
+       /* gimp_drawable_offsets (old_layer_ID, &aux_x_off, &aux_y_off); */
+       gimp_layer_translate (new_layer_ID, -x_off, -y_off);
+     }
diff --git a/gimp-lqr-plugin.spec b/gimp-lqr-plugin.spec
index 1d98d37..e780a29 100644
--- a/gimp-lqr-plugin.spec
+++ b/gimp-lqr-plugin.spec
@@ -1,11 +1,14 @@
 Name:           gimp-lqr-plugin
-Version:        0.6.1
-Release:        5%{?dist}
+Version:        0.7.1
+Release:        1%{?dist}
 Summary:        Content-aware resizing plug-in for the GIMP
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://liquidrescale.wikidot.com/
 Source0:        http://liquidrescale.wikidot.com/local--files/en:download-page/%{name}-%{version}.tar.bz2
+# Submitted $upstream @
+# http://liquidrescale.wikidot.com/forum/t-422108/gimp-image-add-layer-deprecated-in-gimp-2-7-2-8
+Patch0:         gimp-lqr-plugin-add_layer-insert_layer.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 BuildRequires:  gimp-devel >= 2.4 perl(XML::Parser), gettext, liblqr-1-devel >= 0.3.0
 BuildRequires:  intltool
@@ -19,6 +22,7 @@ http://www.faculty.idc.ac.il/arik/imret.pdf
 
 %prep
 %setup -q -n gimp-lqr-plugin-%{version}
+%patch0 -p 1
 
 %build
 %configure
@@ -48,6 +52,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Dec 17 2011 Sven Lankes <sven at lank.es> - 0.7.1-1
+- Update to latest upstream release
+- Change image-add-layer to image-insert-layer as suggested by gimp-upstream
+
 * Fri Dec 16 2011 Nils Philippsen <nils at redhat.com> - 0.6.1-5
 - rebuild for GIMP 2.7
 
diff --git a/sources b/sources
index a044082..153301b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f5f15814904d7c812eca60cbb2fc6385  gimp-lqr-plugin-0.6.1.tar.bz2
+d7ee28b16bdbd9f46bc9f21cf5deb487  gimp-lqr-plugin-0.7.1.tar.bz2


More information about the scm-commits mailing list