commit xournal for openSUSE:Factory

2020-09-30 Thread root 
Hello community,

here is the log from the commit of package xournal for openSUSE:Factory checked 
in at 2020-09-30 19:55:28

Comparing /work/SRC/openSUSE:Factory/xournal (Old)
 and  /work/SRC/openSUSE:Factory/.xournal.new.4249 (New)


Package is "xournal"

Wed Sep 30 19:55:28 2020 rev:34 rq:838753 version:0.4.8.2016

Changes:

--- /work/SRC/openSUSE:Factory/xournal/xournal.changes  2018-02-25 
11:47:21.379747389 +0100
+++ /work/SRC/openSUSE:Factory/.xournal.new.4249/xournal.changes
2020-09-30 19:55:40.392853465 +0200
@@ -1,0 +2,5 @@
+Wed Sep 30 11:03:21 UTC 2020 - Ferdinand Thiessen 
+
+- Fixed build on Tumbleweed: New commandline options from inkscape
+
+---



Other differences:
--
++ xournal.spec ++
--- /var/tmp/diff_new_pack.n9km9C/_old  2020-09-30 19:55:41.028854033 +0200
+++ /var/tmp/diff_new_pack.n9km9C/_new  2020-09-30 19:55:41.032854037 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package xournal
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,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/
 #
 
 
@@ -22,7 +22,7 @@
 Summary:An application for notetaking, sketching, and keeping a 
journal using a stylus
 License:GPL-2.0-or-later
 Group:  Productivity/Office/Other
-Url:http://xournal.sourceforge.net/
+URL:http://xournal.sourceforge.net/
 Source: http://download.sf.net/xournal/%{name}-%{version}.tar.gz
 Patch0: %{name}-implicit-funcs.patch
 # PATCH-FIX-UPSTREAM xournal-Improve-window-title.patch -- 
https://sourceforge.net/p/xournal/patches/79/
@@ -36,6 +36,7 @@
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  inkscape
 BuildRequires:  intltool
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(atk)
 BuildRequires:  pkgconfig(cairo)
@@ -54,8 +55,6 @@
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(zlib)
 
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-
 %description
 Xournal is an application for notetaking, sketching, and keeping a journal
 using a stylus. You can also use it to annotate PDF files with scribbles or
@@ -74,21 +73,26 @@
 autoreconf -fi
 intltoolize --force
 %configure
-make %{?_smp_mflags}
+%make_build
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 make DESTDIR=%{buildroot} desktop-install
 
+%if 0%{?suse_version} > 1500
+export EXPORT="--export-filename"
+%else
+export EXPORT="-e"
+%endif
 # GENERATE AND INSTALL HIRES ICONS IN HICOLOR ICON DIR
-for i in 24 32 48 64 128 256
+for i in 64 128 256
 do
   mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
   mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/mimetypes
   inkscape -w ${i} -C pixmaps/%{name}.svg \
