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.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xournal.new/xournal.changes 2015-03-03 11:15:49.000000000 +0100
@@ -1,0 +2,29 @@
+Mon Mar 2 11:31:30 UTC 2015 - rpm@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.vanPaassen@gmail.com
+
+- have the large pen cursor option updated in the interface after defaults
+ loaded
+
+-------------------------------------------------------------------
+Tue Jul 23 16:04:50 UTC 2013 - Rene.vanPaassen@gmail.com
+
+- don't need libgnomeprintui
+
+-------------------------------------------------------------------
+Tue Jul 23 14:31:31 UTC 2013 - Rene.vanPaassen@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.000000000 +0100
+++ /var/tmp/diff_new_pack.6E60MT/_new 2015-03-03 11:15:50.000000000 +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 vuntz@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 pgajdos@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_pencursor = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
+ update_cursor();
+ return;
+}
+
Index: xournal-0.4.7/src/xo-callbacks.h
===================================================================
--- xournal-0.4.7.orig/src/xo-callbacks.h
+++ xournal-0.4.7/src/xo-callbacks.h
@@ -660,3 +660,7 @@ on_button2Image_activate (
void
on_button3Image_activate (GtkMenuItem *menuitem,
gpointer user_data);
+
+void
+on_optionsLargePenCursor_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
Index: xournal-0.4.7/src/xo-file.c
===================================================================
--- xournal-0.4.7.orig/src/xo-file.c
+++ xournal-0.4.7/src/xo-file.c
@@ -1483,6 +1483,7 @@ void init_config_default(void)
ui.auto_save_prefs = FALSE;
ui.bg_apply_all_pages = FALSE;
ui.use_erasertip = FALSE;
+ ui.large_pencursor = FALSE;
ui.window_default_width = 720;
ui.window_default_height = 480;
ui.maximize_at_start = FALSE;
@@ -1632,6 +1633,9 @@ void save_config_to_file(void)
update_keyval("general", "use_erasertip",
_(" always map eraser tip to eraser (true/false)"),
g_strdup(ui.use_erasertip?"true":"false"));
+ update_keyval("general", "large_pencursor",
+ _(" use a large pen cursor (true/false)"),
+ g_strdup(ui.large_pencursor?"true":"false"));
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"));
@@ -2023,6 +2027,7 @@ void load_config_from_file(void)
parse_keyval_boolean("general", "use_xinput", &ui.allow_xinput);
parse_keyval_boolean("general", "discard_corepointer", &ui.discard_corepointer);
parse_keyval_boolean("general", "use_erasertip", &ui.use_erasertip);
+ parse_keyval_boolean("general", "large_pencursor", &ui.large_pencursor);
parse_keyval_boolean("general", "buttons_switch_mappings", &ui.button_switch_mapping);
parse_keyval_boolean("general", "autoload_pdf_xoj", &ui.autoload_pdf_xoj);
parse_keyval_string("general", "default_path", &ui.default_path);
Index: xournal-0.4.7/src/xo-interface.c
===================================================================
--- xournal-0.4.7.orig/src/xo-interface.c
+++ xournal-0.4.7/src/xo-interface.c
@@ -209,6 +209,7 @@ create_winMain (void)
GtkWidget *optionsUseXInput;
GtkWidget *optionsButtonMappings;
GtkWidget *optionsPressureSensitive;
+ GtkWidget *optionsLargePenCursor;
GtkWidget *button2_mapping;
GtkWidget *button2_mapping_menu;
GSList *button2Pen_group = NULL;
@@ -1209,6 +1210,10 @@ create_winMain (void)
gtk_widget_show (optionsPressureSensitive);
gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsPressureSensitive);
+ optionsLargePenCursor = gtk_check_menu_item_new_with_mnemonic (_("_Large pen cursor"));
+ gtk_widget_show (optionsLargePenCursor);
+ gtk_container_add (GTK_CONTAINER (menuOptions_menu), optionsLargePenCursor);
+
button2_mapping = gtk_menu_item_new_with_mnemonic (_("Button _2 Mapping"));
gtk_widget_show (button2_mapping);
gtk_container_add (GTK_CONTAINER (menuOptions_menu), button2_mapping);
@@ -2309,6 +2314,9 @@ create_winMain (void)
g_signal_connect ((gpointer) optionsPressureSensitive, "activate",
G_CALLBACK (on_optionsPressureSensitive_activate),
NULL);
+ g_signal_connect ((gpointer) optionsLargePenCursor, "activate",
+ G_CALLBACK (on_optionsLargePenCursor_activate),
+ NULL);
g_signal_connect ((gpointer) button2Pen, "activate",
G_CALLBACK (on_button2Pen_activate),
NULL);
@@ -2725,6 +2733,7 @@ create_winMain (void)
GLADE_HOOKUP_OBJECT (winMain, optionsUseXInput, "optionsUseXInput");
GLADE_HOOKUP_OBJECT (winMain, optionsButtonMappings, "optionsButtonMappings");
GLADE_HOOKUP_OBJECT (winMain, optionsPressureSensitive, "optionsPressureSensitive");
+ GLADE_HOOKUP_OBJECT (winMain, optionsLargePenCursor, "optionsLargePenCursor");
GLADE_HOOKUP_OBJECT (winMain, button2_mapping, "button2_mapping");
GLADE_HOOKUP_OBJECT (winMain, button2_mapping_menu, "button2_mapping_menu");
GLADE_HOOKUP_OBJECT (winMain, button2Pen, "button2Pen");
Index: xournal-0.4.7/src/xo-paint.c
===================================================================
--- xournal-0.4.7.orig/src/xo-paint.c
+++ xournal-0.4.7/src/xo-paint.c
@@ -106,6 +106,11 @@ static char cursor_pen_bits[] = {
0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static char cursor_largepen_bits[] = {
+ 0x00, 0x10, 0x00, 0x28, 0x00, 0x44, 0x00, 0x82, 0x00, 0x41, 0x80, 0x20,
+ 0x40, 0x10, 0x20, 0x08, 0x10, 0x04, 0x08, 0x02, 0x04, 0x01, 0x86, 0x00,
+ 0x4e, 0x00, 0x3e, 0x00, 0x1e, 0x00, 0x00, 0x00 };
+
static char cursor_eraser_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x08, 0x08, 0x08, 0x08,
0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0xf8, 0x0f,
@@ -153,8 +158,14 @@ void update_cursor(void)
fg.red = (ui.cur_brush->color_rgba >> 16) & 0xff00;
fg.green = (ui.cur_brush->color_rgba >> 8) & 0xff00;
fg.blue = (ui.cur_brush->color_rgba >> 0) & 0xff00;
- source = gdk_bitmap_create_from_data(NULL, cursor_pen_bits, 16, 16);
- ui.cursor = gdk_cursor_new_from_pixmap(source, source, &fg, &bg, 7, 7);
+ if (ui.large_pencursor) {
+ source = gdk_bitmap_create_from_data(NULL, cursor_largepen_bits, 16, 16);
+ ui.cursor = gdk_cursor_new_from_pixmap(source, source, &fg, &bg, 1, 15);
+ }
+ else {
+ source = gdk_bitmap_create_from_data(NULL, cursor_pen_bits, 16, 16);
+ ui.cursor = gdk_cursor_new_from_pixmap(source, source, &fg, &bg, 7, 7);
+ }
gdk_bitmap_unref(source);
}
else if (ui.toolno[ui.cur_mapping] == TOOL_ERASER) {
Index: xournal-0.4.7/src/xournal.h
===================================================================
--- xournal-0.4.7.orig/src/xournal.h
+++ xournal-0.4.7/src/xournal.h
@@ -257,6 +257,7 @@ typedef struct UIData {
int cur_mapping; // the current button number for mappings
gboolean button_switch_mapping; // button clicks switch button 1 mappings
gboolean use_erasertip;
+ gboolean large_pencursor;
int which_mouse_button; // the mouse button drawing the current path
int which_unswitch_button; // if button_switch_mapping, the mouse button that switched the mapping
struct Page default_page; // the model for the default page
Index: xournal-0.4.7/xournal.glade
===================================================================
--- xournal-0.4.7.orig/xournal.glade
+++ xournal-0.4.7/xournal.glade
@@ -1569,6 +1569,16 @@
</child>
<child>
+ <widget class="GtkCheckMenuItem" id="optionsLargePenCursor">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Large pen cursor</property>
+ <property name="use_underline">True</property>
+ <property name="active">False</property>
+ <signal name="activate" handler="on_optionsLargePenCursor_activate" last_modification_time="Tue, 23 Jul 2013 11:53:26 GMT"/>
+ </widget>
+ </child>
+
+ <child>
<widget class="GtkMenuItem" id="button2_mapping">
<property name="visible">True</property>
<property name="label" translatable="yes">Button _2 Mapping</property>
Index: xournal-0.4.7/src/main.c
===================================================================
--- xournal-0.4.7.orig/src/main.c
+++ xournal-0.4.7/src/main.c
@@ -234,6 +234,8 @@ void init_stuff (int argc, char *argv[])
GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsAutoSavePrefs")), ui.auto_save_prefs);
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsButtonSwitchMapping")), ui.button_switch_mapping);
+ gtk_check_menu_item_set_active
+ (GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsLargePenCursor")), ui.large_pencursor);
hide_unimplemented();
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
