[arch-commits] Commit in kdelibs3/trunk (PKGBUILD)
Date: Tuesday, December 3, 2013 @ 19:02:03
Author: eric
Revision: 200734
upgpkg: kdelibs3 3.5.10-19
Add xorg-iceauth depends (close FS#37742)
Modified:
kdelibs3/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-12-03 17:58:19 UTC (rev 200733)
+++ PKGBUILD2013-12-03 18:02:03 UTC (rev 200734)
@@ -5,13 +5,13 @@
pkgname=kdelibs3
pkgver=3.5.10
-pkgrel=18
+pkgrel=19
pkgdesc='KDE3 Core Libraries'
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL')
depends=('libxslt' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
- 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
+ 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates' 'xorg-iceauth')
makedepends=('cups' 'hspell' 'optipng')
optdepends=('hspell: for Hebrew spell-checking support')
options=('libtool' 'staticlibs' '!makeflags')
[arch-commits] Commit in kdelibs3/trunk (PKGBUILD)
Date: Friday, October 25, 2013 @ 23:53:04
Author: eric
Revision: 197433
Static libraries have no dynamic counterpart
Modified:
kdelibs3/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-25 21:21:49 UTC (rev 197432)
+++ PKGBUILD2013-10-25 21:53:04 UTC (rev 197433)
@@ -14,7 +14,7 @@
'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
makedepends=('cups' 'hspell' 'optipng')
optdepends=('hspell: for Hebrew spell-checking support')
-options=('libtool' '!makeflags')
+options=('libtool' 'staticlibs' '!makeflags')
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'
@@ -44,7 +44,7 @@
patch -p1 -i ${srcdir}/kdelibs3-cups16.patch
pushd pics/crystalsvg
optipng -quiet -force -fix cr{16,22,32,48,64,128}-app-kttsd.png
cr22-app-password.png \
- cr16-filesys-folder_green{,_open}.png cr32-action-today.png
+cr16-filesys-folder_green{,_open}.png cr32-action-today.png
popd
optipng -quiet -force -fix
interfaces/kimproxy/library/icons/cr48-action-presence_offline.png
}
[arch-commits] Commit in kdelibs3/trunk (PKGBUILD kdelibs3.install)
Date: Sunday, October 6, 2013 @ 21:51:08
Author: eric
Revision: 195977
Remove obsolete and broken install scriptlet
Modified:
kdelibs3/trunk/PKGBUILD
Deleted:
kdelibs3/trunk/kdelibs3.install
--+
PKGBUILD |1 -
kdelibs3.install | 12
2 files changed, 13 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-06 19:13:25 UTC (rev 195976)
+++ PKGBUILD2013-10-06 19:51:08 UTC (rev 195977)
@@ -15,7 +15,6 @@
makedepends=('cups' 'hspell' 'optipng')
optdepends=('hspell: for Hebrew spell-checking support')
options=('libtool' '!makeflags')
-install=kdelibs3.install
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'
Deleted: kdelibs3.install
===
--- kdelibs3.install2013-10-06 19:13:25 UTC (rev 195976)
+++ kdelibs3.install2013-10-06 19:51:08 UTC (rev 195977)
@@ -1,12 +0,0 @@
-post_install() {
- post_remove
-}
-
-post_upgrade() {
- post_remove
-}
-
-post_remove() {
- # this can be removed in future versions
- sed -ie '/\/opt\/kde\/lib/d' etc/ld.so.conf
-}
[arch-commits] Commit in kdelibs3/trunk (PKGBUILD)
Date: Monday, May 20, 2013 @ 20:52:29
Author: eric
Revision: 186056
Fix png
Modified:
kdelibs3/trunk/PKGBUILD
--+
PKGBUILD |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-05-20 18:42:26 UTC (rev 186055)
+++ PKGBUILD2013-05-20 18:52:29 UTC (rev 186056)
@@ -12,7 +12,7 @@
license=('GPL' 'LGPL')
depends=('libxslt' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
-makedepends=('cups' 'hspell')
+makedepends=('cups' 'hspell' 'optipng')
optdepends=('hspell: for Hebrew spell-checking support')
options=('libtool' '!makeflags')
install=kdelibs3.install
@@ -43,6 +43,11 @@
patch -p1 -i ${srcdir}/openssl.patch
patch -p0 -i $srcdir/kdelibs3-missing-include.patch
patch -p1 -i ${srcdir}/kdelibs3-cups16.patch
+ pushd pics/crystalsvg
+ optipng -quiet -force -fix cr{16,22,32,48,64,128}-app-kttsd.png
cr22-app-password.png \
+ cr16-filesys-folder_green{,_open}.png cr32-action-today.png
+ popd
+ optipng -quiet -force -fix
interfaces/kimproxy/library/icons/cr48-action-presence_offline.png
}
build() {
[arch-commits] Commit in kdelibs3/trunk (PKGBUILD)
Date: Tuesday, May 7, 2013 @ 00:30:55
Author: eric
Revision: 184461
Remove unneeded optipng makedepends
Modified:
kdelibs3/trunk/PKGBUILD
--+
PKGBUILD |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-05-06 22:29:37 UTC (rev 184460)
+++ PKGBUILD2013-05-06 22:30:55 UTC (rev 184461)
@@ -12,7 +12,7 @@
license=('GPL' 'LGPL')
depends=('libxslt' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
-makedepends=('cups' 'hspell' 'optipng')
+makedepends=('cups' 'hspell')
optdepends=('hspell: for Hebrew spell-checking support')
options=('libtool' '!makeflags')
install=kdelibs3.install
@@ -43,11 +43,6 @@
patch -p1 -i ${srcdir}/openssl.patch
patch -p0 -i $srcdir/kdelibs3-missing-include.patch
patch -p1 -i ${srcdir}/kdelibs3-cups16.patch
- pushd pics/crystalsvg
- optipng -quiet -force -fix cr{16,22,32,48,64,128}-app-kttsd.png
cr22-app-password.png \
-cr16-filesys-folder_green{,_open}.png cr32-action-today.png
- popd
- optipng -quiet -force -fix
interfaces/kimproxy/library/icons/cr48-action-presence_offline.png
}
build() {
[arch-commits] Commit in kdelibs3/trunk (PKGBUILD)
Date: Sunday, May 5, 2013 @ 09:00:31
Author: eric
Revision: 184256
upgpkg: kdelibs3 3.5.10-18
Fix png files for libpng 1.6
Modified:
kdelibs3/trunk/PKGBUILD
--+
PKGBUILD |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-05-05 01:34:04 UTC (rev 184255)
+++ PKGBUILD2013-05-05 07:00:31 UTC (rev 184256)
@@ -5,14 +5,14 @@
pkgname=kdelibs3
pkgver=3.5.10
-pkgrel=17
+pkgrel=18
pkgdesc='KDE3 Core Libraries'
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL')
depends=('libxslt' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
-makedepends=('cups' 'hspell')
+makedepends=('cups' 'hspell' 'optipng')
optdepends=('hspell: for Hebrew spell-checking support')
options=('libtool' '!makeflags')
install=kdelibs3.install
@@ -43,6 +43,11 @@
patch -p1 -i ${srcdir}/openssl.patch
patch -p0 -i $srcdir/kdelibs3-missing-include.patch
patch -p1 -i ${srcdir}/kdelibs3-cups16.patch
+ pushd pics/crystalsvg
+ optipng -quiet -force -fix cr{16,22,32,48,64,128}-app-kttsd.png
cr22-app-password.png \
+cr16-filesys-folder_green{,_open}.png cr32-action-today.png
+ popd
+ optipng -quiet -force -fix
interfaces/kimproxy/library/icons/cr48-action-presence_offline.png
}
build() {
[arch-commits] Commit in kdelibs3/trunk (PKGBUILD)
Date: Wednesday, April 17, 2013 @ 01:27:44
Author: eric
Revision: 183034
upgpkg: kdelibs3 3.5.10-17
Rebuild against openexr 2.0.0, Move styles to /usr/lib/qt3/plugins, Add prepare
function, PKGBUILD clean up
Modified:
kdelibs3/trunk/PKGBUILD
--+
PKGBUILD | 82 ++---
1 file changed, 35 insertions(+), 47 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-04-16 22:34:55 UTC (rev 183033)
+++ PKGBUILD2013-04-16 23:27:44 UTC (rev 183034)
@@ -5,12 +5,12 @@
pkgname=kdelibs3
pkgver=3.5.10
-pkgrel=16
+pkgrel=17
pkgdesc='KDE3 Core Libraries'
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL')
-depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
+depends=('libxslt' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
makedepends=('cups' 'hspell')
optdepends=('hspell: for Hebrew spell-checking support')
@@ -35,59 +35,47 @@
'e5f5b8c060a2db9cedb82bf18caadfa869921779'
'6a6c544b3336bfe89bb17ef737d783a7ec006c6c')
+prepare() {
+ cd kdelibs-${pkgver}
+ patch -p0 -i $srcdir/kde-3.5-1074156.patch
+ patch -p1 -i $srcdir/acinclude.patch
+ patch -p1 -i $srcdir/kde4-compatibility.patch
+ patch -p1 -i ${srcdir}/openssl.patch
+ patch -p0 -i $srcdir/kdelibs3-missing-include.patch
+ patch -p1 -i ${srcdir}/kdelibs3-cups16.patch
+}
+
build() {
- cd $srcdir/kdelibs-${pkgver}
-
- . $srcdir/kde3.profile
-
- patch -p0 -i $srcdir/kde-3.5-1074156.patch
- patch -p1 -i $srcdir/acinclude.patch
- patch -p1 -i $srcdir/kde4-compatibility.patch
- patch -p1 -i ${srcdir}/openssl.patch
- patch -p0 -i $srcdir/kdelibs3-missing-include.patch
- patch -p1 -i ${srcdir}/kdelibs3-cups16.patch
-
- ./configure --prefix=/opt/kde \
- --with-distribution='Arch Linux' \
- --with-alsa \
- --disable-debug \
- --disable-dnssd \
- --disable-dnotify \
- --enable-inotify \
- --enable-sendfile \
- --without-lua \
- --with-hspell \
- --enable-gcc-hidden-visibility \
- --enable-final \
- --enable-new-ldflags LDFLAGS=${LDFLAGS} -L/opt/qt/lib \
- --without-arts \
- --disable-libfam
- make
+ cd kdelibs-${pkgver}
+ ./configure --prefix=/opt/kde --with-distribution='Arch Linux' \
+--with-alsa --disable-dnssd --disable-dnotify \
+--enable-inotify --enable-sendfile --with-hspell \
+--enable-gcc-hidden-visibility --enable-final \
+--without-arts --without-lua --disable-libfam
+ make
}
package() {
- cd $srcdir/kdelibs-${pkgver}
+ cd kdelibs-${pkgver}
- make DESTDIR=$pkgdir install
+ make DESTDIR=$pkgdir install
- # disable broken kconf_update by default
- install -D -m644 $srcdir/kconf_updaterc \
- $pkgdir/opt/kde/share/config/kconf_updaterc
+# disable broken kconf_update by default
+ install -D -m644 $srcdir/kconf_updaterc
$pkgdir/opt/kde/share/config/kconf_updaterc
- # install KDE3 profile
- install -D -m755 $srcdir/kde3.profile $pkgdir/etc/profile.d/kde3.sh
- # make KDE3 styles available to Qt3
- install -d -m755 $pkgdir/opt/qt/plugins
- ln -sf /opt/kde/lib/kde3/plugins/styles $pkgdir/opt/qt/plugins/styles
+# install KDE3 profile
+ install -D -m755 $srcdir/kde3.profile $pkgdir/etc/profile.d/kde3.sh
+# make KDE3 styles available to Qt3
+ install -d -m755 $pkgdir/usr/lib/qt3/plugins
+ ln -sf /opt/kde/lib/kde3/plugins/styles $pkgdir/usr/lib/qt3/plugins/styles
- # cert bundle seems to be hardcoded
- # link it to the one from ca-certificates
- rm -f $pkgdir/opt/kde/share/apps/kssl/ca-bundle.crt
- ln -sf /etc/ssl/certs/ca-certificates.crt
$pkgdir/opt/kde/share/apps/kssl/ca-bundle.crt
+# cert bundle seems to be hardcoded
+# link it to the one from ca-certificates
+ ln -sf /etc/ssl/certs/ca-certificates.crt
$pkgdir/opt/kde/share/apps/kssl/ca-bundle.crt
- # we don't have khelpcenter anyway
- rm -rf $pkgdir/opt/kde/share/doc
+# we don't have khelpcenter anyway
+ rm -rf $pkgdir/opt/kde/share/doc
- install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
- echo '/opt/kde/lib' ${pkgdir}/etc/ld.so.conf.d/kdelibs3.conf
+ install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
+ echo '/opt/kde/lib' ${pkgdir}/etc/ld.so.conf.d/kdelibs3.conf
}
[arch-commits] Commit in kdelibs3/trunk (PKGBUILD)
Date: Tuesday, April 9, 2013 @ 23:32:47
Author: eric
Revision: 182391
Add build fix for qt3 in /usr
Modified:
kdelibs3/trunk/PKGBUILD
--+
PKGBUILD |1 -
1 file changed, 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-04-09 21:23:22 UTC (rev 182390)
+++ PKGBUILD2013-04-09 21:32:47 UTC (rev 182391)
@@ -38,7 +38,6 @@
build() {
cd $srcdir/kdelibs-${pkgver}
- . /etc/profile.d/qt3.sh
. $srcdir/kde3.profile
patch -p0 -i $srcdir/kde-3.5-1074156.patch
[arch-commits] Commit in kdelibs3/trunk (PKGBUILD kde3.profile)
Date: Tuesday, February 12, 2013 @ 05:09:20
Author: eric
Revision: 177943
upgpkg: kdelibs3 3.5.10-16
Remove XDG_DATA_DIRS setting from profile (FS#31204)
Modified:
kdelibs3/trunk/PKGBUILD
kdelibs3/trunk/kde3.profile
--+
PKGBUILD |7 ++-
kde3.profile |5 -
2 files changed, 2 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-12 02:33:16 UTC (rev 177942)
+++ PKGBUILD2013-02-12 04:09:20 UTC (rev 177943)
@@ -5,7 +5,7 @@
pkgname=kdelibs3
pkgver=3.5.10
-pkgrel=15
+pkgrel=16
pkgdesc='KDE3 Core Libraries'
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -28,7 +28,7 @@
sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82'
'c8ca21e4848a627760746d0a8a64bf4f90684c3e'
'50c9de71b102507fb78b192ecc22a5fc3e031bc3'
- 'fbd6e773edf3e8bb8e1272629984025e041da2ca'
+ 'd63d51c8fef5e521b4a9a8efa050a0c8ce6f94bf'
'5fbbf7a5e2032878815fa055bfb5020f478d2b25'
'35e56fe4c5f71685e64b13f448dcacc620166e06'
'50e92950498463defb9149ffcf8cbc2e8cd1063b'
@@ -48,9 +48,6 @@
patch -p0 -i $srcdir/kdelibs3-missing-include.patch
patch -p1 -i ${srcdir}/kdelibs3-cups16.patch
- sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|'
admin/cvs.sh
- make -f admin/Makefile.common cvs
-
./configure --prefix=/opt/kde \
--with-distribution='Arch Linux' \
--with-alsa \
Modified: kde3.profile
===
--- kde3.profile2013-02-12 02:33:16 UTC (rev 177942)
+++ kde3.profile2013-02-12 04:09:20 UTC (rev 177943)
@@ -1,6 +1 @@
export PATH=$PATH:/opt/kde/bin
-if [ ! -z $XDG_DATA_DIRS ]; then
- export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde/share
-else
- export XDG_DATA_DIRS=/opt/kde/share
-fi
[arch-commits] Commit in kdelibs3/trunk (PKGBUILD)
Date: Friday, October 19, 2012 @ 22:29:31
Author: eric
Revision: 169352
upgpkg: kdelibs3 3.5.10-15
Rebuild against ilmbase 1.0.3
Modified:
kdelibs3/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-20 01:35:15 UTC (rev 169351)
+++ PKGBUILD2012-10-20 02:29:31 UTC (rev 169352)
@@ -5,7 +5,7 @@
pkgname=kdelibs3
pkgver=3.5.10
-pkgrel=14
+pkgrel=15
pkgdesc='KDE3 Core Libraries'
arch=('i686' 'x86_64')
url='http://www.kde.org'
[arch-commits] Commit in kdelibs3/trunk (PKGBUILD)
Date: Saturday, October 13, 2012 @ 02:34:50
Author: eric
Revision: 168524
upgpkg: kdelibs3 3.5.10-14
Rebuild against openexr 1.7.1
Modified:
kdelibs3/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-13 06:26:15 UTC (rev 168523)
+++ PKGBUILD2012-10-13 06:34:50 UTC (rev 168524)
@@ -5,7 +5,7 @@
pkgname=kdelibs3
pkgver=3.5.10
-pkgrel=13
+pkgrel=14
pkgdesc='KDE3 Core Libraries'
arch=('i686' 'x86_64')
url='http://www.kde.org'
[arch-commits] Commit in kdelibs3/trunk (PKGBUILD kdelibs3-cups16.patch)
Date: Saturday, October 6, 2012 @ 18:16:32
Author: eric
Revision: 168251
Fix cups 1.6 build issue (close FS#30942), Disable SMP build
Added:
kdelibs3/trunk/kdelibs3-cups16.patch
Modified:
kdelibs3/trunk/PKGBUILD
---+
PKGBUILD |9
kdelibs3-cups16.patch | 724
2 files changed, 730 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-06 21:22:11 UTC (rev 168250)
+++ PKGBUILD2012-10-06 22:16:32 UTC (rev 168251)
@@ -14,7 +14,7 @@
'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
makedepends=('cups' 'hspell')
optdepends=('hspell: for Hebrew spell-checking support')
-options=('libtool')
+options=('libtool' '!makeflags')
install=kdelibs3.install
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'
@@ -23,7 +23,8 @@
'kde4-compatibility.patch'
'kconf_updaterc'
'openssl.patch'
-'kdelibs3-missing-include.patch')
+'kdelibs3-missing-include.patch'
+ 'kdelibs3-cups16.patch')
sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82'
'c8ca21e4848a627760746d0a8a64bf4f90684c3e'
'50c9de71b102507fb78b192ecc22a5fc3e031bc3'
@@ -31,7 +32,8 @@
'5fbbf7a5e2032878815fa055bfb5020f478d2b25'
'35e56fe4c5f71685e64b13f448dcacc620166e06'
'50e92950498463defb9149ffcf8cbc2e8cd1063b'
- 'e5f5b8c060a2db9cedb82bf18caadfa869921779')
+ 'e5f5b8c060a2db9cedb82bf18caadfa869921779'
+ '6a6c544b3336bfe89bb17ef737d783a7ec006c6c')
build() {
cd $srcdir/kdelibs-${pkgver}
@@ -44,6 +46,7 @@
patch -p1 -i $srcdir/kde4-compatibility.patch
patch -p1 -i ${srcdir}/openssl.patch
patch -p0 -i $srcdir/kdelibs3-missing-include.patch
+ patch -p1 -i ${srcdir}/kdelibs3-cups16.patch
sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|'
admin/cvs.sh
make -f admin/Makefile.common cvs
Added: kdelibs3-cups16.patch
===
--- kdelibs3-cups16.patch (rev 0)
+++ kdelibs3-cups16.patch 2012-10-06 22:16:32 UTC (rev 168251)
@@ -0,0 +1,724 @@
+diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp
kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cupsdconf.cpp
+--- kdelibs-3.5.10-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp 2012-10-06
14:49:37.521406729 -0400
kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cupsdconf.cpp 2012-10-06
15:08:17.460612585 -0400
+@@ -629,26 +629,26 @@
+ cups_lang_t*lang = cupsLangDefault();
+ ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
attributes-charset, NULL, cupsLangEncoding(lang));
+ ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
attributes-natural-language, NULL, lang-language);
+- request_-request.op.operation_id = CUPS_GET_PRINTERS;
++ ippSetOperation(request_, CUPS_GET_PRINTERS);
+ request_ = cupsDoRequest(http_, request_, /printers/);
+ if (request_)
+ {
+ QString name;
+ int type(0);
+- ipp_attribute_t *attr = request_-attrs;
++ ipp_attribute_t *attr = ippFirstAttribute(request_);
+ while (attr)
+ {
+ // check new printer (keep only local non-implicit
printers)
+- if (!attr-name)
++ if (!ippGetName(attr))
+ {
+ if (!(type CUPS_PRINTER_REMOTE) !(type
CUPS_PRINTER_IMPLICIT) !name.isEmpty())
+ resources_.append(new
CupsResource(/printers/+name));
+ name = ;
+ type = 0;
+ }
+- else if (strcmp(attr-name, printer-name) == 0) name
= attr-values[0].string.text;
+- else if (strcmp(attr-name, printer-type) == 0) type
= attr-values[0].integer;
+- attr = attr-next;
++ else if (strcmp(ippGetName(attr), printer-name) == 0)
name = ippGetString(attr, 0, NULL);
++ else if (strcmp(ippGetName(attr), printer-type) == 0)
type = ippGetInteger(attr, 0);
++ attr = ippNextAttribute(request_);
+ }
+ if (!(type CUPS_PRINTER_REMOTE) !(type
CUPS_PRINTER_IMPLICIT) !name.isEmpty())
+ resources_.append(new CupsResource(/printers/+name));
+@@ -658,26 +658,26 @@
+ request_ = ippNew();
+ ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
attributes-charset, NULL, cupsLangEncoding(lang));
+ ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
[arch-commits] Commit in kdelibs3/trunk (PKGBUILD)
Date: Monday, February 6, 2012 @ 02:29:50
Author: eric
Revision: 149184
upgpkg: kdelibs3 3.5.10-13
Rebuild against pcre 8.30
Modified:
kdelibs3/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-02-06 07:21:41 UTC (rev 149183)
+++ PKGBUILD2012-02-06 07:29:50 UTC (rev 149184)
@@ -5,7 +5,7 @@
pkgname=kdelibs3
pkgver=3.5.10
-pkgrel=12
+pkgrel=13
pkgdesc='KDE3 Core Libraries'
arch=('i686' 'x86_64')
url='http://www.kde.org'
[arch-commits] Commit in kdelibs3/trunk (PKGBUILD kdelibs3-missing-include.patch)
Date: Thursday, January 19, 2012 @ 03:16:06
Author: eric
Revision: 146920
upgpkg: kdelibs3 3.5.10-12
Rebuild against libpng 1.5 and libtiff 4.0, Add hspell optdepends, Clean up
depends and makedepends, Add build fix
Added:
kdelibs3/trunk/kdelibs3-missing-include.patch
Modified:
kdelibs3/trunk/PKGBUILD
+
PKGBUILD | 32 ++--
kdelibs3-missing-include.patch | 10 ++
2 files changed, 28 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 07:41:51 UTC (rev 146919)
+++ PKGBUILD2012-01-19 08:16:06 UTC (rev 146920)
@@ -1,34 +1,37 @@
# $Id$
-# Maintainer:
+# Maintainer: Eric Bélanger e...@archlinux.org
# Contributor: Pierre Schmitz pie...@archlinux.de
# Contributor: Tobias Powalowski tp...@archlinux.org
pkgname=kdelibs3
pkgver=3.5.10
-pkgrel=11
+pkgrel=12
pkgdesc='KDE3 Core Libraries'
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL')
depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
- 'bzip2' 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
-makedepends=('pkgconfig' 'cups' 'hspell' 'autoconf')
+ 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
+makedepends=('cups' 'hspell')
+optdepends=('hspell: for Hebrew spell-checking support')
options=('libtool')
-install='kdelibs3.install'
+install=kdelibs3.install
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'
-'openssl.patch')
-md5sums=('43cd55ed15f63b5738d620ef9f9fd568'
- 'ca50d4515468cfda80946690c53073f3'
- 'a5aedcc9550809ce6672a7dddf9f5ad4'
- 'ab14ce2c40698e24e162284d50c6f466'
- 'f4e0735475b5de59d738d68a9f467b77'
- '11e49bc6aca497f55610146afe217751'
- '242f0e4750c019e62e285c0aad0c03b8')
+'openssl.patch'
+'kdelibs3-missing-include.patch')
+sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82'
+ 'c8ca21e4848a627760746d0a8a64bf4f90684c3e'
+ '50c9de71b102507fb78b192ecc22a5fc3e031bc3'
+ 'fbd6e773edf3e8bb8e1272629984025e041da2ca'
+ '5fbbf7a5e2032878815fa055bfb5020f478d2b25'
+ '35e56fe4c5f71685e64b13f448dcacc620166e06'
+ '50e92950498463defb9149ffcf8cbc2e8cd1063b'
+ 'e5f5b8c060a2db9cedb82bf18caadfa869921779')
build() {
cd $srcdir/kdelibs-${pkgver}
@@ -39,7 +42,8 @@
patch -p0 -i $srcdir/kde-3.5-1074156.patch
patch -p1 -i $srcdir/acinclude.patch
patch -p1 -i $srcdir/kde4-compatibility.patch
-patch -p1 -i ${srcdir}/openssl.patch
+ patch -p1 -i ${srcdir}/openssl.patch
+ patch -p0 -i $srcdir/kdelibs3-missing-include.patch
sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|'
admin/cvs.sh
make -f admin/Makefile.common cvs
Added: kdelibs3-missing-include.patch
===
--- kdelibs3-missing-include.patch (rev 0)
+++ kdelibs3-missing-include.patch 2012-01-19 08:16:06 UTC (rev 146920)
@@ -0,0 +1,10 @@
+--- kdeprint/cups/cupsdconf2/cups-util.c.old 2012-01-19 01:30:26.0
-0500
kdeprint/cups/cupsdconf2/cups-util.c 2012-01-19 01:31:33.0
-0500
+@@ -2,6 +2,7 @@
+ #include cups/http.h
+ #include cups/cups.h
+ #include stdlib.h
++#include stdio.h
+ #include fcntl.h
+ #include sys/stat.h
+ #include unistd.h
[arch-commits] Commit in kdelibs3/trunk (PKGBUILD openssl.patch)
Date: Thursday, May 12, 2011 @ 12:07:27
Author: andrea
Revision: 123704
heimdal rebuild; patched to build with openssl 1.x
Added:
kdelibs3/trunk/openssl.patch
Modified:
kdelibs3/trunk/PKGBUILD (contents, properties)
---+
PKGBUILD | 51 ---
openssl.patch | 180
2 files changed, 208 insertions(+), 23 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-05-12 15:50:24 UTC (rev 123703)
+++ PKGBUILD2011-05-12 16:07:27 UTC (rev 123704)
@@ -1,10 +1,11 @@
-# $ Id: $
-# Maintainer: Pierre Schmitz pie...@archlinux.de
+# $Id$
+# Maintainer:
+# Contributor: Pierre Schmitz pie...@archlinux.de
# Contributor: Tobias Powalowski tp...@archlinux.org
pkgname=kdelibs3
pkgver=3.5.10
-pkgrel=10
+pkgrel=11
pkgdesc='KDE3 Core Libraries'
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -19,23 +20,26 @@
'acinclude.patch'
'kde3.profile'
'kde4-compatibility.patch'
-'kconf_updaterc')
+'kconf_updaterc'
+'openssl.patch')
md5sums=('43cd55ed15f63b5738d620ef9f9fd568'
'ca50d4515468cfda80946690c53073f3'
'a5aedcc9550809ce6672a7dddf9f5ad4'
'ab14ce2c40698e24e162284d50c6f466'
'f4e0735475b5de59d738d68a9f467b77'
- '11e49bc6aca497f55610146afe217751')
+ '11e49bc6aca497f55610146afe217751'
+ '242f0e4750c019e62e285c0aad0c03b8')
build() {
- cd $srcdir/kdelibs-${pkgver}
+ cd $srcdir/kdelibs-${pkgver}
. /etc/profile.d/qt3.sh
- . $srcdir/kde3.profile
+ . $srcdir/kde3.profile
- 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
+ patch -p0 -i $srcdir/kde-3.5-1074156.patch
+ patch -p1 -i $srcdir/acinclude.patch
+ patch -p1 -i $srcdir/kde4-compatibility.patch
+patch -p1 -i ${srcdir}/openssl.patch
sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|'
admin/cvs.sh
make -f admin/Makefile.common cvs
@@ -54,32 +58,33 @@
--enable-final \
--enable-new-ldflags LDFLAGS=${LDFLAGS} -L/opt/qt/lib \
--without-arts \
- --disable-libfam || return 1
- make || return 1
+ --disable-libfam
+ make
}
package() {
- cd $srcdir/kdelibs-${pkgver}
+ cd $srcdir/kdelibs-${pkgver}
- make DESTDIR=$pkgdir install || return 1
+ make DESTDIR=$pkgdir install
# disable broken kconf_update by default
- install -D -m644 $srcdir/kconf_updaterc
$pkgdir/opt/kde/share/config/kconf_updaterc
+ install -D -m644 $srcdir/kconf_updaterc \
+ $pkgdir/opt/kde/share/config/kconf_updaterc
# install KDE3 profile
- install -D -m755 $srcdir/kde3.profile $pkgdir/etc/profile.d/kde3.sh
+ install -D -m755 $srcdir/kde3.profile $pkgdir/etc/profile.d/kde3.sh
# make KDE3 styles available to Qt3
- install -d -m755 $pkgdir/opt/qt/plugins
- ln -sf /opt/kde/lib/kde3/plugins/styles $pkgdir/opt/qt/plugins/styles
+ install -d -m755 $pkgdir/opt/qt/plugins
+ ln -sf /opt/kde/lib/kde3/plugins/styles $pkgdir/opt/qt/plugins/styles
# cert bundle seems to be hardcoded
# link it to the one from ca-certificates
- rm -f $pkgdir/opt/kde/share/apps/kssl/ca-bundle.crt
- ln -sf /etc/ssl/certs/ca-certificates.crt
$pkgdir/opt/kde/share/apps/kssl/ca-bundle.crt
+ rm -f $pkgdir/opt/kde/share/apps/kssl/ca-bundle.crt
+ ln -sf /etc/ssl/certs/ca-certificates.crt
$pkgdir/opt/kde/share/apps/kssl/ca-bundle.crt
# we don't have khelpcenter anyway
- rm -rf $pkgdir/opt/kde/share/doc
+ rm -rf $pkgdir/opt/kde/share/doc
- install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
- echo '/opt/kde/lib' ${pkgdir}/etc/ld.so.conf.d/kdelibs3.conf
+ install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
+ echo '/opt/kde/lib' ${pkgdir}/etc/ld.so.conf.d/kdelibs3.conf
}
Property changes on: kdelibs3/trunk/PKGBUILD
___
Added: svn:keywords
+ Id
Added: openssl.patch
===
--- openssl.patch (rev 0)
+++ openssl.patch 2011-05-12 16:07:27 UTC (rev 123704)
@@ -0,0 +1,180 @@
+diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x
kdelibs-3.5.10/kio/kssl/kopenssl.cc
+--- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x 2009-09-04
23:10:53.0 +0200
kdelibs-3.5.10/kio/kssl/kopenssl.cc2009-09-04 23:10:53.0
+0200
+@@ -96,9 +96,14 @@ static int (*K_BIO_write) (BIO *b, cons
+ static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
+const EVP_CIPHER
[arch-commits] Commit in kdelibs3/trunk (PKGBUILD kdelibs3.install)
Date: Sunday, February 14, 2010 @ 11:02:29
Author: pierre
Revision: 68848
upgpkg: kdelibs3 3.5.10-10
rebuild due to FS#18238
Modified:
kdelibs3/trunk/PKGBUILD
kdelibs3/trunk/kdelibs3.install
--+
PKGBUILD |5 -
kdelibs3.install |5 +++--
2 files changed, 7 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-02-14 16:00:53 UTC (rev 68847)
+++ PKGBUILD2010-02-14 16:02:29 UTC (rev 68848)
@@ -4,7 +4,7 @@
pkgname=kdelibs3
pkgver=3.5.10
-pkgrel=9
+pkgrel=10
pkgdesc='KDE3 Core Libraries'
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -79,4 +79,7 @@
# we don't have khelpcenter anyway
rm -rf $pkgdir/opt/kde/share/doc
+
+ install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
+ echo '/opt/kde/lib' ${pkgdir}/etc/ld.so.conf.d/kdelibs3.conf
}
Modified: kdelibs3.install
===
--- kdelibs3.install2010-02-14 16:00:53 UTC (rev 68847)
+++ kdelibs3.install2010-02-14 16:02:29 UTC (rev 68848)
@@ -1,11 +1,12 @@
post_install() {
- grep -q '/opt/kde/lib' etc/ld.so.conf || echo '/opt/kde/lib'
etc/ld.so.conf
+ post_remove
}
post_upgrade() {
- post_install
+ post_remove
}
post_remove() {
+ # this can be removed in future versions
sed -ie '/\/opt\/kde\/lib/d' etc/ld.so.conf
}
[arch-commits] Commit in kdelibs3/trunk (PKGBUILD)
Date: Monday, January 18, 2010 @ 06:41:50
Author: pierre
Revision: 63732
jpng rebuild
Modified:
kdelibs3/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-18 11:41:27 UTC (rev 63731)
+++ PKGBUILD2010-01-18 11:41:50 UTC (rev 63732)
@@ -4,7 +4,7 @@
pkgname=kdelibs3
pkgver=3.5.10
-pkgrel=8
+pkgrel=9
pkgdesc='KDE3 Core Libraries'
arch=('i686' 'x86_64')
url='http://www.kde.org'
