diff options
author | root <root@rshg054.dnsready.net> | 2013-05-11 01:48:19 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-05-11 01:48:19 -0700 |
commit | 207b7c7b0d7bc0db898a2386a665bdb20495fb19 (patch) | |
tree | 972e21e2c70df56034182bfc0bf6ccbebab104b7 /extra | |
parent | fc7ee6f5a358c428577ae4e6217ff594a3e45ad3 (diff) |
Sat May 11 01:48:09 PDT 2013
Diffstat (limited to 'extra')
24 files changed, 143 insertions, 687 deletions
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index d036a3e32..1376a4d20 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 181138 2013-04-01 07:43:20Z bpiotrowski $ +# $Id: PKGBUILD 185036 2013-05-10 14:39:15Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=1.2 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ depends=( ) makedepends=('libvdpau' 'yasm') source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -sha256sums=('9a39fbc07dae0c893059e07491bcfb1e2409cc220f72b41eed23a04becea5aaf') +sha256sums=('0302375c3a64e9c2facfa7cbeb1aa333a39fdf6bbacda228cd48e04bf9ee32ca') build() { cd $pkgname-$pkgver diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 3cbc58c2c..bad7b3336 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183712 2013-04-27 12:28:29Z dan $ +# $Id: PKGBUILD 185043 2013-05-10 16:49:05Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.2.2 +pkgver=1.8.2.3 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -107,7 +107,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('f7407df37facf579dcaa979266cc3c59' - '765e8b9bbed49333f78103c6afd1dd0b' +md5sums=('03ebfd403a8cf355da0e3f15e53b8925' + '891481ec6ecd9ee530701378e5b61d3f' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index bb04902df..8edc2dff2 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 180567 2013-03-23 15:06:13Z andyrtr $ +# $Id: PKGBUILD 185059 2013-05-10 18:32:00Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gnutls -pkgver=3.1.10 +pkgver=3.1.11 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') -license=('GPL3' 'LGPL') +license=('GPL3' 'LGPL2.1') url="http://www.gnutls.org/" install=gnutls.install options=('!libtool' '!zipman') depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12') makedepends=('valgrind' 'strace' 'datefudge') source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('9e73aa5c3ef3b7358159a31302e25aa7' - '062dd4fe7d527dadbb3d9e9fb240510f') +md5sums=('b1c8f431f7c258a1e76cdba05cc1dd88' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index eca20ebf2..ac39bf8cd 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184407 2013-05-06 19:38:32Z foutrelis $ +# $Id: PKGBUILD 185016 2013-05-10 07:10:14Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -19,9 +19,9 @@ pkgname=('libreoffice-common' 'libreoffice-extension-report-builder' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.0.2.2 -pkgver=4.0.2 -pkgrel=4 +_LOver=4.0.3.3 +pkgver=4.0.3 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -74,17 +74,11 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll - ${_additional_source_url}/libcdr-0.0.11.tar.bz2 + ${_additional_source_url}/libcdr-0.0.12.tar.bz2 ${_additional_source_url}/libmspub-0.0.5.tar.bz2 - ${_additional_source_url}/libvisio-0.0.25.tar.bz2 + ${_additional_source_url}/libvisio-0.0.26.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff - libreoffice-common.sh libreoffice-common.csh - gcc48_1.diff - gcc48_2.diff - remove_unused_vars.diff - gcc48_3.diff - gcc48_4.diff - gcc48_5.diff) + libreoffice-common.sh libreoffice-common.csh) noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 @@ -114,12 +108,12 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - libcdr-0.0.11.tar.bz2 + libcdr-0.0.12.tar.bz2 libmspub-0.0.5.tar.bz2 - libvisio-0.0.25.tar.bz2) -md5sums=('2c92879fa8c50d0071c4703afb7d10bf' - '22e99e58aa32417dd7c132f40ae7654b' - '8b61fbfa6bcd18213b5744f2b8a289b0' + libvisio-0.0.26.tar.bz2) +md5sums=('7bcde561375f3bbce08f6d05451c8ad7' + '994b1f3015668335c30b53ddd3d60dc8' + '05b9ba0e86181bda3afeadcaba9202a3' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -149,39 +143,21 @@ md5sums=('2c92879fa8c50d0071c4703afb7d10bf' '0168229624cfac409e766913506961a8' '17410483b5b5f267aa18b7e00b65e6e0' '185d60944ea767075d27247c3162b3bc' - '107a3d18f637b342684b3c21eb0fcd7d' + '6db2c96a4ae5977da8b84893c1441038' '881c4628ec5f54d47f35d5d19e335662' - '92bde158f249b9b27f76f48cc65a0242' + '2f638cf6f92cec59c9205ac3cbf1702e' '07d2bf5ad839a394cca008b3ec6e7bb1' '4195735a80876ae812fca5736b50192a' - 'e7e4b3e70e99e5cba8f8dfcacf3b0d87' - '941aab11a42c8052cc1999434ae82bcd' - 'caf426e9eefb99108adba6cf231de348' - 'c367454b402720eea064280d0dfb291b' - '69aef9ea67856714e0ad3b5600b49bd7' - '424c346c52d1a3ee7b1008cdcf89ed82' - 'aed5397524af27a8cceced54a30edf23') + 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') build() { -# unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH -# [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh -# [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh - cd ${srcdir}/libreoffice-$_LOver # fix exttextcat build error # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] unset CPPFLAGS - # git commits from 2013-03-09 with "GCC" to fix gcc 4.8 issues -# patch -Np1 -i ${srcdir}/gcc48_1.diff -# patch -Np1 -i ${srcdir}/gcc48_2.diff -# patch -Np1 -i ${srcdir}/remove_unused_vars.diff -# patch -Np1 -i ${srcdir}/gcc48_3.diff -# patch -Np1 -i ${srcdir}/gcc48_4.diff -# patch -Np1 -i ${srcdir}/gcc48_5.diff - # move external sources into place mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources for source in "${noextract[@]}"; do diff --git a/extra/libreoffice/gcc48_1.diff b/extra/libreoffice/gcc48_1.diff deleted file mode 100644 index 7ee6bd249..000000000 --- a/extra/libreoffice/gcc48_1.diff +++ /dev/null @@ -1,52 +0,0 @@ -From 6bea5311d70f518444fe3218cf0b6f49bd93cc34 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 08 Mar 2013 09:36:44 +0000 -Subject: Work around GCC 4.8 -Werror=unused-local-typedefs in boost - -Change-Id: Ib137c5c5764333d7a878c5e996e6983a277d3856 ---- -diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk -index 2fcae8c..fde6fa6 100644 ---- a/boost/UnpackedTarball_boost.mk -+++ b/boost/UnpackedTarball_boost.mk -@@ -52,6 +52,8 @@ boost_patches += boost_1_44_0-clang-warnings.patch - # in GCC-4.7 experimental": - boost_patches += boost_1_44_0-gthreads.patch - -+boost_patches += boost_1_44_0-gcc4.8.patch -+ - $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) - - $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL))) -diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch -new file mode 100644 -index 0000000..9fc603e ---- a/dev/null -+++ b/boost/boost_1_44_0-gcc4.8.patch -@@ -0,0 +1,24 @@ -+--- misc/boost_1_44_0/boost/bind/arg.hpp -++++ misc/build/boost_1_44_0/boost/bind/arg.hpp -+@@ -35,6 +35,8 @@ -+ { -+ // static assert I == is_placeholder<T>::value -+ typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ]; -++ T_must_be_placeholder dummy; (void) dummy; -++ // silence -Werror=unused-local-typedefs (GCC 4.8) -+ } -+ }; -+ -+--- misc/boost_1_44_0/boost/concept/detail/general.hpp -++++ misc/build/boost_1_44_0/boost/concept/detail/general.hpp -+@@ -68,7 +68,9 @@ -+ # define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \ -+ typedef ::boost::concepts::detail::instantiate< \ -+ &::boost::concepts::requirement_<ModelFnPtr>::failed> \ -+- BOOST_PP_CAT(boost_concept_check,__LINE__) -++ BOOST_PP_CAT(boost_concept_check,__LINE__); \ -++ BOOST_PP_CAT(boost_concept_check,__LINE__) BOOST_PP_CAT(boost_concept_check_dummy,__LINE__)() -++ // silence -Werror=unused-local-typedefs (GCC 4.8) -+ -+ }} -+ --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/gcc48_2.diff b/extra/libreoffice/gcc48_2.diff deleted file mode 100644 index 559adddfa..000000000 --- a/extra/libreoffice/gcc48_2.diff +++ /dev/null @@ -1,45 +0,0 @@ -From c6cfd44717643b0630b5f8fd3262c243fdaaf239 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 08 Mar 2013 09:54:45 +0000 -Subject: Work around GCC 4.8 -Werror=format= in python3 - -...complainging that "‘PyArg_ParseTuple’ is an unrecognized format function -type." - -Change-Id: I125af6669010c4c9c1a18cc7c1a4895acc89338b ---- -diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk -index d8c0862..87adff0 100644 ---- a/python3/UnpackedTarball_python3.mk -+++ b/python3/UnpackedTarball_python3.mk -@@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ - python3/python-3.3.0-ssl.patch.1 \ - python3/python-3.3.0-implicit-int.patch.1 \ - python3/python-3.3.0-ffi-clang.patch.1 \ -+ python3/python-3.3.0-gcc-4.8.patch.1 \ - )) - - ifneq ($(OS),WNT) -diff --git a/python3/python-3.3.0-gcc-4.8.patch.1 b/python3/python-3.3.0-gcc-4.8.patch.1 -new file mode 100644 -index 0000000..8fb7107 ---- a/dev/null -+++ b/python3/python-3.3.0-gcc-4.8.patch.1 -@@ -0,0 +1,15 @@ -+--- Python-3.3.0/Include/modsupport.h 2012-09-29 10:00:26.000000000 +0200 -++++ Python-3.3.0/Include/modsupport.h 2013-03-08 10:46:28.671938738 +0100 -+@@ -26,7 +26,11 @@ -+ /* Due to a glitch in 3.2, the _SizeT versions weren't exported from the DLL. */ -+ #if !defined(PY_SSIZE_T_CLEAN) || !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 -+ PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...); -+-PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3); -++PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) -++#ifdef PY_SSIZE_T_CLEAN -++ Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3) -++#endif -++ ; -+ PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *, -+ const char *, char **, ...); -+ PyAPI_FUNC(int) PyArg_ValidateKeywordArguments(PyObject *); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/gcc48_3.diff b/extra/libreoffice/gcc48_3.diff deleted file mode 100644 index 395fe7928..000000000 --- a/extra/libreoffice/gcc48_3.diff +++ /dev/null @@ -1,46 +0,0 @@ -From 52c5eb20fd96d63e17cb9cd18912030131bcc787 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 08 Mar 2013 09:59:05 +0000 -Subject: -Werror=unused-local-typedefs (GCC 4.8) - -Change-Id: Ib1dedbe8e273463fa47573486d67dc9d509953db ---- -diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx -index f8267c6..810470e 100644 ---- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx -+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx -@@ -608,7 +608,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( - putenv(strdup(osJavaHome.getStr())); - #endif - -- typedef jint JNICALL JNI_InitArgs_Type(void *); - typedef jint JNICALL JNI_CreateVM_Type(JavaVM **, JNIEnv **, void *); - rtl::OUString sSymbolCreateJava( - RTL_CONSTASCII_USTRINGPARAM("JNI_CreateJavaVM")); -diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx -index 8c4f129..2694218 100644 ---- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx -+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx -@@ -201,8 +201,6 @@ void ClientBox::DeleteRemoved() - - if ( ! m_vRemovedEntries.empty() ) - { -- typedef std::vector< TClientBoxEntry >::iterator ITER; -- - m_vRemovedEntries.clear(); - } - -diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -index cd7df65..1eb94c9 100644 ---- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -+++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -@@ -225,7 +225,6 @@ void MasterPageObserver::Implementation::AddEventListener ( - - // Tell the new listener about all the master pages that are - // currently in use. -- typedef ::std::vector<String> StringList; - MasterPageContainer::iterator aDocumentIterator; - for (aDocumentIterator=maUsedMasterPages.begin(); - aDocumentIterator!=maUsedMasterPages.end(); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/gcc48_4.diff b/extra/libreoffice/gcc48_4.diff deleted file mode 100644 index 4dd92c7aa..000000000 --- a/extra/libreoffice/gcc48_4.diff +++ /dev/null @@ -1,223 +0,0 @@ -From 72c62e0e83598862e1c6e00e4264d7720aa94e41 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 08 Mar 2013 10:45:35 +0000 -Subject: -Werror=unused-local-typedefs (GCC 4.8) - -Change-Id: I873813e30e44712d6793bad91938eb847b55a7bb ---- -diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch -index 9fc603e..2d2beeb 100644 ---- a/boost/boost_1_44_0-gcc4.8.patch -+++ b/boost/boost_1_44_0-gcc4.8.patch -@@ -1,3 +1,45 @@ -+--- misc/boost_1_44_0/boost/algorithm/string/detail/finder.hpp -++++ misc/build/boost_1_44_0/boost/algorithm/string/detail/finder.hpp -+@@ -142,7 +142,6 @@ -+ ForwardIteratorT End, -+ std::forward_iterator_tag ) const -+ { -+- typedef ForwardIteratorT input_iterator_type; -+ typedef iterator_range<ForwardIteratorT> result_type; -+ -+ first_finder_type first_finder( -+@@ -263,7 +262,6 @@ -+ ForwardIteratorT End, -+ unsigned int N) const -+ { -+- typedef ForwardIteratorT input_iterator_type; -+ typedef iterator_range<ForwardIteratorT> result_type; -+ -+ // Sanity check -+@@ -298,7 +296,6 @@ -+ ForwardIteratorT End, -+ unsigned int N) const -+ { -+- typedef ForwardIteratorT input_iterator_type; -+ typedef iterator_range<ForwardIteratorT> result_type; -+ -+ // Sanity check -+@@ -362,7 +359,6 @@ -+ unsigned int N, -+ std::random_access_iterator_tag ) -+ { -+- typedef ForwardIteratorT input_iterator_type; -+ typedef iterator_range<ForwardIteratorT> result_type; -+ -+ if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) ) -+@@ -436,7 +432,6 @@ -+ unsigned int N, -+ std::random_access_iterator_tag ) -+ { -+- typedef ForwardIteratorT input_iterator_type; -+ typedef iterator_range<ForwardIteratorT> result_type; -+ -+ if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) ) - --- misc/boost_1_44_0/boost/bind/arg.hpp - +++ misc/build/boost_1_44_0/boost/bind/arg.hpp - @@ -35,6 +35,8 @@ -@@ -22,3 +64,163 @@ - - }} - -+--- misc/boost_1_44_0/boost/date_time/date_parsing.hpp -++++ misc/build/boost_1_44_0/boost/date_time/date_parsing.hpp -+@@ -113,7 +113,6 @@ -+ spec_str = "mdy"; -+ } -+ -+- typedef typename date_type::year_type year_type; -+ typedef typename date_type::month_type month_type; -+ unsigned pos = 0; -+ unsigned short year(0), month(0), day(0); -+@@ -159,7 +158,7 @@ -+ parse_undelimited_date(const std::string& s) { -+ int offsets[] = {4,2,2}; -+ int pos = 0; -+- typedef typename date_type::year_type year_type; -++ //typedef typename date_type::year_type year_type; -+ //typename date_type::ymd_type ymd((year_type::min)(),1,1); -+ unsigned short y = 0, m = 0, d = 0; -+ -+--- misc/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp -++++ misc/build/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp -+@@ -36,7 +36,6 @@ -+ boost::io::ios_flags_saver iflags(os); -+ typedef local_date_time time_type;//::utc_time_type typename -+ typedef date_time::time_facet<time_type, CharT> custom_time_facet; -+- typedef std::time_put<CharT> std_time_facet; -+ std::ostreambuf_iterator<CharT> oitr(os); -+ -+ if(std::has_facet<custom_time_facet>(os.getloc())) { -+@@ -123,7 +122,6 @@ -+ const boost::local_time::local_time_period& p) { -+ boost::io::ios_flags_saver iflags(os); -+ typedef boost::date_time::time_facet<local_date_time, CharT> custom_facet; -+- typedef std::time_put<CharT> std_time_facet; -+ std::ostreambuf_iterator<CharT> oitr(os); -+ if (std::has_facet<custom_facet>(os.getloc())) { -+ std::use_facet<custom_facet>(os.getloc()).put(oitr, os, os.fill(), p); -+--- misc/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp -++++ misc/build/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp -+@@ -47,7 +47,6 @@ -+ const ptime& p) { -+ boost::io::ios_flags_saver iflags(os); -+ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; -+- typedef std::time_put<CharT> std_ptime_facet; -+ std::ostreambuf_iterator<CharT> oitr(os); -+ if (std::has_facet<custom_ptime_facet>(os.getloc())) -+ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p); -+@@ -114,7 +113,6 @@ -+ const boost::posix_time::time_period& p) { -+ boost::io::ios_flags_saver iflags(os); -+ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; -+- typedef std::time_put<CharT> std_time_facet; -+ std::ostreambuf_iterator<CharT> oitr(os); -+ if (std::has_facet<custom_ptime_facet>(os.getloc())) { -+ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p); -+@@ -180,7 +178,6 @@ -+ { -+ boost::io::ios_flags_saver iflags(os); -+ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; -+- typedef std::time_put<CharT> std_ptime_facet; -+ std::ostreambuf_iterator<CharT> oitr(os); -+ if (std::has_facet<custom_ptime_facet>(os.getloc())) -+ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), td); -+--- misc/boost_1_44_0/boost/date_time/string_convert.hpp -++++ misc/build/boost_1_44_0/boost/date_time/string_convert.hpp -+@@ -21,7 +21,6 @@ -+ inline -+ std::basic_string<OutputT> convert_string_type(const std::basic_string<InputT>& inp_str) -+ { -+- typedef std::basic_string<InputT> input_type; -+ typedef std::basic_string<OutputT> output_type; -+ output_type result; -+ result.insert(result.begin(), inp_str.begin(), inp_str.end()); -+--- misc/boost_1_44_0/boost/date_time/strings_from_facet.hpp -++++ misc/build/boost_1_44_0/boost/date_time/strings_from_facet.hpp -+@@ -35,7 +35,6 @@ -+ { -+ typedef std::basic_string<charT> string_type; -+ typedef std::vector<string_type> collection_type; -+- typedef std::basic_ostringstream<charT> ostream_type; -+ typedef std::ostreambuf_iterator<charT> ostream_iter_type; -+ typedef std::basic_ostringstream<charT> stringstream_type; -+ typedef std::time_put<charT> time_put_facet_type; -+@@ -85,7 +84,6 @@ -+ { -+ typedef std::basic_string<charT> string_type; -+ typedef std::vector<string_type> collection_type; -+- typedef std::basic_ostringstream<charT> ostream_type; -+ typedef std::ostreambuf_iterator<charT> ostream_iter_type; -+ typedef std::basic_ostringstream<charT> stringstream_type; -+ typedef std::time_put<charT> time_put_facet_type; -+--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp -++++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp -+@@ -39,8 +39,6 @@ -+ -+ template <typename Array, typename IdxGen, typename Call_Type> -+ static void call(Array& a, const IdxGen& idgen, Call_Type c) { -+- typedef typename Array::index_range index_range_; -+- typedef typename Array::index index_; -+ idgen_helper<N-1>::call(a,idgen[c],c); -+ } -+ }; -+@@ -50,8 +48,6 @@ -+ -+ template <typename Array, typename IdxGen, typename Call_Type> -+ static void call(Array& a, const IdxGen& idgen, Call_Type) { -+- typedef typename Array::index_range index_range_; -+- typedef typename Array::index index_; -+ a[ idgen ]; -+ } -+ }; -+--- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp -++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp -+@@ -307,7 +307,6 @@ -+ #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) -+ typedef impl::grammar_helper_base<GrammarT> helper_base_t; -+ typedef grammar_helper_list<GrammarT> helper_list_t; -+- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; -+ -+ helper_list_t& helpers = -+ # if !defined(__GNUC__) || (__GNUC__ > 2) -+@@ -318,6 +317,7 @@ -+ -+ # if (defined(BOOST_MSVC) && (BOOST_MSVC < 1300)) \ -+ || defined(BOOST_INTEL_CXX_VERSION) -++ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; -+ for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) -+ (*i)->undefine(self); -+ # else -+--- misc/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp -++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp -+@@ -47,7 +47,6 @@ -+ typename parser_result<self_t, ScannerT>::type -+ parse(ScannerT const& scan) const -+ { -+- typedef typename parser_result<self_t, ScannerT>::type result_t; -+ typedef typename ScannerT::value_t value_t; -+ typedef typename ScannerT::iterator_t iterator_t; -+ -+--- misc/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp -++++ misc/build/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp -+@@ -140,7 +140,6 @@ -+ parse(ScannerT const& scan) const -+ { -+ typedef typename parser_result<ParserT, ScannerT>::type result_t; -+- typedef typename ScannerT::iterator_t iterator_t; -+ -+ result_t hit = this->subject().parse(scan); -+ if (!hit) -+--- misc/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp -++++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp -+@@ -49,8 +49,6 @@ -+ typename parser_result<self_t, ScannerT>::type -+ parse(ScannerT const& scan) const -+ { -+- typedef typename parser_result<self_t, ScannerT>::type result_t; -+- typedef typename ScannerT::value_t value_t; -+ typedef typename ScannerT::iterator_t iterator_t; -+ -+ iterator_t const s(scan.first); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/gcc48_5.diff b/extra/libreoffice/gcc48_5.diff deleted file mode 100644 index f63571039..000000000 --- a/extra/libreoffice/gcc48_5.diff +++ /dev/null @@ -1,34 +0,0 @@ -From 157ce65588ec8ef4ff8f805f7b8a64fefdd9edec Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 08 Mar 2013 11:07:11 +0000 -Subject: Work around GCC 4.8 -Werror=virtual-move-assign - -...complaining that "defaulted move assignment for ‘cppcanvas::SpriteCanvas’ -calls a non-trivial move assignment operator for virtual base -‘cppcanvas::BitmapCanvas’." - -Change-Id: I4dc92176dbec62f0ae4fa7d2842073077ecb8fc3 ---- -diff --git a/cppcanvas/inc/cppcanvas/spritecanvas.hxx b/cppcanvas/inc/cppcanvas/spritecanvas.hxx -index 59aa3da..6a606b3 100644 ---- a/cppcanvas/inc/cppcanvas/spritecanvas.hxx -+++ b/cppcanvas/inc/cppcanvas/spritecanvas.hxx -@@ -24,6 +24,7 @@ - #include <osl/diagnose.h> - #include <basegfx/vector/b2dsize.hxx> - -+#include <boost/noncopyable.hpp> - #include <boost/shared_ptr.hpp> - - -@@ -48,7 +49,7 @@ namespace cppcanvas - - /** SpriteCanvas interface - */ -- class SpriteCanvas : public virtual BitmapCanvas -+ class SpriteCanvas : public virtual BitmapCanvas, private boost::noncopyable - { - public: - virtual bool updateScreen( bool bUpdateAll ) const = 0; --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/remove_unused_vars.diff b/extra/libreoffice/remove_unused_vars.diff deleted file mode 100644 index 7970b913c..000000000 --- a/extra/libreoffice/remove_unused_vars.diff +++ /dev/null @@ -1,26 +0,0 @@ -From 305bf19e390aebdf2d20ea052a92f782e8d1185c Mon Sep 17 00:00:00 2001 -From: Thomas Arnhold <thomas@arnhold.org> -Date: Sun, 24 Feb 2013 17:39:08 +0000 -Subject: loplugin: unused variables - -And some fallout. - -Change-Id: I8dfc12f3566e72d79d4f9930284c92577aa485a1 ---- -(limited to 'sd/source/ui/toolpanel/controls/MasterPageObserver.cxx') - -diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -index 1d27c9d..cd7df65 100644 ---- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -+++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -@@ -226,8 +226,6 @@ void MasterPageObserver::Implementation::AddEventListener ( - // Tell the new listener about all the master pages that are - // currently in use. - typedef ::std::vector<String> StringList; -- StringList aNewMasterPages; -- StringList aRemovedMasterPages; - MasterPageContainer::iterator aDocumentIterator; - for (aDocumentIterator=maUsedMasterPages.begin(); - aDocumentIterator!=maUsedMasterPages.end(); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index f648b4e62..d5f926997 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 178301 2013-02-19 19:05:06Z ronald $ +# $Id: PKGBUILD 185029 2013-05-10 12:32:47Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima -pkgver=5.29.1 +pkgver=5.30.0 pkgrel=1 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64') license=('GPL') url="http://maxima.sourceforge.net" -depends=('sbcl=1.1.4' 'texinfo' 'sh') +depends=('sbcl=1.1.7' 'texinfo' 'sh') makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') # needs rebuild when bash changes version @@ -17,7 +17,7 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/ options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima install=maxima.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop") -sha1sums=('9be04303d6a5472bc95576b7de7286fa4b8ff604' +sha1sums=('ae009d71524f55264b346b03dac8e504e3b18ac0' '4398ebb1ec85ccfa12f37516a56d60c26f74b18b') build() { @@ -28,6 +28,9 @@ build() { ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \ --libexecdir=/usr/lib --enable-sbcl --with-default-lisp=sbcl + + # help avoid (re)running makeinfo/tex + touch doc/info/maxima.info make } diff --git a/extra/notification-daemon/PKGBUILD b/extra/notification-daemon/PKGBUILD deleted file mode 100644 index f7e249a87..000000000 --- a/extra/notification-daemon/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 183449 2013-04-21 22:11:53Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Mark Rosenstand <mark@borkware.net> - -pkgname=notification-daemon -pkgver=0.7.6 -pkgrel=2 -pkgdesc="Notification daemon for the desktop notifications framework" -arch=(i686 x86_64) -license=(GPL) -url="http://www.galago-project.org/specs/notification/" -depends=(gtk3 libcanberra) -makedepends=(pkgconfig intltool) -options=('!libtool' '!emptydirs') -source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz) -sha256sums=('64d0ce6fb12c94c3b73b701502c804c408cb5a94580bcae5ac37607639f7a0b3') - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/notification-daemon-1.0 \ - --localstatedir=/var --disable-static - make -} - -check() { - cd ${pkgname}-${pkgver} - make check -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/extra/notification-daemon/notification-daemon.install b/extra/notification-daemon/notification-daemon.install deleted file mode 100644 index 8a1aa3433..000000000 --- a/extra/notification-daemon/notification-daemon.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=notification-daemon - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index 88a5e11ea..a00640517 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 178844 2013-02-27 16:21:24Z jgc $ +# $Id: PKGBUILD 185090 2013-05-10 21:54:30Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss pkgver=3.14.3 -pkgrel=2 +pkgrel=3 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64) url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') -_nsprver=4.9.5 +_nsprver=4.9.6 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh') makedepends=('perl') options=('!strip') diff --git a/extra/polkit-gnome/PKGBUILD b/extra/polkit-gnome/PKGBUILD deleted file mode 100644 index cbd405df2..000000000 --- a/extra/polkit-gnome/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 141266 2011-10-27 16:27:38Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: onestep_ua <onestep@ukr.net> - -pkgname=polkit-gnome -pkgver=0.105 -pkgrel=1 -pkgdesc="PolicyKit integration for the GNOME desktop" -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/PolicyKit" -license=('LGPL') -depends=('polkit' 'gtk3') -makedepends=('intltool' 'gobject-introspection') -options=(!libtool) -source=(http://download.gnome.org/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz - polkit-gnome-authentication-agent-1.desktop) -sha256sums=('1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369' - 'ad19e73ae8eba00a8f66bd9afd3e0e1fd7ca22f716e29b97f097d9c01711e0de') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib/polkit-gnome \ - --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/polkit-gnome-authentication-agent-1.desktop" \ - "${pkgdir}/etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop" -} diff --git a/extra/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/extra/polkit-gnome/polkit-gnome-authentication-agent-1.desktop deleted file mode 100644 index fc2acc28d..000000000 --- a/extra/polkit-gnome/polkit-gnome-authentication-agent-1.desktop +++ /dev/null @@ -1,88 +0,0 @@ -[Desktop Entry] -Name=PolicyKit Authentication Agent -Name[ar]=مدير الاستيثاق PolicyKit -Name[be]=PolicyKit - аґент аўтэнтыфікацыі -Name[bn_IN]=PolicyKit অনুমোদনের এজেন্ট -Name[ca]=Agent d'autenticació del PolicyKit -Name[cs]=Ověřovací agent PolicyKit -Name[da]=Godkendelsesprogrammet PolicyKit -Name[de]=Legitimationsdienst von PolicyKit -Name[el]=Πράκτορας πιστοποίησης PolicyKit -Name[en_GB]=PolicyKit Authentication Agent -Name[es]=Agente de autenticación de PolicyKit -Name[eu]=PolicyKit autentifikatzeko agentea -Name[fi]=PolicytKit-tunnistautumisohjelma -Name[fr]=Agent d'authentification de PolicyKit -Name[gl]=Axente de autenticación PolicyKit -Name[gu]=PolicyKit સત્તાધિકરણ એજન્ટ -Name[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि -Name[hu]=PolicyKit hitelesítési ügynök -Name[it]=Agente di autenticazione per PolicyKit -Name[ja]=PolicyKit 認証エージェント -Name[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ -Name[lt]=PolicyKit tapatybės nustatymo agentas -Name[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന് ഏജന്റ് -Name[mr]=PolicyKit ऑथेंटीकेशन एजेंट -Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ -Name[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ -Name[pl]=Agent uwierzytelniania PolicyKit -Name[pt]=Agente de Autenticação PolicyKit -Name[pt_BR]=Agente de autenticação PolicyKit -Name[ro]=Agent de autentificare PolicyKit -Name[sk]=Agent PolicyKit na overovanie totožnosti -Name[sl]=PolicyKit program overjanja -Name[sv]=Autentiseringsagent för PolicyKit -Name[ta]=PolicyKit அங்கீகார முகவர் -Name[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి -Name[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit -Name[uk]=Агент автентифікації PolicyKit -Name[zh_CN]=PolicyKit 认证代理 -Name[zh_HK]=PolicyKit 驗證代理程式 -Name[zh_TW]=PolicyKit 驗證代理程式 -Comment=PolicyKit Authentication Agent -Comment[ar]=مدير الاستيثاق PolicyKit -Comment[be]=PolicyKit - аґент аўтэнтыфікацыі -Comment[bn_IN]=PolicyKit অনুমোদনের এজেন্ট -Comment[ca]=Agent d'autenticació del PolicyKit -Comment[cs]=Ověřovací agent PolicyKit -Comment[da]=Godkendelsesprogrammet PolicyKit -Comment[de]=Legitimationsdienst von PolicyKit -Comment[el]=Πράκτορας πιστοποίησης PolicyKit -Comment[en_GB]=PolicyKit Authentication Agent -Comment[es]=Agente de autenticación de PolicyKit -Comment[eu]=PolicyKit autentifikatzeko agentea -Comment[fi]=PolicytKit-tunnistautumisohjelma -Comment[fr]=Agent d'authentification de PolicyKit -Comment[gl]=Axente de autenticación PolicyKit -Comment[gu]=PolicyKit સત્તાધિકરણ એજન્ટ -Comment[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि -Comment[hu]=PolicyKit hitelesítési ügynök -Comment[it]=Agente di autenticazione per PolicyKit -Comment[ja]=PolicyKit 認証エージェント -Comment[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ -Comment[lt]=PolicyKit tapatybės nustatymo agentas -Comment[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന് ഏജന്റ് -Comment[mr]=PolicyKit ऑथेंटीकेशन एजेंट -Comment[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ -Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ -Comment[pl]=Agent uwierzytelniania PolicyKit -Comment[pt]=Agente de Autenticação PolicyKit -Comment[pt_BR]=Agente de autenticação PolicyKit -Comment[ro]=Agent de autentificare PolicyKit -Comment[sk]=Agent PolicyKit na overovanie totožnosti -Comment[sl]=PolicyKit program overjanja -Comment[sv]=Autentiseringsagent för PolicyKit -Comment[ta]=PolicyKit அங்கீகார முகவர் -Comment[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి -Comment[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit -Comment[uk]=Агент автентифікації PolicyKit -Comment[zh_CN]=PolicyKit 认证代理 -Comment[zh_HK]=PolicyKit 驗證代理程式 -Comment[zh_TW]=PolicyKit 驗證代理程式 -Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 -Terminal=false -Type=Application -Categories= -NoDisplay=true -NotShowIn=KDE; -AutostartCondition=GNOME3 unless-session gnome diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index a9a826ab4..2ed9bc142 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184427 2013-05-06 19:39:27Z foutrelis $ +# $Id: PKGBUILD 185057 2013-05-10 18:09:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 pkgver=4.8.4 -pkgrel=17 +pkgrel=18 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -28,13 +28,15 @@ replaces=('qt<=4.8.4') conflicts=('qt') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz" - 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' 'linguist-qt4.desktop' + 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' + 'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop' 'improve-cups-support.patch') md5sums=('89c5ecba180cae74c66260ac732dc5cb' 'a16638f4781e56e7887ff8212a322ecc' - '4f0152ba6d645e81218b23ba8beeb42d' - '283a00ff7f662dca481b70d6daa826e0' - '027683880235708d4bc270a7ef961183' + '8a28b3f52dbeb685d4b69440b520a3e1' + '9727c406c240990870c905696a8c5bd1' + '0e384663d3dd32abe35f5331c4147569' + 'b859c5673e5098c39f72b2252947049e' 'c439c7731c25387352d8453ca7574971') build() { @@ -87,10 +89,26 @@ package() { # install missing icons and desktop files install -D -m644 src/gui/dialogs/images/qtlogo-64.png \ - "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qt4logo.png" + "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/qt4logo.png + install -D -m644 tools/assistant/tools/assistant/images/assistant.png \ + "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/assistant-qt4.png + install -D -m644 tools/assistant/tools/assistant/images/assistant-128.png \ + "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/assistant-qt4.png + install -D -m644 tools/designer/src/designer/images/designer.png \ + "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/designer-qt4.png + for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -D -m644 ${icon} \ + "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/linguist-qt4.png + done + install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer.png \ + "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/qdbusviewer-qt4.png + install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \ + "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/qdusviewer-qt4.png + install -d "${pkgdir}"/usr/share/applications - install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig}-qt4.desktop \ - "${pkgdir}/usr/share/applications/" + install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig,qdbusviewer}-qt4.desktop \ + "${pkgdir}"/usr/share/applications/ # Useful symlinks for cmake and configure scripts install -d "${pkgdir}"/usr/bin diff --git a/extra/qt4/assistant-qt4.desktop b/extra/qt4/assistant-qt4.desktop index d2904beb2..d874d612b 100644 --- a/extra/qt4/assistant-qt4.desktop +++ b/extra/qt4/assistant-qt4.desktop @@ -2,7 +2,7 @@ Name=Qt4 Assistant Comment=Shows Qt4 documentation and examples Exec=assistant-qt4 -Icon=assistant +Icon=assistant-qt4 Terminal=false Encoding=UTF-8 Type=Application diff --git a/extra/qt4/designer-qt4.desktop b/extra/qt4/designer-qt4.desktop index 514146e78..86ea4eda5 100644 --- a/extra/qt4/designer-qt4.desktop +++ b/extra/qt4/designer-qt4.desktop @@ -3,7 +3,7 @@ Name=Qt4 Designer GenericName=Interface Designer Comment=Design GUIs for Qt4 applications Exec=designer-qt4 -Icon=designer +Icon=designer-qt4 MimeType=application/x-designer; Terminal=false Encoding=UTF-8 diff --git a/extra/qt4/linguist-qt4.desktop b/extra/qt4/linguist-qt4.desktop index 61036b307..765c88275 100644 --- a/extra/qt4/linguist-qt4.desktop +++ b/extra/qt4/linguist-qt4.desktop @@ -2,7 +2,7 @@ Name=Qt4 Linguist Comment=Add translations to Qt4 applications Exec=linguist-qt4 -Icon=linguist +Icon=linguist-qt4 MimeType=text/vnd.trolltech.linguist;application/x-linguist; Terminal=false Encoding=UTF-8 diff --git a/extra/qt4/qdbusviewer-qt4.desktop b/extra/qt4/qdbusviewer-qt4.desktop new file mode 100644 index 000000000..2d4218c9b --- /dev/null +++ b/extra/qt4/qdbusviewer-qt4.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt4 QDbusViewer +GenericName=D-Bus Debugger +Comment=Debug D-Bus applications +Exec=qdbusviewer-qt4 +Icon=qdbusviewer-qt4 +Terminal=false +Type=Application +Categories=Qt;Development;Debugger; + diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index 752376596..adbbb6f91 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178213 2013-02-18 09:01:22Z juergen $ +# $Id: PKGBUILD 185032 2013-05-10 12:58:50Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.1.4 +pkgver=1.1.7 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -13,18 +13,37 @@ arch=('i686' 'x86_64') license=('custom') depends=('glibc' 'zlib') provides=('common-lisp' 'cl-asdf') -makedepends=('sbcl' 'texinfo') +makedepends=('sbcl') install=sbcl.install source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" - "arch-fixes.lisp") -md5sums=('9d82ec89abbaf265fbfc71a24445dd66' - '7ac0c1936547f4278198b8bf7725204d') + "arch-fixes.lisp" + "ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-4.13a.tar.gz" + "texinfo-4.13a-data_types.patch") +md5sums=('ca3dd0ce2943e10a1c86ff5f40db3f85' + '7ac0c1936547f4278198b8bf7725204d' + '71ba711519209b5fb583fed2b3d86fcb' + 'd8574782ff7def1e2dc5c291dbeaec18') + + +# Temporary Texinfo legacy build +# See: http://sourceforge.net/mailarchive/message.php?msg_id=30747919 + +build-texinfo-legacy() { + cd ${srcdir}/texinfo-4.13 + patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch + mkdir -p $srcdir/texinfo-instroot + ./configure --prefix=$srcdir/texinfo-instroot + make install +} build() { + build-texinfo-legacy + export PATH=$srcdir/texinfo-instroot/bin:$PATH + cd "$srcdir/$pkgname-$pkgver" - export CFLAGS+=" -D_GNU_SOURCE -DSBCL_HOME=\\\"/usr/lib/sbcl\\\"" - export GNUMAKE="make -e" + export CFLAGS+=" -D_GNU_SOURCE -fno-omit-frame-pointer -DSBCL_HOME=/usr/lib/sbcl" + export GNUMAKE="make" # build system uses LINKFLAGS and OS_LIBS to build LDFLAGS export LINKFLAGS="$LDFLAGS" @@ -40,14 +59,15 @@ build() { (disable :largefile))) EOF - sh make.sh sbcl + sh make.sh sbcl --prefix=/usr make -C doc/manual info } package() { cd "$srcdir/$pkgname-$pkgver" - INSTALL_ROOT="$pkgdir/usr" sh install.sh + # cannot have both SBCL_HOME and INSTALL_ROOT + SBCL_HOME="" INSTALL_ROOT="$pkgdir/usr" sh install.sh src/runtime/sbcl --core output/sbcl.core --script "${srcdir}/arch-fixes.lisp" mv sbcl-new.core "${pkgdir}/usr/lib/sbcl/sbcl.core" diff --git a/extra/sbcl/texinfo-4.13a-data_types.patch b/extra/sbcl/texinfo-4.13a-data_types.patch new file mode 100644 index 000000000..2a87c2146 --- /dev/null +++ b/extra/sbcl/texinfo-4.13a-data_types.patch @@ -0,0 +1,32 @@ +diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c +--- texinfo-4.13/info/window.c_old 2009-08-04 13:46:15.000000000 +0200 ++++ texinfo-4.13/info/window.c 2009-08-04 13:47:29.000000000 +0200 +@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st + const char *carried_over_ptr; + size_t carried_over_len, carried_over_count; + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); ++ size_t cur_len = mb_len (mbi_cur (iter)); + int replen; + int delim = 0; + int rc; +@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage) + mbi_advance (iter)) + { + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); ++ size_t cur_len = mb_len (mbi_cur (iter)); + + if (cur_len == 1) + { +@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line, + mbi_advance (iter)) + { + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); +- int replen; ++ size_t cur_len = mb_len (mbi_cur (iter)); ++ size_t replen; + + if (cur_ptr >= endp) + break; diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index 2b4a87884..6d869c448 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184138 2013-05-02 15:21:00Z andrea $ +# $Id: PKGBUILD 185050 2013-05-10 17:29:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=soprano -pkgver=2.9.1 +pkgver=2.9.2 pkgrel=1 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL' 'LGPL') depends=('qt4' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base') makedepends=('cmake' 'java-environment' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('c7beb1bda475f363fa0afb58edc541fe') +md5sums=('60ce910cf3c8e4655c614b45d73f2b2a') build() { mkdir build |