update qt and catalyst

catalyst/PKGBUILD

@@ -10,7 +10,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 _kernver=`uname -r`
 
 pkgname=catalyst
-pkgver=10.5
+pkgver=10.6
 pkgrel=1
 pkgdesc="AMD/ATI drivers for Radeon brand cards"
 arch=('i686' 'x86_64')
@@ -22,12 +22,11 @@ conflicts=('catalyst' 'catalyst-utils' 'nvidia' 'libgl' 'catalyst-leaked' 'xf86-
 provides=('catalyst' 'libgl' 'libatical')
 install=catalyst.install
 source=(http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run
-    catalyst.sh amdcccle.desktop atieventsd.sh fglrx-2.6.33.patch fglrx-2.6.34-rc4.patch)
+    catalyst.sh amdcccle.desktop atieventsd.sh fglrx-2.6.34-rc4.patch)
-md5sums=('869a923891ae052b7636f92062189266'
+md5sums=('089967a9aa86ad596884d82bb0b3a382'
          'bdafe749e046bfddee2d1c5e90eabd83'
          '4efa8414a8fe9eeb50da38b5522ef81d'
          'f729bf913613f49b0b9759c246058a87'
-	 'c5eb5571782fed5232461f59a789fb08'
 	 '5d464f7068fb45a9d2013cbd6a0b2021')
 
 build() {
@@ -48,7 +47,6 @@ fi
 #patching for kernel 2.6.33 or 2.6.34 support
 if [ `uname -r |grep -c "2.6.33"` != 0 ] || [ `uname -r |grep -c "2.6.34"` != 0 ]; then
 cd "${srcdir}/archive_files/"
-patch -Np1 -i ../fglrx-2.6.33.patch || return 1
 patch -Np1 -i ../fglrx-2.6.34-rc4.patch || return 1
 fi
 

catalyst/fglrx-2.6.33.patch

@@ -1,228 +0,0 @@
-Index: ati10.1/common/lib/modules/fglrx/build_mod/drmP.h
-===================================================================
---- ati10.1/common/lib/modules/fglrx/build_mod/drmP.h
-+++ ati10.1/common/lib/modules/fglrx/build_mod/drmP.h	2010-01-28 19:57:07.562644291 +0200
-@@ -42,7 +42,12 @@
-  * can build the DRM (part of PI DRI). 4/21/2000 S + B */
- #include <asm/current.h>
- #endif /* __alpha__ */
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/miscdevice.h>
-@@ -51,7 +56,6 @@
- #include <linux/init.h>
- #include <linux/file.h>
- #include <linux/pci.h>
--#include <linux/version.h>
- #include <linux/sched.h>
- #include <linux/smp_lock.h>	/* For (un)lock_kernel */
- #include <linux/mm.h>
-Index: ati10.1/common/lib/modules/fglrx/build_mod/firegl_public.c
-===================================================================
---- ati10.1/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ ati10.1/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-01-29 14:21:58.687999115 +0200
-@@ -28,7 +28,11 @@
- #error Kernel versions older than 2.6.0 are no longer supported by this module.
- #endif 
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- 
- #if !defined(CONFIG_X86) 
- #if !defined(CONFIG_X86_PC) 
-@@ -163,8 +167,12 @@
- 
- //  For 2.6.18 or higher, the UTS_RELEASE is defined in the linux/utsrelease.h. 
- #ifndef UTS_RELEASE 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/utsrelease.h>
-+#else
- #include <linux/utsrelease.h>
- #endif
-+#endif
- 
- #if defined(__i386__)
- #ifndef do_div
-@@ -1472,7 +1472,16 @@
- #ifndef __HAVE_ARCH_CMPXCHG
-     return __fgl_cmpxchg(ptr,old,new,size);
- #else
--    return __cmpxchg(ptr,old,new,size);
-+    switch (size) {
-+    case 1: { volatile u8 *_ptr = ptr; return cmpxchg(_ptr, old, new); }
-+    case 2: { volatile u16 *_ptr = ptr; return cmpxchg(_ptr, old, new); }
-+    case 4: { volatile u32 *_ptr = ptr; return cmpxchg(_ptr, old, new); }
-+#ifdef __x86_64__
-+    case 8: { volatile u64 *_ptr = ptr; return cmpxchg(_ptr, old, new); }
-+#endif
-+    default:
-+        return old;
-+    }
- #endif
- }
-
- 
-Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-===================================================================
---- ati10.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c
-+++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2010-01-28 19:57:17.897225045 +0200
-@@ -15,7 +15,11 @@
-  ****************************************************************************/
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/acpi.h>
- 
- #include "kcl_config.h"
-Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_agp.c
-===================================================================
---- ati10.1/common/lib/modules/fglrx/build_mod/kcl_agp.c
-+++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_agp.c	2010-01-28 19:57:26.104892082 +0200
-@@ -31,7 +31,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/pci.h>
- #include <linux/agp_backend.h>
- #include <linux/string.h>
-Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_io.c
-===================================================================
---- ati10.1/common/lib/modules/fglrx/build_mod/kcl_io.c
-+++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_io.c	2010-01-28 19:57:34.337558105 +0200
-@@ -37,7 +37,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/poll.h>
- #include <linux/signal.h>
- #include <asm/io.h>
-Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
-===================================================================
---- ati10.1/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
-+++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_osconfig.h	2010-01-28 19:57:43.599182385 +0200
-@@ -20,7 +20,11 @@
- #define KCL_OSCONFIG_H
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- 
- // Choose modern way to call 32-on-64 IOCTLs if configured in the kernel
- #if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
-Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_pci.c
-===================================================================
---- ati10.1/common/lib/modules/fglrx/build_mod/kcl_pci.c
-+++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_pci.c	2010-01-28 19:57:51.295870149 +0200
-@@ -31,7 +31,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/pci.h>
- 
- #include "kcl_config.h"
-Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_str.c
-===================================================================
---- ati10.1/common/lib/modules/fglrx/build_mod/kcl_str.c
-+++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_str.c	2010-01-28 19:57:59.728528058 +0200
-@@ -30,7 +30,12 @@
-  *
-  */
- 
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/string.h>
- #include <linux/module.h>
- 
-Index: ati10.1/common/lib/modules/fglrx/build_mod/kcl_wait.c
-===================================================================
---- ati10.1/common/lib/modules/fglrx/build_mod/kcl_wait.c
-+++ ati10.1/common/lib/modules/fglrx/build_mod/kcl_wait.c	2010-01-28 19:58:08.936154527 +0200
-@@ -31,7 +31,11 @@
-  */
- 
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
-+#include <generated/autoconf.h>
-+#else
- #include <linux/autoconf.h>
-+#endif
- #include <linux/wait.h>
- #include <linux/highmem.h>
- #include <linux/sched.h>
-Index: ati10.1/common/lib/modules/fglrx/build_mod/make.sh
-===================================================================
---- ati10.1/common/lib/modules/fglrx/build_mod/make.sh
-+++ ati10.1/common/lib/modules/fglrx/build_mod/make.sh	2010-01-28 19:55:10.849378991 +0200
-@@ -218,8 +218,15 @@
-         # UTS-define is in external version-*.h files, i.e. linux-2.2.14-5.0-RedHat does this flaw
-         kernel_release=`cat $linuxincludes/linux/version-*.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2` 
-     else
--        # For 2.6.18 or higher, UTS-define is defined in utsrelease.h.
--        kernel_release=`cat $linuxincludes/linux/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2` 
-+        UTS_REL_COUNT=`cat $linuxincludes/generated/utsrelease.h 2>/dev/null | grep UTS_RELEASE -c`
-+
-+	if [ $UTS_REL_COUNT -gt 0 ]; then
-+	    # 2.6.33+
-+	    kernel_release=`cat $linuxincludes/generated/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
-+	else
-+            # For 2.6.18 to 2.6.32, UTS-define is defined in utsrelease.h.
-+            kernel_release=`cat $linuxincludes/linux/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
-+	fi
-     fi
-   fi
- fi
-@@ -302,7 +309,8 @@
- # 3
- # linux/autoconf.h may contain this: #define CONFIG_SMP 1
- 
--src_file=$linuxincludes/linux/autoconf.h
-+src_file=$linuxincludes/generated/autoconf.h
-+[ -e $src_file ] || src_file=$linuxincludes/linux/autoconf.h
- 
- if [ ! -e $src_file ]; then
-   echo "Warning:"                                                  >> $logfile
-@@ -355,7 +363,8 @@
- MODVERSIONS=0
- 
- # linux/autoconf.h may contain this: #define CONFIG_MODVERSIONS 1
--src_file=$linuxincludes/linux/autoconf.h
-+src_file=$linuxincludes/generated/autoconf.h
-+[ -e $src_file ] || src_file=$linuxincludes/linux/autoconf.h
- if [ ! -e $src_file ];
- then
-   echo "Warning:"                                                  >> $logfile

qt/PKGBUILD

@@ -12,12 +12,14 @@ _origname=qt
 pkgbase=('qt')
 pkgname=('qt'
          'qt-doc'
-         'qt-debug'
+#disable debug-pkg creation
+#         'qt-debug'
          'qt-demos'
          'qt-tools')
 
-pkgver=4.6.2
+pkgver=4.6.3
 pkgrel=1
+_kdeqt=0
 
 pkgdesc="A cross-platform application and UI framework"
 arch=('i686' 'x86_64')
@@ -51,7 +53,7 @@ makedepends=('inputproto'
 	'libxcursor'
 	'libxinerama'
 	'libmysqlclient>=5.1.42'
-	'gconf') #	'git'
+ 	'git') # 'gconf'
 
 _pkgfqn=${_origname}-everywhere-opensource-src-${pkgver}
 
