Accepting request 850569 from graphics

OBS-URL: https://build.opensuse.org/request/show/850569
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp-lqr-plugin?expand=0&rev=13

gimp-lqr-plugin-0.7.2.tar.bz2

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

gimp-lqr-plugin-0.7.2.tar.gz

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

gimp-lqr-plugin.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Nov 13 12:10:57 UTC 2020 - munix9@googlemail.com
+
+- Use (newer) source package from github
+- Add upstream-Fix-compilation-errors.patch
+  * fixes "multiple definition of ..." with gcc10
+- Clean up spec file
+
 -------------------------------------------------------------------
 Tue Aug  6 16:20:56 UTC 2013 - zaitor@opensuse.org
 

gimp-lqr-plugin.spec

@@ -1,8 +1,7 @@
 #
 # spec file for package gimp-lqr-plugin
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
-# Copyright (c) 2010 Peter Linnell
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -13,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -21,14 +20,16 @@ Name:           gimp-lqr-plugin
 Version:        0.7.2
 Release:        0
 Summary:        Content-aware resizing plug-in for GIMP
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Graphics/Bitmap Editors
-Url:            http://liquidrescale.wikidot.com/
+URL:            http://liquidrescale.wikidot.com/
-Source0:        http://liquidrescale.wdfiles.com/local--files/en:download-page-sources/%{name}-%{version}.tar.bz2
+Source0:        https://github.com/carlobaldassi/gimp-lqr-plugin/archive/v%{version}/%{name}-%{version}.tar.gz
+# https://github.com/carlobaldassi/gimp-lqr-plugin/commit/22a274942434ae841b0b51a183979ddb560996f9
+Patch0:         upstream-Fix-compilation-errors.patch
 BuildRequires:  gimp-devel >= 2.8.0
 BuildRequires:  intltool
 BuildRequires:  liblqr-devel >= 0.4.0
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Requires:       gimp >= 2.8.0
 
 %description
 This GIMP plug-in implements the content-aware resizing algorithm
@@ -38,8 +39,8 @@ by Shai Avidan and Ariel Shamir.
 %package -n gimp-plugin-lqr
 Summary:        Content-aware resizing plug-in for GIMP
 Group:          Productivity/Graphics/Bitmap Editors
-Provides:       %{name} = %{version}
 Recommends:     gimp-plugin-lqr-lang
+Provides:       %{name} = %{version}
 
 %description -n gimp-plugin-lqr
 This GIMP plug-in implements the content-aware resizing algorithm
@@ -47,35 +48,29 @@ described in the paper "Seam Carving for Content-Aware Image Resizing"
 by Shai Avidan and Ariel Shamir.
 
 %lang_package -n gimp-plugin-lqr
+
 %prep
-%setup -q -n %{name}-%{version}
+%autosetup -p1
 
 %build
 %configure
-make %{?_smp_mflags}
+%make_build
 
 %install
-%makeinstall
+%make_install
 # ro_RO locale should simply be ro
 test ! -e %{buildroot}%{_datadir}/locale/ro
 mv %{buildroot}%{_datadir}/locale/ro_RO %{buildroot}%{_datadir}/locale/ro
+
 %find_lang gimp20-lqr-plugin
 
-%clean
-rm -rf %{buildroot}
-
 %files -n gimp-plugin-lqr
-%defattr(-,root,root,-)
+%license COPYING
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog README TODO
-%dir %{_libdir}/gimp/
-%dir %{_libdir}/gimp/2.0/
-%dir %{_libdir}/gimp/2.0/plug-ins/
 %{_libdir}/gimp/2.0/plug-ins/gimp-lqr-plugin
 %{_libdir}/gimp/2.0/plug-ins/plug_in_lqr_iter
-%dir %{_datadir}/gimp/
-%dir %{_datadir}/gimp/2.0/
-%dir %{_datadir}/gimp/2.0/scripts/
 %{_datadir}/gimp-lqr-plugin/
+%dir %{_datadir}/gimp/2.0/scripts/
 %{_datadir}/gimp/2.0/scripts/batch-gimp-lqr.scm
 
 %files -n gimp-plugin-lqr-lang -f gimp20-lqr-plugin.lang

upstream-Fix-compilation-errors.patch

@@ -0,0 +1,55 @@
+From ae3464a82e1395fc577cc94999bdc7c4a7bb35f1 Mon Sep 17 00:00:00 2001
+From: Dmytro Kostiuchenko <edio@archlinux.us>
+Date: Thu, 25 Jun 2020 11:08:26 -0400
+Subject: [PATCH] Fix compilation errors
+
+This commit applies a patch submitted in #5 and initially offered at
+https://mail.gnome.org/archives/gimp-developer-list/2020-June/msg00004.html
+---
+ src/interface_I.c   | 10 +++++-----
+ src/interface_aux.c |  8 ++++----
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/interface_I.c b/src/interface_I.c
+index b680a2f..5e04754 100644
+--- a/src/interface_I.c
++++ b/src/interface_I.c
+@@ -65,13 +65,13 @@ static void callback_alarm_triggered (GtkWidget * size_entry, gpointer data);
+ 
+ gint dialog_I_response = GTK_RESPONSE_OK;
+ 
+-PlugInUIVals *ui_state;
+-PlugInVals *state;
+-PlugInDialogVals *dialog_state;
+-gboolean features_are_sensitive;
++extern PlugInUIVals *ui_state;
++extern PlugInVals *state;
++extern PlugInDialogVals *dialog_state;
++extern gboolean features_are_sensitive;
+ InterfaceIData interface_I_data;
+ 
+-GtkWidget *dlg;
++extern GtkWidget *dlg;
+ GtkWidget *coordinates;
+ 
+ gulong size_changed = 0;
+diff --git a/src/interface_aux.c b/src/interface_aux.c
+index a6bcc8d..58d0af4 100644
+--- a/src/interface_aux.c
++++ b/src/interface_aux.c
+@@ -48,11 +48,11 @@ static void callback_dialog_aux_response (GtkWidget * dialog, gint response_id,
+ 
+ gint dialog_aux_response = GTK_RESPONSE_OK;
+ 
+-PlugInUIVals *ui_state;
+-PlugInVals *state;
+-PlugInDialogVals *dialog_state;
++extern PlugInUIVals *ui_state;
++extern PlugInVals *state;
++extern PlugInDialogVals *dialog_state;
+ 
+-GtkWidget *dlg;
++extern GtkWidget *dlg;
+ 
+ /***  Public functions  ***/
+