From 463f96dcf3e27fc2dbd2ac0168deda9dc55f9a263a531c3d75dbbbbe8f2c4ecc Mon Sep 17 00:00:00 2001
From: Atri Bhattacharya <badshah400@gmail.com>
Date: Wed, 2 Aug 2023 16:27:51 +0000
Subject: [PATCH] Accepting request 1102041 from home:ithod:updated

- update to 1.2.0:
  * Added PDF text selection tools
  * Added Setsquare Tool and Compass Tool
  * Many more changes; for the full list, see
    https://github.com/xournalpp/xournalpp/blob/release-1.2/CHANGELOG.md
- remove xournalpp-include.patch, fixed upstream
- Add xournalpp-return.patch: Fix control reaches end of non-void function

OBS-URL: https://build.opensuse.org/request/show/1102041
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xournalpp?expand=0&rev=41
---
 xournalpp-1.1.3.tar.gz  |  3 ---
 xournalpp-1.2.0.tar.gz  |  3 +++
 xournalpp-include.patch | 12 ------------
 xournalpp-return.patch  | 10 ++++++++++
 xournalpp.changes       | 11 +++++++++++
 xournalpp.spec          | 10 ++++------
 6 files changed, 28 insertions(+), 21 deletions(-)
 delete mode 100644 xournalpp-1.1.3.tar.gz
 create mode 100644 xournalpp-1.2.0.tar.gz
 delete mode 100644 xournalpp-include.patch
 create mode 100644 xournalpp-return.patch

diff --git a/xournalpp-1.1.3.tar.gz b/xournalpp-1.1.3.tar.gz
deleted file mode 100644
index c29cd82..0000000
--- a/xournalpp-1.1.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5021c7a8f53687edb3a759e079c54d23d5918d83f8d1f5fcd08a1da2ce81bd8b
-size 15096883
diff --git a/xournalpp-1.2.0.tar.gz b/xournalpp-1.2.0.tar.gz
new file mode 100644
index 0000000..ef1b8f5
--- /dev/null
+++ b/xournalpp-1.2.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39e6e9b9c9eee44170a81e05c152e31a83d6a42ac7f8eebf7eea6b752a446377
+size 16699028
diff --git a/xournalpp-include.patch b/xournalpp-include.patch
deleted file mode 100644
index 79317e5..0000000
--- a/xournalpp-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: xournalpp-1.1.3/src/view/background/BackgroundConfig.h
-===================================================================
---- xournalpp-1.1.3.orig/src/view/background/BackgroundConfig.h
-+++ xournalpp-1.1.3/src/view/background/BackgroundConfig.h
-@@ -11,6 +11,7 @@
- 
- #pragma once
- 
-+#include <cinttypes>
- #include <map>
- #include <string>
- 
diff --git a/xournalpp-return.patch b/xournalpp-return.patch
new file mode 100644
index 0000000..a74e4ec
--- /dev/null
+++ b/xournalpp-return.patch
@@ -0,0 +1,10 @@
+--- xournalpp-1.2.0-orig/src/core/pdf/popplerapi/PopplerGlibPage.cpp 2023-07-29 23:28:24.000000000 +0200
++++ xournalpp-1.2.0/src/core/pdf/popplerapi/PopplerGlibPage.cpp 2023-08-02 17:13:44.165492360 +0200
+@@ -109,6 +109,7 @@
+             return POPPLER_SELECTION_GLYPH;
+         default:
+             g_assert(false && "unimplemented");
++            return POPPLER_SELECTION_WORD; // never reached
+     }
+ }
+ 
diff --git a/xournalpp.changes b/xournalpp.changes
index 04e13b8..a2c224a 100644
--- a/xournalpp.changes
+++ b/xournalpp.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Aug  2 06:11:10 UTC 2023 - thod_@gmx.de
+
+- update to 1.2.0:
+  * Added PDF text selection tools
+  * Added Setsquare Tool and Compass Tool
+  * Many more changes; for the full list, see
+    https://github.com/xournalpp/xournalpp/blob/release-1.2/CHANGELOG.md
+- remove xournalpp-include.patch, fixed upstream
+- Add xournalpp-return.patch: Fix control reaches end of non-void function
+
 -------------------------------------------------------------------
 Wed Apr 26 13:24:19 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/xournalpp.spec b/xournalpp.spec
index 16d0635..c71b528 100644
--- a/xournalpp.spec
+++ b/xournalpp.spec
@@ -17,15 +17,15 @@
 
 
 Name:           xournalpp
-Version:        1.1.3
+Version:        1.2.0
 Release:        0
 Summary:        Notetaking software designed around a tablet
 License:        GPL-2.0-or-later
 Group:          Productivity/Office/Other
 URL:            https://github.com/xournalpp/xournalpp
 Source0:        https://github.com/xournalpp/xournalpp/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM xournalpp-include.patch -- Add missing include
-Patch0:         xournalpp-include.patch
+# PATCH-FIX-UPSTREAM xournalpp-return.patch -- Fix control reaches end of non-void function
+Patch0:         xournalpp-return.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
@@ -43,6 +43,7 @@ BuildRequires:  pkgconfig(poppler-glib)
 BuildRequires:  pkgconfig(portaudiocpp)
 BuildRequires:  pkgconfig(sndfile)
 BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(gtksourceview-4)
 Recommends:     webp-pixbuf-loader
 Recommends:     tex(scontents.tex)
 Recommends:     tex(standalone.tex)
@@ -84,9 +85,6 @@ It supports pen input, e.g. Wacom tablets.
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/metainfo/*.appdata.xml
 %{_datadir}/mime/packages/*.xml
-%dir %{_datadir}/mimelnk
-%dir %{_datadir}/mimelnk/application
-%{_datadir}/mimelnk/application/*.desktop
 %dir %{_datadir}/thumbnailers
 %{_datadir}/thumbnailers/*.thumbnailer
 %{_datadir}/xournalpp/