-   -e %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
+   $EXPORT 
%{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
   inkscape -w ${i} -C pixmaps/xoj.svg \
-   -e 
%{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/mimetypes/application-x-xoj.png
+   $EXPORT 
%{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/mimetypes/application-x-xoj.png
 done
 
 %suse_update_desktop_file %{name}
@@ -111,7 +115,6 @@
 %mime_database_postun
 
 %files -f %{name}.lang
-%defattr(-, root, root)
 %doc %{_docdir}/%{name}
 %{_bindir}/%{name}
 %{_datadir}/%{name}
@@ -120,6 +123,7 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/icons/hicolor/*/mimetypes/*xoj.*
 %{_datadir}/mime/packages/xournal.xml
+%dir %{_datadir}/mime/application
 %{_datadir}/mime/application/x-xoj.xml
 %dir %{_datadir}/mimelnk
 %dir %{_datadir}/mimelnk/application

commit xournal for openSUSE:Factory

2018-02-25 Thread root 
Hello community,

here is the log from the commit of package xournal for openSUSE:Factory checked 
in at 2018-02-25 11:47:20

Comparing /work/SRC/openSUSE:Factory/xournal (Old)
 and  /work/SRC/openSUSE:Factory/.xournal.new (New)


Package is "xournal"

Sun Feb 25 11:47:20 2018 rev:33 rq:579828 version:0.4.8.2016

Changes:

--- /work/SRC/openSUSE:Factory/xournal/xournal.changes  2017-11-19 
11:15:34.210251939 +0100
+++ /work/SRC/openSUSE:Factory/.xournal.new/xournal.changes 2018-02-25 
11:47:21.379747389 +0100
@@ -1,0 +2,6 @@
+Sat Feb 24 16:35:12 UTC 2018 - crrodrig...@opensuse.org
+
+- Fix BuildRequires so it lists all the needed, specific 
+  libraries.
+
+---



Other differences:
--
++ xournal.spec ++
--- /var/tmp/diff_new_pack.AyTiDi/_old  2018-02-25 11:47:22.635701815 +0100
+++ /var/tmp/diff_new_pack.AyTiDi/_new  2018-02-25 11:47:22.639701671 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xournal
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 Version:0.4.8.2016
 Release:0
 Summary:An application for notetaking, sketching, and keeping a 
journal using a stylus
-License:GPL-2.0+
+License:GPL-2.0-or-later
 Group:  Productivity/Office/Other
 Url:http://xournal.sourceforge.net/
 Source: http://download.sf.net/xournal/%{name}-%{version}.tar.gz
@@ -37,10 +37,23 @@
 BuildRequires:  inkscape
 BuildRequires:  intltool
 BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(atk)
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gobject-2.0)
+BuildRequires:  pkgconfig(gtk+-x11-2.0)
+BuildRequires:  pkgconfig(libart-2.0)
 BuildRequires:  pkgconfig(libgnomecanvas-2.0)
+BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(pangocairo)
 BuildRequires:  pkgconfig(pangoft2)
 BuildRequires:  pkgconfig(poppler-glib)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(zlib)
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description

commit xournal for openSUSE:Factory

2017-11-19 Thread root 
Hello community,

here is the log from the commit of package xournal for openSUSE:Factory checked 
in at 2017-11-19 11:15:27

Comparing /work/SRC/openSUSE:Factory/xournal (Old)
 and  /work/SRC/openSUSE:Factory/.xournal.new (New)


Package is "xournal"

Sun Nov 19 11:15:27 2017 rev:32 rq:542825 version:0.4.8.2016

Changes:

--- /work/SRC/openSUSE:Factory/xournal/xournal.changes  2017-10-02 
16:54:50.185063235 +0200
+++ /work/SRC/openSUSE:Factory/.xournal.new/xournal.changes 2017-11-19 
11:15:34.210251939 +0100
@@ -1,0 +2,5 @@
+Sat Nov 11 16:15:54 UTC 2017 - badshah...@gmail.com
+
+- Switch BuildRequires to pkgconfig based ones wherever possible.
+
+---



Other differences:
--
++ xournal.spec ++
--- /var/tmp/diff_new_pack.4pWU08/_old  2017-11-19 11:15:35.014222732 +0100
+++ /var/tmp/diff_new_pack.4pWU08/_new  2017-11-19 11:15:35.018222587 +0100
@@ -33,13 +33,14 @@
 Patch3: xournal-fix-strokes-on-Lenovo-active-pen.patch
 BuildRequires:  automake >= 1.11.2
 BuildRequires:  fdupes
-BuildRequires:  gtk2-devel
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  inkscape
 BuildRequires:  intltool
-BuildRequires:  libgnomecanvas-devel
-BuildRequires:  libpoppler-glib-devel
 BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(libgnomecanvas-2.0)
+BuildRequires:  pkgconfig(pangoft2)
+BuildRequires:  pkgconfig(poppler-glib)
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description

commit xournal for openSUSE:Factory

2017-10-02 Thread root 
Hello community,

here is the log from the commit of package xournal for openSUSE:Factory checked 
in at 2017-10-02 16:54:40

Comparing /work/SRC/openSUSE:Factory/xournal (Old)
 and  /work/SRC/openSUSE:Factory/.xournal.new (New)


Package is "xournal"

Mon Oct  2 16:54:40 2017 rev:31 rq:530299 version:0.4.8.2016

Changes:

--- /work/SRC/openSUSE:Factory/xournal/xournal.changes  2017-08-24 
18:40:48.863304200 +0200
+++ /work/SRC/openSUSE:Factory/.xournal.new/xournal.changes 2017-10-02 
16:54:50.185063235 +0200
@@ -1,0 +2,6 @@
+Sat Sep 30 22:46:21 UTC 2017 - badshah...@gmail.com
+
+- Add xournal-fix-strokes-on-Lenovo-active-pen.patch: Fix strokes
+  with Lenovo active pen 2; patches taken from upstream git.
+
+---

New:

  xournal-fix-strokes-on-Lenovo-active-pen.patch



Other differences:
--
++ xournal.spec ++
--- /var/tmp/diff_new_pack.g9lHom/_old  2017-10-02 16:54:50.740985204 +0200
+++ /var/tmp/diff_new_pack.g9lHom/_new  2017-10-02 16:54:50.744984643 +0200
@@ -29,6 +29,8 @@
 Patch1: %{name}-Improve-window-title.patch
 # PATCH-FIX-UPSTREAM xournal-appdata.patch badshah...@gmail.com -- Add, 
translate and install appdata file
 Patch2: xournal-appdata.patch
+# PATCH-FIX-UPSTREAM xournal-fix-strokes-on-Lenovo-active-pen.patch 
badshah...@gmail.com -- Fix strokes with Lenovo active pen 2; patches taken 
from upstream git
+Patch3: xournal-fix-strokes-on-Lenovo-active-pen.patch
 BuildRequires:  automake >= 1.11.2
 BuildRequires:  fdupes
 BuildRequires:  gtk2-devel
@@ -52,6 +54,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 autoreconf -fi

++ xournal-fix-strokes-on-Lenovo-active-pen.patch ++
 ChangeLog  |  6 ++
 src/xo-clipboard.c |  2 ++
 src/xo-file.c  |  5 +
 src/xo-paint.c | 35 +--
 src/xournal.h  |  1 +
 5 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7c6d8c6..8fd18f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+This version:
+  - keep selection in clipboard after exiting
+  - config option to fix unreliable stroke origin (Lenovo AES pen issues)
+ (use in conjunction with xsetwacom to set RawSample = 1 or 2 until
+  wacom driver fix is committed).
+
 Version 0.4.8.2016 (July 20, 2017 bugfix release):
  * Bug fixes:
   - pen and touchscreen input handling bugfixes (bug #136 and others)
diff --git a/src/xo-clipboard.c b/src/xo-clipboard.c
index 253605e..d998648 100644
--- a/src/xo-clipboard.c
+++ b/src/xo-clipboard.c
@@ -189,6 +189,8 @@ void selection_to_clip(void)
   gtk_clipboard_set_with_data(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), 
targets, n_targets,
callback_clipboard_get, callback_clipboard_clear, sel);
+  gtk_clipboard_set_can_store(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD),
+   targets, n_targets);
   gtk_target_table_free(targets, n_targets);
 }
 
diff --git a/src/xo-file.c b/src/xo-file.c
index 0285b2b..4b8b5b2 100644
--- a/src/xo-file.c
+++ b/src/xo-file.c
@@ -1767,6 +1767,7 @@ void init_config_default(void)
   ui.autosave_delay = 5;
   ui.autosave_loop_running = FALSE;
   ui.autosave_need_catchup = FALSE;
+  ui.fix_stroke_origin = FALSE;
   
   // the default UI vertical order
   ui.vertical_order[0][0] = 1; 
@@ -1917,6 +1918,9 @@ void save_config_to_file(void)
   update_keyval("general", "buttons_switch_mappings",
 _(" buttons 2 and 3 switch mappings instead of drawing (useful for some 
tablets) (true/false)"),
 g_strdup(ui.button_switch_mapping?"true":"false"));
+  update_keyval("general", "fix_stroke_origin",
+_(" fix origin of strokes (devices with unreliable button press 
coordinates, e.g. Lenovo's AES pens) (true/false)"),
+g_strdup(ui.fix_stroke_origin?"true":"false"));
   update_keyval("general", "autoload_pdf_xoj",
 _(" automatically load filename.pdf.xoj instead of filename.pdf 
(true/false)"),
 g_strdup(ui.autoload_pdf_xoj?"true":"false"));
@@ -2337,6 +2341,7 @@ void load_config_from_file(void)
   if (parse_keyval_string("general", "touchscreen_device_name", &str))
 if (str!=NULL) ui.device_for_touch = str;
   parse_keyval_boolean("general", "buttons_switch_mappings", 
&ui.button_switch_mapping);
+  parse_keyval_boolean("general", "fix_stroke_origin", &ui.fix_stroke_origin);
   parse_keyval_boolean("general", "autoload_pdf_xoj", &ui.autoload_pdf_xoj);
   parse_keyval_boolean("general", "autocreate_new_xoj", 
&ui.autocreate_new_xoj);
   parse_keyval_boolean("general", "autosave_enabled", &ui.autosave_enabled);
diff --git a/src/xo-paint.c b/src/xo-paint.c
index 2331ff7..cf9614b 100644
--- a/src/xo-paint.c
+++ b/src/xo-paint.c
@@ -258,7 +258,7 @

commit xournal for openSUSE:Factory

2017-08-24 Thread root 
Hello community,

here is the log from the commit of package xournal for openSUSE:Factory checked 
in at 2017-08-24 18:40:39

Comparing /work/SRC/openSUSE:Factory/xournal (Old)
 and  /work/SRC/openSUSE:Factory/.xournal.new (New)


Package is "xournal"

Thu Aug 24 18:40:39 2017 rev:30 rq:511727 version:0.4.8.2016

Changes:

--- /work/SRC/openSUSE:Factory/xournal/xournal.changes  2017-06-13 
16:09:28.115149782 +0200
+++ /work/SRC/openSUSE:Factory/.xournal.new/xournal.changes 2017-08-24 
18:40:48.863304200 +0200
@@ -1,0 +2,35 @@
+Thu Jul 20 22:41:05 UTC 2017 - r...@fthiessen.de
+
+- Dropped upstream merged xournal-german-translation.patch
+
+---
+Thu Jul 20 21:29:14 UTC 2017 - badshah...@gmail.com
+
+- Update to version 0.4.8.2016:
+  * Pen and touchscreen input handling bugfixes (bug #136 and
+others).
+  * Fix a minor bug with save file paths in Windows.
+  * Use GDK macros (not WIN32) to disable X11-specific code (T.
+Schoonjans)
+  * Export to PDF and printing: fix resolution loss on some pdf
+backgrounds.
+  * Disable xinput during modal dialog boxes (bug #159).
+  * Avoid data corruption when exporting to overwrite a PDF.
+  * Fix path search order for toolbar bitmaps.
+  * Text and image tools activate on button release instead of
+button press to avoid subsequent confusion between clicks in
+toolbar and drawing area.
+  * Fix "pen disable touch" when touchscreen sends prox events.
+  * Fix crash when pasting text or images via xclip (bug #171).
+  * Add space and shift-space bindings to page down/up.
+  * Add A5 paper.
+  * Config option to export successive layers to separate PDF.
+pages.
+  * Config option to create new file when trying to open
+non-existent .xoj.
+  * Updated translations.
+- Use full URL for source tarball.
+- Drop xournal-decl-spec.patch; upstreamed.
+- Minor rebase of patches where needed.
+
+---

Old:

  xournal-0.4.8.tar.gz
  xournal-decl-spec.patch
  xournal-german-translation.patch

New:

  xournal-0.4.8.2016.tar.gz



Other differences:
--
++ xournal.spec ++
--- /var/tmp/diff_new_pack.UHmkVA/_old  2017-08-24 18:40:50.863022483 +0200
+++ /var/tmp/diff_new_pack.UHmkVA/_new  2017-08-24 18:40:50.899017411 +0200
@@ -17,22 +17,18 @@
 
 
 Name:   xournal
-Version:0.4.8
+Version:0.4.8.2016
 Release:0
 Summary:An application for notetaking, sketching, and keeping a 
journal using a stylus
 License:GPL-2.0+
 Group:  Productivity/Office/Other
-Url:http://math.mit.edu/~auroux/software/xournal/
-Source: %{name}-%{version}.tar.gz
+Url:http://xournal.sourceforge.net/
+Source: http://download.sf.net/xournal/%{name}-%{version}.tar.gz
 Patch0: %{name}-implicit-funcs.patch
-# PATCH-FIX-UPSTREAM xournal-german-translation.patch -- 
https://sourceforge.net/p/xournal/bugs/152/ -> is fixed in git
-Patch1: %{name}-german-translation.patch
 # PATCH-FIX-UPSTREAM xournal-Improve-window-title.patch -- 
https://sourceforge.net/p/xournal/patches/79/
-Patch2: %{name}-Improve-window-title.patch
+Patch1: %{name}-Improve-window-title.patch
 # PATCH-FIX-UPSTREAM xournal-appdata.patch badshah...@gmail.com -- Add, 
translate and install appdata file
-Patch3: xournal-appdata.patch
-# PATCH-FIX-UPSTREAM xournal-decl-spec.patch -- 
https://sourceforge.net/p/xournal/patches/85/
-Patch4: xournal-decl-spec.patch
+Patch2: xournal-appdata.patch
 BuildRequires:  automake >= 1.11.2
 BuildRequires:  fdupes
 BuildRequires:  gtk2-devel
@@ -56,8 +52,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 autoreconf -fi

++ xournal-0.4.8.tar.gz -> xournal-0.4.8.2016.tar.gz ++
 7820 lines of diff (skipped)

++ xournal-Improve-window-title.patch ++
--- /var/tmp/diff_new_pack.UHmkVA/_old  2017-08-24 18:40:51.414944729 +0200
+++ /var/tmp/diff_new_pack.UHmkVA/_new  2017-08-24 18:40:51.418944165 +0200
@@ -7,11 +7,11 @@
  src/xo-misc.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/xo-misc.c b/src/xo-misc.c
-index 335759b..25f83c2 100644
 a/src/xo-misc.c
-+++ b/src/xo-misc.c
-@@ -1635,7 +1635,7 @@ void update_file_name(char *filename)
+Index: xournal-0.4.8.2016/src/xo-misc.c
+===
+--- xournal-0.4.8.2016.orig/src/xo-misc.c
 xournal-0.4.8.2016/src/xo-misc.c
+@@ -1639,7 +1639,7 @@ void update_file_name(char *filename)
  return;
}
p = xo_basename(filename, FALSE);
@@ -20,6 +20,3 @@
gtk_window_set_title(GTK_WINDOW (wi

commit xournal for openSUSE:Factory

2017-06-13 Thread root 
Hello community,

here is the log from the commit of package xournal for openSUSE:Factory checked 
in at 2017-06-13 16:09:22

Comparing /work/SRC/openSUSE:Factory/xournal (Old)
 and  /work/SRC/openSUSE:Factory/.xournal.new (New)


Package is "xournal"

Tue Jun 13 16:09:22 2017 rev:29 rq:503229 version:0.4.8

Changes:

--- /work/SRC/openSUSE:Factory/xournal/xournal.changes  2017-01-09 
11:53:28.773317642 +0100
+++ /work/SRC/openSUSE:Factory/.xournal.new/xournal.changes 2017-06-13 
16:09:28.115149782 +0200
@@ -1,0 +2,5 @@
+Mon Jun 12 15:52:41 UTC 2017 - r...@fthiessen.de
+
+- Fixed build with Tumbleweed by adding xournal-decl-spec.patch
+
+---

New:

  xournal-decl-spec.patch



Other differences:
--
++ xournal.spec ++
--- /var/tmp/diff_new_pack.6EZUm6/_old  2017-06-13 16:09:29.011023526 +0200
+++ /var/tmp/diff_new_pack.6EZUm6/_new  2017-06-13 16:09:29.011023526 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package xournal
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,6 +31,8 @@
 Patch2: %{name}-Improve-window-title.patch
 # PATCH-FIX-UPSTREAM xournal-appdata.patch badshah...@gmail.com -- Add, 
translate and install appdata file
 Patch3: xournal-appdata.patch
+# PATCH-FIX-UPSTREAM xournal-decl-spec.patch -- 
https://sourceforge.net/p/xournal/patches/85/
+Patch4: xournal-decl-spec.patch
 BuildRequires:  automake >= 1.11.2
 BuildRequires:  fdupes
 BuildRequires:  gtk2-devel
@@ -55,6 +57,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 autoreconf -fi

++ xournal-decl-spec.patch ++
diff -Nur xournal-0.4.8/src/xo-shapes.c new/src/xo-shapes.c
--- xournal-0.4.8/src/xo-shapes.c   2014-06-15 22:21:05.0 +0200
+++ new/src/xo-shapes.c 2017-06-12 17:39:26.638290098 +0200
@@ -25,6 +25,7 @@
 #include "xournal.h"
 #include "xo-shapes.h"
 #include "xo-paint.h"
+#include "xo-misc.h"
 
 typedef struct Inertia {
   double mass, sx, sy, sxx, sxy, syy;

commit xournal for openSUSE:Factory

2016-08-09 Thread h_root 
Hello community,

here is the log from the commit of package xournal for openSUSE:Factory checked 
in at 2016-08-09 22:14:47

Comparing /work/SRC/openSUSE:Factory/xournal (Old)
 and  /work/SRC/openSUSE:Factory/.xournal.new (New)


Package is "xournal"

Changes:

--- /work/SRC/openSUSE:Factory/xournal/xournal.changes  2015-07-12 
22:52:12.0 +0200
+++ /work/SRC/openSUSE:Factory/.xournal.new/xournal.changes 2016-08-09 
22:14:49.0 +0200
@@ -1,0 +2,13 @@
+Fri Aug  5 18:55:16 UTC 2016 - r...@fthiessen.de
+
+- Some cleanup on the spec-file.
+
+---
+Fri Aug  5 06:44:40 UTC 2016 - badshah...@gmail.com
+
+- Add xournal-appdata.patch to add, translate and install appdata
+  file for application, this makes xournal show up in appstores
+  like GNOME Software and KDE Discover; run intltoolize to
+  translate appdata file.
+
+---

New:

  xournal-appdata.patch



Other differences:
--
++ xournal.spec ++
--- /var/tmp/diff_new_pack.C99xdb/_old  2016-08-09 22:14:50.0 +0200
+++ /var/tmp/diff_new_pack.C99xdb/_new  2016-08-09 22:14:50.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package xournal
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,31 +17,30 @@
 
 
 Name:   xournal
-Url:http://math.mit.edu/~auroux/software/xournal/
 Version:0.4.8
 Release:0
 Summary:An application for notetaking, sketching, and keeping a 
journal using a stylus
 License:GPL-2.0+
 Group:  Productivity/Office/Other
+Url:http://math.mit.edu/~auroux/software/xournal/
 Source: %{name}-%{version}.tar.gz
 Patch0: %{name}-implicit-funcs.patch
-#reported already upstream -> is fixed in git
+# PATCH-FIX-UPSTREAM xournal-german-translation.patch -- 
https://sourceforge.net/p/xournal/bugs/152/ -> is fixed in git
 Patch1: %{name}-german-translation.patch
+# PATCH-FIX-UPSTREAM xournal-Improve-window-title.patch -- 
https://sourceforge.net/p/xournal/patches/79/
 Patch2: %{name}-Improve-window-title.patch
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+# PATCH-FIX-UPSTREAM xournal-appdata.patch badshah...@gmail.com -- Add, 
translate and install appdata file
+Patch3: xournal-appdata.patch
 BuildRequires:  automake >= 1.11.2
 BuildRequires:  fdupes
 BuildRequires:  gtk2-devel
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  inkscape
+BuildRequires:  intltool
 BuildRequires:  libgnomecanvas-devel
-%if 0%{?suse_version}
 BuildRequires:  libpoppler-glib-devel
 BuildRequires:  update-desktop-files
-%else
-# E.g. Fedora etc. use other package name
-BuildRequires:  poppler-glib-devel
-%endif
+BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
 Xournal is an application for notetaking, sketching, keeping a journal
@@ -51,18 +50,20 @@
 Gournal.
 
 %prep
-%setup
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 autoreconf -fi
+intltoolize --force
 %configure
-make %{_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
 make DESTDIR=%{buildroot} desktop-install
 
 # GENERATE AND INSTALL HIRES ICONS IN HICOLOR ICON DIR
@@ -76,12 +77,12 @@
-e 
%{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/mimetypes/application-x-xoj.png
 done
 
-%if 0%{?suse_version}
 %suse_update_desktop_file %{name}
-%endif
 %find_lang %{name}
 
 install -D -m 0644 %{name}.xml 
%{buildroot}%{_datadir}/mime/application/x-xoj.xml
+mkdir -p %{buildroot}%{_docdir}/%{name}
+install -m 0644 -t %{buildroot}%{_docdir}/%{name} AUTHORS COPYING ChangeLog 
NEWS README
 
 %fdupes %{buildroot}%{_datadir}
 
@@ -97,20 +98,20 @@
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc %{_docdir}/%{name}
 %{_bindir}/%{name}
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_datadir}/icons/hicolor/*/mimetypes/*.png
-%{_datadir}/icons/hicolor/scalable/mimetypes/*.svg
-%{_datadir}/icons/hicolor/scalable/mimetypes/xoj.svg
-%{_datadir}/mime/packages/*.xml
-%{_datadir}/mime/application/*.xml
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/icons/hicolor/*/mimetypes/*xoj.*
+%{_datadir}/mi

commit xournal for openSUSE:Factory

2015-07-12 Thread h_root 
Hello community,

here is the log from the commit of package xournal for openSUSE:Factory checked 
in at 2015-07-12 22:52:10

Comparing /work/SRC/openSUSE:Factory/xournal (Old)
 and  /work/SRC/openSUSE:Factory/.xournal.new (New)


Package is "xournal"

Changes:

--- /work/SRC/openSUSE:Factory/xournal/xournal.changes  2015-04-25 
11:25:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.xournal.new/xournal.changes 2015-07-12 
22:52:12.0 +0200
@@ -0,0 +1,12 @@
+---
+Mon Jul  6 01:42:22 UTC 2015 - badshah...@gmail.com
+
+- Use upstream command to install desktop entries, mimetypes
+  and icons.
+- Generate and install hires icons into hicolor directory (needed
+  on HiDPI displays).
+- Use appropriate post-scripts to update desstop menu database,
+  mime cache and icon-theme.
+- Drop external .desktop file and icon, and use upstream bundled
+  ones.
+

Old:

  xournal.desktop
  xournal.png



Other differences:
--
++ xournal.spec ++
--- /var/tmp/diff_new_pack.eFHqlF/_old  2015-07-12 22:52:13.0 +0200
+++ /var/tmp/diff_new_pack.eFHqlF/_new  2015-07-12 22:52:13.0 +0200
@@ -24,15 +24,16 @@
 License:GPL-2.0+
 Group:  Productivity/Office/Other
 Source: %{name}-%{version}.tar.gz
-Source1:%{name}.desktop
-Source2:%{name}.png
 Patch0: %{name}-implicit-funcs.patch
 #reported already upstream -> is fixed in git
 Patch1: %{name}-german-translation.patch
 Patch2: %{name}-Improve-window-title.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  automake >= 1.11.2
+BuildRequires:  fdupes
 BuildRequires:  gtk2-devel
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  inkscape
 BuildRequires:  libgnomecanvas-devel
 %if 0%{?suse_version}
 BuildRequires:  libpoppler-glib-devel
@@ -62,15 +63,37 @@
 
 %install
 make DESTDIR=%{buildroot} install
-install -D -m 0644 %{SOURCE1} 
%{buildroot}/%{_datadir}/applications/%{name}.desktop
-install -D -m 0644 %{SOURCE2} %{buildroot}/%{_datadir}/pixmaps/%{name}.png
+make DESTDIR=%{buildroot} desktop-install
+
+# GENERATE AND INSTALL HIRES ICONS IN HICOLOR ICON DIR
+for i in 24 32 48 64 128 256
+do
+  mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+  mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/mimetypes
+  inkscape -w ${i} -C pixmaps/%{name}.svg \
+   -e %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
+  inkscape -w ${i} -C pixmaps/xoj.svg \
+   -e 
%{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/mimetypes/application-x-xoj.png
+done
+
 %if 0%{?suse_version}
 %suse_update_desktop_file %{name}
 %endif
 %find_lang %{name}
 
-%clean
-rm -rf %buildroot
+install -D -m 0644 %{name}.xml 
%{buildroot}%{_datadir}/mime/application/x-xoj.xml
+
+%fdupes %{buildroot}%{_datadir}
+
+%post
+%desktop_database_post
+%icon_theme_cache_post
+%mime_database_post
+
+%postun
+%desktop_database_postun
+%icon_theme_cache_postun
+%mime_database_postun
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -79,6 +102,15 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_datadir}/icons/hicolor/*/mimetypes/*.png
+%{_datadir}/icons/hicolor/scalable/mimetypes/*.svg
+%{_datadir}/icons/hicolor/scalable/mimetypes/xoj.svg
+%{_datadir}/mime/packages/*.xml
+%{_datadir}/mime/application/*.xml
+%dir %{_datadir}/mimelnk
+%dir %{_datadir}/mimelnk/application
+%{_datadir}/mimelnk/application/*.desktop
 
 %changelog

commit xournal for openSUSE:Factory

2015-04-25 Thread h_root 
Hello community,

here is the log from the commit of package xournal for openSUSE:Factory checked 
in at 2015-04-25 09:53:18

Comparing /work/SRC/openSUSE:Factory/xournal (Old)
 and  /work/SRC/openSUSE:Factory/.xournal.new (New)


Package is "xournal"

Changes:

--- /work/SRC/openSUSE:Factory/xournal/xournal.changes  2015-03-05 
18:17:22.0 +0100
+++ /work/SRC/openSUSE:Factory/.xournal.new/xournal.changes 2015-04-25 
11:25:55.0 +0200
@@ -0,0 +1,5 @@
+Sun Mar 22 20:00:03 UTC 2015 - r...@fthiessen.de
+---
+
+- Improved spec file (requirements)
+



Other differences:
--
++ xournal.spec ++
--- /var/tmp/diff_new_pack.PkUpkR/_old  2015-04-25 11:25:55.0 +0200
+++ /var/tmp/diff_new_pack.PkUpkR/_new  2015-04-25 11:25:55.0 +0200
@@ -31,12 +31,15 @@
 Patch1: %{name}-german-translation.patch
 Patch2: %{name}-Improve-window-title.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  automake
+BuildRequires:  automake >= 1.11.2
 BuildRequires:  gtk2-devel
 BuildRequires:  libgnomecanvas-devel
-BuildRequires:  libpoppler-glib-devel
 %if 0%{?suse_version}
+BuildRequires:  libpoppler-glib-devel
 BuildRequires:  update-desktop-files
+%else
+# E.g. Fedora etc. use other package name
+BuildRequires:  poppler-glib-devel
 %endif
 
 %description

commit xournal for openSUSE:Factory

2015-03-05 Thread h_root 
Hello community,

here is the log from the commit of package xournal for openSUSE:Factory checked 
in at 2015-03-05 15:43:22

Comparing /work/SRC/openSUSE:Factory/xournal (Old)
 and  /work/SRC/openSUSE:Factory/.xournal.new (New)


Package is "xournal"

Changes:

--- /work/SRC/openSUSE:Factory/xournal/xournal.changes  2015-03-03 
11:15:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.xournal.new/xournal.changes 2015-03-05 
18:17:22.0 +0100
@@ -1,0 +2,15 @@
+Tue Mar  3 17:27:02 UTC 2015 - r...@fthiessen.de
+
+- Added some patches
+ * Missing German translation: xournal-german-translation.patch
+ * Window title format is corrected: xournal-Improve-window-title.patch
+- incorrect-fsf-address warning is reported upstream (Bug #151)
+
+---
+Tue Mar 3 02:25:00 UTC 2015 - r...@fthiessen.de
+
+- Updated to 0.4.8
+- removed outdated patch (now included in xournal)
+  * xournal-large-pen-cursor.patch
+
+---

Old:

  xournal-0.4.7.tar.gz
  xournal-large-pen-cursor.patch

New:

  xournal-0.4.8.tar.gz
  xournal-Improve-window-title.patch
  xournal-german-translation.patch



Other differences:
--
++ xournal.spec ++
--- /var/tmp/diff_new_pack.1KF6ai/_old  2015-03-05 18:17:23.0 +0100
+++ /var/tmp/diff_new_pack.1KF6ai/_new  2015-03-05 18:17:23.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xournal
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 Name:   xournal
 Url:http://math.mit.edu/~auroux/software/xournal/
-Version:0.4.7
+Version:0.4.8
 Release:0
 Summary:An application for notetaking, sketching, and keeping a 
journal using a stylus
 License:GPL-2.0+
@@ -26,13 +26,14 @@
 Source: %{name}-%{version}.tar.gz
 Source1:%{name}.desktop
 Source2:%{name}.png
-Patch0: %{name}-large-pen-cursor.patch
-Patch1: %{name}-implicit-funcs.patch
+Patch0: %{name}-implicit-funcs.patch
+#reported already upstream -> is fixed in git
+Patch1: %{name}-german-translation.patch
+Patch2: %{name}-Improve-window-title.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  automake
 BuildRequires:  gtk2-devel
 BuildRequires:  libgnomecanvas-devel
-#BuildRequires:  libgnomeprintui-devel
 BuildRequires:  libpoppler-glib-devel
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
@@ -49,6 +50,7 @@
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 autoreconf -fi
@@ -56,16 +58,16 @@
 make %{_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
-install -D -m 0644 %{SOURCE1} 
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+make DESTDIR=%{buildroot} install
+install -D -m 0644 %{SOURCE1} 
%{buildroot}/%{_datadir}/applications/%{name}.desktop
+install -D -m 0644 %{SOURCE2} %{buildroot}/%{_datadir}/pixmaps/%{name}.png
 %if 0%{?suse_version}
 %suse_update_desktop_file %{name}
 %endif
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %buildroot
 
 %files -f %{name}.lang
 %defattr(-, root, root)

++ xournal-0.4.7.tar.gz -> xournal-0.4.8.tar.gz ++
 21011 lines of diff (skipped)

++ xournal-Improve-window-title.patch ++
>From b0d19f6945477bac922767d12a3c57a6e80cebe3 Mon Sep 17 00:00:00 2001
From: Michael Walter 
Date: Wed, 10 Dec 2014 23:05:36 -0800
Subject: [PATCH] Improve window title (file name before program name).

---
 src/xo-misc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xo-misc.c b/src/xo-misc.c
index 335759b..25f83c2 100644
--- a/src/xo-misc.c
+++ b/src/xo-misc.c
@@ -1635,7 +1635,7 @@ void update_file_name(char *filename)
 return;
   }
   p = xo_basename(filename, FALSE);
-  g_snprintf(tmp, 100, _("Xournal - %s"), p);
+  g_snprintf(tmp, 100, _("%s - Xournal"), p);
   gtk_window_set_title(GTK_WINDOW (winMain), tmp);
   new_mru_entry(filename);
 
-- 
1.9.4.msysgit.0

++ xournal-german-translation.patch ++
 1762 lines (skipped)


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit xournal for openSUSE:Factory

2015-03-03 Thread h_root 
Hello community,

here is the log from the commit of package xournal for openSUSE:Factory checked 
in at 2015-03-03 11:15:25

Comparing /work/SRC/openSUSE:Factory/xournal (Old)
 and  /work/SRC/openSUSE:Factory/.xournal.new (New)


Package is "xournal"

Changes:

--- /work/SRC/openSUSE:Factory/xournal/xournal.changes  2013-03-19 
12:43:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.xournal.new/xournal.changes 2015-03-03 
11:15:49.0 +0100
@@ -1,0 +2,29 @@
+Mon Mar 2 11:31:30 UTC 2015 - r...@fthiessen.de
+
+- slightly modified changlog, so factory auto review does not grumble anymore.
+ * Added patch references
+
+---
+Wed Jul 24 07:18:40 UTC 2013 - rene.vanpaas...@gmail.com
+
+- have the large pen cursor option updated in the interface after defaults
+  loaded 
+
+---
+Tue Jul 23 16:04:50 UTC 2013 - rene.vanpaas...@gmail.com
+
+- don't need libgnomeprintui 
+
+---
+Tue Jul 23 14:31:31 UTC 2013 - rene.vanpaas...@gmail.com
+
+- update to 0.4.7, and add a patch to optionally select a larger cursor 
+ * xournal-large-pen-cursor.patch
+- added patch for fixing implicit functions
+ * xournal-implicit-funcs.patch
+- removed unneeded patches (which are now included in xournal)
+ * xournal-automake-1.13.patch
+ * xournal-poppler-0.18.patch
+ * xournal-unistd-decl.diff
+ * xournal-no-copy-dt-needed-entries.patch
+---

Old:

  xournal-0.4.5.tar.bz2
  xournal-automake-1.13.patch
  xournal-no-copy-dt-needed-entries.patch
  xournal-poppler-0.18.patch
  xournal-unistd-decl.diff

New:

  xournal-0.4.7.tar.gz
  xournal-implicit-funcs.patch
  xournal-large-pen-cursor.patch



Other differences:
--
++ xournal.spec ++
--- /var/tmp/diff_new_pack.6E60MT/_old  2015-03-03 11:15:50.0 +0100
+++ /var/tmp/diff_new_pack.6E60MT/_new  2015-03-03 11:15:50.0 +0100
@@ -18,26 +18,21 @@
 
 Name:   xournal
 Url:http://math.mit.edu/~auroux/software/xournal/
-Version:0.4.5
+Version:0.4.7
 Release:0
 Summary:An application for notetaking, sketching, and keeping a 
journal using a stylus
 License:GPL-2.0+
 Group:  Productivity/Office/Other
-Source: %{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.gz
 Source1:%{name}.desktop
 Source2:%{name}.png
-Patch0: %{name}-unistd-decl.diff
-#feel free to improve it and please upstream it
-Patch1: %{name}-no-copy-dt-needed-entries.patch
-# PATCH-FIX-UPSTREAM xournal-poppler-0.18.patch vu...@opensuse.org -- Fix 
build with poppler 0.17/0.18, taken from CVS
-Patch2: xournal-poppler-0.18.patch
-# PATCH-FIX-UPSTREAM xournal-automake-1.13.patch pgaj...@suse.cz
-Patch3: xournal-automake-1.13.patch
+Patch0: %{name}-large-pen-cursor.patch
+Patch1: %{name}-implicit-funcs.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  automake
 BuildRequires:  gtk2-devel
 BuildRequires:  libgnomecanvas-devel
-BuildRequires:  libgnomeprintui-devel
+#BuildRequires:  libgnomeprintui-devel
 BuildRequires:  libpoppler-glib-devel
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
@@ -52,10 +47,8 @@
 
 %prep
 %setup
-%patch0
+%patch0 -p1
 %patch1 -p1
-%patch2 -p0
-%patch3 -p1
 
 %build
 autoreconf -fi

++ xournal-implicit-funcs.patch ++
Index: xournal-0.4.7/src/ttsubset/sft.c
===
--- xournal-0.4.7.orig/src/ttsubset/sft.c
+++ xournal-0.4.7/src/ttsubset/sft.c
@@ -42,11 +42,14 @@
  * @author Alexander Gelfenbain 
  * @version 1.0
  */
-
+#include 
 #include 
 #include 
 #include 
 #include 
+#ifdef HAVE_UNISTD_H
+#include 
+#endif
 #include "sft.h"
 #ifdef USE_GSUB
 #include "gsub.h"
Index: xournal-0.4.7/src/ttsubset/ttcr.c
===
--- xournal-0.4.7.orig/src/ttsubset/ttcr.c
+++ xournal-0.4.7/src/ttsubset/ttcr.c
@@ -43,7 +43,7 @@
  * @version 1.3
  *
  */
-
+#include 
 #include 
 #ifdef HAVE_UNISTD_H
 #include 
++ xournal-large-pen-cursor.patch ++
Index: xournal-0.4.7/src/xo-callbacks.c
===
--- xournal-0.4.7.orig/src/xo-callbacks.c
+++ xournal-0.4.7/src/xo-callbacks.c
@@ -3677,3 +3677,14 @@ on_optionsButtonsSwitchMappings_activate
 }
 
 
+
+void
+on_optionsLargePenCursor_activate  (GtkMenuItem *menuitem,
+gpointer user_data)
+{
+  end_text();
+  ui.large_pencurs

commit xournal for openSUSE:Factory

2013-03-19 Thread h_root 
Hello community,

here is the log from the commit of package xournal for openSUSE:Factory checked 
in at 2013-03-19 12:43:48

Comparing /work/SRC/openSUSE:Factory/xournal (Old)
 and  /work/SRC/openSUSE:Factory/.xournal.new (New)


Package is "xournal", Maintainer is "dkuka...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/xournal/xournal.changes  2011-12-01 
17:39:30.0 +0100
+++ /work/SRC/openSUSE:Factory/.xournal.new/xournal.changes 2013-03-19 
12:43:49.0 +0100
@@ -1,0 +2,6 @@
+Wed Mar 13 12:38:31 CET 2013 - pgaj...@suse.cz
+
+- builds with automake 1.13
+  * automake-1.13.patch
+
+---

New:

  xournal-automake-1.13.patch



Other differences:
--
++ xournal.spec ++
--- /var/tmp/diff_new_pack.mAXPvK/_old  2013-03-19 12:43:51.0 +0100
+++ /var/tmp/diff_new_pack.mAXPvK/_new  2013-03-19 12:43:51.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xournal
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
 #
 
 
-
 Name:   xournal
 Url:http://math.mit.edu/~auroux/software/xournal/
 Version:0.4.5
@@ -32,6 +31,8 @@
 Patch1: %{name}-no-copy-dt-needed-entries.patch
 # PATCH-FIX-UPSTREAM xournal-poppler-0.18.patch vu...@opensuse.org -- Fix 
build with poppler 0.17/0.18, taken from CVS
 Patch2: xournal-poppler-0.18.patch
+# PATCH-FIX-UPSTREAM xournal-automake-1.13.patch pgaj...@suse.cz
+Patch3: xournal-automake-1.13.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  automake
 BuildRequires:  gtk2-devel
@@ -54,6 +55,7 @@
 %patch0
 %patch1 -p1
 %patch2 -p0
+%patch3 -p1
 
 %build
 autoreconf -fi

++ xournal-automake-1.13.patch ++
Index: xournal-0.4.5/configure.in
===
--- xournal-0.4.5.orig/configure.in
+++ xournal-0.4.5/configure.in
@@ -2,12 +2,11 @@ dnl Process this file with autoconf to p
 
 AC_INIT(configure.in)
 AM_INIT_AUTOMAKE(xournal, 0.4.5)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
 AM_MAINTAINER_MODE
 
 AC_ISC_POSIX
 AC_PROG_CC
-AM_PROG_CC_STDC
 AC_PROG_RANLIB
 AC_HEADER_STDC
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit xournal for openSUSE:Factory

2011-12-01 Thread h_root 
Hello community,

here is the log from the commit of package xournal for openSUSE:Factory checked 
in at 2011-12-01 17:39:28

Comparing /work/SRC/openSUSE:Factory/xournal (Old)
 and  /work/SRC/openSUSE:Factory/.xournal.new (New)


Package is "xournal", Maintainer is "dkuka...@suse.com"

Changes:

--- /work/SRC/openSUSE:Factory/xournal/xournal.changes  2011-09-23 
12:52:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.xournal.new/xournal.changes 2011-12-01 
17:39:30.0 +0100
@@ -1,0 +2,5 @@
+Wed Nov 30 10:26:04 UTC 2011 - co...@suse.com
+
+- add automake as buildrequire to avoid implicit dependency
+
+---



Other differences:
--
++ xournal.spec ++
--- /var/tmp/diff_new_pack.HEYeJj/_old  2011-12-01 17:39:31.0 +0100
+++ /var/tmp/diff_new_pack.HEYeJj/_new  2011-12-01 17:39:31.0 +0100
@@ -20,9 +20,9 @@
 Name:   xournal
 Url:http://math.mit.edu/~auroux/software/xournal/
 Version:0.4.5
-Release:7
+Release:0
 Summary:An application for notetaking, sketching, and keeping a 
journal using a stylus
-License:GPLv2+
+License:GPL-2.0+
 Group:  Productivity/Office/Other
 Source: %{name}-%{version}.tar.bz2
 Source1:%{name}.desktop
@@ -33,6 +33,7 @@
 # PATCH-FIX-UPSTREAM xournal-poppler-0.18.patch vu...@opensuse.org -- Fix 
build with poppler 0.17/0.18, taken from CVS
 Patch2: xournal-poppler-0.18.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  automake
 BuildRequires:  gtk2-devel
 BuildRequires:  libgnomecanvas-devel
 BuildRequires:  libgnomeprintui-devel


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit xournal for openSUSE:Factory

2011-09-21 Thread h_root 

Hello community,

here is the log from the commit of package xournal for openSUSE:Factory
checked in at Wed Sep 21 17:30:01 CEST 2011.




--- xournal/xournal.changes 2011-09-17 00:16:43.0 +0200
+++ /mounts/work_src_done/STABLE/xournal/xournal.changes2011-09-20 
12:41:13.0 +0200
@@ -1,0 +2,6 @@
+Tue Sep 20 10:40:10 UTC 2011 - vu...@opensuse.org
+
+- Add xournal-poppler-0.18.patch: fix build with poppler 0.18.
+  Taken from CVS.
+
+---

calling whatdependson for head-i586


New:

  xournal-poppler-0.18.patch



Other differences:
--
++ xournal.spec ++
--- /var/tmp/diff_new_pack.UN1rHI/_old  2011-09-21 17:29:57.0 +0200
+++ /var/tmp/diff_new_pack.UN1rHI/_new  2011-09-21 17:29:57.0 +0200
@@ -30,6 +30,8 @@
 Patch0: %{name}-unistd-decl.diff
 #feel free to improve it and please upstream it
 Patch1: %{name}-no-copy-dt-needed-entries.patch
+# PATCH-FIX-UPSTREAM xournal-poppler-0.18.patch vu...@opensuse.org -- Fix 
build with poppler 0.17/0.18, taken from CVS
+Patch2: xournal-poppler-0.18.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gtk2-devel
 BuildRequires:  libgnomecanvas-devel
@@ -50,6 +52,7 @@
 %setup
 %patch0
 %patch1 -p1
+%patch2 -p0
 
 %build
 autoreconf -fi

++ xournal-poppler-0.18.patch ++
--- src/xo-misc.c   2010/10/18 18:45:36 1.23
+++ src/xo-misc.c   2011/07/21 22:07:33 1.24
@@ -2197,3 +2197,93 @@
   if(GTK_IS_CONTAINER(w))
 gtk_container_forall(GTK_CONTAINER(w), install_focus_hooks, data);
 }
+
+// wrapper for missing poppler functions (defunct poppler-gdk api)
+
+static void
+wrapper_copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,
+ GdkPixbuf   *pixbuf)
+{
+  int cairo_width, cairo_height, cairo_rowstride;
+  unsigned char *pixbuf_data, *dst, *cairo_data;
+  int pixbuf_rowstride, pixbuf_n_channels;
+  unsigned int *src;
+  int x, y;
+
+  cairo_width = cairo_image_surface_get_width (surface);
+  cairo_height = cairo_image_surface_get_height (surface);
+  cairo_rowstride = cairo_image_surface_get_stride (surface);
+  cairo_data = cairo_image_surface_get_data (surface);
+
+  pixbuf_data = gdk_pixbuf_get_pixels (pixbuf);
+  pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+  pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf);
+
+  if (cairo_width > gdk_pixbuf_get_width (pixbuf))
+cairo_width = gdk_pixbuf_get_width (pixbuf);
+  if (cairo_height > gdk_pixbuf_get_height (pixbuf))
+cairo_height = gdk_pixbuf_get_height (pixbuf);
+  for (y = 0; y < cairo_height; y++)
+{
+  src = (unsigned int *) (cairo_data + y * cairo_rowstride);
+  dst = pixbuf_data + y * pixbuf_rowstride;
+  for (x = 0; x < cairo_width; x++) 
+   {
+ dst[0] = (*src >> 16) & 0xff;
+ dst[1] = (*src >> 8) & 0xff; 
+ dst[2] = (*src >> 0) & 0xff;
+ if (pixbuf_n_channels == 4)
+ dst[3] = (*src >> 24) & 0xff;
+ dst += pixbuf_n_channels;
+ src++;
+   }
+}
+}  
+
+void
+wrapper_poppler_page_render_to_pixbuf (PopplerPage *page,
+  int src_x, int src_y,
+  int src_width, int src_height,
+  double scale,
+  int rotation,
+  GdkPixbuf *pixbuf)
+{
+  cairo_t *cr;
+  cairo_surface_t *surface;
+
+  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+   src_width, src_height);
+  cr = cairo_create (surface);
+  cairo_save (cr);
+  switch (rotation) {
+  case 90:
+ cairo_translate (cr, src_x + src_width, -src_y);
+ break;
+  case 180:
+ cairo_translate (cr, src_x + src_width, src_y + src_height);
+ break;
+  case 270:
+ cairo_translate (cr, -src_x, src_y + src_height);
+ break;
+  default:
+ cairo_translate (cr, -src_x, -src_y);
+  }
+
+  if (scale != 1.0)
+ cairo_scale (cr, scale, scale);
+
+  if (rotation != 0)
+ cairo_rotate (cr, rotation * G_PI / 180.0);
+
+  poppler_page_render (page, cr);
+  cairo_restore (cr);
+
+  cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER);
+  cairo_set_source_rgb (cr, 1., 1., 1.);
+  cairo_paint (cr);
+
+  cairo_destroy (cr);
+
+  wrapper_copy_cairo_surface_to_pixbuf (surface, pixbuf);
+  cairo_surface_destroy (surface);
+}
--- src/xo-misc.h   2009/09/28 06:14:17 1.15
+++ src/xo-misc.h   2011/07/21 22:07:33 1.16
@@ -107,6 +107,15 @@
 gboolean intercept_activate_events(GtkWidget *w, GdkEvent *ev, gpointer data);
 void install_focus_hooks(GtkWidget *w, gpointer data);
 