@@ -65,12 +67,10 @@ source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
 	'enable-qt3support-debug-info.patch'
 	'enable-qtwebkit-debug-info.patch'
 	'qmake-linker-flags-as-needed.patch'
-	'ca-certificates.patch'
+	'ca-certificates.patch')
 
-	'kde-qt-6dbbf15fcef976fafc3f55e048f9b4daaa4c0d19.patch'
-	'qt.install')
 
-md5sums=('eb651ee4b157c01696aa56777fc6e0e5
+md5sums=('5c69f16d452b0bb3d44bc3c10556c072
 20d333282c43f9e643cb8e91b6307dcc
 bf89ee0bdd178933f19d8bc4090173ec
 a9bfeeffab8ba103bc8153fdb31474a1
@@ -80,33 +80,36 @@ a9bfeeffab8ba103bc8153fdb31474a1
 bb99a4ad35f89b0a4f34795ba2ccc776
 9113f9964bdaeb59165b815cce503b4c
 c436732fc467271e8a3838145c122070
-d5c4cad7af93f1d736d4569a207bd739
+d5c4cad7af93f1d736d4569a207bd739')
-
+
-9717e204abc8f849ba1d0d99a77ef26e
-c40c32c34a619336ba2e215f8059a568')
 
 
 
-# FIXME create kde-qt patches temp disabled
 
 build()
 {
 	#Create patches
-#	msg "creating kde-qt patches"
+	if [ "$_kdeqt" == "1" ]; then
-#	local codir=$(mktemp -d)
+	  msg "creating kde-qt patches"
-#	mkdir -p "${codir}/kde-qt"
+	  local codir=$(mktemp -d)
-#	git clone git://gitorious.org/+kde-developers/qt/kde-qt.git "${codir}/kde-qt"
+	  mkdir -p "${codir}/kde-qt"
-#	pushd "${codir}/kde-qt"
+	  git clone git://gitorious.org/+kde-developers/qt/kde-qt.git "${codir}/kde-qt"
-#	git checkout --track -b ${pkgver}-patched origin/${pkgver}-patched
+	  pushd "${codir}/kde-qt"
-#	local kdeqtver=$(git --no-pager show --format='%H' "${pkgver}-patched" | head -1)
+	  git checkout --track -b ${pkgver}-patched origin/${pkgver}-patched
-#	git diff "v${pkgver}..${pkgver}-patched" > "${codir}/kde-qt-${kdeqtver}.patch"
+	  local kdeqtver=$(git --no-pager show --format='%H' "${pkgver}-patched" | head -1)
-#	popd
+	  git diff "v${pkgver}..${pkgver}-patched" > "${codir}/kde-qt-${kdeqtver}.patch"
-#	mv "${codir}/kde-qt-${kdeqtver}.patch" .
+	  popd
-#	rm -rf "${codir}"
+	  mv "${codir}/kde-qt-${kdeqtver}.patch" .
+	  rm -rf "${codir}"
+	fi
 
-	#editing qt.install
+	# editing qt.install
-#	sed -i -e 's/^.*> Qt .*/        echo " > Qt '${pkgver}'"/' $startdir/qt.install
+	sed -i -e 's/^.*> Qt .*/        echo " > Qt '${pkgver}'"/' $startdir/qt.install
-#	sed -i -e 's/^.*kde-qt .*/        echo "   kde-qt '${kdeqtver}'"/' $startdir/qt.install
+	if [ "$_kdeqt" == "1" ]; then
+	  sed -i -e 's/^.*kde-qt .*/        echo "   kde-qt '${kdeqtver}'"/' $startdir/qt.install
+	else
+	  sed -i -e 's/^.*kde-qt .*/        echo "   kde-qt (this time not patched)"/' $startdir/qt.install
+	fi
 
 	cd $srcdir/$_pkgfqn
 
@@ -115,11 +118,12 @@ build()
 	export PATH=${QT4DIR}/bin:${PATH}
 	export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
-	msg "applying kde-qt patches"
 	cd $srcdir/$_pkgfqn
-#	patch -p1 -i $srcdir/kde-qt-${kdeqtver}.patch || return 1
+	if [ "$_kdeqt" == "1" ]; then
-
+	  msg "applying kde-qt patches"
-	patch -p1 -i $startdir/kde-qt-6dbbf15fcef976fafc3f55e048f9b4daaa4c0d19.patch || return 1
+	  cd $srcdir/$_pkgfqn
+	  patch -p1 -i $srcdir/kde-qt-${kdeqtver}.patch || return 1
+	fi
 
 	msg "apply other patches"
 	patch -Np1 -i ${srcdir}/install-qdoc3.patch || return 1
@@ -164,7 +168,7 @@ build()
 		-system-libmng \
 		-system-libjpeg \
 		-no-rpath \
-		-gtkstyle \
+		-no-gtkstyle \
 		-opengl \
 		-glib \
 		-ptmalloc || return 1
@@ -182,8 +186,8 @@ package_qt()
 	depends=('libpng>=1.4.0' 'libxi' 'mesa' 'fontconfig' 'libxrandr' 'glib2' 'libtiff>=3.9.2-2' 'libmng>=1.0.10-3' 'libjpeg>=8' 'sqlite3' 'dbus' 'libxcursor' 'libxinerama')
 	optdepends=('postgresql-libs : PostgreSQL support' 
 	'libmysqlclient  : MySQL support'
-	'iodbc/unixodbc  : ODBC support'
+	'iodbc/unixodbc  : ODBC support')
-	'gconf           : qgtkstyle theme support for GTK')
+#	'gconf           : qgtkstyle theme support for GTK')
 	provides=("qt4=${pkgver}" "qt=${pkgver}") # "phonon=4.3.80"
 	replaces=('qt-devel' 'qtmod')
 	conflicts=('qt4' 'qtmod')

qt/qt.install

@@ -1,7 +1,7 @@
 post_install() {
 		echo " "
-        echo " > Qt 4.6.2"
+        echo " > Qt 4.6.3"
-        echo "   kde-qt 6dbbf15fcef976fafc3f55e048f9b4daaa4c0d19"
+        echo "   kde-qt (this time not patched)"
 		echo " "
 		echo "   Prefix: /usr"
 		echo " "
@@ -9,7 +9,6 @@ post_install() {
 		echo "   Some components are split into separate packages:"
 		echo " "
 		echo "   qt       : Base libraries and tools"
-		echo "   qt-debug : Debugging Symbols"
 		echo "   qt-doc   : Documentation"
 		echo "   qt-demos : Demos & Examples"
 		echo "   qt-tools : Development Tools (Assistant, Designer, Linguist)"