diff options
| author | Florian Franzmann | 2010-11-30 09:45:56 +0100 |
|---|---|---|
| committer | Florian Franzmann | 2010-11-30 09:45:56 +0100 |
| commit | 8ed40076eef78cf6ebed62824038f4c0b94824da (patch) | |
| tree | 2503e9262d7ddda5b807890251f0cdea56504e51 | |
| parent | 1c64694614c81bc6e1847558fc51169e01d17e67 (diff) | |
| parent | 03be93278fda2eb46bd15b8ea2eb008aea01ce5e (diff) | |
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
27 files changed, 98 insertions, 268 deletions
@@ -1,3 +1,6 @@ +2010-11-29 Ismael Luceno <ismael@sourcemage.org> + * shell-term-fm/rc: new spell, a reimplementation of the Plan 9 shell + 2010-11-26 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * libs/libfm: new spell, pcmanfm's core functionality as a library diff --git a/devel/ccache/DETAILS b/devel/ccache/DETAILS index d1f7c0bd44..0479567c18 100755 --- a/devel/ccache/DETAILS +++ b/devel/ccache/DETAILS @@ -1,5 +1,5 @@ SPELL=ccache - VERSION=3.1.2 + VERSION=3.1.3 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE2=$SOURCE.asc SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/devel/ccache/HISTORY b/devel/ccache/HISTORY index e4846416a8..0db92cf7c4 100644 --- a/devel/ccache/HISTORY +++ b/devel/ccache/HISTORY @@ -1,3 +1,6 @@ +2010-11-29 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.1.3 + 2010-11-22 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.1.2 diff --git a/disk/hdparm/DETAILS b/disk/hdparm/DETAILS index c9533906d0..594f26c174 100755 --- a/disk/hdparm/DETAILS +++ b/disk/hdparm/DETAILS @@ -1,6 +1,6 @@ SPELL=hdparm - VERSION=9.35 - SOURCE_HASH=sha512:0a8160b3adcfc455b26203043468e3acdf4f976df027e3915850567873e37dc9e500f1413f4226f0867d14463fed20e25c55b2d234f347cee5bd1ef02a0e81e7 + VERSION=9.36 + SOURCE_HASH=sha512:b9a9bbe1b3fbab9d7600830e3592c82e5730d4a3a35165287cd6bb76eb3e56613a70ff3ab9afd9fc1306c6fba382701a2e6e4bc35c9b040aea6bc3c988c32ed6 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE diff --git a/disk/hdparm/HISTORY b/disk/hdparm/HISTORY index cebc578769..9b72a92192 100644 --- a/disk/hdparm/HISTORY +++ b/disk/hdparm/HISTORY @@ -1,3 +1,6 @@ +2010-11-29 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 9.36 + 2010-10-20 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 9.35 diff --git a/disk/lilo/DETAILS b/disk/lilo/DETAILS index c5703b819e..605c908168 100755 --- a/disk/lilo/DETAILS +++ b/disk/lilo/DETAILS @@ -2,7 +2,7 @@ VERSION=23.1 SOURCE=lilo-${VERSION}.tar.gz SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" - SOURCE_URL[0]=http://lilo.alioth.debian.org/ftp/sources/$SOURCE + SOURCE_URL[0]=http://lilo.alioth.debian.org/ftp/upstream/sources/$SOURCE SOURCE_HASH=sha512:268dcc405685c4de41c48b3b9db6de829c3620e267861518ec71df1ddcc18fb52b15d4a72ffab431de59d6a000371c04c2916aaedcfa09f8c3e06e343258d341 WEB_SITE=http://lilo.alioth.debian.org/ ENTERED=20010922 diff --git a/disk/lilo/HISTORY b/disk/lilo/HISTORY index 95969882fb..5d7a399d77 100644 --- a/disk/lilo/HISTORY +++ b/disk/lilo/HISTORY @@ -1,3 +1,6 @@ +2010-11-29 Bor Kraljič <pyrobor@ver.si> + * DETAILS: fixed SOURCE_URL + 2010-11-08 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: sharutils => UUDECODE diff --git a/gnome2-apps/file-roller/DETAILS b/gnome2-apps/file-roller/DETAILS index ffdf7481b3..4c0fd78423 100755 --- a/gnome2-apps/file-roller/DETAILS +++ b/gnome2-apps/file-roller/DETAILS @@ -1,5 +1,5 @@ SPELL=file-roller - VERSION=2.32.0 + VERSION=2.32.1 BRANCH=`echo $VERSION | cut -d . -f 1,2` SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/gnome2-apps/file-roller/HISTORY b/gnome2-apps/file-roller/HISTORY index c4bc53d4d5..f6821bfb97 100644 --- a/gnome2-apps/file-roller/HISTORY +++ b/gnome2-apps/file-roller/HISTORY @@ -1,3 +1,6 @@ +2010-11-29 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 2.32.1 + 2010-09-30 Vasil Yonkov <spirtbrat@sourcemage.org> * DETAILS: updated spell to 2.32.0 diff --git a/gnome2-apps/file-roller/file-roller-2.32.0.tar.gz.sig b/gnome2-apps/file-roller/file-roller-2.32.0.tar.gz.sig Binary files differdeleted file mode 100644 index 76bc72eacd..0000000000 --- a/gnome2-apps/file-roller/file-roller-2.32.0.tar.gz.sig +++ /dev/null diff --git a/gnome2-apps/file-roller/file-roller-2.32.1.tar.gz.sig b/gnome2-apps/file-roller/file-roller-2.32.1.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..8062d09eaf --- /dev/null +++ b/gnome2-apps/file-roller/file-roller-2.32.1.tar.gz.sig diff --git a/shell-term-fm/rc/DEPENDS b/shell-term-fm/rc/DEPENDS new file mode 100755 index 0000000000..965a0815bd --- /dev/null +++ b/shell-term-fm/rc/DEPENDS @@ -0,0 +1 @@ +depends readline diff --git a/shell-term-fm/rc/DETAILS b/shell-term-fm/rc/DETAILS new file mode 100755 index 0000000000..31eb677e93 --- /dev/null +++ b/shell-term-fm/rc/DETAILS @@ -0,0 +1,16 @@ + SPELL=rc + VERSION=1.7.1 + SOURCE="${SPELL}-${VERSION}.tar.gz" + SOURCE_URL[0]=http://www.libra-aries-books.co.uk/software/download/${SOURCE} + SOURCE_HASH=sha512:4e0d18c9897fe1751afc06f18c3d4c6b991bc2e365b30b6982004a2bed583c38738581b15488f6138ca6f637fb40964b220a024f2b795d768e5f200ea573f634 +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + WEB_SITE="http://www.libra-aries-books.co.uk/software/rc" + LICENSE[0]=BSD + ENTERED=20101129 + SHORT="a reimplementation of the Plan 9 shell" +cat << EOF +This is a reimplementation for Unix, by Byron Rakitzis, of the Plan 9 shell. + +rc offers much the same capabilities as a traditional Bourne shell, but with +a much cleaner syntax. +EOF diff --git a/shell-term-fm/rc/HISTORY b/shell-term-fm/rc/HISTORY new file mode 100644 index 0000000000..f0cb3d0660 --- /dev/null +++ b/shell-term-fm/rc/HISTORY @@ -0,0 +1,3 @@ +2010-11-29 Ismael Luceno <ismael@sourcemage.org> + * DEPENDS, DETAILS: spell created + diff --git a/utils/b43-fwcutter/DETAILS b/utils/b43-fwcutter/DETAILS index 6a90530ce3..c4c313fede 100755 --- a/utils/b43-fwcutter/DETAILS +++ b/utils/b43-fwcutter/DETAILS @@ -1,5 +1,5 @@ SPELL=b43-fwcutter - VERSION=012 + VERSION=013 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=http://bu3sch.de/b43/fwcutter/$SOURCE diff --git a/utils/b43-fwcutter/HISTORY b/utils/b43-fwcutter/HISTORY index b56318a623..996c6df54d 100644 --- a/utils/b43-fwcutter/HISTORY +++ b/utils/b43-fwcutter/HISTORY @@ -1,3 +1,6 @@ +2010-11-28 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 013 + 2009-11-25 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 012; quoting paths diff --git a/utils/b43-fwcutter/b43-fwcutter-012.tar.bz2.sig b/utils/b43-fwcutter/b43-fwcutter-012.tar.bz2.sig Binary files differdeleted file mode 100644 index 23017d614f..0000000000 --- a/utils/b43-fwcutter/b43-fwcutter-012.tar.bz2.sig +++ /dev/null diff --git a/utils/b43-fwcutter/b43-fwcutter-013.tar.bz2.sig b/utils/b43-fwcutter/b43-fwcutter-013.tar.bz2.sig Binary files differnew file mode 100644 index 0000000000..f87b9b169c --- /dev/null +++ b/utils/b43-fwcutter/b43-fwcutter-013.tar.bz2.sig diff --git a/utils/eventlog/DETAILS b/utils/eventlog/DETAILS index 5593f52b61..d063ef22bd 100755 --- a/utils/eventlog/DETAILS +++ b/utils/eventlog/DETAILS @@ -1,8 +1,8 @@ SPELL=eventlog SPELLX=syslog-ng - VERSION=0.2.10 - VX=3.0.4 - SOURCE_HASH=sha512:fbe979a388c89cba140b13a658690c17ec560f8654bdd17ce9b9b5b88f43cd99c12847247baacbe1b0ac9ab23cfb221c52701128ac5f313063ad66640b6fd716 + VERSION=0.2.12 + VX=3.2.1 + SOURCE_HASH=sha512:683726e7784d004c71b4b2ee89a1599da5e7b6875d2b3984f69949e9861b930a8880dafbfdeb8f4c1636c07c8a37cccb3eff15d8ffa5529cfeb25f47270996e0 SOURCE=${SPELL}_${VERSION}.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://www.balabit.hu/downloads/files/$SPELLX/sources/$VX/source/$SOURCE diff --git a/utils/eventlog/HISTORY b/utils/eventlog/HISTORY index 16fa1b12c0..615208e3c2 100644 --- a/utils/eventlog/HISTORY +++ b/utils/eventlog/HISTORY @@ -1,3 +1,6 @@ +2010-11-29 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 2.12 + 2009-08-22 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.10 diff --git a/utils/syslog-ng/DETAILS b/utils/syslog-ng/DETAILS index b6e8a2ca6b..8571d72456 100755 --- a/utils/syslog-ng/DETAILS +++ b/utils/syslog-ng/DETAILS @@ -1,6 +1,6 @@ SPELL=syslog-ng - VERSION=3.1.2 - SOURCE_HASH=sha512:58429be2cf0a91cca8a82a170a2376587c655cd6ee2f06263b4f9e7416db1097d840388cfe0ab1415b268cd0c7afa2caaad067805b8512e99b01f558da16dc5e + VERSION=3.2.1 + SOURCE_HASH=sha512:be1f0b2b544584831afde6651f8b5ff35d1bd35a0dd19ae3960d63b7cdfa3e79a9d6fdc30ecf3749f75e0e3a03c573bbd467f04b0b78b77530af076434f7e783 SOURCE=${SPELL}_${VERSION}.tar.gz # SOURCE2=$SOURCE.asc SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/utils/syslog-ng/HISTORY b/utils/syslog-ng/HISTORY index 60e974ed6d..33d4e6a9cc 100644 --- a/utils/syslog-ng/HISTORY +++ b/utils/syslog-ng/HISTORY @@ -1,3 +1,7 @@ +2010-11-29 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 3.2.1 + * syslog-ng.conf, INSTALL: deleted + 2010-09-07 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 3.1.2 This release changes the default for 'store-legacy-msghdr' flag diff --git a/utils/syslog-ng/INSTALL b/utils/syslog-ng/INSTALL deleted file mode 100755 index 0d5ef34699..0000000000 --- a/utils/syslog-ng/INSTALL +++ /dev/null @@ -1,7 +0,0 @@ -default_install && - -install_config_file $SCRIPT_DIRECTORY/syslog-ng.conf \ - ${INSTALL_ROOT}/etc/syslog-ng.conf && - -chmod 640 ${INSTALL_ROOT}/etc/syslog-ng.conf - diff --git a/utils/syslog-ng/syslog-ng.conf b/utils/syslog-ng/syslog-ng.conf deleted file mode 100644 index 9175ce3beb..0000000000 --- a/utils/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,250 +0,0 @@ -@version:3.0 - -### -# -# Name : syslog-ng.conf -# Author : Vladimir Vydra <vydra@fria.fri.utc.sk> -# LastChangement: 2003-02-14 -# -## - - -## -# *** Configuration - global -# http://www.balabit.hu/static/syslog-ng/reference/x601.html -## - -options { - chain_hostnames(no); # usage of long names - flush_lines(0); # how many events nefore writing to log -# sync(0); # how mutch of events nefore writing to log - time_reopen(2); # if write faile wait 2sec, before traing again (net) -# log_fifo_size(1000); # size of the output buffer (rows) - use_dns(no); # don't resolve - use_fqdn(no); # use fqdn and not hostname - owner("root"); # owner of the logs - group("root"); - perm(0640); # default permission on log files. - dir_perm(0700); - create_dirs(no); # will be the dirs created automaticali ? (I prefer no) -}; - - -## -# *** Sources -# http://www.balabit.hu/static/syslog-ng/reference/reference.html#AEN180 -## - -source src { - unix-stream("/dev/log" # sockets, max 20 conn. at once -# max-connections(20) - ); - internal(); # messages from syslog itselfs - -}; - -source s_kern { - file("/proc/kmsg"); # kernel msg -}; - - -## Receiving data from net -# it's easy to collect data from net ... - -#source s_tcp { -# tcp(ip(127.0.0.1) port(1999) max-connections(10)); -#}; - -#source s_udp { -# udp(); -#}; - - - -## -# *** Destinations -# http://www.balabit.hu/static/syslog-ng/reference/x354.html -## - -## Log ALL -destination d_full { - file("/var/log/full/full_$YEAR-$MONTH-$DAY.log" - create_dirs(yes) - ); -}; - -destination d_fullhosts { - file("/var/log/full/$HOST/$HOST-$ISODATE.log" - create_dirs(yes) - ); -}; - -destination d_kern { file("/var/log/kmsg-kern.log" - perm(0600) - ); -}; -destination d_named { file("/var/log/full/service/named-$YEAR$MONTH$DAY.log" - create_dirs(yes) - ); -}; -destination d_proftpd { file("/var/log/full/service/proftpd-$YEAR$MONTH$DAY.log" - create_dirs(yes) - ); -}; -destination d_sshd { file("/var/log/full/service/sshd-$YEAR$MONTH$DAY.log" - create_dirs(yes) - ); -}; -destination d_imap { file("/var/log/full/service/imap-$YEAR$MONTH$DAY.log" - create_dirs(yes) - ); -}; -destination d_pop3 { file("/var/log/full/service/pop3-$YEAR$MONTH$DAY.log" - create_dirs(yes) - ); -}; - -destination d_postfix { file("/var/log/full/service/postfix-$YEAR$MONTH$DAY.log" - create_dirs(yes) - ); -}; - -destination d_syslogng { file("/var/log/full/service/syslogng-$YEAR$MONTH$DAY.log" - create_dirs(yes) - ); -}; - -## Default destinations - -destination authlog { file("/var/log/auth.log" create_dirs(yes) ); }; -#destination syslog { file("/var/log/syslog" create_dirs(yes) ); }; -destination cron { file("/var/log/cron.log" create_dirs(yes) );}; -destination daemon { file("/var/log/daemon.log" create_dirs(yes) );}; -destination kern { file("/var/log/kern.log" create_dirs(yes) );}; -destination lpr { file("/var/log/lpr.log" create_dirs(yes) );}; -destination user { file("/var/log/user.log" create_dirs(yes) );}; -destination uucp { file("/var/log/uucp.log" create_dirs(yes) );}; -# In general - peoples don't have ppp facility in kernel - if yes - uncoment this -#destination ppp { file("/var/log/ppp.log" create_dirs(yes) );}; -destination mail { file("/var/log/mail.log" create_dirs(yes) );}; - -destination mailinfo { file("/var/log/mail.info" create_dirs(yes) );}; -destination mailwarn { file("/var/log/mail.warn" create_dirs(yes) );}; -destination mailerr { file("/var/log/mail.err" create_dirs(yes) );}; - -destination newscrit { file("/var/log/news/news.crit" create_dirs(yes) );}; -destination newserr { file("/var/log/news/news.err" create_dirs(yes) );}; -destination newsnotice { file("/var/log/news/news.notice" create_dirs(yes) );}; - -destination debug { file("/var/log/debug" create_dirs(yes) );}; -destination messages { file("/var/log/messages" create_dirs(yes) );}; -destination console { usertty("root");}; -destination console_all { file("/dev/tty12" create_dirs(yes) );}; -#destination loghost { udp("loghost" port(999)); }; - -destination xconsole { pipe("/dev/xconsole"); }; - - -## -# *** Filters -# http://www.balabit.hu/static/syslog-ng/reference/x567.html -## - -# - -filter f_named { match("named"); }; -filter f_postfix { match("postfix"); }; -filter f_proftpd { match("proftpd"); }; -filter f_sshd { match("sshd"); }; -filter f_imap { match("imapd"); }; -filter f_pop3 { match("pop3"); }; -filter f_syslogng { match("syslog-ng"); }; -filter f_full { not filter(f_named) - and not filter(f_postfix); -}; - -# default - -filter f_auth { facility(auth); }; -filter f_authpriv { facility(auth, authpriv); }; -filter f_syslog { not facility(authpriv, mail) - and not filter(f_named) - and not filter(f_postfix); -}; -filter f_cron { facility(cron); }; -filter f_daemon { facility(daemon) - and not filter(f_named) - and not filter(f_postfix); -}; -filter f_kern { facility(kern); }; -filter f_lpr { facility(lpr); }; -filter f_mail { facility(mail); }; -filter f_user { facility(user); }; -filter f_uucp { facility(cron); }; -# In general - peoples don't have ppp facility in kernel - if yes - uncoment this -#filter f_ppp { facility(ppp); }; -filter f_news { facility(news); }; -filter f_debug { not facility(auth, authpriv, news, mail) - and not filter(f_named) - and not filter(f_postfix); -}; - -filter f_messages { - level(info..warn) - and not facility(auth, authpriv, mail, news) - and not filter(f_named) - and not filter(f_postfix); -}; - -filter f_emergency { level(emerg); }; - -filter f_info { level(info); }; -filter f_notice { level(notice); }; -filter f_warn { level(warn); }; -filter f_crit { level(crit); }; -filter f_err { level(err); }; - - -## -# *** Connections between filters and destinations -# http://www.balabit.hu/static/syslog-ng/reference/logpath.html -## - -# - -log { source(src); destination(d_full); }; -log { source(src); filter(f_full); destination(d_fullhosts); }; -log { source(s_kern); destination(d_kern); }; -log { source(src); filter(f_proftpd); destination(d_proftpd); }; -log { source(src); filter(f_postfix); destination(d_postfix); }; -log { source(src); filter(f_syslogng); destination(d_syslogng); }; -log { source(src); filter(f_sshd); destination(d_sshd); }; -log { source(src); filter(f_imap); destination(d_imap); }; -log { source(src); filter(f_pop3); destination(d_pop3); }; -log { source(src); filter(f_named); destination(d_named); }; - -# defaults - -log { source(src); filter(f_authpriv); destination(authlog); }; -#log { source(src); filter(f_syslog); destination(syslog); }; -log { source(src); filter(f_cron); destination(cron); }; -log { source(src); filter(f_daemon); destination(daemon); }; -log { source(src); filter(f_kern); destination(kern); }; -log { source(src); filter(f_lpr); destination(lpr); }; -log { source(src); filter(f_mail); destination(mail); }; -log { source(src); filter(f_user); destination(user); }; -log { source(src); filter(f_uucp); destination(uucp); }; -log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); }; -log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); }; -log { source(src); filter(f_mail); filter(f_err); destination(mailerr); }; -log { source(src); filter(f_news); filter(f_crit); destination(newscrit); }; -log { source(src); filter(f_news); filter(f_err); destination(newserr); }; -log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); }; -log { source(src); filter(f_debug); destination(debug); }; -log { source(src); filter(f_messages); destination(messages); }; -log { source(src); filter(f_emergency); destination(console); }; -# In general - peoples don't have ppp facility in kernel - if yes - uncoment this -#log { source(src); filter(f_ppp); destination(ppp); }; -log { source(src); destination(console_all); }; - - diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY index d96c68e098..dae9dd3dcf 100644 --- a/x11-toolkits/qt4/HISTORY +++ b/x11-toolkits/qt4/HISTORY @@ -1,3 +1,6 @@ +2010-11-29 Ladislav Hagara <hgr@vabo.cz> + * PRE_BUILD, ca2e8b6dc176576f7217f4b7209994eddad1a358.patch: #15905 + 2010-11-10 Bor Kraljič <pyrobor@ver.si> * DETAILS: updated spell to 4.7.1 diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD index 92fff5e45e..59adc96c0a 100755 --- a/x11-toolkits/qt4/PRE_BUILD +++ b/x11-toolkits/qt4/PRE_BUILD @@ -1,5 +1,7 @@ default_pre_build && cd $SOURCE_DIRECTORY && +patch -p1 < $SPELL_DIRECTORY/ca2e8b6dc176576f7217f4b7209994eddad1a358.patch && + # fix bad .pro file for 4.6.0-beta1 for file in tools/assistant/tools/{qhelpgenerator,qcollectiongenerator,qhelpconverter,assistant}/*.pro; do echo "LIBS += -lQtCLucene" >> $file || return 1 diff --git a/x11-toolkits/qt4/ca2e8b6dc176576f7217f4b7209994eddad1a358.patch b/x11-toolkits/qt4/ca2e8b6dc176576f7217f4b7209994eddad1a358.patch new file mode 100644 index 0000000000..30d7ba0444 --- /dev/null +++ b/x11-toolkits/qt4/ca2e8b6dc176576f7217f4b7209994eddad1a358.patch @@ -0,0 +1,37 @@ +From ca2e8b6dc176576f7217f4b7209994eddad1a358 Mon Sep 17 00:00:00 2001 +From: Mike McQuaid <mike@mikemcquaid.com> +Date: Thu, 18 Nov 2010 05:40:36 +0000 +Subject: [PATCH] Check correctly before including SSE4.2 header. + +Previously, this failed machines that only had SSE4.1 but not +SSE4.2 due to an assumption that nmmintrin.h could be included +when only using SSE4.1. + +Fixes http://bugreports.qt.nokia.com/browse/QTBUG-13623. +--- + src/corelib/tools/qsimd_p.h | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h +index 664543b..08da700 100644 +--- a/src/corelib/tools/qsimd_p.h ++++ b/src/corelib/tools/qsimd_p.h +@@ -87,9 +87,13 @@ QT_BEGIN_HEADER + #include <tmmintrin.h> + #endif + +-// SSE4.1 and SSE4.2 intrinsics +-#if (defined(QT_HAVE_SSE4_1) || defined(QT_HAVE_SSE4_2)) && (defined(__SSE4_1__) || defined(Q_CC_MSVC)) ++// SSE4.1 intrinsics ++#if defined(QT_HAVE_SSE4_1) && (defined(__SSE4_1__) || defined(Q_CC_MSVC)) + #include <smmintrin.h> ++#endif ++ ++// SSE4.2 intrinsics ++#if defined(QT_HAVE_SSE4_2) && (defined(__SSE4_2__) || defined(Q_CC_MSVC)) + #include <nmmintrin.h> + #endif + +-- +1.6.1 + |