commit: 3112e11b4e7c909e27cc59e17f3e2a24d44a0920 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Mon Mar 31 08:11:33 2025 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Mon Mar 31 08:11:36 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3112e11b
app-text/xournal: treeclean Closes: https://bugs.gentoo.org/948200 (pkgremoved) Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> app-text/xournal/Manifest | 1 - .../xournal/files/xournal-0.4.8-aspectratio.patch | 74 ------------------ app-text/xournal/files/xournal-0.4.8-c99-fix.patch | 89 ---------------------- app-text/xournal/metadata.xml | 17 ----- app-text/xournal/xournal-0.4.8.2016-r1.ebuild | 62 --------------- app-text/xournal/xournal-9999.ebuild | 58 -------------- profiles/package.mask | 5 -- 7 files changed, 306 deletions(-) diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest deleted file mode 100644 index 344abfe8cf11..000000000000 --- a/app-text/xournal/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xournal-0.4.8.2016.tar.gz 646082 BLAKE2B 4f64fb45759616d99f961b8db575bec1620e089d9f87d4e02d3de7b1cb1d9189d439d78e5b89c93d5635138206f603e40bb33a46458d34a9ec050869e54be531 SHA512 1426d5c9ba3486fbe342d49fc19fcc162965cd6a7b7754f79665e43fe0e60e6f42f61969405ace78fdaa7b99cbb3d4b07b7fb5df246d68a329b52084b6eec76e 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 <[email protected]> - -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/files/xournal-0.4.8-c99-fix.patch b/app-text/xournal/files/xournal-0.4.8-c99-fix.patch deleted file mode 100644 index ee3689cddd70..000000000000 --- a/app-text/xournal/files/xournal-0.4.8-c99-fix.patch +++ /dev/null @@ -1,89 +0,0 @@ -Bug: https://bugs.gentoo.org/875158 - -Patch: https://src.fedoraproject.org/rpms/xournal/raw/dacd5bf30ec95debca62946868d9450f68ea54de/f/xournal-c99-1.patch -Patch: https://src.fedoraproject.org/rpms/xournal/raw/dacd5bf30ec95debca62946868d9450f68ea54de/f/xournal-c99-2.patch -Author: Denis Auroux <[email protected]> -Date: Sun Jan 24 15:48:16 2021 -0500 - - Fix implicit function declarations by including config.h in ttsubset/*.c - ---- a/src/ttsubset/list.c -+++ b/src/ttsubset/list.c -@@ -33,7 +33,7 @@ - * - */ - --/* $Id$ */ -+/* $Id: list.c,v 1.4 2004/09/10 18:59:06 jody Exp $ */ - /* @(#)list.c 1.7 03/02/06 SMI */ - - /* -@@ -44,6 +44,10 @@ - * - */ - -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <stdlib.h> - #include <assert.h> - #ifdef MALLOC_TRACE ---- a/src/ttsubset/sft.c -+++ b/src/ttsubset/sft.c -@@ -33,7 +33,7 @@ - * - */ - --/* $Id$ */ -+/* $Id: sft.c,v 1.9 2005/01/04 20:10:46 jody Exp $ */ - /* @(#)sft.c 1.17 03/01/08 SMI */ - - /* -@@ -43,6 +43,10 @@ - * @version 1.0 - */ - -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <assert.h> - #include <stdlib.h> - #include <string.h> ---- a/src/ttsubset/ttcr.c -+++ b/src/ttsubset/ttcr.c -@@ -33,7 +33,7 @@ - * - */ - --/* $Id$ */ -+/* $Id: ttcr.c,v 1.7 2005/01/04 20:10:46 jody Exp $ */ - /* @(#)ttcr.c 1.7 03/01/08 SMI */ - - /* -@@ -44,6 +44,10 @@ - * - */ - -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ - #include <sys/types.h> - #ifdef HAVE_UNISTD_H - #include <unistd.h> - -Add missing include directives for make_dashed, set_cursor_busy. - ---- a/src/xo-image.c -+++ b/src/xo-image.c -@@ -25,6 +25,8 @@ - #include "xo-support.h" - #include "xo-image.h" - #include "xo-misc.h" -+#include "xo-selection.h" -+#include "xo-paint.h" - - // create pixbuf from buffer, or return NULL on failure - GdkPixbuf *pixbuf_from_buffer(const gchar *buf, gsize buflen) diff --git a/app-text/xournal/metadata.xml b/app-text/xournal/metadata.xml deleted file mode 100644 index d7d5af0839e1..000000000000 --- a/app-text/xournal/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</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.2016-r1.ebuild b/app-text/xournal/xournal-0.4.8.2016-r1.ebuild deleted file mode 100644 index e2a69eb6c2f4..000000000000 --- a/app-text/xournal/xournal-0.4.8.2016-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -[[ ${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 ~ppc64 ~x86" - SRC_URI="https://downloads.sourceforge.net/${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" - -DEPEND=" - 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=" - ${DEPEND} - pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}"-0.4.8-c99-fix.patch -) - -src_prepare() { - default - - if ! use vanilla; then - eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch - fi -} - -src_install() { - emake DESTDIR="${D}" install desktop-install - - dodoc ChangeLog AUTHORS README - dodoc -r html-doc/* -} diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild deleted file mode 100644 index 8440bd9546ae..000000000000 --- a/app-text/xournal/xournal-9999.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -[[ ${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 ~ppc64 ~x86" - SRC_URI="https://downloads.sourceforge.net/${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" - -DEPEND=" - 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=" - ${DEPEND} - pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl ) -" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - - if ! use vanilla; then - eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch - fi -} - -src_install() { - emake DESTDIR="${D}" install desktop-install - - dodoc ChangeLog AUTHORS README - dodoc -r html-doc/* -} diff --git a/profiles/package.mask b/profiles/package.mask index 593ba0dc353c..a66d15958d3b 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -311,11 +311,6 @@ dev-python/zstd dev-python/shiboken6 dev-python/pyside6-tools -# Andreas K. Hüttel <[email protected]> (2025-02-16) -# Discontinued, please use xournal++ instead. -# Removal on 2025-03-16. Bug 948200. -app-text/xournal - # Maciej Barć <[email protected]> (2025-02-12) # Masked for testing. Fails to update from previous version. See bug #949626. >=x11-themes/fluent-icon-theme-2025.02.10
