[arch-commits] Commit in (78 files)

Andrea Scarpino andrea at archlinux.org
Sun Nov 29 17:28:52 UTC 2009


    Date: Sunday, November 29, 2009 @ 12:28:52
  Author: andrea
Revision: 59914

cleanup

Added:
  cdrdao/trunk/cdrdao-1.2.3-k3b.patch
Modified:
  akonadi/trunk/PKGBUILD
  cdrdao/trunk/PKGBUILD
  kdeplasma-applets-networkmanager/trunk/PKGBUILD
  qt/trunk/PKGBUILD
  srcpac/trunk/PKGBUILD
Deleted:
  cdrdao/trunk/cdrdao-1.2.3-gcc44.patch
  cdrdao/trunk/cdrdao-1.2.3-k3b.patch
  cdrdao/trunk/cdrdao-1.2.3-pkg-config.patch
  cdrdao/trunk/cdrdao-1.2.3-toc2cue.patch
  cdrdao/trunk/cdrdao-1.2.3-tocparser.patch
  kde-i18n-af/
  kde-i18n-ar/
  kde-i18n-az/
  kde-i18n-bg/
  kde-i18n-bn/
  kde-i18n-br/
  kde-i18n-bs/
  kde-i18n-ca/
  kde-i18n-cs/
  kde-i18n-cy/
  kde-i18n-da/
  kde-i18n-de/
  kde-i18n-el/
  kde-i18n-en_gb/
  kde-i18n-eo/
  kde-i18n-es/
  kde-i18n-et/
  kde-i18n-eu/
  kde-i18n-fa/
  kde-i18n-fi/
  kde-i18n-fr/
  kde-i18n-fy/
  kde-i18n-ga/
  kde-i18n-gl/
  kde-i18n-he/
  kde-i18n-hi/
  kde-i18n-hr/
  kde-i18n-hu/
  kde-i18n-is/
  kde-i18n-it/
  kde-i18n-ja/
  kde-i18n-kk/
  kde-i18n-km/
  kde-i18n-ko/
  kde-i18n-lt/
  kde-i18n-lv/
  kde-i18n-mk/
  kde-i18n-mn/
  kde-i18n-ms/
  kde-i18n-nb/
  kde-i18n-nds/
  kde-i18n-nl/
  kde-i18n-nn/
  kde-i18n-pa/
  kde-i18n-pl/
  kde-i18n-pt/
  kde-i18n-pt_br/
  kde-i18n-ro/
  kde-i18n-ru/
  kde-i18n-rw/
  kde-i18n-se/
  kde-i18n-sk/
  kde-i18n-sl/
  kde-i18n-sr/
  kde-i18n-ss/
  kde-i18n-sv/
  kde-i18n-ta/
  kde-i18n-te/
  kde-i18n-tg/
  kde-i18n-th/
  kde-i18n-tr/
  kde-i18n-uk/
  kde-i18n-uz/
  kde-i18n-vi/
  kde-i18n-wa/
  kde-i18n-zh_cn/
  kde-i18n-zh_tw/

-------------------------------------------------+
 akonadi/trunk/PKGBUILD                          |   42 ++++-
 cdrdao/trunk/PKGBUILD                           |   39 +----
 cdrdao/trunk/cdrdao-1.2.3-gcc44.patch           |   23 ---
 cdrdao/trunk/cdrdao-1.2.3-k3b.patch             |   22 +-
 cdrdao/trunk/cdrdao-1.2.3-pkg-config.patch      |   15 --
 cdrdao/trunk/cdrdao-1.2.3-toc2cue.patch         |   12 -
 cdrdao/trunk/cdrdao-1.2.3-tocparser.patch       |   17 --
 kdeplasma-applets-networkmanager/trunk/PKGBUILD |   16 --
 qt/trunk/PKGBUILD                               |  165 +++++++++-------------
 srcpac/trunk/PKGBUILD                           |    2 
 10 files changed, 139 insertions(+), 214 deletions(-)