+// wrapper for a function no longer provided by poppler 0.17+
+void
+wrapper_poppler_page_render_to_pixbuf (PopplerPage *page,
+

commit xournal for openSUSE:Factory

2011-09-19 Thread h_root 

Hello community,

here is the log from the commit of package xournal for openSUSE:Factory
checked in at Mon Sep 19 18:09:16 CEST 2011.




--- xournal/xournal.changes 2011-08-30 12:33:00.0 +0200
+++ xournal/xournal.changes 2011-09-17 00:16:43.0 +0200
@@ -1,0 +2,5 @@
+Fri Sep 16 22:15:39 UTC 2011 - suse-...@gmx.de
+
+- added "-lm" to no-copy-dt-needed-entries.patch (fix factory build)
+
+---

calling whatdependson for head-i586




Other differences:
--
++ xournal-no-copy-dt-needed-entries.patch ++
--- /var/tmp/diff_new_pack.nBEbPa/_old  2011-09-19 18:09:11.0 +0200
+++ /var/tmp/diff_new_pack.nBEbPa/_new  2011-09-19 18:09:11.0 +0200
@@ -7,5 +7,5 @@
xo-shapes.c xo-shapes.h
  
 -xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS)
-+xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz
++xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz 
-lm
  







Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit xournal for openSUSE:Factory

