summaryrefslogtreecommitdiff
path: root/app-text/xournal
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2025-04-01 01:33:27 +0100
committerV3n3RiX <venerix@koprulu.sector>2025-04-01 01:33:27 +0100
commit9cb5d77a6732fadf391fd38da00e6921f3e23112 (patch)
tree30f5c59801151fa131da4743ca598f950b2e5b4b /app-text/xournal
parent033286afc1eb2e64a87a58798a0c620d8b56f497 (diff)
gentoo auto-resync : 01:04:2025 - 01:33:27
Diffstat (limited to 'app-text/xournal')
-rw-r--r--app-text/xournal/Manifest6
-rw-r--r--app-text/xournal/files/xournal-0.4.8-aspectratio.patch74
-rw-r--r--app-text/xournal/files/xournal-0.4.8-c99-fix.patch89
-rw-r--r--app-text/xournal/metadata.xml17
-rw-r--r--app-text/xournal/xournal-0.4.8.2016-r1.ebuild62
-rw-r--r--app-text/xournal/xournal-9999.ebuild58
6 files changed, 0 insertions, 306 deletions
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
deleted file mode 100644
index 405e50e3780a..000000000000
--- a/app-text/xournal/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX xournal-0.4.8-aspectratio.patch 3494 BLAKE2B 966fabedcb5d1ea3cce635713e45beb1fbae3a5fcee54701fcb3f581107ae80f67af4492998d7dfad7fccccba225bf0758ffc327aa6dd7ea8197d21de26735ee SHA512 26f017ab04e857710ec380ffc70f75520f66dd1097b6cd15fcb599c44f4bcb0ec905859b4ad3e613fff1731e2fe83938f221081b314cc0e69bf3d07b4e54ad70
-AUX xournal-0.4.8-c99-fix.patch 1838 BLAKE2B 1a4ab7eb3120add177e0b9292cc849f1636089703b5788d12dde1f9c4cf3224f172c17feec58b40b6a32a41a60cc9405f568809d6eedc50f045b6fa1573f22f7 SHA512 510432cf904ef47a323b160e466393068b3e75b32d26f55b19467219b0d4f5b2ba538feea0e87a9d596347a9c363c2e8802608a6298ee8a4d24db939ebbe02c7
-DIST xournal-0.4.8.2016.tar.gz 646082 BLAKE2B 4f64fb45759616d99f961b8db575bec1620e089d9f87d4e02d3de7b1cb1d9189d439d78e5b89c93d5635138206f603e40bb33a46458d34a9ec050869e54be531 SHA512 1426d5c9ba3486fbe342d49fc19fcc162965cd6a7b7754f79665e43fe0e60e6f42f61969405ace78fdaa7b99cbb3d4b07b7fb5df246d68a329b52084b6eec76e
-EBUILD xournal-0.4.8.2016-r1.ebuild 1195 BLAKE2B b25099bb4ca1dc175e913ba6e108a60d7e8e0a17f37b3266698347b4ecbad3a99340d173c201e236a2b2cb33924749c4029201c39d4a5cc17767886765cc0b83 SHA512 ab6725e83652c1a8db6d35c433011550596f122cd775c74fcc0e3d0700b684ad4c614101a9c62ab50b4453414a20562ab05524575956525f66f7417e6ac85c24
-EBUILD xournal-9999.ebuild 1142 BLAKE2B 5386c92d9254b8336141c63f5fac969945a3aec1691b1af291a79e158c99deca9e93bba0d6d3b93139329c70827a1a05d25dc26415a2745e0dd7ed2b745e3517 SHA512 7c3753aa0e0d5531e6b86a166c580de193b795ad77da0f7a7a92229a59d689f2466ef61d225b4c346a3237068d0fa88283e186159900ddc949dafb29963be97e
-MISC metadata.xml 653 BLAKE2B a3598ff53d87c0684fb4ef3c069c7e9df8da296a9cc748aae4592803fd14e015ef1260acb84546a70bc47fd9d94a1a7e8eb97e9126a65eedf2ce0fd18326f10d SHA512 b3200c92455d820252af3a53b643cb1ce21baa4b1238538a46bf12cc2162b44713cad1e61db5ea1698c8eba7507a2439052924e0cba301cef85cbbb3b0493688
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 <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/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 <auroux@users.sourceforge.net>
-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>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.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/*
-}