From 1c073b84a003edada0a61c1b21ea25c39524754e Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 5 May 2015 08:56:44 +0000 Subject: main/goffice0.8: remove nothing needs it anymore so we can remove it --- main/goffice0.8/APKBUILD | 54 ------- main/goffice0.8/goffice-0.8.17-no-pcre.patch | 219 --------------------------- main/goffice0.8/use-apiver-for-dirs.patch | 32 ---- 3 files changed, 305 deletions(-) delete mode 100644 main/goffice0.8/APKBUILD delete mode 100644 main/goffice0.8/goffice-0.8.17-no-pcre.patch delete mode 100644 main/goffice0.8/use-apiver-for-dirs.patch diff --git a/main/goffice0.8/APKBUILD b/main/goffice0.8/APKBUILD deleted file mode 100644 index f1500ca57e..0000000000 --- a/main/goffice0.8/APKBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=goffice0.8 -_realname=goffice -pkgver=0.8.17 -pkgrel=0 -_maj=${pkgver%%.*} -_min=${pkgver#${_maj}.} -_min=${_min%%.*} -pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" -url="http://www.gnome.org" -arch="all" -license="GPL" -depends_dev="glib-dev libgsf-dev cairo-dev libxml2-dev" -makedepends="$depends_dev intltool gtk+-dev autoconf automake libtool gtk-doc" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="http://ftp.gnome.org/pub/gnome/sources/$_realname/$_maj.$_min/$_realname-$pkgver.tar.bz2 - goffice-0.8.17-no-pcre.patch - use-apiver-for-dirs.patch - " - -prepare() { - cd "$srcdir"/$_realname-$pkgver - update_config_sub || return 1 - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done - libtoolize --force && aclocal && autoconf && automake --add-missing -} - -build() { - cd "$srcdir"/$_realname-$pkgver - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --without-gconf \ - --disable-static \ - || return 1 - make || return 1 -} - -package() { - cd "$srcdir"/$_realname-$pkgver - make DESTDIR="$pkgdir" install || return 1 - rm -f "$pkgdir"/usr/lib/*.la "$pkgdir"/usr/lib/goffice/*/plugins/*/*.la -} - -md5sums="b4c924457163e02daf8a8d2428f51d10 goffice-0.8.17.tar.bz2 -bf54fa8b063b79b857e5b572e94a162a goffice-0.8.17-no-pcre.patch -4054dd4ecec9f7e48d71413648f73768 use-apiver-for-dirs.patch" diff --git a/main/goffice0.8/goffice-0.8.17-no-pcre.patch b/main/goffice0.8/goffice-0.8.17-no-pcre.patch deleted file mode 100644 index 4691acdcd8..0000000000 --- a/main/goffice0.8/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 -Date: Fri, 20 Apr 2012 14:57:59 -0400 -Subject: [PATCH] Drop pcre workaround for ]], [[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 - #include "regutf8.h" --#ifndef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH --#include --#endif - #include "go-glib-extras.h" - #include - #include -@@ -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/main/goffice0.8/use-apiver-for-dirs.patch b/main/goffice0.8/use-apiver-for-dirs.patch deleted file mode 100644 index c925b399b9..0000000000 --- a/main/goffice0.8/use-apiver-for-dirs.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/configure.in 2011-09-07 08:45:49.687783970 +0000 -+++ b/configure.in 2011-09-07 09:12:55.709382840 +0000 -@@ -418,7 +418,7 @@ - fi - - dnl ************************************************** --AC_SUBST(GETTEXT_PACKAGE, goffice-${VERSION}) -+AC_SUBST(GETTEXT_PACKAGE, goffice-${GOFFICE_API_VER}) - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", - [The package name, for gettext]) - AM_GLIB_GNU_GETTEXT -@@ -638,9 +638,9 @@ - dnl ****************** - dnl - dnl These are changed in goffice.c for WIN32 packages --AC_SUBST(goffice_datadir, '${datadir}/goffice/${VERSION}') --AC_SUBST(goffice_libdir, '${libdir}/goffice/${VERSION}') --AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${VERSION}') -+AC_SUBST(goffice_datadir, '${datadir}/goffice/${GOFFICE_API_VER}') -+AC_SUBST(goffice_libdir, '${libdir}/goffice/${GOFFICE_API_VER}') -+AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${GOFFICE_API_VER}') - AC_SUBST(goffice_localedir, '${prefix}/${DATADIRNAME}/locale') - dnl - AC_SUBST(goffice_plugindir, '${goffice_libdir}/plugins') ---- a/libgoffice.pc.in 2010-02-18 22:49:39.000000000 +0000 -+++ b/libgoffice.pc.in 2011-09-07 09:18:53.655992532 +0000 -@@ -11,4 +11,4 @@ - Libs.private: @EXTRA_LIBS@ - Cflags: -I${includedir}/libgoffice-@GOFFICE_API_VER@ @EXTRA_INCLUDES@ - --PluginDir=${libdir}/goffice/@VERSION@/plugins -+PluginDir=${libdir}/goffice/@GOFFICE_API_VER@/plugins -- cgit v1.2.3