From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- app-text/xournal/Manifest | 8 --- .../xournal/files/xournal-0.4.8-aspectratio.patch | 74 ---------------------- app-text/xournal/metadata.xml | 17 ----- app-text/xournal/xournal-0.4.8-r1.ebuild | 61 ------------------ app-text/xournal/xournal-0.4.8.2016.ebuild | 59 ----------------- app-text/xournal/xournal-0.4.8.ebuild | 54 ---------------- app-text/xournal/xournal-9999.ebuild | 59 ----------------- 7 files changed, 332 deletions(-) delete mode 100644 app-text/xournal/Manifest delete mode 100644 app-text/xournal/files/xournal-0.4.8-aspectratio.patch delete mode 100644 app-text/xournal/metadata.xml delete mode 100644 app-text/xournal/xournal-0.4.8-r1.ebuild delete mode 100644 app-text/xournal/xournal-0.4.8.2016.ebuild delete mode 100644 app-text/xournal/xournal-0.4.8.ebuild delete mode 100644 app-text/xournal/xournal-9999.ebuild (limited to 'app-text/xournal') diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest deleted file mode 100644 index 12947b98e102..000000000000 --- a/app-text/xournal/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX xournal-0.4.8-aspectratio.patch 3494 BLAKE2B 966fabedcb5d1ea3cce635713e45beb1fbae3a5fcee54701fcb3f581107ae80f67af4492998d7dfad7fccccba225bf0758ffc327aa6dd7ea8197d21de26735ee SHA512 26f017ab04e857710ec380ffc70f75520f66dd1097b6cd15fcb599c44f4bcb0ec905859b4ad3e613fff1731e2fe83938f221081b314cc0e69bf3d07b4e54ad70 -DIST xournal-0.4.8.2016.tar.gz 646082 BLAKE2B 4f64fb45759616d99f961b8db575bec1620e089d9f87d4e02d3de7b1cb1d9189d439d78e5b89c93d5635138206f603e40bb33a46458d34a9ec050869e54be531 SHA512 1426d5c9ba3486fbe342d49fc19fcc162965cd6a7b7754f79665e43fe0e60e6f42f61969405ace78fdaa7b99cbb3d4b07b7fb5df246d68a329b52084b6eec76e -DIST xournal-0.4.8.tar.gz 641240 BLAKE2B cbf82f3ddb27854ce4a17fe80d1ed012f47529ee3f41eac0118f4948f4ca76488fb647c77ab21c99cf19de0016df4db31a448d4c626a42219b2b13b297b5d51e SHA512 cfd5760a0e832ef02786a29cb744d4932aeee97c4d6992b430e647bd59aaef1042735203824d0eaf9da9b884dcdadcfb8f5acea221638db91438ae46a6ee42bf -EBUILD xournal-0.4.8-r1.ebuild 1202 BLAKE2B 7bd649419efc8c130d88e90303f7b1946a907c8737b1dde4cc5aaf3798e3fc54e7459dbb70abf4fc0539245b710f5b5e8f8a9f125452cd2e0a6d4109532c8c39 SHA512 f872b8b3c4b00a265ab0fc74f33f895c1fbfd676d39df4ebe2a1c2d5282b3265d13f741067ce6f417cc03f437db7e10768693bd9de758ec9b5ffc6d920d300e0 -EBUILD xournal-0.4.8.2016.ebuild 1185 BLAKE2B fb8edbf9bdf19cc7f450592c4addb81afa4369c865bb9a276f4c730079b789d12abe0036b3f5cc1d4b578b3cece037e4288d8c44aeff9b3b7436c5ef29d683cc SHA512 247f3963f18a8f4f96ee69e2497428eb424a11c800cadf7302405b9c192f8d32ee4f7ae5657bdc5d14c1c99c66d94361364beb70d3d5f6de23c2ef1f3a6012bb -EBUILD xournal-0.4.8.ebuild 1069 BLAKE2B 26606ab4d9128be573c91e33025270ed832f71c9b8d6b27cb1fe80defa11936d3ea8d2643376e691aa365d5140e287cad109be3019de6bcf8f02baadbc45a168 SHA512 7f74070413631ace102df1bb34cc06023d17eb35a6da2e5fce6c09914e6afff101e49eff7cfdfcfb9afc7699b4345e07c7d3ad7c575685269d7050e136769eb6 -EBUILD xournal-9999.ebuild 1185 BLAKE2B fb8edbf9bdf19cc7f450592c4addb81afa4369c865bb9a276f4c730079b789d12abe0036b3f5cc1d4b578b3cece037e4288d8c44aeff9b3b7436c5ef29d683cc SHA512 247f3963f18a8f4f96ee69e2497428eb424a11c800cadf7302405b9c192f8d32ee4f7ae5657bdc5d14c1c99c66d94361364beb70d3d5f6de23c2ef1f3a6012bb -MISC metadata.xml 652 BLAKE2B 780548e075d6468df82b41e454b8d77c97eb7c9e4b4e4e286b7cd98a4f6c2d5489b355eb088602f414eeecd32b19b42d7c24aec6b1436aed3c818f60605d54f7 SHA512 1105a21a4f228529e6a9bfa038e2f72cdc59bcb663b6206ec57daa3d779d0bfcff3cf1228418dc5031ba37da149dcacb897fa9562db39a4990382521d73a0648 diff --git a/app-text/xournal/files/xournal-0.4.8-aspectratio.patch b/app-text/xournal/files/xournal-0.4.8-aspectratio.patch deleted file mode 100644 index d054492a44eb..000000000000 --- a/app-text/xournal/files/xournal-0.4.8-aspectratio.patch +++ /dev/null @@ -1,74 +0,0 @@ -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 - -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 deleted file mode 100644 index 125eb5b19afe..000000000000 --- a/app-text/xournal/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - dilfridge@gentoo.org - - - 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. - - - xournal - - diff --git a/app-text/xournal/xournal-0.4.8-r1.ebuild b/app-text/xournal/xournal-0.4.8-r1.ebuild deleted file mode 100644 index 69d6ceebd250..000000000000 --- a/app-text/xournal/xournal-0.4.8-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -GCONF_DEBUG=no - -[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes - -inherit gnome2 - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code" - unset SRC_URI -else - KEYWORDS="~amd64 ~x86" - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -fi - -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" - -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.2016.ebuild b/app-text/xournal/xournal-0.4.8.2016.ebuild deleted file mode 100644 index 50477f8a4537..000000000000 --- a/app-text/xournal/xournal-0.4.8.2016.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes - -inherit gnome2 - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code" - unset SRC_URI -else - KEYWORDS="~amd64 ~x86" - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -fi - -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" - -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 - eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch - fi -} - -src_install() { - emake DESTDIR="${D}" install - emake DESTDIR="${D}" desktop-install - - dodoc ChangeLog AUTHORS README - dodoc -r html-doc/* -} diff --git a/app-text/xournal/xournal-0.4.8.ebuild b/app-text/xournal/xournal-0.4.8.ebuild deleted file mode 100644 index 1e879f6a6f85..000000000000 --- a/app-text/xournal/xournal-0.4.8.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -GCONF_DEBUG=no - -[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes - -inherit gnome2 - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code" - unset SRC_URI -else - KEYWORDS="amd64 x86" - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -fi - -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" - -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 deleted file mode 100644 index 50477f8a4537..000000000000 --- a/app-text/xournal/xournal-9999.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes - -inherit gnome2 - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code" - unset SRC_URI -else - KEYWORDS="~amd64 ~x86" - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -fi - -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" - -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 - eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch - fi -} - -src_install() { - emake DESTDIR="${D}" install - emake DESTDIR="${D}" desktop-install - - dodoc ChangeLog AUTHORS README - dodoc -r html-doc/* -} -- cgit v1.2.3