From 8615c518b1f1d03130f21656a1a026959bb1e9c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Dec 2022 15:13:37 +0000 Subject: gentoo auto-resync : 07:12:2022 - 15:13:37 --- app-text/Manifest.gz | Bin 48917 -> 48919 bytes app-text/xournal/Manifest | 4 +- app-text/xournal/files/xournal-0.4.8-c99-fix.patch | 89 +++++++++++++++++++++ app-text/xournal/xournal-0.4.8.2016-r1.ebuild | 62 ++++++++++++++ app-text/xournal/xournal-9999.ebuild | 29 ++++--- 5 files changed, 172 insertions(+), 12 deletions(-) create mode 100644 app-text/xournal/files/xournal-0.4.8-c99-fix.patch create mode 100644 app-text/xournal/xournal-0.4.8.2016-r1.ebuild (limited to 'app-text') diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz index b0e5c2ada1d5..d2b970e9c2f3 100644 Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest index df2580ab9413..54f6b62c366a 100644 --- a/app-text/xournal/Manifest +++ b/app-text/xournal/Manifest @@ -1,5 +1,7 @@ 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 1183 BLAKE2B d02414c26d1c0970179c44550ab330ac395f3688636e2233910dfc08d15a64153e2d4a9c12b5c8dbe0d814c502b9d5df95ecb130f7ba42c735f4f05a989839c7 SHA512 8b984cae5a8995e6f28d05593dae810d34ec1d11c8e5d3a0e056434914505a923239843fcf5e160c90559e78eaffd069a43e28c144ef713b093610d3d74a4479 EBUILD xournal-0.4.8.2016.ebuild 1188 BLAKE2B c3803e8c9ed0cfd1e573568fc3de4351ac53d0e997f6e933d912325dad40e8949491e7ef060a9d2496a96c014df6ae98485e61142f57185c6b5651aa735c1928 SHA512 ad4d4ee2b734862b04997351b9aeeb1472a0562dcdfac9fc030d7759b5db5182756e1ebafead88f53c33b9baa58f9e26b86fdd8e827881c85669e73e037f0cda -EBUILD xournal-9999.ebuild 998 BLAKE2B b040d45de8ab96b168607a97e249a5e92aec2b7e8a2f95f098ddd63c912e33e90679566fec6cbf03ae4b95d5b039ee7ee65d0249cc35303ff68e0b864cd77d54 SHA512 d45e91904ccc3f71297a79ae9dc2308b7cbc38b574d55dc3483789bb3320dcbcf2267a298dbd5f1c368698caf8750b32f6bae4ed887f5a9f6fd7debf6693f5d9 +EBUILD xournal-9999.ebuild 1129 BLAKE2B bdbd25f4c7f28f442410e3882cd9a777320054346fcddf50312d71d967b15bca63a03acdd496a87d49c285177f896c0cbed19a4dbf13d2fc6518183e16cad95b SHA512 167eac8e83ad7cab99be20202fb45cda285441d4fc3a56e6ee8f00d04d2308d6f5c656cf4fee6a8d0a05f2656b3024e575a3028fb273c52e61a965fa14d4dc71 MISC metadata.xml 653 BLAKE2B a3598ff53d87c0684fb4ef3c069c7e9df8da296a9cc748aae4592803fd14e015ef1260acb84546a70bc47fd9d94a1a7e8eb97e9126a65eedf2ce0fd18326f10d SHA512 b3200c92455d820252af3a53b643cb1ce21baa4b1238538a46bf12cc2162b44713cad1e61db5ea1698c8eba7507a2439052924e0cba301cef85cbbb3b0493688 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 new file mode 100644 index 000000000000..ee3689cddd70 --- /dev/null +++ b/app-text/xournal/files/xournal-0.4.8-c99-fix.patch @@ -0,0 +1,89 @@ +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 +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 ++#endif ++ + #include + #include + #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 ++#endif ++ + #include + #include + #include +--- 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 ++#endif ++ + #include + #ifdef HAVE_UNISTD_H + #include + +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/xournal-0.4.8.2016-r1.ebuild b/app-text/xournal/xournal-0.4.8.2016-r1.ebuild new file mode 100644 index 000000000000..3ebf59e8631a --- /dev/null +++ b/app-text/xournal/xournal-0.4.8.2016-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2022 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="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" + +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 index 5afafb130f7e..d7fc7a1b87ab 100644 --- a/app-text/xournal/xournal-9999.ebuild +++ b/app-text/xournal/xournal-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 [[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code" unset SRC_URI else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~ppc64 ~x86" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" fi @@ -21,9 +21,9 @@ HOMEPAGE="http://xournal.sourceforge.net/" LICENSE="GPL-2" SLOT="0" -IUSE="+pdf" +IUSE="+pdf vanilla" -COMMONDEPEND=" +DEPEND=" app-text/poppler[cairo] dev-libs/atk dev-libs/glib @@ -36,16 +36,23 @@ COMMONDEPEND=" x11-libs/gtk+:2 x11-libs/pango " -RDEPEND="${COMMONDEPEND} +RDEPEND=" + ${DEPEND} pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl ) " -DEPEND="${COMMONDEPEND} - virtual/pkgconfig -" +BDEPEND="virtual/pkgconfig" -src_install() { +src_prepare() { default - emake DESTDIR="${D}" desktop-install + 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/* } -- cgit v1.2.3