Modified: akonadi/trunk/PKGBUILD
===================================================================
--- akonadi/trunk/PKGBUILD	2009-11-29 17:06:48 UTC (rev 59913)
+++ akonadi/trunk/PKGBUILD	2009-11-29 17:28:52 UTC (rev 59914)
@@ -1,17 +1,17 @@
-# $ Id: $
+# $Id: $
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
-pkgname=akonadi
+pkgbase=akonadi
+pkgname=('akonadi' 'akonadi-server')
 pkgver=1.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
 url='http://www.akonadi-project.org'
 license=('LGPL')
-depends=('shared-mime-info' 'boost' 'mysql>=5.1.41' 'soprano')
-makedepends=('pkgconfig' 'cmake' 'automoc4')
-install=$pkgname.install
+makedepends=('shared-mime-info' 'boost' 'mysql>=5.1.41' 'soprano'
+	'pkgconfig' 'cmake' 'automoc4')
 source=("http://download.akonadi-project.org/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('f9c1d000844f31c67360078ddf60bec2')
 
@@ -19,11 +19,37 @@
   cd ${srcdir}
   mkdir build
   cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake ../${pkgbase}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
   make || return 1
-  make DESTDIR=${pkgdir} install
 }
+
+package_akonadi(){
+  desc="Libraries for the Akonadi PIM storage service"
+  depends=('shared-mime-info' 'boost' 'soprano')
+
+  cd ${srcdir}/build/libs/
+  make DESTDIR=${pkgdir} install || return 1
+  
+  # install cmake files
+  install -d ${pkgdir}/usr/lib/cmake/Akonadi
+  install -Dm644 ../AkonadiConfig{,Version}.cmake \
+    ${pkgdir}/usr/lib/cmake/Akonadi || return 1
+}
+
+package_akonadi-server(){
+  desc="Akonadi PIM storage service"
+  depends=('akonadi' 'mysql')
+  install=akonadi.install
+
+  cd ${srcdir}/build/server
+  make DESTDIR=${pkgdir} install || return 1
+
+  # install mime file
+  install -d ${pkgdir}/usr/share/mime/packages
+  install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/akonadi-mime.xml \
+    ${pkgdir}/usr/share/mime/packages
+}

Modified: cdrdao/trunk/PKGBUILD
===================================================================
--- cdrdao/trunk/PKGBUILD	2009-11-29 17:06:48 UTC (rev 59913)
+++ cdrdao/trunk/PKGBUILD	2009-11-29 17:28:52 UTC (rev 59914)
@@ -1,40 +1,29 @@
 # $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
 pkgname=cdrdao
-pkgver=1.2.3rc2
+pkgver=1.2.3
 pkgrel=1
 pkgdesc="Records audio/data CD-Rs in disk-at-once (DAO) mode"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://cdrdao.sourceforge.net/"
 depends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao')
-source=(ftp://ftp.archlinux.org/other/cdrdao/${pkgname}-${pkgver}.tar.bz2
-        cdrdao-1.2.3-autoconf-update.patch
-        cdrdao-1.2.3-gcc44.patch
-        cdrdao-1.2.3-k3b.patch
-        cdrdao-1.2.3-pkg-config.patch
-        cdrdao-1.2.3-toc2cue.patch
-        cdrdao-1.2.3-tocparser.patch)
-md5sums=('862f35eeb1c148db8bea99abb4a643fc'
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+	cdrdao-1.2.3-autoconf-update.patch
+        cdrdao-1.2.3-k3b.patch)
+md5sums=('8d15ba6280bb7ba2f4d6be31d28b3c0c'
          '8e53dfc174f7c0882194caa05e68b85e'
-         '0e09ec11d6804d8db2eccaeb539f3f83'
-         '696f6ca01e1eeb9b6a5be88e535d9398'
-         '829ff219a1c98a0fcccd9ab3ced0cbd1'
-         '6982de2c8ae02169ef5756b5ca1d03a8'
-         'e4afe12b00f686562056b66b29a7e6e4')
+         '696f6ca01e1eeb9b6a5be88e535d9398')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
   patch -Np1 -i "${srcdir}/cdrdao-1.2.3-autoconf-update.patch" || return 1
