[arch-commits] Commit in goffice0.8/repos (8 files)
Jan de Groot
jgc at archlinux.org
Wed Dec 19 14:13:59 UTC 2012
Date: Wednesday, December 19, 2012 @ 09:13:59
Author: jgc
Revision: 173347
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
goffice0.8/repos/extra-i686/PKGBUILD
(from rev 173346, goffice0.8/trunk/PKGBUILD)
goffice0.8/repos/extra-i686/use-apiver-for-dirs.patch
(from rev 173346, goffice0.8/trunk/use-apiver-for-dirs.patch)
goffice0.8/repos/extra-x86_64/PKGBUILD
(from rev 173346, goffice0.8/trunk/PKGBUILD)
goffice0.8/repos/extra-x86_64/use-apiver-for-dirs.patch
(from rev 173346, goffice0.8/trunk/use-apiver-for-dirs.patch)
Deleted:
goffice0.8/repos/extra-i686/PKGBUILD
goffice0.8/repos/extra-i686/use-apiver-for-dirs.patch
goffice0.8/repos/extra-x86_64/PKGBUILD
goffice0.8/repos/extra-x86_64/use-apiver-for-dirs.patch
----------------------------------------+
extra-i686/PKGBUILD | 65 +++++++++++++++----------------
extra-i686/use-apiver-for-dirs.patch | 64 +++++++++++++++---------------
extra-x86_64/PKGBUILD | 65 +++++++++++++++----------------
extra-x86_64/use-apiver-for-dirs.patch | 64 +++++++++++++++---------------
4 files changed, 130 insertions(+), 128 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-12-19 14:13:32 UTC (rev 173346)
+++ extra-i686/PKGBUILD 2012-12-19 14:13:59 UTC (rev 173347)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Aaron Griffin <aaron at archlinux.org>
-
-pkgname=goffice0.8
-pkgver=0.8.17
-pkgrel=1
-pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org"
-license=('GPL')
-options=('!libtool')
-depends=('gtk2' 'gconf' 'libgsf')
-conflicts=('goffice<0.10')
-makedepends=('pkgconfig' 'intltool' 'gtk-doc')
-source=(http://ftp.gnome.org/pub/gnome/sources/goffice/${pkgver%.*}/goffice-${pkgver}.tar.xz
- use-apiver-for-dirs.patch)
-sha256sums=('165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15'
- '4507a49f6ccb13e55c0b3cc6831b7e0dcec7badb58a3661190e843f8607fa270')
-
-build() {
- cd "${srcdir}/goffice-${pkgver}"
- patch -Np0 -i "${srcdir}/use-apiver-for-dirs.patch"
- autoreconf -fi
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/goffice-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: goffice0.8/repos/extra-i686/PKGBUILD (from rev 173346, goffice0.8/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-12-19 14:13:59 UTC (rev 173347)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Aaron Griffin <aaron at archlinux.org>
+
+pkgname=goffice0.8
+pkgver=0.8.17
+pkgrel=2
+pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+"
+arch=('i686' 'x86_64')
+url="http://www.gnome.org"
+license=('GPL')
+options=('!libtool')
+depends=('gtk2' 'gconf' 'libgsf')
+conflicts=('goffice<0.10')
+makedepends=('pkgconfig' 'intltool' 'gtk-doc')
+source=(http://ftp.gnome.org/pub/gnome/sources/goffice/${pkgver%.*}/goffice-${pkgver}.tar.xz
+ use-apiver-for-dirs.patch)
+sha256sums=('165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15'
+ '4507a49f6ccb13e55c0b3cc6831b7e0dcec7badb58a3661190e843f8607fa270')
+
+build() {
+ cd "${srcdir}/goffice-${pkgver}"
+ patch -Np0 -i "${srcdir}/use-apiver-for-dirs.patch"
+ sed -i -e 's/glib\/gregex.h/glib.h/' configure.in
+ autoreconf -fi
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}/goffice-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/use-apiver-for-dirs.patch
===================================================================
--- extra-i686/use-apiver-for-dirs.patch 2012-12-19 14:13:32 UTC (rev 173346)
+++ extra-i686/use-apiver-for-dirs.patch 2012-12-19 14:13:59 UTC (rev 173347)
@@ -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- at GOFFICE_API_VER@ @EXTRA_INCLUDES@
-
--PluginDir=${libdir}/goffice/@VERSION@/plugins
-+PluginDir=${libdir}/goffice/@GOFFICE_API_VER@/plugins
Copied: goffice0.8/repos/extra-i686/use-apiver-for-dirs.patch (from rev 173346, goffice0.8/trunk/use-apiver-for-dirs.patch)
===================================================================
--- extra-i686/use-apiver-for-dirs.patch (rev 0)
+++ extra-i686/use-apiver-for-dirs.patch 2012-12-19 14:13:59 UTC (rev 173347)
@@ -0,0 +1,32 @@
+--- 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- at GOFFICE_API_VER@ @EXTRA_INCLUDES@
+
+-PluginDir=${libdir}/goffice/@VERSION@/plugins
++PluginDir=${libdir}/goffice/@GOFFICE_API_VER@/plugins
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-12-19 14:13:32 UTC (rev 173346)
+++ extra-x86_64/PKGBUILD 2012-12-19 14:13:59 UTC (rev 173347)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Aaron Griffin <aaron at archlinux.org>
-
-pkgname=goffice0.8
-pkgver=0.8.17
-pkgrel=1
-pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org"
-license=('GPL')
-options=('!libtool')
-depends=('gtk2' 'gconf' 'libgsf')
-conflicts=('goffice<0.10')
-makedepends=('pkgconfig' 'intltool' 'gtk-doc')
-source=(http://ftp.gnome.org/pub/gnome/sources/goffice/${pkgver%.*}/goffice-${pkgver}.tar.xz
- use-apiver-for-dirs.patch)
-sha256sums=('165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15'
- '4507a49f6ccb13e55c0b3cc6831b7e0dcec7badb58a3661190e843f8607fa270')
-
-build() {
- cd "${srcdir}/goffice-${pkgver}"
- patch -Np0 -i "${srcdir}/use-apiver-for-dirs.patch"
- autoreconf -fi
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/goffice-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: goffice0.8/repos/extra-x86_64/PKGBUILD (from rev 173346, goffice0.8/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-12-19 14:13:59 UTC (rev 173347)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Aaron Griffin <aaron at archlinux.org>
+
+pkgname=goffice0.8
+pkgver=0.8.17
+pkgrel=2
+pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+"
+arch=('i686' 'x86_64')
+url="http://www.gnome.org"
+license=('GPL')
+options=('!libtool')
+depends=('gtk2' 'gconf' 'libgsf')
+conflicts=('goffice<0.10')
+makedepends=('pkgconfig' 'intltool' 'gtk-doc')
+source=(http://ftp.gnome.org/pub/gnome/sources/goffice/${pkgver%.*}/goffice-${pkgver}.tar.xz
+ use-apiver-for-dirs.patch)
+sha256sums=('165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15'
+ '4507a49f6ccb13e55c0b3cc6831b7e0dcec7badb58a3661190e843f8607fa270')
+
+build() {
+ cd "${srcdir}/goffice-${pkgver}"
+ patch -Np0 -i "${srcdir}/use-apiver-for-dirs.patch"
+ sed -i -e 's/glib\/gregex.h/glib.h/' configure.in
+ autoreconf -fi
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}/goffice-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/use-apiver-for-dirs.patch
===================================================================
--- extra-x86_64/use-apiver-for-dirs.patch 2012-12-19 14:13:32 UTC (rev 173346)
+++ extra-x86_64/use-apiver-for-dirs.patch 2012-12-19 14:13:59 UTC (rev 173347)
@@ -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- at GOFFICE_API_VER@ @EXTRA_INCLUDES@
-
--PluginDir=${libdir}/goffice/@VERSION@/plugins
-+PluginDir=${libdir}/goffice/@GOFFICE_API_VER@/plugins
Copied: goffice0.8/repos/extra-x86_64/use-apiver-for-dirs.patch (from rev 173346, goffice0.8/trunk/use-apiver-for-dirs.patch)
===================================================================
--- extra-x86_64/use-apiver-for-dirs.patch (rev 0)
+++ extra-x86_64/use-apiver-for-dirs.patch 2012-12-19 14:13:59 UTC (rev 173347)
@@ -0,0 +1,32 @@
+--- 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- at GOFFICE_API_VER@ @EXTRA_INCLUDES@
+
+-PluginDir=${libdir}/goffice/@VERSION@/plugins
++PluginDir=${libdir}/goffice/@GOFFICE_API_VER@/plugins
More information about the arch-commits
mailing list