Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xournal: Support gtk with quartz or x11 backend #21842

Merged
merged 1 commit into from Jan 13, 2017

Conversation

johbo
Copy link
Contributor

@johbo johbo commented Jan 12, 2017

Motivation for this change

Allows to use gtk2 with either quartz or x11 backend to build xournal on darwin.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@johbo, thanks for your PR! By analyzing the history of the files in this pull request, we identified @abbradar, @lverns and @dguibert to be potential reviewers.

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Jan 12, 2017
@johbo
Copy link
Contributor Author

johbo commented Jan 13, 2017

Note that the binaries suffer from #12346

interim this does workaround it:

DYLD_FRAMEWORK_PATH=/System/Library/Frameworks ./result/bin/xournal

@7c6f434c 7c6f434c merged commit ee96600 into NixOS:master Jan 13, 2017
aszlig added a commit that referenced this pull request Sep 4, 2017
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
globin pushed a commit that referenced this pull request Sep 4, 2017
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
(cherry picked from commit 8436e9b)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants