[arch-commits] Commit in zlib/repos (3 files)
Date: Monday, December 28, 2009 @ 17:03:55
Author: pierre
Revision: 61947
Merged revisions 61945 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/zlib/trunk
r61945 | pierre | 2009-12-28 23:02:36 +0100 (Mo, 28 Dez 2009) | 2 lines
see http://packages.qa.debian.org/z/zlib/news/20091228T194714Z.html
Added:
zlib/repos/testing-x86_64/revert-transparent-feof-test.patch
(from rev 61945, zlib/trunk/revert-transparent-feof-test.patch)
Modified:
zlib/repos/testing-x86_64/(properties)
zlib/repos/testing-x86_64/PKGBUILD
+
PKGBUILD |9 ++---
revert-transparent-feof-test.patch | 19 +++
2 files changed, 25 insertions(+), 3 deletions(-)
Property changes on: zlib/repos/testing-x86_64
___
Modified: svnmerge-integrated
- /zlib/trunk:1-61898
+ /zlib/trunk:1-61946
Modified: testing-x86_64/PKGBUILD
===
--- testing-x86_64/PKGBUILD 2009-12-28 22:03:12 UTC (rev 61946)
+++ testing-x86_64/PKGBUILD 2009-12-28 22:03:55 UTC (rev 61947)
@@ -3,7 +3,7 @@
pkgname=zlib
pkgver=1.2.3.4
-pkgrel=2
+pkgrel=3
pkgdesc='compression library implementing the deflate compression method found
in gzip and PKZIP'
arch=('i686' 'x86_64')
license=('custom')
@@ -12,10 +12,12 @@
depends=('glibc')
# source from http://packages.qa.debian.org/z/zlib.html
source=("ftp://ftp.archlinux.org/other/zlib/zlib-${pkgver}.tar.gz";
-'install.patch' 'revert-eof-reporting.patch')
+'install.patch' 'revert-eof-reporting.patch'
+'revert-transparent-feof-test.patch')
md5sums=('70cad33163abe3c234939a5c63bf95ea'
'e0b303fabe9272803ab57d988be1e88e'
- '40293a11f8d5032af18c31c8522feb7e')
+ '40293a11f8d5032af18c31c8522feb7e'
+ '79c0b09bfe269883cb36f8f29993cbcf')
build() {
cd ${srcdir}/zlib-$pkgver
@@ -23,6 +25,7 @@
export CFLAGS="${CFLAGS/-O2/-O3} -DUNALIGNED_OK"
patch -p1 -i ${srcdir}/install.patch || return 1
patch -p1 -i ${srcdir}/revert-eof-reporting.patch || return 1
+ patch -p1 -i ${srcdir}/revert-transparent-feof-test.patch || return 1
./configure --prefix=/usr --shared
if [ "${CARCH}" == "x86_64" ]; then
ln -s contrib/amd64/amd64-match.S match.S
Copied: zlib/repos/testing-x86_64/revert-transparent-feof-test.patch (from rev
61945, zlib/trunk/revert-transparent-feof-test.patch)
===
--- testing-x86_64/revert-transparent-feof-test.patch
(rev 0)
+++ testing-x86_64/revert-transparent-feof-test.patch 2009-12-28 22:03:55 UTC
(rev 61947)
@@ -0,0 +1,19 @@
+Only check for and set the EOF flag if we've read zero bytes in from a
+transparent stream, otherwise we may read the entire file into our
+buffer (causing feof() to become true), flag EOF and begin reporting EOF
+to users before we have actually returned all the data in the stream to
+the application.
+
+Index: debian/gzio.c
+===
+--- debian.orig/gzio.c 2009-12-28 18:48:57.0 +
debian/gzio.c 2009-12-28 18:49:02.0 +
+@@ -472,7 +472,7 @@
+ len -= s->stream.avail_out;
+ s->in += len;
+ s->out += len;
+-if (feof(s->file)) s->z_eof = 1;
++if (len == 0 && feof(s->file)) s->z_eof = 1;
+ return (int)len;
+ }
+ if (s->stream.avail_in == 0 && !s->z_eof) {
[arch-commits] Commit in zlib/repos (3 files)
Date: Monday, December 28, 2009 @ 17:03:12
Author: pierre
Revision: 61946
Merged revisions 61945 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/zlib/trunk
r61945 | pierre | 2009-12-28 23:02:36 +0100 (Mo, 28 Dez 2009) | 2 lines
see http://packages.qa.debian.org/z/zlib/news/20091228T194714Z.html
Added:
zlib/repos/testing-i686/revert-transparent-feof-test.patch
(from rev 61945, zlib/trunk/revert-transparent-feof-test.patch)
Modified:
zlib/repos/testing-i686/ (properties)
zlib/repos/testing-i686/PKGBUILD
+
PKGBUILD |9 ++---
revert-transparent-feof-test.patch | 19 +++
2 files changed, 25 insertions(+), 3 deletions(-)
Property changes on: zlib/repos/testing-i686
___
Modified: svnmerge-integrated
- /zlib/trunk:1-61897
+ /zlib/trunk:1-61945
Modified: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD 2009-12-28 22:02:36 UTC (rev 61945)
+++ testing-i686/PKGBUILD 2009-12-28 22:03:12 UTC (rev 61946)
@@ -3,7 +3,7 @@
pkgname=zlib
pkgver=1.2.3.4
-pkgrel=2
+pkgrel=3
pkgdesc='compression library implementing the deflate compression method found
in gzip and PKZIP'
arch=('i686' 'x86_64')
license=('custom')
@@ -12,10 +12,12 @@
depends=('glibc')
# source from http://packages.qa.debian.org/z/zlib.html
source=("ftp://ftp.archlinux.org/other/zlib/zlib-${pkgver}.tar.gz";
-'install.patch' 'revert-eof-reporting.patch')
+'install.patch' 'revert-eof-reporting.patch'
+'revert-transparent-feof-test.patch')
md5sums=('70cad33163abe3c234939a5c63bf95ea'
'e0b303fabe9272803ab57d988be1e88e'
- '40293a11f8d5032af18c31c8522feb7e')
+ '40293a11f8d5032af18c31c8522feb7e'
+ '79c0b09bfe269883cb36f8f29993cbcf')
build() {
cd ${srcdir}/zlib-$pkgver
@@ -23,6 +25,7 @@
export CFLAGS="${CFLAGS/-O2/-O3} -DUNALIGNED_OK"
patch -p1 -i ${srcdir}/install.patch || return 1
patch -p1 -i ${srcdir}/revert-eof-reporting.patch || return 1
+ patch -p1 -i ${srcdir}/revert-transparent-feof-test.patch || return 1
./configure --prefix=/usr --shared
if [ "${CARCH}" == "x86_64" ]; then
ln -s contrib/amd64/amd64-match.S match.S
Copied: zlib/repos/testing-i686/revert-transparent-feof-test.patch (from rev
61945, zlib/trunk/revert-transparent-feof-test.patch)
===
--- testing-i686/revert-transparent-feof-test.patch
(rev 0)
+++ testing-i686/revert-transparent-feof-test.patch 2009-12-28 22:03:12 UTC
(rev 61946)
@@ -0,0 +1,19 @@
+Only check for and set the EOF flag if we've read zero bytes in from a
+transparent stream, otherwise we may read the entire file into our
+buffer (causing feof() to become true), flag EOF and begin reporting EOF
+to users before we have actually returned all the data in the stream to
+the application.
+
+Index: debian/gzio.c
+===
+--- debian.orig/gzio.c 2009-12-28 18:48:57.0 +
debian/gzio.c 2009-12-28 18:49:02.0 +
+@@ -472,7 +472,7 @@
+ len -= s->stream.avail_out;
+ s->in += len;
+ s->out += len;
+-if (feof(s->file)) s->z_eof = 1;
++if (len == 0 && feof(s->file)) s->z_eof = 1;
+ return (int)len;
+ }
+ if (s->stream.avail_in == 0 && !s->z_eof) {
[arch-commits] Commit in zlib/trunk (PKGBUILD revert-transparent-feof-test.patch)
Date: Monday, December 28, 2009 @ 17:02:36
Author: pierre
Revision: 61945
see http://packages.qa.debian.org/z/zlib/news/20091228T194714Z.html
Added:
zlib/trunk/revert-transparent-feof-test.patch
Modified:
zlib/trunk/PKGBUILD
+
PKGBUILD |9 ++---
revert-transparent-feof-test.patch | 19 +++
2 files changed, 25 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2009-12-28 18:46:03 UTC (rev 61944)
+++ PKGBUILD2009-12-28 22:02:36 UTC (rev 61945)
@@ -3,7 +3,7 @@
pkgname=zlib
pkgver=1.2.3.4
-pkgrel=2
+pkgrel=3
pkgdesc='compression library implementing the deflate compression method found
in gzip and PKZIP'
arch=('i686' 'x86_64')
license=('custom')
@@ -12,10 +12,12 @@
depends=('glibc')
# source from http://packages.qa.debian.org/z/zlib.html
source=("ftp://ftp.archlinux.org/other/zlib/zlib-${pkgver}.tar.gz";
-'install.patch' 'revert-eof-reporting.patch')
+'install.patch' 'revert-eof-reporting.patch'
+'revert-transparent-feof-test.patch')
md5sums=('70cad33163abe3c234939a5c63bf95ea'
'e0b303fabe9272803ab57d988be1e88e'
- '40293a11f8d5032af18c31c8522feb7e')
+ '40293a11f8d5032af18c31c8522feb7e'
+ '79c0b09bfe269883cb36f8f29993cbcf')
build() {
cd ${srcdir}/zlib-$pkgver
@@ -23,6 +25,7 @@
export CFLAGS="${CFLAGS/-O2/-O3} -DUNALIGNED_OK"
patch -p1 -i ${srcdir}/install.patch || return 1
patch -p1 -i ${srcdir}/revert-eof-reporting.patch || return 1
+ patch -p1 -i ${srcdir}/revert-transparent-feof-test.patch || return 1
./configure --prefix=/usr --shared
if [ "${CARCH}" == "x86_64" ]; then
ln -s contrib/amd64/amd64-match.S match.S
Added: revert-transparent-feof-test.patch
===
--- revert-transparent-feof-test.patch (rev 0)
+++ revert-transparent-feof-test.patch 2009-12-28 22:02:36 UTC (rev 61945)
@@ -0,0 +1,19 @@
+Only check for and set the EOF flag if we've read zero bytes in from a
+transparent stream, otherwise we may read the entire file into our
+buffer (causing feof() to become true), flag EOF and begin reporting EOF
+to users before we have actually returned all the data in the stream to
+the application.
+
+Index: debian/gzio.c
+===
+--- debian.orig/gzio.c 2009-12-28 18:48:57.0 +
debian/gzio.c 2009-12-28 18:49:02.0 +
+@@ -472,7 +472,7 @@
+ len -= s->stream.avail_out;
+ s->in += len;
+ s->out += len;
+-if (feof(s->file)) s->z_eof = 1;
++if (len == 0 && feof(s->file)) s->z_eof = 1;
+ return (int)len;
+ }
+ if (s->stream.avail_in == 0 && !s->z_eof) {
[arch-commits] Commit in gcin/repos (3 files)
Date: Monday, December 28, 2009 @ 13:46:03
Author: andyrtr
Revision: 61944
Merged revisions 61942 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gcin/trunk
r61942 | andyrtr | 2009-12-28 18:43:58 + (Mo, 28 Dez 2009) | 2 lines
upgpkg: gcin 1.4.6-2
add support for Qt4 input method; FS #17606
Added:
gcin/repos/extra-x86_64/gcin-1.4.6-qt4.patch
(from rev 61942, gcin/trunk/gcin-1.4.6-qt4.patch)
Modified:
gcin/repos/extra-x86_64/ (properties)
gcin/repos/extra-x86_64/PKGBUILD
--+
PKGBUILD |9 ++---
gcin-1.4.6-qt4.patch | 31 +++
2 files changed, 37 insertions(+), 3 deletions(-)
Property changes on: gcin/repos/extra-x86_64
___
Modified: svnmerge-integrated
- /gcin/trunk:1-61901
+ /gcin/trunk:1-61943
Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2009-12-28 18:44:47 UTC (rev 61943)
+++ extra-x86_64/PKGBUILD 2009-12-28 18:46:03 UTC (rev 61944)
@@ -4,7 +4,7 @@
pkgname=gcin
pkgver=1.4.6
-pkgrel=1
+pkgrel=2
pkgdesc="Traditional Chinese Input Method Server for X window system (XIM)"
arch=("i686" "x86_64")
license=('LGPL')
@@ -14,14 +14,17 @@
optdepends=('qt: support for Qt4 Input Method')
install=gcin.install
source=(http://cle.linux.org.tw/gcin/download/${pkgname}-${pkgver}.tar.bz2
- fix_x86_64_libdir.patch)
+ fix_x86_64_libdir.patch
+ gcin-1.4.6-qt4.patch)
#options=('!makeflags')
md5sums=('64f5ded6404d9091560c2316e9207158'
- '2018737a07a0a7a9e0c28e11245dde14')
+ '2018737a07a0a7a9e0c28e11245dde14'
+'ac1e85a36ad5a32597793281e3253b84')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np0 -i "${srcdir}/fix_x86_64_libdir.patch" || return 1
+patch -Np1 -i "${srcdir}/gcin-1.4.6-qt4.patch" || return 1
./configure --prefix=/usr || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
Copied: gcin/repos/extra-x86_64/gcin-1.4.6-qt4.patch (from rev 61942,
gcin/trunk/gcin-1.4.6-qt4.patch)
===
--- extra-x86_64/gcin-1.4.6-qt4.patch (rev 0)
+++ extra-x86_64/gcin-1.4.6-qt4.patch 2009-12-28 18:46:03 UTC (rev 61944)
@@ -0,0 +1,31 @@
+diff -ruN gcin-1.4.6/configure gcin-1.4.6-new/configure
+--- gcin-1.4.6/configure 2009-12-17 17:29:46.0 +0800
gcin-1.4.6-new/configure 2009-12-28 16:46:25.0 +0800
+@@ -164,7 +164,7 @@
+
+
+ QT4_IM='N'
+-QT4_IM_DIR=/usr/$LIB/qt4/plugins/inputmethods
++QT4_IM_DIR=/usr/$LIB/qt/plugins/inputmethods
+ echo "testing if you have qt4 support"
+ if [ -d $QT4_IM_DIR ]; then
+ QT4_IM='Y'
+diff -ruN gcin-1.4.6/qt4-im/Makefile gcin-1.4.6-new/qt4-im/Makefile
+--- gcin-1.4.6/qt4-im/Makefile 2009-12-10 07:09:17.0 +0800
gcin-1.4.6-new/qt4-im/Makefile 2009-12-28 16:47:59.0 +0800
+@@ -1,5 +1,5 @@
+ include ../config.mak
+-QT=qt4
++QT=qt
+ QTIM=$(QT)/plugins/inputmethods
+ IMMODULES=$(libdir)/$(QTIM)
+
+@@ -15,7 +15,7 @@
+ $(CXX) -E $(CFLAGS) $(INCS) $< > $@
+
+ moc_gcin-qt.cpp: gcin-qt.h
+- /usr/lib/$(QT)/bin/moc $< -o moc_gcin-qt.cpp
++ /usr/bin/moc $< -o moc_gcin-qt.cpp
+
+ im-gcin.so: $(OBJS)
+ export LD_RUN_PATH=$(gcinlibdir) ;\
[arch-commits] Commit in gcin/repos (3 files)
Date: Monday, December 28, 2009 @ 13:44:47
Author: andyrtr
Revision: 61943
Merged revisions 61942 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gcin/trunk
r61942 | andyrtr | 2009-12-28 18:43:58 + (Mo, 28 Dez 2009) | 2 lines
upgpkg: gcin 1.4.6-2
add support for Qt4 input method; FS #17606
Added:
gcin/repos/extra-i686/gcin-1.4.6-qt4.patch
(from rev 61942, gcin/trunk/gcin-1.4.6-qt4.patch)
Modified:
gcin/repos/extra-i686/(properties)
gcin/repos/extra-i686/PKGBUILD
--+
PKGBUILD |9 ++---
gcin-1.4.6-qt4.patch | 31 +++
2 files changed, 37 insertions(+), 3 deletions(-)
Property changes on: gcin/repos/extra-i686
___
Modified: svnmerge-integrated
- /gcin/trunk:1-61900
+ /gcin/trunk:1-61942
Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-28 18:43:58 UTC (rev 61942)
+++ extra-i686/PKGBUILD 2009-12-28 18:44:47 UTC (rev 61943)
@@ -4,7 +4,7 @@
pkgname=gcin
pkgver=1.4.6
-pkgrel=1
+pkgrel=2
pkgdesc="Traditional Chinese Input Method Server for X window system (XIM)"
arch=("i686" "x86_64")
license=('LGPL')
@@ -14,14 +14,17 @@
optdepends=('qt: support for Qt4 Input Method')
install=gcin.install
source=(http://cle.linux.org.tw/gcin/download/${pkgname}-${pkgver}.tar.bz2
- fix_x86_64_libdir.patch)
+ fix_x86_64_libdir.patch
+ gcin-1.4.6-qt4.patch)
#options=('!makeflags')
md5sums=('64f5ded6404d9091560c2316e9207158'
- '2018737a07a0a7a9e0c28e11245dde14')
+ '2018737a07a0a7a9e0c28e11245dde14'
+'ac1e85a36ad5a32597793281e3253b84')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np0 -i "${srcdir}/fix_x86_64_libdir.patch" || return 1
+patch -Np1 -i "${srcdir}/gcin-1.4.6-qt4.patch" || return 1
./configure --prefix=/usr || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
Copied: gcin/repos/extra-i686/gcin-1.4.6-qt4.patch (from rev 61942,
gcin/trunk/gcin-1.4.6-qt4.patch)
===
--- extra-i686/gcin-1.4.6-qt4.patch (rev 0)
+++ extra-i686/gcin-1.4.6-qt4.patch 2009-12-28 18:44:47 UTC (rev 61943)
@@ -0,0 +1,31 @@
+diff -ruN gcin-1.4.6/configure gcin-1.4.6-new/configure
+--- gcin-1.4.6/configure 2009-12-17 17:29:46.0 +0800
gcin-1.4.6-new/configure 2009-12-28 16:46:25.0 +0800
+@@ -164,7 +164,7 @@
+
+
+ QT4_IM='N'
+-QT4_IM_DIR=/usr/$LIB/qt4/plugins/inputmethods
++QT4_IM_DIR=/usr/$LIB/qt/plugins/inputmethods
+ echo "testing if you have qt4 support"
+ if [ -d $QT4_IM_DIR ]; then
+ QT4_IM='Y'
+diff -ruN gcin-1.4.6/qt4-im/Makefile gcin-1.4.6-new/qt4-im/Makefile
+--- gcin-1.4.6/qt4-im/Makefile 2009-12-10 07:09:17.0 +0800
gcin-1.4.6-new/qt4-im/Makefile 2009-12-28 16:47:59.0 +0800
+@@ -1,5 +1,5 @@
+ include ../config.mak
+-QT=qt4
++QT=qt
+ QTIM=$(QT)/plugins/inputmethods
+ IMMODULES=$(libdir)/$(QTIM)
+
+@@ -15,7 +15,7 @@
+ $(CXX) -E $(CFLAGS) $(INCS) $< > $@
+
+ moc_gcin-qt.cpp: gcin-qt.h
+- /usr/lib/$(QT)/bin/moc $< -o moc_gcin-qt.cpp
++ /usr/bin/moc $< -o moc_gcin-qt.cpp
+
+ im-gcin.so: $(OBJS)
+ export LD_RUN_PATH=$(gcinlibdir) ;\
[arch-commits] Commit in gcin/trunk (PKGBUILD gcin-1.4.6-qt4.patch)
Date: Monday, December 28, 2009 @ 13:43:58
Author: andyrtr
Revision: 61942
upgpkg: gcin 1.4.6-2
add support for Qt4 input method; FS #17606
Added:
gcin/trunk/gcin-1.4.6-qt4.patch
Modified:
gcin/trunk/PKGBUILD
--+
PKGBUILD |9 ++---
gcin-1.4.6-qt4.patch | 31 +++
2 files changed, 37 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2009-12-28 14:47:05 UTC (rev 61941)
+++ PKGBUILD2009-12-28 18:43:58 UTC (rev 61942)
@@ -4,7 +4,7 @@
pkgname=gcin
pkgver=1.4.6
-pkgrel=1
+pkgrel=2
pkgdesc="Traditional Chinese Input Method Server for X window system (XIM)"
arch=("i686" "x86_64")
license=('LGPL')
@@ -14,14 +14,17 @@
optdepends=('qt: support for Qt4 Input Method')
install=gcin.install
source=(http://cle.linux.org.tw/gcin/download/${pkgname}-${pkgver}.tar.bz2
- fix_x86_64_libdir.patch)
+ fix_x86_64_libdir.patch
+ gcin-1.4.6-qt4.patch)
#options=('!makeflags')
md5sums=('64f5ded6404d9091560c2316e9207158'
- '2018737a07a0a7a9e0c28e11245dde14')
+ '2018737a07a0a7a9e0c28e11245dde14'
+'ac1e85a36ad5a32597793281e3253b84')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np0 -i "${srcdir}/fix_x86_64_libdir.patch" || return 1
+patch -Np1 -i "${srcdir}/gcin-1.4.6-qt4.patch" || return 1
./configure --prefix=/usr || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
Added: gcin-1.4.6-qt4.patch
===
--- gcin-1.4.6-qt4.patch(rev 0)
+++ gcin-1.4.6-qt4.patch2009-12-28 18:43:58 UTC (rev 61942)
@@ -0,0 +1,31 @@
+diff -ruN gcin-1.4.6/configure gcin-1.4.6-new/configure
+--- gcin-1.4.6/configure 2009-12-17 17:29:46.0 +0800
gcin-1.4.6-new/configure 2009-12-28 16:46:25.0 +0800
+@@ -164,7 +164,7 @@
+
+
+ QT4_IM='N'
+-QT4_IM_DIR=/usr/$LIB/qt4/plugins/inputmethods
++QT4_IM_DIR=/usr/$LIB/qt/plugins/inputmethods
+ echo "testing if you have qt4 support"
+ if [ -d $QT4_IM_DIR ]; then
+ QT4_IM='Y'
+diff -ruN gcin-1.4.6/qt4-im/Makefile gcin-1.4.6-new/qt4-im/Makefile
+--- gcin-1.4.6/qt4-im/Makefile 2009-12-10 07:09:17.0 +0800
gcin-1.4.6-new/qt4-im/Makefile 2009-12-28 16:47:59.0 +0800
+@@ -1,5 +1,5 @@
+ include ../config.mak
+-QT=qt4
++QT=qt
+ QTIM=$(QT)/plugins/inputmethods
+ IMMODULES=$(libdir)/$(QTIM)
+
+@@ -15,7 +15,7 @@
+ $(CXX) -E $(CFLAGS) $(INCS) $< > $@
+
+ moc_gcin-qt.cpp: gcin-qt.h
+- /usr/lib/$(QT)/bin/moc $< -o moc_gcin-qt.cpp
++ /usr/bin/moc $< -o moc_gcin-qt.cpp
+
+ im-gcin.so: $(OBJS)
+ export LD_RUN_PATH=$(gcinlibdir) ;\
[arch-commits] Commit in go-openoffice/trunk (ChangeLog PKGBUILD)
Date: Monday, December 28, 2009 @ 09:47:05
Author: andyrtr
Revision: 61941
prepare 3.2.0 build
Modified:
go-openoffice/trunk/ChangeLog
go-openoffice/trunk/PKGBUILD
---+
ChangeLog |7 +
PKGBUILD | 79 ++--
2 files changed, 37 insertions(+), 49 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2009-12-28 11:58:57 UTC (rev 61940)
+++ ChangeLog 2009-12-28 14:47:05 UTC (rev 61941)
@@ -1,3 +1,10 @@
+2009-12-28 Andreas Radke
+
+* 3.2.0.1-1 :
+new upstream release = 3.2.0rc1
+ change how source is now downloaded via git/rsync
+ build with more system libs
+
2009-11-28 Andreas Radke
* 3.1.1.5-1 :
Modified: PKGBUILD
===
--- PKGBUILD2009-12-28 11:58:57 UTC (rev 61940)
+++ PKGBUILD2009-12-28 14:47:05 UTC (rev 61941)
@@ -2,19 +2,20 @@
# Maintainer: AndyRTR
pkgname=go-openoffice
-_GOver=3.1.1.5 # = OOo 3.1.1 final + fixes
+_GOver=3.2.0.1 # = OOo 3.2 RC1
pkgver=${_GOver}
pkgrel=1
pkgdesc="OpenOffice.org - go-oo.org enhanced version of SUN's office suite"
arch=('i686' 'x86_64')
-_go_tree="OOO310"
-_ootag=ooo310-m19 # m19 = OOo 3.1.1 RC2 = final
+_go_tree="OOO320"
+_ootag=ooo320-m8 # m8 = OOo 3.2.0 RC1
license=('LGPL3')
url="http://go-oo.org/";
install=${pkgname}.install
depends=("curl>=7.19.6" "hunspell>=1.2.8" "python>=2.6.2-6" 'libwpd'
'redland>=1.0.9-4'
'libxaw' "neon>=0.28.6" "icu>=4.2.1" 'hsqldb-java' 'libxslt'
'libxtst' 'lpsolve'
-'hicolor-icon-theme' 'shared-mime-info' 'desktop-file-utils')
+ 'beanshell' 'saxon' 'vigra' 'hyphen' 'libmspack' 'libldap'
+'hicolor-icon-theme' 'shared-mime-info' 'desktop-file-utils') #
'lucene' 'libmythes' 'libgraphite'
optdepends=('java-runtime: adds java support'
'libcups: adds printing support'
'gconf:adds additional gnome support'
@@ -28,17 +29,17 @@
makedepends=('automake' 'autoconf' 'wget' 'bison' 'findutils' 'flex' 'gawk'
'gcc-libs' 'libart-lgpl'
'pam' 'sane' 'perl-archive-zip' 'pkgconfig' 'unzip'
"xulrunner>=1.9.1.3" 'apache-ant' 'cairo'
'gperf' 'libcups' 'pstoedit' 'gconf' "openjdk6>=1.5.2" 'unixodbc'
'mesa>=7.5' 'poppler>=0.10.7'
- 'gstreamer0.10-base>=0.10.24' 'mono>=2.4.2.3' 'kdelibs>=4.3.1'
'libjpeg') # 'boost'
+ 'gstreamer0.10-base>=0.10.24' 'mono>=2.4.2.3' 'kdelibs>=4.3.1'
'libjpeg' 'boost' 'git' 'rsync')
backup=(usr/lib/go-openoffice/program/sofficerc)
provides=('openoffice-base')
conflicts=('openoffice-base')
_mirror="http://download.go-oo.org/";
source=(${_mirror}/${_go_tree}/ooo-build-${_GOver}.tar.gz
ArchLinux.patch
- http://download.go-oo.org//DEV300/ooo-cli-prebuilt-3.1.1.tar.bz2
+ ${_ootag}.tar.gz
+ http://download.go-oo.org//DEV300/ooo-cli-prebuilt-3.2.tar.bz2
http://cairographics.org/releases//cairo-1.4.10.tar.gz
http://download.go-oo.org//SRC680/mdbtools-0.6pre1.tar.gz
-
${_mirror}/${_go_tree}/${_ootag}-{artwork,base,bootstrap,calc,components,extras,filters,help,impress,libs-gui,libs-core,libs-extern,postprocess,sdk,testing,ure,writer,libs-extern-sys,extensions}.tar.bz2
http://download.go-oo.org//SRC680/extras-3.tar.bz2
http://download.go-oo.org//SRC680/biblio.tar.bz2
http://tools.openoffice.org/unowinreg_prebuild/680//unowinreg.dll
@@ -47,51 +48,16 @@
http://download.go-oo.org//SRC680/libwps-0.1.2.tar.gz
http://download.go-oo.org//SRC680/libwpg-0.1.3.tar.gz
http://download.go-oo.org//DEV300/ooo_oxygen_images-2009-06-17.tar.gz
- buildfix_64bit_system_libjpeg.diff
- openoffice.org-3.0.1.oooX.extensions.npapi.diff)
+ buildfix_64bit_system_libjpeg.diff)
#options=('!distcc' '!ccache' '!makeflags')
-noextract=(ooo-cli-prebuilt-3.1.1.tar.bz2 cairo-1.4.10.tar.gz
mdbtools-0.6pre1.tar.gz
-
${_ootag}-{artwork,base,bootstrap,calc,components,extras,filters,help,impress,libs-gui,libs-core,libs-extern,postprocess,sdk,testing,ure,writer,libs-extern-sys,extensions}.tar.bz2
- extras-3.tar.bz2 biblio.tar.bz2 unowinreg.dll
scsolver.2008-10-30.tar.bz2 libwpd-0.8.14.tar.gz libwps-0.1.2.tar.gz
libwpg-0.1.3.tar.gz ooo_oxygen_images-2009-06-17.tar.gz)
-md5sums=('c1303e19302c087ce6dab43be42695df'
- 'a1ff3d64d0ca95c62a15c07e7f19f193'
- '222a42af5b874ea15dbafd07b2381aee'
- '5598a5e500ad922e37b159dee72fc993'
- '246e8f38b2a1af1bcff60ee0da59300b'
- '092ce8212b591f8090a408631f0f3b5d'
- '1cc6e2e31fbcc9b2e936e700235f5b1c'
- 'c2552c5b91054317806502fa5bd28087'
- 'da748a39c9d83a09badd8bd9604d4489'
- 'e5e3825fac16609c810fab3fbe2eb9d5'
- '257ac5758245c2ee1590273489b19048'
- '5b78c271a6f8a8b95c15fb4689646e5b'
- '2e0c32bbd3495cf8aaa6b628cf44'
- '8
[arch-commits] Commit in xorg-server/repos (extra-i686)
Date: Monday, December 28, 2009 @ 06:58:56 Author: andyrtr Revision: 61939 db-move: xorg-server removed by andyrtr for move to extra Deleted: xorg-server/repos/extra-i686/
[arch-commits] Commit in xorg-server/repos (extra-i686 testing-i686)
Date: Monday, December 28, 2009 @ 06:58:57 Author: andyrtr Revision: 61940 db-move: moved xorg-server from [testing] to [extra] (i686) Added: xorg-server/repos/extra-i686/ Deleted: xorg-server/repos/testing-i686/
[arch-commits] Commit in xf86-video-ati/repos (extra-i686)
Date: Monday, December 28, 2009 @ 06:58:49 Author: andyrtr Revision: 61937 db-move: xf86-video-ati removed by andyrtr for move to extra Deleted: xf86-video-ati/repos/extra-i686/
[arch-commits] Commit in xf86-video-ati/repos (extra-i686 testing-i686)
Date: Monday, December 28, 2009 @ 06:58:50 Author: andyrtr Revision: 61938 db-move: moved xf86-video-ati from [testing] to [extra] (i686) Added: xf86-video-ati/repos/extra-i686/ Deleted: xf86-video-ati/repos/testing-i686/
[arch-commits] Commit in tzdata/repos (core-i686 testing-i686)
Date: Monday, December 28, 2009 @ 06:58:47 Author: andyrtr Revision: 61936 db-move: moved tzdata from [testing] to [core] (i686) Added: tzdata/repos/core-i686/ Deleted: tzdata/repos/testing-i686/
[arch-commits] Commit in tzdata/repos (core-i686)
Date: Monday, December 28, 2009 @ 06:58:47 Author: andyrtr Revision: 61935 db-move: tzdata removed by andyrtr for move to core Deleted: tzdata/repos/core-i686/
[arch-commits] Commit in mesa/repos (extra-i686 testing-i686)
Date: Monday, December 28, 2009 @ 06:58:18 Author: andyrtr Revision: 61934 db-move: moved mesa from [testing] to [extra] (i686) Added: mesa/repos/extra-i686/ Deleted: mesa/repos/testing-i686/
[arch-commits] Commit in mesa/repos (extra-i686)
Date: Monday, December 28, 2009 @ 06:58:18 Author: andyrtr Revision: 61933 db-move: mesa removed by andyrtr for move to extra Deleted: mesa/repos/extra-i686/
[arch-commits] Commit in xorg-server/repos (extra-x86_64 testing-x86_64)
Date: Monday, December 28, 2009 @ 06:58:00 Author: andyrtr Revision: 61932 db-move: moved xorg-server from [testing] to [extra] (x86_64) Added: xorg-server/repos/extra-x86_64/ Deleted: xorg-server/repos/testing-x86_64/
[arch-commits] Commit in xorg-server/repos (extra-x86_64)
Date: Monday, December 28, 2009 @ 06:58:00 Author: andyrtr Revision: 61931 db-move: xorg-server removed by andyrtr for move to extra Deleted: xorg-server/repos/extra-x86_64/
[arch-commits] Commit in xf86-video-ati/repos (extra-x86_64 testing-x86_64)
Date: Monday, December 28, 2009 @ 06:57:54 Author: andyrtr Revision: 61930 db-move: moved xf86-video-ati from [testing] to [extra] (x86_64) Added: xf86-video-ati/repos/extra-x86_64/ Deleted: xf86-video-ati/repos/testing-x86_64/
[arch-commits] Commit in xf86-video-ati/repos (extra-x86_64)
Date: Monday, December 28, 2009 @ 06:57:53 Author: andyrtr Revision: 61929 db-move: xf86-video-ati removed by andyrtr for move to extra Deleted: xf86-video-ati/repos/extra-x86_64/
[arch-commits] Commit in tzdata/repos (core-x86_64 testing-x86_64)
Date: Monday, December 28, 2009 @ 06:57:51 Author: andyrtr Revision: 61928 db-move: moved tzdata from [testing] to [core] (x86_64) Added: tzdata/repos/core-x86_64/ Deleted: tzdata/repos/testing-x86_64/
[arch-commits] Commit in tzdata/repos (core-x86_64)
Date: Monday, December 28, 2009 @ 06:57:50 Author: andyrtr Revision: 61927 db-move: tzdata removed by andyrtr for move to core Deleted: tzdata/repos/core-x86_64/
[arch-commits] Commit in mesa/repos (extra-x86_64 testing-x86_64)
Date: Monday, December 28, 2009 @ 06:57:23 Author: andyrtr Revision: 61926 db-move: moved mesa from [testing] to [extra] (x86_64) Added: mesa/repos/extra-x86_64/ Deleted: mesa/repos/testing-x86_64/
[arch-commits] Commit in mesa/repos (extra-x86_64)
Date: Monday, December 28, 2009 @ 06:57:22 Author: andyrtr Revision: 61925 db-move: mesa removed by andyrtr for move to extra Deleted: mesa/repos/extra-x86_64/
[arch-commits] Commit in hdparm/repos (core-x86_64)
Date: Monday, December 28, 2009 @ 06:45:31 Author: andyrtr Revision: 61923 db-move: hdparm removed by andyrtr for move to core Deleted: hdparm/repos/core-x86_64/
[arch-commits] Commit in hdparm/repos (core-x86_64 testing-x86_64)
Date: Monday, December 28, 2009 @ 06:45:32 Author: andyrtr Revision: 61924 db-move: moved hdparm from [testing] to [core] (x86_64) Added: hdparm/repos/core-x86_64/ Deleted: hdparm/repos/testing-x86_64/
[arch-commits] Commit in nano/repos (core-x86_64 testing-x86_64)
Date: Monday, December 28, 2009 @ 06:45:29 Author: andyrtr Revision: 61922 db-move: moved nano from [testing] to [core] (x86_64) Added: nano/repos/core-x86_64/ Deleted: nano/repos/testing-x86_64/
[arch-commits] Commit in libgcrypt/repos (core-x86_64 testing-x86_64)
Date: Monday, December 28, 2009 @ 06:45:26 Author: andyrtr Revision: 61920 db-move: moved libgcrypt from [testing] to [core] (x86_64) Added: libgcrypt/repos/core-x86_64/ Deleted: libgcrypt/repos/testing-x86_64/
[arch-commits] Commit in nano/repos (core-x86_64)
Date: Monday, December 28, 2009 @ 06:45:29 Author: andyrtr Revision: 61921 db-move: nano removed by andyrtr for move to core Deleted: nano/repos/core-x86_64/
[arch-commits] Commit in libgcrypt/repos (core-x86_64)
Date: Monday, December 28, 2009 @ 06:45:26 Author: andyrtr Revision: 61919 db-move: libgcrypt removed by andyrtr for move to core Deleted: libgcrypt/repos/core-x86_64/
[arch-commits] Commit in hdparm/repos (core-i686 testing-i686)
Date: Monday, December 28, 2009 @ 06:45:16 Author: andyrtr Revision: 61918 db-move: moved hdparm from [testing] to [core] (i686) Added: hdparm/repos/core-i686/ Deleted: hdparm/repos/testing-i686/
[arch-commits] Commit in nano/repos (core-i686 testing-i686)
Date: Monday, December 28, 2009 @ 06:45:13 Author: andyrtr Revision: 61916 db-move: moved nano from [testing] to [core] (i686) Added: nano/repos/core-i686/ Deleted: nano/repos/testing-i686/
[arch-commits] Commit in hdparm/repos (core-i686)
Date: Monday, December 28, 2009 @ 06:45:15 Author: andyrtr Revision: 61917 db-move: hdparm removed by andyrtr for move to core Deleted: hdparm/repos/core-i686/
[arch-commits] Commit in nano/repos (core-i686)
Date: Monday, December 28, 2009 @ 06:45:12 Author: andyrtr Revision: 61915 db-move: nano removed by andyrtr for move to core Deleted: nano/repos/core-i686/
[arch-commits] Commit in libgcrypt/repos (core-i686 testing-i686)
Date: Monday, December 28, 2009 @ 06:45:09 Author: andyrtr Revision: 61914 db-move: moved libgcrypt from [testing] to [core] (i686) Added: libgcrypt/repos/core-i686/ Deleted: libgcrypt/repos/testing-i686/
[arch-commits] Commit in libgcrypt/repos (core-i686)
Date: Monday, December 28, 2009 @ 06:45:08 Author: andyrtr Revision: 61913 db-move: libgcrypt removed by andyrtr for move to core Deleted: libgcrypt/repos/core-i686/