-  patch -Np1 -i "${srcdir}/cdrdao-1.2.3-gcc44.patch" || return 1
   patch -Np1 -i "${srcdir}/cdrdao-1.2.3-k3b.patch" || return 1
-  patch -Np1 -i "${srcdir}/cdrdao-1.2.3-pkg-config.patch" || return 1
-  patch -Np1 -i "${srcdir}/cdrdao-1.2.3-toc2cue.patch" || return 1
-  patch -Np1 -i "${srcdir}/cdrdao-1.2.3-tocparser.patch" || return 1
-  aclocal || return 1
-  autoconf || return 1
-  automake || return 1
-  ./configure --prefix=/usr --with-lame || return 1
+  
+  ./configure --prefix=/usr \
+    --without-xdao || return 1
   make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR=${pkgdir} install || return 1
 }

Deleted: cdrdao/trunk/cdrdao-1.2.3-gcc44.patch
===================================================================
--- cdrdao/trunk/cdrdao-1.2.3-gcc44.patch	2009-11-29 17:06:48 UTC (rev 59913)
+++ cdrdao/trunk/cdrdao-1.2.3-gcc44.patch	2009-11-29 17:28:52 UTC (rev 59914)
@@ -1,23 +0,0 @@
---- cdrdao-1.2.3rc2/trackdb/TempFileManager.cc~	2008-02-17 14:05:05.000000000 +0100
-+++ cdrdao-1.2.3rc2/trackdb/TempFileManager.cc	2009-04-07 09:05:41.000000000 +0200
-@@ -20,6 +20,7 @@
- #include "TempFileManager.h"
- #include "log.h"
- 
-+#include <stdio.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
---- cdrdao-1.2.3rc2/dao/CdrDriver.cc~	2009-02-21 11:01:32.000000000 +0100
-+++ cdrdao-1.2.3rc2/dao/CdrDriver.cc	2009-04-07 09:07:14.000000000 +0200
-@@ -2114,8 +2114,8 @@
- 	ret = 1;
-     }
-     else {
--      if ((caps & CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW) != 0)
--	ret = 1;
-+      if ((caps & (CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW)) != 0)
-+        ret = 1;
-     }
-     break;
- 

