From 0892e4cfda22737a005f31597aa2f2b5ccdad52c Mon Sep 17 00:00:00 2001 From: Phantom X Date: Sun, 22 Jun 2014 21:38:35 -0300 Subject: [PATCH] ffms2, gajim, kmymoney, libgit2, libreoffce, mpg123, networkmanager, phonon*, rsync --- ChangeLog.All | 51 ++ _pasture/README | 1 + .../phonon-backend-mplayer}/.gitignore | 0 .../phonon-backend-mplayer}/ChangeLog.SB | 0 .../phonon-backend-mplayer-snapshot.sh | 0 .../phonon-backend-mplayer.SlackBuild | 0 .../phonon-backend-mplayer}/slack-desc | 0 .../phonon-backend-mplayer}/slack-required | 0 ffms2/ChangeLog.SB | 4 + ffms2/ffms2.SlackBuild | 2 +- gajim/ChangeLog.SB | 4 + gajim/gajim.SlackBuild | 7 +- gajim/slack-required | 1 + kde-apps/kmymoney/ChangeLog.SB | 4 + kde-apps/kmymoney/kmymoney.SlackBuild | 4 +- kde/kdelibs/ChangeLog.SB | 4 + kde/kdelibs/apply-patches.sh | 6 +- kde/kdelibs/kdelibs.SlackBuild | 2 +- ...l-loading-of-DTD-and-entities-no-mor.patch | 36 + ...require-a-job-to-handle-messageboxes.patch | 58 ++ ...d2a069f270507a6c8020688582a47babbcc83.diff | 22 + ...073c60f6cc8df1320460fbf94adae9e7b5254.diff | 70 ++ kde/kdelibs/patches/kdelibs-giflib51.patch | 39 -- libgit2/ChangeLog.SB | 4 + libgit2/libgit2.SlackBuild | 2 +- .../libreoffice-langpack-pt_BR/ChangeLog.SB | 4 + .../libreoffice-langpack-pt_BR.SlackBuild | 2 +- libreoffice/ChangeLog.SB | 4 + libreoffice/libreoffice.SlackBuild | 2 +- .../ChangeLog.SB | 4 + .../firefox-classic-theme-restorer.SlackBuild | 2 +- mpg123/ChangeLog.SB | 4 + mpg123/mpg123-compat32.SlackBuild | 2 +- mpg123/mpg123.SlackBuild | 2 +- networkmanager/ChangeLog.SB | 4 + networkmanager/apply-patches.sh | 5 +- networkmanager/networkmanager.SlackBuild | 2 +- .../patches/rh978435-dns-none.patch | 584 --------------- perl-modules/perl-image-exiftool/ChangeLog.SB | 4 + .../perl-image-exiftool.SlackBuild | 4 +- phonon-backend-gstreamer/ChangeLog.SB | 4 + .../phonon-backend-gstreamer.SlackBuild | 6 +- phonon-backend-vlc/ChangeLog.SB | 4 + .../phonon-backend-vlc.SlackBuild | 6 +- phonon/ChangeLog.SB | 4 + phonon/apply-patches.sh | 6 +- ...m-kdelibs-master-to-unbreak-build-wi.patch | 662 ------------------ ...ckendchanged-when-we-have-no-backend.patch | 30 - ...dir-resolution-workaround-from-CMake.patch | 64 ++ phonon/patches/phonon-4.7.0-rootDir.patch | 12 - phonon/phonon.SlackBuild | 4 +- python-modules/python-modules-order.txt | 1 + python-modules/python-nbxmpp/ChangeLog.SB | 4 + .../python-nbxmpp/python-nbxmpp.SlackBuild | 195 ++++++ python-modules/python-nbxmpp/slack-desc | 12 + python-modules/python-nbxmpp/slack-required | 3 + rsync/ChangeLog.SB | 4 + rsync/rsync.SlackBuild | 4 +- tvheadend/tvheadend.SlackBuild | 20 +- tvheadend/tvheadend.service | 3 + xorg/libva/ChangeLog.SB | 4 + xorg/libva/apply-patches.sh | 2 + xorg/libva/libva-compat32.SlackBuild | 2 +- xorg/libva/libva.SlackBuild | 2 +- ...playContext-at-the-end-of-vaTerminat.patch | 38 + 65 files changed, 676 insertions(+), 1370 deletions(-) rename {phonon-backend-mplayer => _pasture/phonon-backend-mplayer}/.gitignore (100%) rename {phonon-backend-mplayer => _pasture/phonon-backend-mplayer}/ChangeLog.SB (100%) rename {phonon-backend-mplayer => _pasture/phonon-backend-mplayer}/phonon-backend-mplayer-snapshot.sh (100%) rename {phonon-backend-mplayer => _pasture/phonon-backend-mplayer}/phonon-backend-mplayer.SlackBuild (100%) rename {phonon-backend-mplayer => _pasture/phonon-backend-mplayer}/slack-desc (100%) rename {phonon-backend-mplayer => _pasture/phonon-backend-mplayer}/slack-required (100%) create mode 100644 kde/kdelibs/patches/0006-Do-not-set-global-loading-of-DTD-and-entities-no-mor.patch create mode 100644 kde/kdelibs/patches/0008-Don-t-require-a-job-to-handle-messageboxes.patch create mode 100644 kde/kdelibs/patches/changeset_r0ded2a069f270507a6c8020688582a47babbcc83.diff create mode 100644 kde/kdelibs/patches/changeset_r40e073c60f6cc8df1320460fbf94adae9e7b5254.diff delete mode 100644 kde/kdelibs/patches/kdelibs-giflib51.patch delete mode 100644 networkmanager/patches/rh978435-dns-none.patch delete mode 100644 phonon/patches/0003-sync-FindQt4-from-kdelibs-master-to-unbreak-build-wi.patch delete mode 100644 phonon/patches/0004-don-t-emit-backendchanged-when-we-have-no-backend.patch create mode 100644 phonon/patches/import-relative-dir-resolution-workaround-from-CMake.patch delete mode 100644 phonon/patches/phonon-4.7.0-rootDir.patch create mode 100644 python-modules/python-nbxmpp/ChangeLog.SB create mode 100755 python-modules/python-nbxmpp/python-nbxmpp.SlackBuild create mode 100644 python-modules/python-nbxmpp/slack-desc create mode 100644 python-modules/python-nbxmpp/slack-required create mode 100644 xorg/libva/patches/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch diff --git a/ChangeLog.All b/ChangeLog.All index 6ef112a19c..2168e4e791 100644 --- a/ChangeLog.All +++ b/ChangeLog.All @@ -1,3 +1,54 @@ +Sun Jun 22 19:28:37 BRT 2014 +rsync-3.1.1-x86_64-1xinc.txz ++--------------------------+ +Sun Jun 22 18:53:41 BRT 2014 +networkmanager-0.9.9.98-x86_64-1xinc.txz ++--------------------------+ +Sun Jun 22 03:49:44 BRT 2014 +mpg123-1.20.1-x86_64-1xinc.txz ++--------------------------+ +Sat Jun 21 13:05:00 BRT 2014 +firefox-classic-theme-restorer-1.2.1-noarch-1xinc.txz ++--------------------------+ +Sat Jun 21 12:15:03 BRT 2014 +python-nbxmpp-0.4-x86_64-1xinc.txz ++--------------------------+ +Sat Jun 21 12:02:04 BRT 2014 +gajim-0.16.rc1-x86_64-1xinc.txz ++--------------------------+ +Sat Jun 21 11:55:25 BRT 2014 +ffms2-2.20-x86_64-1xinc.txz ++--------------------------+ +Sat Jun 21 04:18:40 BRT 2014 +perl-image-exiftool-9.65-noarch-1xinc.txz ++--------------------------+ +Fri Jun 20 19:52:29 BRT 2014 +kmymoney-4.6.6-x86_64-1xinc.txz ++--------------------------+ +Fri Jun 20 18:04:07 BRT 2014 +kdelibs-4.13.2-x86_64-3xinc.txz ++--------------------------+ +Fri Jun 20 17:57:36 BRT 2014 +libgit2-0.21.0-x86_64-1xinc.txz ++--------------------------+ +Fri Jun 20 17:52:29 BRT 2014 +libva-1.3.1-x86_64-2xinc.txz ++--------------------------+ +Fri Jun 20 17:42:42 BRT 2014 +libreoffice-langpack-pt_BR-4.2.5-x86_64-1xinc.txz ++--------------------------+ +Fri Jun 20 17:42:14 BRT 2014 +libreoffice-4.2.5-x86_64-1xinc.txz ++--------------------------+ +Fri Jun 20 17:37:04 BRT 2014 +phonon-backend-vlc-0.7.2-x86_64-1xinc.txz ++--------------------------+ +Fri Jun 20 17:33:05 BRT 2014 +phonon-backend-gstreamer-4.7.2-x86_64-1xinc.txz ++--------------------------+ +Fri Jun 20 17:28:49 BRT 2014 +phonon-4.7.2-x86_64-1xinc.txz ++--------------------------+ Thu Jun 19 23:07:20 BRT 2014 lincity-ng-2.9.beta-x86_64-1xinc.txz +--------------------------+ diff --git a/_pasture/README b/_pasture/README index 27bff7c7ae..a57c53bf31 100644 --- a/_pasture/README +++ b/_pasture/README @@ -240,6 +240,7 @@ perl-modules/perl-xml-dom - Unneeded perl-modules/perl-xml-grove - Unneeded perl-modules/perl-xml-regexp - Unneeded perl-modules/perl-xml-twig - perl-net-dbus +phonon-backend-mplayer - Seems to be dead. phonon-backend-xine - Deprecated. php-gtk - Uneeded plpa - Uneeded diff --git a/phonon-backend-mplayer/.gitignore b/_pasture/phonon-backend-mplayer/.gitignore similarity index 100% rename from phonon-backend-mplayer/.gitignore rename to _pasture/phonon-backend-mplayer/.gitignore diff --git a/phonon-backend-mplayer/ChangeLog.SB b/_pasture/phonon-backend-mplayer/ChangeLog.SB similarity index 100% rename from phonon-backend-mplayer/ChangeLog.SB rename to _pasture/phonon-backend-mplayer/ChangeLog.SB diff --git a/phonon-backend-mplayer/phonon-backend-mplayer-snapshot.sh b/_pasture/phonon-backend-mplayer/phonon-backend-mplayer-snapshot.sh similarity index 100% rename from phonon-backend-mplayer/phonon-backend-mplayer-snapshot.sh rename to _pasture/phonon-backend-mplayer/phonon-backend-mplayer-snapshot.sh diff --git a/phonon-backend-mplayer/phonon-backend-mplayer.SlackBuild b/_pasture/phonon-backend-mplayer/phonon-backend-mplayer.SlackBuild similarity index 100% rename from phonon-backend-mplayer/phonon-backend-mplayer.SlackBuild rename to _pasture/phonon-backend-mplayer/phonon-backend-mplayer.SlackBuild diff --git a/phonon-backend-mplayer/slack-desc b/_pasture/phonon-backend-mplayer/slack-desc similarity index 100% rename from phonon-backend-mplayer/slack-desc rename to _pasture/phonon-backend-mplayer/slack-desc diff --git a/phonon-backend-mplayer/slack-required b/_pasture/phonon-backend-mplayer/slack-required similarity index 100% rename from phonon-backend-mplayer/slack-required rename to _pasture/phonon-backend-mplayer/slack-required diff --git a/ffms2/ChangeLog.SB b/ffms2/ChangeLog.SB index bfbfc19494..c9a7edc62f 100644 --- a/ffms2/ChangeLog.SB +++ b/ffms2/ChangeLog.SB @@ -1,3 +1,7 @@ +Sat Jun 21 11:55:25 BRT 2014 +ffms2-2.20-x86_64-1xinc.txz: + Updated to 2.20. ++--------------------------+ Wed Apr 9 19:47:07 BRT 2014 ffms2-2.19.1-x86_64-1xinc.txz: Updated to 2.19.1. diff --git a/ffms2/ffms2.SlackBuild b/ffms2/ffms2.SlackBuild index b5bb0c5dcd..0156cd7a48 100755 --- a/ffms2/ffms2.SlackBuild +++ b/ffms2/ffms2.SlackBuild @@ -44,7 +44,7 @@ fi NAME=ffms2 PKG=${PKG:-${TMP}/package-${NAME}} -VERSION=${VERSION:-2.19.1} +VERSION=${VERSION:-2.20} if [ "${SB_NATIVE}" = "YES" ] ;then ARCH=${ARCH:-$(uname -m)} else diff --git a/gajim/ChangeLog.SB b/gajim/ChangeLog.SB index 26a14e332b..e576d02ca4 100644 --- a/gajim/ChangeLog.SB +++ b/gajim/ChangeLog.SB @@ -1,3 +1,7 @@ +Sat Jun 21 12:02:04 BRT 2014 +gajim-0.16.rc1-x86_64-1xinc.txz: + Updated to 0.16-rc1. ++--------------------------+ Wed Aug 29 17:52:35 BRT 2012 gajim-0.15.1-x86_64-1xinc.tgz: Updated to 0.15.1. diff --git a/gajim/gajim.SlackBuild b/gajim/gajim.SlackBuild index cf916f0f3a..2430c9823e 100755 --- a/gajim/gajim.SlackBuild +++ b/gajim/gajim.SlackBuild @@ -3,7 +3,7 @@ # Build script by Phantom X # Suggested usage: $ gajim.SlackBuild 2>&1 | tee build.log #-- -# Copyright 2008-2012 Phantom X, Goiania, Brazil. +# Copyright 2008-2014 Phantom X, Goiania, Brazil. # Copyright 2006 Martijn Dekker, Groningen, Netherlands. # # Redistribution and use of this script, with or without modification, is @@ -43,8 +43,8 @@ fi NAME=gajim PKG=${PKG:-${TMP}/package-${NAME}} -VERSION=${VERSION:-0.15.1} -SVER=$(echo ${VERSION} | cut -d . -f1-2) +VERSION=${VERSION:-0.16-rc1} +SVER=$(echo ${VERSION} | cut -d- -f1 | cut -d . -f1-2) if [ "${SB_NATIVE}" = "YES" ] ;then ARCH=${ARCH:-$(uname -m)} else @@ -211,6 +211,7 @@ fi # Build package: set +o xtrace # no longer print commands upon execution +set -e ROOTCOMMANDS="set -o errexit -o xtrace ; cd ${PKG} ; /bin/chown --recursive root:root . ;" diff --git a/gajim/slack-required b/gajim/slack-required index d3d51dc40c..63f9217a4a 100644 --- a/gajim/slack-required +++ b/gajim/slack-required @@ -10,4 +10,5 @@ python-crypto >= 2.2 python-docutils >= 0.5 python-gnupginterface >= 0.3.2 python-libasyncns >= 0.7.1 +python-nbxmpp >= 0.4 python-sexy >= 0.1.9 diff --git a/kde-apps/kmymoney/ChangeLog.SB b/kde-apps/kmymoney/ChangeLog.SB index 49668ca212..763ef32963 100644 --- a/kde-apps/kmymoney/ChangeLog.SB +++ b/kde-apps/kmymoney/ChangeLog.SB @@ -1,3 +1,7 @@ +Fri Jun 20 19:52:29 BRT 2014 +kmymoney-4.6.6-x86_64-1xinc.txz: + Updated to 4.6.6. ++--------------------------+ Sat Oct 5 13:46:54 BRT 2013 kmymoney-4.6.4-x86_64-1xinc.txz: Updated to 4.6.4. diff --git a/kde-apps/kmymoney/kmymoney.SlackBuild b/kde-apps/kmymoney/kmymoney.SlackBuild index 7bd2bd322b..39894b5e1f 100755 --- a/kde-apps/kmymoney/kmymoney.SlackBuild +++ b/kde-apps/kmymoney/kmymoney.SlackBuild @@ -3,7 +3,7 @@ # Build script by Phantom X # Suggested usage: $ kmymoney.SlackBuild 2>&1 | tee build.log #-- -# Copyright 2008-2013 Phantom X, Goiania, Brazil. +# Copyright 2008-2014 Phantom X, Goiania, Brazil. # Copyright 2006 Martijn Dekker, Groningen, Netherlands. # # Redistribution and use of this script, with or without modification, is @@ -43,7 +43,7 @@ fi NAME=kmymoney PKG=${PKG:-${TMP}/package-${NAME}} -VERSION=${VERSION:-4.6.5} +VERSION=${VERSION:-4.6.6} RVER=$(echo ${VERSION} | cut -d- -f1) if [ "${SB_NATIVE}" = "YES" ] ;then ARCH=${ARCH:-$(uname -m)} diff --git a/kde/kdelibs/ChangeLog.SB b/kde/kdelibs/ChangeLog.SB index 7d61426b26..0f4fbc0850 100644 --- a/kde/kdelibs/ChangeLog.SB +++ b/kde/kdelibs/ChangeLog.SB @@ -1,3 +1,7 @@ +Fri Jun 20 18:04:07 BRT 2014 +kdelibs-4.13.2-x86_64-3xinc.txz: + Rebuilt. ++--------------------------+ Sat Jun 14 11:35:57 BRT 2014 kdelibs-4.13.2-x86_64-2xinc.txz: Rebuilt. diff --git a/kde/kdelibs/apply-patches.sh b/kde/kdelibs/apply-patches.sh index 000ddedc36..ee1f7b095b 100644 --- a/kde/kdelibs/apply-patches.sh +++ b/kde/kdelibs/apply-patches.sh @@ -62,11 +62,13 @@ patch -p1 --verbose --backup -i ${SB_PATCHDIR}/kdelibs-4.11.3-klauncher-no-glib. # Gentoo/Mandriva patch -p1 --verbose --backup -i ${SB_PATCHDIR}/kdelibs-4.6.3-no_suid_kdeinit.patch -patch -p0 --verbose --backup -i ${SB_PATCHDIR}/kdelibs-giflib51.patch - # official backports # Branch upstream +patch -p1 --verbose --backup -i ${SB_PATCHDIR}/0006-Do-not-set-global-loading-of-DTD-and-entities-no-mor.patch +patch -p1 --verbose --backup -i ${SB_PATCHDIR}/0008-Don-t-require-a-job-to-handle-messageboxes.patch +patch -p1 --verbose --backup -i ${SB_PATCHDIR}/changeset_r0ded2a069f270507a6c8020688582a47babbcc83.diff +patch -p1 --verbose --backup -i ${SB_PATCHDIR}/changeset_r40e073c60f6cc8df1320460fbf94adae9e7b5254.diff # revert these commits for #https://bugs.kde.org/315578 diff --git a/kde/kdelibs/kdelibs.SlackBuild b/kde/kdelibs/kdelibs.SlackBuild index 141b728e98..f522158590 100755 --- a/kde/kdelibs/kdelibs.SlackBuild +++ b/kde/kdelibs/kdelibs.SlackBuild @@ -55,7 +55,7 @@ else SLKTARGET=${SLKTARGET:-i486} fi SLKDIST=${SLKDIST:-Slackware} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))} DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION} SBDIR=${PKG}/usr/src/slackbuilds/kde/${NAME} diff --git a/kde/kdelibs/patches/0006-Do-not-set-global-loading-of-DTD-and-entities-no-mor.patch b/kde/kdelibs/patches/0006-Do-not-set-global-loading-of-DTD-and-entities-no-mor.patch new file mode 100644 index 0000000000..974eab1757 --- /dev/null +++ b/kde/kdelibs/patches/0006-Do-not-set-global-loading-of-DTD-and-entities-no-mor.patch @@ -0,0 +1,36 @@ +From 684bb98b31d338d85e1e6089cac381a507a5b4d8 Mon Sep 17 00:00:00 2001 +From: Luigi Toscano +Date: Fri, 13 Jun 2014 02:41:50 +0200 +Subject: [PATCH 06/12] Do not set global loading of DTD and entities, no more + needed + +The global settings have been replaced by the fine-grained +parameters passed to xmlReadFile. +Moreover a libxml2 regression prevents those parameters from +being used when the patch for CVE-2014-0191 is applied, see +https://bugzilla.gnome.org/show_bug.cgi?id=730290 +A new libxml2 patch is going to be deployed soon, but anyway +this code works even without setting those parameters. + +CCBUG: 335001 +--- + kdoctools/meinproc.cpp | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp +index 0467f22..de4fbc8 100644 +--- a/kdoctools/meinproc.cpp ++++ b/kdoctools/meinproc.cpp +@@ -157,9 +157,6 @@ int main(int argc, char **argv) { + } + } + +- xmlSubstituteEntitiesDefault(1); +- xmlLoadExtDtdDefaultValue = 1; +- + QVector params; + #ifndef Q_WS_WIN + // libxslt parses the path given to outputFile as XPath expression which fails +-- +1.8.3.1 + diff --git a/kde/kdelibs/patches/0008-Don-t-require-a-job-to-handle-messageboxes.patch b/kde/kdelibs/patches/0008-Don-t-require-a-job-to-handle-messageboxes.patch new file mode 100644 index 0000000000..7cad92250e --- /dev/null +++ b/kde/kdelibs/patches/0008-Don-t-require-a-job-to-handle-messageboxes.patch @@ -0,0 +1,58 @@ +From bbae87dc1be3ae063796a582774bd5642cacdd5d Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Wed, 18 Jun 2014 20:29:04 +0200 +Subject: [PATCH 08/12] Don't require a job to handle messageboxes. + +The POP3 ioslave doesn't have a job when it gets here. +--- + kio/kio/usernotificationhandler.cpp | 27 +++++++++++++-------------- + 1 file changed, 13 insertions(+), 14 deletions(-) + +diff --git a/kio/kio/usernotificationhandler.cpp b/kio/kio/usernotificationhandler.cpp +index 10043cf..2b2e091 100644 +--- a/kio/kio/usernotificationhandler.cpp ++++ b/kio/kio/usernotificationhandler.cpp +@@ -19,7 +19,7 @@ + #include "usernotificationhandler_p.h" + + #include "slave.h" +-#include "job_p.h" ++#include "jobuidelegate.h" + + #include + +@@ -76,19 +76,18 @@ void UserNotificationHandler::processRequest() + + if (m_cachedResults.contains(key)) { + result = *(m_cachedResults[key]); +- } else if (r->slave->job()) { +- SimpleJobPrivate* jobPrivate = SimpleJobPrivate::get(r->slave->job()); +- if (jobPrivate) { +- result = jobPrivate->requestMessageBox(r->type, +- r->data.value(MSG_TEXT).toString(), +- r->data.value(MSG_CAPTION).toString(), +- r->data.value(MSG_YES_BUTTON_TEXT).toString(), +- r->data.value(MSG_NO_BUTTON_TEXT).toString(), +- r->data.value(MSG_YES_BUTTON_ICON).toString(), +- r->data.value(MSG_NO_BUTTON_ICON).toString(), +- r->data.value(MSG_DONT_ASK_AGAIN).toString(), +- r->data.value(MSG_META_DATA).toMap()); +- } ++ } else { ++ JobUiDelegate ui; ++ const JobUiDelegate::MessageBoxType type = static_cast(r->type); ++ result = ui.requestMessageBox(type, ++ r->data.value(MSG_TEXT).toString(), ++ r->data.value(MSG_CAPTION).toString(), ++ r->data.value(MSG_YES_BUTTON_TEXT).toString(), ++ r->data.value(MSG_NO_BUTTON_TEXT).toString(), ++ r->data.value(MSG_YES_BUTTON_ICON).toString(), ++ r->data.value(MSG_NO_BUTTON_ICON).toString(), ++ r->data.value(MSG_DONT_ASK_AGAIN).toString(), ++ r->data.value(MSG_META_DATA).toMap()); + m_cachedResults.insert(key, new int(result)); + } + } else { +-- +1.8.3.1 + diff --git a/kde/kdelibs/patches/changeset_r0ded2a069f270507a6c8020688582a47babbcc83.diff b/kde/kdelibs/patches/changeset_r0ded2a069f270507a6c8020688582a47babbcc83.diff new file mode 100644 index 0000000000..ce6db57e88 --- /dev/null +++ b/kde/kdelibs/patches/changeset_r0ded2a069f270507a6c8020688582a47babbcc83.diff @@ -0,0 +1,22 @@ +commit 0ded2a069f270507a6c8020688582a47babbcc83 +Author: David Faure +Date: Wed Jun 18 20:29:53 2014 +0200 + + Handle unexpected return values here (such as -1). + + Patch by Jim Scadden, jims at silentasylum.co.uk + +diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp +index 2af99bf..cdf28f0 100644 +--- a/kio/kio/tcpslavebase.cpp ++++ b/kio/kio/tcpslavebase.cpp +@@ -824,6 +824,9 @@ TCPSlaveBase::SslResult TCPSlaveBase::verifyServerCertificate() + messageBox(SSLMessageBox /*the SSL info dialog*/, d->host); + } else if (msgResult == KMessageBox::Cancel) { + return ResultFailed; ++ } else if (msgResult != KMessageBox::No) { ++ kWarning() << "Unexpected MessageBox response received:" << msgResult; ++ return ResultFailed; + } + //fall through on KMessageBox::No + } while (msgResult == KMessageBox::Yes); diff --git a/kde/kdelibs/patches/changeset_r40e073c60f6cc8df1320460fbf94adae9e7b5254.diff b/kde/kdelibs/patches/changeset_r40e073c60f6cc8df1320460fbf94adae9e7b5254.diff new file mode 100644 index 0000000000..e149efff1e --- /dev/null +++ b/kde/kdelibs/patches/changeset_r40e073c60f6cc8df1320460fbf94adae9e7b5254.diff @@ -0,0 +1,70 @@ +commit 40e073c60f6cc8df1320460fbf94adae9e7b5254 +Author: Milian Wolff +Date: Wed Jun 18 13:27:50 2014 +0200 + + Fix compile with giflib-5.1.0 and upwards. + + See news about the giflib-5.1.0 release about the API break here: + http://fossies.org/linux/giflib/NEWS + + REVIEW: 118811 + + (cherry picked from commit 7c7a47575f1f57b5c0cc704826a5e5059939bbae) + +diff --git a/khtml/imload/decoders/gifloader.cpp b/khtml/imload/decoders/gifloader.cpp +index 6c61ff5..09645a8 100644 +--- a/khtml/imload/decoders/gifloader.cpp ++++ b/khtml/imload/decoders/gifloader.cpp +@@ -52,6 +52,16 @@ extern "C" { + + // #define DEBUG_GIFLOADER + ++static void closeGif(GifFileType* file) ++{ ++#if GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) ++ int errorCode; ++ DGifCloseFile(file, &errorCode); ++#else ++ DGifCloseFile(file); ++#endif ++} ++ + namespace khtmlImLoad { + + static int INTERLACED_OFFSET[] = { 0, 4, 2, 1 }; +@@ -369,7 +379,7 @@ public: + + if (DGifSlurp(file) == GIF_ERROR) + { +- DGifCloseFile(file); ++ closeGif(file); + return Error; + } + +@@ -378,7 +388,7 @@ public: + if (file->ImageCount > 1) { + // Verify it.. + if (!ImageManager::isAcceptableSize(file->SWidth, file->SHeight)) { +- DGifCloseFile(file); ++ closeGif(file); + return Error; + } + notifyImageInfo(file->SWidth, file->SHeight); +@@ -390,7 +400,7 @@ public: + //Extract colormap, geometry, so that we can create the frame + SavedImage* curFrame = &file->SavedImages[frame]; + if (!ImageManager::isAcceptableSize(curFrame->ImageDesc.Width, curFrame->ImageDesc.Height)) { +- DGifCloseFile(file); ++ closeGif(file); + return Error; + } + } +@@ -576,7 +586,7 @@ public: + frame0->animProvider = new GIFAnimProvider(frame0, image, frameProps, bgColor); + } + +- DGifCloseFile(file); ++ closeGif(file); + + return Done; + } diff --git a/kde/kdelibs/patches/kdelibs-giflib51.patch b/kde/kdelibs/patches/kdelibs-giflib51.patch deleted file mode 100644 index 2aa73f5231..0000000000 --- a/kde/kdelibs/patches/kdelibs-giflib51.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up khtml/imload/decoders/gifloader.cpp.giflib khtml/imload/decoders/gifloader.cpp ---- khtml/imload/decoders/gifloader.cpp.giflib 2014-06-08 10:41:32.000000000 -0300 -+++ khtml/imload/decoders/gifloader.cpp 2014-06-14 11:33:42.406279776 -0300 -@@ -369,7 +369,7 @@ public: - - if (DGifSlurp(file) == GIF_ERROR) - { -- DGifCloseFile(file); -+ DGifCloseFile(file, NULL); - return Error; - } - -@@ -378,7 +378,7 @@ public: - if (file->ImageCount > 1) { - // Verify it.. - if (!ImageManager::isAcceptableSize(file->SWidth, file->SHeight)) { -- DGifCloseFile(file); -+ DGifCloseFile(file, NULL); - return Error; - } - notifyImageInfo(file->SWidth, file->SHeight); -@@ -390,7 +390,7 @@ public: - //Extract colormap, geometry, so that we can create the frame - SavedImage* curFrame = &file->SavedImages[frame]; - if (!ImageManager::isAcceptableSize(curFrame->ImageDesc.Width, curFrame->ImageDesc.Height)) { -- DGifCloseFile(file); -+ DGifCloseFile(file, NULL); - return Error; - } - } -@@ -576,7 +576,7 @@ public: - frame0->animProvider = new GIFAnimProvider(frame0, image, frameProps, bgColor); - } - -- DGifCloseFile(file); -+ DGifCloseFile(file, NULL); - - return Done; - } diff --git a/libgit2/ChangeLog.SB b/libgit2/ChangeLog.SB index e1292e3ae6..58ac1323a5 100644 --- a/libgit2/ChangeLog.SB +++ b/libgit2/ChangeLog.SB @@ -1,3 +1,7 @@ +Fri Jun 20 17:57:36 BRT 2014 +libgit2-0.21.0-x86_64-1xinc.txz: + Updated to 0.21.0. ++--------------------------+ Tue Feb 25 20:21:11 BRT 2014 libgit2-0.20.0-x86_64-1xinc.txz: First SB. diff --git a/libgit2/libgit2.SlackBuild b/libgit2/libgit2.SlackBuild index 16616db6d0..962fa528ec 100755 --- a/libgit2/libgit2.SlackBuild +++ b/libgit2/libgit2.SlackBuild @@ -44,7 +44,7 @@ fi NAME=libgit2 PKG=${PKG:-${TMP}/package-${NAME}} -VERSION=${VERSION:-0.20.0} +VERSION=${VERSION:-0.21.0} if [ "${SB_NATIVE}" = "YES" ] ;then ARCH=${ARCH:-$(uname -m)} else diff --git a/libreoffice-langpacks/libreoffice-langpack-pt_BR/ChangeLog.SB b/libreoffice-langpacks/libreoffice-langpack-pt_BR/ChangeLog.SB index 581ae41e71..2fcf1f7c09 100644 --- a/libreoffice-langpacks/libreoffice-langpack-pt_BR/ChangeLog.SB +++ b/libreoffice-langpacks/libreoffice-langpack-pt_BR/ChangeLog.SB @@ -1,3 +1,7 @@ +Fri Jun 20 17:42:42 BRT 2014 +libreoffice-langpack-pt_BR-4.2.5-x86_64-1xinc.txz: + Updated to 4.2.5. ++--------------------------+ Thu May 8 17:58:23 BRT 2014 libreoffice-langpack-pt_BR-4.2.4-x86_64-1xinc.txz: Updated to 4.2.4. diff --git a/libreoffice-langpacks/libreoffice-langpack-pt_BR/libreoffice-langpack-pt_BR.SlackBuild b/libreoffice-langpacks/libreoffice-langpack-pt_BR/libreoffice-langpack-pt_BR.SlackBuild index f545896143..2aa3344815 100755 --- a/libreoffice-langpacks/libreoffice-langpack-pt_BR/libreoffice-langpack-pt_BR.SlackBuild +++ b/libreoffice-langpacks/libreoffice-langpack-pt_BR/libreoffice-langpack-pt_BR.SlackBuild @@ -43,7 +43,7 @@ RLOLANG="$(echo ${LOLANG//_/-})" NAME=libreoffice-langpack-${LOLANG} PKG=${PKG:-${TMP}/package-${NAME}} -VERSION=${VERSION:-4.2.4} +VERSION=${VERSION:-4.2.5} SVER="$(echo ${VERSION} | cut -d . -f1)" SVER2="$(echo ${VERSION} | cut -d . -f1-2)" SVER3="$(echo ${VERSION} | cut -d _ -f1 | cut -d r -f1)" diff --git a/libreoffice/ChangeLog.SB b/libreoffice/ChangeLog.SB index 4f1dbacf94..25d833fa93 100644 --- a/libreoffice/ChangeLog.SB +++ b/libreoffice/ChangeLog.SB @@ -1,3 +1,7 @@ +Fri Jun 20 17:42:14 BRT 2014 +libreoffice-4.2.5-x86_64-1xinc.txz: + Updated to 4.2.5. ++--------------------------+ Thu May 8 17:57:44 BRT 2014 libreoffice-4.2.4-x86_64-1xinc.txz: Updated to 4.2.4. diff --git a/libreoffice/libreoffice.SlackBuild b/libreoffice/libreoffice.SlackBuild index 531d08bacf..3979e76c6d 100755 --- a/libreoffice/libreoffice.SlackBuild +++ b/libreoffice/libreoffice.SlackBuild @@ -40,7 +40,7 @@ fi NAME=libreoffice PKG=${PKG:-${TMP}/package-${NAME}} -VERSION=${VERSION:-4.2.4} +VERSION=${VERSION:-4.2.5} SVER="$(echo ${VERSION} | cut -d . -f1)" SVER2="$(echo ${VERSION} | cut -d . -f1-2)" SVER3="$(echo ${VERSION} | cut -d _ -f1 | cut -d r -f1)" diff --git a/mozilla-addons/firefox-classic-theme-restorer/ChangeLog.SB b/mozilla-addons/firefox-classic-theme-restorer/ChangeLog.SB index 662e36179c..cd7c9ed125 100644 --- a/mozilla-addons/firefox-classic-theme-restorer/ChangeLog.SB +++ b/mozilla-addons/firefox-classic-theme-restorer/ChangeLog.SB @@ -1,3 +1,7 @@ +Sat Jun 21 13:05:00 BRT 2014 +firefox-classic-theme-restorer-1.2.1-noarch-1xinc.txz: + Updated to 1.2.1. ++--------------------------+ Thu Jun 19 10:57:00 BRT 2014 firefox-classic-theme-restorer-1.2.1beta9-noarch-1xinc.txz: Updated to 1.2.1beta9. diff --git a/mozilla-addons/firefox-classic-theme-restorer/firefox-classic-theme-restorer.SlackBuild b/mozilla-addons/firefox-classic-theme-restorer/firefox-classic-theme-restorer.SlackBuild index 5138effab3..02d1f05711 100755 --- a/mozilla-addons/firefox-classic-theme-restorer/firefox-classic-theme-restorer.SlackBuild +++ b/mozilla-addons/firefox-classic-theme-restorer/firefox-classic-theme-restorer.SlackBuild @@ -41,7 +41,7 @@ fi NAME=firefox-classic-theme-restorer PKG=${PKG:-${TMP}/package-${NAME}} -VERSION=${VERSION:-1.2.1beta9} +VERSION=${VERSION:-1.2.1} ARCH=noarch SLKTARGET=${SLKTARGET:-x86_64} SLKDTARGET=${SLKDTARGET:-slackware} diff --git a/mpg123/ChangeLog.SB b/mpg123/ChangeLog.SB index 3090b66e67..dc47d83d34 100644 --- a/mpg123/ChangeLog.SB +++ b/mpg123/ChangeLog.SB @@ -1,3 +1,7 @@ +Sun Jun 22 03:49:44 BRT 2014 +mpg123-1.20.1-x86_64-1xinc.txz: + Updated to 1.20.1. ++--------------------------+ Mon May 26 19:28:11 BRT 2014 mpg123-1.20.0-x86_64-1xinc.txz: Updated to 1.20.0. diff --git a/mpg123/mpg123-compat32.SlackBuild b/mpg123/mpg123-compat32.SlackBuild index 4c6b9f32ac..613563a0a6 100755 --- a/mpg123/mpg123-compat32.SlackBuild +++ b/mpg123/mpg123-compat32.SlackBuild @@ -45,7 +45,7 @@ PNAME=mpg123 NAME=mpg123-compat32 PKG=${PKG:-${TMP}/package-${NAME}} -VERSION=${VERSION:-1.20.0} +VERSION=${VERSION:-1.20.1} if [ "${SB_NATIVE}" = "YES" ] ;then ARCH32=${ARCH32:-$(linux32 uname -m)} else diff --git a/mpg123/mpg123.SlackBuild b/mpg123/mpg123.SlackBuild index 5e67ef9f78..69bab4fd54 100755 --- a/mpg123/mpg123.SlackBuild +++ b/mpg123/mpg123.SlackBuild @@ -44,7 +44,7 @@ fi NAME=mpg123 PKG=${PKG:-${TMP}/package-${NAME}} -VERSION=${VERSION:-1.20.0} +VERSION=${VERSION:-1.20.1} if [ "${SB_NATIVE}" = "YES" ] ;then ARCH=${ARCH:-$(uname -m)} else diff --git a/networkmanager/ChangeLog.SB b/networkmanager/ChangeLog.SB index 7b9c86edcf..8d7e56f395 100644 --- a/networkmanager/ChangeLog.SB +++ b/networkmanager/ChangeLog.SB @@ -1,3 +1,7 @@ +Sun Jun 22 18:53:41 BRT 2014 +networkmanager-0.9.9.98-x86_64-1xinc.txz: + Updated to 0.9.9.98. ++--------------------------+ Thu Apr 24 22:31:17 BRT 2014 networkmanager-0.9.8.10-x86_64-1xinc.txz: Updated to 0.9.8.10. diff --git a/networkmanager/apply-patches.sh b/networkmanager/apply-patches.sh index 4646759b41..3df5352014 100644 --- a/networkmanager/apply-patches.sh +++ b/networkmanager/apply-patches.sh @@ -4,15 +4,12 @@ set -e -o pipefail SB_PATCHDIR=${CWD}/patches # patch -p0 -E --backup --verbose -i ${SB_PATCHDIR}/${NAME}.patch -### Fedora -patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/rh978435-dns-none.patch - ### Debian patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/02-dbus_access_network_manager.patch ### Gentoo # Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832 -patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/networkmanager-0.9.7.995-pre-sleep.patch +#patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/networkmanager-0.9.7.995-pre-sleep.patch ### Arch patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/disable_set_hostname.patch diff --git a/networkmanager/networkmanager.SlackBuild b/networkmanager/networkmanager.SlackBuild index eab7d092cc..3516bfb168 100755 --- a/networkmanager/networkmanager.SlackBuild +++ b/networkmanager/networkmanager.SlackBuild @@ -47,7 +47,7 @@ PNAME=NetworkManager NAME=networkmanager PKG=${PKG:-${TMP}/package-${NAME}} -VERSION=${VERSION:-0.9.8.10} +VERSION=${VERSION:-0.9.9.98} PPPDVER=${PPPDVER:-2.4.5} SVER=$(echo ${VERSION} | cut -d . -f1-2) if [ "${SB_NATIVE}" = "YES" ] ;then diff --git a/networkmanager/patches/rh978435-dns-none.patch b/networkmanager/patches/rh978435-dns-none.patch deleted file mode 100644 index e5436e2194..0000000000 --- a/networkmanager/patches/rh978435-dns-none.patch +++ /dev/null @@ -1,584 +0,0 @@ -Took these three 'master' commits and rebased them to nm-0-9-8: -commit a15558daed7b94fd810303451089f7799d3eb65d -commit df1f4bee0ed048c1b434d65e5d0cd884f2e7040b -commit 282a9720ab4432b919e0fa57a9b71dfe87ee8ac1 - ---- - -commit a15558daed7b94fd810303451089f7799d3eb65d -Author: Dan Winship -Date: Mon Mar 11 16:15:14 2013 -0400 - - dns-manager: minor cleanups - - Remove the unused NMDnsPlugin::init method, some unused #includes, and - an out-of-date comment. - - Use the correct macro for the default "/etc/resolv.conf" path. - - Simplify NMDnsManager::dispose() a bit. - - Make nm_dns_dnsmasq_new() return an NMDnsPlugin* rather than - NMDnsDnsmasq*. - -diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c -index f7e27da..61b08c6 100644 ---- a/src/dns-manager/nm-dns-dnsmasq.c -+++ b/src/dns-manager/nm-dns-dnsmasq.c -@@ -387,12 +387,6 @@ child_quit (NMDnsPlugin *plugin, gint status) - /****************************************************************/ - - static gboolean --init (NMDnsPlugin *plugin) --{ -- return TRUE; --} -- --static gboolean - is_caching (NMDnsPlugin *plugin) - { - return TRUE; -@@ -406,10 +400,10 @@ get_name (NMDnsPlugin *plugin) - - /****************************************************************/ - --NMDnsDnsmasq * -+NMDnsPlugin * - nm_dns_dnsmasq_new (void) - { -- return (NMDnsDnsmasq *) g_object_new (NM_TYPE_DNS_DNSMASQ, NULL); -+ return g_object_new (NM_TYPE_DNS_DNSMASQ, NULL); - } - - static void -@@ -435,7 +429,6 @@ nm_dns_dnsmasq_class_init (NMDnsDnsmasqClass *dns_class) - - object_class->dispose = dispose; - -- plugin_class->init = init; - plugin_class->child_quit = child_quit; - plugin_class->is_caching = is_caching; - plugin_class->update = update; -diff --git a/src/dns-manager/nm-dns-dnsmasq.h b/src/dns-manager/nm-dns-dnsmasq.h -index 01ec579..70933c0 100644 ---- a/src/dns-manager/nm-dns-dnsmasq.h -+++ b/src/dns-manager/nm-dns-dnsmasq.h -@@ -41,7 +41,7 @@ typedef struct { - - GType nm_dns_dnsmasq_get_type (void); - --NMDnsDnsmasq *nm_dns_dnsmasq_new (void); -+NMDnsPlugin *nm_dns_dnsmasq_new (void); - - #endif /* NM_DNS_DNSMASQ_H */ - -diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c -index 742ab82..ff030f4 100644 ---- a/src/dns-manager/nm-dns-manager.c -+++ b/src/dns-manager/nm-dns-manager.c -@@ -23,17 +23,11 @@ - - #include "config.h" - --#include --#include --#include --#include - #include --#include --#include --#include --#include --#include -+#include -+#include - -+#include - #include - - #include "nm-dns-manager.h" -@@ -47,11 +41,7 @@ - #include "nm-dns-plugin.h" - #include "nm-dns-dnsmasq.h" - --#ifndef RESOLV_CONF --#define RESOLV_CONF "/etc/resolv.conf" --#endif -- --G_DEFINE_TYPE(NMDnsManager, nm_dns_manager, G_TYPE_OBJECT) -+G_DEFINE_TYPE (NMDnsManager, nm_dns_manager, G_TYPE_OBJECT) - - #define NM_DNS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \ - NM_TYPE_DNS_MANAGER, \ -@@ -60,8 +50,6 @@ G_DEFINE_TYPE(NMDnsManager, nm_dns_manager, G_TYPE_OBJECT) - #define HASH_LEN 20 - - typedef struct { -- gboolean disposed; -- - NMIP4Config *ip4_vpn_config; - NMIP4Config *ip4_device_config; - NMIP6Config *ip6_vpn_config; -@@ -350,7 +338,7 @@ write_resolv_conf (FILE *f, const char *domain, - g_set_error (error, - NM_DNS_MANAGER_ERROR, - NM_DNS_MANAGER_ERROR_SYSTEM, -- "Could not write " RESOLV_CONF ": %s\n", -+ "Could not write " _PATH_RESCONF ": %s\n", - g_strerror (errno)); - return FALSE; - } -@@ -458,9 +446,9 @@ update_resolv_conf (const char *domain, - g_return_val_if_fail (error != NULL, FALSE); - - /* Find the real path of resolv.conf; it could be a symlink to something */ -- resolv_conf_realpath = realpath (RESOLV_CONF, NULL); -+ resolv_conf_realpath = realpath (_PATH_RESCONF, NULL); - if (!resolv_conf_realpath) -- resolv_conf_realpath = strdup (RESOLV_CONF); -+ resolv_conf_realpath = strdup (_PATH_RESCONF); - - /* Build up the real path for the temp resolv.conf that we're about to - * write out. -@@ -475,21 +463,21 @@ update_resolv_conf (const char *domain, - if ((f = fopen (tmp_resolv_conf_realpath, "w")) == NULL) { - do_rename = 0; - old_errno = errno; -- if ((f = fopen (RESOLV_CONF, "w")) == NULL) { -+ if ((f = fopen (_PATH_RESCONF, "w")) == NULL) { - g_set_error (error, - NM_DNS_MANAGER_ERROR, - NM_DNS_MANAGER_ERROR_SYSTEM, - "Could not open %s: %s\nCould not open %s: %s\n", - tmp_resolv_conf_realpath, - g_strerror (old_errno), -- RESOLV_CONF, -+ _PATH_RESCONF, - g_strerror (errno)); - goto out; - } - /* Update tmp_resolv_conf_realpath so the error message on fclose() - * failure will be correct. - */ -- strcpy (tmp_resolv_conf_realpath, RESOLV_CONF); -+ strcpy (tmp_resolv_conf_realpath, _PATH_RESCONF); - } - - write_resolv_conf (f, domain, searches, nameservers, error); -@@ -516,7 +504,7 @@ update_resolv_conf (const char *domain, - g_set_error (error, - NM_DNS_MANAGER_ERROR, - NM_DNS_MANAGER_ERROR_SYSTEM, -- "Could not replace " RESOLV_CONF ": %s\n", -+ "Could not replace " _PATH_RESCONF ": %s\n", - g_strerror (errno)); - } - } -@@ -967,10 +955,6 @@ nm_dns_manager_set_hostname (NMDnsManager *mgr, - g_free (priv->hostname); - priv->hostname = g_strdup (filtered); - -- /* Passing the last interface here is completely bogus, but SUSE's netconfig -- * wants one. But hostname changes are system-wide and *not* tied to a -- * specific interface, so netconfig can't really handle this. Fake it. -- */ - if (!priv->updates_queue && !update_dns (mgr, FALSE, &error)) { - nm_log_warn (LOGD_DNS, "could not commit DNS changes: (%d) %s", - error ? error->code : -1, -@@ -1043,7 +1027,7 @@ load_plugins (NMDnsManager *self, const char **plugins) - /* Create each configured plugin */ - for (iter = plugins; iter && *iter; iter++) { - if (!strcasecmp (*iter, "dnsmasq")) -- plugin = NM_DNS_PLUGIN (nm_dns_dnsmasq_new ()); -+ plugin = nm_dns_dnsmasq_new (); - else { - nm_log_warn (LOGD_DNS, "Unknown DNS plugin '%s'", *iter);\ - continue; -@@ -1118,30 +1102,25 @@ dispose (GObject *object) - NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self); - GError *error = NULL; - -- if (priv->disposed == FALSE) { -- priv->disposed = TRUE; -- -- g_slist_foreach (priv->plugins, (GFunc) g_object_unref, NULL); -- g_slist_free (priv->plugins); -- priv->plugins = NULL; -+ g_slist_free_full (priv->plugins, g_object_unref); -+ priv->plugins = NULL; - -- /* If we're quitting leave a valid resolv.conf in place, not one -- * pointing to 127.0.0.1 if any plugins were active. Thus update -- * DNS after disposing of all plugins. But if we haven't done any -- * DNS updates yet, there's no reason to touch resolv.conf on shutdown. -- */ -- if (priv->dns_touched && !update_dns (self, TRUE, &error)) { -- nm_log_warn (LOGD_DNS, "could not commit DNS changes on shutdown: (%d) %s", -- error ? error->code : -1, -- error && error->message ? error->message : "(unknown)"); -- g_clear_error (&error); -- } -- -- g_slist_foreach (priv->configs, (GFunc) g_object_unref, NULL); -- g_slist_free (priv->configs); -- priv->configs = NULL; -+ /* If we're quitting, leave a valid resolv.conf in place, not one -+ * pointing to 127.0.0.1 if any plugins were active. Thus update -+ * DNS after disposing of all plugins. But if we haven't done any -+ * DNS updates yet, there's no reason to touch resolv.conf on shutdown. -+ */ -+ if (priv->dns_touched && !update_dns (self, TRUE, &error)) { -+ nm_log_warn (LOGD_DNS, "could not commit DNS changes on shutdown: (%d) %s", -+ error ? error->code : -1, -+ error && error->message ? error->message : "(unknown)"); -+ g_clear_error (&error); -+ priv->dns_touched = FALSE; - } - -+ g_slist_free_full (priv->configs, g_object_unref); -+ priv->configs = NULL; -+ - G_OBJECT_CLASS (nm_dns_manager_parent_class)->dispose (object); - } - -diff --git a/src/dns-manager/nm-dns-plugin.h b/src/dns-manager/nm-dns-plugin.h -index 2a66557..41a12a5 100644 ---- a/src/dns-manager/nm-dns-plugin.h -+++ b/src/dns-manager/nm-dns-plugin.h -@@ -42,7 +42,6 @@ typedef struct { - GObjectClass parent; - - /* Methods */ -- gboolean (*init) (NMDnsPlugin *self); - - /* Called when DNS information is changed. 'vpn_configs' is a list of - * NMIP4Config or NMIP6Config objects from VPN connections, while -commit df1f4bee0ed048c1b434d65e5d0cd884f2e7040b -Author: Dan Winship -Date: Tue Mar 26 10:03:06 2013 -0400 - - dns-manager, config: make the dns config key single-valued - - Make the main/dns config key be a single value rather than a list of - plugins. Since there is currently only one valid value for it - ("dnsmasq"), this is backward-compatible. - - In the future, it will be possible to specify custom DNS-configuring - scripts here, which is a more flexible way of handling complicated - behavior than trying to create chainable internal plugins. - -diff --git a/man/NetworkManager.conf.5.in b/man/NetworkManager.conf.5.in -index 17f82e6..b69eafa 100644 ---- a/man/NetworkManager.conf.5.in -+++ b/man/NetworkManager.conf.5.in -@@ -135,17 +135,22 @@ no-auto-default=* - no-auto-default=* - .fi - .TP --.B dns=\fIplugin1\fP,\fIplugin2\fP, ... --List DNS plugin names separated by ','. DNS plugins are used to provide local --caching nameserver functionality (which speeds up DNS queries) and to push --DNS data to applications that use it. -+.B dns=\fImode\fP -+Set the DNS/resolv.conf-processing mode. - .P - .RS --.B "Available plugins:" -+.B "Supported modes:" - .br - .TP -+.I default -+The default if the key is not specified. NetworkManager will update -+resolv.conf to reflect the nameservers provided by currently active -+connections. -+.TP - .I dnsmasq --this plugin uses dnsmasq to provide local caching nameserver functionality. -+NetworkManager will run dnsmasq as a local caching nameserver, using -+a "split DNS" configuration if you are connected to a VPN, and then -+update resolv.conf to point to the local nameserver. - .RE - .SS [keyfile] - This section contains keyfile-specific options and thus only has effect when using \fIkeyfile\fP plugin. -diff --git a/src/nm-config.c b/src/nm-config.c -index 0266dd5..606a889 100644 ---- a/src/nm-config.c -+++ b/src/nm-config.c -@@ -31,7 +31,7 @@ struct NMConfig { - char *path; - char **plugins; - char *dhcp_client; -- char **dns_plugins; -+ char *dns_mode; - char *log_level; - char *log_domains; - char *connectivity_uri; -@@ -76,12 +76,12 @@ nm_config_get_dhcp_client (NMConfig *config) - return config->dhcp_client; - } - --const char ** --nm_config_get_dns_plugins (NMConfig *config) -+const char * -+nm_config_get_dns_mode (NMConfig *config) - { - g_return_val_if_fail (config != NULL, NULL); - -- return (const char **) config->dns_plugins; -+ return (const char *) config->dns_mode; - } - - const char * -@@ -164,7 +164,7 @@ nm_config_new (GError **error) - config->plugins = g_key_file_get_string_list (kf, "main", "plugins", NULL, NULL); - - config->dhcp_client = g_key_file_get_value (kf, "main", "dhcp", NULL); -- config->dns_plugins = g_key_file_get_string_list (kf, "main", "dns", NULL, NULL); -+ config->dns_mode = g_key_file_get_value (kf, "main", "dns", NULL); - - if (cli_log_level && strlen (cli_log_level)) - config->log_level = g_strdup (cli_log_level); -@@ -283,7 +283,7 @@ nm_config_free (NMConfig *config) - g_free (config->path); - g_strfreev (config->plugins); - g_free (config->dhcp_client); -- g_strfreev (config->dns_plugins); -+ g_free (config->dns_mode); - g_free (config->log_level); - g_free (config->log_domains); - g_free (config->connectivity_uri); -diff --git a/src/nm-config.h b/src/nm-config.h -index ed84613..82cf8c5 100644 ---- a/src/nm-config.h -+++ b/src/nm-config.h -@@ -51,7 +51,7 @@ NMConfig *nm_config_get (void); - const char *nm_config_get_path (NMConfig *config); - const char **nm_config_get_plugins (NMConfig *config); - const char *nm_config_get_dhcp_client (NMConfig *config); --const char **nm_config_get_dns_plugins (NMConfig *config); -+const char *nm_config_get_dns_mode (NMConfig *config); - const char *nm_config_get_log_level (NMConfig *config); - const char *nm_config_get_log_domains (NMConfig *config); - const char *nm_config_get_connectivity_uri (NMConfig *config); -diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c -index ff030f4..d0185c6 100644 ---- a/src/dns-manager/nm-dns-manager.c -+++ b/src/dns-manager/nm-dns-manager.c -@@ -61,7 +61,7 @@ typedef struct { - guint8 hash[HASH_LEN]; /* SHA1 hash of current DNS config */ - guint8 prev_hash[HASH_LEN]; /* Hash when begin_updates() was called */ - -- GSList *plugins; -+ NMDnsPlugin *plugin; - - gboolean dns_touched; - } NMDnsManagerPrivate; -@@ -686,15 +686,15 @@ update_dns (NMDnsManager *self, - } - - /* Let any plugins do their thing first */ -- for (iter = priv->plugins; iter; iter = g_slist_next (iter)) { -- NMDnsPlugin *plugin = NM_DNS_PLUGIN (iter->data); -+ if (priv->plugin) { -+ NMDnsPlugin *plugin = priv->plugin; - const char *plugin_name = nm_dns_plugin_get_name (plugin); - - if (nm_dns_plugin_is_caching (plugin)) { - if (no_caching) { - nm_log_dbg (LOGD_DNS, "DNS: plugin %s ignored (caching disabled)", - plugin_name); -- continue; -+ goto skip; - } - caching = TRUE; - } -@@ -712,7 +712,11 @@ update_dns (NMDnsManager *self, - */ - caching = FALSE; - } -+ -+ skip: -+ ; - } -+ - g_slist_free (vpn_configs); - g_slist_free (dev_configs); - g_slist_free (other_configs); -@@ -1015,60 +1019,28 @@ nm_dns_manager_end_updates (NMDnsManager *mgr, const char *func) - memset (priv->prev_hash, 0, sizeof (priv->prev_hash)); - } - --static void --load_plugins (NMDnsManager *self, const char **plugins) --{ -- NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self); -- NMDnsPlugin *plugin; -- const char **iter; -- gboolean have_caching = FALSE; -- -- if (plugins && *plugins) { -- /* Create each configured plugin */ -- for (iter = plugins; iter && *iter; iter++) { -- if (!strcasecmp (*iter, "dnsmasq")) -- plugin = nm_dns_dnsmasq_new (); -- else { -- nm_log_warn (LOGD_DNS, "Unknown DNS plugin '%s'", *iter);\ -- continue; -- } -- g_assert (plugin); -- -- /* Only one caching DNS plugin is allowed */ -- if (nm_dns_plugin_is_caching (plugin)) { -- if (have_caching) { -- nm_log_warn (LOGD_DNS, -- "Ignoring plugin %s; only one caching DNS " -- "plugin is allowed.", -- *iter); -- g_object_unref (plugin); -- continue; -- } -- have_caching = TRUE; -- } -- -- nm_log_info (LOGD_DNS, "DNS: loaded plugin %s", nm_dns_plugin_get_name (plugin)); -- priv->plugins = g_slist_append (priv->plugins, plugin); -- g_signal_connect (plugin, NM_DNS_PLUGIN_FAILED, -- G_CALLBACK (plugin_failed), -- self); -- } -- } else { -- /* Create default plugins */ -- } --} -- - /******************************************************************/ - - NMDnsManager * --nm_dns_manager_get (const char **plugins) -+nm_dns_manager_get (const char *mode) - { - static NMDnsManager * singleton = NULL; -+ NMDnsManagerPrivate *priv; - - if (!singleton) { - singleton = NM_DNS_MANAGER (g_object_new (NM_TYPE_DNS_MANAGER, NULL)); - g_assert (singleton); -- load_plugins (singleton, plugins); -+ priv = NM_DNS_MANAGER_GET_PRIVATE (singleton); -+ -+ if (!g_strcmp0 (mode, "dnsmasq")) -+ priv->plugin = nm_dns_dnsmasq_new (); -+ else if (mode && g_strcmp0 (mode, "default") != 0) -+ nm_log_warn (LOGD_DNS, "Unknown DNS mode '%s'", mode); -+ -+ if (priv->plugin) { -+ nm_log_info (LOGD_DNS, "DNS: loaded plugin %s", nm_dns_plugin_get_name (priv->plugin)); -+ g_signal_connect (priv->plugin, NM_DNS_PLUGIN_FAILED, G_CALLBACK (plugin_failed), singleton); -+ } - } else - g_object_ref (singleton); - -@@ -1102,8 +1073,7 @@ dispose (GObject *object) - NMDnsManagerPrivate *priv = NM_DNS_MANAGER_GET_PRIVATE (self); - GError *error = NULL; - -- g_slist_free_full (priv->plugins, g_object_unref); -- priv->plugins = NULL; -+ g_clear_object (&priv->plugin); - - /* If we're quitting, leave a valid resolv.conf in place, not one - * pointing to 127.0.0.1 if any plugins were active. Thus update -diff --git a/src/dns-manager/nm-dns-manager.h b/src/dns-manager/nm-dns-manager.h -index 0fd4c19..431d66a 100644 ---- a/src/dns-manager/nm-dns-manager.h -+++ b/src/dns-manager/nm-dns-manager.h -@@ -67,7 +67,7 @@ typedef struct { - - GType nm_dns_manager_get_type (void); - --NMDnsManager * nm_dns_manager_get (const char **plugins); -+NMDnsManager * nm_dns_manager_get (const char *mode); - - /* Allow changes to be batched together */ - void nm_dns_manager_begin_updates (NMDnsManager *mgr, const char *func); -diff --git a/src/main.c b/src/main.c -index feb8fa3..0f92d19 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -534,7 +534,7 @@ main (int argc, char *argv[]) - goto done; - } - -- dns_mgr = nm_dns_manager_get (nm_config_get_dns_plugins (config)); -+ dns_mgr = nm_dns_manager_get (nm_config_get_dns_mode (config)); - if (!dns_mgr) { - nm_log_err (LOGD_CORE, "failed to start the DNS manager."); - goto done; -commit 282a9720ab4432b919e0fa57a9b71dfe87ee8ac1 -Author: Dan Winship -Date: Tue Mar 26 10:05:25 2013 -0400 - - dns-manager: add dns=none - - Add a new dns mode "none", meaning that NM should not modify - resolv.conf at all. - - https://bugzilla.gnome.org/show_bug.cgi?id=690404 - -diff --git a/man/NetworkManager.conf.5.in b/man/NetworkManager.conf.5.in -index b69eafa..368d776 100644 ---- a/man/NetworkManager.conf.5.in -+++ b/man/NetworkManager.conf.5.in -@@ -151,6 +151,9 @@ connections. - NetworkManager will run dnsmasq as a local caching nameserver, using - a "split DNS" configuration if you are connected to a VPN, and then - update resolv.conf to point to the local nameserver. -+.TP -+.I none -+NetworkManager will not modify resolv.conf. - .RE - .SS [keyfile] - This section contains keyfile-specific options and thus only has effect when using \fIkeyfile\fP plugin. -diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c -index d0185c6..84d5ddf 100644 ---- a/src/dns-manager/nm-dns-manager.c -+++ b/src/dns-manager/nm-dns-manager.c -@@ -61,6 +61,7 @@ typedef struct { - guint8 hash[HASH_LEN]; /* SHA1 hash of current DNS config */ - guint8 prev_hash[HASH_LEN]; /* Hash when begin_updates() was called */ - -+ gboolean manage_dns; - NMDnsPlugin *plugin; - - gboolean dns_touched; -@@ -575,6 +576,9 @@ update_dns (NMDnsManager *self, - - priv = NM_DNS_MANAGER_GET_PRIVATE (self); - -+ if (!priv->manage_dns) -+ return TRUE; -+ - priv->dns_touched = TRUE; - - nm_log_dbg (LOGD_DNS, "updating resolv.conf"); -@@ -1029,10 +1033,16 @@ nm_dns_manager_get (const char *mode) - g_assert (singleton); - priv = NM_DNS_MANAGER_GET_PRIVATE (singleton); - -- if (!g_strcmp0 (mode, "dnsmasq")) -- priv->plugin = nm_dns_dnsmasq_new (); -- else if (mode && g_strcmp0 (mode, "default") != 0) -- nm_log_warn (LOGD_DNS, "Unknown DNS mode '%s'", mode); -+ if (!g_strcmp0 (mode, "none")) { -+ priv->manage_dns = FALSE; -+ nm_log_info (LOGD_DNS, "DNS: not managing " _PATH_RESCONF); -+ } else { -+ priv->manage_dns = TRUE; -+ if (!g_strcmp0 (mode, "dnsmasq")) -+ priv->plugin = nm_dns_dnsmasq_new (); -+ else if (mode && g_strcmp0 (mode, "default") != 0) -+ nm_log_warn (LOGD_DNS, "Unknown DNS mode '%s'", mode); -+ } - - if (priv->plugin) { - nm_log_info (LOGD_DNS, "DNS: loaded plugin %s", nm_dns_plugin_get_name (priv->plugin)); diff --git a/perl-modules/perl-image-exiftool/ChangeLog.SB b/perl-modules/perl-image-exiftool/ChangeLog.SB index 5ec13fb767..4db74541c1 100644 --- a/perl-modules/perl-image-exiftool/ChangeLog.SB +++ b/perl-modules/perl-image-exiftool/ChangeLog.SB @@ -1,3 +1,7 @@ +Sat Jun 21 04:18:40 BRT 2014 +perl-image-exiftool-9.65-noarch-1xinc.txz: + Updated to 9.65. ++--------------------------+ Thu Apr 18 19:34:15 BRT 2013 perl-image-exiftool-9.27-noarch-1xinc.txz: Updated to 9.27. diff --git a/perl-modules/perl-image-exiftool/perl-image-exiftool.SlackBuild b/perl-modules/perl-image-exiftool/perl-image-exiftool.SlackBuild index e324ed27a3..99453199bd 100755 --- a/perl-modules/perl-image-exiftool/perl-image-exiftool.SlackBuild +++ b/perl-modules/perl-image-exiftool/perl-image-exiftool.SlackBuild @@ -3,7 +3,7 @@ # Build script by Phantom X # Suggested usage: $ perl-image-exiftool.SlackBuild 2>&1 | tee build.log #-- -# Copyright 2008-2013 Phantom X, Goiania, Brazil. +# Copyright 2008-2014 Phantom X, Goiania, Brazil. # Copyright 2006 Martijn Dekker, Groningen, Netherlands. # # Redistribution and use of this script, with or without modification, is @@ -42,7 +42,7 @@ PNAME=Image-ExifTool NAME=perl-image-exiftool PKG=${PKG:-${TMP}/package-${NAME}} -VERSION=${VERSION:-9.27} +VERSION=${VERSION:-9.65} ARCH=noarch SLKTARGET=${SLKTARGET:-x86_64} BUILD=${BUILD:-1} diff --git a/phonon-backend-gstreamer/ChangeLog.SB b/phonon-backend-gstreamer/ChangeLog.SB index 9ef78b713b..f3f2039c93 100644 --- a/phonon-backend-gstreamer/ChangeLog.SB +++ b/phonon-backend-gstreamer/ChangeLog.SB @@ -1,3 +1,7 @@ +Fri Jun 20 17:33:05 BRT 2014 +phonon-backend-gstreamer-4.7.2-x86_64-1xinc.txz: + Updated to 4.7.2. ++--------------------------+ Sat Dec 7 12:23:41 BRST 2013 phonon-backend-gstreamer-4.7.1-x86_64-1xinc.txz: Updated to 4.7.1. diff --git a/phonon-backend-gstreamer/phonon-backend-gstreamer.SlackBuild b/phonon-backend-gstreamer/phonon-backend-gstreamer.SlackBuild index 2cbd53b13a..1c45f37611 100755 --- a/phonon-backend-gstreamer/phonon-backend-gstreamer.SlackBuild +++ b/phonon-backend-gstreamer/phonon-backend-gstreamer.SlackBuild @@ -3,7 +3,7 @@ # Build script by Phantom X # Suggested usage: $ phonon-backend-gstreamer.SlackBuild 2>&1 | tee build.log #-- -# Copyright 2008-2013 Phantom X, Goiania, Brazil. +# Copyright 2008-2014 Phantom X, Goiania, Brazil. # Copyright 2006 Martijn Dekker, Groningen, Netherlands. # # Redistribution and use of this script, with or without modification, is @@ -43,7 +43,7 @@ fi NAME=phonon-backend-gstreamer PKG=${PKG:-${TMP}/package-${NAME}} -VERSION=${VERSION:-4.7.1} +VERSION=${VERSION:-4.7.2} if [ "${SB_NATIVE}" = "YES" ] ;then ARCH=${ARCH:-$(uname -m)} else @@ -75,7 +75,7 @@ DL_PROG=${DL_PROG:-wget} DL_TO=${DL_TO:-5} DL_OPTS=${DL_OPTS:-"--timeout=${DL_TO}"} MIRROR_KDE=${MIRROR_KDE:-ftp://ftp.kde.org/pub/kde} -DL_URL="${MIRROR_KDE}/stable/phonon/${NAME}/${VERSION}/${SRCARCHIVE}" +DL_URL="${MIRROR_KDE}/stable/phonon/${NAME}/${VERSION}/src/${SRCARCHIVE}" # if source is not present, download in source rootdir if possible test -r ${CWD}/${SRCARCHIVE} || ${DL_PROG} ${DL_OPTS} ${DL_URL} || exit 1 diff --git a/phonon-backend-vlc/ChangeLog.SB b/phonon-backend-vlc/ChangeLog.SB index f8d951a04b..b31f99bf28 100644 --- a/phonon-backend-vlc/ChangeLog.SB +++ b/phonon-backend-vlc/ChangeLog.SB @@ -1,3 +1,7 @@ +Fri Jun 20 17:37:04 BRT 2014 +phonon-backend-vlc-0.7.2-x86_64-1xinc.txz: + Updated to 0.7.2. ++--------------------------+ Sat Dec 7 12:24:54 BRST 2013 phonon-backend-vlc-0.7.1-x86_64-1xinc.txz: Updated to 0.7.1. diff --git a/phonon-backend-vlc/phonon-backend-vlc.SlackBuild b/phonon-backend-vlc/phonon-backend-vlc.SlackBuild index c912f95515..d5b6f9cbeb 100755 --- a/phonon-backend-vlc/phonon-backend-vlc.SlackBuild +++ b/phonon-backend-vlc/phonon-backend-vlc.SlackBuild @@ -3,7 +3,7 @@ # Build script by Phantom X # Suggested usage: $ phonon-backend-vlc.SlackBuild 2>&1 | tee build.log #-- -# Copyright 2008-2013 Phantom X, Goiania, Brazil. +# Copyright 2008-2014 Phantom X, Goiania, Brazil. # Copyright 2006 Martijn Dekker, Groningen, Netherlands. # # Redistribution and use of this script, with or without modification, is @@ -49,7 +49,7 @@ if [ "${SNAPBUILD}" = "YES" ] ;then VERSION=${VERSION:-"$(LC_ALL=C date +%Y%m%d)"} SNAPBRANCH=${SNAPBRANCH:-master} else - VERSION=${VERSION:-0.7.1} + VERSION=${VERSION:-0.7.2} fi if [ "${SB_NATIVE}" = "YES" ] ;then ARCH=${ARCH:-$(uname -m)} @@ -82,7 +82,7 @@ DL_PROG=${DL_PROG:-wget} DL_TO=${DL_TO:-5} DL_OPTS=${DL_OPTS:-"--timeout=${DL_TO}"} MIRROR_KDE=${MIRROR_KDE:-ftp://ftp.kde.org/pub/kde} -DL_URL="${MIRROR_KDE}/stable/phonon/${NAME}/${VERSION}/${SRCARCHIVE}" +DL_URL="${MIRROR_KDE}/stable/phonon/${NAME}/${VERSION}/src/${SRCARCHIVE}" SNAPUPDATE=${NAME}-snapshot.sh export snap=${VERSION} diff --git a/phonon/ChangeLog.SB b/phonon/ChangeLog.SB index c31c93bd93..5009d3f8e0 100644 --- a/phonon/ChangeLog.SB +++ b/phonon/ChangeLog.SB @@ -1,3 +1,7 @@ +Fri Jun 20 17:28:49 BRT 2014 +phonon-4.7.2-x86_64-1xinc.txz: + Updated to 4.7.2. ++--------------------------+ Sat Apr 26 02:48:47 BRT 2014 phonon-4.7.1-x86_64-2xinc.txz: Rebuilt. diff --git a/phonon/apply-patches.sh b/phonon/apply-patches.sh index c13e20cd77..50e4d67a50 100644 --- a/phonon/apply-patches.sh +++ b/phonon/apply-patches.sh @@ -6,11 +6,9 @@ SB_PATCHDIR=${CWD}/patches # patch -p0 -E --backup --verbose -i ${SB_PATCHDIR}/${NAME}.patch ### Fedora patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/phonon-4.7.0-rpath_use_link_path.patch -# workaround cmake bogosity calculating relative dirs + /usr-move -patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/phonon-4.7.0-rootDir.patch +# better upstream fix (pulled from master branch currently) +patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/import-relative-dir-resolution-workaround-from-CMake.patch ## upstream patches -patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/0003-sync-FindQt4-from-kdelibs-master-to-unbreak-build-wi.patch -patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/0004-don-t-emit-backendchanged-when-we-have-no-backend.patch set +e +o pipefail diff --git a/phonon/patches/0003-sync-FindQt4-from-kdelibs-master-to-unbreak-build-wi.patch b/phonon/patches/0003-sync-FindQt4-from-kdelibs-master-to-unbreak-build-wi.patch deleted file mode 100644 index 26ad575c64..0000000000 --- a/phonon/patches/0003-sync-FindQt4-from-kdelibs-master-to-unbreak-build-wi.patch +++ /dev/null @@ -1,662 +0,0 @@ -From c12eb12011fa975fc166a327da166826d6c9d2f3 Mon Sep 17 00:00:00 2001 -From: Harald Sitter -Date: Fri, 7 Mar 2014 09:46:24 +0100 -Subject: [PATCH 3/4] sync FindQt4 from kdelibs/master to unbreak build with - cmake/next - ---- - cmake/FindQt4.cmake | 301 ++++++++++++++++++++++++---------------------------- - 1 file changed, 139 insertions(+), 162 deletions(-) - -diff --git a/cmake/FindQt4.cmake b/cmake/FindQt4.cmake -index 75aa34c..e439a72 100644 ---- a/cmake/FindQt4.cmake -+++ b/cmake/FindQt4.cmake -@@ -2,8 +2,8 @@ - # This module can be used to find Qt4. - # The most important issue is that the Qt4 qmake is available via the system path. - # This qmake is then used to detect basically everything else. --# This module defines a number of key variables and macros. --# The variable QT_USE_FILE is set which is the path to a CMake file that can be included -+# This module defines a number of key variables and macros. -+# The variable QT_USE_FILE is set which is the path to a CMake file that can be included - # to compile Qt 4 applications and libraries. It sets up the compilation - # environment for include directories, preprocessor defines and populates a - # QT_LIBRARIES variable. -@@ -15,10 +15,10 @@ - # target_link_libraries(myexe ${QT_LIBRARIES}) - # - # The minimum required version can be specified using the standard find_package()-syntax --# (see example above). -+# (see example above). - # For compatibility with older versions of FindQt4.cmake it is also possible to --# set the variable QT_MIN_VERSION to the minimum required version of Qt4 before the --# find_package(Qt4) command. -+# set the variable QT_MIN_VERSION to the minimum required version of Qt4 before the -+# find_package(Qt4) command. - # If both are used, the version used in the find_package() command overrides the - # one from QT_MIN_VERSION. - # -@@ -53,26 +53,26 @@ - # QT_USE_QTSCRIPTTOOLS - # QT_USE_QTDECLARATIVE - # --# QT_USE_IMPORTED_TARGETS -+# QT_USE_IMPORTED_TARGETS - # If this variable is set to TRUE, FindQt4.cmake will create imported --# library targets for the various Qt libraries and set the -+# library targets for the various Qt libraries and set the - # library variables like QT_QTCORE_LIBRARY to point at these imported --# targets instead of the library file on disk. This provides much better --# handling of the release and debug versions of the Qt libraries and is -+# targets instead of the library file on disk. This provides much better -+# handling of the release and debug versions of the Qt libraries and is - # also always backwards compatible, except for the case that dependencies --# of libraries are exported, these will then also list the names of the -+# of libraries are exported, these will then also list the names of the - # imported targets as dependency and not the file location on disk. This - # is much more flexible, but requires that FindQt4.cmake is executed before - # such an exported dependency file is processed. - # - # There are also some files that need processing by some Qt tools such as moc - # and uic. Listed below are macros that may be used to process those files. --# -+# - # macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...) - # create moc code from a list of files containing Qt class with --# the Q_OBJECT declaration. Per-direcotry preprocessor definitions -+# the Q_OBJECT declaration. Per-direcotry preprocessor definitions - # are also added. Options may be given to moc, such as those found --# when executing "moc -help". -+# when executing "moc -help". - # - # macro QT4_WRAP_UI(outfiles inputfile ... OPTIONS ...) - # create code from a list of Qt designer ui files. -@@ -92,21 +92,21 @@ - # macro QT4_AUTOMOC(sourcefile1 sourcefile2 ... ) - # This macro is still experimental. - # It can be used to have moc automatically handled. --# So if you have the files foo.h and foo.cpp, and in foo.h a -+# So if you have the files foo.h and foo.cpp, and in foo.h a - # a class uses the Q_OBJECT macro, moc has to run on it. If you don't - # want to use QT4_WRAP_CPP() (which is reliable and mature), you can insert - # #include "foo.moc" - # in foo.cpp and then give foo.cpp as argument to QT4_AUTOMOC(). This will the - # scan all listed files at cmake-time for such included moc files and if it finds --# them cause a rule to be generated to run moc at build time on the -+# them cause a rule to be generated to run moc at build time on the - # accompanying header file foo.h. - # If a source file has the SKIP_AUTOMOC property set it will be ignored by this macro. - # - # macro QT4_ADD_DBUS_INTERFACE(outfiles interface basename) --# create a the interface header and implementation files with the --# given basename from the given interface xml file and add it to -+# create a the interface header and implementation files with the -+# given basename from the given interface xml file and add it to - # the list of sources. --# To disable generating a namespace header, set the source file property -+# To disable generating a namespace header, set the source file property - # NO_NAMESPACE to TRUE on the interface file. - # To include a header in the interface header, set the source file property - # INCLUDE to the name of the header. -@@ -114,10 +114,10 @@ - # to the name of the class. - # - # macro QT4_ADD_DBUS_INTERFACES(outfiles inputfile ... ) --# create the interface header and implementation files -+# create the interface header and implementation files - # for all listed interface xml files - # the name will be automatically determined from the name of the xml file --# To disable generating namespace headers, set the source file property -+# To disable generating namespace headers, set the source file property - # NO_NAMESPACE to TRUE for these inputfiles. - # To include a header in the interface header, set the source file property - # INCLUDE to the name of the header. -@@ -135,19 +135,19 @@ - # - # macro QT4_GENERATE_DBUS_INTERFACE( header [interfacename] OPTIONS ...) - # generate the xml interface file from the given header. --# If the optional argument interfacename is omitted, the name of the -+# If the optional argument interfacename is omitted, the name of the - # interface file is constructed from the basename of the header with - # the suffix .xml appended. - # Options may be given to qdbuscpp2xml, such as those found when executing "qdbuscpp2xml --help" - # --# macro QT4_CREATE_TRANSLATION( qm_files directories ... sources ... -+# macro QT4_CREATE_TRANSLATION( qm_files directories ... sources ... - # ts_files ... OPTIONS ...) - # out: qm_files - # in: directories sources ts_files - # options: flags to pass to lupdate, such as -extensions to specify - # extensions for a directory scan. - # generates commands to create .ts (vie lupdate) and .qm --# (via lrelease) - files from directories and/or sources. The ts files are -+# (via lrelease) - files from directories and/or sources. The ts files are - # created and/or updated in the source tree (unless given with full paths). - # The qm files are generated in the build tree. - # Updating the translations can be done by adding the qm_files -@@ -210,42 +210,42 @@ - # The QT_USE_FILE will also define QT_DEBUG and QT_NO_DEBUG - # to fit your current build type. Those are not contained - # in QT_DEFINITIONS. --# --# QT_INCLUDES List of paths to all include directories of -+# -+# QT_INCLUDES List of paths to all include directories of - # Qt4 QT_INCLUDE_DIR and QT_QTCORE_INCLUDE_DIR are - # always in this variable even if NOTFOUND, - # all other INCLUDE_DIRS are - # only added if they are found. - # You do not need to use this if you include QT_USE_FILE. --# -+# - # - # Include directories for the Qt modules are listed here. - # You do not need to use these variables if you include QT_USE_FILE. - # - # QT_INCLUDE_DIR Path to "include" of Qt4 --# QT_QT_INCLUDE_DIR Path to "include/Qt" --# QT_QT3SUPPORT_INCLUDE_DIR Path to "include/Qt3Support" --# QT_QTASSISTANT_INCLUDE_DIR Path to "include/QtAssistant" -+# QT_QT_INCLUDE_DIR Path to "include/Qt" -+# QT_QT3SUPPORT_INCLUDE_DIR Path to "include/Qt3Support" -+# QT_QTASSISTANT_INCLUDE_DIR Path to "include/QtAssistant" - # QT_QTASSISTANTCLIENT_INCLUDE_DIR Path to "include/QtAssistant" - # QT_QAXCONTAINER_INCLUDE_DIR Path to "include/ActiveQt" (Windows only) - # QT_QAXSERVER_INCLUDE_DIR Path to "include/ActiveQt" (Windows only) --# QT_QTCORE_INCLUDE_DIR Path to "include/QtCore" --# QT_QTDBUS_INCLUDE_DIR Path to "include/QtDBus" --# QT_QTDESIGNER_INCLUDE_DIR Path to "include/QtDesigner" -+# QT_QTCORE_INCLUDE_DIR Path to "include/QtCore" -+# QT_QTDBUS_INCLUDE_DIR Path to "include/QtDBus" -+# QT_QTDESIGNER_INCLUDE_DIR Path to "include/QtDesigner" - # QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR Path to "include/QtDesigner" --# QT_QTGUI_INCLUDE_DIR Path to "include/QtGui" -+# QT_QTGUI_INCLUDE_DIR Path to "include/QtGui" - # QT_QTHELP_INCLUDE_DIR Path to "include/QtHelp" --# QT_QTMOTIF_INCLUDE_DIR Path to "include/QtMotif" --# QT_QTMULTIMEDIA_INCLUDE_DIR Path to "include/QtMultimedia" --# QT_QTNETWORK_INCLUDE_DIR Path to "include/QtNetwork" --# QT_QTNSPLUGIN_INCLUDE_DIR Path to "include/QtNsPlugin" --# QT_QTOPENGL_INCLUDE_DIR Path to "include/QtOpenGL" -+# QT_QTMOTIF_INCLUDE_DIR Path to "include/QtMotif" -+# QT_QTMULTIMEDIA_INCLUDE_DIR Path to "include/QtMultimedia" -+# QT_QTNETWORK_INCLUDE_DIR Path to "include/QtNetwork" -+# QT_QTNSPLUGIN_INCLUDE_DIR Path to "include/QtNsPlugin" -+# QT_QTOPENGL_INCLUDE_DIR Path to "include/QtOpenGL" - # QT_QTSCRIPT_INCLUDE_DIR Path to "include/QtScript" --# QT_QTSQL_INCLUDE_DIR Path to "include/QtSql" -+# QT_QTSQL_INCLUDE_DIR Path to "include/QtSql" - # QT_QTSVG_INCLUDE_DIR Path to "include/QtSvg" - # QT_QTTEST_INCLUDE_DIR Path to "include/QtTest" - # QT_QTWEBKIT_INCLUDE_DIR Path to "include/QtWebKit" --# QT_QTXML_INCLUDE_DIR Path to "include/QtXml" -+# QT_QTXML_INCLUDE_DIR Path to "include/QtXml" - # QT_QTXMLPATTERNS_INCLUDE_DIR Path to "include/QtXmlPatterns" - # QT_PHONON_INCLUDE_DIR Path to "include/phonon" - # QT_QTSCRIPTTOOLS_INCLUDE_DIR Path to "include/QtScriptTools" -@@ -316,7 +316,7 @@ - # The qtmain library for Windows QT_QTMAIN_LIBRARY - # - # The Phonon library: QT_PHONON_LIBRARY --# -+# - # The QtDeclarative library: QT_QTDECLARATIVE_LIBRARY - # - # also defined, but NOT for general use are -@@ -331,17 +331,17 @@ - # QT_QCOLLECTIONGENERATOR_EXECUTABLE Where to find the qcollectiongenerator tool. - # QT_DESIGNER_EXECUTABLE Where to find the Qt designer tool. - # QT_LINGUIST_EXECUTABLE Where to find the Qt linguist tool. -+# - # --# --# These are around for backwards compatibility -+# These are around for backwards compatibility - # they will be set - # QT_WRAP_CPP Set true if QT_MOC_EXECUTABLE is found - # QT_WRAP_UI Set true if QT_UIC_EXECUTABLE is found --# -+# - # These variables do _NOT_ have any effect anymore (compared to FindQt.cmake) - # QT_MT_REQUIRED Qt4 is now always multithreaded --# --# These variables are set to "" Because Qt structure changed -+# -+# These variables are set to "" Because Qt structure changed - # (They make no sense in Qt4) - # QT_QT_LIBRARY Qt-Library is now split - -@@ -354,12 +354,12 @@ IF( Qt4_FIND_COMPONENTS ) - STRING( TOUPPER ${component} _COMPONENT ) - SET( QT_USE_${_COMPONENT} 1 ) - ENDFOREACH( component ) -- -+ - # To make sure we don't use QtCore or QtGui when not in COMPONENTS - IF(NOT QT_USE_QTCORE) - SET( QT_DONT_USE_QTCORE 1 ) - ENDIF(NOT QT_USE_QTCORE) -- -+ - IF(NOT QT_USE_QTGUI) - SET( QT_DONT_USE_QTGUI 1 ) - ENDIF(NOT QT_USE_QTGUI) -@@ -395,7 +395,7 @@ ENDIF (QT4_QMAKE_FOUND AND Qt4::QtCore) - # check that QT_NO_DEBUG is defined for release configurations - MACRO(QT_CHECK_FLAG_EXISTS FLAG VAR DOC) - IF(NOT ${VAR} MATCHES "${FLAG}") -- SET(${VAR} "${${VAR}} ${FLAG}" -+ SET(${VAR} "${${VAR}} ${FLAG}" - CACHE STRING "Flags used by the compiler during ${DOC} builds." FORCE) - ENDIF(NOT ${VAR} MATCHES "${FLAG}") - ENDMACRO(QT_CHECK_FLAG_EXISTS FLAG VAR) -@@ -424,13 +424,13 @@ MACRO(QT_QUERY_QMAKE outvar invar) - # information. Use the same variable for both stdout and stderr - # to make sure we get the output on all platforms. - EXECUTE_PROCESS(COMMAND ${QT_QMAKE_EXECUTABLE} -- WORKING_DIRECTORY -+ WORKING_DIRECTORY - ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake - OUTPUT_VARIABLE _qmake_query_output - RESULT_VARIABLE _qmake_result - ERROR_VARIABLE _qmake_query_output ) - -- FILE(REMOVE_RECURSE -+ FILE(REMOVE_RECURSE - "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake") - - IF(_qmake_result) -@@ -463,7 +463,7 @@ IF (QT_QMAKE_EXECUTABLE) - SET(QT_QMAKE_EXECUTABLE_LAST "${QT_QMAKE_EXECUTABLE}" CACHE INTERNAL "" FORCE) - - SET(QT4_QMAKE_FOUND FALSE) -- -+ - _qt4_query_qmake(QT_VERSION QTVERSION) - - # check for qt3 qmake and then try and find qmake4 or qmake-qt4 in the path -@@ -550,7 +550,7 @@ ENDIF (QT_QMAKE_EXECUTABLE) - IF (QT4_QMAKE_FOUND) - - if (WIN32) -- # get qt install dir -+ # get qt install dir - get_filename_component(_DIR ${QT_QMAKE_EXECUTABLE} PATH ) - get_filename_component(QT_INSTALL_DIR ${_DIR} PATH ) - endif (WIN32) -@@ -566,7 +566,7 @@ IF (QT4_QMAKE_FOUND) - MESSAGE("Warning: ${QT_LIBRARY_DIR_TMP} does NOT exist, Qt must NOT be installed correctly.") - ENDIF(EXISTS "${QT_LIBRARY_DIR_TMP}") - ENDIF(NOT QT_LIBRARY_DIR OR QT_QMAKE_CHANGED) -- -+ - IF (APPLE) - IF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework) - SET(QT_USE_FRAMEWORKS ON -@@ -575,16 +575,27 @@ IF (QT4_QMAKE_FOUND) - SET(QT_USE_FRAMEWORKS OFF - CACHE BOOL "Set to ON if Qt build uses frameworks." FORCE) - ENDIF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework) -- -+ - MARK_AS_ADVANCED(QT_USE_FRAMEWORKS) - ENDIF (APPLE) -- -+ - # ask qmake for the binary dir - IF (QT_LIBRARY_DIR AND NOT QT_BINARY_DIR OR QT_QMAKE_CHANGED) - _qt4_query_qmake(QT_INSTALL_BINS qt_bins) - SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "" FORCE) - ENDIF (QT_LIBRARY_DIR AND NOT QT_BINARY_DIR OR QT_QMAKE_CHANGED) - -+ IF (APPLE) -+ SET(CMAKE_FIND_FRAMEWORK_OLD ${CMAKE_FIND_FRAMEWORK}) -+ IF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework) -+ SET(QT_USE_FRAMEWORKS ON CACHE INTERNAL "" FORCE) -+ SET(CMAKE_FIND_FRAMEWORK FIRST) -+ ELSE (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework) -+ SET(QT_USE_FRAMEWORKS OFF CACHE INTERNAL "" FORCE) -+ SET(CMAKE_FIND_FRAMEWORK LAST) -+ ENDIF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework) -+ ENDIF (APPLE) -+ - # ask qmake for the include dir - IF (QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR OR QT_QMAKE_CHANGED) - _qt4_query_qmake(QT_INSTALL_HEADERS qt_headers) -@@ -632,7 +643,7 @@ IF (QT4_QMAKE_FOUND) - foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH}) - set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/imports") - endforeach(qt_cross_path) -- FIND_PATH(QT_IMPORTS_DIR NAMES Qt QtWebKit -+ FIND_PATH(QT_IMPORTS_DIR NAMES Qt - HINTS ${qt_cross_paths} ${qt_imports_dir} - DOC "The location of the Qt imports" - NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH -@@ -691,11 +702,11 @@ IF (QT4_QMAKE_FOUND) - # - ######################################## - -- SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools -+ SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools - QtHelp QtWebKit QtXmlPatterns QtNetwork QtMultimedia - QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus QtScriptTools - QtDeclarative) -- -+ - IF(Q_WS_X11) - SET(QT_MODULES ${QT_MODULES} QtMotif) - ENDIF(Q_WS_X11) -@@ -763,7 +774,7 @@ IF (QT4_QMAKE_FOUND) - ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers - NO_DEFAULT_PATH - ) -- -+ - # Set QT_QTASSISTANT_INCLUDE_DIR - FIND_PATH(QT_QTASSISTANT_INCLUDE_DIR QtAssistant - PATHS -@@ -771,7 +782,7 @@ IF (QT4_QMAKE_FOUND) - ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers - NO_DEFAULT_PATH - ) -- -+ - # Set QT_QTASSISTANTCLIENT_INCLUDE_DIR - FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QAssistantClient - PATHS -@@ -801,7 +812,7 @@ IF (QT4_QMAKE_FOUND) - # Set QT_INCLUDE_DIR by removine "/QtCore" in the string ${QT_QTCORE_INCLUDE_DIR} - IF( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR) - IF (QT_USE_FRAMEWORKS) -- SET(QT_INCLUDE_DIR ${QT_HEADERS_DIR}) -+ SET(QT_INCLUDE_DIR ${QT_HEADERS_DIR} ${QT_QTCORE_LIBRARY_RELEASE} ) - ELSE (QT_USE_FRAMEWORKS) - STRING( REGEX REPLACE "/QtCore$" "" qt4_include_dir ${QT_QTCORE_INCLUDE_DIR}) - SET( QT_INCLUDE_DIR ${qt4_include_dir} CACHE PATH "") -@@ -847,11 +858,11 @@ IF (QT4_QMAKE_FOUND) - # find the libraries - FOREACH(QT_MODULE ${QT_MODULES}) - STRING(TOUPPER ${QT_MODULE} _upper_qt_module) -- FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_RELEASE -+ FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_RELEASE - NAMES ${QT_MODULE}${QT_LIBINFIX} ${QT_MODULE}${QT_LIBINFIX}4 - PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH - ) -- FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_DEBUG -+ FIND_LIBRARY(QT_${_upper_qt_module}_LIBRARY_DEBUG - NAMES ${QT_MODULE}${QT_LIBINFIX}_debug ${QT_MODULE}${QT_LIBINFIX}d ${QT_MODULE}${QT_LIBINFIX}d4 - PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH - ) -@@ -863,7 +874,7 @@ IF (QT4_QMAKE_FOUND) - ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE) - - IF( NOT QT_QTCORE_LIBRARY_DEBUG AND NOT QT_QTCORE_LIBRARY_RELEASE ) -- -+ - # try dropping a hint if trying to use Visual Studio with Qt built by mingw - IF(QT_LIBRARY_DIR AND MSVC) - IF(EXISTS ${QT_LIBRARY_DIR}/libqtmain.a) -@@ -887,11 +898,11 @@ IF (QT4_QMAKE_FOUND) - FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmain${QT_LIBINFIX}d PATHS ${QT_LIBRARY_DIR} - NO_DEFAULT_PATH) - ENDIF(WIN32) -- -+ - # Set QT_QTASSISTANTCLIENT_LIBRARY - FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) - FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -- -+ - # Set QT_QTASSISTANT_LIBRARY - FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient${QT_LIBINFIX} QtAssistantClient${QT_LIBINFIX}4 QtAssistant${QT_LIBINFIX} QtAssistant${QT_LIBINFIX}4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) - FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG NAMES QtAssistantClient${QT_LIBINFIX}_debug QtAssistantClient${QT_LIBINFIX}d QtAssistantClient${QT_LIBINFIX}d4 QtAssistant${QT_LIBINFIX}_debug QtAssistant${QT_LIBINFIX}d4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) -@@ -910,7 +921,7 @@ IF (QT4_QMAKE_FOUND) - # - ############################################ - -- # On OSX when Qt is found as framework, never use the imported targets for now, since -+ # On OSX when Qt is found as framework, never use the imported targets for now, since - # in this case the handling of the framework directory currently does not work correctly. - IF(QT_USE_FRAMEWORKS) - SET(QT_USE_IMPORTED_TARGETS FALSE) -@@ -931,22 +942,30 @@ IF (QT4_QMAKE_FOUND) - - IF (QT_${basename}_LIBRARY_RELEASE) - SET_PROPERTY(TARGET Qt4::${_camelCaseBasename} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -- SET_PROPERTY(TARGET Qt4::${_camelCaseBasename} PROPERTY IMPORTED_LOCATION_RELEASE "${QT_${basename}_LIBRARY_RELEASE}" ) -+ if (QT_USE_FRAMEWORKS) -+ SET_PROPERTY(TARGET Qt4::${_camelCaseBasename} PROPERTY IMPORTED_LOCATION_RELEASE "${QT_${basename}_LIBRARY_RELEASE}/${_camelCaseBasename}" ) -+ else() -+ SET_PROPERTY(TARGET Qt4::${_camelCaseBasename} PROPERTY IMPORTED_LOCATION_RELEASE "${QT_${basename}_LIBRARY_RELEASE}" ) -+ endif() - ENDIF (QT_${basename}_LIBRARY_RELEASE) - - IF (QT_${basename}_LIBRARY_DEBUG) - SET_PROPERTY(TARGET Qt4::${_camelCaseBasename} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) -- SET_PROPERTY(TARGET Qt4::${_camelCaseBasename} PROPERTY IMPORTED_LOCATION_DEBUG "${QT_${basename}_LIBRARY_DEBUG}" ) -+ if(QT_USE_FRAMEWORKS) -+ SET_PROPERTY(TARGET Qt4::${_camelCaseBasename} PROPERTY IMPORTED_LOCATION_DEBUG "${QT_${basename}_LIBRARY_DEBUG}/${_camelCaseBasename}" ) -+ else() -+ SET_PROPERTY(TARGET Qt4::${_camelCaseBasename} PROPERTY IMPORTED_LOCATION_DEBUG "${QT_${basename}_LIBRARY_DEBUG}" ) -+ endif() - ENDIF (QT_${basename}_LIBRARY_DEBUG) - ENDIF(NOT TARGET Qt4::${_camelCaseBasename}) - - # If QT_USE_IMPORTED_TARGETS is enabled, the QT_QTFOO_LIBRARY variables are set to point at these - # imported targets. This works better in general, and is also in almost all cases fully -- # backward compatible. The only issue is when a project A which had this enabled then exports its -+ # backward compatible. The only issue is when a project A which had this enabled then exports its - # libraries via export or EXPORT_LIBRARY_DEPENDENCIES(). In this case the libraries from project - # A will depend on the imported Qt targets, and the names of these imported targets will be stored - # in the dependency files on disk. This means when a project B then uses project A, these imported -- # targets must be created again, otherwise e.g. "Qt4__QtCore" will be interpreted as name of a -+ # targets must be created again, otherwise e.g. "Qt4__QtCore" will be interpreted as name of a - # library file on disk, and not as a target, and linking will fail: - IF(QT_USE_IMPORTED_TARGETS) - SET(QT_${basename}_LIBRARY Qt4::${_camelCaseBasename} ) -@@ -1002,7 +1021,7 @@ IF (QT4_QMAKE_FOUND) - ENDMACRO (_QT4_ADJUST_LIB_VARS) - - -- # Set QT_xyz_LIBRARY variable and add -+ # Set QT_xyz_LIBRARY variable and add - # library include path to QT_INCLUDES - _QT4_ADJUST_LIB_VARS(QtCore) - _QT4_ADJUST_LIB_VARS(QtGui) -@@ -1052,7 +1071,7 @@ IF (QT4_QMAKE_FOUND) - - ####################################### - # -- # Check the executables of Qt -+ # Check the executables of Qt - # ( moc, uic, rcc ) - # - ####################################### -@@ -1071,86 +1090,44 @@ IF (QT4_QMAKE_FOUND) - SET(QT_DESIGNER_EXECUTABLE NOTFOUND) - SET(QT_LINGUIST_EXECUTABLE NOTFOUND) - ENDIF(QT_QMAKE_CHANGED) -+ -+ macro(_find_qt4_program VAR NAME) -+ find_program(${VAR} -+ NAMES ${ARGN} -+ PATHS ${QT_BINARY_DIR} -+ NO_DEFAULT_PATH -+ ) -+ if (${VAR} AND NOT TARGET ${NAME}) -+ add_executable(${NAME} IMPORTED) -+ set_property(TARGET ${NAME} PROPERTY IMPORTED_LOCATION ${${VAR}}) -+ endif() -+ endmacro() -+ -+ _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc moc4) -+ _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic uic4) -+ _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3) -+ _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc) -+ if(NOT WINCE) -+ _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml) -+ _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp) -+ else() -+ FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE -+ NAMES qdbuscpp2xml -+ PATHS ${HOST_BINDIR} -+ NO_DEFAULT_PATH -+ ) - -- FIND_PROGRAM(QT_MOC_EXECUTABLE -- NAMES moc-qt4 moc -- PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -- ) -- -- FIND_PROGRAM(QT_UIC_EXECUTABLE -- NAMES uic-qt4 uic -- PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -- ) -- -- FIND_PROGRAM(QT_UIC3_EXECUTABLE -- NAMES uic3 -- PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -- ) -- -- FIND_PROGRAM(QT_RCC_EXECUTABLE -- NAMES rcc -- PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -- ) -- --if(NOT WINCE) -- FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE -- NAMES qdbuscpp2xml -- PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -- ) -- -- FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE -- NAMES qdbusxml2cpp -- PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -- ) --else(NOT WINCE) -- FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE -- NAMES qdbuscpp2xml -- PATHS ${HOST_BINDIR} -- NO_DEFAULT_PATH -- ) -- -- FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE -- NAMES qdbusxml2cpp -- PATHS ${HOST_BINDIR} -- NO_DEFAULT_PATH -- ) --endif(NOT WINCE) -- -- FIND_PROGRAM(QT_LUPDATE_EXECUTABLE -- NAMES lupdate-qt4 lupdate -- PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -- ) -- -- FIND_PROGRAM(QT_LRELEASE_EXECUTABLE -- NAMES lrelease-qt4 lrelease -- PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -- ) -- -- FIND_PROGRAM(QT_QCOLLECTIONGENERATOR_EXECUTABLE -- NAMES qcollectiongenerator-qt4 qcollectiongenerator -- PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -- ) -- -- FIND_PROGRAM(QT_DESIGNER_EXECUTABLE -- NAMES designer-qt4 designer -- PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -- ) -- -- FIND_PROGRAM(QT_LINGUIST_EXECUTABLE -- NAMES linguist-qt4 linguist -- PATHS ${QT_BINARY_DIR} -- NO_DEFAULT_PATH -- ) -+ FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE -+ NAMES qdbusxml2cpp -+ PATHS ${HOST_BINDIR} -+ NO_DEFAULT_PATH -+ ) -+ endif() -+ _find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate-qt4 lupdate lupdate4) -+ _find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease-qt4 lrelease lrelease4) -+ _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator) -+ _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer designer4) -+ _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist linguist4) - - IF (QT_MOC_EXECUTABLE) - SET(QT_WRAP_CPP "YES") -@@ -1187,7 +1164,7 @@ endif(NOT WINCE) - ###################################### - - # if the includes,libraries,moc,uic and rcc are found then we have it -- IF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND -+ IF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND - QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE AND QT_QTCORE_LIBRARY) - SET( QT4_FOUND "YES" ) - IF( NOT Qt4_FIND_QUIETLY) -@@ -1215,15 +1192,15 @@ endif(NOT WINCE) - ENDIF( NOT QT_RCC_EXECUTABLE ) - MESSAGE( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!") - ENDIF( Qt4_FIND_REQUIRED) -- ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND -+ ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND - QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE AND QT_QTCORE_LIBRARY) -- -+ - SET(QT_FOUND ${QT4_FOUND}) - - - ############################################### - # -- # configuration/system dependent settings -+ # configuration/system dependent settings - # - ############################################### - -@@ -1232,7 +1209,7 @@ endif(NOT WINCE) - - ####################################### - # -- # compatibility settings -+ # compatibility settings - # - ####################################### - # Backwards compatibility for CMake1.4 and 1.2 -@@ -1242,11 +1219,11 @@ endif(NOT WINCE) - SET( QT_QT_LIBRARY "") - - ELSE(QT4_QMAKE_FOUND) -- -+ - SET(QT_QMAKE_EXECUTABLE "${QT_QMAKE_EXECUTABLE}-NOTFOUND" CACHE FILEPATH "Invalid qmake found" FORCE) -- -+ - # The code below is overly complex to make sure we do not break compatibility with CMake 2.6.x -- # For CMake 2.8, it should be simplified by getting rid of QT4_INSTALLED_VERSION_TOO_OLD and -+ # For CMake 2.8, it should be simplified by getting rid of QT4_INSTALLED_VERSION_TOO_OLD and - # QT4_INSTALLED_VERSION_TOO_NEW - IF(Qt4_FIND_REQUIRED) - IF(QT4_INSTALLED_VERSION_TOO_OLD) -@@ -1267,6 +1244,6 @@ ELSE(QT4_QMAKE_FOUND) - MESSAGE(STATUS "The installed Qt version ${QTVERSION} is too old, at least version ${QT_MIN_VERSION} is required") - ENDIF(QT4_INSTALLED_VERSION_TOO_OLD AND NOT Qt4_FIND_QUIETLY) - ENDIF(Qt4_FIND_REQUIRED) -- -+ - ENDIF (QT4_QMAKE_FOUND) - --- -1.8.5.3 - diff --git a/phonon/patches/0004-don-t-emit-backendchanged-when-we-have-no-backend.patch b/phonon/patches/0004-don-t-emit-backendchanged-when-we-have-no-backend.patch deleted file mode 100644 index 53f0b80154..0000000000 --- a/phonon/patches/0004-don-t-emit-backendchanged-when-we-have-no-backend.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 53b3f3cbc7f1bd2aa3708beaed57487c8685b436 Mon Sep 17 00:00:00 2001 -From: Harald Sitter -Date: Tue, 11 Mar 2014 16:04:42 +0100 -Subject: [PATCH 4/4] don't emit backendchanged when we have no backend - -otherwise certain call chains might cause an infinite loop where it -would attempt to construct a backend to get devices which triggers a -rebuild of the device cache which in turn tries to access the backend... ---- - phonon/factory.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/phonon/factory.cpp b/phonon/factory.cpp -index 1e081bb..4386108 100644 ---- a/phonon/factory.cpp -+++ b/phonon/factory.cpp -@@ -572,7 +572,9 @@ QObject *Factory::backend(bool createWhenNull) - // XXX: might create "reentrancy" problems: - // a method calls this method and is called again because the - // backendChanged signal is emitted -- emit globalFactory->backendChanged(); -+ if (globalFactory->m_backendObject) { -+ emit globalFactory->backendChanged(); -+ } - } - return globalFactory->m_backendObject; - } --- -1.8.5.3 - diff --git a/phonon/patches/import-relative-dir-resolution-workaround-from-CMake.patch b/phonon/patches/import-relative-dir-resolution-workaround-from-CMake.patch new file mode 100644 index 0000000000..36f321ac61 --- /dev/null +++ b/phonon/patches/import-relative-dir-resolution-workaround-from-CMake.patch @@ -0,0 +1,64 @@ +From 523288fa71bba2bb223e7ffbc68f5ebe55118ebd Mon Sep 17 00:00:00 2001 +From: Harald Sitter +Date: Wed, 28 May 2014 16:22:58 +0200 +Subject: [PATCH] import relative dir resolution workaround from + CMakePackageConfigHelpers + +this prevents the install path resolution from going wrong when symlinks +are involved in /usr/lib* (e.g. the case on Fedora). + +the result of not having this workaround is that the install dir will be +resolved as '/' resulting in bogus paths for cmake config users (e.g. +include dir would be set to //include/$soname) + +note: this was not actually tested on an affected system, weeh +--- + CMakeLists.txt | 19 +++++++++++++++++++ + PhononConfig.cmake.in | 1 + + 2 files changed, 20 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8d7f0d9..6130885 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -225,6 +225,25 @@ set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/${PHONON_LIB_SONAME} ) + # runtime different from the chosen CMAKE_INSTALL_PREFIX if under Windows the package was installed anywhere) + # This relative path will be configured into the PhononConfig.cmake + file(RELATIVE_PATH relInstallDir ${CMAKE_INSTALL_PREFIX}/${CMAKECONFIG_INSTALL_DIR} ${CMAKE_INSTALL_PREFIX} ) ++make_abs_install_path(absInstallDir ${CMAKECONFIG_INSTALL_DIR}) ++ ++# Exciting code copy from CMakePackageConfigHelpers to avoid the pain from porting ++# to it for the 4.x series. ++# The set variable is used by the PhononConfig.cmake.in to use a refined rootDir ++# resolution when installed to /usr/lib ++if("${absInstallDir}" MATCHES "^(/usr)?/lib(64)?/.+") ++ # Handle "/usr move" symlinks created by some Linux distros. ++ set(USR_SYMLINK_RESOLVER " ++ # Use original install prefix when loaded through a \"/usr move\" ++ # cross-prefix symbolic link such as /lib -> /usr/lib. ++ get_filename_component(_realCurr \"\${CMAKE_CURRENT_LIST_DIR}\" REALPATH) ++ get_filename_component(_realOrig \"${absInstallDir}\" REALPATH) ++ if(_realCurr STREQUAL _realOrig) ++ set(rootDir \"${CMAKE_INSTALL_PREFIX}\") ++ endif() ++ unset(_realOrig) ++ unset(_realCurr)") ++endif() + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PhononConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${PHONON_LIB_SONAME_CAMEL}Config.cmake @ONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PhononConfigVersion.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${PHONON_LIB_SONAME_CAMEL}ConfigVersion.cmake @ONLY) +diff --git a/PhononConfig.cmake.in b/PhononConfig.cmake.in +index f3962cb..f1f3e7c 100644 +--- a/PhononConfig.cmake.in ++++ b/PhononConfig.cmake.in +@@ -5,6 +5,7 @@ set(PHONON_VERSION "@PHONON_LIB_MAJOR_VERSION@.@PHONON_LIB_MINOR_VERSION@.@PHONO + + get_filename_component(currentDir ${CMAKE_CURRENT_LIST_FILE} PATH) # get the directory where I myself am + get_filename_component(rootDir ${currentDir}/@relInstallDir@ ABSOLUTE) # get the chosen install prefix ++@USR_SYMLINK_RESOLVER@ + + set(PHONON_NO_GRAPHICSVIEW @PHONON_NO_GRAPHICSVIEW@) + set(PHONON_PULSESUPPORT @PHONON_PULSESUPPORT@) +-- +1.9.3 + diff --git a/phonon/patches/phonon-4.7.0-rootDir.patch b/phonon/patches/phonon-4.7.0-rootDir.patch deleted file mode 100644 index ee8eb6d8e1..0000000000 --- a/phonon/patches/phonon-4.7.0-rootDir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up phonon-4.7.0/PhononConfig.cmake.in.rootDir phonon-4.7.0/PhononConfig.cmake.in ---- phonon-4.7.0/PhononConfig.cmake.in.rootDir 2013-11-11 10:15:33.835839769 -0600 -+++ phonon-4.7.0/PhononConfig.cmake.in 2013-11-11 10:16:55.063365497 -0600 -@@ -4,7 +4,7 @@ - set(PHONON_VERSION "@PHONON_LIB_MAJOR_VERSION@.@PHONON_LIB_MINOR_VERSION@.@PHONON_LIB_PATCH_VERSION@") - - get_filename_component(currentDir ${CMAKE_CURRENT_LIST_FILE} PATH) # get the directory where I myself am --get_filename_component(rootDir ${currentDir}/@relInstallDir@ ABSOLUTE) # get the chosen install prefix -+get_filename_component(rootDir @CMAKE_INSTALL_PREFIX@ ABSOLUTE) # get the chosen install prefix - - set(PHONON_NO_GRAPHICSVIEW @PHONON_NO_GRAPHICSVIEW@) - set(PHONON_PULSESUPPORT @PHONON_PULSESUPPORT@) diff --git a/phonon/phonon.SlackBuild b/phonon/phonon.SlackBuild index d5e68828ab..0eb00520f6 100755 --- a/phonon/phonon.SlackBuild +++ b/phonon/phonon.SlackBuild @@ -49,7 +49,7 @@ if [ "${SNAPBUILD}" = "YES" ] ;then VERSION=${VERSION:-"$(LC_ALL=C date +%Y%m%d)"} SNAPBRANCH=${SNAPBRANCH:-master} else - VERSION=${VERSION:-4.7.1} + VERSION=${VERSION:-4.7.2} fi if [ "${SB_NATIVE}" = "YES" ] ;then ARCH=${ARCH:-$(uname -m)} @@ -62,7 +62,7 @@ else SLKTARGET=${SLKTARGET:-i486} fi SLKDTARGET=${SLKDTARGET:-slackware} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))} DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION} SBDIR=${PKG}/usr/src/slackbuilds/${NAME} diff --git a/python-modules/python-modules-order.txt b/python-modules/python-modules-order.txt index 7f0bad1b39..b74367faf0 100644 --- a/python-modules/python-modules-order.txt +++ b/python-modules/python-modules-order.txt @@ -121,6 +121,7 @@ pymsn python-chm python-docutils +python-nbxmpp gajim python-eyed3 diff --git a/python-modules/python-nbxmpp/ChangeLog.SB b/python-modules/python-nbxmpp/ChangeLog.SB new file mode 100644 index 0000000000..f29d669a95 --- /dev/null +++ b/python-modules/python-nbxmpp/ChangeLog.SB @@ -0,0 +1,4 @@ +Sat Jun 21 12:15:03 BRT 2014 +python-nbxmpp-0.4-x86_64-1xinc.txz: + First SB. ++--------------------------+ diff --git a/python-modules/python-nbxmpp/python-nbxmpp.SlackBuild b/python-modules/python-nbxmpp/python-nbxmpp.SlackBuild new file mode 100755 index 0000000000..414ab5f732 --- /dev/null +++ b/python-modules/python-nbxmpp/python-nbxmpp.SlackBuild @@ -0,0 +1,195 @@ +#!/bin/bash +#-- python-nbxmpp for Slackware -- +# Build script by Phantom X +# Suggested usage: $ python-nbxmpp.SlackBuild 2>&1 | tee build.log +#-- +# Copyright 2008-2014 Phantom X, Goiania, Brazil. +# Copyright 2006 Martijn Dekker, Groningen, Netherlands. +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR `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 THE AUTHOR 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. + +# https://python-nbxmpp.gajim.org/ + +PACKAGER_ID=${PACKAGER_ID:-$USER} +PACKAGER=${PACKAGER:-$USER@$HOSTNAME} + +# Set YES for native build with gcc >= 4.2 +SB_NATIVE=${SB_NATIVE:-NO} + +# Set to YES to replicate slackbuild and patches +SB_REP=${SB_REP:-YES} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +if [ ! -d ${TMP} ]; then + mkdir -p ${TMP} +fi + +PNAME=nbxmpp +NAME=python-${PNAME} +PKG=${PKG:-${TMP}/package-${NAME}} + +VERSION=${VERSION:-0.4} +if [ "${SB_NATIVE}" = "YES" ] ;then + ARCH=${ARCH:-$(uname -m)} +else + ARCH=${ARCH:-x86_64} +fi +if [ "${ARCH}" = "x86_64" ] ;then + SLKTARGET=${SLKTARGET:-x86_64} +else + SLKTARGET=${SLKTARGET:-i486} +fi +BUILD=${BUILD:-1} +NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))} +DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION} +SBDIR=${PKG}/usr/src/slackbuilds/python-modules/${NAME} +PKGDEST=${PKGDEST:-${CWD}} +PKGFORMAT=${PKGFORMAT:-tgz} +PKGNAME=${NAME}-$(echo ${VERSION} | tr - . )-${ARCH}-${BUILD}${PACKAGER_ID} + +PYSITEARCH=$(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)') +PYSITELIB=$(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') +PYABI=$(python -c 'import sys; print (sys.version[:3])') +PYVER=$(python -c 'import sys; print sys.version.split(" ")[0]') + +DATE=$(LC_ALL=C date +%d-%b-%Y) + +SRCDIR=${PNAME}-${VERSION} +SRCARCHIVE=${SRCDIR}.tar.gz + +DL_PROG=${DL_PROG:-wget} +DL_TO=${DL_TO:-5} +DL_OPTS=${DL_OPTS:-"--timeout=${DL_TO}" --no-check-certificate} +DL_URL="https://python-nbxmpp.gajim.org/downloads/${SRCARCHIVE}" + +# if source is not present, download in source rootdir if possible +test -r ${CWD}/${SRCARCHIVE} || ${DL_PROG} ${DL_OPTS} ${DL_URL} || exit 1 + +if [ "${ARCH}" = "x86_64" ] ;then + LIBDIRSUFFIX="64" +else + LIBDIRSUFFIX="" +fi + +if [ -d ${PKG} ]; then + # Clean up a previous build + rm -rf ${PKG} +fi +mkdir -p ${PKG} + +cd ${TMP} +rm -rf ${SRCDIR} +tar -xvf ${CWD}/${SRCARCHIVE} || exit 1 +cd ${SRCDIR} || exit 1 + +chmod -R u+w,go+r-w,a-s . + +if [ -r ${CWD}/apply-patches.sh ]; then + . ${CWD}/apply-patches.sh +fi + +python setup.py build || exit $? + +python setup.py install -O1 --skip-build --root ${PKG} || exit $? + +# Add a documentation directory: +mkdir -p ${DOCDIR} +cp -a \ + AUTHORS COPYING LICENSE README NEWS THANKS TODO ${CWD}/ChangeLog.SB \ + ${DOCDIR}/ +[ -r ChangeLog ] && head -n 1000 ChangeLog > ${DOCDIR}/ChangeLog +find ${DOCDIR}/ -type d -print0 | xargs -0 chmod 0755 +find ${DOCDIR}/ -type f -print0 | xargs -0 chmod 0644 +find ${DOCDIR}/ -type f -size 0 -print0 | xargs -0 rm -f + +# Compress and link manpages, if any: +if [ -d ${PKG}/usr/share/man ]; then + mv ${PKG}/usr/share/man ${PKG}/usr/man + rmdir ${PKG}/usr/share +fi +if [ -d ${PKG}/usr/man ]; then + ( cd ${PKG}/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd ${manpagedir} + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink ${eachpage} ).gz ${eachpage}.gz + rm -f ${eachpage} + done + gzip -9 *.? + # Prevent errors + rm -f *.gz.gz + ) + done + ) +fi + +mkdir -p ${PKG}/install +cat ${CWD}/slack-desc > ${PKG}/install/slack-desc +sed -e "s|_PYVER_|${PYVER}|g" ${CWD}/slack-required \ + > ${PKG}/install/slack-required + +sed -i "s|_PACKAGER|${PACKAGER}|g; s|_BUILD_DATE|${DATE}|g" \ + ${PKG}/install/slack-desc + +if [ "${SB_REP}" = "YES" ] ;then + # Replicate slackbuild and patches + mkdir -p ${SBDIR}/patches + install -pm0644 ${CWD}/slack-desc ${CWD}/slack-required ${CWD}/ChangeLog.SB \ + ${CWD}/apply-patches.sh ${SBDIR}/ + install -pm0755 ${CWD}/${NAME}.SlackBuild \ + ${SBDIR}/${NAME}.SlackBuild + install -pm0644 ${CWD}/patches/*.* \ + ${SBDIR}/patches/ + rmdir ${SBDIR}/patches +fi + +# Build package: +set +o xtrace # no longer print commands upon execution +set -e + +ROOTCOMMANDS="set -o errexit -o xtrace ; cd ${PKG} ; + /bin/chown --recursive root:root . ;" + +ROOTCOMMANDS="${ROOTCOMMANDS} + /sbin/makepkg --linkadd y --chown n ${PKGDEST}/${PKGNAME}.${PKGFORMAT} " + +if test ${UID} = 0; then + eval ${ROOTCOMMANDS} + set +o xtrace +elif test "$(type -t fakeroot)" = 'file'; then + echo -e "\e[1mEntering fakeroot environment.\e[0m" + echo ${ROOTCOMMANDS} | fakeroot +else + echo -e "\e[1mPlease enter your root password.\e[0m (Consider installing fakeroot.)" + /bin/su -c "${ROOTCOMMANDS}" +fi + +# Clean up the extra stuff: +if [ "$1" = "--cleanup" ]; then + echo "Cleaning..." + if [ -d ${TMP}/${SRCDIR} ]; then + rm -rf ${TMP}/${SRCDIR} && echo "${TMP}/${SRCDIR} cleanup completed" + fi + if [ -d ${PKG} ]; then + rm -rf ${PKG} && echo "${PKG} cleanup completed" + fi + rmdir ${TMP} && echo "${TMP} cleanup completed" +fi +exit 0 diff --git a/python-modules/python-nbxmpp/slack-desc b/python-modules/python-nbxmpp/slack-desc new file mode 100644 index 0000000000..763adcc079 --- /dev/null +++ b/python-modules/python-nbxmpp/slack-desc @@ -0,0 +1,12 @@ +python-nbxmpp|-----handy-ruler------------------------------------------------------| +python-nbxmpp: python-nbxmpp (Python library for non-blocking use of Jabber/XMPP) +python-nbxmpp: +python-nbxmpp: python-nbxmpp is a Python library that provides a way for Python +python-nbxmpp: applications to use Jabber/XMPP networks in a non-blocking way. +python-nbxmpp: +python-nbxmpp: https://python-nbxmpp.gajim.org/ +python-nbxmpp: +python-nbxmpp: +python-nbxmpp: Packager: _PACKAGER on _BUILD_DATE +python-nbxmpp: +python-nbxmpp: diff --git a/python-modules/python-nbxmpp/slack-required b/python-modules/python-nbxmpp/slack-required new file mode 100644 index 0000000000..1cbe106fda --- /dev/null +++ b/python-modules/python-nbxmpp/slack-required @@ -0,0 +1,3 @@ +pygobject >= 2.28.6 +pyopenssl >= 0.14 +python >= _PYVER_ diff --git a/rsync/ChangeLog.SB b/rsync/ChangeLog.SB index 0a54b3bffb..79617a30b9 100644 --- a/rsync/ChangeLog.SB +++ b/rsync/ChangeLog.SB @@ -1,3 +1,7 @@ +Sun Jun 22 19:28:37 BRT 2014 +rsync-3.1.1-x86_64-1xinc.txz: + Updated to 3.1.1. ++--------------------------+ Sun Sep 29 11:46:09 BRT 2013 rsync-3.1.0-x86_64-1xinc.txz: Updated to 3.1.0. diff --git a/rsync/rsync.SlackBuild b/rsync/rsync.SlackBuild index 6a1c3d65c1..38295088e9 100755 --- a/rsync/rsync.SlackBuild +++ b/rsync/rsync.SlackBuild @@ -3,7 +3,7 @@ # Build script by Phantom X # Suggested usage: $ rsync.SlackBuild 2>&1 | tee build.log #-- -# Copyright 2008-2013 Phantom X, Goiania, Brazil. +# Copyright 2008-2014 Phantom X, Goiania, Brazil. # Copyright 2006 Martijn Dekker, Groningen, Netherlands. # All rights reserved. # @@ -44,7 +44,7 @@ fi NAME=rsync PKG=${PKG:-${TMP}/package-${NAME}} -VERSION=${VERSION:-3.1.0} +VERSION=${VERSION:-3.1.1} if [ "${SB_NATIVE}" = "YES" ] ;then ARCH=${ARCH:-$(uname -m)} else diff --git a/tvheadend/tvheadend.SlackBuild b/tvheadend/tvheadend.SlackBuild index 404dfb43c1..b49dd862f9 100755 --- a/tvheadend/tvheadend.SlackBuild +++ b/tvheadend/tvheadend.SlackBuild @@ -3,7 +3,7 @@ # Build script by Phantom X # Suggested usage: $ tvheadend.SlackBuild 2>&1 | tee build.log #-- -# Copyright 2008-2013 Phantom X, Goiania, Brazil. +# Copyright 2008-2014 Phantom X, Goiania, Brazil. # Copyright 2006 Martijn Dekker, Groningen, Netherlands. # All rights reserved. # @@ -50,7 +50,7 @@ if [ "${SNAPBUILD}" = "YES" ] ;then VERSION=${VERSION:-"$(LC_ALL=C date +%Y%m%d)"} SNAPBRANCH=${SNAPBRANCH:-master} else - VERSION=${VERSION:-3.2.18} + VERSION=${VERSION:-3.9} fi if [ "${SB_NATIVE}" = "YES" ] ;then ARCH=${ARCH:-$(uname -m)} @@ -79,13 +79,13 @@ SRCDIR=${NAME}-${VERSION} if [ "${SNAPBUILD}" = "YES" ] ;then SRCARCHIVE=${SRCDIR}.tar.xz else - SRCARCHIVE=${SRCDIR}.tar.gz + SRCARCHIVE=v${VERSION}.tar.gz fi DL_PROG=${DL_PROG:-wget} DL_TO=${DL_TO:-5} DL_OPTS=${DL_OPTS:-"--timeout=${DL_TO}"} -DL_URL="https://github.com/downloads/${NAME}/${NAME}/${SRCARCHIVE}" +DL_URL="https://github.com/${NAME}/${NAME}/archive/${SRCARCHIVE}" SNAPUPDATE=${NAME}-snapshot.sh export snap=${VERSION} export snapbranch=${SNAPBRANCH} @@ -94,7 +94,14 @@ export snapbranch=${SNAPBRANCH} if [ "${SNAPBUILD}" = "YES" ] ;then test -r ${CWD}/${SRCARCHIVE} || sh ${CWD}/${SNAPUPDATE} || exit 1 else - test -r ${CWD}/${SRCARCHIVE} || ${DL_PROG} ${DL_OPTS} ${DL_URL} || exit 1 + SRCARCHIVE=${SRCDIR}.tar.gz + test -r ${CWD}/${SRCARCHIVE} || ${DL_PROG} ${DL_OPTS} ${DL_URL} -O ${CWD}/${SRCARCHIVE} || exit 1 +fi + +if ! test -s ${CWD}/${SRCARCHIVE} ;then + echo "${CWD}/${SRCARCHIVE} is empty" + echo "Delete ${CWD}/${SRCARCHIVE}, check VERSION and try again." + exit 1 fi if [ "${SB_NATIVE}" = "YES" ] ;then @@ -134,6 +141,8 @@ if [ -r ${CWD}/apply-patches.sh ]; then . ${CWD}/apply-patches.sh fi +sed -i -e 's| -Werror||g' Makefile || exit 1 + CFLAGS="${SLKCFLAGS}" \ CXXFLAGS="${SLKCFLAGS}" \ ./configure \ @@ -147,6 +156,7 @@ CXXFLAGS="${SLKCFLAGS}" \ sed -i -e 's|-lavutil|\0 -lavcodec|g' .config.mk +export V=1 make -j${NJOBS} || make || exit $? make install DESTDIR=${PKG} || exit $? diff --git a/tvheadend/tvheadend.service b/tvheadend/tvheadend.service index 5d9d0f47b9..b895add67c 100644 --- a/tvheadend/tvheadend.service +++ b/tvheadend/tvheadend.service @@ -7,6 +7,9 @@ Type=forking PIDFile=/run/tvheadend.pid EnvironmentFile=/etc/default/tvheadend ExecStart=/usr/bin/tvheadend -f -u tvheadend -g tvheadend -c $TVHE_CONFIG -p /run/tvheadend.pid -w $TVHE_PORT -e $TVHE_PORT2 $TVHE_OPTIONS +ExecStop=/usr/bin/rm /run/tvheadend.pid +Restart=always +RestartSec=5 [Install] WantedBy=multi-user.target diff --git a/xorg/libva/ChangeLog.SB b/xorg/libva/ChangeLog.SB index 46e51f2f80..8d83f56392 100644 --- a/xorg/libva/ChangeLog.SB +++ b/xorg/libva/ChangeLog.SB @@ -1,3 +1,7 @@ +Fri Jun 20 17:52:29 BRT 2014 +libva-1.3.1-x86_64-2xinc.txz: + Rebuilt. ++--------------------------+ Sun May 11 12:04:21 BRT 2014 libva-1.3.1-x86_64-1xinc.txz: Updated to 1.3.1. diff --git a/xorg/libva/apply-patches.sh b/xorg/libva/apply-patches.sh index 454d5c4a5f..11165de0ee 100644 --- a/xorg/libva/apply-patches.sh +++ b/xorg/libva/apply-patches.sh @@ -4,5 +4,7 @@ set -e -o pipefail SB_PATCHDIR=${CWD}/patches # patch -p0 -E --backup --verbose -i ${SB_PATCHDIR}/${NAME}.patch +# Arch #40914 +patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch set +e +o pipefail diff --git a/xorg/libva/libva-compat32.SlackBuild b/xorg/libva/libva-compat32.SlackBuild index 942abee4e7..b6cbb7d222 100755 --- a/xorg/libva/libva-compat32.SlackBuild +++ b/xorg/libva/libva-compat32.SlackBuild @@ -52,7 +52,7 @@ else fi SLKTARGET32=${SLKTARGET32:-i486} SLKDTARGET=${SLKDTARGET:-slackware} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))} DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION} SBDIR=${PKG}/usr/src/slackbuilds/${PNAME} diff --git a/xorg/libva/libva.SlackBuild b/xorg/libva/libva.SlackBuild index 661ba94d4f..c175818ed9 100755 --- a/xorg/libva/libva.SlackBuild +++ b/xorg/libva/libva.SlackBuild @@ -55,7 +55,7 @@ else SLKTARGET=${SLKTARGET:-i486} fi SLKDTARGET=${SLKDTARGET:-slackware} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NJOBS=${NJOBS:-$(( $(getconf _NPROCESSORS_ONLN) + 1 ))} DOCDIR=${PKG}/usr/doc/${NAME}-${VERSION} SBDIR=${PKG}/usr/src/slackbuilds/xorg/${NAME} diff --git a/xorg/libva/patches/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch b/xorg/libva/patches/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch new file mode 100644 index 0000000000..6c1df31f17 --- /dev/null +++ b/xorg/libva/patches/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch @@ -0,0 +1,38 @@ +From d4988142a3f2256e38c5c5cdcdfc1b4f5f3c1ea9 Mon Sep 17 00:00:00 2001 +From: "Xiang, Haihao" +Date: Thu, 18 Jul 2013 13:13:31 +0800 +Subject: [PATCH] va: release VADisplayContext at the end of vaTerminate() + +Otherwise it will result in invalid reading in va_TraceEnd() + +Signed-off-by: Xiang, Haihao +--- + va/va.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/va/va.c b/va/va.c +index 6cb17ef..0ba595b 100644 +--- a/va/va.c ++++ b/va/va.c +@@ -515,15 +515,15 @@ VAStatus vaTerminate ( + free(old_ctx->vtable_vpp); + old_ctx->vtable_vpp = NULL; + +- if (VA_STATUS_SUCCESS == vaStatus) +- pDisplayContext->vaDestroy(pDisplayContext); +- + VA_TRACE_LOG(va_TraceTerminate, dpy); + + va_TraceEnd(dpy); + + va_FoolEnd(dpy); + ++ if (VA_STATUS_SUCCESS == vaStatus) ++ pDisplayContext->vaDestroy(pDisplayContext); ++ + return vaStatus; + } + +-- +2.0.0 +