xournal: 0.4.8 -> 0.4.8.2016
Upstream bug fixes:
* pen and touchscreen input handling bugfixes
* fix a minor bug with save file paths in Windows (D. German)
* 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
* 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 (A.
Kittenberger)
* fix crash when pasting text or images via xclip
* updated Italian translation (Marco Ciampa)
New upstream features:
* add space and shift-space bindings to page down/up (D. German)
* add A5 paper (D. German)
* config option to export successive layers to separate PDF pages
* config option to create new file when trying to open non-existent
.xoj
The full change log along with bug numbers can be found at:
https://sourceforge.net/p/xournal/code/ci/Release-0_4_8_2016/tree/ChangeLog
I've dropped gdk-quartz-backend.patch, because I believe it has been
fixed upstream.
Here are the upstream changes relevant for the patch (shortened, because
SourceForge has really long URLs):
http://bit.ly/2vXW8n0 -> src/Makefile.am
http://bit.ly/2gDnjl7 -> src/xo-file.c
http://bit.ly/2xJ5K7A -> src/xo-misc.c
Tested building and using the application.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @7c6f434c, @dguibert
Cc: @johbo who has introduced the patch in #21842
This commit is contained in:
aszlig
parent
8f154c139a
commit
8436e9bfcd
|
|
@ -9,11 +9,11 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.4.8";
|
||||
version = "0.4.8.2016";
|
||||
name = "xournal-" + version;
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/xournal/${name}.tar.gz";
|
||||
sha256 = "0c7gjcqhygiyp0ypaipdaxgkbivg6q45vhsj8v5jsi9nh6iqff13";
|
||||
sha256 = "09i88v3wacmx7f96dmq0l3afpyv95lh6jrx16xzm0jd1szdrhn5j";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -26,10 +26,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
|
||||
|
||||
patches = stdenv.lib.optionals isGdkQuartzBackend [
|
||||
./gdk-quartz-backend.patch
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = [ "-lz" ]
|
||||
++ stdenv.lib.optionals (!isGdkQuartzBackend) [ "-lX11" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,90 +0,0 @@
|
|||
diff -rup xournal-0.4.8-orig/src/Makefile.am xournal-0.4.8/src/Makefile.am
|
||||
--- xournal-0.4.8-orig/src/Makefile.am 2012-07-04 23:12:47.000000000 +0200
|
||||
+++ xournal-0.4.8/src/Makefile.am 2016-12-25 03:04:00.000000000 +0100
|
||||
@@ -31,6 +31,5 @@ if WIN32
|
||||
xournal_LDFLAGS = -mwindows
|
||||
xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz
|
||||
else
|
||||
- xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz -lm
|
||||
+ xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz -lm
|
||||
endif
|
||||
-
|
||||
diff -rup xournal-0.4.8-orig/src/xo-file.c xournal-0.4.8/src/xo-file.c
|
||||
--- xournal-0.4.8-orig/src/xo-file.c 2014-06-28 21:52:25.000000000 +0200
|
||||
+++ xournal-0.4.8/src/xo-file.c 2016-12-25 03:07:19.000000000 +0100
|
||||
@@ -31,11 +31,6 @@
|
||||
#include <glib/gstdio.h>
|
||||
#include <poppler/glib/poppler.h>
|
||||
|
||||
-#ifndef WIN32
|
||||
- #include <gdk/gdkx.h>
|
||||
- #include <X11/Xlib.h>
|
||||
-#endif
|
||||
-
|
||||
#include "xournal.h"
|
||||
#include "xo-interface.h"
|
||||
#include "xo-support.h"
|
||||
@@ -1275,50 +1270,8 @@ GList *attempt_load_gv_bg(char *filename
|
||||
|
||||
struct Background *attempt_screenshot_bg(void)
|
||||
{
|
||||
-#ifndef WIN32
|
||||
- struct Background *bg;
|
||||
- GdkPixbuf *pix;
|
||||
- XEvent x_event;
|
||||
- GdkWindow *window;
|
||||
- GdkColormap *cmap;
|
||||
- int x,y,w,h;
|
||||
- Window x_root, x_win;
|
||||
-
|
||||
- x_root = gdk_x11_get_default_root_xwindow();
|
||||
-
|
||||
- if (!XGrabButton(GDK_DISPLAY(), AnyButton, AnyModifier, x_root,
|
||||
- False, ButtonReleaseMask, GrabModeAsync, GrabModeSync, None, None))
|
||||
- return NULL;
|
||||
-
|
||||
- XWindowEvent (GDK_DISPLAY(), x_root, ButtonReleaseMask, &x_event);
|
||||
- XUngrabButton(GDK_DISPLAY(), AnyButton, AnyModifier, x_root);
|
||||
-
|
||||
- x_win = x_event.xbutton.subwindow;
|
||||
- if (x_win == None) x_win = x_root;
|
||||
-
|
||||
- window = gdk_window_foreign_new_for_display(gdk_display_get_default(), x_win);
|
||||
-
|
||||
- gdk_window_get_geometry(window, &x, &y, &w, &h, NULL);
|
||||
- cmap = gdk_drawable_get_colormap(window);
|
||||
- if (cmap == NULL) cmap = gdk_colormap_get_system();
|
||||
-
|
||||
- pix = gdk_pixbuf_get_from_drawable(NULL, window,
|
||||
- cmap, 0, 0, 0, 0, w, h);
|
||||
-
|
||||
- if (pix == NULL) return NULL;
|
||||
-
|
||||
- bg = g_new(struct Background, 1);
|
||||
- bg->type = BG_PIXMAP;
|
||||
- bg->canvas_item = NULL;
|
||||
- bg->pixbuf = pix;
|
||||
- bg->pixbuf_scale = DEFAULT_ZOOM;
|
||||
- bg->filename = new_refstring(NULL);
|
||||
- bg->file_domain = DOMAIN_ATTACH;
|
||||
- return bg;
|
||||
-#else
|
||||
// not implemented under WIN32
|
||||
return FALSE;
|
||||
-#endif
|
||||
}
|
||||
|
||||
/************** pdf annotation ***************/
|
||||
diff -rup xournal-0.4.8-orig/src/xo-misc.c xournal-0.4.8/src/xo-misc.c
|
||||
--- xournal-0.4.8-orig/src/xo-misc.c 2014-06-28 15:17:44.000000000 +0200
|
||||
+++ xournal-0.4.8/src/xo-misc.c 2016-12-25 03:05:50.000000000 +0100
|
||||
@@ -2288,9 +2288,7 @@ void hide_unimplemented(void)
|
||||
}
|
||||
|
||||
/* screenshot feature doesn't work yet in Win32 */
|
||||
-#ifdef WIN32
|
||||
gtk_widget_hide(GET_COMPONENT("journalScreenshot"));
|
||||
-#endif
|
||||
}
|
||||
|
||||
// toggle fullscreen mode
|
||||
Loading…
Reference in a new issue