From 1e9e105e8326fb65f10507210fe835afdc424bce239143417c25946988ddd35f Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Tue, 3 Jan 2023 10:54:00 +0000
Subject: [PATCH] Accepting request 1045237 from home:pevik:branches:graphics

- Update to 2022.0.0:
  https://hugin.sourceforge.io/releases/2022.0.0/en.shtml
- Remove xdg-data.patch (accepted upstream)

OBS-URL: https://build.opensuse.org/request/show/1045237
OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=124
---
 hugin-2021.0.0.tar.bz2 |  3 ---
 hugin-2022.0.0.tar.bz2 |  3 +++
 hugin.changes          |  7 +++++++
 hugin.spec             |  5 ++---
 xdg-data.patch         | 23 -----------------------
 5 files changed, 12 insertions(+), 29 deletions(-)
 delete mode 100644 hugin-2021.0.0.tar.bz2
 create mode 100644 hugin-2022.0.0.tar.bz2
 delete mode 100644 xdg-data.patch

diff --git a/hugin-2021.0.0.tar.bz2 b/hugin-2021.0.0.tar.bz2
deleted file mode 100644
index 32741d3..0000000
--- a/hugin-2021.0.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:047aea8a7fa47844b34ef27c19d3b697e84939dcb1fdbbeb2c204621b66eead9
-size 10333565
diff --git a/hugin-2022.0.0.tar.bz2 b/hugin-2022.0.0.tar.bz2
new file mode 100644
index 0000000..39160a3
--- /dev/null
+++ b/hugin-2022.0.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97c8562a0ba9a743e0b955a43dfde048b1c60cd9e5f2ee2b69de1a81646e05a7
+size 10374360
diff --git a/hugin.changes b/hugin.changes
index e2738d3..7439e68 100644
--- a/hugin.changes
+++ b/hugin.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Dec 24 18:00:39 UTC 2022 - Petr Vorel <pvorel@suse.cz>
+
+- Update to 2022.0.0:
+  https://hugin.sourceforge.io/releases/2022.0.0/en.shtml
+- Remove xdg-data.patch (accepted upstream)
+
 -------------------------------------------------------------------
 Wed Nov  2 12:29:44 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
 
diff --git a/hugin.spec b/hugin.spec
index 2a02737..5d12926 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -16,14 +16,14 @@
 #
 
 
-%define mversion 2021.0
+%define mversion 2022.0
 %bcond_with hsi
 %bcond_without system_flann
 %bcond_without lapack
 # Cannot use EGL unless glew bug https://github.com/nigels-com/glew/issues/315 is fixed
 %bcond_with egl
 Name:           hugin
-Version:        2021.0.0
+Version:        2022.0.0
 Release:        0
 Summary:        Toolchain for Stitching of Images and Creating Panoramas
 License:        GPL-2.0-or-later
@@ -31,7 +31,6 @@ Group:          Productivity/Graphics/Other
 URL:            http://hugin.sourceforge.net/
 Source:         https://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{mversion}/%{name}-%{version}.tar.bz2
 Patch0:         hugin.appdata.patch
-Patch1:         xdg-data.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  OpenEXR-devel
 BuildRequires:  cmake >= 3.1.0
diff --git a/xdg-data.patch b/xdg-data.patch
deleted file mode 100644
index 91161ed..0000000
--- a/xdg-data.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# HG changeset patch
-# User tmodes
-# Date 1658245150 -7200
-#      Tue Jul 19 17:39:10 2022 +0200
-# Node ID edfddc6070ca6d4223d359fb4b38273a5aed2f2d
-# Parent  490baa16aae6680792d31316be12a75b50236baa
-Fixes crash when environment variable XDG_DATA_HOME is not set
-
-diff -r 490baa16aae6 -r edfddc6070ca src/hugin_base/hugin_utils/utils.cpp
---- a/src/hugin_base/hugin_utils/utils.cpp	Thu May 26 18:58:52 2022 +0200
-+++ b/src/hugin_base/hugin_utils/utils.cpp	Tue Jul 19 17:39:10 2022 +0200
-@@ -472,9 +472,9 @@
- #else
- #ifdef USE_XDG_DIRS
-     char *xdgDataDir = getenv("XDG_DATA_HOME");
--    if (strlen(xdgDataDir) == 0)
-+    if (xdgDataDir == NULL || strlen(xdgDataDir) == 0)
-     {
--        // no XDG_DATA_HOME enviroment variable set
-+        // no XDG_DATA_HOME enviroment variable set or empty variable
-         // use $HOME/.local/share instead
-         const  std::string homeDir = GetHomeDir();
-         if (homeDir.empty())