diff --git a/1.0.10.tar.gz b/1.0.10.tar.gz new file mode 100644 index 0000000..4befd2f --- /dev/null +++ b/1.0.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1583cfb34267a0f03273e5894b3f47833cdbbdb1b1bd2130287c9f805ece95c8 +size 14644954 diff --git a/1.0.8.tar.gz b/1.0.8.tar.gz deleted file mode 100644 index 287d315..0000000 --- a/1.0.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95069296532119dd193a12cb560a510972614420679ee41d4cad9b0ce5a692ae -size 8485637 diff --git a/xournalpp-fix-horizontal-space.patch b/xournalpp-fix-horizontal-space.patch deleted file mode 100644 index 28848bc..0000000 --- a/xournalpp-fix-horizontal-space.patch +++ /dev/null @@ -1,117 +0,0 @@ -From cdcf02d1a4703d7c146b5479a751ae18180abac6 Mon Sep 17 00:00:00 2001 -From: Andreas Butti -Date: Mon, 18 Feb 2019 18:25:25 +0100 -Subject: [PATCH] fixes #906 - ---- - src/gui/Layout.cpp | 59 ++++++++++++++++++++++++++++++---------- - src/gui/LayoutMapper.cpp | 5 ---- - 2 files changed, 44 insertions(+), 20 deletions(-) - -diff --git a/src/gui/Layout.cpp b/src/gui/Layout.cpp -index d8b15535..c6a6d84a 100644 ---- a/src/gui/Layout.cpp -+++ b/src/gui/Layout.cpp -@@ -9,6 +9,27 @@ - #include "gui/LayoutMapper.h" - - -+/** -+ * Padding outside the pages, including shadow -+ */ -+const int XOURNAL_PADDING = 10; -+ -+/** -+ * Padding outside the pages, if additional padding is set -+ */ -+const int XOURNAL_PADDING_FREE_SPACE = 150; -+ -+/** -+ * Allowance for shadow between page pairs in paired page mode -+ */ -+const int XOURNAL_ROOM_FOR_SHADOW = 3; -+ -+/** -+ * Padding between the pages -+ */ -+const int XOURNAL_PADDING_BETWEEN = 15; -+ -+ - Layout::Layout(XournalView* view, ScrollHandling* scrollHandling) - : view(view), - scrollHandling(scrollHandling), -@@ -174,21 +195,6 @@ double Layout::getLayoutWidth() - return layoutWidth; - } - --/** -- * Padding outside the pages, including shadow -- */ --const int XOURNAL_PADDING = 10; -- --/** -- * Allowance for shadow between page pairs in paired page mode -- */ --const int XOURNAL_ROOM_FOR_SHADOW = 3; -- --/** -- * Padding between the pages -- */ --const int XOURNAL_PADDING_BETWEEN = 15; -- - void Layout::layoutPages() - { - XOJ_CHECK_TYPE(Layout); -@@ -238,6 +244,19 @@ void Layout::layoutPages() - int x = XOURNAL_PADDING; - int y = XOURNAL_PADDING; - -+ bool verticalSpace = settings->getAddVerticalSpace(); -+ bool horizontalSpace = settings->getAddHorizontalSpace(); -+ -+ if (verticalSpace) -+ { -+ x += XOURNAL_PADDING_FREE_SPACE; -+ } -+ -+ if (horizontalSpace) -+ { -+ y += XOURNAL_PADDING_FREE_SPACE; -+ } -+ - // Iterate over ALL possible rows and columns and let the mapper tell us what page, if any, is found there. - for (int r = 0; r < rows; r++) - { -@@ -308,6 +327,16 @@ void Layout::layoutPages() - totalHeight += sizeRow[r]; - } - -+ if (verticalSpace) -+ { -+ totalWidth += XOURNAL_PADDING_FREE_SPACE * 2; -+ } -+ -+ if (horizontalSpace) -+ { -+ totalHeight += XOURNAL_PADDING_FREE_SPACE * 2; -+ } -+ - this->setLayoutSize(totalWidth, totalHeight); - this->view->pagePosition->update(this->view->viewPages, len, totalHeight); - } -diff --git a/src/gui/LayoutMapper.cpp b/src/gui/LayoutMapper.cpp -index 8d97147d..4cf079a0 100644 ---- a/src/gui/LayoutMapper.cpp -+++ b/src/gui/LayoutMapper.cpp -@@ -41,11 +41,6 @@ LayoutMapper::LayoutMapper(int numPages, Settings* settings) - int pages = numPages; - - // get from user settings: -- -- // TODO: Use these again? -- bool verticalSpace = settings->getAddVerticalSpace(); -- // TODO: Use these again? -- bool horizontalSpace = settings->getAddHorizontalSpace(); - bool isPairedPages = settings->isShowPairedPages(); - int numCols = settings->getViewColumns(); - int numRows = settings->getViewRows(); diff --git a/xournalpp.changes b/xournalpp.changes index 5810e98..2f3bc14 100644 --- a/xournalpp.changes +++ b/xournalpp.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Apr 17 08:44:56 UTC 2019 - Atri Bhattacharya + +- Update to version 1.0.10: + * Support for a new, future file format. + * Lots of bug fixes and improvements. +- Drop xournalpp-fix-horizontal-space.patch: incorporated + upstream. +- New BuildRequires: pkgconfig(libzip). + ------------------------------------------------------------------- Tue Feb 19 11:34:38 UTC 2019 - badshah400@gmail.com diff --git a/xournalpp.spec b/xournalpp.spec index 560098a..c8e72e7 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -17,15 +17,13 @@ Name: xournalpp -Version: 1.0.8 +Version: 1.0.10 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/%{version}.tar.gz -# PATCH-FIX-UPSTREAM xournalpp-fix-horizontal-space.patch gh#xournalpp/xournalpp#906 badshah400@gmail.com -- Fix adding horizontal space to document view from preferences; patch taken from upstream commit -Patch0: xournalpp-fix-horizontal-space.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -36,6 +34,7 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libzip) BuildRequires: pkgconfig(poppler-glib) BuildRequires: pkgconfig(portaudiocpp) BuildRequires: pkgconfig(sndfile) @@ -50,7 +49,6 @@ It supports pen input, e.g. Wacom tablets. %prep %setup -q -%patch0 -p1 %build %cmake @@ -79,7 +77,6 @@ rm %{buildroot}%{_datadir}/%{name}/ui/*/hicolor/update-icon-cache.sh %{_datadir}/mimelnk/application/*.desktop %{_datadir}/xournalpp/ %{_datadir}/icons/hicolor/*/apps/* -%{_bindir}/xopp-recording.sh %dir %{_datadir}/thumbnailers %{_datadir}/thumbnailers/*.thumbnailer