summaryrefslogtreecommitdiff
path: root/extra/goffice
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-02-10 11:32:41 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2013-02-10 11:32:41 +0100
commitbdf817c3549ba377334deb1161de703579670d62 (patch)
treec1b80c05c917cda2619e267049978f971bdad169 /extra/goffice
parentdf609724f30aaccfb05d9fb73f68e7a37118f2f8 (diff)
parent1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/cdemu-client/PKGBUILD community/dcron/PKGBUILD community/freevo/PKGBUILD community/gmerlin-avdecoder/PKGBUILD community/hacburn/PKGBUILD community/htmldoc/PKGBUILD community/ibus-table/PKGBUILD community/iksemel/PKGBUILD community/isomaster/PKGBUILD community/libmatio/PKGBUILD community/libtlen/PKGBUILD community/luarocks/PKGBUILD community/lxde-common/PKGBUILD community/multipath-tools/PKGBUILD community/nvclock/PKGBUILD community/pam-krb5/PKGBUILD community/pidgin-musictracker/PKGBUILD community/pkgfile/PKGBUILD community/pkgtools/PKGBUILD community/print-manager/PKGBUILD community/python-pyro/PKGBUILD community/python-pyxmpp/PKGBUILD community/python2-simplejson/PKGBUILD community/rsnapshot/PKGBUILD community/setconf/PKGBUILD community/tagpy/PKGBUILD community/terminator/PKGBUILD community/udunits/PKGBUILD community/vlock/PKGBUILD community/winefish/PKGBUILD core/nss-myhostname/PKGBUILD extra/avfs/PKGBUILD extra/bmp-musepack/PKGBUILD extra/bmp-wma/PKGBUILD extra/bochs/PKGBUILD extra/botan/PKGBUILD extra/cdargs/PKGBUILD extra/cx_freeze/PKGBUILD extra/dcfldd/PKGBUILD extra/devilspie/PKGBUILD extra/emelfm2/PKGBUILD extra/evilwm/PKGBUILD extra/fssos-nsvs/PKGBUILD extra/gimp-dbp/PKGBUILD extra/gimp-gap/PKGBUILD extra/gimp-ufraw/PKGBUILD extra/gmpc/PKGBUILD extra/gtkpod/PKGBUILD extra/hercules/PKGBUILD extra/herqq/PKGBUILD extra/hydrogen/PKGBUILD extra/kdegames/PKGBUILD extra/kradio/PKGBUILD extra/kshutdown/PKGBUILD extra/libmusicbrainz4/PKGBUILD extra/mahjong/PKGBUILD extra/mcrypt/PKGBUILD extra/monica/PKGBUILD extra/mpck/PKGBUILD extra/mrtg/PKGBUILD extra/nicotine/PKGBUILD extra/normalize/PKGBUILD extra/oprofile/PKGBUILD extra/perl-event/PKGBUILD extra/perl-unicode-string/PKGBUILD extra/pidgin-encryption/PKGBUILD extra/proftpd/PKGBUILD extra/pymad/PKGBUILD extra/qiv/PKGBUILD extra/quodlibet/PKGBUILD extra/ratpoison/PKGBUILD extra/rox/PKGBUILD extra/scrot/PKGBUILD extra/stardict/PKGBUILD extra/terminal/PKGBUILD extra/usbview/PKGBUILD extra/xdelta/PKGBUILD extra/xdelta3/PKGBUILD extra/xorg-xlsfonts/PKGBUILD extra/zile/PKGBUILD mozilla-testing/iceweasel-libre/mozconfig mozilla-testing/iceweasel-libre/vendor.js social/tokyocabinet/PKGBUILD ~fauno/notmuch/PKGBUILD ~mtjm/thinkfan/PKGBUILD ~mtjm/zbar/PKGBUILD
Diffstat (limited to 'extra/goffice')
-rw-r--r--extra/goffice/use-apiver-for-dirs.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/extra/goffice/use-apiver-for-dirs.patch b/extra/goffice/use-apiver-for-dirs.patch
deleted file mode 100644
index 3d0909da3..000000000
--- a/extra/goffice/use-apiver-for-dirs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.in.orig 2011-09-07 08:45:49.687783970 +0000
-+++ 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')
---- libgoffice.pc.in.orig 2010-02-18 22:49:39.000000000 +0000
-+++ 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