2011-08-31 Thread h_root 

Hello community,

here is the log from the commit of package xournal for openSUSE:Factory
checked in at Wed Aug 31 10:54:58 CEST 2011.




--- xournal/xournal.changes 2010-05-14 12:42:03.0 +0200
+++ /mounts/work_src_done/STABLE/xournal/xournal.changes2011-08-30 
12:33:00.0 +0200
@@ -1,0 +2,6 @@
+Tue Aug 30 10:32:15 UTC 2011 - pgaj...@suse.com
+
+- build with --no-copy-dt-needed-entries
+  * no-copy-dt-needed-entries.patch
+
+---

calling whatdependson for head-i586


New:

  xournal-no-copy-dt-needed-entries.patch



Other differences:
--
++ xournal.spec ++
--- /var/tmp/diff_new_pack.4QQOIz/_old  2011-08-31 10:54:02.0 +0200
+++ /var/tmp/diff_new_pack.4QQOIz/_new  2011-08-31 10:54:02.0 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package xournal (Version 0.4.5)
+# spec file for package xournal
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 Name:   xournal
 Url:http://math.mit.edu/~auroux/software/xournal/
 Version:0.4.5
-Release:1
+Release:7
 Summary:An application for notetaking, sketching, and keeping a 
journal using a stylus
 License:GPLv2+
 Group:  Productivity/Office/Other
@@ -28,6 +28,8 @@
 Source1:%{name}.desktop
 Source2:%{name}.png
 Patch0: %{name}-unistd-decl.diff
+#feel free to improve it and please upstream it
+Patch1: %{name}-no-copy-dt-needed-entries.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gtk2-devel
 BuildRequires:  libgnomecanvas-devel
@@ -47,6 +49,7 @@
 %prep
 %setup
 %patch0
+%patch1 -p1
 
 %build
 autoreconf -fi

++ xournal-no-copy-dt-needed-entries.patch ++
Index: xournal-0.4.5/src/Makefile.am
===
--- xournal-0.4.5.orig/src/Makefile.am
+++ xournal-0.4.5/src/Makefile.am
@@ -20,5 +20,5 @@ xournal_SOURCES = \
xo-callbacks.c xo-callbacks.h \
xo-shapes.c xo-shapes.h
 
-xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS)
+xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz
 






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org