diff options
Diffstat (limited to 'app-text/xournal')
-rw-r--r-- | app-text/xournal/Manifest | 8 | ||||
-rw-r--r-- | app-text/xournal/files/xournal-0.4.8-aspectratio.patch | 74 | ||||
-rw-r--r-- | app-text/xournal/metadata.xml | 17 | ||||
-rw-r--r-- | app-text/xournal/xournal-0.4.8-r1.ebuild | 63 | ||||
-rw-r--r-- | app-text/xournal/xournal-0.4.8.ebuild | 56 | ||||
-rw-r--r-- | app-text/xournal/xournal-9999.ebuild | 56 |
6 files changed, 274 insertions, 0 deletions
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest new file mode 100644 index 000000000000..6491a98edd3e --- /dev/null +++ b/app-text/xournal/Manifest @@ -0,0 +1,8 @@ +AUX xournal-0.4.8-aspectratio.patch 3494 SHA256 3b870f38ef1c35ee2b3649bbfc6926fe44d68788f2861624a2d18529bc7c9baa SHA512 26f017ab04e857710ec380ffc70f75520f66dd1097b6cd15fcb599c44f4bcb0ec905859b4ad3e613fff1731e2fe83938f221081b314cc0e69bf3d07b4e54ad70 WHIRLPOOL 685e0dc937d75b5971777ff117f0d2cc2d12c7f22311e8940c8c2f340fc51111193916b2e8b99ee04f1f337c99de74c9ef3eefe97b2f75778b7346d2b9c51bd8 +DIST xournal-0.4.8.tar.gz 641240 SHA256 233887a38136452dcb4652c35d08366fc7355f57ed46753db83e3e0f3193ef30 SHA512 cfd5760a0e832ef02786a29cb744d4932aeee97c4d6992b430e647bd59aaef1042735203824d0eaf9da9b884dcdadcfb8f5acea221638db91438ae46a6ee42bf WHIRLPOOL 23c0c31e2e902e42602f62f5060078e878b42e558c90208bd3326054cb733115449b9f36571175d24af3f98164f674049455045968c7f2890370428d447949c2 +EBUILD xournal-0.4.8-r1.ebuild 1228 SHA256 412d164762f8bc3a0513d58f0abddeb12ac63177ed6c1aa953591802bc427e38 SHA512 a7956cc9a2e307b74f486f5f88bde00d19695d312ca9406659c1f741f124bd322b461ab1f894f11047db891159bb7449c6b6a9cd4250d551abb6e54821902ce5 WHIRLPOOL 90bfa5ccc2aa0b3d02e079f63563a43676e6bc56ef543d6935271a5a5f755d88a30310f9db1960b8ee2d67eb4459494b940745c413f4401a6d18b615da93f6f0 +EBUILD xournal-0.4.8.ebuild 1095 SHA256 dcdef388309ef9c5ad735f1b3cae3b8f864a8596c989fb19176d3732df1c414c SHA512 860585238a9257533af0104efac8664ad79c4bd2d716e502d3e18774968c62f0af8db43d658c706b0747e04fd03e7257df968685593513a0279d402568e76c8d WHIRLPOOL 12871e89676b8526f70ae2dde8dd43a3f696497b0a7744be0fbc0258c96826f10fb68e0a9e66d8b20c7f99ea724cdc6041f71cbd41ec4459a548e00406f651fd +EBUILD xournal-9999.ebuild 1097 SHA256 5a83db1c4958f358d53cc0fb8c3c46af9bcb104ffe4afc08499d8f2ac95f3ba2 SHA512 51a02984a5e53a4a4ff79160a7872747b4c85fccf070395438fa47d21e8e515f77db4e64a4ca0588cdda042485ef50af5d426e17fe8891be48422a398347e8ce WHIRLPOOL db97e33e24e6315c089958dac06dd09ec1373b5e8e3c365bb6da4537b26e47e1e59aea8078875b27d756070a5f64a539eb9e3c2e3937874f51535df7682d39f3 +MISC ChangeLog 2883 SHA256 22743e8b652526136773bf8bc5f1b8875d5555ee49e6b740fccf5d4f750f7c05 SHA512 4bf055caf89ce0cf74522ac9769d1def61889dd3f7ce9533aa4ddc1a0f832159d93ed30115d475c3c8c423fc3a52a2ebc0200aac25e5fc9540b34fea217ffdb5 WHIRLPOOL 01f67018163a32be13c1a943e698eafc4b5089a99495530e8d0d847b0068fff57619b7cb6dc47116c022710b1d3273fa8f8b0687ecdb47182ef5809cb9654f3a +MISC ChangeLog-2015 9099 SHA256 5e493bee0246faaa74dc4f545a6415d8ec1f3b29eedc851eef806c03c1e5ee0d SHA512 caece26cb100a7de34f234870358aea88ee3534e727881777bdbaf7b555110796439f67757437c5a561aad67c91553e13f6d428dd6e131b6564bed70736c6f73 WHIRLPOOL c666a82c6aa540935bbc22993cf488d0234739c61f00804664db2b7f98a0c12ecc0b4be6fcfc59e2e540f81042b1dd1badb4c8fdce48242ac3ddced01af68561 +MISC metadata.xml 652 SHA256 297f399438437deeaca95de3aec07f63ebadb33a97f4214c9cc3824d486a2786 SHA512 1105a21a4f228529e6a9bfa038e2f72cdc59bcb663b6206ec57daa3d779d0bfcff3cf1228418dc5031ba37da149dcacb897fa9562db39a4990382521d73a0648 WHIRLPOOL 0b33ab8bbac5966df6343e11f716f5d4e0c03d718e4fc32e48b22a34d0964de3912b7725c2f2a788f4ad25bec339421574f58aa4644f476c8e075ae03b426831 diff --git a/app-text/xournal/files/xournal-0.4.8-aspectratio.patch b/app-text/xournal/files/xournal-0.4.8-aspectratio.patch new file mode 100644 index 000000000000..d054492a44eb --- /dev/null +++ b/app-text/xournal/files/xournal-0.4.8-aspectratio.patch @@ -0,0 +1,74 @@ +Forward-port upstream patch submission +https://sourceforge.net/p/xournal/patches/58/ +https://sourceforge.net/p/xournal/patches/_discuss/thread/f1d7a1d7/4c10/attachment/xournal-0.4.5-dawb-aspectratio.patch + +It applies cleanly, just to xo-selection.c instead of xo-paint.c. + +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> + +diff -Narpu --exclude '*.orig' --exclude '*.rej' --exclude '*~' xournal-0.4.8.orig/src/xo-selection.c xournal-0.4.8/src/xo-selection.c +--- xournal-0.4.8.orig/src/xo-selection.c 2014-06-06 16:41:45.000000000 -0700 ++++ xournal-0.4.8/src/xo-selection.c 2017-02-09 15:31:08.960817336 -0800 +@@ -347,6 +347,12 @@ gboolean start_resizesel(GdkEvent *event + ui.selection->new_x2 = ui.selection->bbox.right; + gnome_canvas_item_set(ui.selection->canvas_item, "dash", NULL, NULL); + update_cursor_for_resize(pt); ++ ++ // Check whether we should preserve the aspect ratio ++ if (event->button.button == 3) ++ ui.cur_brush->tool_options |= TOOLOPT_SELECT_PRESERVE; ++ else ++ ui.cur_brush->tool_options &= ~TOOLOPT_SELECT_PRESERVE; + return TRUE; + } + return FALSE; +@@ -498,6 +504,38 @@ void continue_resizesel(GdkEvent *event) + if (ui.selection->resizing_left) ui.selection->new_x1 = pt[0]; + if (ui.selection->resizing_right) ui.selection->new_x2 = pt[0]; + ++ if (ui.cur_brush->tool_options & TOOLOPT_SELECT_PRESERVE) { ++ double aspectratio = (ui.selection->bbox.top - ui.selection->bbox.bottom)/(ui.selection->bbox.right - ui.selection->bbox.left); ++ double newheight = ui.selection->new_y1 - ui.selection->new_y2; ++ double newwidth = ui.selection->new_x2 - ui.selection->new_x1; ++ gboolean boundheight; ++ ++ // Resizing from top or bottom only ++ if ((ui.selection->resizing_top || ui.selection->resizing_bottom) && !(ui.selection->resizing_left || ui.selection->resizing_right)) ++ boundheight = 0; ++ // Resizing from right or left only ++ else if (!(ui.selection->resizing_top || ui.selection->resizing_bottom) && (ui.selection->resizing_left || ui.selection->resizing_right)) ++ boundheight = 1; ++ // Resizing from a corner ++ else if (newheight/aspectratio > newwidth) ++ boundheight = 0; ++ else ++ boundheight = 1; ++ ++ if (boundheight) { ++ // Bound the height ++ newheight = newwidth*aspectratio; ++ if (ui.selection->resizing_top) ui.selection->new_y1 = ui.selection->new_y2 + newheight; ++ else ui.selection->new_y2 = ui.selection->new_y1 - newheight; ++ } ++ else { ++ // Bound the width ++ newwidth = newheight/aspectratio; ++ if (ui.selection->resizing_left) ui.selection->new_x1 = ui.selection->new_x2 - newwidth; ++ else ui.selection->new_x2 = ui.selection->new_x1 + newwidth; ++ } ++ } ++ + gnome_canvas_item_set(ui.selection->canvas_item, + "x1", ui.selection->new_x1, "x2", ui.selection->new_x2, + "y1", ui.selection->new_y1, "y2", ui.selection->new_y2, NULL); +diff -Narpu --exclude '*.orig' --exclude '*.rej' --exclude '*~' xournal-0.4.8.orig/src/xournal.h xournal-0.4.8/src/xournal.h +--- xournal-0.4.8.orig/src/xournal.h 2014-06-28 12:47:20.000000000 -0700 ++++ xournal-0.4.8/src/xournal.h 2017-02-09 15:29:08.866517375 -0800 +@@ -154,6 +154,7 @@ extern guint predef_bgcolors_rgba[COLOR_ + #define TOOLOPT_ERASER_STANDARD 0 + #define TOOLOPT_ERASER_WHITEOUT 1 + #define TOOLOPT_ERASER_STROKES 2 ++#define TOOLOPT_SELECT_PRESERVE 1 // Preserve the aspect ratio of the selection when resizing + + extern double predef_thickness[NUM_STROKE_TOOLS][THICKNESS_MAX]; + diff --git a/app-text/xournal/metadata.xml b/app-text/xournal/metadata.xml new file mode 100644 index 000000000000..125eb5b19afe --- /dev/null +++ b/app-text/xournal/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>dilfridge@gentoo.org</email> + </maintainer> + <longdescription lang="en"> + Xournal is an application for notetaking, sketching, keeping + a journal using a stylus. It is free software (GNU GPL) + and runs on Linux (recent distributions) and other GTK+/Gnome + platforms. It is similar to Microsoft Windows Journal or to + other alternatives such as Jarnal, Gournal, and NoteLab. + </longdescription> + <upstream> + <remote-id type="sourceforge">xournal</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-text/xournal/xournal-0.4.8-r1.ebuild b/app-text/xournal/xournal-0.4.8-r1.ebuild new file mode 100644 index 000000000000..2d7a90544031 --- /dev/null +++ b/app-text/xournal/xournal-0.4.8-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +GCONF_DEBUG=no + +inherit gnome2 + +DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus" +HOMEPAGE="http://xournal.sourceforge.net/" + +LICENSE="GPL-2" + +SLOT="0" +IUSE="+pdf vanilla" + +if [[ "${PV}" != "9999" ]]; then + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +else + inherit git-2 autotools + SRC_URI="" + KEYWORDS="" + EGIT_REPO_URI="git://git.code.sf.net/p/xournal/code" + EGIT_PROJECT="${PN}" + EGIT_BOOTSTRAP="autogen.sh" +fi + +COMMONDEPEND=" + app-text/poppler:=[cairo] + dev-libs/atk + dev-libs/glib + gnome-base/libgnomecanvas + media-libs/freetype + media-libs/fontconfig + sys-libs/zlib + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/pango +" +RDEPEND="${COMMONDEPEND} + pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl ) +" +DEPEND="${COMMONDEPEND} + virtual/pkgconfig +" + +src_prepare() { + default_src_prepare + if ! use vanilla; then + epatch "${FILESDIR}"/xournal-0.4.8-aspectratio.patch + fi +} + +src_install() { + emake DESTDIR="${D}" install + emake DESTDIR="${D}" desktop-install + + dodoc ChangeLog AUTHORS README + dohtml -r html-doc/* +} diff --git a/app-text/xournal/xournal-0.4.8.ebuild b/app-text/xournal/xournal-0.4.8.ebuild new file mode 100644 index 000000000000..9405f5279cc5 --- /dev/null +++ b/app-text/xournal/xournal-0.4.8.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +GCONF_DEBUG=no + +inherit gnome2 + +DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus" +HOMEPAGE="http://xournal.sourceforge.net/" + +LICENSE="GPL-2" + +SLOT="0" +IUSE="+pdf" + +if [[ "${PV}" != "9999" ]]; then + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + KEYWORDS="amd64 x86" +else + inherit git-2 autotools + SRC_URI="" + KEYWORDS="" + EGIT_REPO_URI="git://git.code.sf.net/p/xournal/code" + EGIT_PROJECT="${PN}" + EGIT_BOOTSTRAP="autogen.sh" +fi + +COMMONDEPEND=" + app-text/poppler:=[cairo] + dev-libs/atk + dev-libs/glib + gnome-base/libgnomecanvas + media-libs/freetype + media-libs/fontconfig + sys-libs/zlib + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/pango +" +RDEPEND="${COMMONDEPEND} + pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl ) +" +DEPEND="${COMMONDEPEND} + virtual/pkgconfig +" + +src_install() { + emake DESTDIR="${D}" install + emake DESTDIR="${D}" desktop-install + + dodoc ChangeLog AUTHORS README + dohtml -r html-doc/* +} diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild new file mode 100644 index 000000000000..9472f5a2e3ad --- /dev/null +++ b/app-text/xournal/xournal-9999.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +GCONF_DEBUG=no + +inherit gnome2 + +DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus" +HOMEPAGE="http://xournal.sourceforge.net/" + +LICENSE="GPL-2" + +SLOT="0" +IUSE="+pdf" + +if [[ "${PV}" != "9999" ]]; then + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +else + inherit git-2 autotools + SRC_URI="" + KEYWORDS="" + EGIT_REPO_URI="git://git.code.sf.net/p/xournal/code" + EGIT_PROJECT="${PN}" + EGIT_BOOTSTRAP="autogen.sh" +fi + +COMMONDEPEND=" + app-text/poppler:=[cairo] + dev-libs/atk + dev-libs/glib + gnome-base/libgnomecanvas + media-libs/freetype + media-libs/fontconfig + sys-libs/zlib + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/pango +" +RDEPEND="${COMMONDEPEND} + pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl ) +" +DEPEND="${COMMONDEPEND} + virtual/pkgconfig +" + +src_install() { + emake DESTDIR="${D}" install + emake DESTDIR="${D}" desktop-install + + dodoc ChangeLog AUTHORS README + dohtml -r html-doc/* +} |