diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-30 21:33:31 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-30 21:33:31 +0100 |
commit | 2f8db31405fac68eea6f7257d58529243815033b (patch) | |
tree | 54259cc8988a98a10586fc0496b1f3501cd1e2a1 /x11-libs/goffice | |
parent | a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (diff) |
gentoo resync : 30.04.2018
Diffstat (limited to 'x11-libs/goffice')
-rw-r--r-- | x11-libs/goffice/Manifest | 5 | ||||
-rw-r--r-- | x11-libs/goffice/files/goffice-0.8.17-no-pcre.patch | 219 | ||||
-rw-r--r-- | x11-libs/goffice/goffice-0.10.35.ebuild | 51 | ||||
-rw-r--r-- | x11-libs/goffice/goffice-0.8.17-r2.ebuild | 64 |
4 files changed, 0 insertions, 339 deletions
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest index bcb3162e308e..0e60b2e6e046 100644 --- a/x11-libs/goffice/Manifest +++ b/x11-libs/goffice/Manifest @@ -1,8 +1,3 @@ -AUX goffice-0.8.17-no-pcre.patch 6490 BLAKE2B bc4fbc5b69a357395ec4d5d0d877e383c4c560c2fd838c5dabb1c11c5fff04bb6e2cd0785a64fb5afbc245b7aed9de2c992c402e5e5179a004d5c4e99e494454 SHA512 70af548433fed3f95b4b64cd7debf0cef0b8b7f7796c155be5d29a060ec2f3883d06703fc42e6dae40d4eb6933f45f2eef1c0d9f2088b5fc2e89ef580fc79b13 -DIST goffice-0.10.35.tar.xz 2370332 BLAKE2B 44799f90f45b36241aa1a3e9371719dcf76d94ff5b180dbc0d13e633c65cea88c8fa6049a94833c01d7a96db29e768e737f458dfff2eb2211d2915be68ec8338 SHA512 68a274e73b8c237966ff300f129362d5a7a861e0281ca0dca9a0850f0ea30644f16de0eb5480ac8a399e7ff40699af5ddfcd79593c42f06d296ab3e778c368d2 DIST goffice-0.10.38.tar.xz 2373308 BLAKE2B f270233adbbf300ad41516b1ed988db0772b95940196a6ac92c3090f6e52bc47933bb6bb4c023d7137cbca42adfab17fc41b82042c2e9c0340a6cd84942874e5 SHA512 1d72e30ee0b9f322cd4114d0a024a99e6d9ff7efcaeb9ca40b5fffe94180c232f03935743c15b1c6170f8bfc04fea5bdcc4d12760643c66cffafefbaa562fd62 -DIST goffice-0.8.17.tar.xz 1814488 BLAKE2B 8e17ade84f7417e493bbd56bd42805ad9fb87749b4705eb09c208384e3537610f478cf0ecb957b2a2007a097efc5e1c2019060b1aaffddf52bd1db559d7af957 SHA512 61a3063d37e2ded4d4065d261f728c862daea04090ac38abe2524089ed1ee253e0d77e501f5b3451b1e011491a8225f90fd4914f28ce2a347ecf561098e6400c -EBUILD goffice-0.10.35.ebuild 1237 BLAKE2B 54b543357075c968a7064c0308cc89677d2d770e9df472c34defbdf52f14ba2f00da32f311e757e51bf13ac8398ce7b1aa25fd715122980c6dde1ccf6a559057 SHA512 4753e0655aad603abd555524552728277c40d930e8ecc5030866b2ed3941dde17ffd04bc2637e895d29a46c80c506ecbe4fdc45fb17ca442bdd4b1c9fa2548e5 EBUILD goffice-0.10.38.ebuild 1236 BLAKE2B c76bcf2963ca520fe37ad8b6ba768f3783cde1f764dc8ed6992dae2ba179607a45da2f67ec856980924a62cb7e52c03c5d99da530b3aaf393e6ab55310522ff0 SHA512 7746c69bd8dbb68e207592897711e445f45cc6995452d6b128db24532ec21004fcdd95863561899d78278dc951338d0c6774760eb065249112342ae3ffa95b81 -EBUILD goffice-0.8.17-r2.ebuild 1426 BLAKE2B 10b9f19c0d19037a8291ab580781fa1b42477115c18136dff346cac59ab2449de8a0b03ecb2e6c86e74a04d660d95227204137ee495d9cfaeeee0e0991763758 SHA512 f674210aa851730d911b7893b30c069b9fca3b79baa5f1dd018c024f366a756ef3487cd0d262edcae7ea0085afe9c40b86b73110e40556c3c62d6da43b3413e6 MISC metadata.xml 441 BLAKE2B d1239d813165b887ed43610e0b9a09afd739164ecf52a0b6a94e957550b5dec5e18dbf5777e4b7bf8e1d665edf89bc5777ad90ebd93caeab5af6fc2882eb3469 SHA512 69e822f6c8ecb89ae952b30074c2527e8283eeabe32ac6555d043576b21d0f5a40b968b0211574ce8b1836dac85370070ee86905551bdd8cf2418cdc2ac6c3ce diff --git a/x11-libs/goffice/files/goffice-0.8.17-no-pcre.patch b/x11-libs/goffice/files/goffice-0.8.17-no-pcre.patch deleted file mode 100644 index 4691acdcd8ff..000000000000 --- a/x11-libs/goffice/files/goffice-0.8.17-no-pcre.patch +++ /dev/null @@ -1,219 +0,0 @@ -From 00b816027e11f5fd890df07ae94d720cce106f34 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Fri, 20 Apr 2012 14:57:59 -0400 -Subject: [PATCH] Drop pcre workaround for <glib-2.15.1 - -For unknown reason, it sometimes gets enabled even on modern systems, -causing problems. - -https://bugzilla.gnome.org/show_bug.cgi?id=670316 ---- - configure.in | 24 +---------- - goffice/utils/regutf8.c | 106 ----------------------------------------------- - 2 files changed, 1 insertions(+), 129 deletions(-) - -diff --git a/configure.in b/configure.in -index fd40d53..62e299d 100644 ---- a/configure.in -+++ b/configure.in -@@ -93,7 +93,7 @@ PKG_PROG_PKG_CONFIG - - dnl ***************************** - goffice_reqs=" -- glib-2.0 >= 2.8.0 -+ glib-2.0 >= 2.16.0 - gobject-2.0 >= 2.16.0 - gmodule-2.0 >= 2.16.0 - gio-2.0 >= 2.16.0 -@@ -492,13 +492,6 @@ SAVE_CFLAGS=$CFLAGS - SAVE_LIBS=$LIBS - CFLAGS="$CFLAGS $GOFFICE_CFLAGS" - LIBS="$GOFFICE_LIBS $LIBS" --AC_MSG_CHECKING([for G_REGEX_ERROR_STRAY_BACKSLASH]) --AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <glib/gregex.h>]], [[GRegexError error=G_REGEX_ERROR_STRAY_BACKSLASH;]])], -- [AC_DEFINE(HAVE_G_REGEX_ERROR_STRAY_BACKSLASH, 1, [Define if G_REGEX_ERROR_STRAY_BACKSLASH is defined]) -- glib_has_G_REGEX_ERROR_STRAY_BACKSLASH=yes -- AC_MSG_RESULT(yes)], -- [AC_MSG_RESULT(no) -- glib_has_G_REGEX_ERROR_STRAY_BACKSLASH=no]) - if test "x$goffice_with_gtk" = "xtrue" ; then - AC_CHECK_FUNCS(gtk_dialog_get_response_for_widget) - AC_CHECK_FUNCS(gtk_widget_set_tooltip_text gtk_tool_item_set_tooltip_text, -@@ -511,21 +504,6 @@ if test $gtk_disable_deprecated = yes; then - CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED" - fi - --if test "x$glib_has_G_REGEX_ERROR_STRAY_BACKSLASH" = "xno"; then -- dnl Check for working pcre -- AC_CHECK_HEADER(pcre.h,[], AC_MSG_ERROR([Header files for PCRE were not found])) -- AC_CHECK_LIB(pcre,pcre_compile2,[], AC_MSG_ERROR([The PCRE library is missing or too old])) -- AC_MSG_CHECKING([for UTF-8 support in pcre]) -- if (pcretest -C 2>&1) | grep -i "^ *UTF-8 support" >/dev/null; then -- AC_MSG_RESULT(yes) -- LIBS="$LIBS -lpcre" -- EXTRA_LIBS="$EXTRA_LIBS -lpcre" -- else -- AC_MSG_ERROR([The installed PCRE library is not configured for UTF-8 support.]) -- fi --fi -- -- - AC_DEFUN([GOFFICE_CHECK_FUNC], - [AC_CHECK_FUNC([$1], - [], -diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c -index bc4aae4..3f32dd6 100644 ---- a/goffice/utils/regutf8.c -+++ b/goffice/utils/regutf8.c -@@ -7,9 +7,6 @@ - - #include <goffice/goffice-config.h> - #include "regutf8.h" --#ifndef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH --#include <pcre.h> --#endif - #include "go-glib-extras.h" - #include <gsf/gsf-impl-utils.h> - #include <glib/gi18n-lib.h> -@@ -21,11 +18,7 @@ void - go_regfree (GORegexp *gor) - { - if (gor->ppcre) { --#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH - g_regex_unref (gor->ppcre); --#else -- pcre_free (gor->ppcre); --#endif - gor->ppcre = NULL; - } - } -@@ -70,7 +63,6 @@ go_regerror (int errcode, const GORegexp *gor, char *dst, size_t dstsize) - int - go_regcomp (GORegexp *gor, const char *pat, int cflags) - { --#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH - GError *error = NULL; - GRegex *r; - int coptions = -@@ -119,47 +111,6 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags) - gor->nosub = (cflags & GO_REG_NOSUB) != 0; - return 0; - } --#else -- const char *errorptr; -- int errorofs, errorcode; -- pcre *r; -- int coptions = -- PCRE_UTF8 | -- PCRE_NO_UTF8_CHECK | -- ((cflags & GO_REG_ICASE) ? PCRE_CASELESS : 0) | -- ((cflags & GO_REG_NEWLINE) ? PCRE_MULTILINE : 0); -- -- if (&pcre_compile2 == NULL) { -- g_error ("libgoffice has been dynamically linked against a libpcre\n" -- "that lacks the pcre_compile2 function. This indicates a\n" -- "distribution dependency problem. Please report this at\n" -- "bugzilla.gnome.org and for you distribution."); -- } -- -- gor->ppcre = r = pcre_compile2 (pat, coptions, -- &errorcode, &errorptr, &errorofs, -- NULL); -- -- if (r == NULL) { -- switch (errorcode) { -- case 1: case 2: case 3: case 37: return GO_REG_EESCAPE; -- case 4: case 5: return GO_REG_EBRACE; -- case 6: return GO_REG_EBRACK; -- case 7: case 30: return GO_REG_ECTYPE; -- case 8: return GO_REG_ERANGE; -- case 9: case 10: return GO_REG_BADRPT; -- case 14: case 18: case 22: return GO_REG_EPAREN; -- case 15: return GO_REG_ESUBREG; -- case 19: case 20: return GO_REG_ESIZE; -- case 21: return GO_REG_ESPACE; -- default: return GO_REG_BADPAT; -- } -- } else { -- gor->re_nsub = pcre_info (r, NULL, NULL); -- gor->nosub = (cflags & GO_REG_NOSUB) != 0; -- return 0; -- } --#endif - return 0; - } - -@@ -167,7 +118,6 @@ int - go_regexec (const GORegexp *gor, const char *txt, - size_t nmatch, GORegmatch *pmatch, int eflags) - { --#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH - int eoptions = - ((eflags & GO_REG_NOTBOL) ? G_REGEX_MATCH_NOTBOL : 0) | - ((eflags & GO_REG_NOTEOL) ? G_REGEX_MATCH_NOTEOL : 0); -@@ -196,62 +146,6 @@ go_regexec (const GORegexp *gor, const char *txt, - g_match_info_free (match_info); - - return matched ? GO_REG_NOERROR : GO_REG_NOMATCH; --#else -- size_t txtlen = strlen (txt); -- int eoptions = -- ((eflags & GO_REG_NOTBOL) ? PCRE_NOTBOL : 0) | -- ((eflags & GO_REG_NOTEOL) ? PCRE_NOTEOL : 0); -- int res; -- int *offsets, *allocated; -- int offsetcount; -- if (gor->nosub) -- nmatch = 0; -- -- if (nmatch > 0) { -- /* Paranoia. */ -- if (nmatch >= G_MAXINT / sizeof (int) / 3) -- return GO_REG_ESPACE; -- -- offsetcount = nmatch * 3; -- offsets = allocated = g_try_new (int, offsetcount); -- if (!offsets) -- return GO_REG_ESPACE; -- } else { -- offsets = allocated = NULL; -- offsetcount = 0; -- } -- -- res = pcre_exec (gor->ppcre, NULL, txt, txtlen, 0, eoptions, -- offsets, offsetcount); -- if (res >= 0) { -- int i; -- -- if (res == 0) res = nmatch; -- -- for (i = 0; i < res; i++) { -- pmatch[i].rm_so = offsets[i * 2]; -- pmatch[i].rm_eo = offsets[i * 2 + 1]; -- } -- for (; i < (int)nmatch; i++) { -- pmatch[i].rm_so = -1; -- pmatch[i].rm_eo = -1; -- } -- g_free (allocated); -- return GO_REG_NOERROR; -- } -- -- g_free (allocated); -- switch (res) { -- case PCRE_ERROR_NOMATCH: -- return GO_REG_NOMATCH; -- case PCRE_ERROR_BADUTF8: -- case PCRE_ERROR_BADUTF8_OFFSET: -- /* POSIX doesn't seem to foresee this kind of error. */ -- return GO_REG_BADPAT; -- default: -- return GO_REG_ESPACE; -- } --#endif - } - - /* ------------------------------------------------------------------------- */ --- -1.7.8.5 - diff --git a/x11-libs/goffice/goffice-0.10.35.ebuild b/x11-libs/goffice/goffice-0.10.35.ebuild deleted file mode 100644 index 3b4fa16dc040..000000000000 --- a/x11-libs/goffice/goffice-0.10.35.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -GNOME2_LA_PUNT="yes" - -inherit gnome2 - -DESCRIPTION="A library of document-centric objects and utilities" -HOMEPAGE="https://git.gnome.org/browse/goffice/" - -LICENSE="GPL-2" -SLOT="0.10" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris" -IUSE="+introspection" - -# FIXME: add lasem to tree -RDEPEND=" - >=app-text/libspectre-0.2.6:= - >=dev-libs/glib-2.38.0:2 - dev-libs/libxslt - >=gnome-base/librsvg-2.22:2 - >=gnome-extra/libgsf-1.14.24:=[introspection?] - >=dev-libs/libxml2-2.4.12:2 - >=x11-libs/pango-1.24:= - >=x11-libs/cairo-1.10:=[svg] - x11-libs/libXext:= - x11-libs/libXrender:= - >=x11-libs/gdk-pixbuf-2.22:2 - >=x11-libs/gtk+-3.8.7:3 - introspection? ( - >=dev-libs/gobject-introspection-1:= - >=gnome-extra/libgsf-1.14.23:= ) -" -DEPEND="${RDEPEND} - dev-lang/perl - virtual/perl-Getopt-Long - virtual/perl-IO-Compress - virtual/perl-Compress-Raw-Zlib - >=dev-util/gtk-doc-am-1.12 - >=dev-util/intltool-0.35 - virtual/pkgconfig -" - -src_configure() { - gnome2_src_configure \ - --without-lasem \ - --with-gtk \ - --with-config-backend=gsettings \ - $(use_enable introspection) -} diff --git a/x11-libs/goffice/goffice-0.8.17-r2.ebuild b/x11-libs/goffice/goffice-0.8.17-r2.ebuild deleted file mode 100644 index a1b5eb192dbd..000000000000 --- a/x11-libs/goffice/goffice-0.8.17-r2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit autotools eutils gnome2 - -DESCRIPTION="A library of document-centric objects and utilities" -HOMEPAGE="https://git.gnome.org/browse/goffice/" - -LICENSE="GPL-2" -SLOT="0.8" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris" -IUSE="gnome" - -# Build fails with -gtk -# FIXME: add lasem to tree -RDEPEND=" - >=dev-libs/glib-2.16:2 - >=gnome-extra/libgsf-1.14.9 - >=dev-libs/libxml2-2.4.12:2 - >=x11-libs/pango-1.8.1 - >=x11-libs/cairo-1.2[svg] - x11-libs/libXext - x11-libs/libXrender - >=x11-libs/gtk+-2.16:2 - gnome? ( >=gnome-base/gconf-2:2 ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=dev-util/intltool-0.35 - dev-util/gtk-doc-am - - gnome-base/gnome-common -" -# eautoreconf requires: gnome-common - -src_prepare() { - # bug #404271, https://bugzilla.gnome.org/show_bug.cgi?id=670316 - epatch "${FILESDIR}/${P}-no-pcre.patch" - - mv configure.in configure.ac || die - eautoreconf - gnome2_src_prepare -} - -src_configure() { - local myconf - DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README" - - # Gsettings is still experimental - if use gnome; then - myconf="${myconf} --with-config-backend=gconf" - else - myconf="${myconf} --with-config-backend=keyfile" - fi - - gnome2_src_configure \ - --without-lasem \ - --with-gtk \ - ${myconf} -} |