Deleted: cdrdao/trunk/cdrdao-1.2.3-k3b.patch
===================================================================
--- cdrdao/trunk/cdrdao-1.2.3-k3b.patch	2009-11-29 17:06:48 UTC (rev 59913)
+++ cdrdao/trunk/cdrdao-1.2.3-k3b.patch	2009-11-29 17:28:52 UTC (rev 59914)
@@ -1,11 +0,0 @@
---- cdrdao/dao/main.cc~	2009-04-16 15:34:27.000000000 +0200
-+++ cdrdao/dao/main.cc	2009-04-16 15:34:38.000000000 +0200
-@@ -207,7 +207,7 @@
- 
- static void printVersion()
- {
--  log_message(2, "Cdrdao version %s - (C) Andreas Mueller <andreas at daneb.de>",
-+  log_message(0, "Cdrdao version %s - (C) Andreas Mueller <andreas at daneb.de>",
- 	  VERSION);
- 
-   std::list<std::string> list;

Added: cdrdao/trunk/cdrdao-1.2.3-k3b.patch
===================================================================
--- cdrdao/trunk/cdrdao-1.2.3-k3b.patch	                        (rev 0)
+++ cdrdao/trunk/cdrdao-1.2.3-k3b.patch	2009-11-29 17:28:52 UTC (rev 59914)
@@ -0,0 +1,11 @@
+--- cdrdao/dao/main.cc~	2009-04-16 15:34:27.000000000 +0200
++++ cdrdao/dao/main.cc	2009-04-16 15:34:38.000000000 +0200
+@@ -207,7 +207,7 @@
+ 
+ static void printVersion()
+ {
+-  log_message(2, "Cdrdao version %s - (C) Andreas Mueller <andreas at daneb.de>",
++  log_message(0, "Cdrdao version %s - (C) Andreas Mueller <andreas at daneb.de>",
+ 	  VERSION);
+ 
+   std::list<std::string> list;

Deleted: cdrdao/trunk/cdrdao-1.2.3-pkg-config.patch
===================================================================
--- cdrdao/trunk/cdrdao-1.2.3-pkg-config.patch	2009-11-29 17:06:48 UTC (rev 59913)
+++ cdrdao/trunk/cdrdao-1.2.3-pkg-config.patch	2009-11-29 17:28:52 UTC (rev 59914)
@@ -1,15 +0,0 @@
-diff -NrU5 cdrdao-1.2.3rc2.orig/configure.ac cdrdao-1.2.3rc2/configure.ac
---- cdrdao-1.2.3rc2.orig/configure.ac	2009-05-19 16:03:03.616292795 +0200
-+++ cdrdao-1.2.3rc2/configure.ac	2009-05-19 16:04:55.826318499 +0200
-@@ -32,10 +32,11 @@
- AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_RANLIB
- AC_CHECK_PROG(AR,ar,ar)
- AC_PROG_MAKE_SET
-+PKG_PROG_PKG_CONFIG
- 
- dnl Checks for header files.
- AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
- AC_CHECK_HEADERS(fcntl.h getopt.h malloc.h unistd.h sys/mman.h sched.h)

Deleted: cdrdao/trunk/cdrdao-1.2.3-toc2cue.patch
===================================================================
--- cdrdao/trunk/cdrdao-1.2.3-toc2cue.patch	2009-11-29 17:06:48 UTC (rev 59913)
+++ cdrdao/trunk/cdrdao-1.2.3-toc2cue.patch	2009-11-29 17:28:52 UTC (rev 59914)
@@ -1,12 +0,0 @@
-diff -Naur cdrdao-1.2.2/trackdb/TocParser.g cdrdao-1.2.2-cclpatch/trackdb/TocParser.g
---- cdrdao-1.2.2/trackdb/TocParser.g	2008-10-06 08:50:48.000000000 -0700
-+++ cdrdao-1.2.2-cclpatch/trackdb/TocParser.g	2008-10-06 08:50:48.000000000 -0700
-@@ -774,7 +774,7 @@
-       << if (item != NULL) {
-            int type = item->packType();
- 
--           if (isTrack && ((type >= 0x86 && type <= 0x89) || type == 0x8f)) {
-+           if (isTrack && ((type > 0x86 && type <= 0x89) || type == 0x8f)) {
-              log_message(-2, "%s:%d: Invalid CD-TEXT item for a track.",
-                      filename_, lineNr);
-              error_ = 1;

Deleted: cdrdao/trunk/cdrdao-1.2.3-tocparser.patch
===================================================================
--- cdrdao/trunk/cdrdao-1.2.3-tocparser.patch	2009-11-29 17:06:48 UTC (rev 59913)
+++ cdrdao/trunk/cdrdao-1.2.3-tocparser.patch	2009-11-29 17:28:52 UTC (rev 59914)
@@ -1,17 +0,0 @@
---- cdrdao-1.2.3.orig/trackdb/TocParser.g	2009/02/21 21:40:56	1.14
-+++ cdrdao-1.2.3/trackdb/TocParser.g		2009/05/04 15:49:52	1.15
-@@ -511,8 +511,12 @@
-        >>
-     )
-     << if ($st != NULL && $st->length() == 0) {
--          // try to determine length 
--          $st->determineLength();
-+         // try to determine length 
-+         if ($st->determineLength() != 0) {
-+	         log_message(-2, "%s:%d: Cannot determine length of track data specification.",
-+		                 filename_, $lineNr);
-+	         error_ = 1;
-+      	 }
-        }
-     >> 
-     ;

Modified: kdeplasma-applets-networkmanager/trunk/PKGBUILD
===================================================================
--- kdeplasma-applets-networkmanager/trunk/PKGBUILD	2009-11-29 17:06:48 UTC (rev 59913)
+++ kdeplasma-applets-networkmanager/trunk/PKGBUILD	2009-11-29 17:28:52 UTC (rev 59914)
@@ -3,7 +3,7 @@
 # Contributor: Jakub Schmidtke <sjakub-at-gmail.com>
 
 pkgname=kdeplasma-applets-networkmanager
-pkgver=1047027
+pkgver=1050092
 pkgrel=1
 pkgdesc="KDE4 NetworkManager plasmoid"
 arch=('i686' 'x86_64')
@@ -13,21 +13,15 @@
 makedepends=('cmake' 'python' 'automoc4')
 conflicts=('networkmanager-plasmoid-svn')
 replaces=('networkmanager-plasmoid-svn')
-#svn co -q svn://websvn.kde.org:443/home/kde/trunk/playground/base/plasma/applets/networkmanager/ kdeplasma-applets-networkmanager
-source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-r${pkgver}.tar.bz2"
-	'remove-i-know-what-am-doing.patch')
-md5sums=('ab554dfe2f503f176d33168f3042c80b'
-         'f4edca116beef0d70a93b5709b854e54')
+#svn co -q svn://websvn.kde.org:443/home/kde/trunk/kdereview/networkmanagement/ kdeplasma-applets-networkmanager
+source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-r${pkgver}.tar.bz2")
+md5sums=('c328158e6a792029943e5e67c5e59c44')
 
 build() {
-  cd ${srcdir}/${pkgname}
-  # we can't build plasmoid with qt 4.5
-  patch -R -p6 -i ${srcdir}/remove-i-know-what-am-doing.patch || return 1
-
   cd ${srcdir}
   mkdir build
   cd build
-  cmake ../${pkgname} \
+  cmake ../networkmanagement \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
     -DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d

Modified: qt/trunk/PKGBUILD
===================================================================
--- qt/trunk/PKGBUILD	2009-11-29 17:06:48 UTC (rev 59913)
+++ qt/trunk/PKGBUILD	2009-11-29 17:28:52 UTC (rev 59914)
@@ -1,13 +1,10 @@
-# $Id$
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
-pkgname=qt
-pkgver=4.5.3
-pkgrel=3
-_kdeqtver=063bded33b417cdf92fd51366fc7fdb06dea00ba
+pkgname=kde-qt
+pkgver=20091125
+pkgrel=1
 pkgdesc='A cross-platform application and UI framework'
 arch=('i686' 'x86_64')
-url='http://www.qtsoftware.com/'
+url='http://qt.gitorious.org/+kde-developers/qt/kde-qt'
 license=('GPL3' 'LGPL')
 depends=('libpng' 'mesa' 'fontconfig' 'libtiff>=3.8.2-5' 'libmng>=1.0.10-2' 'sqlite3' 'xdg-utils' 'hicolor-icon-theme'
          'libxrandr' 'glib2' 'libxi' 'dbus' 'libxcursor' 'libxinerama' 'libxrender' 'gstreamer0.10-base-plugins'
@@ -15,115 +12,101 @@
 optdepends=('postgresql-libs' 'libmysqlclient' 'unixodbc')
 makedepends=('inputproto' 'postgresql-libs' 'mysql' 'unixodbc' 'cups' 'libxfixes' 'gtk2')
 install=qt.install
-provides=("qt4=${pkgver}" 'phonon')
-replaces=('qt4' 'phonon')
-conflicts=('qt4' 'phonon')
+provides=("qt4=${pkgver}" "qt=${pkgver}")
+replaces=('qt4')
+conflicts=('qt4' 'phonon' 'qt')
 options=('!libtool')
-_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"
-	'gstreamer-logo.png'
+source=('gstreamer-logo.png'
         'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop'
-        'qdoc3.patch' 'phonon.patch' 'ca-certificates.patch')
-md5sums=('3988cf9af68be2df8a8000ede231de9b'
-         'a8b984c95ea658116a7b4f632ae93596'
-         'f0c26f76acf8b6a3297cfb31f872b0b7'
+        'ca-certificates.patch')
+md5sums=('f0c26f76acf8b6a3297cfb31f872b0b7'
          'a445c6917086d80f1cfc1e40cb6b0132'
          'd457f0a0ad68a3861c3cadefe3b42ded'
          '668331d9798a0e2b94381efb7be4c513'
          'c29f2993d6a0f73d756d2fa36e130e1c'
-         'a7e450751f42bdff17e57fdc4af72a18'
-         'ca0debc49d3505423e3b5742fdbfd852'
          'd5c4cad7af93f1d736d4569a207bd739')
 
-_create-kdeqt-patch() {
-	local codir=$(mktemp -d)
-	mkdir -p "${codir}/kde-qt"
-	git clone git://gitorious.org/+kde-developers/qt/kde-qt.git "${codir}/kde-qt"
-	pushd "${codir}/kde-qt"
-	local kdeqtver=$(git --no-pager show --format='%H' "${pkgver}-patched" | head -1)
-	git diff "v${pkgver}..${pkgver}-patched" | gzip > "${codir}/kde-qt-${kdeqtver}.patch.gz"
-	popd
-	mv "${codir}/kde-qt-${kdeqtver}.patch.gz" .
-	rm -rf "${codir}"
-}
+_gitroot=git://gitorious.org/+kde-developers/qt/kde-qt.git
+_gitname=kde-qt
 
 build() {
-	unset QMAKESPEC
-	export QT4DIR=$srcdir/$_pkgfqn
-	export PATH=${QT4DIR}/bin:${PATH}
-	export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+  cd ${srcdir}
+  if [[ -d ${srcdir}/${_gitname} ]]; then
+    cd ${_gitname}
+      git pull origin
+      msg "The local files are updated..."
+    else
+      git clone ${_gitroot}
+  fi
 
-	cd $srcdir/$_pkgfqn
-	patch -p1 -i $srcdir/kde-qt-${_kdeqtver}.patch || return 1
+  git clone ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build
+  cd ${srcdir}/${_gitname}-build
+  unset QMAKESPEC
+  export QT4DIR=${srcdir}/${pkgname}
+  export PATH=${QT4DIR}/bin:${PATH}
+  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+ 
+  # use system ssl cert bundle
+  patch -p1 -i $srcdir/ca-certificates.patch || return 1
 
-	# see http://cvs.fedoraproject.org/viewvc/rpms/qt/devel/
-	# enable qdoc3
-	patch -p1 -i $srcdir/qdoc3.patch || return 1
-	# install service files needed by KDE
-	patch -p1 -i $srcdir/phonon.patch || return 1
-	# use system ssl cert bundle
-	patch -p1 -i $srcdir/ca-certificates.patch || return 1
+  sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
+  sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
 
-	sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
-	sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
-
-	./configure -confirm-license -opensource \
-		-prefix /usr \
-		-sysconfdir /etc \
-		-plugindir /usr/lib/qt/plugins \
-		-translationdir /usr/share/qt/translations \
-		-datadir /usr/share/qt \
-		-docdir /usr/share/doc/qt \
-		-examplesdir /usr/share/doc/qt/examples \
-		-demosdir /usr/share/doc/qt/demos \
-		-largefile \
-		-plugin-sql-{psql,mysql,sqlite,odbc} \
-		-system-sqlite \
-		-xmlpatterns \
-		-phonon \
-		-svg \
-		-webkit \
-		-scripttools \
-		-system-zlib \
-		-system-libtiff \
-		-system-libpng \
-		-system-libmng \
-		-system-libjpeg \
-		-openssl-linked \
-		-nomake demos \
-		-nomake examples \
-		-nomake docs \
-		-no-rpath \
-		-silent \
-		-optimized-qmake \
-		-dbus \
-		-reduce-relocations \
-		-no-separate-debug-info \
-		-gtkstyle \
-		-opengl \
-		-glib
-	make
+  ./configure -confirm-license -opensource \
+     -prefix /usr \
+     -sysconfdir /etc \
+     -plugindir /usr/lib/qt/plugins \
+     -translationdir /usr/share/qt/translations \
+     -datadir /usr/share/qt \
+     -docdir /usr/share/doc/qt \
+     -examplesdir /usr/share/doc/qt/examples \
+     -demosdir /usr/share/doc/qt/demos \
+     -largefile \
+     -plugin-sql-{psql,mysql,sqlite,odbc} \
+     -system-sqlite \
+     -xmlpatterns \
+     -svg \
+     -webkit \
+     -scripttools \
+     -system-zlib \
+     -system-libtiff \
+     -system-libpng \
+     -system-libmng \
+     -system-libjpeg \
+     -openssl-linked \
+     -nomake demos \
+     -nomake examples \
+     -nomake docs \
+     -no-rpath \
+     -silent \
+     -optimized-qmake \
+     -dbus \
+     -reduce-relocations \
+     -no-separate-debug-info \
+     -gtkstyle \
+     -opengl \
+     -glib
+  make || return 1
 }
 
 package() {
-	cd $srcdir/$_pkgfqn
+	cd $srcdir/$_gitname-build
 	make INSTALL_ROOT=$pkgdir install
 
 	# install missing icons and desktop files
-	for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
-		size=$(echo $(basename ${icon}) | cut -d- -f2)
-		install -p -D -m644 ${icon} ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png
-	done
-	install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png
+#	for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
+#		size=$(echo $(basename ${icon}) | cut -d- -f2)
+#		install -p -D -m644 ${icon} ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png
+#	done
+#	install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png
 	install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png
 	install -p -D -m644 tools/designer/src/designer/images/designer.png ${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png
-	install -p -D -m644 ${srcdir}/gstreamer-logo.png ${pkgdir}/usr/share/icons/hicolor/128x128/apps/phonon-gstreamer.png
+#	install -p -D -m644 ${srcdir}/gstreamer-logo.png ${pkgdir}/usr/share/icons/hicolor/128x128/apps/phonon-gstreamer.png
 	install -d ${pkgdir}/usr/share/applications
 	install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop ${pkgdir}/usr/share/applications/
 
 	# install license addition
-	install -D -m644 LGPL_EXCEPTION.txt ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
+#	install -D -m644 LGPL_EXCEPTION.txt ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
 
 	# cleanup and path fixes
 	find $pkgdir/usr/lib -type f -name '*prl' -print -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \;

Modified: srcpac/trunk/PKGBUILD
===================================================================
--- srcpac/trunk/PKGBUILD	2009-11-29 17:06:48 UTC (rev 59913)
+++ srcpac/trunk/PKGBUILD	2009-11-29 17:28:52 UTC (rev 59914)
@@ -4,7 +4,7 @@
 
 pkgname=srcpac
 pkgver=0.6
-pkgrel=2
+pkgrel=1
 pkgdesc="The pacman from-source wrapper"
 arch=('any')
 url="http://projects.archlinux.org/srcpac.git/"




More information about the arch-commits mailing list