From 359d940358dec836dd0acfe9d9caf0b1ff0a97fe Mon Sep 17 00:00:00 2001 From: Parabola Date: Sun, 5 Feb 2012 17:25:05 +0000 Subject: Sun Feb 5 17:25:01 UTC 2012 --- community/arpack/arpack-2.1-redhat.patch | 55 - community/arpack/license.txt | 43 - community/bacula/PKGBUILD | 68 - community/bacula/bacula-dir.rc.d | 41 - community/bacula/bacula-fd.rc.d | 41 - community/bacula/bacula-sd.rc.d | 41 - community/bacula/bacula.install | 49 - community/cdfs/cdfs-3.0.0.patch | 274 --- community/clementine/PKGBUILD | 34 - community/clementine/clementine.install | 13 - community/dbus-sharp-glib/PKGBUILD | 32 - community/deadbeef/ffmpeg.patch | 45 - community/dockmanager/PKGBUILD | 63 - community/dockmanager/dockmanager.install | 19 - community/dockmanager/vala.patch | 26 - community/docky/PKGBUILD | 43 - community/docky/docky.install | 30 - community/fcron/fcron.install | 23 - community/ffmpeg2theora/ffmpeg2theora.changelog | 28 - community/filezilla/gnutls-3.patch | 27 - community/flightgear-atlas/PKGBUILD | 32 - community/flightgear-atlas/build-fix.patch | 448 ----- community/freemat/freemat-gcc-4.3.0.patch | 37 - community/freemat/freemat-gcc-4.5.0.patch | 207 --- community/freemat/freemat-qt46.patch | 2088 ----------------------- community/freemat/input-fix.patch | 12 - community/gkrellm/ChangeLog | 10 - community/ibus-hangul/ibus-1.4.0.patch | 58 - community/libcgns/PKGBUILD | 51 - community/libdesktop-agnostic/PKGBUILD | 44 - community/libdesktop-agnostic/gir.patch | 27 - community/libphobos/PKGBUILD | 45 - community/libphobos/dmd.conf | 2 - community/lshw/abi_stdlib.diff | 23 - community/megaglest/megaglest.sh | 26 - community/mythtv/build.patch | 13 - community/mythtv/mythbackend.conf | 92 - community/mythtv/mythbackend.rc | 82 - community/mythtv/mythtv-v4l2-fix.patch | 724 -------- community/mythtv/mythtv.install | 11 - community/openmovieeditor/PKGBUILD | 37 - community/perl-crypt-openssl-bignum/PKGBUILD | 23 - community/perl-crypt-openssl-random/PKGBUILD | 23 - community/perl-crypt-openssl-rsa/PKGBUILD | 27 - community/stow/PKGBUILD | 28 - community/tucan/PKGBUILD | 28 - community/wine/PKGBUILD | 149 -- community/wine/wine.install | 12 - 48 files changed, 5354 deletions(-) delete mode 100644 community/arpack/arpack-2.1-redhat.patch delete mode 100644 community/arpack/license.txt delete mode 100644 community/bacula/PKGBUILD delete mode 100644 community/bacula/bacula-dir.rc.d delete mode 100644 community/bacula/bacula-fd.rc.d delete mode 100644 community/bacula/bacula-sd.rc.d delete mode 100644 community/bacula/bacula.install delete mode 100644 community/cdfs/cdfs-3.0.0.patch delete mode 100644 community/clementine/PKGBUILD delete mode 100644 community/clementine/clementine.install delete mode 100644 community/dbus-sharp-glib/PKGBUILD delete mode 100644 community/deadbeef/ffmpeg.patch delete mode 100644 community/dockmanager/PKGBUILD delete mode 100644 community/dockmanager/dockmanager.install delete mode 100644 community/dockmanager/vala.patch delete mode 100644 community/docky/PKGBUILD delete mode 100644 community/docky/docky.install delete mode 100755 community/fcron/fcron.install delete mode 100644 community/ffmpeg2theora/ffmpeg2theora.changelog delete mode 100644 community/filezilla/gnutls-3.patch delete mode 100644 community/flightgear-atlas/PKGBUILD delete mode 100644 community/flightgear-atlas/build-fix.patch delete mode 100644 community/freemat/freemat-gcc-4.3.0.patch delete mode 100644 community/freemat/freemat-gcc-4.5.0.patch delete mode 100644 community/freemat/freemat-qt46.patch delete mode 100644 community/freemat/input-fix.patch delete mode 100644 community/gkrellm/ChangeLog delete mode 100644 community/ibus-hangul/ibus-1.4.0.patch delete mode 100644 community/libcgns/PKGBUILD delete mode 100644 community/libdesktop-agnostic/PKGBUILD delete mode 100644 community/libdesktop-agnostic/gir.patch delete mode 100644 community/libphobos/PKGBUILD delete mode 100644 community/libphobos/dmd.conf delete mode 100644 community/lshw/abi_stdlib.diff delete mode 100644 community/megaglest/megaglest.sh delete mode 100644 community/mythtv/build.patch delete mode 100644 community/mythtv/mythbackend.conf delete mode 100644 community/mythtv/mythbackend.rc delete mode 100644 community/mythtv/mythtv-v4l2-fix.patch delete mode 100644 community/mythtv/mythtv.install delete mode 100644 community/openmovieeditor/PKGBUILD delete mode 100644 community/perl-crypt-openssl-bignum/PKGBUILD delete mode 100644 community/perl-crypt-openssl-random/PKGBUILD delete mode 100644 community/perl-crypt-openssl-rsa/PKGBUILD delete mode 100644 community/stow/PKGBUILD delete mode 100644 community/tucan/PKGBUILD delete mode 100644 community/wine/PKGBUILD delete mode 100644 community/wine/wine.install (limited to 'community') diff --git a/community/arpack/arpack-2.1-redhat.patch b/community/arpack/arpack-2.1-redhat.patch deleted file mode 100644 index 154bff5d4..000000000 --- a/community/arpack/arpack-2.1-redhat.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- ARPACK/ARmake.inc~ 1996-04-26 21:12:57.000000000 +0200 -+++ ARPACK/ARmake.inc 2003-07-19 11:57:10.000000000 +0200 -@@ -25,7 +25,7 @@ - # | other than your home directory. | - # %--------------------------------------% - # --home = $(HOME)/ARPACK -+home = $(PWD)/. - # - # %--------------------------------------% - # | The platform identifier to suffix to | -@@ -43,7 +43,7 @@ - UTILdir = $(home)/UTIL - SRCdir = $(home)/SRC - # --DIRS = $(BLASdir) $(LAPACKdir) $(UTILdir) $(SRCdir) -+#DIRS = $(BLASdir) $(LAPACKdir) $(UTILdir) $(SRCdir) - # - # %-------------------------------------------------------------------% - # | Comment out the previous line and uncomment the following | -@@ -51,13 +51,13 @@ - # | NOTE: ARPACK assumes the use of LAPACK version 2 codes. | - # %-------------------------------------------------------------------% - # --#DIRS = $(UTILdir) $(SRCdir) -+DIRS = $(UTILdir) $(SRCdir) - # - # %---------------------------------------------------% - # | The name of the libraries to be created/linked to | - # %---------------------------------------------------% - # --ARPACKLIB = $(home)/libarpack_$(PLAT).a -+ARPACKLIB = $(home)/libarpack.a - LAPACKLIB = - BLASLIB = - # -@@ -112,7 +112,7 @@ - LN = ln - LNFLAGS = -s - --MAKE = /bin/make -+MAKE = make - - RM = rm - RMFLAGS = -f ---- ARPACK/UTIL/second.f.old 2008-07-08 17:38:51.759444357 +0200 -+++ ARPACK/UTIL/second.f 2008-07-08 17:39:37.056301918 +0200 -@@ -21,7 +21,6 @@ - * .. - * .. External Functions .. - REAL ETIME -- EXTERNAL ETIME - * .. - * .. Executable Statements .. - * diff --git a/community/arpack/license.txt b/community/arpack/license.txt deleted file mode 100644 index 11a5aea58..000000000 --- a/community/arpack/license.txt +++ /dev/null @@ -1,43 +0,0 @@ -Rice BSD Software License -Permits source and binary redistribution of the software ARPACK and -P_ARPACK for both non-commercial and commercial use. - -Copyright (©) 2001, Rice University -Developed by D.C. Sorensen, R.B. Lehoucq, C. Yang, and K. Maschhoff. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - * If you modify the source for these routines we ask that you - change the name of the routine and comment the changes made to - the original. - - * Written notification is provided to the developers of intent to - use this software. Also, we ask that use of ARPACK is properly - cited in any resulting publications or software documentation. - - * Neither the name of Rice University (RICE) nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY RICE AND CONTRIBUTORS "AS IS" AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL RICE OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/community/bacula/PKGBUILD b/community/bacula/PKGBUILD deleted file mode 100644 index 2c86520c9..000000000 --- a/community/bacula/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# Maintainer: Sven-Hendrik Haase -# Contributor: Xavion -# Contributor: Calogero Lo Leggio -# Contributor: Matias Hernandez - -pkgname=bacula -pkgver=5.2.2 -pkgrel=1 -pkgdesc="An advanced backup tool with network and tape changer support (MySQL backend)" -arch=("i686" "x86_64") -url="http://www.${pkgname}.org" -license=("GPL") -depends=("libmysqlclient") -makedepends=("qt" "wxgtk" "gtk2") -optdepends=("qt: for bat" - "wxgtk: for bwx console" - "gtk2: for tray monitor") -options=(!buildflags !libtool) -conflicts=("${pkgname}-sqlite" "${pkgname}-postgresql" "${pkgname}-client") -backup=("etc/${pkgname}/bconsole.conf" - "etc/${pkgname}/${pkgname}-dir.conf" - "etc/${pkgname}/${pkgname}-fd.conf" - "etc/${pkgname}/${pkgname}-sd.conf") -install="${pkgname}.install" -source=(http://downloads.sourceforge.net/project/bacula/bacula/${pkgver}/${pkgname}-${pkgver}.tar.gz - ${pkgname}-sd.rc.d - ${pkgname}-fd.rc.d - ${pkgname}-dir.rc.d) -md5sums=('227b88f56ae085da8f48823b220d4c87' - 'e7be4c9fb3c7ce334f9ee24d71652d3e' - 'a9a070a862e9cf39ae4bc374409c721d' - '55619ae3094c698541a3bfedc87bdb48') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # Build - ./configure --prefix=/usr \ - --enable-build-dird --enable-build-stored --enable-smartalloc \ - --enable-bat --enable-tray-monitor --enable-bwx-console \ - --with-mysql --without-openssl \ - --with-dir-user=${pkgname} --with-dir-group=${pkgname} \ - --with-sd-user=${pkgname} --with-sd-group=${pkgname} \ - --sysconfdir=/etc/${pkgname} --with-scriptdir=/etc/${pkgname}/scripts \ - --with-working-dir=/var/cache/${pkgname}/working \ - --with-subsys-dir=/var/cache/${pkgname}/working \ - --with-archivedir=/var/cache/${pkgname}/archive - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install - - # Permissions - chmod a+x ${pkgdir}/etc/${pkgname}/scripts/{update_${pkgname}_tables,delete_catalog_backup,update_mysql_tables,make_catalog_backup,bconsole} - - # Daemons - mkdir -p ${pkgdir}/etc/rc.d/ - install -Dm755 ${srcdir}/*.rc.d ${pkgdir}/etc/rc.d/ - - # Logs - install -D -m644 ${srcdir}/${pkgname}-${pkgver}/scripts/logrotate ${pkgdir}/etc/logrotate.d/${pkgname} - sed -i "s|/var/cache/${pkgname}/working/log|/var/log/${pkgname}.log|g" ${pkgdir}/etc/{${pkgname}/${pkgname}-dir.conf,logrotate.d/${pkgname}} -} - diff --git a/community/bacula/bacula-dir.rc.d b/community/bacula/bacula-dir.rc.d deleted file mode 100644 index a5a103dca..000000000 --- a/community/bacula/bacula-dir.rc.d +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/bacula ] || mkdir -p /var/run/bacula - chown bacula:bacula /var/run/bacula - - stat_busy "Starting Bacula Director Daemon" - /usr/sbin/bacula-dir - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon bacula-dir - stat_done - fi - ;; - stop) - stat_busy "Stopping Bacula Director Daemon" - killall bacula-dir > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon bacula-dir - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -~ -~ diff --git a/community/bacula/bacula-fd.rc.d b/community/bacula/bacula-fd.rc.d deleted file mode 100644 index 3817a0fed..000000000 --- a/community/bacula/bacula-fd.rc.d +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/bacula ] || mkdir -p /var/run/bacula - chown bacula:bacula /var/run/bacula - - stat_busy "Starting Bacula File Daemon" - /usr/sbin/bacula-fd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon bacula-fd - stat_done - fi - ;; - stop) - stat_busy "Stopping Bacula File Daemon" - killall bacula-fd > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon bacula-fd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -~ -~ diff --git a/community/bacula/bacula-sd.rc.d b/community/bacula/bacula-sd.rc.d deleted file mode 100644 index 96f200916..000000000 --- a/community/bacula/bacula-sd.rc.d +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/bacula ] || mkdir -p /var/run/bacula - chown bacula:bacula /var/run/bacula - - stat_busy "Starting Bacula Storage Daemon" - /usr/sbin/bacula-sd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon bacula-sd - stat_done - fi - ;; - stop) - stat_busy "Stopping Bacula Storage Daemon" - killall bacula-sd > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon bacula-sd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -~ -~ diff --git a/community/bacula/bacula.install b/community/bacula/bacula.install deleted file mode 100644 index 4d061ddfa..000000000 --- a/community/bacula/bacula.install +++ /dev/null @@ -1,49 +0,0 @@ -post_install() { - if [ -z "`grep '^bacula::' /etc/group`" ]; then - echo "Adding bacula system group... " - groupadd -g 77 bacula >& /dev/null - fi - - if [ -z "`grep '^bacula::' /etc/passwd`" ]; then - echo "Adding bacula system user... " - useradd -u 77 -c "Bacula Daemon" -d / -g bacula -s /bin/false bacula - fi - - echo "Locking Bacula User Account..." - passwd -l bacula &>/dev/null - - post_upgrade -} - -post_upgrade() { - -cat << EOM - -Note: -==> Please don't forget to config your MySQL database for the program. -==> -==> 1. If you have not init your MySQL DB yet, run mysql_install_db. -==> 2. Run /etc/bacula/scripts/grant_mysql_privileges. This script creates database user -==> 'bacula' with unrestricted rights to the bacula's database. The -==> script create user is without any password. You may want to edit -==> the script before run it. -==> 3. Run /etc/bacula/scripts/create_mysql_database to create the Database -==> Bacula. -==> 4. Run /etc/bacula/scripts/make_mysql_tables to create tables used by bacula. - -==> The archive directory is: /var/cache/bacula - -==> Bacula's offical website : http://www.bacula.org - -EOM -} - -post_remove() { - echo "Removing Bacula's system users..." - userdel bacula &> /dev/null - groupdel bacula &> /dev/null -} - -op=$1 -shift -[ "$(type -t "$op")" = "function" ] && $op "$@" diff --git a/community/cdfs/cdfs-3.0.0.patch b/community/cdfs/cdfs-3.0.0.patch deleted file mode 100644 index 20194b848..000000000 --- a/community/cdfs/cdfs-3.0.0.patch +++ /dev/null @@ -1,274 +0,0 @@ -diff -wbBur cdfs-2.6.27/cddata.c cdfs-2.6.27.my/cddata.c ---- cdfs-2.6.27/cddata.c 2009-12-21 17:04:03.000000000 +0300 -+++ cdfs-2.6.27.my/cddata.c 2011-07-24 21:18:44.000000000 +0400 -@@ -83,7 +83,7 @@ - #else - .mmap = generic_file_readonly_mmap, - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) -- .sendfile = generic_file_sendfile -+// .sendfile = generic_file_sendfile - #else - .splice_read = generic_file_splice_read - #endif -diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c ---- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300 -+++ cdfs-2.6.27.my/root.c 2011-07-25 13:16:59.000000000 +0400 -@@ -32,19 +30,14 @@ - * Added code to transform /proc/cdfs into a sequential synthetic file. * - *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ - -- - #include -- --#ifndef OLD_KERNEL - #include --#endif -+#include - - extern struct seq_operations cdfs_operations; - extern struct _track_info *dummy_track_p; - --#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) - struct inode *cdfs_iget(struct super_block *sp, unsigned long ino); --#endif - /*============================================================================* - * cdfs_open() * - * Description: * -@@ -115,15 +108,8 @@ - - /********************************************************************/ - --#ifdef OLD_KERNEL --static struct super_block * cdfs_mount(struct super_block *sb, void *data, int silent){ -- kdev_t dev = sb->s_dev; -- int i, j, t; -- struct cdrom_tochdr hdr; --#else - static int cdfs_fill_super(struct super_block *sb, void *data, int silent){ - int i, t; --#endif - struct cdrom_tocentry entry; - int no_audio=0, no_data=0; - cd * this_cd; -@@ -131,24 +117,13 @@ - - PRINT("cdfs_mount\n"); - --#ifdef OLD_KERNEL -- MOD_INC_USE_COUNT; -- -- set_blocksize(dev, CD_FRAMESIZE); // voor bread met ide-cd --#else - sb_set_blocksize(sb, CD_FRAMESIZE); // voor bread met ide-cd --#endif - - sb->s_blocksize = CD_FRAMESIZE; - sb->s_blocksize_bits = 11; - - if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){ --#ifdef OLD_KERNEL -- MOD_DEC_USE_COUNT; -- return NULL; --#else - return -ENOMEM; --#endif - } - - this_cd->mode = MODE; -@@ -160,13 +135,8 @@ - - // Initialize cache for maximum sector size - if (!(this_cd->cache = kmalloc(CD_FRAMESIZE_RAWER*CACHE_SIZE, GFP_KERNEL))) { --#ifdef OLD_KERNEL -- MOD_DEC_USE_COUNT; -- return NULL; --#else - kfree(cdfs_info(sb)); - return -ENOMEM; --#endif - } - - // Cache is still invalid -@@ -183,23 +153,13 @@ - if (this_cd->toc_scsi){ - if (cdfs_toc_read_full(sb)){ - printk("TOC read failed\n"); --#ifdef OLD_KERNEL -- MOD_DEC_USE_COUNT; -- return NULL; --#else - goto invalid; --#endif - } - } else { - //if (cdfs_ioctl(sb, CDROMREADTOCHDR, (unsigned long)&hdr)){ - if (cdfs_toc_read(sb)){ - printk("cdfs_toc_read failed\n"); --#ifdef OLD_KERNEL -- MOD_DEC_USE_COUNT; -- return NULL; --#else - goto invalid; --#endif - } - } - -@@ -365,11 +325,7 @@ - sb->s_flags |= MS_RDONLY; - sb->s_op = &cdfs_ops; - /* always get inode status */ --#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) - retinode=cdfs_iget(sb, 0); --#else -- retinode=iget(sb, 0); --#endif - if ( IS_ERR(retinode) ) - return PTR_ERR(retinode); - -@@ -379,16 +335,12 @@ - - cdfs_proc_cd = this_cd; - --#ifdef OLD_KERNEL -- return sb; --#else - return 0; - - invalid: - kfree(this_cd->cache); - kfree(cdfs_info(sb)); - return -EINVAL; --#endif - } - - /************************************************************************/ -@@ -410,27 +362,12 @@ - // Remove /proc entry - cdfs_proc_cd = NULL; - kfree(cdfs_info(sb)); -- --#ifdef OLD_KERNEL -- MOD_DEC_USE_COUNT; --#endif -- - } - - /************************************************************************/ - --#ifdef OLD_KERNEL --static int cdfs_statfs(struct super_block *sb, struct statfs *buf) { -- cd * this_cd = cdfs_info(sb); --#else --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) - static int cdfs_statfs(struct dentry *d, struct kstatfs *buf) { - cd * this_cd = cdfs_info(d->d_sb); --#else --static int cdfs_statfs(struct super_block *sb, struct kstatfs *buf) { -- cd * this_cd = cdfs_info(sb); --#endif --#endif - PRINT("rmfs_statfs\n"); - - buf->f_type = CDFS_MAGIC; -@@ -460,11 +397,7 @@ - - /************************************************************************/ - --#ifdef OLD_KERNEL --static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry){ --#else - static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){ --#endif - struct inode * inode; - int i; - cd * this_cd = cdfs_info(dir->i_sb); -@@ -480,15 +413,9 @@ - /* Use goto and read inode with iget()/cdfs_iget() */ - /* Thanks to David Howells for patch and Master class in his mail */ - found: --#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) - inode = cdfs_iget(dir->i_sb, i); - if (IS_ERR(inode)) - return ERR_CAST(inode); --#else -- inode = iget(dir->i_sb, i); -- if (!inode) -- return ERR_PTR(-ENOMEM); --#endif - d_add(dentry, inode); - return NULL; - } -@@ -529,12 +456,8 @@ - i->i_fop = &cdfs_dir_operations; - } else { /* file */ - i->i_size = this_cd->track[i->i_ino].size; --#ifdef OLD_KERNEL -- i->i_mtime = i->i_atime = i->i_ctime = this_cd->track[i->i_ino].time; --#else - i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = this_cd->track[i->i_ino].time; - i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0; --#endif - i->i_mode = this_cd->mode; - if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) { - i->i_fop = &cdfs_cddata_file_operations; -@@ -587,33 +510,21 @@ - /******************************************************************/ - - static struct super_operations cdfs_ops = { --#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) -- .read_inode = cdfs_read_inode, --#endif - .put_super = cdfs_umount, - .statfs = cdfs_statfs - }; - --#ifdef OLD_KERNEL --static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount); --#else --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) --static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) { -- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt); --#else --static struct super_block *cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) { -- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super); --#endif --} -+//static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) { -+// return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt); -+//} - - static struct file_system_type cdfs_fs_type = { - .owner = THIS_MODULE, - .name = "cdfs", -- .get_sb = cdfs_get_sb, -+// .get_sb = cdfs_get_sb, - .kill_sb = kill_block_super, - .fs_flags = FS_REQUIRES_DEV - }; --#endif - - /******************************************************/ - -@@ -621,10 +532,6 @@ - MODULE_DESCRIPTION("CDfs: a CD filesystem"); - MODULE_LICENSE("GPL"); - --#ifdef OLD_KERNEL --EXPORT_NO_SYMBOLS; --#endif -- - /******************************************************************/ - - static int __init cdfs_init(void) { -@@ -676,11 +583,7 @@ - - if (!options) return; - --#ifdef OLD_KERNEL -- for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) { --#else - while ((this_char = strsep(&options,",")) != NULL) { --#endif - - if (!strcmp(this_char,"single")) - this_cd->single=TRUE; diff --git a/community/clementine/PKGBUILD b/community/clementine/PKGBUILD deleted file mode 100644 index c5ff14f7f..000000000 --- a/community/clementine/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 61660 2012-01-05 21:38:03Z stephane $ -#Maintainer: Stéphane Gaudreault -#Contributor: BlackEagle -#Contributor: Dany Martineau - -pkgname=clementine -pkgver=1.0.0 -pkgrel=3 -pkgdesc="A music player and library organizer" -url="http://www.clementine-player.org/" -license=('GPL') -arch=('i686' 'x86_64') -depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' - 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice' - 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl') -makedepends=('cmake' 'boost') -optdepends=('gstreamer0.10-base-plugins: for more open formats' - 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' - 'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries' - 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries') -source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('ba49c686ea5759e33d6b89179965503fd369cf30') -install=clementine.install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DENABLE_REMOTE=ON - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/clementine/clementine.install b/community/clementine/clementine.install deleted file mode 100644 index 2f0338d8a..000000000 --- a/community/clementine/clementine.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - - -post_remove() { - post_install $1 -} diff --git a/community/dbus-sharp-glib/PKGBUILD b/community/dbus-sharp-glib/PKGBUILD deleted file mode 100644 index bd28aeede..000000000 --- a/community/dbus-sharp-glib/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 39552 2011-02-11 14:42:53Z heftig $ -# Maintainer: Jan "heftig" Steffens -# Contributor: Alessio Biancalana - -pkgname=dbus-sharp-glib -pkgver=0.5.0 -pkgrel=3 -pkgdesc="C# GLib implementation of D-Bus" -arch=('i686' 'x86_64') -url="http://github.com/mono/dbus-sharp/" -license=('custom') -depends=('dbus-sharp>=0.7') -makedepends=('pkgconfig') -options=(!makeflags) -source=(https://github.com/downloads/mono/dbus-sharp/${pkgname}-${pkgver}.tar.gz) -md5sums=('2284293316eb3a89f0f78798b8a24418') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - export MONO_SHARED_DIR="${srcdir}/.wabi" - mkdir -p "${MONO_SHARED_DIR}" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make -} - -package(){ - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} diff --git a/community/deadbeef/ffmpeg.patch b/community/deadbeef/ffmpeg.patch deleted file mode 100644 index 925b84408..000000000 --- a/community/deadbeef/ffmpeg.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -aur deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c ---- deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c 2011-05-22 13:58:53.000000000 +0000 -+++ deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c 2011-11-01 10:38:11.447669741 +0000 -@@ -140,7 +140,12 @@ - for (i = 0; i < info->fctx->nb_streams; i++) - { - info->ctx = info->fctx->streams[i]->codec; -- if (info->ctx->codec_type == CODEC_TYPE_AUDIO) -+ if (info->ctx->codec_type == -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) -+ AVMEDIA_TYPE_AUDIO) -+#else -+ CODEC_TYPE_AUDIO) -+#endif - { - info->codec = avcodec_find_decoder (info->ctx->codec_id); - if (info->codec != NULL) { -@@ -490,7 +495,12 @@ - for (i = 0; i < fctx->nb_streams; i++) - { - ctx = fctx->streams[i]->codec; -- if (ctx->codec_type == CODEC_TYPE_AUDIO) -+ if (ctx->codec_type == -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) -+ AVMEDIA_TYPE_AUDIO) -+#else -+ CODEC_TYPE_AUDIO) -+#endif - { - codec = avcodec_find_decoder(ctx->codec_id); - if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams -@@ -745,7 +755,12 @@ - for (i = 0; i < fctx->nb_streams; i++) - { - ctx = fctx->streams[i]->codec; -- if (ctx->codec_type == CODEC_TYPE_AUDIO) -+ if (ctx->codec_type == -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) -+ AVMEDIA_TYPE_AUDIO) -+#else -+ CODEC_TYPE_AUDIO) -+#endif - { - codec = avcodec_find_decoder(ctx->codec_id); - if (codec != NULL) diff --git a/community/dockmanager/PKGBUILD b/community/dockmanager/PKGBUILD deleted file mode 100644 index 0d91fb975..000000000 --- a/community/dockmanager/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 39549 2011-02-11 14:30:10Z heftig $ -# Maintainer: Jan "heftig" Steffens - -pkgname=dockmanager -pkgver=0.1.0 -pkgrel=0.20110211 -pkgdesc="Dock-independent helper scripts for compatible docks" -url="https://launchpad.net/dockmanager" -arch=(i686 x86_64) -license=(GPL) -depends=('libdesktop-agnostic>=0.3.90-2' gconf dbus-glib python2) -makedepends=(bzr 'vala>=0.10' pkgconfig intltool autoconf gnome-common) -conflicts=(dockmanager-bzr) -provides=("dockmanager-bzr") -options=('!libtool' '!emptydirs') -install=dockmanager.install -source=(vala.patch) -md5sums=('f6db8c3a432b41b620f6fcc8bfccfd81') - -__bzrtrunk=lp:dockmanager -__bzrmod=dockmanager - -build() { - cd "$srcdir" - - msg2 "Connecting to Launchpad...." - - if [ -d $__bzrmod ] ; then - ( cd $__bzrmod && bzr up ) || warning "Bzr up failed!" - else - bzr checkout $__bzrtrunk $__bzrmod - fi - - msg2 "BZR checkout done or server timeout" - - rm -rf $pkgname-build - cp -r $__bzrmod $pkgname-build - cd $pkgname-build - - msg2 "Starting make..." - - patch -Np0 -i "$srcdir/vala.patch" - - ./autogen.sh \ - --prefix=/usr \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc - - make -} - -package() { - cd "$srcdir/$pkgname-build" - - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - - # Fix for python2 - find $pkgdir -type f -exec sed -i '1s|#!/usr/bin/env python$|&2|' {} + - - mkdir -p "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/dockmanager.schemas" "$pkgdir"/etc/gconf/schemas/*.schemas - rm -rf "$pkgdir/etc/gconf" -} diff --git a/community/dockmanager/dockmanager.install b/community/dockmanager/dockmanager.install deleted file mode 100644 index 11d20ed8c..000000000 --- a/community/dockmanager/dockmanager.install +++ /dev/null @@ -1,19 +0,0 @@ -pkgname=dockmanager - -post_install() { - echo "Installing schema..." - gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - echo "Removing schema..." - gconfpkg --uninstall ${pkgname} -} diff --git a/community/dockmanager/vala.patch b/community/dockmanager/vala.patch deleted file mode 100644 index efe01e474..000000000 --- a/community/dockmanager/vala.patch +++ /dev/null @@ -1,26 +0,0 @@ -=== modified file 'daemon/tile.vala' ---- daemon/tile.vala 2010-12-01 23:39:56 +0000 -+++ daemon/tile.vala 2011-01-18 04:30:10 +0000 -@@ -185,10 +185,6 @@ - { - try - { --#if VALA_0_12 --#else -- unowned --#endif - Gdk.Pixbuf temp_pb; - unowned IconTheme it = IconTheme.get_default (); - try -@@ -204,10 +200,6 @@ - IconLookupFlags.FORCE_SIZE); - } - pixbuf = temp_pb.copy (); --#if VALA_0_12 --#else -- temp_pb.unref (); // careful here! --#endif - } - catch (Error err) - { - diff --git a/community/docky/PKGBUILD b/community/docky/PKGBUILD deleted file mode 100644 index 636d2e762..000000000 --- a/community/docky/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 49764 2011-06-21 00:08:54Z heftig $ -# Maintainer: Jan "heftig" Steffens -# Contributor: dieghen89 -# Contributor: Alessio 'Bl@ster' Biancalana - -pkgname=docky -pkgver=2.1.3 -pkgrel=1 -pkgdesc="The finest dock no money can buy!" -url="https://launchpad.net/docky" -arch=(i686 x86_64) -license=(GPL) -depends=(gnome-desktop-sharp gnome-keyring-sharp gtk2 mono-addins - hicolor-icon-theme ndesk-dbus-glib notify-sharp-svn xdg-utils - desktop-file-utils dockmanager gio-sharp dbus-sharp-glib gconf-sharp) -makedepends=(intltool libgnome-sharp) -options=('!libtool' '!emptydirs') -install=docky.install -source=("http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz") -md5sums=('7a40c25dff6b71c346e7791533f05b5f') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - export MONO_SHARED_DIR="$srcdir/.wabi" - mkdir -p "$MONO_SHARED_DIR" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc - - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install - - mkdir -p "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/docky.schemas" "$pkgdir"/etc/gconf/schemas/*.schemas - rm -rf "$pkgdir/etc/gconf" -} diff --git a/community/docky/docky.install b/community/docky/docky.install deleted file mode 100644 index 4e2242957..000000000 --- a/community/docky/docky.install +++ /dev/null @@ -1,30 +0,0 @@ -pkgname=docky - -post_install() { - echo "Installing schema..." - gconfpkg --install ${pkgname} - - echo "Updating desktop..." - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - echo "Removing schema..." - gconfpkg --uninstall ${pkgname} -} - -post_remove() { - echo "Updating desktop..." - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - diff --git a/community/fcron/fcron.install b/community/fcron/fcron.install deleted file mode 100755 index a1223138e..000000000 --- a/community/fcron/fcron.install +++ /dev/null @@ -1,23 +0,0 @@ -pre_install() { - # Create necessary user and group - getent group cron || /usr/sbin/groupadd -g 22 cron - getent passwd cron || /usr/sbin/useradd -d / -g cron -u 22 -s /bin/false cron -} - -post_install() { - cat << "EOF" - - Use fcrontab -u systab -e to edit the system crontab and change the defaults. - - By default fcron uses vi as an editor for your crontab. If you want to use another editor - you can define it in /etc/fcron/fcron.conf. If for some odd reason you want to uninstall - vi and recompile fcron, you need to edit the PKGBUILD and pass - --with-editor= to configure. - - By default fcron uses /usr/sbin/sendmail (as in the packages providing smtp-sever, such as - exim and postfix) to send mails about your cron jobs. If there is no /usr/sbin/sendmail you - won't get mails. If you want to use a MTA with a different path you can define it - /etc/fcron/fcron.conf. - -EOF -} diff --git a/community/ffmpeg2theora/ffmpeg2theora.changelog b/community/ffmpeg2theora/ffmpeg2theora.changelog deleted file mode 100644 index adbe34807..000000000 --- a/community/ffmpeg2theora/ffmpeg2theora.changelog +++ /dev/null @@ -1,28 +0,0 @@ -2011-10-09 Jaroslav Lichtblau - - * ffmpeg2theora 0.28-1 - * Upstream update - -2010-06-25 Eric Belanger - - * ffmpeg2theora 0.27-1 - * Upstream update - -2010-02-05 Eric Belanger - - * ffmpeg2theora 0.26-1 - * Upstream update - * Updated license - * Updated source url - -2010-01-10 Eric Belanger - - * ffmpeg2theora 0.25-1 - * Upstream update - * Built against ffmpeg 20100108 - -2009-06-06 Eric Belanger - - * ffmpeg2theora 0.24-1 - * Upstream update - * Added ChangeLog diff --git a/community/filezilla/gnutls-3.patch b/community/filezilla/gnutls-3.patch deleted file mode 100644 index 88e4ac9e7..000000000 --- a/community/filezilla/gnutls-3.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fix FS#25669 - -Upstream bug: http://trac.filezilla-project.org/ticket/7742 - -diff --git a/src/engine/tlssocket.cpp b/src/engine/tlssocket.cpp -index e9a5105..7ddb1ae 100644 ---- a/src/engine/tlssocket.cpp -+++ b/src/engine/tlssocket.cpp -@@ -97,7 +97,7 @@ bool CTlsSocket::Init() - return false; - } - -- res = gnutls_priority_set_direct(m_session, "SECURE256:+CTYPE-X509:-CTYPE-OPENPGP", 0); -+ res = gnutls_priority_set_direct(m_session, "NORMAL:+CTYPE-X509:-CTYPE-OPENPGP", 0); - if (res) - { - LogError(res); -@@ -113,7 +113,9 @@ bool CTlsSocket::Init() - gnutls_transport_set_push_function(m_session, PushFunction); - gnutls_transport_set_pull_function(m_session, PullFunction); - gnutls_transport_set_ptr(m_session, (gnutls_transport_ptr_t)this); -+#if GNUTLS_VERSION_MAJOR < 3 - gnutls_transport_set_lowat(m_session, 0); -+#endif - - m_shutdown_requested = false; - diff --git a/community/flightgear-atlas/PKGBUILD b/community/flightgear-atlas/PKGBUILD deleted file mode 100644 index 8cbd7a8ee..000000000 --- a/community/flightgear-atlas/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: William Rea -# Contributor: Hans Janssen - -pkgname=flightgear-atlas -pkgver=0.3.1 -pkgrel=3 -arch=(i686 x86_64) -pkgdesc="aims to produce and display high quality charts of the world for users of FlightGear." -depends=('flightgear-data' 'libpng' 'libjpeg') -makedepends=('simgear') -url="http://atlas.sourceforge.net" -license=('GPL') -source=(http://downloads.sourceforge.net/sourceforge/atlas/Atlas-$pkgver.tar.gz \ - build-fix.patch) -md5sums=('15bba54523a29928a14f17af449f960e' - '6ad0d34b617d9ca680a63c965479eb7c') - -build() { - cd $startdir/src/Atlas-$pkgver - - patch -p1 <$srcdir/build-fix.patch - - LDFLAGS="-lsgstructure" ./configure --prefix=/usr - - perl -ne 's/LIBS =(.+)/LIBS =$1 -lsgstructure/g; print;' src/Makefile >src/Makefile2 && \ - mv src/Makefile2 src/Makefile - - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - mkdir -p $startdir/pkg/usr/share/FlightGear/data - cp $startdir/src/Atlas-$pkgver/src/AtlasPalette $startdir/pkg/usr/share/FlightGear/data -} diff --git a/community/flightgear-atlas/build-fix.patch b/community/flightgear-atlas/build-fix.patch deleted file mode 100644 index 5f190d386..000000000 --- a/community/flightgear-atlas/build-fix.patch +++ /dev/null @@ -1,448 +0,0 @@ -diff -wbBur Atlas-0.3.1/src/Atlas.cxx Atlas-0.3.1.my/src/Atlas.cxx ---- Atlas-0.3.1/src/Atlas.cxx 2006-10-28 16:28:32.000000000 +0000 -+++ Atlas-0.3.1.my/src/Atlas.cxx 2009-03-11 16:33:33.000000000 +0000 -@@ -29,7 +29,7 @@ - #include - #include - #include --#include SG_GLUT_H -+#include - #include - #include - #include -@@ -40,6 +40,8 @@ - #include "Overlays.hxx" - #include "FlightTrack.hxx" - -+#include -+ - #define SCALECHANGEFACTOR 1.3f - - SGIOChannel *input_channel; -@@ -345,7 +347,7 @@ - - string nav1_freq_str = msg.substr(begin, end - begin); - begin = end + 1; -- cout << " nav1_freq = " << nav1_freq_str << endl; -+ std::cout << " nav1_freq = " << nav1_freq_str << std::endl; - - // nav1 selected radial - end = msg.find(",", begin); -@@ -355,7 +357,7 @@ - - string nav1_rad_str = msg.substr(begin, end - begin); - begin = end + 1; -- cout << " nav1_rad = " << nav1_rad_str << endl; -+ std::cout << " nav1_rad = " << nav1_rad_str << std::endl; - - // nav2 freq - end = msg.find(",", begin); -@@ -365,7 +367,7 @@ - - string nav2_freq_str = msg.substr(begin, end - begin); - begin = end + 1; -- cout << " nav2_freq = " << nav2_freq_str << endl; -+ std::cout << " nav2_freq = " << nav2_freq_str << std::endl; - - // nav2 selected radial - end = msg.find(",", begin); -@@ -375,7 +377,7 @@ - - string nav2_rad_str = msg.substr(begin, end - begin); - begin = end + 1; -- cout << " nav2_rad = " << nav2_rad_str << endl; -+ std::cout << " nav2_rad = " << nav2_rad_str << std::endl; - - // adf freq - end = msg.find("*", begin); -@@ -385,7 +387,7 @@ - - string adf_freq_str = msg.substr(begin, end - begin); - begin = end + 1; -- cout << " adf_freq = " << adf_freq_str << endl; -+ std::cout << " adf_freq = " << adf_freq_str << std::endl; - - nav1_freq = atof( nav1_freq_str.c_str() ); - nav1_rad = atof( nav1_rad_str.c_str() ) * -diff -wbBur Atlas-0.3.1/src/FlightTrack.cxx Atlas-0.3.1.my/src/FlightTrack.cxx ---- Atlas-0.3.1/src/FlightTrack.cxx 2003-01-07 21:51:12.000000000 +0000 -+++ Atlas-0.3.1.my/src/FlightTrack.cxx 2009-03-11 16:33:33.000000000 +0000 -@@ -29,7 +29,7 @@ - } - - FlightTrack::~FlightTrack() { -- for (list::iterator i = track.begin(); i != track.end(); i++) { -+ for (std::list::iterator i = track.begin(); i != track.end(); i++) { - delete *i; - } - } -diff -wbBur Atlas-0.3.1/src/FlightTrack.hxx Atlas-0.3.1.my/src/FlightTrack.hxx ---- Atlas-0.3.1/src/FlightTrack.hxx 2003-01-07 21:51:12.000000000 +0000 -+++ Atlas-0.3.1.my/src/FlightTrack.hxx 2009-03-11 16:33:30.000000000 +0000 -@@ -27,7 +27,7 @@ - #include - #include - --SG_USING_STD(list); -+#include - - struct FlightData { - float lat, lon, alt, hdg, spd; -@@ -51,8 +51,8 @@ - protected: - unsigned int max_buffer; - -- list track; -- list::iterator track_pos; -+ std::list track; -+ std::list::iterator track_pos; - }; - - -diff -wbBur Atlas-0.3.1/src/Map.cxx Atlas-0.3.1.my/src/Map.cxx ---- Atlas-0.3.1/src/Map.cxx 2006-10-26 21:45:05.000000000 +0000 -+++ Atlas-0.3.1.my/src/Map.cxx 2009-03-11 16:35:10.000000000 +0000 -@@ -39,7 +39,7 @@ - #include - - #include --#include SG_GL_H -+#include - #ifdef UL_GLX - # define GLX_GLXEXT_PROTOTYPES - # ifdef __APPLE__ -@@ -50,7 +50,7 @@ - #elif defined UL_WIN32 - # include - #endif --#include SG_GLUT_H -+#include - #include - #include - #include -@@ -65,10 +65,10 @@ - #include - #include "Scenery.hxx" - #include --#include STL_STRING -+#include - --SG_USING_STD(vector); --SG_USING_STD(string); -+#include -+#include - - typedef vector string_list; - -@@ -319,9 +319,9 @@ - } - - bool ContinueIfNoHeadless() { -- cout << "Unable to continue in headless mode - revert to doublebuffer mode? [Y/n] "; -+ std::cout << "Unable to continue in headless mode - revert to doublebuffer mode? [Y/n] "; - char c; -- cin >> c; -+ std::cin >> c; - return((c == 'n' || c == 'N') ? false : true); - } - -@@ -439,7 +439,7 @@ - scenerypath = new char[max_path_length + 256]; - scenery_pos = 0; - } else { -- cout << "No scenery paths could be found. You need to set either a valid FG_ROOT and/or FG_SCENERY variable, or specify a valid --fg-root and/or --fg-scenery on the command line.\n"; -+ std::cout << "No scenery paths could be found. You need to set either a valid FG_ROOT and/or FG_SCENERY variable, or specify a valid --fg-root and/or --fg-scenery on the command line.\n"; - exit(-1); - } - -@@ -467,7 +467,7 @@ - } - dir1 = ulOpenDir(outp); - if(NULL == dir1) { -- cout << "Unable to create requested Atlas map directory " << outp << "... exiting :-(\n"; -+ std::cout << "Unable to create requested Atlas map directory " << outp << "... exiting :-(\n"; - exit(-1); - } - -@@ -502,17 +502,17 @@ - if(dir1 != NULL) { - path_found = true; - scenerypath[sz] = '\0'; -- //cout << "Scenerypath found, = " << scenerypath << '\n'; -+ //std::cout << "Scenerypath found, = " << scenerypath << '\n'; - break; - } -- //cout << scenerypath << (dir1 == NULL ? " does not exist..." : " exists!") << '\n'; -+ //std::cout << scenerypath << (dir1 == NULL ? " does not exist..." : " exists!") << '\n'; - } - if(!path_found) { -- cout << "Unable to find required subdirectory " << dpath1 << '/' << dpath2 << " on the available scenery paths:\n"; -+ std::cout << "Unable to find required subdirectory " << dpath1 << '/' << dpath2 << " on the available scenery paths:\n"; - for(unsigned int i = 0; i < fg_scenery.size(); ++i) { -- cout << fg_scenery[i] << '\n'; -+ std::cout << fg_scenery[i] << '\n'; - } -- cout << "... unable to continue - exiting!\n"; -+ std::cout << "... unable to continue - exiting!\n"; - exit(-1); - } - } -diff -wbBur Atlas-0.3.1/src/MapBrowser.cxx Atlas-0.3.1.my/src/MapBrowser.cxx ---- Atlas-0.3.1/src/MapBrowser.cxx 2005-09-29 19:18:01.000000000 +0000 -+++ Atlas-0.3.1.my/src/MapBrowser.cxx 2009-03-11 16:33:33.000000000 +0000 -@@ -112,7 +112,7 @@ - - void MapBrowser::changeResolution(char *path) { - MapTile *tile; -- list::iterator i = tiles.end(), -+ std::list::iterator i = tiles.end(), - itmp; - i--; - while (tiles.begin() != tiles.end()) { -@@ -171,7 +171,7 @@ - glEnable( GL_TEXTURE_2D ); - GLfloat tilesize = earth_radius_lat(clat) * SG_DEGREES_TO_RADIANS; - -- for (list::iterator i = tiles.begin(); i != tiles.end(); i++) { -+ for (std::list::iterator i = tiles.begin(); i != tiles.end(); i++) { - MapTile *tile = *i; - if ( tile->tex ) { - GLfloat dxs = 0.5f; -@@ -237,7 +237,7 @@ - if (max_lat > 90) max_lat = 90; - int num_lat = (max_lat - min_lat) + 1, num_lon = (max_lon - min_lon) + 1; - -- for (list::iterator it = tiles.begin(); it != tiles.end(); it++) { -+ for (std::list::iterator it = tiles.begin(); it != tiles.end(); it++) { - MapTile *tile = *it; - - // remove old tiles -@@ -246,7 +246,7 @@ - tile->c.lon < min_lon - CACHE_LIMIT || - tile->c.lon > max_lon + CACHE_LIMIT) { - -- list::iterator tmp = it; tmp++; -+ std::list::iterator tmp = it; tmp++; - if ( tile->tex ) { - glDeleteTextures( 1, &tile->texture_handle ); - } -diff -wbBur Atlas-0.3.1/src/MapBrowser.hxx Atlas-0.3.1.my/src/MapBrowser.hxx ---- Atlas-0.3.1/src/MapBrowser.hxx 2006-10-28 16:28:32.000000000 +0000 -+++ Atlas-0.3.1.my/src/MapBrowser.hxx 2009-03-11 16:33:30.000000000 +0000 -@@ -27,7 +27,7 @@ - #include "FlightTrack.hxx" - #include "Projection.hxx" - #include --#include SG_GL_H -+#include - #include - #include - #include -@@ -113,9 +113,9 @@ - } - }; - -- typedef map TileTable; -+ typedef std::map TileTable; - -- list tiles; -+ std::list tiles; - TileTable tiletable; - - char mpath[512]; -diff -wbBur Atlas-0.3.1/src/MapMaker.cxx Atlas-0.3.1.my/src/MapMaker.cxx ---- Atlas-0.3.1/src/MapMaker.cxx 2005-09-29 19:18:01.000000000 +0000 -+++ Atlas-0.3.1.my/src/MapMaker.cxx 2009-03-11 16:39:09.000000000 +0000 -@@ -32,6 +32,8 @@ - #include - #include - -+#include -+ - #include "MapMaker.hxx" - /*#include */ - -@@ -626,7 +628,7 @@ - } - - int MapMaker::process_binary_file( char *tile_name, sgVec3 xyz ) { -- //cout << "tile name = " << tile_name << '\n'; -+ //std::cout << "tile name = " << tile_name << '\n'; - - //float cr; // reference point (gbs) - sgVec3 gbs, tmp; -@@ -653,8 +655,8 @@ - - /* convert point_list of wgs84 nodes to a list of points transformed - into the maps local coordinate system */ -- const point_list wgs84_nodes = tile.get_wgs84_nodes(); -- for ( point_list::const_iterator node = wgs84_nodes . begin(); -+ const std::vector< SGVec3 > wgs84_nodes = tile.get_wgs84_nodes(); -+ for ( std::vector< SGVec3 >::const_iterator node = wgs84_nodes . begin(); - node != wgs84_nodes . end(); - node++ ) { - -@@ -674,8 +676,8 @@ - } - - // same as above for normals -- const point_list m_norms = tile.get_normals(); -- for ( point_list::const_iterator normal = m_norms.begin(); -+ const std::vector< SGVec3 > m_norms = tile.get_normals(); -+ for ( std::vector< SGVec3 >::const_iterator normal = m_norms.begin(); - normal != m_norms.end(); - normal++ ) { - // Make a new normal -@@ -760,8 +762,8 @@ - } - - if(0) { -- cout << "Node_list sizes are nodes: " << wgs84_nodes.size() << " -- normals: " << m_norms.size() << '\n'; -- cout << "Group_list sizes are tris: " << tris.size() << " -- fans: " << fans.size() << " -- strips: " << strips.size() << '\n'; -+ std::cout << "Node_list sizes are nodes: " << wgs84_nodes.size() << " -- normals: " << m_norms.size() << '\n'; -+ std::cout << "Group_list sizes are tris: " << tris.size() << " -- fans: " << fans.size() << " -- strips: " << strips.size() << '\n'; - } - - for (i = 0; i < v.size(); i++) { -diff -wbBur Atlas-0.3.1/src/MapMaker.hxx Atlas-0.3.1.my/src/MapMaker.hxx ---- Atlas-0.3.1/src/MapMaker.hxx 2005-02-26 18:40:36.000000000 +0000 -+++ Atlas-0.3.1.my/src/MapMaker.hxx 2009-03-11 16:33:30.000000000 +0000 -@@ -31,14 +31,14 @@ - #include - #include - #include --#include STL_STRING -+#include - - #include "Output.hxx" - #include "Overlays.hxx" - #include "Geodesy.hxx" - --SG_USING_STD(vector); --SG_USING_STD(string); -+#include -+#include - - // Utility function that I needed to put somewhere - this probably isn't the best place for it. - // Appends a path separator to a directory path if not present. -diff -wbBur Atlas-0.3.1/src/MapPS.cxx Atlas-0.3.1.my/src/MapPS.cxx ---- Atlas-0.3.1/src/MapPS.cxx 2005-09-29 19:18:01.000000000 +0000 -+++ Atlas-0.3.1.my/src/MapPS.cxx 2009-03-11 16:40:31.000000000 +0000 -@@ -39,8 +39,9 @@ - #include - #include "Scenery.hxx" - --SG_USING_STD(vector); --SG_USING_STD(string); -+#include -+#include -+#include - - typedef vector string_list; - -@@ -149,7 +150,7 @@ - scenerypath = new char[max_path_length + 256]; - scenery_pos = 0; - } else { -- cout << "No scenery paths could be found. You need to set either a valid FG_ROOT and/or FG_SCENERY variable, or specify a valid --fg-root and/or --fg-scenery on the command line.\n"; -+ std::cout << "No scenery paths could be found. You need to set either a valid FG_ROOT and/or FG_SCENERY variable, or specify a valid --fg-root and/or --fg-scenery on the command line.\n"; - exit(-1); - } - -diff -wbBur Atlas-0.3.1/src/OutputGL.hxx Atlas-0.3.1.my/src/OutputGL.hxx ---- Atlas-0.3.1/src/OutputGL.hxx 2005-02-26 18:40:37.000000000 +0000 -+++ Atlas-0.3.1.my/src/OutputGL.hxx 2009-03-11 16:33:30.000000000 +0000 -@@ -2,7 +2,7 @@ - #define __OUTPUTGL_H__ - - #include --#include SG_GLUT_H -+#include - #include - #include - #include "Output.hxx" -diff -wbBur Atlas-0.3.1/src/Overlays.cxx Atlas-0.3.1.my/src/Overlays.cxx ---- Atlas-0.3.1/src/Overlays.cxx 2006-10-26 11:56:25.000000000 +0000 -+++ Atlas-0.3.1.my/src/Overlays.cxx 2009-03-11 16:33:33.000000000 +0000 -@@ -27,7 +27,7 @@ - #include "Overlays.hxx" - #include "Geodesy.hxx" - --SG_USING_STD(map); -+#include - - #ifdef _MSC_VER - -@@ -65,8 +65,10 @@ - bool Overlays::airports_loaded = false; - bool Overlays::navaids_loaded = false; - bool Overlays::fixes_loaded = false; --vector Overlays::airports; --vector Overlays::navaids; -+std::vector Overlays::airports; -+std::vector Overlays::navaids; -+ -+using namespace std; - - const float Overlays::airport_color1[4] = {0.439, 0.271, 0.420, 0.7}; - const float Overlays::airport_color2[4] = {0.824, 0.863, 0.824, 0.7}; -diff -wbBur Atlas-0.3.1/src/Overlays.hxx Atlas-0.3.1.my/src/Overlays.hxx ---- Atlas-0.3.1/src/Overlays.hxx 2005-01-10 13:15:53.000000000 +0000 -+++ Atlas-0.3.1.my/src/Overlays.hxx 2009-03-11 16:33:30.000000000 +0000 -@@ -121,7 +121,7 @@ - struct ARP { - char name[64], id[5]; - float lat, lon; -- list rwys; -+ std::list rwys; - }; - - enum NavType { NAV_VOR, NAV_DME, NAV_NDB, NAV_ILS, NAV_FIX }; -@@ -142,8 +142,8 @@ - - protected: - -- static vector airports; -- static vector navaids; -+ static std::vector airports; -+ static std::vector navaids; - static bool airports_loaded, navaids_loaded, fixes_loaded; - static const float dummy_normals[][3]; - -diff -wbBur Atlas-0.3.1/src/Scenery.cxx Atlas-0.3.1.my/src/Scenery.cxx ---- Atlas-0.3.1/src/Scenery.cxx 2005-02-26 18:39:14.000000000 +0000 -+++ Atlas-0.3.1.my/src/Scenery.cxx 2009-03-11 16:33:33.000000000 +0000 -@@ -3,8 +3,8 @@ - - #include "MapMaker.hxx" - --SG_USING_STD(vector); --SG_USING_STD(string); -+#include -+#include - - typedef vector string_list; - -diff -wbBur Atlas-0.3.1/src/buildmaps.sh Atlas-0.3.1.my/src/buildmaps.sh ---- Atlas-0.3.1/src/buildmaps.sh 2006-10-29 14:35:49.000000000 +0000 -+++ Atlas-0.3.1.my/src/buildmaps.sh 2009-03-11 16:17:43.000000000 +0000 -@@ -1,6 +1,6 @@ - #!/bin/sh - --ROOT=NONE/lib/FlightGear/Scenery -+ROOT=/usr/lib/FlightGear/Scenery - OUTPUTDIR=./maps - - mkdir -p $OUTPUTDIR -diff -wbBur Atlas-0.3.1/src/fg_mkdir.cxx Atlas-0.3.1.my/src/fg_mkdir.cxx ---- Atlas-0.3.1/src/fg_mkdir.cxx 2005-01-28 12:54:12.000000000 +0000 -+++ Atlas-0.3.1.my/src/fg_mkdir.cxx 2009-03-11 16:40:00.000000000 +0000 -@@ -28,6 +28,8 @@ - - #include - -+#include -+ - #ifdef _MSC_VER - #include - #include diff --git a/community/freemat/freemat-gcc-4.3.0.patch b/community/freemat/freemat-gcc-4.3.0.patch deleted file mode 100644 index 40247177c..000000000 --- a/community/freemat/freemat-gcc-4.3.0.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -wbBur FreeMat-3.6/libs/libFreeMat/Malloc.cpp FreeMat-3.6.my/libs/libFreeMat/Malloc.cpp ---- FreeMat-3.6/libs/libFreeMat/Malloc.cpp 2008-03-14 18:43:10.000000000 +0300 -+++ FreeMat-3.6.my/libs/libFreeMat/Malloc.cpp 2008-04-25 21:29:19.000000000 +0400 -@@ -21,6 +21,7 @@ - #include "Exception.hpp" - #include - #include -+#include - - - void* Malloc(int count) { -diff -wbBur FreeMat-3.6/libs/libFreeMat/Token.cpp FreeMat-3.6.my/libs/libFreeMat/Token.cpp ---- FreeMat-3.6/libs/libFreeMat/Token.cpp 2008-03-14 18:43:10.000000000 +0300 -+++ FreeMat-3.6.my/libs/libFreeMat/Token.cpp 2008-04-25 21:31:33.000000000 +0400 -@@ -2,6 +2,7 @@ - #include "Serialize.hpp" - #include - #include -+#include - - // These must appear as sequential token numbers - string fm_reserved[22] = { -diff -wbBur FreeMat-3.6/libs/libFreeMat/Types.hpp FreeMat-3.6.my/libs/libFreeMat/Types.hpp ---- FreeMat-3.6/libs/libFreeMat/Types.hpp 2008-03-14 18:43:10.000000000 +0300 -+++ FreeMat-3.6.my/libs/libFreeMat/Types.hpp 2008-04-25 21:28:26.000000000 +0400 -@@ -20,7 +20,11 @@ - #ifndef __Types_hpp__ - #define __Types_hpp__ - -+#include - #include -+#include -+using namespace std; -+ - #include - #include - #include diff --git a/community/freemat/freemat-gcc-4.5.0.patch b/community/freemat/freemat-gcc-4.5.0.patch deleted file mode 100644 index 08f644e50..000000000 --- a/community/freemat/freemat-gcc-4.5.0.patch +++ /dev/null @@ -1,207 +0,0 @@ -diff -wbBur FreeMat-4.0.1-Source/libs/libFreeMat/Array.cpp FreeMat-4.0.1-Source.my//libs/libFreeMat/Array.cpp ---- FreeMat-4.0.1-Source/libs/libFreeMat/Array.cpp 2009-10-09 06:24:20.000000000 +0000 -+++ FreeMat-4.0.1-Source.my//libs/libFreeMat/Array.cpp 2010-12-27 12:38:46.000000000 +0000 -@@ -465,7 +465,7 @@ - - void Array::set(const QString& field, ArrayVector& data) { - if (isEmpty() && m_type.Class != Struct) -- *this = Array::Array(Struct); -+ *this = Array(Struct); - if (m_type.Class != Struct) throw Exception("Unsupported type for A.field=B"); - StructArray &rp(structPtr()); - if (isEmpty()) -diff -wbBur FreeMat-4.0.1-Source/libs/libFreeMat/Math.cpp FreeMat-4.0.1-Source.my//libs/libFreeMat/Math.cpp ---- FreeMat-4.0.1-Source/libs/libFreeMat/Math.cpp 2009-10-09 06:24:22.000000000 +0000 -+++ FreeMat-4.0.1-Source.my//libs/libFreeMat/Math.cpp 2010-12-27 12:42:34.000000000 +0000 -@@ -1590,9 +1590,9 @@ - - Array Not(const Array& A) { - if (A.isScalar()) -- return Array::Array(!A.toClass(Bool).constRealScalar()); -+ return Array(!A.toClass(Bool).constRealScalar()); - const Array &Abool(A.toClass(Bool)); -- return Array::Array(Apply(Abool.constReal(),notfunc)); -+ return Array(Apply(Abool.constReal(),notfunc)); - } - - Array Plus(const Array& A) { -diff -wbBur FreeMat-4.0.1-Source/libs/libFreeMat/Operators.hpp FreeMat-4.0.1-Source.my//libs/libFreeMat/Operators.hpp ---- FreeMat-4.0.1-Source/libs/libFreeMat/Operators.hpp 2009-10-09 06:24:22.000000000 +0000 -+++ FreeMat-4.0.1-Source.my//libs/libFreeMat/Operators.hpp 2010-12-27 14:04:11.000000000 +0000 -@@ -142,11 +142,11 @@ - if (!Bcast.isScalar()) Bcast = Bcast.asDenseArray(); - if (Acast.isScalar() && Bcast.isScalar()) { - if (Acast.allReal() && Bcast.allReal()) { -- F = Array::Array(Op::func(Acast.constRealScalar(), -+ F = Array(Op::func(Acast.constRealScalar(), - Bcast.constRealScalar())); - } else { - Acast.forceComplex(); Bcast.forceComplex(); -- F = Array::Array(T(0),T(0)); -+ F = Array(T(0),T(0)); - Op::func(Acast.constRealScalar(), - Acast.constImagScalar(), - Bcast.constRealScalar(), -@@ -155,7 +155,7 @@ - } - } else if (Acast.isScalar()) { - if (Acast.allReal() && Bcast.allReal()) { -- F = Array::Array(Tclass,Bcast.dimensions()); -+ F = Array(Tclass,Bcast.dimensions()); - T* ret = F.real().data(); - const T& Ap = Acast.constRealScalar(); - const T* Bp = Bcast.constReal().constData(); -@@ -163,7 +163,7 @@ - for (uint64 i=0;i().data(); - T* Ci = F.imag().data(); - const T& Ar = Acast.constRealScalar(); -@@ -175,7 +175,7 @@ - } - } else if (Bcast.isScalar()) { - if (Bcast.allReal() && Acast.allReal()) { -- F = Array::Array(Tclass,Acast.dimensions()); -+ F = Array(Tclass,Acast.dimensions()); - T* ret = F.real().data(); - const T* Ap = Acast.constReal().constData(); - const T& Bp = Bcast.constRealScalar(); -@@ -183,7 +183,7 @@ - for (uint64 i=0;i().data(); - T* Ci = F.imag().data(); - const T* Ar = Acast.constReal().constData(); -@@ -197,7 +197,7 @@ - if (Acast.dimensions() != Bcast.dimensions()) - throw Exception("size mismatch in arguments to binary operator"); - if (Bcast.allReal() && Acast.allReal()) { -- F = Array::Array(Tclass,Acast.dimensions()); -+ F = Array(Tclass,Acast.dimensions()); - T* ret = F.real().data(); - const T* Ap = Acast.constReal().constData(); - const T* Bp = Bcast.constReal().constData(); -@@ -205,7 +205,7 @@ - for (uint64 i=0;i().data(); - T* Ci = F.imag().data(); - const T* Ar = Acast.constReal().constData(); -@@ -328,17 +328,17 @@ - if (!Acast.isScalar()) Acast = Acast.asDenseArray(); - if (!Bcast.isScalar()) Bcast = Bcast.asDenseArray(); - if (Acast.isScalar() && Bcast.isScalar()) { -- F = Array::Array(Op::func(Acast.constRealScalar(), -+ F = Array(Op::func(Acast.constRealScalar(), - Bcast.constRealScalar())); - } else if (Acast.isScalar()) { -- F = Array::Array(Bool,Bcast.dimensions()); -+ F = Array(Bool,Bcast.dimensions()); - bool* ret = F.real().data(); - const T& Ap = Acast.constRealScalar(); - const T* Bp = Bcast.constReal().constData(); - uint64 q = uint64(Bcast.length()); - for (uint64 i=0;i().data(); - const T* Ap = Acast.constReal().constData(); - const T& Bp = Bcast.constRealScalar(); -@@ -347,7 +347,7 @@ - } else { - if (Acast.dimensions() != Bcast.dimensions()) - throw Exception("size mismatch in arguments to binary operator"); -- F = Array::Array(Bool,Acast.dimensions()); -+ F = Array(Bool,Acast.dimensions()); - bool* ret = F.real().data(); - const T* Ap = Acast.constReal().constData(); - const T* Bp = Bcast.constReal().constData(); -@@ -395,18 +395,18 @@ - if (!Bcast.isScalar()) Bcast = Bcast.asDenseArray(); - if (Acast.isScalar() && Bcast.isScalar()) { - if (Acast.allReal() && Bcast.allReal()) { -- F = Array::Array(Op::func(Acast.constRealScalar(), -+ F = Array(Op::func(Acast.constRealScalar(), - Bcast.constRealScalar())); - } else { - Acast.forceComplex(); Bcast.forceComplex(); -- F = Array::Array(Op::func(Acast.constRealScalar(), -+ F = Array(Op::func(Acast.constRealScalar(), - Acast.constImagScalar(), - Bcast.constRealScalar(), - Bcast.constImagScalar())); - } - } else if (Acast.isScalar()) { - if (Acast.allReal() && Bcast.allReal()) { -- F = Array::Array(Bool,Bcast.dimensions()); -+ F = Array(Bool,Bcast.dimensions()); - bool* ret = F.real().data(); - const T& Ap = Acast.constRealScalar(); - const T* Bp = Bcast.constReal().constData(); -@@ -414,7 +414,7 @@ - for (uint64 i=0;i().data(); - const T& Ar = Acast.constRealScalar(); - const T& Ai = Acast.constImagScalar(); -@@ -425,7 +425,7 @@ - } - } else if (Bcast.isScalar()) { - if (Bcast.allReal() && Acast.allReal()) { -- F = Array::Array(Bool,Acast.dimensions()); -+ F = Array(Bool,Acast.dimensions()); - bool* ret = F.real().data(); - const T* Ap = Acast.constReal().constData(); - const T& Bp = Bcast.constRealScalar(); -@@ -433,7 +433,7 @@ - for (uint64 i=0;i().data(); - const T* Ar = Acast.constReal().constData(); - const T* Ai = Acast.constImag().constData(); -@@ -446,7 +446,7 @@ - if (Acast.dimensions() != Bcast.dimensions()) - throw Exception("size mismatch in arguments to binary operator"); - if (Bcast.allReal() && Acast.allReal()) { -- F = Array::Array(Bool,Acast.dimensions()); -+ F = Array(Bool,Acast.dimensions()); - bool* ret = F.real().data(); - const T* Ap = Acast.constReal().constData(); - const T* Bp = Bcast.constReal().constData(); -@@ -454,7 +454,7 @@ - for (uint64 i=0;i().data(); - const T* Ar = Acast.constReal().constData(); - const T* Ai = Acast.constImag().constData(); -@@ -533,9 +533,9 @@ - if (!Acast.isScalar()) Acast = Acast.asDenseArray(); - if (Acast.isScalar()) { - if (Acast.allReal()) { -- F = Array::Array(Op::func(Acast.constRealScalar())); -+ F = Array(Op::func(Acast.constRealScalar())); - } else { -- F = Array::Array(T(0),T(0)); -+ F = Array(T(0),T(0)); - Op::func(Acast.constRealScalar(), - Acast.constImagScalar(), - F.realScalar(),F.imagScalar()); diff --git a/community/freemat/freemat-qt46.patch b/community/freemat/freemat-qt46.patch deleted file mode 100644 index aa92dc18c..000000000 --- a/community/freemat/freemat-qt46.patch +++ /dev/null @@ -1,2088 +0,0 @@ -diff -wbBur FreeMat-4.0.1-Source/libs/libCore/helpwidget.moc.cpp FreeMat-4.0.1-Source.new/libs/libCore/helpwidget.moc.cpp ---- FreeMat-4.0.1-Source/libs/libCore/helpwidget.moc.cpp 2009-10-09 06:23:29.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libCore/helpwidget.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'helpwidget.hpp' - ** --** Created: Thu Oct 8 21:52:25 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "helpwidget.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'helpwidget.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_HelpSearcher[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 1, 12, // methods -+ 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 14, 13, 13, 13, 0x08, -@@ -43,9 +45,13 @@ - qt_meta_data_HelpSearcher, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &HelpSearcher::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *HelpSearcher::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *HelpSearcher::qt_metacast(const char *_clname) -@@ -73,13 +79,15 @@ - static const uint qt_meta_data_HelpWidget[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - 0 // eod - }; -@@ -93,9 +101,13 @@ - qt_meta_data_HelpWidget, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &HelpWidget::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *HelpWidget::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *HelpWidget::qt_metacast(const char *_clname) -@@ -116,13 +128,15 @@ - static const uint qt_meta_data_HelpWindow[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 6, 12, // methods -+ 6, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 1, // signalCount - - // signals: signature, parameters, type, tag, flags - 12, 11, 11, 11, 0x05, -@@ -150,9 +164,13 @@ - qt_meta_data_HelpWindow, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &HelpWindow::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *HelpWindow::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *HelpWindow::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libCore/XML.moc.cpp FreeMat-4.0.1-Source.new/libs/libCore/XML.moc.cpp ---- FreeMat-4.0.1-Source/libs/libCore/XML.moc.cpp 2009-10-09 06:23:28.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libCore/XML.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'XML.hpp' - ** --** Created: Thu Oct 8 21:52:25 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "XML.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'XML.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_URLRetriever[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 1, 12, // methods -+ 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 21, 14, 13, 13, 0x0a, -@@ -43,9 +45,13 @@ - qt_meta_data_URLRetriever, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &URLRetriever::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *URLRetriever::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *URLRetriever::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libFreeMat/DebugStream.moc.cpp FreeMat-4.0.1-Source.new/libs/libFreeMat/DebugStream.moc.cpp ---- FreeMat-4.0.1-Source/libs/libFreeMat/DebugStream.moc.cpp 2009-10-09 06:24:22.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libFreeMat/DebugStream.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'DebugStream.hpp' - ** --** Created: Thu Oct 8 21:51:54 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "DebugStream.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'DebugStream.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_DebugStream[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 1, 12, // methods -+ 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 1, // signalCount - - // signals: signature, parameters, type, tag, flags - 17, 13, 12, 12, 0x05, -@@ -43,9 +45,13 @@ - qt_meta_data_DebugStream, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &DebugStream::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *DebugStream::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *DebugStream::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libFreeMat/Intrepreter.moc.cpp FreeMat-4.0.1-Source.new/libs/libFreeMat/Intrepreter.moc.cpp ---- FreeMat-4.0.1-Source/libs/libFreeMat/Intrepreter.moc.cpp 2009-10-09 06:24:21.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libFreeMat/Intrepreter.moc.cpp 2010-03-03 13:24:53.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'Interpreter.hpp' - ** --** Created: Thu Oct 8 21:51:55 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:24:53 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "Interpreter.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'Interpreter.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_Interpreter[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 20, 12, // methods -+ 20, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 16, // signalCount - - // signals: signature, parameters, type, tag, flags - 13, 12, 12, 12, 0x05, -@@ -77,9 +79,13 @@ - qt_meta_data_Interpreter, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &Interpreter::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *Interpreter::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *Interpreter::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libGraphics/GLWindow.moc.cpp FreeMat-4.0.1-Source.new/libs/libGraphics/GLWindow.moc.cpp ---- FreeMat-4.0.1-Source/libs/libGraphics/GLWindow.moc.cpp 2009-10-09 06:24:11.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libGraphics/GLWindow.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'GLWindow.hpp' - ** --** Created: Thu Oct 8 21:52:04 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "GLWindow.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'GLWindow.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_GLWidget[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - 0 // eod - }; -@@ -40,9 +42,13 @@ - qt_meta_data_GLWidget, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &GLWidget::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *GLWidget::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *GLWidget::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libGraphics/HandleMultiEdit.moc.cpp FreeMat-4.0.1-Source.new/libs/libGraphics/HandleMultiEdit.moc.cpp ---- FreeMat-4.0.1-Source/libs/libGraphics/HandleMultiEdit.moc.cpp 2009-10-09 06:24:11.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libGraphics/HandleMultiEdit.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'HandleMultiEdit.hpp' - ** --** Created: Thu Oct 8 21:52:05 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "HandleMultiEdit.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'HandleMultiEdit.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_HandleMultiEdit[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 1, 12, // methods -+ 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 1, // signalCount - - // signals: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x05, -@@ -43,9 +45,13 @@ - qt_meta_data_HandleMultiEdit, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &HandleMultiEdit::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *HandleMultiEdit::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *HandleMultiEdit::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libGraphics/HandleUIControl.moc.cpp FreeMat-4.0.1-Source.new/libs/libGraphics/HandleUIControl.moc.cpp ---- FreeMat-4.0.1-Source/libs/libGraphics/HandleUIControl.moc.cpp 2009-10-09 06:24:11.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libGraphics/HandleUIControl.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'HandleUIControl.hpp' - ** --** Created: Thu Oct 8 21:52:05 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "HandleUIControl.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'HandleUIControl.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_HandleUIControl[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 1, 12, // methods -+ 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 17, 16, 16, 16, 0x08, -@@ -43,9 +45,13 @@ - qt_meta_data_HandleUIControl, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &HandleUIControl::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *HandleUIControl::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *HandleUIControl::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libGraphics/HandleWindow.moc.cpp FreeMat-4.0.1-Source.new/libs/libGraphics/HandleWindow.moc.cpp ---- FreeMat-4.0.1-Source/libs/libGraphics/HandleWindow.moc.cpp 2009-10-09 06:24:11.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libGraphics/HandleWindow.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'HandleWindow.hpp' - ** --** Created: Thu Oct 8 21:52:05 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "HandleWindow.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'HandleWindow.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_HandleWindow[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 6, 12, // methods -+ 6, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 14, 13, 13, 13, 0x0a, -@@ -50,9 +52,13 @@ - qt_meta_data_HandleWindow, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &HandleWindow::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *HandleWindow::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *HandleWindow::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libXP/DataTable.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/DataTable.moc.cpp ---- FreeMat-4.0.1-Source/libs/libXP/DataTable.moc.cpp 2009-10-09 06:24:19.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libXP/DataTable.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'DataTable.hpp' - ** --** Created: Thu Oct 8 21:52:15 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "DataTable.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'DataTable.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_DataTable[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - 0 // eod - }; -@@ -40,9 +42,13 @@ - qt_meta_data_DataTable, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &DataTable::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *DataTable::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *DataTable::qt_metacast(const char *_clname) -@@ -63,13 +69,15 @@ - static const uint qt_meta_data_DataView[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - 0 // eod - }; -@@ -83,9 +91,13 @@ - qt_meta_data_DataView, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &DataView::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *DataView::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *DataView::qt_metacast(const char *_clname) -@@ -106,13 +118,15 @@ - static const uint qt_meta_data_DataHeaderView[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 1, 12, // methods -+ 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 16, 15, 15, 15, 0x08, -@@ -129,9 +143,13 @@ - qt_meta_data_DataHeaderView, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &DataHeaderView::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *DataHeaderView::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *DataHeaderView::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libXP/DebugWin.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/DebugWin.moc.cpp ---- FreeMat-4.0.1-Source/libs/libXP/DebugWin.moc.cpp 2009-10-09 06:24:18.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libXP/DebugWin.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'DebugWin.hpp' - ** --** Created: Thu Oct 8 21:52:15 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "DebugWin.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'DebugWin.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_DebugWin[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 3, 12, // methods -+ 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 12, 10, 9, 9, 0x09, -@@ -46,9 +48,13 @@ - qt_meta_data_DebugWin, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &DebugWin::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *DebugWin::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *DebugWin::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libXP/Editor.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/Editor.moc.cpp ---- FreeMat-4.0.1-Source/libs/libXP/Editor.moc.cpp 2009-10-09 06:24:12.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libXP/Editor.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'Editor.hpp' - ** --** Created: Thu Oct 8 21:52:14 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "Editor.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'Editor.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_FMFindDialog[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 2, 12, // methods -+ 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 1, // signalCount - - // signals: signature, parameters, type, tag, flags - 39, 14, 13, 13, 0x05, -@@ -47,9 +49,13 @@ - qt_meta_data_FMFindDialog, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &FMFindDialog::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *FMFindDialog::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *FMFindDialog::qt_metacast(const char *_clname) -@@ -85,13 +91,15 @@ - static const uint qt_meta_data_FMReplaceDialog[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 6, 12, // methods -+ 6, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 3, // signalCount - - // signals: signature, parameters, type, tag, flags - 42, 17, 16, 16, 0x05, -@@ -120,9 +128,13 @@ - qt_meta_data_FMReplaceDialog, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &FMReplaceDialog::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *FMReplaceDialog::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *FMReplaceDialog::qt_metacast(const char *_clname) -@@ -176,13 +188,15 @@ - static const uint qt_meta_data_FMTextEdit[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 6, 12, // methods -+ 6, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 3, // signalCount - - // signals: signature, parameters, type, tag, flags - 12, 11, 11, 11, 0x05, -@@ -210,9 +224,13 @@ - qt_meta_data_FMTextEdit, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &FMTextEdit::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *FMTextEdit::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *FMTextEdit::qt_metacast(const char *_clname) -@@ -264,13 +282,15 @@ - static const uint qt_meta_data_FMIndent[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 2, 12, // methods -+ 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 10, 9, 9, 9, 0x08, -@@ -288,9 +308,13 @@ - qt_meta_data_FMIndent, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &FMIndent::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *FMIndent::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *FMIndent::qt_metacast(const char *_clname) -@@ -319,13 +343,15 @@ - static const uint qt_meta_data_BreakPointIndicator[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - 0 // eod - }; -@@ -339,9 +365,13 @@ - qt_meta_data_BreakPointIndicator, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &BreakPointIndicator::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *BreakPointIndicator::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *BreakPointIndicator::qt_metacast(const char *_clname) -@@ -362,13 +392,15 @@ - static const uint qt_meta_data_FMLineNumber[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - 0 // eod - }; -@@ -382,9 +414,13 @@ - qt_meta_data_FMLineNumber, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &FMLineNumber::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *FMLineNumber::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *FMLineNumber::qt_metacast(const char *_clname) -@@ -405,13 +441,15 @@ - static const uint qt_meta_data_FMEditPane[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 1, 12, // methods -+ 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 1, // signalCount - - // signals: signature, parameters, type, tag, flags - 23, 12, 11, 11, 0x05, -@@ -428,9 +466,13 @@ - qt_meta_data_FMEditPane, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &FMEditPane::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *FMEditPane::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *FMEditPane::qt_metacast(const char *_clname) -@@ -465,13 +507,15 @@ - static const uint qt_meta_data_FMIndentConf[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 1, 12, // methods -+ 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 14, 13, 13, 13, 0x08, -@@ -488,9 +532,13 @@ - qt_meta_data_FMIndentConf, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &FMIndentConf::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *FMIndentConf::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *FMIndentConf::qt_metacast(const char *_clname) -@@ -518,13 +566,15 @@ - static const uint qt_meta_data_FMSynLightConf[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 5, 12, // methods -+ 5, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 16, 15, 15, 15, 0x08, -@@ -547,9 +597,13 @@ - qt_meta_data_FMSynLightConf, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &FMSynLightConf::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *FMSynLightConf::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *FMSynLightConf::qt_metacast(const char *_clname) -@@ -581,13 +635,15 @@ - static const uint qt_meta_data_FMEditor[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 46, 12, // methods -+ 46, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 3, // signalCount - - // signals: signature, parameters, type, tag, flags - 10, 9, 9, 9, 0x05, -@@ -675,9 +731,13 @@ - qt_meta_data_FMEditor, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &FMEditor::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *FMEditor::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *FMEditor::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libXP/FileTool.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/FileTool.moc.cpp ---- FreeMat-4.0.1-Source/libs/libXP/FileTool.moc.cpp 2009-10-09 06:24:20.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libXP/FileTool.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'FileTool.hpp' - ** --** Created: Thu Oct 8 21:52:15 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "FileTool.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'FileTool.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_FileTool[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 3, 12, // methods -+ 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 1, // signalCount - - // signals: signature, parameters, type, tag, flags - 12, 10, 9, 9, 0x05, -@@ -49,9 +51,13 @@ - qt_meta_data_FileTool, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &FileTool::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *FileTool::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *FileTool::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libXP/findform.ui.h FreeMat-4.0.1-Source.new/libs/libXP/findform.ui.h ---- FreeMat-4.0.1-Source/libs/libXP/findform.ui.h 2009-10-09 06:24:12.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libXP/findform.ui.h 2010-03-03 13:17:50.000000000 +0000 -@@ -1,10 +1,10 @@ - /******************************************************************************** --** Form generated from reading ui file 'findform.ui' -+** Form generated from reading UI file 'findform.ui' - ** --** Created: Thu Oct 8 21:52:13 2009 --** by: Qt User Interface Compiler version 4.5.2 -+** Created: Wed Mar 3 13:17:50 2010 -+** by: Qt User Interface Compiler version 4.6.2 - ** --** WARNING! All changes made in this file will be lost when recompiling ui file! -+** WARNING! All changes made in this file will be lost when recompiling UI file! - ********************************************************************************/ - - #ifndef FINDFORM_H -@@ -69,7 +69,7 @@ - #ifndef Q_OS_MAC - vboxLayout->setSpacing(6); - #endif -- vboxLayout->setMargin(0); -+ vboxLayout->setContentsMargins(0, 0, 0, 0); - vboxLayout->setObjectName(QString::fromUtf8("vboxLayout")); - vboxLayout->setContentsMargins(0, 0, 0, 0); - hboxLayout = new QHBoxLayout(); -@@ -77,7 +77,7 @@ - hboxLayout->setSpacing(6); - #endif - #ifndef Q_OS_MAC -- hboxLayout->setMargin(0); -+ hboxLayout->setContentsMargins(0, 0, 0, 0); - #endif - hboxLayout->setObjectName(QString::fromUtf8("hboxLayout")); - label = new QLabel(layoutWidget); -@@ -119,7 +119,7 @@ - #ifndef Q_OS_MAC - vboxLayout1->setSpacing(6); - #endif -- vboxLayout1->setMargin(0); -+ vboxLayout1->setContentsMargins(0, 0, 0, 0); - vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1")); - vboxLayout1->setContentsMargins(0, 0, 0, 0); - cbSensitive = new QCheckBox(layoutWidget1); -@@ -149,7 +149,7 @@ - #ifndef Q_OS_MAC - vboxLayout2->setSpacing(6); - #endif -- vboxLayout2->setMargin(0); -+ vboxLayout2->setContentsMargins(0, 0, 0, 0); - vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2")); - vboxLayout2->setContentsMargins(0, 0, 0, 0); - btFind = new QPushButton(layoutWidget2); -@@ -191,7 +191,6 @@ - lbStatus->setText(QString()); - btFind->setText(QApplication::translate("FMFindDialog", "Find", 0, QApplication::UnicodeUTF8)); - btClose->setText(QApplication::translate("FMFindDialog", "Close", 0, QApplication::UnicodeUTF8)); -- Q_UNUSED(FMFindDialog); - } // retranslateUi - - }; -diff -wbBur FreeMat-4.0.1-Source/libs/libXP/FMFontDialog.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/FMFontDialog.moc.cpp ---- FreeMat-4.0.1-Source/libs/libXP/FMFontDialog.moc.cpp 2009-10-09 06:24:20.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libXP/FMFontDialog.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'FMFontDialog.hpp' - ** --** Created: Thu Oct 8 21:52:14 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "FMFontDialog.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'FMFontDialog.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_FMFontDialog[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 3, 12, // methods -+ 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 19, 14, 13, 13, 0x08, -@@ -46,9 +48,13 @@ - qt_meta_data_FMFontDialog, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &FMFontDialog::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *FMFontDialog::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *FMFontDialog::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libXP/fontform.ui.h FreeMat-4.0.1-Source.new/libs/libXP/fontform.ui.h ---- FreeMat-4.0.1-Source/libs/libXP/fontform.ui.h 2009-10-09 06:24:19.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libXP/fontform.ui.h 2010-03-03 13:17:50.000000000 +0000 -@@ -1,10 +1,10 @@ - /******************************************************************************** --** Form generated from reading ui file 'fontform.ui' -+** Form generated from reading UI file 'fontform.ui' - ** --** Created: Thu Oct 8 21:52:13 2009 --** by: Qt User Interface Compiler version 4.5.2 -+** Created: Wed Mar 3 13:17:50 2010 -+** by: Qt User Interface Compiler version 4.6.2 - ** --** WARNING! All changes made in this file will be lost when recompiling ui file! -+** WARNING! All changes made in this file will be lost when recompiling UI file! - ********************************************************************************/ - - #ifndef FONTFORM_H -@@ -80,7 +80,6 @@ - label_2->setText(QApplication::translate("FixedFontDialog", "Size", 0, QApplication::UnicodeUTF8)); - groupBox->setTitle(QApplication::translate("FixedFontDialog", "Sample", 0, QApplication::UnicodeUTF8)); - sample->setText(QApplication::translate("FixedFontDialog", "AaBbZz123", 0, QApplication::UnicodeUTF8)); -- Q_UNUSED(FixedFontDialog); - } // retranslateUi - - }; -diff -wbBur FreeMat-4.0.1-Source/libs/libXP/highlighter.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/highlighter.moc.cpp ---- FreeMat-4.0.1-Source/libs/libXP/highlighter.moc.cpp 2009-10-09 06:24:19.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libXP/highlighter.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'highlighter.hpp' - ** --** Created: Thu Oct 8 21:52:15 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "highlighter.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'highlighter.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_Highlighter[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - 0 // eod - }; -@@ -40,9 +42,13 @@ - qt_meta_data_Highlighter, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &Highlighter::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *Highlighter::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *Highlighter::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libXP/HistoryWidget.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/HistoryWidget.moc.cpp ---- FreeMat-4.0.1-Source/libs/libXP/HistoryWidget.moc.cpp 2009-10-09 06:24:20.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libXP/HistoryWidget.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'HistoryWidget.hpp' - ** --** Created: Thu Oct 8 21:52:15 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "HistoryWidget.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'HistoryWidget.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_HistoryWidget[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 8, 12, // methods -+ 8, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 3, // signalCount - - // signals: signature, parameters, type, tag, flags - 17, 15, 14, 14, 0x05, -@@ -56,9 +58,13 @@ - qt_meta_data_HistoryWidget, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &HistoryWidget::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *HistoryWidget::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *HistoryWidget::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libXP/KeyManager.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/KeyManager.moc.cpp ---- FreeMat-4.0.1-Source/libs/libXP/KeyManager.moc.cpp 2009-10-09 06:24:12.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libXP/KeyManager.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'KeyManager.hpp' - ** --** Created: Thu Oct 8 21:52:14 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "KeyManager.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'KeyManager.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_KeyManager[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 39, 12, // methods -+ 39, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 21, // signalCount - - // signals: signature, parameters, type, tag, flags - 12, 11, 11, 11, 0x05, -@@ -101,9 +103,13 @@ - qt_meta_data_KeyManager, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &KeyManager::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *KeyManager::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *KeyManager::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libXP/PathTool.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/PathTool.moc.cpp ---- FreeMat-4.0.1-Source/libs/libXP/PathTool.moc.cpp 2009-10-09 06:24:12.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libXP/PathTool.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'PathTool.hpp' - ** --** Created: Thu Oct 8 21:52:14 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "PathTool.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'PathTool.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_PathTool[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 7, 12, // methods -+ 7, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 10, 9, 9, 9, 0x08, -@@ -50,9 +52,13 @@ - qt_meta_data_PathTool, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &PathTool::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *PathTool::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *PathTool::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libXP/QTTerm.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/QTTerm.moc.cpp ---- FreeMat-4.0.1-Source/libs/libXP/QTTerm.moc.cpp 2009-10-09 06:24:18.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libXP/QTTerm.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'QTTerm.hpp' - ** --** Created: Thu Oct 8 21:52:14 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "QTTerm.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'QTTerm.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_QTTerm[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 15, 12, // methods -+ 15, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 4, // signalCount - - // signals: signature, parameters, type, tag, flags - 10, 8, 7, 7, 0x05, -@@ -65,9 +67,13 @@ - qt_meta_data_QTTerm, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &QTTerm::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *QTTerm::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *QTTerm::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libXP/replaceform.ui.h FreeMat-4.0.1-Source.new/libs/libXP/replaceform.ui.h ---- FreeMat-4.0.1-Source/libs/libXP/replaceform.ui.h 2009-10-09 06:24:12.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libXP/replaceform.ui.h 2010-03-03 13:17:50.000000000 +0000 -@@ -1,10 +1,10 @@ - /******************************************************************************** --** Form generated from reading ui file 'replaceform.ui' -+** Form generated from reading UI file 'replaceform.ui' - ** --** Created: Thu Oct 8 21:52:13 2009 --** by: Qt User Interface Compiler version 4.5.2 -+** Created: Wed Mar 3 13:17:50 2010 -+** by: Qt User Interface Compiler version 4.6.2 - ** --** WARNING! All changes made in this file will be lost when recompiling ui file! -+** WARNING! All changes made in this file will be lost when recompiling UI file! - ********************************************************************************/ - - #ifndef REPLACEFORM_H -@@ -74,7 +74,7 @@ - #ifndef Q_OS_MAC - vboxLayout->setSpacing(6); - #endif -- vboxLayout->setMargin(0); -+ vboxLayout->setContentsMargins(0, 0, 0, 0); - vboxLayout->setObjectName(QString::fromUtf8("vboxLayout")); - vboxLayout->setContentsMargins(0, 0, 0, 0); - hboxLayout = new QHBoxLayout(); -@@ -82,7 +82,7 @@ - hboxLayout->setSpacing(6); - #endif - #ifndef Q_OS_MAC -- hboxLayout->setMargin(0); -+ hboxLayout->setContentsMargins(0, 0, 0, 0); - #endif - hboxLayout->setObjectName(QString::fromUtf8("hboxLayout")); - label = new QLabel(layoutWidget); -@@ -113,7 +113,7 @@ - #ifndef Q_OS_MAC - hboxLayout1->setSpacing(6); - #endif -- hboxLayout1->setMargin(0); -+ hboxLayout1->setContentsMargins(0, 0, 0, 0); - hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1")); - label_2 = new QLabel(layoutWidget); - label_2->setObjectName(QString::fromUtf8("label_2")); -@@ -146,7 +146,7 @@ - #ifndef Q_OS_MAC - vboxLayout1->setSpacing(6); - #endif -- vboxLayout1->setMargin(0); -+ vboxLayout1->setContentsMargins(0, 0, 0, 0); - vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1")); - vboxLayout1->setContentsMargins(0, 0, 0, 0); - cbSensitive = new QCheckBox(layoutWidget1); -@@ -176,7 +176,7 @@ - #ifndef Q_OS_MAC - vboxLayout2->setSpacing(6); - #endif -- vboxLayout2->setMargin(0); -+ vboxLayout2->setContentsMargins(0, 0, 0, 0); - vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2")); - vboxLayout2->setContentsMargins(0, 0, 0, 0); - btReplace = new QPushButton(layoutWidget2); -@@ -234,7 +234,6 @@ - btReplaceAll->setText(QApplication::translate("FMReplaceDialog", "Replace All", 0, QApplication::UnicodeUTF8)); - btFind->setText(QApplication::translate("FMReplaceDialog", "Find Next", 0, QApplication::UnicodeUTF8)); - btClose->setText(QApplication::translate("FMReplaceDialog", "Close", 0, QApplication::UnicodeUTF8)); -- Q_UNUSED(FMReplaceDialog); - } // retranslateUi - - }; -diff -wbBur FreeMat-4.0.1-Source/libs/libXP/StackTool.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/StackTool.moc.cpp ---- FreeMat-4.0.1-Source/libs/libXP/StackTool.moc.cpp 2009-10-09 06:24:19.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libXP/StackTool.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'StackTool.hpp' - ** --** Created: Thu Oct 8 21:52:13 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "StackTool.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'StackTool.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_StackTool[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 3, 12, // methods -+ 3, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 1, // signalCount - - // signals: signature, parameters, type, tag, flags - 11, 10, 10, 10, 0x05, -@@ -49,9 +51,13 @@ - qt_meta_data_StackTool, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &StackTool::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *StackTool::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *StackTool::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libXP/ToolDock.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/ToolDock.moc.cpp ---- FreeMat-4.0.1-Source/libs/libXP/ToolDock.moc.cpp 2009-10-09 06:24:19.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libXP/ToolDock.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'ToolDock.hpp' - ** --** Created: Thu Oct 8 21:52:15 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "ToolDock.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'ToolDock.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_ToolDock[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo - 0, 0, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - 0 // eod - }; -@@ -40,9 +42,13 @@ - qt_meta_data_ToolDock, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &ToolDock::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *ToolDock::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *ToolDock::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/libs/libXP/VariablesTool.moc.cpp FreeMat-4.0.1-Source.new/libs/libXP/VariablesTool.moc.cpp ---- FreeMat-4.0.1-Source/libs/libXP/VariablesTool.moc.cpp 2009-10-09 06:24:20.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/libs/libXP/VariablesTool.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'VariablesTool.hpp' - ** --** Created: Thu Oct 8 21:52:15 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "VariablesTool.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'VariablesTool.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_VariablesTool[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 1, 12, // methods -+ 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 15, 14, 14, 14, 0x09, -@@ -43,9 +45,13 @@ - qt_meta_data_VariablesTool, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &VariablesTool::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *VariablesTool::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *VariablesTool::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/src/application.moc.cpp FreeMat-4.0.1-Source.new/src/application.moc.cpp ---- FreeMat-4.0.1-Source/src/application.moc.cpp 2009-10-09 06:27:01.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/src/application.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'application.hpp' - ** --** Created: Thu Oct 8 21:53:56 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "application.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'application.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_ApplicationWindow[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 31, 12, // methods -+ 31, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 6, // signalCount - - // signals: signature, parameters, type, tag, flags - 19, 18, 18, 18, 0x05, -@@ -86,9 +88,13 @@ - qt_meta_data_ApplicationWindow, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &ApplicationWindow::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *ApplicationWindow::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *ApplicationWindow::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/src/DumbTerminal.moc.cpp FreeMat-4.0.1-Source.new/src/DumbTerminal.moc.cpp ---- FreeMat-4.0.1-Source/src/DumbTerminal.moc.cpp 2009-10-09 06:27:01.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/src/DumbTerminal.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'DumbTerminal.hpp' - ** --** Created: Thu Oct 8 21:53:56 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "DumbTerminal.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'DumbTerminal.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_DumbTerminal[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 13, 12, // methods -+ 13, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 3, // signalCount - - // signals: signature, parameters, type, tag, flags - 16, 14, 13, 13, 0x05, -@@ -63,9 +65,13 @@ - qt_meta_data_DumbTerminal, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &DumbTerminal::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *DumbTerminal::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *DumbTerminal::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/src/FuncMode.moc.cpp FreeMat-4.0.1-Source.new/src/FuncMode.moc.cpp ---- FreeMat-4.0.1-Source/src/FuncMode.moc.cpp 2009-10-09 06:27:01.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/src/FuncMode.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'FuncMode.hpp' - ** --** Created: Thu Oct 8 21:53:56 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "FuncMode.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'FuncMode.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_FuncMode[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 2, 12, // methods -+ 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 1, // signalCount - - // signals: signature, parameters, type, tag, flags - 10, 9, 9, 9, 0x05, -@@ -46,9 +48,13 @@ - qt_meta_data_FuncMode, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &FuncMode::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *FuncMode::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *FuncMode::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/src/MainApp.moc.cpp FreeMat-4.0.1-Source.new/src/MainApp.moc.cpp ---- FreeMat-4.0.1-Source/src/MainApp.moc.cpp 2009-10-09 06:27:01.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/src/MainApp.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'MainApp.hpp' - ** --** Created: Thu Oct 8 21:53:56 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "MainApp.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'MainApp.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_MainApp[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 21, 12, // methods -+ 21, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 3, // signalCount - - // signals: signature, parameters, type, tag, flags - 9, 8, 8, 8, 0x05, -@@ -75,9 +77,13 @@ - qt_meta_data_MainApp, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &MainApp::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *MainApp::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *MainApp::qt_metacast(const char *_clname) -diff -wbBur FreeMat-4.0.1-Source/src/Terminal.moc.cpp FreeMat-4.0.1-Source.new/src/Terminal.moc.cpp ---- FreeMat-4.0.1-Source/src/Terminal.moc.cpp 2009-10-09 06:27:01.000000000 +0000 -+++ FreeMat-4.0.1-Source.new/src/Terminal.moc.cpp 2010-03-03 13:22:19.000000000 +0000 -@@ -1,8 +1,8 @@ - /**************************************************************************** - ** Meta object code from reading C++ file 'Terminal.hpp' - ** --** Created: Thu Oct 8 21:53:56 2009 --** by: The Qt Meta Object Compiler version 61 (Qt 4.5.2) -+** Created: Wed Mar 3 13:22:19 2010 -+** by: The Qt Meta Object Compiler version 62 (Qt 4.6.2) - ** - ** WARNING! All changes made in this file will be lost! - *****************************************************************************/ -@@ -10,8 +10,8 @@ - #include "Terminal.hpp" - #if !defined(Q_MOC_OUTPUT_REVISION) - #error "The header file 'Terminal.hpp' doesn't include ." --#elif Q_MOC_OUTPUT_REVISION != 61 --#error "This file was generated using the moc from 4.5.2. It" -+#elif Q_MOC_OUTPUT_REVISION != 62 -+#error "This file was generated using the moc from 4.6.2. It" - #error "cannot be used with the include files from this version of Qt." - #error "(The moc has changed too much.)" - #endif -@@ -20,13 +20,15 @@ - static const uint qt_meta_data_Terminal[] = { - - // content: -- 2, // revision -+ 4, // revision - 0, // classname - 0, 0, // classinfo -- 13, 12, // methods -+ 13, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors -+ 0, // flags -+ 3, // signalCount - - // signals: signature, parameters, type, tag, flags - 12, 10, 9, 9, 0x05, -@@ -62,9 +64,13 @@ - qt_meta_data_Terminal, 0 } - }; - -+#ifdef Q_NO_DATA_RELOCATION -+const QMetaObject &Terminal::getStaticMetaObject() { return staticMetaObject; } -+#endif //Q_NO_DATA_RELOCATION -+ - const QMetaObject *Terminal::metaObject() const - { -- return &staticMetaObject; -+ return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; - } - - void *Terminal::qt_metacast(const char *_clname) diff --git a/community/freemat/input-fix.patch b/community/freemat/input-fix.patch deleted file mode 100644 index 92a66176b..000000000 --- a/community/freemat/input-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -wbBur FreeMat-4.0.1-Source/libs/libCore/Loader.cpp FreeMat-4.0.1-Source.my/libs/libCore/Loader.cpp ---- FreeMat-4.0.1-Source/libs/libCore/Loader.cpp 2009-10-09 06:23:29.000000000 +0000 -+++ FreeMat-4.0.1-Source.my/libs/libCore/Loader.cpp 2010-12-27 12:04:20.000000000 +0000 -@@ -388,7 +388,7 @@ - context->addSpecialFunction("warning",WarningFunction,1,0,"msg",NULL); - context->addFunction("error",ErrorFunction,1,0,"string",NULL); - context->addSpecialFunction("eval",EvalFunction,2,-1,"try_clause","catch_clause",NULL); -- context->addSpecialFunction("evalin",EvalInFunction,2,3,"workspace","expression",NULL); -+ context->addSpecialFunction("evalin",EvalInFunction,3,3,"workspace","expression","catch_clause",NULL); - context->addSpecialFunction("assignin",AssignInFunction,3,0,"workspace","variablename","value",NULL); - context->addSpecialFunction("feval",FevalFunction,-1,-1,NULL); - context->addSpecialFunction("exist",ExistFunction,2,1,"item","kind",NULL); diff --git a/community/gkrellm/ChangeLog b/community/gkrellm/ChangeLog deleted file mode 100644 index d64831587..000000000 --- a/community/gkrellm/ChangeLog +++ /dev/null @@ -1,10 +0,0 @@ -2010-01-06 Jaroslav Lichtblau -* Update to major release 2.3.4 -* Patch removed - implemented in source - -2007-11-29 Roman Kyrylych -* Patched for lm_sensors 3 - -2007-06-28 tardo -* Built for x86_64 - diff --git a/community/ibus-hangul/ibus-1.4.0.patch b/community/ibus-hangul/ibus-1.4.0.patch deleted file mode 100644 index 0c043d374..000000000 --- a/community/ibus-hangul/ibus-1.4.0.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Naur ibus-hangul-1.3.1-orig/configure.ac ibus-hangul-1.3.1/configure.ac ---- ibus-hangul-1.3.1-orig/configure.ac 2011-10-02 03:36:02.000000000 -0400 -+++ ibus-hangul-1.3.1/configure.ac 2011-10-02 03:37:01.000000000 -0400 -@@ -52,7 +52,7 @@ - - # check ibus - PKG_CHECK_MODULES(IBUS, [ -- ibus-1.0 >= 1.2.99 -+ ibus-1.0 >= 1.3.99 - ]) - - # check libhangul -diff -Naur ibus-hangul-1.3.1-orig/src/engine.c ibus-hangul-1.3.1/src/engine.c ---- ibus-hangul-1.3.1-orig/src/engine.c 2011-10-02 03:36:02.000000000 -0400 -+++ ibus-hangul-1.3.1/src/engine.c 2011-10-02 03:37:51.000000000 -0400 -@@ -175,8 +194,7 @@ - void - ibus_hangul_init (IBusBus *bus) - { -- gboolean res; -- GValue value = { 0, }; -+ GVariant* value; - - hanja_table = hanja_table_load (NULL); - -@@ -187,22 +205,22 @@ - g_object_ref_sink (config); - - hangul_keyboard = g_string_new_len ("2", 8); -- res = ibus_config_get_value (config, "engine/Hangul", -- "HangulKeyboard", &value); -- if (res) { -- const gchar* str = g_value_get_string (&value); -+ value = ibus_config_get_value (config, "engine/Hangul", -+ "HangulKeyboard"); -+ if (value != NULL) { -+ const gchar* str = g_variant_get_string (value, NULL); - g_string_assign (hangul_keyboard, str); -- g_value_unset(&value); -+ g_variant_unref(value); - } - - hanja_key_list_init(&hanja_keys); - -- res = ibus_config_get_value (config, "engine/Hangul", -- "HanjaKeys", &value); -- if (res) { -- const gchar* str = g_value_get_string (&value); -+ value = ibus_config_get_value (config, "engine/Hangul", -+ "HanjaKeys"); -+ if (value != NULL) { -+ const gchar* str = g_variant_get_string (value, NULL); - hanja_key_list_set_from_string(&hanja_keys, str); -- g_value_unset(&value); -+ g_variant_unref(value); - } else { - hanja_key_list_append(&hanja_keys, IBUS_Hangul_Hanja, 0); - hanja_key_list_append(&hanja_keys, IBUS_F9, 0); diff --git a/community/libcgns/PKGBUILD b/community/libcgns/PKGBUILD deleted file mode 100644 index 4338d5222..000000000 --- a/community/libcgns/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Klimov Max - -pkgname=libcgns -_basever=3.1.3 -_relver=4 -pkgver=${_basever}.${_relver} -pkgrel=1 -pkgdesc='General purpose library for the storage and retrieval of computational fluid dynamics analysis data by CGNS standard' -arch=('i686' 'x86_64') -url='http://www.cgns.org' -license=('custom') -conflicts=('libcgns2') -makedepends=('cmake') -source=("http://downloads.sourceforge.net/project/cgns/cgnslib_${_basever:0:3}/cgnslib_${_basever}-${_relver}.tar.gz") -md5sums=('442bba32b576f3429cbd086af43fd4ae') - -# need to tell cmake when to build 64bit version -[[ "$CARCH" == "i686" ]] && _64bits=OFF -[[ "$CARCH" == "x86_64" ]] && _64bits=ON - -build() { - mkdir build - cd build - - cmake \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DENABLE_64BIT:BOOL=${_64bits} \ - -DENABLE_TESTS:BOOL=ON \ - ../cgnslib_${_basever} - - make -} - -check() { - cd build - - make test -} - -package() { - cd build - - make DESTDIR=${pkgdir} install - - # install license - install -d ${pkgdir}/usr/share/licenses/libcgns - install -m644 ${srcdir}/cgnslib_${_basever}/license.txt \ - ${pkgdir}/usr/share/licenses/libcgns -} diff --git a/community/libdesktop-agnostic/PKGBUILD b/community/libdesktop-agnostic/PKGBUILD deleted file mode 100644 index 3c0072045..000000000 --- a/community/libdesktop-agnostic/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# Maintainer: Jan "heftig" Steffens -# Contributor: Daniel J Griffiths - -pkgname=libdesktop-agnostic -pkgver=0.3.92 -pkgrel=1 -pkgdesc="Provides an extensible config API, a unified virtual fs API, and a desktop item editor for GLib-based projects." -arch=('i686' 'x86_64') -url="https://launchpad.net/libdesktop-agnostic" -license=('GPL' 'LGPL') -depends=('glib2' 'gtk2' 'pygtk' 'pygobject') -makedepends=('gobject-introspection' 'vala>=0.8.1' 'intltool' - 'gconf') -optdepends=('gconf: gconf configuration backend') -options=('!libtool') -backup=(etc/xdg/libdesktop-agnostic/desktop-agnostic.ini) -source=(https://launchpad.net/$pkgname/0.4/$pkgver/+download/$pkgname-$pkgver.tar.gz - gir.patch) -md5sums=('42374d226a21d57637f97173f6b105a1' - '346e06ae914ec0c12e5f1fa1c4796575') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Force source regeneration - rm -r gen_src - - # fix for python 2.7 - sed -i '1s|^#!.*python$|&2|' waf - export PYTHON=/usr/bin/python2 - - # fix to enable introspection - patch -Np1 -i "$srcdir/gir.patch" - - ./waf configure --config-backends=gconf,keyfile --vfs-backends=gio \ - --desktop-entry-backends=gio,glib --prefix=/usr --sysconfdir=/etc - ./waf -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - ./waf install --destdir="$pkgdir" --sysconfdir="$pkgdir/etc" -} diff --git a/community/libdesktop-agnostic/gir.patch b/community/libdesktop-agnostic/gir.patch deleted file mode 100644 index 88824cf76..000000000 --- a/community/libdesktop-agnostic/gir.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -u -r libdesktop-agnostic-0.3.92/libdesktop-agnostic/wscript libdesktop-agnostic-0.3.92-gir/libdesktop-agnostic/wscript ---- libdesktop-agnostic-0.3.92/libdesktop-agnostic/wscript 2011-03-12 15:14:23.000000000 +0100 -+++ libdesktop-agnostic-0.3.92-gir/libdesktop-agnostic/wscript 2011-03-27 18:51:13.170000225 +0200 -@@ -67,8 +67,9 @@ - - - def create_typelib_task(): -- rule = 'LD_LIBRARY_PATH="${CURRENT_BUILD_DIR}" ${G_IR_COMPILER} ' + \ -- '-o ${TGT} ${SRC}' -+ rule = '${G_IR_COMPILER}' + \ -+ ' --includedir "${CURRENT_BUILD_DIR}"' + \ -+ ' -o ${TGT} ${SRC}' - Task.simple_task_type('typelib', rule, after='cc_link') - - create_typelib_task() -diff -u -r libdesktop-agnostic-0.3.92/wscript libdesktop-agnostic-0.3.92-gir/wscript ---- libdesktop-agnostic-0.3.92/wscript 2011-03-13 16:09:47.000000000 +0100 -+++ libdesktop-agnostic-0.3.92-gir/wscript 2011-03-27 18:51:46.973335650 +0200 -@@ -71,7 +71,7 @@ - help='Enables the library to be built so that it is ' - 'instrumented to measure performance.') - opt.add_option('--disable-gi', action='store_true', -- dest='no_gi', default=True) -+ dest='no_gi', default=False) - - - def configure(conf): diff --git a/community/libphobos/PKGBUILD b/community/libphobos/PKGBUILD deleted file mode 100644 index 227067776..000000000 --- a/community/libphobos/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 61679 2012-01-06 12:52:49Z cbrannon $ -# Maintainer: Chris Brannon -# Contributor: Andrea Scarpino -# Contributor: Anders Bergh -# Contributor: Dawid Ciezarkiewicz - -pkgname=libphobos -pkgver=1.072 -pkgrel=1 -pkgdesc="Runtime library for the D programming language" -arch=('i686' x86_64) -url="http://www.digitalmars.com/d/1.0/" -source=(http://ftp.digitalmars.com/dmd.$pkgver.zip dmd.conf) -depends=(dmd=$pkgver) -license=('custom') -conflicts=('libtango') - -build() { - install -d "$pkgdir/usr/include/d" - cd "$srcdir/dmd/src/phobos" - cp -Rf std "$pkgdir/usr/include/d" - cp -Rf etc "$pkgdir/usr/include/d" - cp -Rf internal "$pkgdir/usr/include/d" - cp -f {crc32,object,gcstats}.d "$pkgdir/usr/include/d" - - if [ $CARCH == x86_64 ]; then - install -Dm644 "$srcdir/dmd/linux/lib64/libphobos.a" "$pkgdir/usr/lib/libphobos.a" - else - install -Dm644 "$srcdir/dmd/linux/lib32/libphobos.a" "$pkgdir/usr/lib/libphobos.a" - fi - - install -Dm644 "$srcdir/dmd.conf" "$pkgdir/etc/dmd.conf" - - # Get rid of this subdirectory; it's just an unpacked zlib source - # distribution. - rm -rf "${pkgdir}/usr/include/d/etc/c/zlib" - # Insure that files and directories under /usr/include/d have - # correct permissions. - find "${pkgdir}/usr/include/d" -type d -print0 |xargs -0 chmod 755 - find "${pkgdir}/usr/include/d" -type f -print0 |xargs -0 chmod 644 - install -Dm644 phoboslicense.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -md5sums=('d5489b94f06c7ca2f4b5de62f7e6815a' - 'e93f0ccb1e5c00cd222af5a9be3f599a') diff --git a/community/libphobos/dmd.conf b/community/libphobos/dmd.conf deleted file mode 100644 index 262f0b224..000000000 --- a/community/libphobos/dmd.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Environment] -DFLAGS=-I/usr/include/d -L-L/usr/lib diff --git a/community/lshw/abi_stdlib.diff b/community/lshw/abi_stdlib.diff deleted file mode 100644 index ffe88d1d8..000000000 --- a/community/lshw/abi_stdlib.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff -wbBur lshw-B.02.14/src/core/abi.cc lshw-B.02.14.my//src/core/abi.cc ---- lshw-B.02.14/src/core/abi.cc 2009-02-12 22:53:09.000000000 +0000 -+++ lshw-B.02.14.my//src/core/abi.cc 2010-05-24 14:30:18.000000000 +0000 -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - - __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $"); - -diff -wbBur lshw-B.02.14/src/core/scsi.cc lshw-B.02.14.my//src/core/scsi.cc ---- lshw-B.02.14/src/core/scsi.cc 2009-02-12 22:53:09.000000000 +0000 -+++ lshw-B.02.14.my//src/core/scsi.cc 2010-05-24 14:32:13.000000000 +0000 -@@ -842,7 +842,7 @@ - - if (!controller) - { -- controller = node.addChild(hwNode::hwNode("scsi", hw::storage)); -+ controller = node.addChild(hwNode("scsi", hw::storage)); - if (controller) - { - controller->setLogicalName(host_logicalname(number)); diff --git a/community/megaglest/megaglest.sh b/community/megaglest/megaglest.sh deleted file mode 100644 index 571a01be7..000000000 --- a/community/megaglest/megaglest.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - # Wrapper script for Megaglest. - - MAINDIR=/usr/share/megaglest - BASEDIR="$HOME/.config" - DIR="$BASEDIR/megaglest" - if [ ! -d "$DIR" ]; then - mkdir -p $DIR - fi - cd $DIR - [ -f glest.ini ] || cp /usr/share/megaglest/glest.ini . - [ -h megaglest ] || ln -s /usr/share/megaglest/megaglest . - [ -f servers.ini ] || cp $MAINDIR/servers.ini . - [ -f glestkeys.ini ] || cp $MAINDIR/glestkeys.ini . - for i in data scenarios techs tilesets tutorials; do - [ -h $i ] || ln -s $MAINDIR/$i . - done - [ -d maps ] || mkdir maps - [ -d screens ] || mkdir screens - cd maps - for i in $MAINDIR/maps/*; do - [ -h `basename $i` ] || ln -s $i . - done - cd .. - - exec ./megaglest \ No newline at end of file diff --git a/community/mythtv/build.patch b/community/mythtv/build.patch deleted file mode 100644 index 35dccd618..000000000 --- a/community/mythtv/build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nru a/libs/libmythui/mythrender_opengl.cpp b/libs/libmythui/mythrender_opengl.cpp ---- a/libs/libmythui/mythrender_opengl.cpp 2011-05-16 08:57:52.000000000 +1200 -+++ b/libs/libmythui/mythrender_opengl.cpp 2011-10-23 15:05:33.178392264 +1300 -@@ -2,6 +2,8 @@ - #include "mythrender_opengl.h" - #include "mythxdisplay.h" - -+#include -+ - #define LOC QString("OpenGL: ") - #define LOC_ERR QString("OpenGL Error: ") - -Binary files a/libs/libmythui/.mythrender_opengl.cpp.swp and b/libs/libmythui/.mythrender_opengl.cpp.swp differ diff --git a/community/mythtv/mythbackend.conf b/community/mythtv/mythbackend.conf deleted file mode 100644 index e004ae5bd..000000000 --- a/community/mythtv/mythbackend.conf +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash -# -# Rename this file to: -# -# /etc/config.d/mythbackend -# -############################################################################### -# -# Copyright (c) by the MythTV Development Team. -# -# Derived from work by: -# -# Michael Thomson -# Stu Tomlinson -# Axel Thimm -# Adopted for ArchLinux: -# Jürgen Hoetzel -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -############################################################################### -# -# Config variables for the mythbackend startup script, which is usually -# located in /etc/rc.d/mythbackend -# -# When the startup script is executed, it sources this file if it exists, -# otherwise it will fall back on default values. -# -# Leave variables commented out to use default values in init script -# (/etc/rc.d/mythbackend). -# -# To override defaults, uncomment the relevant variable definition and -# edit as required. -# - -# -# User who should start the mythbackend processes -# -# Running mythbackend as non-root requires you to ensure that audio/video -# devices used for recording have suitable user permissions. One way -# to achieve this is to modify existing or create new udev rules which -# assign these devices to a non-root group with rw permissions and add -# your mythbackend user to that group. Be aware that console.perms can -# also affect device permissions and may need additional configuration. -# Running as non-root may also introduce increased process latency. -# -# MBE_USER='root' - -# -# Directory holding the mythbackend binary (empty means autodetect). -# -# MBE_DIR='' - -# -# Name of mythbackend binary. -# -# MBE_PROG='mythbackend' - -# -# Other startup options for mythbackend (see 'mythbackend --help' for a list). -# -# MBE_OPTIONS='' - -# -# Directory holding the mythbackend log file -# -# LOG_DIR='/var/log/mythtv' - -# -# Name of mythbackend log file. -# -# NOTE: If you are running as non-root take care to ensure the mythbackend user -# has permission to write to this log file. -# -# LOG_FILE='mythbackend.log' - -# -# Logging options for mythbackend (see 'mythbackend -v help' for a list) -# -# LOG_OPTS='' diff --git a/community/mythtv/mythbackend.rc b/community/mythtv/mythbackend.rc deleted file mode 100644 index 410e8de41..000000000 --- a/community/mythtv/mythbackend.rc +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -# Default values to use if none are supplied in the config file. - -# Running mythbackend as non-root requires you to ensure that audio/video -# devices used for recording have suitable user permissions. One way -# to achieve this is to modify existing or create new udev rules which -# assign these devices to a non-root group with rw permissions and add -# your mythbackend user to that group. Be aware that console.perms can -# also affect device permissions and may need additional configuration. -# Running as non-root may also introduce increased process latency. -# -# User who should start the mythbackend processes -MBE_USER='root' - -# Startup options for mythbackend -MBE_OPTIONS='' - -# Name of mythbackend log file -LOG_FILE='/var/log/mythbackend.log' - -# Logging options for mythbackend (empty means '-v important,general') -LOG_OPTS='' - -############################################################################### - -CONFIG_FILE=/etc/conf.d/mythbackend -PIDFILE=/var/run/mythbackend.pid - -if [[ -f ${CONFIG_FILE} ]]; then - . ${CONFIG_FILE} -fi - -pid="$(cat ${PIDFILE} 2>/dev/null || pidof mythbackend)"; - -# fix FS#11890 -mbe_user_home="$(getent passwd ${MBE_USER}|cut -d : -f 6)" - -case "$1" in - start) - stat_busy "Starting MythTV Backend" - - # already running ? - if [[ "${pid}" -gt 0 ]] && kill -0 "${pid}"; then - stat_fail - exit 1; - fi - touch ${PIDFILE} ${LOG_FILE} - chown "$MBE_USER" ${PIDFILE} ${LOG_FILE} - if su "$MBE_USER" -c "HOME=${mbe_user_home} mythbackend \ - --daemon \ - --logfile $LOG_FILE $LOG_OPTS \ - --pidfile ${PIDFILE} $MBE_OPTIONS"; - then - add_daemon mythbackend - stat_done - else - stat_fail - fi - ;; - - stop) - stat_busy "Stopping MythTV Backend" - if [[ "${pid}" -gt 0 ]] && kill $pid &>/dev/null; then - rm_daemon mythbackend - stat_done - rm ${PIDFILE} 2>/dev/null - else - stat_fail - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/mythtv/mythtv-v4l2-fix.patch b/community/mythtv/mythtv-v4l2-fix.patch deleted file mode 100644 index e26e16615..000000000 --- a/community/mythtv/mythtv-v4l2-fix.patch +++ /dev/null @@ -1,724 +0,0 @@ -diff --git a/mythtv/configure b/mythtv/configure -index 1efe803..7bcdf06 100755 ---- a/mythtv/configure -+++ b/mythtv/configure -@@ -109,7 +109,8 @@ Advanced options (experts only): - --disable-iptv disable support for recording RTSP/UDP/RTP streams - --disable-hdhomerun disable support for HDHomeRun boxes - --disable-v4l disable Video4Linux support -- --disable-ivtv disable ivtv support (PVR-x50) req. v4l support -+ --disable-v4l2 disable Video4Linux2 support -+ --disable-ivtv disable ivtv support (PVR-x50) req. v4l2 support - --disable-hdpvr disable HD-PVR support - --disable-dvb disable DVB support - --dvb-path=HDRLOC location of directory containing -@@ -1315,6 +1316,7 @@ MYTHTV_CONFIG_LIST=' - qtwebkit - quartz_video - v4l -+ v4l2 - valgrind - x11 - xrandr -@@ -1706,8 +1708,8 @@ audio_oss_deps_any="soundcard_h sys_soundcard_h" - dvb_deps="backend" - firewire_deps="backend" - iptv_deps="backend" --ivtv_deps="backend v4l" --hdpvr_deps="backend v4l" -+ivtv_deps="backend v4l2" -+hdpvr_deps="backend v4l2" - hdhomerun_deps="backend" - mpegtsraw_demuxer_deps="merge_libavformat_mpegts_c" - mythtranscode_deps="backend frontend" -@@ -1715,6 +1717,7 @@ opengl_deps_any="agl_h GL_gl_h darwin windows x11" - opengl_video_deps="opengl" - opengl_vsync_deps="opengl" - v4l_deps="backend linux_videodev_h linux_videodev2_h" -+v4l2_deps="backend linux_videodev2_h" - vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h" - xrandr_deps="x11" - xv_deps="x11" -@@ -1933,6 +1936,7 @@ enable opengl_vsync - enable opengl_video - enable quartz_video - enable v4l -+enable v4l2 - enable x11 - enable xrandr - enable xv -@@ -3062,6 +3066,7 @@ EOF - fi - disable opengl_vsync - disable v4l -+ disable v4l2 - disable x11 - # Workaround compile errors from missing gmtime_r/localtime_r/uint def - CFLAGS=`echo $CFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'` -@@ -3106,6 +3111,7 @@ EOF - fi - disable symver - disable v4l -+ disable v4l2 - enable windows - disable x11 - ###### Standard ffmpeg configure stuff follows: -@@ -4375,6 +4381,7 @@ enabled stripping || strip="echo skipping strip" - - if enabled backend; then - echo "Video4Linux sup. ${v4l-no}" -+ echo "Video4Linux2 sup. ${v4l2-no}" - echo "ivtv support ${ivtv-no}" - echo "HD-PVR support ${hdpvr-no}" - echo "FireWire support ${firewire-no}" -diff --git a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp -index 739634d..39e5956 100644 ---- a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp -+++ b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp -@@ -42,9 +42,13 @@ extern "C" { - #include "libswscale/swscale.h" - } - -+#if defined(USING_V4L) || defined(USING_V4L2) - #ifdef USING_V4L - #include -+#endif -+#ifdef USING_V4L2 - #include -+#endif - - #include "go7007_myth.h" - -@@ -55,9 +59,9 @@ extern "C" { - extern "C" { - #include "vbitext/vbi.h" - } --#else // USING_V4l -+#else // USING_V4L || USING_V4L2 - #define VT_WIDTH 0 --#endif // USING_V4l -+#endif // USING_V4l || USING_V4L2 - - #define KEYFRAMEDIST 30 - -@@ -1019,7 +1023,7 @@ bool NuppelVideoRecorder::Open(void) - - void NuppelVideoRecorder::ProbeV4L2(void) - { --#ifdef USING_V4L -+#if defined(USING_V4L) || defined(USING_V4L2) - usingv4l2 = true; - - struct v4l2_capability vcap; -@@ -1049,7 +1053,7 @@ void NuppelVideoRecorder::ProbeV4L2(void) - QString driver = (char *)vcap.driver; - if (driver == "go7007") - go7007 = true; --#endif // USING_V4L -+#endif // USING_V4L || USING_V4L2 - } - - void NuppelVideoRecorder::StartRecording(void) -@@ -2460,7 +2464,7 @@ void NuppelVideoRecorder::doAudioThread(void) - audio_device->Close(); - } - --#ifdef USING_V4L -+#if defined(USING_V4L) || defined(USING_V4L2) - struct VBIData - { - NuppelVideoRecorder *nvr; -@@ -2634,9 +2638,9 @@ void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata) - act_text_buffer = 0; - textbuffer[act]->freeToEncode = 1; - } --#else // USING_V4L -+#else // USING_V4L || USING_V4L2 - void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata) {} --#endif // USING_V4L -+#endif // USING_V4L || USING_V4L2 - - void NuppelVideoRecorder::FormatCC(struct cc *cc) - { -@@ -2863,7 +2867,7 @@ void NuppelVideoRecorder::doVbiThread(void) - //VERBOSE(VB_RECORD, LOC + "vbi end"); - } - --#else // USING_V4L -+#else // USING_V4L - void NuppelVideoRecorder::doVbiThread(void) { } - #endif // USING_V4L - -diff --git a/mythtv/libs/libmythtv/analogsignalmonitor.cpp b/mythtv/libs/libmythtv/analogsignalmonitor.cpp -index 2a4f4c5..fa5823a 100644 ---- a/mythtv/libs/libmythtv/analogsignalmonitor.cpp -+++ b/mythtv/libs/libmythtv/analogsignalmonitor.cpp -@@ -6,7 +6,9 @@ - #include - #include - -+#ifdef USING_V4L - #include -+#endif - - #include "mythverbose.h" - #include "analogsignalmonitor.h" -@@ -151,6 +153,7 @@ void AnalogSignalMonitor::UpdateValues(void) - } - else - { -+#ifdef USING_V4L - struct video_tuner tuner; - bzero(&tuner, sizeof(tuner)); - -@@ -163,6 +166,7 @@ void AnalogSignalMonitor::UpdateValues(void) - { - isLocked = tuner.signal; - } -+#endif - } - - { -diff --git a/mythtv/libs/libmythtv/cardutil.cpp b/mythtv/libs/libmythtv/cardutil.cpp -index 8852682..494f48a 100644 ---- a/mythtv/libs/libmythtv/cardutil.cpp -+++ b/mythtv/libs/libmythtv/cardutil.cpp -@@ -4,7 +4,7 @@ - - #include - --#if defined(USING_V4L) || defined(USING_DVB) -+#if defined(USING_V4L) || defined(USING_V4L2) || defined(USING_DVB) - #include - #endif - -@@ -28,6 +28,8 @@ - - #ifdef USING_V4L - #include -+#endif -+#ifdef USING_V4L2 - #include - #endif - -@@ -1455,15 +1457,15 @@ uint CardUtil::GetQuickTuning(uint cardid, const QString &input_name) - bool CardUtil::hasV4L2(int videofd) - { - (void) videofd; --#ifdef USING_V4L -+#ifdef USING_V4L2 - struct v4l2_capability vcap; - bzero(&vcap, sizeof(vcap)); - - return ((ioctl(videofd, VIDIOC_QUERYCAP, &vcap) >= 0) && - (vcap.capabilities & V4L2_CAP_VIDEO_CAPTURE)); --#else // if !USING_V4L -+#else // if !USING_V4L2 - return false; --#endif // !USING_V4L -+#endif // !USING_V4L2 - } - - bool CardUtil::GetV4LInfo( -@@ -1475,7 +1477,7 @@ bool CardUtil::GetV4LInfo( - if (videofd < 0) - return false; - --#ifdef USING_V4L -+#if defined(USING_V4L) || defined(USING_V4L2) - // First try V4L2 query - struct v4l2_capability capability; - bzero(&capability, sizeof(struct v4l2_capability)); -@@ -1487,11 +1489,13 @@ bool CardUtil::GetV4LInfo( - } - else // Fallback to V4L1 query - { -+#ifdef USING_V4L - struct video_capability capability; - if (ioctl(videofd, VIDIOCGCAP, &capability) >= 0) - card = QString::fromAscii((const char*)capability.name); -+#endif //USING_V4L - } --#endif // !USING_V4L -+#endif // !USING_V4L || USING_V4L2 - - if (!driver.isEmpty()) - driver.remove( QRegExp("\\[[0-9]\\]$") ); -@@ -1506,9 +1510,9 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok) - InputNames list; - ok = false; - --#ifdef USING_V4L -+#if defined(USING_V4L) || defined(USING_V4L2) - bool usingv4l2 = hasV4L2(videofd); -- -+#ifdef USING_V4L2 - // V4L v2 query - struct v4l2_input vin; - bzero(&vin, sizeof(vin)); -@@ -1523,8 +1527,10 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok) - ok = true; - return list; - } -+#endif - - // V4L v1 query -+#ifdef USING_V4L - struct video_capability vidcap; - bzero(&vidcap, sizeof(vidcap)); - if (ioctl(videofd, VIDIOCGCAP, &vidcap) != 0) -@@ -1552,15 +1558,15 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok) - - list[i] = test.name; - } -- -+#endif - // Create an input on single input cards that don't advertise input - if (!list.size()) - list[0] = "Television"; - - ok = true; --#else // if !USING_V4L -+#else // if !USING_V4L || USING_V4L2 - list[-1] += QObject::tr("ERROR, Compile with V4L support to query inputs"); --#endif // !USING_V4L -+#endif // !USING_V4L || USING_V4L2 - return list; - } - -diff --git a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp -index 832d0a8..e35b186 100644 ---- a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp -+++ b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp -@@ -1394,7 +1394,7 @@ const DVBChannel *ChannelScanSM::GetDVBChannel(void) const - - V4LChannel *ChannelScanSM::GetV4LChannel(void) - { --#ifdef USING_V4L -+#if defined(USING_V4L) || defined(USING_V4L2) - return dynamic_cast(channel); - #else - return NULL; -diff --git a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp -index 1595d6a..4d2b2cf 100644 ---- a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp -+++ b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp -@@ -342,7 +342,7 @@ void ChannelScanner::PreScanCommon( - channel = new DVBChannel(device); - #endif - --#ifdef USING_V4L -+#if defined(USING_V4L) || defined(USING_V4L2) - if (("V4L" == card_type) || ("MPEG" == card_type)) - channel = new V4LChannel(NULL, device); - #endif -diff --git a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp -index 00fd9d3..70e3469 100644 ---- a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp -+++ b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp -@@ -27,14 +27,14 @@ static QString card_types(void) - cardTypes += "'DVB'"; - #endif // USING_DVB - --#ifdef USING_V4L -+#if defined(USING_V4L) || defined(USING_V4L2) - if (!cardTypes.isEmpty()) - cardTypes += ","; - cardTypes += "'V4L'"; - # ifdef USING_IVTV - cardTypes += ",'MPEG'"; - # endif // USING_IVTV --#endif // USING_V4L -+#endif // USING_V4L || USING_V4L2 - - #ifdef USING_IPTV - if (!cardTypes.isEmpty()) -diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro -index 3d26e0a..ea06ee7 100644 ---- a/mythtv/libs/libmythtv/libmythtv.pro -+++ b/mythtv/libs/libmythtv/libmythtv.pro -@@ -119,7 +119,7 @@ cygwin:DEFINES += _WIN32 - using_valgrind:DEFINES += USING_VALGRIND - - # old libvbitext (Caption decoder) --using_v4l { -+using_v4l || using_v4l2 { - HEADERS += vbitext/cc.h vbitext/dllist.h vbitext/hamm.h vbitext/lang.h - HEADERS += vbitext/vbi.h vbitext/vt.h - SOURCES += vbitext/cc.cpp vbitext/vbi.c vbitext/hamm.c vbitext/lang.c -@@ -471,11 +471,17 @@ using_backend { - SOURCES += channelchangemonitor.cpp - - # Support for Video4Linux devices -- using_v4l { -+ using_v4l || using_v4l2 { - HEADERS += v4lchannel.h analogsignalmonitor.h - SOURCES += v4lchannel.cpp analogsignalmonitor.cpp - -- DEFINES += USING_V4L -+ using_v4l { -+ DEFINES += USING_V4L -+ } -+ -+ using_v4l2 { -+ DEFINES += USING_V4L2 -+ } - } - - # Support for cable boxes that provide Firewire out -diff --git a/mythtv/libs/libmythtv/signalmonitor.cpp b/mythtv/libs/libmythtv/signalmonitor.cpp -index 221efef..c199b3b 100644 ---- a/mythtv/libs/libmythtv/signalmonitor.cpp -+++ b/mythtv/libs/libmythtv/signalmonitor.cpp -@@ -23,7 +23,7 @@ extern "C" { - # include "dvbchannel.h" - #endif - --#ifdef USING_V4L -+#ifdef USING_V4L2 - # include "analogsignalmonitor.h" - # include "v4lchannel.h" - #endif -@@ -95,7 +95,7 @@ SignalMonitor *SignalMonitor::Init(QString cardtype, int db_cardnum, - } - #endif - --#ifdef USING_V4L -+#ifdef USING_V4L2 - if ((cardtype.toUpper() == "HDPVR")) - { - V4LChannel *chan = dynamic_cast(channel); -diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp -index b885eaa..3d9c7ad 100644 ---- a/mythtv/libs/libmythtv/tv_rec.cpp -+++ b/mythtv/libs/libmythtv/tv_rec.cpp -@@ -57,7 +57,7 @@ using namespace std; - - #include "channelgroup.h" - --#ifdef USING_V4L -+#if defined(USING_V4L) || defined(USING_V4L2) - #include "v4lchannel.h" - #endif - -@@ -206,7 +206,7 @@ bool TVRec::CreateChannel(const QString &startchannel) - } - else // "V4L" or "MPEG", ie, analog TV - { --#ifdef USING_V4L -+#if defined(USING_V4L) || defined(USING_V4L2) - channel = new V4LChannel(this, genOpt.videodev); - if (!channel->Open()) - return false; -@@ -1082,11 +1082,11 @@ bool TVRec::SetupRecorder(RecordingProfile &profile) - } - else - { --#ifdef USING_V4L -+#if defined(USING_V4L) || defined(USING_V4L2) - // V4L/MJPEG/GO7007 from here on - recorder = new NuppelVideoRecorder(this, channel); - recorder->SetOption("skipbtaudio", genOpt.skip_btaudio); --#endif // USING_V4L -+#endif // USING_V4L || USING_V4L2 - } - - if (recorder) -@@ -1292,11 +1292,11 @@ FirewireChannel *TVRec::GetFirewireChannel(void) - - V4LChannel *TVRec::GetV4LChannel(void) - { --#ifdef USING_V4L -+#if defined(USING_V4L) || defined(USING_V4L2) - return dynamic_cast(channel); - #else - return NULL; --#endif // USING_V4L -+#endif // USING_V4L || USING_V4L2 - } - - /** \fn TVRec::EventThread(void*) -@@ -4137,7 +4137,7 @@ void TVRec::TuningNewRecorder(MPEGStreamData *streamData) - channel->GetCurrentName()); - } - --#ifdef USING_V4L -+#if defined(USING_V4L) || defined(USING_V4L2) - if (GetV4LChannel()) - { - channel->InitPictureAttributes(); -diff --git a/mythtv/libs/libmythtv/v4lchannel.cpp b/mythtv/libs/libmythtv/v4lchannel.cpp -index bc82b49..7aa47ef 100644 ---- a/mythtv/libs/libmythtv/v4lchannel.cpp -+++ b/mythtv/libs/libmythtv/v4lchannel.cpp -@@ -16,8 +16,12 @@ - #include - using namespace std; - -+#ifdef USING_V4L - #include -+#endif -+#ifdef USING_V4L2 - #include -+#endif - - // MythTV headers - #include "v4lchannel.h" -@@ -150,8 +154,10 @@ static int format_to_mode(const QString &fmt, int v4l_version) - { - if (fmt == "NTSC-JP") - return 6; -+#ifdef USING_V4L - else if (fmt.left(5) == "SECAM") - return VIDEO_MODE_SECAM; -+#endif - else if (fmt == "PAL-NC") - return 3; - else if (fmt == "PAL-M") -@@ -159,6 +165,7 @@ static int format_to_mode(const QString &fmt, int v4l_version) - else if (fmt == "PAL-N") - return 5; - // generics... -+#ifdef USING_V4L - else if (fmt.left(3) == "PAL") - return VIDEO_MODE_PAL; - else if (fmt.left(4) == "NTSC") -@@ -166,6 +173,7 @@ static int format_to_mode(const QString &fmt, int v4l_version) - else if (fmt.left(4) == "ATSC") - return VIDEO_MODE_NTSC; // We've dropped V4L ATSC support... - return VIDEO_MODE_NTSC; -+#endif - } - - VERBOSE(VB_IMPORTANT, -@@ -237,6 +245,7 @@ static QString mode_to_format(int mode, int v4l_version) - } - else if (1 == v4l_version) - { -+#ifdef USING_V4L - if (mode == VIDEO_MODE_NTSC) - return "NTSC"; - else if (mode == VIDEO_MODE_PAL) -@@ -249,6 +258,7 @@ static QString mode_to_format(int mode, int v4l_version) - return "PAL-N"; - else if (mode == 6) - return "NTSC-JP"; -+#endif - } - else - { -@@ -676,6 +686,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname, - return true; - } - -+#ifdef USING_V4L - // Video4Linux version 1 tuning - uint freq = frequency / 62500; - ioctlval = ioctl(videofd, VIDIOCSFREQ, &freq); -@@ -687,6 +698,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname, - .arg(device).arg(ioctlval).arg(strerror(errno))); - return false; - } -+#endif - - SetSIStandard(si_std); - -@@ -858,6 +870,7 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt) - - if (usingv4l1) - { -+#ifdef USING_V4L - VERBOSE(VB_CHANNEL, LOC + msg + "(v4l v1)"); - - // read in old settings -@@ -875,8 +888,9 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt) - { - VERBOSE(VB_IMPORTANT, LOC_ERR + msg + - "\n\t\t\twhile setting format (v4l v1)" + ENO); -- } -- else if (usingv4l2) -+ } else -+#endif -+ if (usingv4l2) - { - VERBOSE(VB_IMPORTANT, LOC + msg + - "\n\t\t\tSetting video mode with v4l version 1 worked"); -@@ -951,6 +965,7 @@ bool V4LChannel::SwitchToInput(int inputnum, bool setstarting) - return ok; - } - -+#ifdef USING_V4L - static unsigned short *get_v4l1_field( - int v4l2_attrib, struct video_picture &vid_pic) - { -@@ -970,6 +985,7 @@ static unsigned short *get_v4l1_field( - } - return NULL; - } -+#endif - - static int get_v4l2_attribute(const QString &db_col_name) - { -@@ -1067,6 +1083,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name) - } - - // V4L1 -+#ifdef USING_V4L - unsigned short *setfield; - struct video_picture vid_pic; - bzero(&vid_pic, sizeof(vid_pic)); -@@ -1087,7 +1104,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name) - VERBOSE(VB_IMPORTANT, loc_err + "failed to set controls." + ENO); - return false; - } -- -+#endif - return true; - } - -@@ -1154,6 +1171,7 @@ static int get_v4l2_attribute_value(int videofd, int v4l2_attrib) - - static int get_v4l1_attribute_value(int videofd, int v4l2_attrib) - { -+#ifdef USING_V4L - struct video_picture vid_pic; - bzero(&vid_pic, sizeof(vid_pic)); - -@@ -1167,6 +1185,7 @@ static int get_v4l1_attribute_value(int videofd, int v4l2_attrib) - unsigned short *setfield = get_v4l1_field(v4l2_attrib, vid_pic); - if (setfield) - return *setfield; -+#endif - - return -1; - } -@@ -1210,6 +1229,7 @@ static int set_v4l2_attribute_value(int videofd, int v4l2_attrib, int newvalue) - - static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue) - { -+#ifdef USING_V4L - unsigned short *setfield; - struct video_picture vid_pic; - bzero(&vid_pic, sizeof(vid_pic)); -@@ -1236,7 +1256,7 @@ static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue) - // ??? - return -1; - } -- -+#endif - return 0; - } - -diff --git a/mythtv/libs/libmythtv/v4lchannel.h b/mythtv/libs/libmythtv/v4lchannel.h -index b059c64..aa6d934 100644 ---- a/mythtv/libs/libmythtv/v4lchannel.h -+++ b/mythtv/libs/libmythtv/v4lchannel.h -@@ -4,11 +4,11 @@ - #define CHANNEL_H - - #include "dtvchannel.h" --#ifdef USING_V4L -+#ifdef USING_V4L2 - #include // needed for v4l2_std_id type - #else - typedef uint64_t v4l2_std_id; --#endif //USING_V4L -+#endif //USING_V4L2 - - using namespace std; - -diff --git a/mythtv/libs/libmythtv/vbitext/vbi.c b/mythtv/libs/libmythtv/vbitext/vbi.c -index 15f8d85..4c50e8d 100644 ---- a/mythtv/libs/libmythtv/vbitext/vbi.c -+++ b/mythtv/libs/libmythtv/vbitext/vbi.c -@@ -14,8 +14,12 @@ - // compiling with -std=c99. We could remove this in the .pro file, - // but that would disable it for all .c files. - #undef __STRICT_ANSI__ -+#ifdef USING_V4L - #include -+#endif -+#ifdef USING_V4L2 - #include -+#endif - - // vbitext headers - #include "vt.h" -@@ -29,8 +33,13 @@ static int rawbuf_size; // its current size - - - /***** bttv api *****/ -+#ifdef USING_V4L - #define BTTV_VBISIZE _IOR('v' , BASE_VIDIOCPRIVATE+8, int) -- -+#else // !USING_V4L -+#ifdef USING_V4L2 -+#define BTTV_VBISIZE _IOR('v' , BASE_VIDIOC_PRIVATE+8, int) -+#endif // USING_V4L2 -+#endif // !USING_V4L - - static void - error(const char *str, ...) -diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp -index 5d7a508..635faeb 100644 ---- a/mythtv/libs/libmythtv/videosource.cpp -+++ b/mythtv/libs/libmythtv/videosource.cpp -@@ -45,7 +45,7 @@ using namespace std; - #include "dvbtypes.h" - #endif - --#ifdef USING_V4L -+#ifdef USING_V4L2 - #include - #endif - -@@ -2012,7 +2012,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) : - setTrigger(cardtype); - setSaveAll(false); - --#ifdef USING_V4L -+#if defined(USING_V4L) || defined(USING_V4L2) - addTarget("V4L", new V4LConfigurationGroup(parent)); - # ifdef USING_IVTV - addTarget("MPEG", new MPEGConfigurationGroup(parent)); -@@ -2020,7 +2020,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) : - # ifdef USING_HDPVR - addTarget("HDPVR", new HDPVRConfigurationGroup(parent)); - # endif // USING_HDPVR --#endif // USING_V4L -+#endif // USING_V4L || USING_V4L2 - - #ifdef USING_DVB - addTarget("DVB", new DVBConfigurationGroup(parent)); -@@ -2201,7 +2201,7 @@ CardType::CardType(const CaptureCard &parent) : - - void CardType::fillSelections(SelectSetting* setting) - { --#ifdef USING_V4L -+#if defined(USING_V4L) || defined(USING_V4L2) - setting->addSelection( - QObject::tr("Analog V4L capture card"), "V4L"); - setting->addSelection( -@@ -2214,7 +2214,7 @@ void CardType::fillSelections(SelectSetting* setting) - setting->addSelection( - QObject::tr("H.264 encoder card (HD-PVR)"), "HDPVR"); - # endif // USING_HDPVR --#endif // USING_V4L -+#endif // USING_V4L || USING_V4L2 - - #ifdef USING_DVB - setting->addSelection( -@@ -2226,11 +2226,11 @@ void CardType::fillSelections(SelectSetting* setting) - QObject::tr("FireWire cable box"), "FIREWIRE"); - #endif // USING_FIREWIRE - --#ifdef USING_V4L -+#if defined(USING_V4L) || defined(USING_V4L2) - setting->addSelection( - QObject::tr("USB MPEG-4 encoder box (Plextor ConvertX, etc)"), - "GO7007"); --#endif // USING_V4L -+#endif // USING_V4L || USING_V4L2 - - #ifdef USING_HDHOMERUN - setting->addSelection( diff --git a/community/mythtv/mythtv.install b/community/mythtv/mythtv.install deleted file mode 100644 index c29a53454..000000000 --- a/community/mythtv/mythtv.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - echo "See \"MythTV\" on the Archlinux Wiki for installation information - Extensive!!" -} - -post_upgrade() { - return -} - -post_remove() { - echo -e "NOTE: mysql database was not removed. To remove run:\nmysql -u root -e 'drop database mythconverg;'" -} diff --git a/community/openmovieeditor/PKGBUILD b/community/openmovieeditor/PKGBUILD deleted file mode 100644 index cef330b33..000000000 --- a/community/openmovieeditor/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 57799 2011-11-03 09:07:09Z spupykin $ -# Contributor: Robert Emil Berge -# Maintainer: Robert Emil Berge -# Maintainer: Mateusz Herych - -pkgname=openmovieeditor -pkgver=0.0.20090105 -pkgrel=8 -pkgdesc="A simple video editor" -arch=('i686' 'x86_64') -url="http://openmovieeditor.sourceforge.net/HomePage" -license=('GPL') -depends=('libquicktime' 'libsamplerate' 'fltk' 'jack' - 'portaudio' 'gmerlin-avdecoder' 'libxtst') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('ce4f76c0b3e90aabf9c2d5c8dd31e9b1') - -build() { - cd $srcdir/$pkgname-$pkgver - unset LDFLAGS - - export CFLAGS="$CFLAGS -fpermissive" - export CXXFLAGS="$CXXFLAGS -fpermissive" - export CPPFLAGS="$CPPFLAGS -fpermissive" - sed -i 's|= sizes();|= (short*)sizes();|g' src/Fl_Split.cpp - - # Fix missing includes - sed -e 's||\n#include |' -i src/VideoViewGL.H - sed -e 's||\n#include |' -i src/WaveForm.H - sed -e 's||\n#include |' -i src/AddCommand.H - sed -e 's||\n#include |' -i src/MediaBrowser.H - sed -e 's||\n#include |' -i src/fl_font_browser.h - - ./configure --prefix=/usr - make - make DESTDIR=$pkgdir install -} diff --git a/community/perl-crypt-openssl-bignum/PKGBUILD b/community/perl-crypt-openssl-bignum/PKGBUILD deleted file mode 100644 index 33f382066..000000000 --- a/community/perl-crypt-openssl-bignum/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 47483 2011-05-23 15:54:16Z tdziedzic $ -# Maintainer: Sergej Pupykin - -pkgname=perl-crypt-openssl-bignum -pkgver=0.04 -pkgrel=5 -pkgdesc="OpenSSL's multiprecision integer arithmetic " -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum" -depends=('perl' 'openssl') -license=('GPL') -option=('!emptydirs') -source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Bignum-$pkgver.tar.gz) -md5sums=('9369ef722b0705c0604998559988eb18') - -build() { - cd $startdir/src/Crypt-OpenSSL-Bignum-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make pure_install doc_install DESTDIR=$startdir/pkg - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete -} diff --git a/community/perl-crypt-openssl-random/PKGBUILD b/community/perl-crypt-openssl-random/PKGBUILD deleted file mode 100644 index b9a8adb52..000000000 --- a/community/perl-crypt-openssl-random/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 47486 2011-05-23 15:55:23Z tdziedzic $ -# Maintainer: Sergej Pupykin - -pkgname=perl-crypt-openssl-random -pkgver=0.04 -pkgrel=5 -pkgdesc="Interface to OpenSSL PRNG methods" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Crypt-OpenSSL-Random" -depends=('perl' 'openssl') -license=('GPL') -option=('!emptydirs') -source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Random-$pkgver.tar.gz) -md5sums=('c56ac5dbdd46122eb9b8da59613b7b0a') - -build() { - cd $startdir/src/Crypt-OpenSSL-Random-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make pure_install doc_install DESTDIR=$startdir/pkg - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete -} diff --git a/community/perl-crypt-openssl-rsa/PKGBUILD b/community/perl-crypt-openssl-rsa/PKGBUILD deleted file mode 100644 index dcedd07a7..000000000 --- a/community/perl-crypt-openssl-rsa/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 56403 2011-10-07 09:48:48Z spupykin $ -# Maintainer: Sergej Pupykin - -pkgname=perl-crypt-openssl-rsa -pkgver=0.28 -pkgrel=1 -pkgdesc="Interface to OpenSSL RSA methods" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Crypt-OpenSSL-RSA" -depends=('perl-crypt-openssl-random' 'perl-crypt-openssl-bignum') -license=('GPL') -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/P/PE/PERLER/Crypt-OpenSSL-RSA-$pkgver.tar.gz") -md5sums=('86217a5036fc63779c30420b5fd84129') - -build() { - cd $srcdir/Crypt-OpenSSL-RSA-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd $srcdir/Crypt-OpenSSL-RSA-$pkgver - make pure_install doc_install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community/stow/PKGBUILD b/community/stow/PKGBUILD deleted file mode 100644 index d52341b39..000000000 --- a/community/stow/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id$ -# Maintainer: Sebastien Luttringer -# Contributor: eric -# Contributor: Tom Newsom -# Contributor: Chris Brannon - -pkgname=stow -pkgver=2.1.2 -pkgrel=1 -pkgdesc='GNU Stow is a program for managing the installation of software packages' -url='http://www.gnu.org/software/stow/' -arch=('i686' 'x86_64') -source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz") -license=('GPL2') -md5sums=('82857e43531cf6936aed99ef3b86b446') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/tucan/PKGBUILD b/community/tucan/PKGBUILD deleted file mode 100644 index 5dd2d1a95..000000000 --- a/community/tucan/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Maintainer: Daniel J Griffiths -# Contributor: Raul Pons Lopez - -pkgname=tucan -pkgver=0.3.10 -pkgrel=1 -pkgdesc='Download and upload manager for hosting sites' -arch=('i686' 'x86_64') -url='http://tucaneando.com/index.html' -license=('GPL3') -depends=('python-imaging' 'python2' 'pygtk' 'tesseract' 'librsvg') -source=("http://build-tucan-doc.googlecode.com/files/tucan-${pkgver}.tar.gz") -md5sums=('35f49eb3f118051817d3692a13fa922c') - -build() { - cd ${pkgname}-${pkgver} - - # python2 fix - sed -i 's_usr/bin/env python_usr/bin/env python2_' tucan.py -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir}/usr install - ln -sf /usr/share/tucan/tucan.py ${pkgdir}/usr/bin/tucan -} diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD deleted file mode 100644 index 9528e2edb..000000000 --- a/community/wine/PKGBUILD +++ /dev/null @@ -1,149 +0,0 @@ -# $Id: PKGBUILD 61124 2011-12-21 21:17:31Z svenstaro $ -# Maintainer: Sven-Hendrik Haase -# Contributor: Jan "heftig" Steffens -# Contributor: Eduardo Romero -# Contributor: Giovanni Scafora - -pkgname=wine -pkgver=1.3.35 -pkgrel=3 - -_pkgbasever=${pkgver/rc/-rc} - -source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('5833787fcd7fee5a2299fade10a2760d') - -pkgdesc="A compatibility layer for running Windows programs" -url="http://www.winehq.com" -arch=(i686 x86_64) -license=(LGPL) -install=wine.install - -depends=( - fontconfig lib32-fontconfig - mesa lib32-mesa - libxcursor lib32-libxcursor - libxrandr lib32-libxrandr - libxdamage lib32-libxdamage - libxi lib32-libxi - gettext lib32-gettext - desktop-file-utils -) - -makedepends=(autoconf ncurses bison perl fontforge flex prelink - 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' - giflib lib32-giflib - libxpm lib32-libxpm - libpng lib32-libpng - libxinerama lib32-libxinerama - libxcomposite lib32-libxcomposite - libxmu lib32-libxmu - libxxf86vm lib32-libxxf86vm - libxml2 lib32-libxml2 - libxslt lib32-libxslt - libldap lib32-libldap - lcms lib32-lcms - mpg123 lib32-mpg123 - openal lib32-openal - libcups lib32-libcups - v4l-utils lib32-v4l-utils - alsa-lib lib32-alsa-lib - oss -) - -optdepends=( - giflib lib32-giflib - libpng lib32-libpng - libldap lib32-libldap - lcms lib32-lcms - libxml2 lib32-libxml2 - mpg123 lib32-mpg123 - openal lib32-openal - libcups lib32-libcups - v4l-utils lib32-v4l-utils - libpulse lib32-libpulse - alsa-plugins lib32-alsa-plugins - alsa-lib lib32-alsa-lib - oss -) - -if [[ $CARCH == i686 ]]; then - # Strip lib32 etc. on i686 - depends=(${depends[@]/*32-*/}) - makedepends=(${makedepends[@]/*32-*/}) - makedepends=(${makedepends[@]/*-multilib*/}) - optdepends=(${optdepends[@]/*32-*/}) -else - provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver") - conflicts=('bin32-wine' 'wine-wow64') - replaces=('bin32-wine') -fi - -build() { - cd "$srcdir" - - # Allow ccache to work - mv $pkgname-$_pkgbasever $pkgname - - # Get rid of old build dirs - rm -rf $pkgname-{32,64}-build - mkdir $pkgname-32-build - - # These additional CFLAGS solve FS#27662 - export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" - export CXXFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" - - if [[ $CARCH == x86_64 ]]; then - msg2 "Building Wine-64..." - - mkdir $pkgname-64-build - cd "$srcdir/$pkgname-64-build" - ../$pkgname/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib \ - --with-x \ - --enable-win64 - - make - - _wine32opts=( - --libdir=/usr/lib32 - --with-wine64="$srcdir/$pkgname-64-build" - ) - - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - fi - - msg2 "Building Wine-32..." - cd "$srcdir/$pkgname-32-build" - ../$pkgname/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-x \ - "${_wine32opts[@]}" - - # These additional CFLAGS solve FS#27560 - make CFLAGS+="-mstackrealign" CXXFLAGS+="-mstackrealign" -} - -package() { - msg2 "Packaging Wine-32..." - cd "$srcdir/$pkgname-32-build" - - if [[ $CARCH == i686 ]]; then - make prefix="$pkgdir/usr" install - else - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib32" \ - dlldir="$pkgdir/usr/lib32/wine" install - - msg2 "Packaging Wine-64..." - cd "$srcdir/$pkgname-64-build" - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib" \ - dlldir="$pkgdir/usr/lib/wine" install - fi -} - -# vim:set ts=8 sts=2 sw=2 et: diff --git a/community/wine/wine.install b/community/wine/wine.install deleted file mode 100644 index 0548b7ffd..000000000 --- a/community/wine/wine.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - #echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." - #echo "If you are on x86_64, the default WINEARCH will be win64." - #echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." - #echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." - #echo "See the Arch wiki on wine for more information." -} - -post_remove() { - update-desktop-database -q -} -- cgit v1.2.3-54-g00ecf