summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--abs/core/qt/.qmake.vars6
-rw-r--r--abs/core/qt/PKGBUILD56
-rw-r--r--abs/core/qt/__changelog2
-rw-r--r--abs/core/qt/ca-certificates.patch25
-rw-r--r--abs/core/qt/fix-multisampling-with-ati-card.patch25
-rw-r--r--abs/core/qt/fix-scroll-when-last-item-is-removed.patch38
-rw-r--r--abs/core/qt/qt-webkit-4.6.3-flash-plugin-segfault.patch43
-rw-r--r--abs/extra/postgresql-libs/PKGBUILD172
-rw-r--r--abs/extra/postgresql-libs/build.patch11
-rwxr-xr-xabs/extra/postgresql-libs/postgresql59
-rw-r--r--abs/extra/postgresql-libs/postgresql.confd5
-rw-r--r--abs/extra/postgresql-libs/postgresql.logrotate4
-rw-r--r--abs/extra/postgresql-libs/postgresql.pam3
-rw-r--r--abs/extra/postgresql/PKGBUILD165
-rwxr-xr-xabs/extra/postgresql/postgresql4
-rw-r--r--abs/extra/postgresql/postgresql.confd3
-rw-r--r--abs/extra/postgresql/postgresql.logrotate4
17 files changed, 430 insertions, 195 deletions
diff --git a/abs/core/qt/.qmake.vars b/abs/core/qt/.qmake.vars
new file mode 100644
index 0000000..74936a5
--- /dev/null
+++ b/abs/core/qt/.qmake.vars
@@ -0,0 +1,6 @@
+styles += cde mac motif plastique cleanlooks windows
+decorations += default windows styled
+mouse-drivers += pc
+gfx-drivers += linuxfb
+mouse-drivers += linuxtp
+kbd-drivers += tty
diff --git a/abs/core/qt/PKGBUILD b/abs/core/qt/PKGBUILD
index 75e4737..e1ee827 100644
--- a/abs/core/qt/PKGBUILD
+++ b/abs/core/qt/PKGBUILD
@@ -1,23 +1,31 @@
-# $Id: PKGBUILD 82062 2010-06-08 11:58:32Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+# $Id: PKGBUILD 94734 2010-10-10 14:30:15Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=qt
-pkgver=4.6.3
-pkgrel=2
+pkgver=4.7.0
+pkgrel=4
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
url='http://qt.nokia.com/'
license=('GPL3' 'LGPL')
-depends=('libpng' 'fontconfig' 'libtiff' 'libmng' 'sqlite3' 'xdg-utils' 'ca-certificates'
- 'hicolor-icon-theme' 'alsa-lib' 'glib2' 'dbus' 'libxrender' 'libgl' 'libsm')
-optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
-makedepends=('mesa' 'inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'libxfixes' 'gtk2')
-install=qt.install
+depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
+ 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
+ 'xdg-utils' 'hicolor-icon-theme')
+optdepends=('postgresql-libs: PostgreSQL driver'
+ 'libmysqlclient: MySQL driver'
+ 'unixodbc: ODBC driver'
+ 'libxinerama: Xinerama support'
+ 'libxcursor: Xcursor support'
+ 'libxfixes: Xfixes support')
+makedepends=('mesa' 'postgresql-libs' 'mysql' 'unixodbc' 'gtk2')
+install="${pkgname}.install"
options=('!libtool')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop'
- 'ca-certificates.patch' 'qt-webkit-4.6.3-flash-plugin-segfault.patch')
+ 'fix-scroll-when-last-item-is-removed.patch'
+ 'fix-multisampling-with-ati-card.patch')
build() {
unset QMAKESPEC
@@ -27,22 +35,22 @@ build() {
cd $srcdir/$_pkgfqn
- # see http://cvs.fedoraproject.org/viewvc/rpms/qt/devel/
- # use system ssl cert bundle
- patch -p1 -i $srcdir/ca-certificates.patch || return 1
- patch -p0 < $srcdir/qt-webkit-4.6.3-flash-plugin-segfault.patch || return 1
+ # Already fixed in 4.7.1
+ patch -Np1 -i ${srcdir}/fix-scroll-when-last-item-is-removed.patch
+ patch -Np1 -i ${srcdir}/fix-multisampling-with-ati-card.patch
sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
- ./configure -confirm-license -opensource \
+ ./configure -v -confirm-license -opensource \
-prefix /usr \
- -sysconfdir /etc \
+ -docdir /usr/share/doc/qt \
-plugindir /usr/lib/qt/plugins \
- -translationdir /usr/share/qt/translations \
+ -importdir /usr/lib/qt/imports \
-datadir /usr/share/qt \
- -docdir /usr/share/doc/qt \
+ -translationdir /usr/share/qt/translations \
+ -sysconfdir /etc \
-examplesdir /usr/share/doc/qt/examples \
-demosdir /usr/share/doc/qt/demos \
-largefile \
@@ -53,22 +61,24 @@ build() {
-no-phonon-backend \
-svg \
-webkit \
+ -script \
-scripttools \
-system-zlib \
-system-libtiff \
-system-libpng \
-system-libmng \
-system-libjpeg \
- -openssl-linked \
-nomake demos \
-nomake examples \
-nomake docs \
-no-rpath \
+ -no-cups \
+ -openssl-linked \
-silent \
-optimized-qmake \
-dbus \
- -no-separate-debug-info \
-reduce-relocations \
+ -no-separate-debug-info \
-gtkstyle \
-opengl \
-no-openvg \
@@ -101,10 +111,10 @@ package() {
find ${pkgdir}/usr/lib -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
}
-md5sums=('5c69f16d452b0bb3d44bc3c10556c072'
+md5sums=('3a2f25b9b115037277f4fb759194a7a5'
'a445c6917086d80f1cfc1e40cb6b0132'
'd457f0a0ad68a3861c3cadefe3b42ded'
'668331d9798a0e2b94381efb7be4c513'
'c29f2993d6a0f73d756d2fa36e130e1c'
- 'd5c4cad7af93f1d736d4569a207bd739'
- '17382f5532888268bb50d1ab47e5fa19')
+ 'ef20c34afc5be5ed62f2935be66d9402'
+ 'b2e0f134bbb848ebef41134a45a36ee9')
diff --git a/abs/core/qt/__changelog b/abs/core/qt/__changelog
index 86af276..d92474d 100644
--- a/abs/core/qt/__changelog
+++ b/abs/core/qt/__changelog
@@ -1,2 +1,4 @@
remove cups support
added QtWebKit_Flash.patch to fix crash with Flash 10.1 and webkit browsers like mythbrowser. http://trac.webkit.org/changeset/61307 This shouldn't be needed in qt versions 4.6.4 or later.
+
+upgrade to 4.7.0
diff --git a/abs/core/qt/ca-certificates.patch b/abs/core/qt/ca-certificates.patch
deleted file mode 100644
index 02ebbad..0000000
--- a/abs/core/qt/ca-certificates.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp
---- qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp.system_ca_certificates 2009-09-29 06:01:38.000000000 -0500
-+++ qt-x11-opensource-src-4.5.3/src/network/ssl/qsslsocket_openssl.cpp 2009-10-02 11:20:10.674662746 -0500
-@@ -482,8 +482,20 @@ void QSslSocketPrivate::resetDefaultCiph
-
- QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
- {
-+
-+ QFile caBundle;
-+
-+#ifdef Q_OS_UNIX
-+ // Check known locations for the system's default bundle. ### On Windows,
-+ // we should use CAPI to find the bundle, and not rely on default unix
-+ // locations.
-+ caBundle.setFileName(QLatin1String("/etc/ssl/certs/ca-certificates.crt"));
-+ if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
-+ return QSslCertificate::fromDevice(&caBundle);
-+#endif
-+
- // Qt provides a default bundle of certificates
-- QFile caBundle(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
-+ caBundle.setFileName(QLatin1String(":/trolltech/network/ssl/qt-ca-bundle.crt"));
- if (caBundle.open(QIODevice::ReadOnly | QIODevice::Text))
- return QSslCertificate::fromDevice(&caBundle);
-
diff --git a/abs/core/qt/fix-multisampling-with-ati-card.patch b/abs/core/qt/fix-multisampling-with-ati-card.patch
new file mode 100644
index 0000000..c215c2c
--- /dev/null
+++ b/abs/core/qt/fix-multisampling-with-ati-card.patch
@@ -0,0 +1,25 @@
+From e48e50c460434c451c67403390d98f7418c77cce Mon Sep 17 00:00:00 2001
+From: Jonathan Liu <net147@gmail.com>
+Date: Wed, 25 Aug 2010 14:07:40 +1000
+Subject: [PATCH] Fix OpenGL multisampling for some graphics drivers
+
+---
+ src/opengl/qgl_win.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp
+index 5ab944a..8eb6177 100644
+--- a/src/opengl/qgl_win.cpp
++++ b/src/opengl/qgl_win.cpp
+@@ -1042,7 +1042,7 @@ int QGLContext::choosePixelFormat(void* dummyPfd, HDC pdc)
+ iAttributes[i++] = WGL_DRAW_TO_WINDOW_ARB;
+ iAttributes[i++] = TRUE;
+ iAttributes[i++] = WGL_COLOR_BITS_ARB;
+- iAttributes[i++] = 32;
++ iAttributes[i++] = 24;
+ iAttributes[i++] = WGL_DOUBLE_BUFFER_ARB;
+ iAttributes[i++] = d->glFormat.doubleBuffer();
+ if (d->glFormat.stereo()) {
+--
+1.7.2.1
+
diff --git a/abs/core/qt/fix-scroll-when-last-item-is-removed.patch b/abs/core/qt/fix-scroll-when-last-item-is-removed.patch
new file mode 100644
index 0000000..8656702
--- /dev/null
+++ b/abs/core/qt/fix-scroll-when-last-item-is-removed.patch
@@ -0,0 +1,38 @@
+From 6da6b7099d4e0b49329793e4b90703ec3d868048 Mon Sep 17 00:00:00 2001
+From: Frank Reininghaus <frank78ac@googlemail.com>
+Date: Wed, 22 Sep 2010 10:19:59 +0200
+Subject: [PATCH] QTreeView: do not scroll to top if last item is removed
+
+When the last item is the current item and is removed,
+QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's
+viewItems member is cleared. This commit makes sure that viewItems is
+restored by calling QTreeView::doItemsLayout() in this case, preventing
+that the scroll bar range is set to zero temporarily and the view is
+scrolled to the top unexpectedly (this was a regression in 4.7.0:
+QTBUG-13567).
+
+Merge-request: 2481
+Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
+---
+ src/gui/itemviews/qtreeview.cpp | 4 ++++
+ tests/auto/qtreeview/tst_qtreeview.cpp | 22 ++++++++++++++++++++++
+ 2 files changed, 26 insertions(+), 0 deletions(-)
+
+diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
+index b797776..40b51fe 100644
+--- a/src/gui/itemviews/qtreeview.cpp
++++ b/src/gui/itemviews/qtreeview.cpp
+@@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars()
+ if (!viewportSize.isValid())
+ viewportSize = QSize(0, 0);
+
++ if (viewItems.isEmpty()) {
++ q->doItemsLayout();
++ }
++
+ int itemsInViewport = 0;
+ if (uniformRowHeights) {
+ if (defaultItemHeight <= 0)
+--
+1.6.1
+
diff --git a/abs/core/qt/qt-webkit-4.6.3-flash-plugin-segfault.patch b/abs/core/qt/qt-webkit-4.6.3-flash-plugin-segfault.patch
deleted file mode 100644
index 6fc87ca..0000000
--- a/abs/core/qt/qt-webkit-4.6.3-flash-plugin-segfault.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-This patch fixes WebKit Bug 40567: [Qt] QtWebKit crashes while initializing
-flash plugin 10.1.53.64...
-https://bugs.webkit.org/show_bug.cgi?id=40567
-
---- src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp
-+++ src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp
-@@ -35,4 +35,6 @@
-
- namespace WebCore {
-+
-+typedef void gtkInitFunc(int *argc, char ***argv);
-
- bool PluginPackage::fetchInfo()
-@@ -110,4 +112,5 @@
- NP_InitializeFuncPtr NP_Initialize;
- NPError npErr;
-+ gtkInitFunc* gtkInit;
-
- NP_Initialize = (NP_InitializeFuncPtr)m_module->resolve("NP_Initialize");
-@@ -126,4 +129,24 @@
- // It does so in NP_Initialize with a null instance, therefore it is done this way:
- m_browserFuncs.getvalue = staticPluginQuirkRequiresGtkToolKit_NPN_GetValue;
-+ }
-+
-+ // WORKAROUND: Prevent gtk based plugin crashes such as BR# 40567 by
-+ // explicitly forcing the initializing of Gtk, i.e. calling gtk_init,
-+ // whenver the symbol is present in the plugin library loaded above.
-+ // Note that this workaround is based on code from the NSPluginClass ctor
-+ // in KDE's kdebase/apps/nsplugins/viewer/nsplugin.cpp file.
-+ gtkInit = (gtkInitFunc*)m_module->resolve("gtk_init");
-+ if (gtkInit) {
-+ // Prevent gtk_init() from replacing the X error handlers, since the Gtk
-+ // handlers abort when they receive an X error, thus killing the viewer.
-+#ifdef Q_WS_X11
-+ int (*old_error_handler)(Display*, XErrorEvent*) = XSetErrorHandler(0);
-+ int (*old_io_error_handler)(Display*) = XSetIOErrorHandler(0);
-+#endif
-+ gtkInit(0, 0);
-+#ifdef Q_WS_X11
-+ XSetErrorHandler(old_error_handler);
-+ XSetIOErrorHandler(old_io_error_handler);
-+#endif
- }
diff --git a/abs/extra/postgresql-libs/PKGBUILD b/abs/extra/postgresql-libs/PKGBUILD
index ac037c7..14ba9f8 100644
--- a/abs/extra/postgresql-libs/PKGBUILD
+++ b/abs/extra/postgresql-libs/PKGBUILD
@@ -1,58 +1,136 @@
-# $Id: PKGBUILD 27764 2009-02-25 16:30:54Z douglas $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgname=postgresql-libs
-pkgver=8.3.6
-pkgrel=1
-pkgdesc="Libraries for use with PostgreSQL"
-arch=(i686 x86_64)
+# $Id: PKGBUILD 98184 2010-11-04 14:55:39Z dan $
+# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
+
+pkgbase=postgresql
+pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
+pkgver=9.0.1
+pkgrel=2.1
+arch=('i686' 'x86_64')
+url="http://www.postgresql.org"
license=('BSD')
-url="http://www.postgresql.org/"
-depends=('openssl>=0.9.8b' 'zlib' 'readline')
-options=('!makeflags')
-source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2)
+makedepends=('libxml2' 'python2' 'perl')
+source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 \
+ postgresql postgresql.confd build.patch postgresql.pam postgresql.logrotate)
build() {
- cd $startdir/src/postgresql-$pkgver || return 1
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ # patch to remove regress/test make target (won't build with it present)
+ patch -Np1 -i ../build.patch
# configure
- ./configure --prefix=/usr --with-openssl --datadir=/usr/share/postgresql \
- --with-pam \
- || return 1
+ ./configure --prefix=/usr --mandir=/usr/share/man --with-libxml \
+ --with-openssl --with-perl \
+ --with-python PYTHON=/usr/bin/python2 --with-pam \
+ --with-system-tzdata=/usr/share/zoneinfo --enable-nls \
+ --datadir=/usr/share/postgresql --enable-thread-safety
+
+ sed -i -e '/interfaces/d' src/Makefile
+
+ # build
+ make world
+
+ # build libs
+ for dir in src/interfaces src/bin/pg_config; do
+ pushd ${dir}
+ make
+ popd
+ done
+}
+
+package_postgresql-libs() {
+ pkgdesc="Libraries for use with PostgreSQL"
+ depends=('openssl>=1.0.0')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ # install license
+ install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- # make and install
+ # install libs
for dir in src/interfaces src/bin/pg_config; do
- pushd ${dir} || return 1
- make || return 1
- make DESTDIR=${startdir}/pkg install || return 1
+ pushd ${dir}
+ make DESTDIR="${pkgdir}" install
popd
done
- cd src/include || return 1
- make || return 1
-
- set -e
- mkdir -p $startdir/pkg/usr/include/postgresql/{internal,internal/libpq} \
- || return 1
- mkdir -p $startdir/pkg/usr/include/libpq || return 1
-
- # These headers are needed by the public headers of the interfaces.
- install -m644 pg_config.h $startdir/pkg/usr/include/ || return 1
- install -m644 pg_config_os.h $startdir/pkg/usr/include/ || return 1
- install -m644 postgres_ext.h $startdir/pkg/usr/include/ || return 1
- install -m644 libpq/libpq-fs.h $startdir/pkg/usr/include/libpq/ || return 1
- install -m644 pg_config_manual.h $startdir/pkg/usr/include/ || return 1
-
- # These headers are needed by the not-so-public headers of the interfaces.
- install -m644 c.h $startdir/pkg/usr/include/postgresql/internal/ || return 1
- install -m644 port.h $startdir/pkg/usr/include/postgresql/internal/ \
- || return 1
- install -m644 postgres_fe.h $startdir/pkg/usr/include/postgresql/internal/ \
- || return 1
- install -m644 libpq/pqcomm.h $startdir/pkg/usr/include/postgresql/internal/libpq/ || return 1
-
- install -D -m644 ../../COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/LICENSE || return 1
-
- set +e
+ install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1"
+
+ cd src/include
+
+ mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq}
+
+ # these headers are needed by the public headers of the interfaces
+ install -m644 pg_config.h "${pkgdir}/usr/include/"
+ install -m644 pg_config_os.h "${pkgdir}/usr/include/"
+ install -m644 postgres_ext.h "${pkgdir}/usr/include/"
+ install -m644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/"
+ install -m644 pg_config_manual.h "${pkgdir}/usr/include/"
+
+ # these headers are needed by the not-so-public headers of the interfaces
+ install -m644 c.h "${pkgdir}/usr/include/postgresql/internal/"
+ install -m644 port.h "${pkgdir}/usr/include/postgresql/internal/"
+ install -m644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal/"
+ install -m644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq/"
}
-md5sums=('4f8c67d802bd03b5b844e268bba7d44a')
+
+package_postgresql-docs() {
+ pkgdesc="HTML documentation for PostgreSQL"
+ options=(docs)
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ # install license
+ install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ make -C doc/src/sgml DESTDIR="${pkgdir}" install-html
+ chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html/"
+}
+
+package_postgresql() {
+ pkgdesc="A sophisticated object-relational DBMS"
+ backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql')
+ depends=("postgresql-libs>=${pkgver}" 'libxml2' 'readline>=6.0')
+ optdepends=('python2: for PL/Python support'
+ 'perl: for PL/Perl support')
+ provides=('postgresql-client')
+ conflicts=('postgresql-client')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ # install
+ make DESTDIR="${pkgdir}" install
+ make -C contrib DESTDIR="${pkgdir}" install
+ make -C doc/src/sgml DESTDIR="${pkgdir}" install-man
+ # we don't want this, it is in the -libs package
+ make -C src/bin/pg_config DESTDIR="${pkgdir}" uninstall
+ rm "${pkgdir}/usr/share/man/man1/pg_config.1"
+
+ # install license
+ install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
+
+ # clean up unneeded installed items
+ rm -rf "${pkgdir}/usr/include/postgresql/internal"
+ rm -rf "${pkgdir}/usr/include/libpq"
+ find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} +
+
+ # install launch script
+ install -D -m755 "${srcdir}/postgresql" "${pkgdir}/etc/rc.d/postgresql"
+
+ # install conf file
+ install -D -m644 ${srcdir}/postgresql.confd \
+ "${pkgdir}/etc/conf.d/postgresql"
+
+ install -D -m644 ${srcdir}/postgresql.pam \
+ "${pkgdir}/etc/pam.d/postgresql"
+
+ install -D -m644 ${srcdir}/postgresql.logrotate \
+ "${pkgdir}/etc/logrotate.d/postgresql"
+}
+
+md5sums=('57ba57e43cfe29e16dacbf5789be98d1'
+ '4153ac0ef4a77e709385b0a13e1c0fad'
+ 'd63a05943cf0a2726aa2070f3033c569'
+ '4d74f4227dc5e12bf95b3490758d86c9'
+ '96f82c38f3f540b53f3e5144900acf17'
+ 'd28e443f9f65a5712c52018b84e27137')
diff --git a/abs/extra/postgresql-libs/build.patch b/abs/extra/postgresql-libs/build.patch
new file mode 100644
index 0000000..c8f665d
--- /dev/null
+++ b/abs/extra/postgresql-libs/build.patch
@@ -0,0 +1,11 @@
+diff -Naur postgresql-8.2.3-orig/src/Makefile postgresql-8.2.3/src/Makefile
+--- postgresql-8.2.3-orig/src/Makefile 2006-06-22 16:50:35.000000000 -0700
++++ postgresql-8.2.3/src/Makefile 2007-03-05 10:46:24.000000000 -0800
+@@ -23,7 +23,6 @@
+ $(MAKE) -C bin $@
+ $(MAKE) -C pl $@
+ $(MAKE) -C makefiles $@
+- $(MAKE) -C test/regress $@
+
+ install: install-local
+
diff --git a/abs/extra/postgresql-libs/postgresql b/abs/extra/postgresql-libs/postgresql
new file mode 100755
index 0000000..b00289e
--- /dev/null
+++ b/abs/extra/postgresql-libs/postgresql
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/postgresql
+
+case "$1" in
+ start)
+ stat_busy "Starting PostgreSQL"
+ # initialization
+ if [ ! `egrep '^postgres:' /etc/group` ]; then
+ stat_busy "Adding postgres group"
+ groupadd -g 88 postgres
+ stat_done
+ fi
+ if [ ! `egrep '^postgres:' /etc/passwd` ]; then
+ stat_busy "Adding postgres user"
+ useradd -u 88 -g postgres -d $PGROOT -s /bin/bash postgres
+ [ -d $PGROOT ] && chown -R postgres.postgres $PGROOT
+ stat_done
+ fi
+ if [ ! -d $PGROOT ]; then
+ mkdir -p $PGROOT/data && chown -R postgres.postgres $PGROOT
+ su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data"
+ fi
+ if [ ! -e /var/log/postgresql.log ]; then
+ touch /var/log/postgresql.log
+ chown postgres /var/log/postgresql.log
+ fi
+ # start the process
+ su - postgres -c \
+ "/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -W start"
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon postgresql
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping PostgreSQL"
+ su - postgres -c \
+ "/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -w stop"
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon postgresql
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 3
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/abs/extra/postgresql-libs/postgresql.confd b/abs/extra/postgresql-libs/postgresql.confd
new file mode 100644
index 0000000..5f8fa03
--- /dev/null
+++ b/abs/extra/postgresql-libs/postgresql.confd
@@ -0,0 +1,5 @@
+#
+# Parameters to be passed to postgresql
+#
+PGROOT="/var/lib/postgres"
+INITOPTS="--locale $LANG"
diff --git a/abs/extra/postgresql-libs/postgresql.logrotate b/abs/extra/postgresql-libs/postgresql.logrotate
new file mode 100644
index 0000000..9c36918
--- /dev/null
+++ b/abs/extra/postgresql-libs/postgresql.logrotate
@@ -0,0 +1,4 @@
+/var/log/postgresql.log {
+ copytruncate
+ missingok
+}
diff --git a/abs/extra/postgresql-libs/postgresql.pam b/abs/extra/postgresql-libs/postgresql.pam
new file mode 100644
index 0000000..53724d1
--- /dev/null
+++ b/abs/extra/postgresql-libs/postgresql.pam
@@ -0,0 +1,3 @@
+auth required pam_unix.so
+account required pam_unix.so
+session required pam_unix.so
diff --git a/abs/extra/postgresql/PKGBUILD b/abs/extra/postgresql/PKGBUILD
index 1fda9a4..14ba9f8 100644
--- a/abs/extra/postgresql/PKGBUILD
+++ b/abs/extra/postgresql/PKGBUILD
@@ -1,79 +1,136 @@
-# $Id: PKGBUILD 27762 2009-02-25 16:29:49Z douglas $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgname=postgresql
-pkgver=8.3.6
-pkgrel=1
-pkgdesc="A sophisticated object-relational DBMS"
-arch=(i686 x86_64)
+# $Id: PKGBUILD 98184 2010-11-04 14:55:39Z dan $
+# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
+
+pkgbase=postgresql
+pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
+pkgver=9.0.1
+pkgrel=2.1
+arch=('i686' 'x86_64')
+url="http://www.postgresql.org"
license=('BSD')
-backup=('etc/conf.d/postgresql' '/etc/pam.d/postgresql')
-url="http://www.postgresql.org/"
-depends=("postgresql-libs>=$pkgver" "libxml2")
-options=('!makeflags')
+makedepends=('libxml2' 'python2' 'perl')
source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 \
- postgresql postgresql.confd build.patch postgresql.pam)
+ postgresql postgresql.confd build.patch postgresql.pam postgresql.logrotate)
build() {
- cd ${startdir}/src/$pkgname-$pkgver || return 1
+ cd "${srcdir}/${pkgbase}-${pkgver}"
# patch to remove regress/test make target (won't build with it present)
- patch -Np1 -i ../build.patch || return 1
+ patch -Np1 -i ../build.patch
# configure
- ./configure --prefix=/usr --mandir=/usr/share/man \
- --with-docdir=/usr/share/doc --with-openssl \
- --datadir=/usr/share/postgresql --with-pam --with-libxml || return 1
+ ./configure --prefix=/usr --mandir=/usr/share/man --with-libxml \
+ --with-openssl --with-perl \
+ --with-python PYTHON=/usr/bin/python2 --with-pam \
+ --with-system-tzdata=/usr/share/zoneinfo --enable-nls \
+ --datadir=/usr/share/postgresql --enable-thread-safety
- sed -i -e '/interfaces/d' src/Makefile || return 1
+ sed -i -e '/interfaces/d' src/Makefile
# build
- make || return 1
+ make world
+
+ # build libs
+ for dir in src/interfaces src/bin/pg_config; do
+ pushd ${dir}
+ make
+ popd
+ done
+}
- # install
- make DESTDIR=${startdir}/pkg install || return 1
+package_postgresql-libs() {
+ pkgdesc="Libraries for use with PostgreSQL"
+ depends=('openssl>=1.0.0')
- (
- cd contrib/adminpack;
- make || return 1;
- make DESTDIR=${startdir}/pkg install || return 1;
- );
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ # install license
+ install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- # clean up unneeded installed items
- rm -rf $startdir/pkg/usr/include/postgresql/internal || return 1
- rm -rf $startdir/pkg/usr/include/libpq || return 1
- # the below line is expected to produce an error; fix this one day
- rm -f $startdir/pkg/usr/include/*
- rm -f $startdir/pkg/usr/bin/pg_config || return 1
-
- # Maintaining the lib below because of qt
- #rm -f $startdir/pkg/usr/lib/libpgport.a || return 1
+ # install libs
+ for dir in src/interfaces src/bin/pg_config; do
+ pushd ${dir}
+ make DESTDIR="${pkgdir}" install
+ popd
+ done
- # install launch script
- install -D -m755 ../postgresql $startdir/pkg/etc/rc.d/postgresql \
- || return 1
+ install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1"
+
+ cd src/include
+
+ mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq}
+
+ # these headers are needed by the public headers of the interfaces
+ install -m644 pg_config.h "${pkgdir}/usr/include/"
+ install -m644 pg_config_os.h "${pkgdir}/usr/include/"
+ install -m644 postgres_ext.h "${pkgdir}/usr/include/"
+ install -m644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/"
+ install -m644 pg_config_manual.h "${pkgdir}/usr/include/"
+
+ # these headers are needed by the not-so-public headers of the interfaces
+ install -m644 c.h "${pkgdir}/usr/include/postgresql/internal/"
+ install -m644 port.h "${pkgdir}/usr/include/postgresql/internal/"
+ install -m644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal/"
+ install -m644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq/"
+}
+
+package_postgresql-docs() {
+ pkgdesc="HTML documentation for PostgreSQL"
+ options=(docs)
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
# install license
- install -D -m644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/LICENSE || return 1
+ install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ make -C doc/src/sgml DESTDIR="${pkgdir}" install-html
+ chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html/"
+}
+
+package_postgresql() {
+ pkgdesc="A sophisticated object-relational DBMS"
+ backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql')
+ depends=("postgresql-libs>=${pkgver}" 'libxml2' 'readline>=6.0')
+ optdepends=('python2: for PL/Python support'
+ 'perl: for PL/Perl support')
+ provides=('postgresql-client')
+ conflicts=('postgresql-client')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ # install
+ make DESTDIR="${pkgdir}" install
+ make -C contrib DESTDIR="${pkgdir}" install
+ make -C doc/src/sgml DESTDIR="${pkgdir}" install-man
+ # we don't want this, it is in the -libs package
+ make -C src/bin/pg_config DESTDIR="${pkgdir}" uninstall
+ rm "${pkgdir}/usr/share/man/man1/pg_config.1"
+
+ # install license
+ install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
+
+ # clean up unneeded installed items
+ rm -rf "${pkgdir}/usr/include/postgresql/internal"
+ rm -rf "${pkgdir}/usr/include/libpq"
+ find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} +
+
+ # install launch script
+ install -D -m755 "${srcdir}/postgresql" "${pkgdir}/etc/rc.d/postgresql"
# install conf file
- install -D -m644 $startdir/src/postgresql.confd \
- $startdir/pkg/etc/conf.d/postgresql || return 1
+ install -D -m644 ${srcdir}/postgresql.confd \
+ "${pkgdir}/etc/conf.d/postgresql"
- install -D -m644 $startdir/src/postgresql.pam \
- $startdir/pkg/etc/pam.d/postgresql
+ install -D -m644 ${srcdir}/postgresql.pam \
+ "${pkgdir}/etc/pam.d/postgresql"
- chown root:root $startdir/pkg/usr/share/doc/postgresql/html/*
+ install -D -m644 ${srcdir}/postgresql.logrotate \
+ "${pkgdir}/etc/logrotate.d/postgresql"
}
-md5sums=('4f8c67d802bd03b5b844e268bba7d44a'
- '7d8ea2abb6a8cdacf35604bda659a34a'
- 'df6ddf9e2ab4700a3415f17c0f4f4172'
- '4d74f4227dc5e12bf95b3490758d86c9'
- '96f82c38f3f540b53f3e5144900acf17')
-md5sums=('4f8c67d802bd03b5b844e268bba7d44a'
- '7d8ea2abb6a8cdacf35604bda659a34a'
- 'df6ddf9e2ab4700a3415f17c0f4f4172'
+md5sums=('57ba57e43cfe29e16dacbf5789be98d1'
+ '4153ac0ef4a77e709385b0a13e1c0fad'
+ 'd63a05943cf0a2726aa2070f3033c569'
'4d74f4227dc5e12bf95b3490758d86c9'
- '96f82c38f3f540b53f3e5144900acf17')
+ '96f82c38f3f540b53f3e5144900acf17'
+ 'd28e443f9f65a5712c52018b84e27137')
diff --git a/abs/extra/postgresql/postgresql b/abs/extra/postgresql/postgresql
index c6aedfb..b00289e 100755
--- a/abs/extra/postgresql/postgresql
+++ b/abs/extra/postgresql/postgresql
@@ -20,8 +20,8 @@ case "$1" in
stat_done
fi
if [ ! -d $PGROOT ]; then
- mkdir -p $PGROOT/data && chown postgres.postgres $PGROOT/data
- su - postgres -c "/usr/bin/initdb -D $PGROOT/data"
+ mkdir -p $PGROOT/data && chown -R postgres.postgres $PGROOT
+ su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data"
fi
if [ ! -e /var/log/postgresql.log ]; then
touch /var/log/postgresql.log
diff --git a/abs/extra/postgresql/postgresql.confd b/abs/extra/postgresql/postgresql.confd
index 7bbf016..5f8fa03 100644
--- a/abs/extra/postgresql/postgresql.confd
+++ b/abs/extra/postgresql/postgresql.confd
@@ -1,4 +1,5 @@
#
# Parameters to be passed to postgresql
#
-PGROOT="/var/lib/postgres" \ No newline at end of file
+PGROOT="/var/lib/postgres"
+INITOPTS="--locale $LANG"
diff --git a/abs/extra/postgresql/postgresql.logrotate b/abs/extra/postgresql/postgresql.logrotate
new file mode 100644
index 0000000..9c36918
--- /dev/null
+++ b/abs/extra/postgresql/postgresql.logrotate
@@ -0,0 +1,4 @@
+/var/log/postgresql.log {
+ copytruncate
+ missingok
+}
generated by cgit v0.12 at 2024-11-27 21:08:13 (GMT)