[arch-commits] Commit in haskell-mtl/repos (extra-i686 testing-i686)
Date: Saturday, January 16, 2010 @ 05:39:27 Author: vesa Revision: 63210 db-move: moved haskell-mtl from [testing] to [extra] (i686) Added: haskell-mtl/repos/extra-i686/ Deleted: haskell-mtl/repos/testing-i686/
[arch-commits] Commit in haskell-mtl/repos (extra-x86_64 testing-x86_64)
Date: Saturday, January 16, 2010 @ 05:39:33 Author: vesa Revision: 63211 db-move: moved haskell-mtl from [testing] to [extra] (x86_64) Added: haskell-mtl/repos/extra-x86_64/ Deleted: haskell-mtl/repos/testing-x86_64/
[arch-commits] Commit in filesystem/repos (core-any)
Date: Saturday, January 16, 2010 @ 07:04:39 Author: thomas Revision: 63212 db-move: filesystem removed by thomas for move to core Deleted: filesystem/repos/core-any/
[arch-commits] Commit in filesystem/repos (core-any testing-any)
Date: Saturday, January 16, 2010 @ 07:04:39 Author: thomas Revision: 63213 db-move: moved filesystem from [testing] to [core] (any) Added: filesystem/repos/core-any/ Deleted: filesystem/repos/testing-any/
[arch-commits] Commit in rfkill/repos (core-i686 testing-i686)
Date: Saturday, January 16, 2010 @ 07:05:08 Author: thomas Revision: 63214 db-move: moved rfkill from [testing] to [core] (i686) Added: rfkill/repos/core-i686/ Deleted: rfkill/repos/testing-i686/
[arch-commits] Commit in rfkill/repos (core-x86_64 testing-x86_64)
Date: Saturday, January 16, 2010 @ 07:05:13 Author: thomas Revision: 63215 db-move: moved rfkill from [testing] to [core] (x86_64) Added: rfkill/repos/core-x86_64/ Deleted: rfkill/repos/testing-x86_64/
[arch-commits] Commit in kdelibs3/trunk (3 files)
Date: Saturday, January 16, 2010 @ 07:52:35
Author: pierre
Revision: 63216
cleanup & update for recent tool chain
Added:
kdelibs3/trunk/acinclude.patch
Modified:
kdelibs3/trunk/PKGBUILD
Deleted:
kdelibs3/trunk/kde-3.5-1002164.patch
---+
PKGBUILD | 33 +-
acinclude.patch | 66 +
kde-3.5-1002164.patch | 557
3 files changed, 83 insertions(+), 573 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 12:05:13 UTC (rev 63215)
+++ PKGBUILD2010-01-16 12:52:35 UTC (rev 63216)
@@ -4,25 +4,26 @@
pkgname=kdelibs3
pkgver=3.5.10
-pkgrel=7
-pkgdesc="KDE3 Core Libraries"
+pkgrel=8
+pkgdesc='KDE3 Core Libraries'
arch=('i686' 'x86_64')
-url="http://www.kde.org";
+url='http://www.kde.org'
license=('GPL' 'LGPL')
-depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups>=1.3.10-3'
- 'jasper>=1.900.1-3' 'bzip2' 'openssl' 'libidn' 'libxrender' 'openexr'
-'aspell' 'heimdal' 'acl' 'libtiff' 'qt3>=3.3.8-12' 'ca-certificates')
-makedepends=('pkgconfig' 'cups' 'hspell' 'autoconf<2.64')
+depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
+ 'bzip2' 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
+makedepends=('pkgconfig' 'cups' 'hspell' 'autoconf')
options=('libtool')
install='kdelibs3.install'
-source=("http://download.kde.org/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2";
- 'kde3.profile'
- 'kde-3.5-1002164.patch'
- 'kde4-compatibility.patch'
- 'kconf_updaterc')
+source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2";
+'ftp://ftp.archlinux.org/other/kde/kde-3.5-1074156.patch.gz'
+'acinclude.patch'
+'kde3.profile'
+'kde4-compatibility.patch'
+'kconf_updaterc')
md5sums=('43cd55ed15f63b5738d620ef9f9fd568'
+ 'ca50d4515468cfda80946690c53073f3'
+ 'a5aedcc9550809ce6672a7dddf9f5ad4'
'ab14ce2c40698e24e162284d50c6f466'
- '3632ec69d0866e8d6ff7fa2cfce76fb1'
'f4e0735475b5de59d738d68a9f467b77'
'11e49bc6aca497f55610146afe217751')
@@ -32,12 +33,12 @@
. /etc/profile.d/qt3.sh
. $srcdir/kde3.profile
- patch -p0 -i $srcdir/kde-3.5-1002164.patch || return 1
+ patch -p0 -i $srcdir/kde-3.5-1074156.patch || return 1
+ patch -p1 -i $srcdir/acinclude.patch || return 1
patch -p1 -i $srcdir/kde4-compatibility.patch || return 1
sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|'
admin/cvs.sh
- sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|'
admin/cvs.shautomake
- make -f admin/Makefile.common dist
+ make -f admin/Makefile.common cvs
./configure --prefix=/opt/kde \
--with-distribution='Arch Linux' \
Added: acinclude.patch
===
--- acinclude.patch (rev 0)
+++ acinclude.patch 2010-01-16 12:52:35 UTC (rev 63216)
@@ -0,0 +1,66 @@
+2009-12-10 Stepan Kasal
+
+The change of implementation of AC_REQUIRE in 2.64 caused a regression
+in the arts project.
+This can be fixed by shuffling some macro calls.
+
+I suppose that most of this patch will not be needed with a future
+release of Autoconf.
+But the last chunk of this patch is a real bug in this source and
+should go upstream.
+
+--- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.0 +0200
arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.0 +0100
+@@ -3081,8 +3081,18 @@
+ fi
+ ])
+
++AC_DEFUN([AC_CHECK_COMPILERS_CC],
++[
++ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
++ CFLAGS=" $CFLAGS"
++ AC_PROG_CC
++ CXXFLAGS=" $CXXFLAGS"
++ AC_PROG_CXX
++])
++
+ AC_DEFUN([AC_CHECK_COMPILERS],
+ [
++ AC_REQUIRE([AC_CHECK_COMPILERS_CC])
+ AC_ARG_ENABLE(debug,
+ AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols
(yes|no|full) [default=no]]),
+ [
+@@ -3141,11 +3151,6 @@
+ [kde_use_profiling="no"]
+ )
+
+- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
+- CFLAGS=" $CFLAGS"
+-
+- AC_PROG_CC
+-
+ AC_PROG_CPP
+
+ if test "$GCC" = "yes"; then
+@@ -3174,10 +3179,6 @@
+ LDFLAGS=""
+ fi
+
+- CXXFLAGS=" $CXXFLAGS"
+-
+- AC_PROG_CXX
+-
+ KDE_CHECK_FOR_BAD_COMPILER
+
+ if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
+@@ -3503,8 +3504,8 @@
+ AC_REQUIRE([AC_LIBTOOL_DLOPEN])
+ AC_REQUIRE([KDE_CHECK_LIB64])
+
+-AC_OBJEXT
+-AC_EXEEXT
++AC_REQUIRE([AC_OBJEXT])
++AC_REQUIRE([AC_EXEEXT])
+
+ AM_PROG_LIBTOOL
+ AC_LIBTOOL_CXX
Deleted: kde-3.5-1002164.patch
===
--- kde-3.5-1002164.patch 2010-01-16 12:05:13 UTC (rev 63215)
+++ kde-3.5-1002164.patch 2010-01-16 12:52:35 UTC (rev 63216)
@@ -1,557 +0,0 @@
-Index: kate/data/c
[arch-commits] Commit in kdelibs3/repos (4 files)
Date: Saturday, January 16, 2010 @ 08:35:45
Author: pierre
Revision: 63217
Merged revisions 63216 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdelibs3/trunk
r63216 | pierre | 2010-01-16 13:52:35 +0100 (Sa, 16 Jan 2010) | 1 line
cleanup & update for recent tool chain
Added:
kdelibs3/repos/extra-i686/acinclude.patch
(from rev 63216, kdelibs3/trunk/acinclude.patch)
Modified:
kdelibs3/repos/extra-i686/(properties)
kdelibs3/repos/extra-i686/PKGBUILD
Deleted:
kdelibs3/repos/extra-i686/kde-3.5-1002164.patch
---+
PKGBUILD | 33 +-
acinclude.patch | 66 +
kde-3.5-1002164.patch | 557
3 files changed, 83 insertions(+), 573 deletions(-)
Property changes on: kdelibs3/repos/extra-i686
___
Modified: svnmerge-integrated
- /kdelibs3/trunk:1-49397
+ /kdelibs3/trunk:1-63216
Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-01-16 12:52:35 UTC (rev 63216)
+++ extra-i686/PKGBUILD 2010-01-16 13:35:45 UTC (rev 63217)
@@ -4,25 +4,26 @@
pkgname=kdelibs3
pkgver=3.5.10
-pkgrel=7
-pkgdesc="KDE3 Core Libraries"
+pkgrel=8
+pkgdesc='KDE3 Core Libraries'
arch=('i686' 'x86_64')
-url="http://www.kde.org";
+url='http://www.kde.org'
license=('GPL' 'LGPL')
-depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups>=1.3.10-3'
- 'jasper>=1.900.1-3' 'bzip2' 'openssl' 'libidn' 'libxrender' 'openexr'
-'aspell' 'heimdal' 'acl' 'libtiff' 'qt3>=3.3.8-12' 'ca-certificates')
-makedepends=('pkgconfig' 'cups' 'hspell' 'autoconf<2.64')
+depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
+ 'bzip2' 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
+makedepends=('pkgconfig' 'cups' 'hspell' 'autoconf')
options=('libtool')
install='kdelibs3.install'
-source=("http://download.kde.org/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2";
- 'kde3.profile'
- 'kde-3.5-1002164.patch'
- 'kde4-compatibility.patch'
- 'kconf_updaterc')
+source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2";
+'ftp://ftp.archlinux.org/other/kde/kde-3.5-1074156.patch.gz'
+'acinclude.patch'
+'kde3.profile'
+'kde4-compatibility.patch'
+'kconf_updaterc')
md5sums=('43cd55ed15f63b5738d620ef9f9fd568'
+ 'ca50d4515468cfda80946690c53073f3'
+ 'a5aedcc9550809ce6672a7dddf9f5ad4'
'ab14ce2c40698e24e162284d50c6f466'
- '3632ec69d0866e8d6ff7fa2cfce76fb1'
'f4e0735475b5de59d738d68a9f467b77'
'11e49bc6aca497f55610146afe217751')
@@ -32,12 +33,12 @@
. /etc/profile.d/qt3.sh
. $srcdir/kde3.profile
- patch -p0 -i $srcdir/kde-3.5-1002164.patch || return 1
+ patch -p0 -i $srcdir/kde-3.5-1074156.patch || return 1
+ patch -p1 -i $srcdir/acinclude.patch || return 1
patch -p1 -i $srcdir/kde4-compatibility.patch || return 1
sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|'
admin/cvs.sh
- sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|'
admin/cvs.shautomake
- make -f admin/Makefile.common dist
+ make -f admin/Makefile.common cvs
./configure --prefix=/opt/kde \
--with-distribution='Arch Linux' \
Copied: kdelibs3/repos/extra-i686/acinclude.patch (from rev 63216,
kdelibs3/trunk/acinclude.patch)
===
--- extra-i686/acinclude.patch (rev 0)
+++ extra-i686/acinclude.patch 2010-01-16 13:35:45 UTC (rev 63217)
@@ -0,0 +1,66 @@
+2009-12-10 Stepan Kasal
+
+The change of implementation of AC_REQUIRE in 2.64 caused a regression
+in the arts project.
+This can be fixed by shuffling some macro calls.
+
+I suppose that most of this patch will not be needed with a future
+release of Autoconf.
+But the last chunk of this patch is a real bug in this source and
+should go upstream.
+
+--- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.0 +0200
arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.0 +0100
+@@ -3081,8 +3081,18 @@
+ fi
+ ])
+
++AC_DEFUN([AC_CHECK_COMPILERS_CC],
++[
++ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
++ CFLAGS=" $CFLAGS"
++ AC_PROG_CC
++ CXXFLAGS=" $CXXFLAGS"
++ AC_PROG_CXX
++])
++
+ AC_DEFUN([AC_CHECK_COMPILERS],
+ [
++ AC_REQUIRE([AC_CHECK_COMPILERS_CC])
+ AC_ARG_ENABLE(debug,
+ AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols
(yes|no|full) [default=no]]),
+ [
+@@ -3141,11 +3151,6 @@
+ [kde_use_profiling="no"]
+ )
+
+- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
+- CFLAGS=" $CFLAGS"
+-
+- AC_PROG_CC
+-
+ AC_PROG_CPP
+
+ if test "$GCC" = "yes"; then
+@@ -3174,
[arch-commits] Commit in kdelibs3/repos (4 files)
Date: Saturday, January 16, 2010 @ 08:39:49
Author: pierre
Revision: 63218
Merged revisions 63216 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdelibs3/trunk
r63216 | pierre | 2010-01-16 13:52:35 +0100 (Sa, 16 Jan 2010) | 1 line
cleanup & update for recent tool chain
Added:
kdelibs3/repos/extra-x86_64/acinclude.patch
(from rev 63216, kdelibs3/trunk/acinclude.patch)
Modified:
kdelibs3/repos/extra-x86_64/ (properties)
kdelibs3/repos/extra-x86_64/PKGBUILD
Deleted:
kdelibs3/repos/extra-x86_64/kde-3.5-1002164.patch
---+
PKGBUILD | 33 +-
acinclude.patch | 66 +
kde-3.5-1002164.patch | 557
3 files changed, 83 insertions(+), 573 deletions(-)
Property changes on: kdelibs3/repos/extra-x86_64
___
Modified: svnmerge-integrated
- /kdelibs3/trunk:1-49396
+ /kdelibs3/trunk:1-63217
Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2010-01-16 13:35:45 UTC (rev 63217)
+++ extra-x86_64/PKGBUILD 2010-01-16 13:39:49 UTC (rev 63218)
@@ -4,25 +4,26 @@
pkgname=kdelibs3
pkgver=3.5.10
-pkgrel=7
-pkgdesc="KDE3 Core Libraries"
+pkgrel=8
+pkgdesc='KDE3 Core Libraries'
arch=('i686' 'x86_64')
-url="http://www.kde.org";
+url='http://www.kde.org'
license=('GPL' 'LGPL')
-depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups>=1.3.10-3'
- 'jasper>=1.900.1-3' 'bzip2' 'openssl' 'libidn' 'libxrender' 'openexr'
-'aspell' 'heimdal' 'acl' 'libtiff' 'qt3>=3.3.8-12' 'ca-certificates')
-makedepends=('pkgconfig' 'cups' 'hspell' 'autoconf<2.64')
+depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
+ 'bzip2' 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
+makedepends=('pkgconfig' 'cups' 'hspell' 'autoconf')
options=('libtool')
install='kdelibs3.install'
-source=("http://download.kde.org/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2";
- 'kde3.profile'
- 'kde-3.5-1002164.patch'
- 'kde4-compatibility.patch'
- 'kconf_updaterc')
+source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2";
+'ftp://ftp.archlinux.org/other/kde/kde-3.5-1074156.patch.gz'
+'acinclude.patch'
+'kde3.profile'
+'kde4-compatibility.patch'
+'kconf_updaterc')
md5sums=('43cd55ed15f63b5738d620ef9f9fd568'
+ 'ca50d4515468cfda80946690c53073f3'
+ 'a5aedcc9550809ce6672a7dddf9f5ad4'
'ab14ce2c40698e24e162284d50c6f466'
- '3632ec69d0866e8d6ff7fa2cfce76fb1'
'f4e0735475b5de59d738d68a9f467b77'
'11e49bc6aca497f55610146afe217751')
@@ -32,12 +33,12 @@
. /etc/profile.d/qt3.sh
. $srcdir/kde3.profile
- patch -p0 -i $srcdir/kde-3.5-1002164.patch || return 1
+ patch -p0 -i $srcdir/kde-3.5-1074156.patch || return 1
+ patch -p1 -i $srcdir/acinclude.patch || return 1
patch -p1 -i $srcdir/kde4-compatibility.patch || return 1
sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|'
admin/cvs.sh
- sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|'
admin/cvs.shautomake
- make -f admin/Makefile.common dist
+ make -f admin/Makefile.common cvs
./configure --prefix=/opt/kde \
--with-distribution='Arch Linux' \
Copied: kdelibs3/repos/extra-x86_64/acinclude.patch (from rev 63216,
kdelibs3/trunk/acinclude.patch)
===
--- extra-x86_64/acinclude.patch(rev 0)
+++ extra-x86_64/acinclude.patch2010-01-16 13:39:49 UTC (rev 63218)
@@ -0,0 +1,66 @@
+2009-12-10 Stepan Kasal
+
+The change of implementation of AC_REQUIRE in 2.64 caused a regression
+in the arts project.
+This can be fixed by shuffling some macro calls.
+
+I suppose that most of this patch will not be needed with a future
+release of Autoconf.
+But the last chunk of this patch is a real bug in this source and
+should go upstream.
+
+--- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.0 +0200
arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.0 +0100
+@@ -3081,8 +3081,18 @@
+ fi
+ ])
+
++AC_DEFUN([AC_CHECK_COMPILERS_CC],
++[
++ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
++ CFLAGS=" $CFLAGS"
++ AC_PROG_CC
++ CXXFLAGS=" $CXXFLAGS"
++ AC_PROG_CXX
++])
++
+ AC_DEFUN([AC_CHECK_COMPILERS],
+ [
++ AC_REQUIRE([AC_CHECK_COMPILERS_CC])
+ AC_ARG_ENABLE(debug,
+ AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols
(yes|no|full) [default=no]]),
+ [
+@@ -3141,11 +3151,6 @@
+ [kde_use_profiling="no"]
+ )
+
+- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
+- CFLAGS=" $CFLAGS"
+-
+- AC_PROG_CC
+-
+ AC_PROG_CPP
+
[arch-commits] Commit in qscintilla/kde-unstable (PKGBUILD)
Date: Saturday, January 16, 2010 @ 09:52:44
Author: andrea
Revision: 63219
upstream release
Modified:
qscintilla/kde-unstable/PKGBUILD
--+
PKGBUILD |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 13:39:49 UTC (rev 63218)
+++ PKGBUILD2010-01-16 14:52:44 UTC (rev 63219)
@@ -5,8 +5,7 @@
# Contributor: DaNiMoTh
pkgname=qscintilla
-pkgver=2.4.120091222
-_pkgver=2.4.1-snapshot-20091222
+pkgver=2.4.1
pkgrel=1
license=('GPL')
pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
@@ -16,11 +15,11 @@
provides=('qscintilla2')
conflicts=('qscintilla2')
replaces=('qscintilla2')
-source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-$_pkgver.tar.gz)
-md5sums=('16c42bcc327ef465607fca1ef0cab9af')
+source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-$pkgver.tar.gz)
+md5sums=('2815ea8b7f15d857d657743d023dcbc3')
build() {
-cd $srcdir/QScintilla-gpl-$_pkgver/Qt4
+cd $srcdir/QScintilla-gpl-$pkgver/Qt4
sed -i "s|DESTDIR = .*|DESTDIR = $pkgdir/usr/lib|g" qscintilla.pro
sed -i "s|header.path = .*|header.path = $pkgdir/usr/include|g"
qscintilla.pro
sed -i "s|trans.path = .*|trans.path =
$pkgdir/usr/share/qt/translations|g" qscintilla.pro
[arch-commits] Commit in sip/kde-unstable (PKGBUILD)
Date: Saturday, January 16, 2010 @ 09:52:55
Author: andrea
Revision: 63220
upstream release
Modified:
sip/kde-unstable/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 14:52:44 UTC (rev 63219)
+++ PKGBUILD2010-01-16 14:52:55 UTC (rev 63220)
@@ -4,8 +4,8 @@
# Contributor: riai , Ben
pkgname=sip
-pkgver=4.1020100102
-_pkgver=4.10-snapshot-20100102
+pkgver=4.10.0
+_pkgver=4.10
pkgrel=1
pkgdesc="A tool that makes it easy to create Python bindings for C and C++
libraries"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
license=('custom:"sip"')
depends=('python' 'gcc-libs')
source=(http://riverbankcomputing.com/static/Downloads/${pkgname}4/${pkgname}-${_pkgver}.tar.gz)
-md5sums=('a8456d56398b0daf82d64453b4996baa')
+md5sums=('4b8f7361839b33868dd3cc576509ba8e')
build() {
cd ${srcdir}/${pkgname}-${_pkgver}
[arch-commits] Commit in pyqt/kde-unstable (PKGBUILD)
Date: Saturday, January 16, 2010 @ 09:53:03
Author: andrea
Revision: 63221
upstream release
Modified:
pyqt/kde-unstable/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 14:52:55 UTC (rev 63220)
+++ PKGBUILD2010-01-16 14:53:03 UTC (rev 63221)
@@ -4,8 +4,8 @@
# Contributor: riai Ben
pkgname=pyqt
-pkgver=4.720100108
-_pkgver=4.7-snapshot-20100108
+pkgver=4.7.0
+_pkgver=4.7
pkgrel=1
pkgdesc="A set of Python bindings for the Qt toolkit"
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
replaces=('pyqt4')
conflicts=('pyqt4')
source=(http://riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-${_pkgver}.tar.gz)
-md5sums=('4581a56d2858dfd893bd25a945d16b8f')
+md5sums=('4882179ab4da128aaa8520f146afb955')
build() {
cd ${srcdir}/PyQt-x11-gpl-${_pkgver}
[arch-commits] Commit in qscintilla/kde-unstable (PKGBUILD)
Date: Saturday, January 16, 2010 @ 10:09:15
Author: andrea
Revision: 63222
force update
Modified:
qscintilla/kde-unstable/PKGBUILD
--+
PKGBUILD |1 +
1 file changed, 1 insertion(+)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 14:53:03 UTC (rev 63221)
+++ PKGBUILD2010-01-16 15:09:15 UTC (rev 63222)
@@ -17,6 +17,7 @@
replaces=('qscintilla2')
source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-$pkgver.tar.gz)
md5sums=('2815ea8b7f15d857d657743d023dcbc3')
+options=('force')
build() {
cd $srcdir/QScintilla-gpl-$pkgver/Qt4
[arch-commits] Commit in sip/kde-unstable (PKGBUILD)
Date: Saturday, January 16, 2010 @ 10:10:30
Author: andrea
Revision: 63223
force update
Modified:
sip/kde-unstable/PKGBUILD
--+
PKGBUILD |1 +
1 file changed, 1 insertion(+)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 15:09:15 UTC (rev 63222)
+++ PKGBUILD2010-01-16 15:10:30 UTC (rev 63223)
@@ -14,6 +14,7 @@
depends=('python' 'gcc-libs')
source=(http://riverbankcomputing.com/static/Downloads/${pkgname}4/${pkgname}-${_pkgver}.tar.gz)
md5sums=('4b8f7361839b33868dd3cc576509ba8e')
+options=('force')
build() {
cd ${srcdir}/${pkgname}-${_pkgver}
[arch-commits] Commit in pyqt/kde-unstable (PKGBUILD)
Date: Saturday, January 16, 2010 @ 10:10:59
Author: andrea
Revision: 63224
force update
Modified:
pyqt/kde-unstable/PKGBUILD
--+
PKGBUILD |1 +
1 file changed, 1 insertion(+)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 15:10:30 UTC (rev 63223)
+++ PKGBUILD2010-01-16 15:10:59 UTC (rev 63224)
@@ -17,6 +17,7 @@
conflicts=('pyqt4')
source=(http://riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-${_pkgver}.tar.gz)
md5sums=('4882179ab4da128aaa8520f146afb955')
+options=('force')
build() {
cd ${srcdir}/PyQt-x11-gpl-${_pkgver}
[arch-commits] Commit in mplayer/trunk (PKGBUILD fix_building.patch)
Date: Saturday, January 16, 2010 @ 12:27:07
Author: ibiru
Revision: 63225
upgpkg: mplayer 30325-1
update to the latest revision to fix playing rmvb video files
Modified:
mplayer/trunk/PKGBUILD
Deleted:
mplayer/trunk/fix_building.patch
+
PKGBUILD | 18 +-
fix_building.patch | 14 --
2 files changed, 5 insertions(+), 27 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 15:10:59 UTC (rev 63224)
+++ PKGBUILD2010-01-16 17:27:07 UTC (rev 63225)
@@ -2,7 +2,7 @@
# Maintainer: Hugo Doria
pkgname=mplayer
-pkgver=30286
+pkgver=30325
pkgrel=1
pkgdesc="A movie player for linux"
arch=('i686' 'x86_64')
@@ -13,26 +13,18 @@
'enca' 'libvdpau>=0.3' 'opencore-amr' 'a52dec' 'libdca')
license=('GPL')
url="http://www.mplayerhq.hu/";
-makedepends=('unzip' 'mesa' 'live-media>=2010.01.11')
+makedepends=('unzip' 'mesa' 'live-media>=2010.01.13')
backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2
liba52_gcc_bug.patch
- mplayer.desktop mplayer.png fix_building.patch )
-md5sums=('bbfbe6651c09324756322f7ff7b23dbe'
- 'ac53c73dd6f69d91ab0ea0591df4a653'
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2
mplayer.desktop mplayer.png)
+md5sums=('f325e67b25b784f2e61983b32318aa9c'
'f91b1be03ed301cc15142f49455c1b88'
- 'd00874ccc644b7f43d6ef1c942fcef28'
- '294c9c6af43c0453da7dd8de1a188f8a')
+ 'd00874ccc644b7f43d6ef1c942fcef28')
build() {
# Custom CFLAGS break the mplayer build
unset CFLAGS LDFLAGS
- # Needed to compile using gcc 4.4.0
-# patch -p0 < ${srcdir}/liba52_gcc_bug.patch || return 1
-
cd ${srcdir}/${pkgname}
- #bad revision
- patch -p0 < ${srcdir}/fix_building.patch || return 1
./configure --prefix=/usr \
--enable-runtime-cpudetection \
Deleted: fix_building.patch
===
--- fix_building.patch 2010-01-16 15:10:59 UTC (rev 63224)
+++ fix_building.patch 2010-01-16 17:27:07 UTC (rev 63225)
@@ -1,14 +0,0 @@
libavformat/network.h (revision 21153)
-+++ libavformat/network.h (working copy)
-@@ -23,6 +23,10 @@
-
- #include "config.h"
-
-+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
-+#define HAVE_STRUCT_ADDRINFO 1
-+#define HAVE_GETADDRINFO 1
-+
- #if HAVE_WINSOCK2_H
- #include
- #include
-
[arch-commits] Commit in mplayer/repos (3 files)
Date: Saturday, January 16, 2010 @ 12:27:47
Author: ibiru
Revision: 63226
Merged revisions 63225 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mplayer/trunk
r63225 | ibiru | 2010-01-16 19:27:07 +0200 (Sat, 16 Jan 2010) | 2 lines
upgpkg: mplayer 30325-1
update to the latest revision to fix playing rmvb video files
Modified:
mplayer/repos/extra-i686/ (properties)
mplayer/repos/extra-i686/PKGBUILD
Deleted:
mplayer/repos/extra-i686/fix_building.patch
+
PKGBUILD | 18 +-
fix_building.patch | 14 --
2 files changed, 5 insertions(+), 27 deletions(-)
Property changes on: mplayer/repos/extra-i686
___
Modified: svnmerge-integrated
- /mplayer/trunk:1-62803
+ /mplayer/trunk:1-63225
Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-01-16 17:27:07 UTC (rev 63225)
+++ extra-i686/PKGBUILD 2010-01-16 17:27:47 UTC (rev 63226)
@@ -2,7 +2,7 @@
# Maintainer: Hugo Doria
pkgname=mplayer
-pkgver=30286
+pkgver=30325
pkgrel=1
pkgdesc="A movie player for linux"
arch=('i686' 'x86_64')
@@ -13,26 +13,18 @@
'enca' 'libvdpau>=0.3' 'opencore-amr' 'a52dec' 'libdca')
license=('GPL')
url="http://www.mplayerhq.hu/";
-makedepends=('unzip' 'mesa' 'live-media>=2010.01.11')
+makedepends=('unzip' 'mesa' 'live-media>=2010.01.13')
backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2
liba52_gcc_bug.patch
- mplayer.desktop mplayer.png fix_building.patch )
-md5sums=('bbfbe6651c09324756322f7ff7b23dbe'
- 'ac53c73dd6f69d91ab0ea0591df4a653'
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2
mplayer.desktop mplayer.png)
+md5sums=('f325e67b25b784f2e61983b32318aa9c'
'f91b1be03ed301cc15142f49455c1b88'
- 'd00874ccc644b7f43d6ef1c942fcef28'
- '294c9c6af43c0453da7dd8de1a188f8a')
+ 'd00874ccc644b7f43d6ef1c942fcef28')
build() {
# Custom CFLAGS break the mplayer build
unset CFLAGS LDFLAGS
- # Needed to compile using gcc 4.4.0
-# patch -p0 < ${srcdir}/liba52_gcc_bug.patch || return 1
-
cd ${srcdir}/${pkgname}
- #bad revision
- patch -p0 < ${srcdir}/fix_building.patch || return 1
./configure --prefix=/usr \
--enable-runtime-cpudetection \
Deleted: extra-i686/fix_building.patch
===
--- extra-i686/fix_building.patch 2010-01-16 17:27:07 UTC (rev 63225)
+++ extra-i686/fix_building.patch 2010-01-16 17:27:47 UTC (rev 63226)
@@ -1,14 +0,0 @@
libavformat/network.h (revision 21153)
-+++ libavformat/network.h (working copy)
-@@ -23,6 +23,10 @@
-
- #include "config.h"
-
-+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
-+#define HAVE_STRUCT_ADDRINFO 1
-+#define HAVE_GETADDRINFO 1
-+
- #if HAVE_WINSOCK2_H
- #include
- #include
-
[arch-commits] Commit in mplayer/repos (3 files)
Date: Saturday, January 16, 2010 @ 12:29:34
Author: ibiru
Revision: 63227
Merged revisions 63225 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mplayer/trunk
r63225 | ibiru | 2010-01-16 19:27:07 +0200 (Sat, 16 Jan 2010) | 2 lines
upgpkg: mplayer 30325-1
update to the latest revision to fix playing rmvb video files
Modified:
mplayer/repos/extra-x86_64/ (properties)
mplayer/repos/extra-x86_64/PKGBUILD
Deleted:
mplayer/repos/extra-x86_64/fix_building.patch
+
PKGBUILD | 18 +-
fix_building.patch | 14 --
2 files changed, 5 insertions(+), 27 deletions(-)
Property changes on: mplayer/repos/extra-x86_64
___
Modified: svnmerge-integrated
- /mplayer/trunk:1-62804
+ /mplayer/trunk:1-63226
Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2010-01-16 17:27:47 UTC (rev 63226)
+++ extra-x86_64/PKGBUILD 2010-01-16 17:29:34 UTC (rev 63227)
@@ -2,7 +2,7 @@
# Maintainer: Hugo Doria
pkgname=mplayer
-pkgver=30286
+pkgver=30325
pkgrel=1
pkgdesc="A movie player for linux"
arch=('i686' 'x86_64')
@@ -13,26 +13,18 @@
'enca' 'libvdpau>=0.3' 'opencore-amr' 'a52dec' 'libdca')
license=('GPL')
url="http://www.mplayerhq.hu/";
-makedepends=('unzip' 'mesa' 'live-media>=2010.01.11')
+makedepends=('unzip' 'mesa' 'live-media>=2010.01.13')
backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2
liba52_gcc_bug.patch
- mplayer.desktop mplayer.png fix_building.patch )
-md5sums=('bbfbe6651c09324756322f7ff7b23dbe'
- 'ac53c73dd6f69d91ab0ea0591df4a653'
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2
mplayer.desktop mplayer.png)
+md5sums=('f325e67b25b784f2e61983b32318aa9c'
'f91b1be03ed301cc15142f49455c1b88'
- 'd00874ccc644b7f43d6ef1c942fcef28'
- '294c9c6af43c0453da7dd8de1a188f8a')
+ 'd00874ccc644b7f43d6ef1c942fcef28')
build() {
# Custom CFLAGS break the mplayer build
unset CFLAGS LDFLAGS
- # Needed to compile using gcc 4.4.0
-# patch -p0 < ${srcdir}/liba52_gcc_bug.patch || return 1
-
cd ${srcdir}/${pkgname}
- #bad revision
- patch -p0 < ${srcdir}/fix_building.patch || return 1
./configure --prefix=/usr \
--enable-runtime-cpudetection \
Deleted: extra-x86_64/fix_building.patch
===
--- extra-x86_64/fix_building.patch 2010-01-16 17:27:47 UTC (rev 63226)
+++ extra-x86_64/fix_building.patch 2010-01-16 17:29:34 UTC (rev 63227)
@@ -1,14 +0,0 @@
libavformat/network.h (revision 21153)
-+++ libavformat/network.h (working copy)
-@@ -23,6 +23,10 @@
-
- #include "config.h"
-
-+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
-+#define HAVE_STRUCT_ADDRINFO 1
-+#define HAVE_GETADDRINFO 1
-+
- #if HAVE_WINSOCK2_H
- #include
- #include
-
[arch-commits] Commit in go-openoffice/trunk (ChangeLog PKGBUILD)
Date: Saturday, January 16, 2010 @ 12:35:46
Author: andyrtr
Revision: 63228
prepare new release
Modified:
go-openoffice/trunk/ChangeLog
go-openoffice/trunk/PKGBUILD
---+
ChangeLog |5 +
PKGBUILD | 11 +++
2 files changed, 12 insertions(+), 4 deletions(-)
Modified: ChangeLog
===
--- ChangeLog 2010-01-16 17:29:34 UTC (rev 63227)
+++ ChangeLog 2010-01-16 17:35:46 UTC (rev 63228)
@@ -1,3 +1,8 @@
+2010-01-15 Andreas Radke
+
+* 3.2.0.2-1 :
+new upstream release = 3.2.0rc2
+
2009-12-28 Andreas Radke
* 3.2.0.1-1 :
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 17:29:34 UTC (rev 63227)
+++ PKGBUILD2010-01-16 17:35:46 UTC (rev 63228)
@@ -2,19 +2,19 @@
# Maintainer: AndyRTR
pkgname=go-openoffice
-_GOver=3.2.0.1 # = OOo 3.2 RC1
+_GOver=3.2.0.2 # = OOo 3.2 RC2
pkgver=${_GOver}
pkgrel=1
pkgdesc="OpenOffice.org - go-oo.org enhanced version of SUN's office suite"
arch=('i686' 'x86_64')
_go_tree="OOO320"
-_ootag=ooo320-m8 # m8 = OOo 3.2.0 RC1
+_ootag=ooo320-m9 # m8 = OOo 3.2.0 RC2
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'
- 'beanshell' 'saxon' 'vigra' 'hyphen' 'libmspack' 'libldap'
+ 'beanshell' 'saxon' 'vigra' 'hyphen' 'libmspack' 'libldap' 'gtk2'
'hicolor-icon-theme' 'shared-mime-info' 'desktop-file-utils') #
'lucene' 'libmythes' 'libgraphite'
optdepends=('java-runtime: adds java support'
'libcups: adds printing support'
@@ -48,8 +48,11 @@
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
+ http://download.go-oo.org/src//seamonkey-1.1.14.source.tar.gz
+ http://archive.apache.org/dist/ant/binaries/apache-ant-1.7.0-bin.tar.gz
buildfix_64bit_system_libjpeg.diff)
#options=('!distcc' '!ccache' '!makeflags')
+#options=('!fakeroot')
noextract=(ooo-cli-prebuilt-3.2.tar.bz2 cairo-1.4.10.tar.gz
mdbtools-0.6pre1.tar.gz 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)
@@ -126,7 +129,7 @@
# --with-additional-sections="OOXMLExport"
unset MAKEFLAGS
- ./download
+ ./download --all
# compress the sources after first run
# tar -cvzf ${SRCDEST}/${_ootag}.tar.gz ../clone && return 1
[arch-commits] Commit in gajim/trunk (PKGBUILD gnome-keyring-password-fix.patch)
Date: Saturday, January 16, 2010 @ 12:37:38
Author: ibiru
Revision: 63229
upgpkg: gajim 0.13.2-1
update to 0.13.2 and remove patch merged upstream
Modified:
gajim/trunk/PKGBUILD
Deleted:
gajim/trunk/gnome-keyring-password-fix.patch
--+
PKGBUILD | 12
gnome-keyring-password-fix.patch | 12
2 files changed, 4 insertions(+), 20 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 17:35:46 UTC (rev 63228)
+++ PKGBUILD2010-01-16 17:37:38 UTC (rev 63229)
@@ -4,8 +4,8 @@
# Contributor: Nikos Kouremenos
pkgname=gajim
-pkgver=0.13.1
-pkgrel=2
+pkgver=0.13.2
+pkgrel=1
pkgdesc="Jabber client written in PyGTK"
arch=(i686 x86_64)
url="http://www.gajim.org/";
@@ -14,18 +14,14 @@
makedepends=('gettext' 'intltool' 'dbus')
optdepends=('dbus-python' 'pyopenssl')
options=(!libtool)
-source=(http://www.gajim.org/downloads/0.13/gajim-${pkgver}.tar.gz
- gnome-keyring-password-fix.patch)
+source=(http://www.gajim.org/downloads/0.13/gajim-${pkgver}.tar.gz)
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/gnome-keyring-password-fix.patch" || return 1
-
./configure --prefix=/usr || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
find "${pkgdir}/usr/share/gajim/" -name "*.pyo" | xargs rm -rf
}
-md5sums=('844752ab1b368b709b05572ad76fdc2d'
- '55c6191e78bbe5f224cd7f941f4d1cf1')
+md5sums=('1e41999c40e2986d5f5dba1b1faaeb85')
Deleted: gnome-keyring-password-fix.patch
===
--- gnome-keyring-password-fix.patch2010-01-16 17:35:46 UTC (rev 63228)
+++ gnome-keyring-password-fix.patch2010-01-16 17:37:38 UTC (rev 63229)
@@ -1,12 +0,0 @@
-diff -Nur gajim-0.13.1.old/src/common/passwords.py
gajim-0.13.1/src/common/passwords.py
gajim-0.13.1.old/src/common/passwords.py 2009-10-29 12:15:17.0
+0200
-+++ gajim-0.13.1/src/common/passwords.py 2009-12-07 13:59:42.179454769
+0200
-@@ -122,6 +122,8 @@
- user = gajim.config.get_per('accounts', account_name, 'name')
- display_name = _('XMPP account %...@%s') % (user, server)
- attributes1 = dict(server=str(server), user=str(user),
protocol='xmpp')
-+ if password is None:
-+ password = str()
- try:
- auth_token = gnomekeyring.item_create_sync(
- self.keyring,
gnomekeyring.ITEM_NETWORK_PASSWORD,
[arch-commits] Commit in gajim/repos (3 files)
Date: Saturday, January 16, 2010 @ 12:38:22
Author: ibiru
Revision: 63230
Merged revisions 63229 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gajim/trunk
r63229 | ibiru | 2010-01-16 19:37:38 +0200 (Sat, 16 Jan 2010) | 2 lines
upgpkg: gajim 0.13.2-1
update to 0.13.2 and remove patch merged upstream
Modified:
gajim/repos/extra-i686/ (properties)
gajim/repos/extra-i686/PKGBUILD
Deleted:
gajim/repos/extra-i686/gnome-keyring-password-fix.patch
--+
PKGBUILD | 12
gnome-keyring-password-fix.patch | 12
2 files changed, 4 insertions(+), 20 deletions(-)
Property changes on: gajim/repos/extra-i686
___
Modified: svnmerge-integrated
- /gajim/trunk:1-60842
+ /gajim/trunk:1-63229
Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2010-01-16 17:37:38 UTC (rev 63229)
+++ extra-i686/PKGBUILD 2010-01-16 17:38:22 UTC (rev 63230)
@@ -4,8 +4,8 @@
# Contributor: Nikos Kouremenos
pkgname=gajim
-pkgver=0.13.1
-pkgrel=2
+pkgver=0.13.2
+pkgrel=1
pkgdesc="Jabber client written in PyGTK"
arch=(i686 x86_64)
url="http://www.gajim.org/";
@@ -14,18 +14,14 @@
makedepends=('gettext' 'intltool' 'dbus')
optdepends=('dbus-python' 'pyopenssl')
options=(!libtool)
-source=(http://www.gajim.org/downloads/0.13/gajim-${pkgver}.tar.gz
- gnome-keyring-password-fix.patch)
+source=(http://www.gajim.org/downloads/0.13/gajim-${pkgver}.tar.gz)
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/gnome-keyring-password-fix.patch" || return 1
-
./configure --prefix=/usr || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
find "${pkgdir}/usr/share/gajim/" -name "*.pyo" | xargs rm -rf
}
-md5sums=('844752ab1b368b709b05572ad76fdc2d'
- '55c6191e78bbe5f224cd7f941f4d1cf1')
+md5sums=('1e41999c40e2986d5f5dba1b1faaeb85')
Deleted: extra-i686/gnome-keyring-password-fix.patch
===
--- extra-i686/gnome-keyring-password-fix.patch 2010-01-16 17:37:38 UTC (rev
63229)
+++ extra-i686/gnome-keyring-password-fix.patch 2010-01-16 17:38:22 UTC (rev
63230)
@@ -1,12 +0,0 @@
-diff -Nur gajim-0.13.1.old/src/common/passwords.py
gajim-0.13.1/src/common/passwords.py
gajim-0.13.1.old/src/common/passwords.py 2009-10-29 12:15:17.0
+0200
-+++ gajim-0.13.1/src/common/passwords.py 2009-12-07 13:59:42.179454769
+0200
-@@ -122,6 +122,8 @@
- user = gajim.config.get_per('accounts', account_name, 'name')
- display_name = _('XMPP account %...@%s') % (user, server)
- attributes1 = dict(server=str(server), user=str(user),
protocol='xmpp')
-+ if password is None:
-+ password = str()
- try:
- auth_token = gnomekeyring.item_create_sync(
- self.keyring,
gnomekeyring.ITEM_NETWORK_PASSWORD,
[arch-commits] Commit in gajim/repos (3 files)
Date: Saturday, January 16, 2010 @ 12:39:28
Author: ibiru
Revision: 63231
Merged revisions 63229 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gajim/trunk
r63229 | ibiru | 2010-01-16 19:37:38 +0200 (Sat, 16 Jan 2010) | 2 lines
upgpkg: gajim 0.13.2-1
update to 0.13.2 and remove patch merged upstream
Modified:
gajim/repos/extra-x86_64/ (properties)
gajim/repos/extra-x86_64/PKGBUILD
Deleted:
gajim/repos/extra-x86_64/gnome-keyring-password-fix.patch
--+
PKGBUILD | 12
gnome-keyring-password-fix.patch | 12
2 files changed, 4 insertions(+), 20 deletions(-)
Property changes on: gajim/repos/extra-x86_64
___
Modified: svnmerge-integrated
- /gajim/trunk:1-60843
+ /gajim/trunk:1-63230
Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD 2010-01-16 17:38:22 UTC (rev 63230)
+++ extra-x86_64/PKGBUILD 2010-01-16 17:39:28 UTC (rev 63231)
@@ -4,8 +4,8 @@
# Contributor: Nikos Kouremenos
pkgname=gajim
-pkgver=0.13.1
-pkgrel=2
+pkgver=0.13.2
+pkgrel=1
pkgdesc="Jabber client written in PyGTK"
arch=(i686 x86_64)
url="http://www.gajim.org/";
@@ -14,18 +14,14 @@
makedepends=('gettext' 'intltool' 'dbus')
optdepends=('dbus-python' 'pyopenssl')
options=(!libtool)
-source=(http://www.gajim.org/downloads/0.13/gajim-${pkgver}.tar.gz
- gnome-keyring-password-fix.patch)
+source=(http://www.gajim.org/downloads/0.13/gajim-${pkgver}.tar.gz)
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/gnome-keyring-password-fix.patch" || return 1
-
./configure --prefix=/usr || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
find "${pkgdir}/usr/share/gajim/" -name "*.pyo" | xargs rm -rf
}
-md5sums=('844752ab1b368b709b05572ad76fdc2d'
- '55c6191e78bbe5f224cd7f941f4d1cf1')
+md5sums=('1e41999c40e2986d5f5dba1b1faaeb85')
Deleted: extra-x86_64/gnome-keyring-password-fix.patch
===
--- extra-x86_64/gnome-keyring-password-fix.patch 2010-01-16 17:38:22 UTC
(rev 63230)
+++ extra-x86_64/gnome-keyring-password-fix.patch 2010-01-16 17:39:28 UTC
(rev 63231)
@@ -1,12 +0,0 @@
-diff -Nur gajim-0.13.1.old/src/common/passwords.py
gajim-0.13.1/src/common/passwords.py
gajim-0.13.1.old/src/common/passwords.py 2009-10-29 12:15:17.0
+0200
-+++ gajim-0.13.1/src/common/passwords.py 2009-12-07 13:59:42.179454769
+0200
-@@ -122,6 +122,8 @@
- user = gajim.config.get_per('accounts', account_name, 'name')
- display_name = _('XMPP account %...@%s') % (user, server)
- attributes1 = dict(server=str(server), user=str(user),
protocol='xmpp')
-+ if password is None:
-+ password = str()
- try:
- auth_token = gnomekeyring.item_create_sync(
- self.keyring,
gnomekeyring.ITEM_NETWORK_PASSWORD,
[arch-commits] Commit in attica/kde-unstable (PKGBUILD)
Date: Saturday, January 16, 2010 @ 12:46:28
Author: andrea
Revision: 63232
upstream release
Modified:
attica/kde-unstable/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 17:39:28 UTC (rev 63231)
+++ PKGBUILD2010-01-16 17:46:28 UTC (rev 63232)
@@ -2,8 +2,8 @@
# Maintainer: Andrea Scarpino
pkgname=attica
-pkgver=0.1.1
-pkgrel=2
+pkgver=0.1.2
+pkgrel=1
pkgdesc='A library to access Open Collaboration Service providers'
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -11,7 +11,7 @@
depends=('qt')
makedepends=('cmake')
source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2";)
-md5sums=('4011ebc19fe6b12b8de9f10ccc341125')
+md5sums=('8b4207dbc0a826d422632bdb9c50d51a')
build() {
cd ${srcdir}
[arch-commits] Commit in libpng/trunk (PKGBUILD)
Date: Saturday, January 16, 2010 @ 13:21:09
Author: jgc
Revision: 63233
upgpkg: libpng 1.4.0-1
Update to libpng 1.4.0:
New major version, needs lots of rebuilds.
Grab apng patch from sourceforge now
Modified:
libpng/trunk/PKGBUILD
--+
PKGBUILD | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 17:46:28 UTC (rev 63232)
+++ PKGBUILD2010-01-16 18:21:09 UTC (rev 63233)
@@ -4,7 +4,7 @@
# Maintainer: Douglas Soares de Andrade
pkgname=libpng
-pkgver=1.2.40
+pkgver=1.4.0
pkgrel=1
pkgdesc="A collection of routines used to create PNG format graphics files"
arch=('i686' 'x86_64')
@@ -12,17 +12,17 @@
license=('custom')
depends=('zlib')
options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2";
-
"http://hp.vector.co.jp/authors/VA013651/lib/libpng-1.2.38-apng.patch.gz";)
-md5sums=('29bbd1c3cbe54b04bfc2bda43067ccb5' '40ee503d0ff5386ad537df2162fb9c4e')
-sha1sums=('776cf18a799af58303590f6996f6d3aa5a7908ff'
'1746e03734b2967481330ade3fb8513896ec2f95')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+
http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${pkgver}-apng.patch.gz)
+md5sums=('fd73b764e92c711c219d766d03889b64'
+ '1a1a1ac18b7c4a23aa9b1441f2c0f2e9')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
# Add animated PNG (apng) support
# see http://hp.vector.co.jp/authors/VA013651/freeSoftware/apng.html
- patch -p1 -i "${srcdir}/libpng-1.2.38-apng.patch" || return 1
+ patch -p1 -i "${srcdir}/libpng-${pkgver}-apng.patch" || return 1
libtoolize --force --copy || return 1
aclocal || return 1
[arch-commits] Commit in libpng/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 13:21:19 Author: jgc Revision: 63234 archrelease: new repo jpng-i686 Added: libpng/repos/jpng-i686/
[arch-commits] Commit in libpng/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 13:21:25 Author: jgc Revision: 63235 Initialized merge tracking via "svnmerge" with revisions "1-63233" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/libpng/trunk Modified: libpng/repos/jpng-i686/ (properties) Property changes on: libpng/repos/jpng-i686 ___ Added: svnmerge-integrated + /libpng/trunk:1-63233
[arch-commits] Commit in libpng/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 13:21:38 Author: jgc Revision: 63236 archrelease: new repo jpng-x86_64 Added: libpng/repos/jpng-x86_64/
[arch-commits] Commit in libpng/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 13:21:44 Author: jgc Revision: 63237 Initialized merge tracking via "svnmerge" with revisions "1-63235" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/libpng/trunk Modified: libpng/repos/jpng-x86_64/ (properties) Property changes on: libpng/repos/jpng-x86_64 ___ Added: svnmerge-integrated + /libpng/trunk:1-63235
[arch-commits] Commit in libtiff/trunk (PKGBUILD)
Date: Saturday, January 16, 2010 @ 13:42:34
Author: jgc
Revision: 63238
upgpkg: libtiff 3.9.2-2
Rebuild for libjpeg 8
Modified:
libtiff/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 18:21:44 UTC (rev 63237)
+++ PKGBUILD2010-01-16 18:42:34 UTC (rev 63238)
@@ -4,12 +4,12 @@
pkgname=libtiff
pkgver=3.9.2
-pkgrel=1
+pkgrel=2
pkgdesc="Library for manipulation of TIFF images"
arch=('i686' 'x86_64')
url="http://www.remotesensing.org/libtiff/";
license=('custom')
-depends=('libjpeg>=7' 'zlib')
+depends=('libjpeg>=8' 'zlib')
makedepends=('libgl' 'freeglut' 'libxmu' 'libxi')
optdepends=('freeglut: for using tiffgt')
options=('!libtool')
[arch-commits] Commit in libtiff/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 13:42:40 Author: jgc Revision: 63239 archrelease: new repo jpng-i686 Added: libtiff/repos/jpng-i686/
[arch-commits] Commit in libtiff/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 13:42:46 Author: jgc Revision: 63240 Initialized merge tracking via "svnmerge" with revisions "1-63238" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/libtiff/trunk Modified: libtiff/repos/jpng-i686/ (properties) Property changes on: libtiff/repos/jpng-i686 ___ Added: svnmerge-integrated + /libtiff/trunk:1-63238
[arch-commits] Commit in libtiff/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 13:43:01 Author: jgc Revision: 63241 archrelease: new repo jpng-x86_64 Added: libtiff/repos/jpng-x86_64/
[arch-commits] Commit in libtiff/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 13:43:08 Author: jgc Revision: 63242 Initialized merge tracking via "svnmerge" with revisions "1-63240" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/libtiff/trunk Modified: libtiff/repos/jpng-x86_64/(properties) Property changes on: libtiff/repos/jpng-x86_64 ___ Added: svnmerge-integrated + /libtiff/trunk:1-63240
[arch-commits] Commit in cairo/trunk (PKGBUILD)
Date: Saturday, January 16, 2010 @ 14:07:32
Author: jgc
Revision: 63243
upgpkg: cairo 1.8.8-2
Rebuild for libpng14, fix configure script to use the new stable version
Modified:
cairo/trunk/PKGBUILD
--+
PKGBUILD |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 18:43:08 UTC (rev 63242)
+++ PKGBUILD2010-01-16 19:07:32 UTC (rev 63243)
@@ -4,19 +4,20 @@
pkgname=cairo
pkgver=1.8.8
-pkgrel=1
+pkgrel=2
pkgdesc="Cairo vector graphics library"
arch=(i686 x86_64)
license=('LGPL' 'MPL')
url="http://cairographics.org/";
-depends=('libpng>=1.2.37' 'libxrender' 'fontconfig>=2.6.0' 'pixman>=0.14.0'
'xcb-util>=0.3.4')
-makedepends=('pkgconfig')
+depends=('libpng>=1.4.0' 'libxrender' 'fontconfig>=2.8.0' 'pixman>=0.16.4'
'xcb-util>=0.3.6')
+makedepends=('pkgconfig' 'gtk-doc')
options=('!libtool')
source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
md5sums=('d3e1a1035ae563812d4dd44a74fb0dd0')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ sed -i -e 's/libpng13/libpng14/g' configure || return 1
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --enable-xcb --disable-static || return 1
make || return 1
[arch-commits] Commit in cairo/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 14:07:40 Author: jgc Revision: 63244 archrelease: new repo jpng-i686 Added: cairo/repos/jpng-i686/
[arch-commits] Commit in cairo/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 14:07:45 Author: jgc Revision: 63245 Initialized merge tracking via "svnmerge" with revisions "1-63243" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/cairo/trunk Modified: cairo/repos/jpng-i686/(properties) Property changes on: cairo/repos/jpng-i686 ___ Added: svnmerge-integrated + /cairo/trunk:1-63243
[arch-commits] Commit in cairo/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 14:07:56 Author: jgc Revision: 63246 archrelease: new repo jpng-x86_64 Added: cairo/repos/jpng-x86_64/
[arch-commits] Commit in cairo/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 14:08:01 Author: jgc Revision: 63247 Initialized merge tracking via "svnmerge" with revisions "1-63245" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/cairo/trunk Modified: cairo/repos/jpng-x86_64/ (properties) Property changes on: cairo/repos/jpng-x86_64 ___ Added: svnmerge-integrated + /cairo/trunk:1-63245
[arch-commits] Commit in libmng/trunk (PKGBUILD)
Date: Saturday, January 16, 2010 @ 15:44:09
Author: jgc
Revision: 63248
upgpkg: libmng 1.0.10-3
Rebuild for libjpeg-8
Modified:
libmng/trunk/PKGBUILD
--+
PKGBUILD | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 19:08:01 UTC (rev 63247)
+++ PKGBUILD2010-01-16 20:44:09 UTC (rev 63248)
@@ -3,23 +3,23 @@
# Maintainer: judd
pkgname=libmng
pkgver=1.0.10
-pkgrel=2
+pkgrel=3
pkgdesc="A collection of routines used to create and manipulate MNG format
graphics files"
arch=('i686' 'x86_64')
url="http://www.libmng.com/";
license=('custom')
-depends=('zlib' 'libjpeg>=7')
+depends=('zlib' 'libjpeg>=8')
options=(!libtool)
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
md5sums=('a464ae7d679781beebdf7440d144b7bd')
build() {
- cd $startdir/src/$pkgname-$pkgver
+ cd $srcdir/$pkgname-$pkgver
ln -s makefiles/configure.in .
ln -s makefiles/Makefile.am .
autoreconf --force --install
./configure --prefix=/usr
make || return 1
- make DESTDIR=$startdir/pkg install
- install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
+ make DESTDIR=$pkgdir install || return 1
+ install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
}
[arch-commits] Commit in libmng/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 15:44:16 Author: jgc Revision: 63249 archrelease: new repo jpng-i686 Added: libmng/repos/jpng-i686/
[arch-commits] Commit in libmng/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 15:44:22 Author: jgc Revision: 63250 Initialized merge tracking via "svnmerge" with revisions "1-63248" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/libmng/trunk Modified: libmng/repos/jpng-i686/ (properties) Property changes on: libmng/repos/jpng-i686 ___ Added: svnmerge-integrated + /libmng/trunk:1-63248
[arch-commits] Commit in libmng/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 15:44:33 Author: jgc Revision: 63251 archrelease: new repo jpng-x86_64 Added: libmng/repos/jpng-x86_64/
[arch-commits] Commit in libmng/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 15:44:38 Author: jgc Revision: 63252 Initialized merge tracking via "svnmerge" with revisions "1-63250" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/libmng/trunk Modified: libmng/repos/jpng-x86_64/ (properties) Property changes on: libmng/repos/jpng-x86_64 ___ Added: svnmerge-integrated + /libmng/trunk:1-63250
[arch-commits] Commit in cairomm/trunk (PKGBUILD)
Date: Saturday, January 16, 2010 @ 15:47:31
Author: ibiru
Revision: 63253
Rebuild libpng 1.4.0
Modified:
cairomm/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 20:44:38 UTC (rev 63252)
+++ PKGBUILD2010-01-16 20:47:31 UTC (rev 63253)
@@ -3,17 +3,17 @@
# Contributor: criminy
pkgname=cairomm
-pkgver=1.8.2
+pkgver=1.8.4
pkgrel=1
pkgdesc="C++ bindings to Cairo vector graphics library"
arch=('i686' 'x86_64')
url="http://www.cairographics.org";
license=('LGPL' 'MPL')
-depends=('cairo>=1.8.8' 'libsigc++2.0>=2.2.3')
+depends=('cairo>=1.8.8-2' 'libsigc++2.0>=2.2.3')
makedepends=('pkgconfig')
source=(http://www.cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
options=('!libtool' '!emptydirs')
-md5sums=('24aa46a4f92bdb2af7cd80e6b335f07f')
+md5sums=('559afbc47484ba3fad265e38a3dafe90')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
[arch-commits] Commit in cairomm/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 15:48:28 Author: ibiru Revision: 63254 archrelease: new repo jpng-i686 Added: cairomm/repos/jpng-i686/
[arch-commits] Commit in cairomm/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 15:48:49 Author: ibiru Revision: 63255 Initialized merge tracking via "svnmerge" with revisions "1-63253" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/cairomm/trunk Modified: cairomm/repos/jpng-i686/ (properties) Property changes on: cairomm/repos/jpng-i686 ___ Added: svnmerge-integrated + /cairomm/trunk:1-63253
[arch-commits] Commit in cairomm/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 15:50:39 Author: ibiru Revision: 63256 archrelease: new repo jpng-x86_64 Added: cairomm/repos/jpng-x86_64/
[arch-commits] Commit in cairomm/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 15:51:42 Author: ibiru Revision: 63257 Initialized merge tracking via "svnmerge" with revisions "1-63255" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/cairomm/trunk Modified: cairomm/repos/jpng-x86_64/(properties) Property changes on: cairomm/repos/jpng-x86_64 ___ Added: svnmerge-integrated + /cairomm/trunk:1-63255
[arch-commits] Commit in qt3/trunk (PKGBUILD qt3-png14.patch)
Date: Saturday, January 16, 2010 @ 16:19:24
Author: jgc
Revision: 63258
upgpkg: qt3 3.3.8-14
Rebuild for libpng14 and libjpeg8
Added:
qt3/trunk/qt3-png14.patch
Modified:
qt3/trunk/PKGBUILD
-+
PKGBUILD| 11 +++
qt3-png14.patch | 33 +
2 files changed, 40 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 20:51:42 UTC (rev 63257)
+++ PKGBUILD2010-01-16 21:19:24 UTC (rev 63258)
@@ -4,22 +4,23 @@
pkgname=qt3
pkgver=3.3.8
-pkgrel=13
+pkgrel=14
pkgdesc="The QT gui toolkit."
arch=(i686 x86_64)
license=('GPL')
url="http://www.trolltech.com/products/qt/index.html";
pkgfqn=qt-x11-free-${pkgver}
install=qt.install
-depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' \
-'libxft' 'libxrandr' 'libmng>=1.0.10-2')
+depends=('libpng>=1.4.0' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' \
+'libxft' 'libxrandr' 'libmng>=1.0.10-3')
makedepends=('mysql' 'postgresql>=8.2.3' 'unixodbc' 'sqlite3')
optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
-source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.bz2 qt.profile \
+source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.bz2 qt3-png14.patch
qt.profile \
qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 utf8-bug-qt3.diff \
qt-font-default-subst.diff mysql.patch eastern_asian_languagues.diff
qt-odbc.patch)
options=(!libtool)
md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85'
+ '1dc671df42b9030dbdf68bb61cd3375e'
'f72d1eb4eb49b9a9467c1f6035194266'
'f2a2dbdbfee9422c90efc3ef3f86197c'
'2f00e5c0c1e2c2a23dddc982cd79f3e0'
@@ -57,6 +58,8 @@
patch -p1 -i ${srcdir}/eastern_asian_languagues.diff || return 1
# fix build problem against new unixODBC
patch -p1 -i $srcdir/qt-odbc.patch || return 1
+
+ patch -p0 -i $srcdir/qt3-png14.patch || return 1
# start compiling qt
sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
rm -rf doc/html examples tutorial
Added: qt3-png14.patch
===
--- qt3-png14.patch (rev 0)
+++ qt3-png14.patch 2010-01-16 21:19:24 UTC (rev 63258)
@@ -0,0 +1,33 @@
+--- src/kernel/qpngio.cpp.orig 2010-01-16 22:02:41.0 +0100
src/kernel/qpngio.cpp 2010-01-16 22:03:56.0 +0100
+@@ -159,7 +159,7 @@
+ image.setColor( i, qRgba(c,c,c,0xff) );
+ }
+ if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
+- const int g = info_ptr->trans_values.gray;
++ const int g = info_ptr->trans_color.gray;
+ if (g < ncols) {
+ image.setAlphaBuffer(TRUE);
+ image.setColor(g, image.color(g) & RGB_MASK);
+@@ -187,7 +187,7 @@
+ info_ptr->palette[i].red,
+ info_ptr->palette[i].green,
+ info_ptr->palette[i].blue,
+- info_ptr->trans[i]
++ info_ptr->trans_alpha[i]
+ )
+ );
+ i++;
+@@ -321,9 +321,9 @@
+ png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
+ if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
{
+ QRgb trans = 0xFF00 | qRgb(
+-(info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
+-(info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
+-(info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
++(info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
++(info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
++(info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
+ for (uint y=0; ywidth; x++) {
+ if (((uint**)jt)[y][x] == trans) {
[arch-commits] Commit in qt3/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 16:19:31 Author: jgc Revision: 63259 archrelease: new repo jpng-i686 Added: qt3/repos/jpng-i686/
[arch-commits] Commit in qt3/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 16:19:37 Author: jgc Revision: 63260 Initialized merge tracking via "svnmerge" with revisions "1-63258" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/qt3/trunk Modified: qt3/repos/jpng-i686/ (properties) Property changes on: qt3/repos/jpng-i686 ___ Added: svnmerge-integrated + /qt3/trunk:1-63258
[arch-commits] Commit in qt3/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 16:20:48 Author: jgc Revision: 63261 archrelease: new repo jpng-x86_64 Added: qt3/repos/jpng-x86_64/
[arch-commits] Commit in qt3/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 16:20:54 Author: jgc Revision: 63262 Initialized merge tracking via "svnmerge" with revisions "1-63260" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/qt3/trunk Modified: qt3/repos/jpng-x86_64/(properties) Property changes on: qt3/repos/jpng-x86_64 ___ Added: svnmerge-integrated + /qt3/trunk:1-63260
[arch-commits] Commit in poppler/trunk (PKGBUILD)
Date: Saturday, January 16, 2010 @ 16:27:13
Author: jgc
Revision: 63263
upgpkg: poppler 0.12.3-1
Update to 0.12.3, build with libpng14 and libjpeg8
Modified:
poppler/trunk/PKGBUILD
--+
PKGBUILD | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 21:20:54 UTC (rev 63262)
+++ PKGBUILD2010-01-16 21:27:13 UTC (rev 63263)
@@ -3,15 +3,15 @@
pkgbase=poppler
pkgname=('poppler' 'poppler-glib' 'poppler-qt' 'poppler-qt3')
-pkgver=0.12.2
+pkgver=0.12.3
pkgrel=1
arch=(i686 x86_64)
license=('GPL')
-makedepends=('libjpeg>=7' 'gcc-libs>=4.4.2' 'cairo>=1.8.8' 'libxml2>=2.7.6'
'fontconfig>=2.6.0' 'openjpeg>=1.3-3' 'gtk2>=2.18.2' 'qt>=4.5.3' 'qt3>=3.3.8'
'pkgconfig' 'lcms')
+makedepends=('libjpeg>=8' 'gcc-libs>=4.4.2' 'cairo>=1.8.8-2' 'libxml2>=2.7.6'
'fontconfig>=2.8.0' 'openjpeg>=1.3-3' 'gtk2>=2.18.6' 'qt>=4.5.3' 'qt3>=3.3.8'
'pkgconfig' 'lcms')
options=('!libtool')
url="http://poppler.freedesktop.org/";
source=(http://poppler.freedesktop.org/${pkgname}-${pkgver}.tar.gz)
-md5sums=('60c00b55acf7dd389bf256d178af70bf')
+md5sums=('d0ca8344d8d94e27aaba6d432688365d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,7 +28,7 @@
package_poppler() {
pkgdesc="PDF rendering library based on xpdf 3.0"
- depends=('libjpeg>=7' 'gcc-libs>=4.4.2' 'cairo>=1.8.8' 'libxml2>=2.7.6'
'fontconfig>=2.6.0' 'openjpeg>=1.3-3' 'lcms')
+ depends=('libjpeg>=8' 'gcc-libs>=4.4.2' 'cairo>=1.8.8-2' 'libxml2>=2.7.6'
'fontconfig>=2.8.0' 'openjpeg>=1.3-3' 'lcms')
optdepends=('poppler-data')
cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -43,7 +43,7 @@
package_poppler-glib() {
pkgdesc="Poppler glib bindings"
- depends=("poppler=${pkgver}" 'gtk2>=2.18.2')
+ depends=("poppler=${pkgver}" 'gtk2>=2.18.6')
cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
make DESTDIR="${pkgdir}" install-libLTLIBRARIES || return 1
[arch-commits] Commit in poppler/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 16:27:20 Author: jgc Revision: 63264 archrelease: new repo jpng-i686 Added: poppler/repos/jpng-i686/
[arch-commits] Commit in poppler/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 16:27:25 Author: jgc Revision: 63265 Initialized merge tracking via "svnmerge" with revisions "1-63263" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/poppler/trunk Modified: poppler/repos/jpng-i686/ (properties) Property changes on: poppler/repos/jpng-i686 ___ Added: svnmerge-integrated + /poppler/trunk:1-63263
[arch-commits] Commit in poppler/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 16:27:45 Author: jgc Revision: 63266 archrelease: new repo jpng-x86_64 Added: poppler/repos/jpng-x86_64/
[arch-commits] Commit in poppler/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 16:27:50 Author: jgc Revision: 63267 Initialized merge tracking via "svnmerge" with revisions "1-63265" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/poppler/trunk Modified: poppler/repos/jpng-x86_64/(properties) Property changes on: poppler/repos/jpng-x86_64 ___ Added: svnmerge-integrated + /poppler/trunk:1-63265
[arch-commits] Commit in zlib/trunk (PKGBUILD)
Date: Saturday, January 16, 2010 @ 16:35:36
Author: pierre
Revision: 63268
assembler optimized code might cause problems with NX/PAX
Modified:
zlib/trunk/PKGBUILD
--+
PKGBUILD |9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 21:27:50 UTC (rev 63267)
+++ PKGBUILD2010-01-16 21:35:36 UTC (rev 63268)
@@ -3,7 +3,7 @@
pkgname=zlib
pkgver=1.2.3.4
-pkgrel=3
+pkgrel=4
pkgdesc='compression library implementing the deflate compression method found
in gzip and PKZIP'
arch=('i686' 'x86_64')
license=('custom')
@@ -27,12 +27,7 @@
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
- elif [ "${CARCH}" == "i686" ]; then
- ln -s contrib/asm686/match.S match.S
- fi
- make LOC=-DASMV OBJA=match.o PIC_OBJA=match.lo || return 1
+ make || return 1
grep -A 24 '^ Copyright' zlib.h > LICENSE
}
[arch-commits] Commit in cups/trunk (PKGBUILD)
Date: Saturday, January 16, 2010 @ 16:37:21
Author: jgc
Revision: 63269
upgpkg: cups 1.4.2-3
Rebuild for libjpeg8 and libpng14
Modified:
cups/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 21:35:36 UTC (rev 63268)
+++ PKGBUILD2010-01-16 21:37:21 UTC (rev 63269)
@@ -4,11 +4,11 @@
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=1.4.2
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/";
-makedepends=('libtiff>=3.9.1' 'libpng>=1.2.39' 'acl' 'openslp' 'pam'
'xdg-utils' 'heimdal>=1.3.1' 'gnutls>=2.8.3' 'poppler>=0.10.7-2'
+makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam'
'xdg-utils' 'heimdal>=1.3.1' 'gnutls>=2.8.3' 'poppler>=0.12.3'
'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-glib' 'avahi'
'hicolor-icon-theme')
source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
cups
@@ -36,7 +36,7 @@
package_libcups() {
pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=3.9.1' 'libpng>=1.2.39' 'heimdal>=1.3.1')
+depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'heimdal>=1.3.1')
cd ${srcdir}/${pkgbase}-${pkgver}
@@ -57,7 +57,7 @@
etc/logrotate.d/cups
etc/pam.d/cups
etc/xinetd.d/cups-lpd)
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils'
'heimdal>=1.3.1' 'gnutls>=2.8.3' 'poppler>=0.10.7-2'
+depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils'
'heimdal>=1.3.1' 'gnutls>=2.8.3' 'poppler>=0.12.3'
'libusb' 'dbus-glib' 'avahi' 'hicolor-icon-theme')
optdepends=('php: for included phpcups.so module')
[arch-commits] Commit in cups/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 16:37:29 Author: jgc Revision: 63270 archrelease: new repo jpng-i686 Added: cups/repos/jpng-i686/
[arch-commits] Commit in cups/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 16:37:34 Author: jgc Revision: 63271 Initialized merge tracking via "svnmerge" with revisions "1-63269" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/cups/trunk Modified: cups/repos/jpng-i686/ (properties) Property changes on: cups/repos/jpng-i686 ___ Added: svnmerge-integrated + /cups/trunk:1-63269
[arch-commits] Commit in cups/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 16:38:03 Author: jgc Revision: 63272 archrelease: new repo jpng-x86_64 Added: cups/repos/jpng-x86_64/
[arch-commits] Commit in cups/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 16:38:08 Author: jgc Revision: 63273 Initialized merge tracking via "svnmerge" with revisions "1-63271" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/cups/trunk Modified: cups/repos/jpng-x86_64/ (properties) Property changes on: cups/repos/jpng-x86_64 ___ Added: svnmerge-integrated + /cups/trunk:1-63271
[arch-commits] Commit in zlib/repos (testing-i686)
Date: Saturday, January 16, 2010 @ 16:38:24 Author: pierre Revision: 63274 archrelease: new repo testing-i686 Added: zlib/repos/testing-i686/
[arch-commits] Commit in zlib/repos (testing-i686)
Date: Saturday, January 16, 2010 @ 16:38:45 Author: pierre Revision: 63275 Initialized merge tracking via "svnmerge" with revisions "1-63273" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/zlib/trunk Modified: zlib/repos/testing-i686/ (properties) Property changes on: zlib/repos/testing-i686 ___ Added: svnmerge-integrated + /zlib/trunk:1-63273
[arch-commits] Commit in gtk2/trunk (PKGBUILD)
Date: Saturday, January 16, 2010 @ 16:47:35
Author: jgc
Revision: 63276
upgpkg: gtk2 2.18.6-1
Update to 2.18.6, rebuild for libjpeg8 and libpng14
Modified:
gtk2/trunk/PKGBUILD
--+
PKGBUILD |8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 21:38:45 UTC (rev 63275)
+++ PKGBUILD2010-01-16 21:47:35 UTC (rev 63276)
@@ -2,15 +2,13 @@
# Maintainer: Jan de Groot
pkgname=gtk2
-pkgver=2.18.5
+pkgver=2.18.6
pkgrel=1
pkgdesc="The GTK+ Toolkit (v2)"
arch=(i686 x86_64)
url="http://www.gtk.org/";
install=gtk2.install
-depends=('atk>=1.28.0' 'pango>=1.26.1' 'libxcursor' 'libxinerama'
'libxrandr>=1.3.0' \
- 'libxi>=1.2.1' 'libcups>=1.4.2' 'libxcomposite' 'libxdamage'
'heimdal>=1.3.1' \
- 'gnutls>=2.8.3' 'shared-mime-info')
+depends=('atk>=1.28.0' 'pango>=1.26.1' 'libxcursor' 'libxinerama'
'libxrandr>=1.3.0' 'libxi>=1.2.1' 'libxcomposite' 'libxdamage' 'heimdal>=1.3.1'
'gnutls>=2.8.3' 'shared-mime-info' 'cairo>=1.8.8-2' 'libtiff>=3.9.2-2'
'libcups>=1.4.2-3')
makedepends=('pkgconfig' 'gtk-doc')
replaces=('gtkprint-cups' 'gail')
conflicts=('gtkprint-cups' 'gail')
@@ -20,7 +18,7 @@
license=('LGPL')
source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.18/gtk+-${pkgver}.tar.bz2
xid-collision-debug.patch)
-sha256sums=('4986365bce2f164edae10be20a4d417eadca9534eedfd9e2176a0c45334b7bf4'
+sha256sums=('5629944917b739152d89b69279aefcc3de9fe12a12fd7adb3ca39c840df9354d'
'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
build() {
[arch-commits] Commit in gtk2/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 16:47:42 Author: jgc Revision: 63277 archrelease: new repo jpng-i686 Added: gtk2/repos/jpng-i686/
[arch-commits] Commit in gtk2/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 16:47:47 Author: jgc Revision: 63278 Initialized merge tracking via "svnmerge" with revisions "1-63276" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/gtk2/trunk Modified: gtk2/repos/jpng-i686/ (properties) Property changes on: gtk2/repos/jpng-i686 ___ Added: svnmerge-integrated + /gtk2/trunk:1-63276
[arch-commits] Commit in gtk2/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 16:48:49 Author: jgc Revision: 63279 archrelease: new repo jpng-x86_64 Added: gtk2/repos/jpng-x86_64/
[arch-commits] Commit in gtk2/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 16:48:54 Author: jgc Revision: 63280 Initialized merge tracking via "svnmerge" with revisions "1-63278" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/gtk2/trunk Modified: gtk2/repos/jpng-x86_64/ (properties) Property changes on: gtk2/repos/jpng-x86_64 ___ Added: svnmerge-integrated + /gtk2/trunk:1-63278
[arch-commits] Commit in jasper/trunk (PKGBUILD)
Date: Saturday, January 16, 2010 @ 16:52:23
Author: ibiru
Revision: 63281
upgpkg: jasper 1.900.1-4
libjpeg 8 rebuild, change depedency to freeglut
Modified:
jasper/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 21:48:54 UTC (rev 63280)
+++ PKGBUILD2010-01-16 21:52:23 UTC (rev 63281)
@@ -4,12 +4,12 @@
pkgname=jasper
pkgver=1.900.1
-pkgrel=3
+pkgrel=4
pkgdesc="A software-based implementation of the codec specified in the
emerging JPEG-2000 Part-1 standard"
arch=('i686' 'x86_64')
url="http://www.ece.uvic.ca/~mdadams/jasper/";
license=('custom:JasPer2.0')
-depends=('libjpeg>=7' 'glut' 'libxi' 'libxmu' 'mesa')
+depends=('libjpeg>=8' 'freeglut' 'libxi' 'libxmu' 'mesa')
makedepends=('unzip')
options=('!libtool')
source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip)
[arch-commits] Commit in jasper/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 16:52:40 Author: ibiru Revision: 63282 archrelease: new repo jpng-i686 Added: jasper/repos/jpng-i686/
[arch-commits] Commit in jasper/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 16:52:54 Author: ibiru Revision: 63283 Initialized merge tracking via "svnmerge" with revisions "1-63281" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/jasper/trunk Modified: jasper/repos/jpng-i686/ (properties) Property changes on: jasper/repos/jpng-i686 ___ Added: svnmerge-integrated + /jasper/trunk:1-63281
[arch-commits] Commit in jasper/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 16:53:20 Author: ibiru Revision: 63284 archrelease: new repo jpng-x86_64 Added: jasper/repos/jpng-x86_64/
[arch-commits] Commit in jasper/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 16:53:34 Author: ibiru Revision: 63285 Initialized merge tracking via "svnmerge" with revisions "1-63283" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/jasper/trunk Modified: jasper/repos/jpng-x86_64/ (properties) Property changes on: jasper/repos/jpng-x86_64 ___ Added: svnmerge-integrated + /jasper/trunk:1-63283
[arch-commits] Commit in perl-libwww/trunk (PKGBUILD)
Date: Saturday, January 16, 2010 @ 17:12:47
Author: andrea
Revision: 63286
upgpkg: perl-libwww 5.833-3
added HEAD,POST and GET utilities (FS#17870)
Modified:
perl-libwww/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 21:53:34 UTC (rev 63285)
+++ PKGBUILD2010-01-16 22:12:47 UTC (rev 63286)
@@ -6,12 +6,12 @@
pkgname=perl-libwww
_realname=libwww-perl
pkgver=5.833
-pkgrel=2
+pkgrel=3
pkgdesc="A set of Perl modules which provides a simple and consistent API to
the WWW."
arch=('any')
license=('PerlArtistic')
url="http://search.cpan.org/dist/${_realname}/";
-depends=('perl-uri' 'perl-html-parser' 'perl>=5.10.0')
+depends=('perl-uri' 'perl-html-parser' 'perl')
optdepends=('perl-crypt-ssleay: for SSL/TLS support')
options=('!emptydirs')
replaces=('libwww-perl')
@@ -38,7 +38,7 @@
build() {
cd ${srcdir}/${_realname}-${pkgver}
# install module in vendor directories.
- perl Makefile.PL INSTALLDIRS=vendor || return 1
+ perl Makefile.PL --aliases INSTALLDIRS=vendor || return 1
make || return 1
make install DESTDIR=${pkgdir} || return 1
[arch-commits] Commit in perl-libwww/repos (extra-any extra-any/PKGBUILD)
Date: Saturday, January 16, 2010 @ 17:13:25
Author: andrea
Revision: 63287
Merged revisions 63286 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/perl-libwww/trunk
r63286 | andrea | 2010-01-16 23:12:47 +0100 (Sat, 16 Jan 2010) | 2 lines
upgpkg: perl-libwww 5.833-3
added HEAD,POST and GET utilities (FS#17870)
Modified:
perl-libwww/repos/extra-any/ (properties)
perl-libwww/repos/extra-any/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Property changes on: perl-libwww/repos/extra-any
___
Modified: svnmerge-integrated
- /perl-libwww/trunk:1-58738
+ /perl-libwww/trunk:1-63286
Modified: extra-any/PKGBUILD
===
--- extra-any/PKGBUILD 2010-01-16 22:12:47 UTC (rev 63286)
+++ extra-any/PKGBUILD 2010-01-16 22:13:25 UTC (rev 63287)
@@ -6,12 +6,12 @@
pkgname=perl-libwww
_realname=libwww-perl
pkgver=5.833
-pkgrel=2
+pkgrel=3
pkgdesc="A set of Perl modules which provides a simple and consistent API to
the WWW."
arch=('any')
license=('PerlArtistic')
url="http://search.cpan.org/dist/${_realname}/";
-depends=('perl-uri' 'perl-html-parser' 'perl>=5.10.0')
+depends=('perl-uri' 'perl-html-parser' 'perl')
optdepends=('perl-crypt-ssleay: for SSL/TLS support')
options=('!emptydirs')
replaces=('libwww-perl')
@@ -38,7 +38,7 @@
build() {
cd ${srcdir}/${_realname}-${pkgver}
# install module in vendor directories.
- perl Makefile.PL INSTALLDIRS=vendor || return 1
+ perl Makefile.PL --aliases INSTALLDIRS=vendor || return 1
make || return 1
make install DESTDIR=${pkgdir} || return 1
[arch-commits] Commit in qt/trunk (PKGBUILD qt-png14.patch)
Date: Saturday, January 16, 2010 @ 17:27:15
Author: jgc
Revision: 63288
upgpkg: qt 4.5.3-4
Rebuild for libjpeg8 and libpng14
Added:
qt/trunk/qt-png14.patch
Modified:
qt/trunk/PKGBUILD
+
PKGBUILD | 10 +++---
qt-png14.patch | 33 +
2 files changed, 40 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 22:13:25 UTC (rev 63287)
+++ PKGBUILD2010-01-16 22:27:15 UTC (rev 63288)
@@ -3,17 +3,17 @@
pkgname=qt
pkgver=4.5.3
-pkgrel=3
+pkgrel=4
_kdeqtver=063bded33b417cdf92fd51366fc7fdb06dea00ba
pkgdesc='A cross-platform application and UI framework'
arch=('i686' 'x86_64')
url='http://www.qtsoftware.com/'
license=('GPL3' 'LGPL')
-depends=('libpng' 'mesa' 'fontconfig' 'libtiff>=3.8.2-5' 'libmng>=1.0.10-2'
'sqlite3' 'xdg-utils' 'hicolor-icon-theme'
+depends=('libpng>=1.4.0' 'mesa' 'fontconfig>=2.8.0' 'libtiff>=3.9.2-2'
'libmng>=1.0.10-2' 'sqlite3' 'xdg-utils' 'hicolor-icon-theme'
'libxrandr' 'glib2' 'libxi' 'dbus' 'libxcursor' 'libxinerama'
'libxrender' 'gstreamer0.10-base-plugins'
'ca-certificates')
optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
-makedepends=('inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'cups'
'libxfixes' 'gtk2')
+makedepends=('inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'libxfixes'
'gtk2' 'cups')
install=qt.install
provides=("qt4=${pkgver}" 'phonon')
replaces=('qt4' 'phonon')
@@ -22,11 +22,13 @@
_pkgfqn="qt-x11-opensource-src-${pkgver}"
source=("ftp://ftp.qtsoftware.com/qt/source/${_pkgfqn}.tar.gz";
"ftp://ftp.archlinux.org/other/kde-qt/kde-qt-${_kdeqtver}.patch.gz";
+qt-png14.patch
'gstreamer-logo.png'
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
'qtconfig.desktop'
'qdoc3.patch' 'phonon.patch' 'ca-certificates.patch')
md5sums=('3988cf9af68be2df8a8000ede231de9b'
'a8b984c95ea658116a7b4f632ae93596'
+ '15faef8356cf5545d7e8300e5dd186f2'
'f0c26f76acf8b6a3297cfb31f872b0b7'
'a445c6917086d80f1cfc1e40cb6b0132'
'd457f0a0ad68a3861c3cadefe3b42ded'
@@ -65,6 +67,8 @@
# use system ssl cert bundle
patch -p1 -i $srcdir/ca-certificates.patch || return 1
+ patch -p0 -i ${srcdir}/qt-png14.patch || return 1
+
sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
Added: qt-png14.patch
===
--- qt-png14.patch (rev 0)
+++ qt-png14.patch 2010-01-16 22:27:15 UTC (rev 63288)
@@ -0,0 +1,33 @@
+--- src/gui/image/qpnghandler.cpp.orig 2010-01-16 20:58:18.0 +0100
src/gui/image/qpnghandler.cpp 2010-01-16 21:00:10.0 +0100
+@@ -205,7 +205,7 @@
+ image.setColor(i, qRgba(c,c,c,0xff));
+ }
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+-const int g = info_ptr->trans_values.gray;
++const int g = info_ptr->trans_color.gray;
+ if (g < ncols) {
+ image.setColor(g, 0);
+ }
+@@ -234,7 +234,7 @@
+ info_ptr->palette[i].red,
+ info_ptr->palette[i].green,
+ info_ptr->palette[i].blue,
+-info_ptr->trans[i]
++info_ptr->trans_alpha[i]
+)
+);
+ i++;
+@@ -454,9 +454,9 @@
+ png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
+ if (outImage->depth()==32 && png_get_valid(png_ptr, info_ptr,
PNG_INFO_tRNS)) {
+ QRgb trans = 0xFF00 | qRgb(
+-(info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
+-(info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
+-(info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
++(info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
++(info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
++(info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
+ for (uint y=0; ywidth; x++) {
+ if (((uint**)jt)[y][x] == trans) {
[arch-commits] Commit in qt/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 17:27:21 Author: jgc Revision: 63289 archrelease: new repo jpng-i686 Added: qt/repos/jpng-i686/
[arch-commits] Commit in qt/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 17:27:26 Author: jgc Revision: 63290 Initialized merge tracking via "svnmerge" with revisions "1-63288" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/qt/trunk Modified: qt/repos/jpng-i686/ (properties) Property changes on: qt/repos/jpng-i686 ___ Added: svnmerge-integrated + /qt/trunk:1-63288
[arch-commits] Commit in qt/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 17:30:10 Author: jgc Revision: 63291 archrelease: new repo jpng-x86_64 Added: qt/repos/jpng-x86_64/
[arch-commits] Commit in qt/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 17:30:16 Author: jgc Revision: 63292 Initialized merge tracking via "svnmerge" with revisions "1-63290" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/qt/trunk Modified: qt/repos/jpng-x86_64/ (properties) Property changes on: qt/repos/jpng-x86_64 ___ Added: svnmerge-integrated + /qt/trunk:1-63290
[arch-commits] Commit in lcms/trunk (PKGBUILD)
Date: Saturday, January 16, 2010 @ 17:37:15
Author: ibiru
Revision: 63293
upgpkg: lcms 1.18-3
libjpeg 8 rebuild
Modified:
lcms/trunk/PKGBUILD
--+
PKGBUILD | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 22:30:16 UTC (rev 63292)
+++ PKGBUILD2010-01-16 22:37:15 UTC (rev 63293)
@@ -4,21 +4,21 @@
pkgname=lcms
pkgver=1.18
-pkgrel=2
+pkgrel=3
pkgdesc="Lightweight color management development library/engine"
arch=(i686 x86_64)
license=('custom')
-depends=('libtiff>=3.8.2-5')
+depends=('libtiff>=3.9.2-2')
url="http://www.littlecms.com";
options=('!libtool')
-source=(http://littlecms.com/${pkgname}-${pkgver}.tar.gz)
-md5sums=('9f908e2dc48f76db77ac35a382e394c7')
+source=(http://littlecms.com/${pkgname}-${pkgver}a.tar.gz)
+md5sums=('f4abfe1c57ea3f633c2e9d034e74e3e8')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
+ cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr
make || return 1
- make DESTDIR=${startdir}/pkg install
+ make DESTDIR=${pkgdir} install
install -Dm 644 COPYING \
-${startdir}/pkg/usr/share/licenses/${pkgname}/LICENSE
+${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
[arch-commits] Commit in lcms/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 17:37:32 Author: ibiru Revision: 63294 archrelease: new repo jpng-i686 Added: lcms/repos/jpng-i686/
[arch-commits] Commit in lcms/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 17:37:46 Author: ibiru Revision: 63295 Initialized merge tracking via "svnmerge" with revisions "1-63293" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/lcms/trunk Modified: lcms/repos/jpng-i686/ (properties) Property changes on: lcms/repos/jpng-i686 ___ Added: svnmerge-integrated + /lcms/trunk:1-63293
[arch-commits] Commit in lcms/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 17:38:11 Author: ibiru Revision: 63296 archrelease: new repo jpng-x86_64 Added: lcms/repos/jpng-x86_64/
[arch-commits] Commit in lcms/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 17:38:31 Author: ibiru Revision: 63297 Initialized merge tracking via "svnmerge" with revisions "1-63295" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/lcms/trunk Modified: lcms/repos/jpng-x86_64/ (properties) Property changes on: lcms/repos/jpng-x86_64 ___ Added: svnmerge-integrated + /lcms/trunk:1-63295
[arch-commits] Commit in libdjvu/trunk (PKGBUILD)
Date: Saturday, January 16, 2010 @ 17:39:22
Author: jgc
Revision: 63298
upgpkg: libdjvu 3.5.22-3
Rebuild for libjpeg8
Modified:
libdjvu/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 22:38:31 UTC (rev 63297)
+++ PKGBUILD2010-01-16 22:39:22 UTC (rev 63298)
@@ -4,12 +4,12 @@
pkgname=libdjvu
pkgver=3.5.22
-pkgrel=2
+pkgrel=3
pkgdesc="Library to process DjVu ('déjà vu') documents"
arch=("i686" "x86_64")
license=('GPL')
url="http://djvu.sourceforge.net/";
-depends=('gcc-libs' 'libjpeg>=7')
+depends=('gcc-libs' 'libjpeg>=8')
options=('!libtool')
source=(http://downloads.sourceforge.net/djvu/djvulibre-${pkgver}.tar.gz)
md5sums=('d1513784ce0e4f37d71595dc34c95ec7')
[arch-commits] Commit in libdjvu/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 17:39:28 Author: jgc Revision: 63299 archrelease: new repo jpng-i686 Added: libdjvu/repos/jpng-i686/
[arch-commits] Commit in libdjvu/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 17:39:34 Author: jgc Revision: 63300 Initialized merge tracking via "svnmerge" with revisions "1-63298" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/libdjvu/trunk Modified: libdjvu/repos/jpng-i686/ (properties) Property changes on: libdjvu/repos/jpng-i686 ___ Added: svnmerge-integrated + /libdjvu/trunk:1-63298
[arch-commits] Commit in libdjvu/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 17:39:47 Author: jgc Revision: 63301 archrelease: new repo jpng-x86_64 Added: libdjvu/repos/jpng-x86_64/
[arch-commits] Commit in libdjvu/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 17:39:53 Author: jgc Revision: 63302 Initialized merge tracking via "svnmerge" with revisions "1-63300" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/libdjvu/trunk Modified: libdjvu/repos/jpng-x86_64/(properties) Property changes on: libdjvu/repos/jpng-x86_64 ___ Added: svnmerge-integrated + /libdjvu/trunk:1-63300
[arch-commits] Commit in libgdiplus/trunk (3 files)
Date: Saturday, January 16, 2010 @ 17:52:58
Author: jgc
Revision: 63303
upgpkg: libgdiplus 2.6-2
Fix package to work with libpng14
Added:
libgdiplus/trunk/gdiplus-png14.patch
Modified:
libgdiplus/trunk/PKGBUILD
Deleted:
libgdiplus/trunk/system-cairo.patch
-+
PKGBUILD| 19 --
gdiplus-png14.patch | 20 ++
system-cairo.patch | 67 --
3 files changed, 31 insertions(+), 75 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 22:39:53 UTC (rev 63302)
+++ PKGBUILD2010-01-16 22:52:58 UTC (rev 63303)
@@ -3,20 +3,23 @@
pkgname=libgdiplus
pkgver=2.6
-pkgrel=1
+pkgrel=2
pkgdesc="An Open Source Implementation of the GDI+ API"
arch=(i686 x86_64)
license=('MPL' 'LGPL')
url="http://www.mono-project.com";
-depends=('libtiff>=3.8.2-5' 'cairo>=1.8.6' 'giflib' 'glib2>=2.20.0' 'libexif')
-makedepends=('automake' 'pkgconfig')
+depends=('libtiff>=3.9.2-2' 'cairo>=1.8.8-2' 'giflib' 'glib2>=2.22.3'
'libexif')
+makedepends=('pkgconfig')
options=('!libtool')
-source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9107b4429fdafde914bd23405544c58d')
+source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+gdiplus-png14.patch)
+md5sums=('9107b4429fdafde914bd23405544c58d'
+ '8393904b1a1a79a51cb8b29d61dc090f')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
- ./configure --prefix=/usr --with-cairo=system
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np0 -i "${srcdir}/gdiplus-png14.patch" || return 1
+ ./configure --prefix=/usr --with-cairo=system || return 1
make || return 1
- make DESTDIR=${startdir}/pkg install || return 1
+ make DESTDIR="${pkgdir}" install || return 1
}
Added: gdiplus-png14.patch
===
--- gdiplus-png14.patch (rev 0)
+++ gdiplus-png14.patch 2010-01-16 22:52:58 UTC (rev 63303)
@@ -0,0 +1,20 @@
+--- src/pngcodec.c.orig2010-01-16 23:47:17.0 +0100
src/pngcodec.c 2010-01-16 23:49:49.0 +0100
+@@ -352,7 +352,7 @@
+ info_ptr->palette[i].blue,
+ info_ptr->palette[i].green,
+ info_ptr->palette[i].red,
+- info_ptr->trans[i]); /* alpha */
++ info_ptr->trans_alpha[i]); /*
alpha */
+ }
+ }
+
+@@ -418,7 +418,7 @@
+ }
+
+ if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) {
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ }
+
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
Deleted: system-cairo.patch
===
--- system-cairo.patch 2010-01-16 22:39:53 UTC (rev 63302)
+++ system-cairo.patch 2010-01-16 22:52:58 UTC (rev 63303)
@@ -1,67 +0,0 @@
-diff -ur libgdiplus-1.1.15-old/Makefile.am libgdiplus-1.1.15/Makefile.am
libgdiplus-1.1.15-old/Makefile.am 2006-04-14 10:04:55.0 -0700
-+++ libgdiplus-1.1.15/Makefile.am 2006-04-21 18:06:49.0 -0700
-@@ -1,4 +1,4 @@
--SUBDIRS = cairo src tests
-+SUBDIRS = src tests
- #libpixman
-
- pkgconfigdir = $(libdir)/pkgconfig
-diff -ur libgdiplus-1.1.15-old/configure.in libgdiplus-1.1.15/configure.in
libgdiplus-1.1.15-old/configure.in 2006-04-14 10:04:55.0 -0700
-+++ libgdiplus-1.1.15/configure.in 2006-04-21 18:06:49.0 -0700
-@@ -18,32 +18,32 @@
- AC_MSG_ERROR("Did not find Glib >= 2.2.3");
- fi
-
--AC_CONFIG_SUBDIRS(cairo)
--CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la'
--CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src
-I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src
-I$(top_srcdir)/cairo/src'
--AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus])
-+#AC_CONFIG_SUBDIRS(cairo)
-+#CAIRO_LIBS='$(top_builddir)/cairo/src/libcairo.la'
-+#CAIRO_CFLAGS='-I$(top_builddir)/cairo/pixman/src
-I$(top_srcdir)/cairo/pixman/src -I$(top_builddir)/cairo/src
-I$(top_srcdir)/cairo/src'
-+#AC_DEFINE(USE_INCLUDED_CAIRO,1,[Use Cairo bundled in libgdiplus])
-
- # Activate this when we support linking to an already exiting Cairo
installation
--#default_cairo=included
--#AC_ARG_WITH(cairo, [
--with-cairo=included,installed],[cairo_v=$with_cairo],[cairo_v=$default_cairo])
-+default_cairo=included
-+AC_ARG_WITH(cairo, [
--with-cairo=included,installed],[cairo_v=$with_cairo],[cairo_v=$default_cairo])
- #
--#if test $cairo_v = "included";
--#then
-+if test $cairo_v = "included";
-+then
- # #AC_CONFIG_SUBDIRS(libpixman)
[arch-commits] Commit in libgdiplus/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 17:53:04 Author: jgc Revision: 63304 archrelease: new repo jpng-i686 Added: libgdiplus/repos/jpng-i686/
[arch-commits] Commit in libgdiplus/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 17:53:09 Author: jgc Revision: 63305 Initialized merge tracking via "svnmerge" with revisions "1-63303" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/libgdiplus/trunk Modified: libgdiplus/repos/jpng-i686/ (properties) Property changes on: libgdiplus/repos/jpng-i686 ___ Added: svnmerge-integrated + /libgdiplus/trunk:1-63303
[arch-commits] Commit in libgdiplus/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 17:53:20 Author: jgc Revision: 63306 archrelease: new repo jpng-x86_64 Added: libgdiplus/repos/jpng-x86_64/
[arch-commits] Commit in libgdiplus/repos (jpng-x86_64)
Date: Saturday, January 16, 2010 @ 17:53:26 Author: jgc Revision: 63307 Initialized merge tracking via "svnmerge" with revisions "1-63305" from svn+ssh://gerolde.archlinux.org/srv/svn-packages/libgdiplus/trunk Modified: libgdiplus/repos/jpng-x86_64/ (properties) Property changes on: libgdiplus/repos/jpng-x86_64 ___ Added: svnmerge-integrated + /libgdiplus/trunk:1-63305
[arch-commits] Commit in libgphoto2/trunk (PKGBUILD)
Date: Saturday, January 16, 2010 @ 18:03:58
Author: jgc
Revision: 63308
upgpkg: libgphoto2 2.4.7-2
Rebuild for jpeg8
Modified:
libgphoto2/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-16 22:53:26 UTC (rev 63307)
+++ PKGBUILD2010-01-16 23:03:58 UTC (rev 63308)
@@ -4,12 +4,12 @@
pkgname=libgphoto2
pkgver=2.4.7
-pkgrel=1
+pkgrel=2
pkgdesc="The core library of gphoto2, designed to allow access to digital
camera by external programs."
arch=(i686 x86_64)
url="http://www.gphoto.org";
license=(LGPL)
-depends=('libexif>=0.6.17' 'libjpeg>=7' 'libtool>=2.2.6a' 'libusb')
+depends=('libexif>=0.6.19' 'libjpeg>=8' 'libtool>=2.2.6b' 'libusb')
install=libgphoto2.install
options=('libtool')
source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz)
[arch-commits] Commit in libgphoto2/repos (jpng-i686)
Date: Saturday, January 16, 2010 @ 18:04:06 Author: jgc Revision: 63309 archrelease: new repo jpng-i686 Added: libgphoto2/repos/jpng-i686/
