Sun Apr 7 00:54:38 PDT 2013

9 files changed, 24 insertions, 140 deletions

diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index c5a381df5..cb897bcbb 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 181859 2013-04-04 18:56:27Z andyrtr $
+# $Id: PKGBUILD 182085 2013-04-06 18:07:38Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -21,7 +21,7 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
 _LOver=4.0.2.2
 pkgver=4.0.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -152,9 +152,9 @@ md5sums=('2c92879fa8c50d0071c4703afb7d10bf'
          '107a3d18f637b342684b3c21eb0fcd7d'
          '881c4628ec5f54d47f35d5d19e335662'
          '92bde158f249b9b27f76f48cc65a0242'
-         '97bf43dda273d79ff90c848ab53b0e3c'
-         'abcb1b0a7deaffe13ab3d7ca70becb49'
-         '72790a4103da259a55cadd66db931d00'
+         '07d2bf5ad839a394cca008b3ec6e7bb1'
+         '4195735a80876ae812fca5736b50192a'
+         'e7e4b3e70e99e5cba8f8dfcacf3b0d87'
          '941aab11a42c8052cc1999434ae82bcd'
          'caf426e9eefb99108adba6cf231de348'
          'c367454b402720eea064280d0dfb291b'
@@ -190,7 +190,7 @@ build() {
 	popd
    
     # fix not upstreamable pyuno paths - patch taken from Debian
-#    patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
+    patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
     
 	#use the CFLAGS but remove the LibO overridden ones
 	for i in $CFLAGS; do
@@ -300,7 +300,7 @@ package_libreoffice-common() {
  install=libreoffice-common.install
  depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib'
           'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.2"
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') # 'orbit2')
+          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
              'libcups:          adds printing support'
@@ -347,7 +347,7 @@ package_libreoffice-common() {
  cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
  ln -vsf /etc/libreoffice/psprint.conf .
  
- # set VLC and if needed python-uno PYTHON path
+ # allow to preset desired VLC
  install -dm755 ${pkgdir}/etc/profile.d
  install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
  
@@ -361,6 +361,11 @@ package_libreoffice-common() {
  rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
  rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
  
+ # make pyuno find its modules
+ install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages
+ ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.3/site-packages/uno.py
+ ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py
+  
  # workaround all packages now depend on that file
  cp  ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
 }
diff --git a/extra/libreoffice/libreoffice-common.csh b/extra/libreoffice/libreoffice-common.csh
index 5efa39404..502512189 100644
--- a/extra/libreoffice/libreoffice-common.csh
+++ b/extra/libreoffice/libreoffice-common.csh
@@ -1,5 +1,3 @@
-#setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program
-
 # to force a certain look'n feel
 
 #setenv SAL_USE_VCLPLUGIN gen
diff --git a/extra/libreoffice/libreoffice-common.sh b/extra/libreoffice/libreoffice-common.sh
index 795867125..7bfdcf7f6 100644
--- a/extra/libreoffice/libreoffice-common.sh
+++ b/extra/libreoffice/libreoffice-common.sh
@@ -1,5 +1,3 @@
-#export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program"
-
 # to force a certain look'n feel
 
 #export SAL_USE_VCLPLUGIN=gen
diff --git a/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff b/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
index e86548136..3317b3ca5 100644
--- a/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
+++ b/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
@@ -17,9 +17,9 @@ index f93ac5e..92a2891 100644
 --- a/pyuno/source/module/uno.py
 +++ b/pyuno/source/module/uno.py
 @@ -26,8 +26,12 @@
- # for a copy of the LGPLv3 License.
+ #   except in compliance with the License. You may obtain a copy of
+ #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  #
- #*************************************************************************
 +import os
  import sys
  
@@ -33,12 +33,12 @@ diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/o
 index 610ac5f..df243d0 100755
 --- a/scripting/source/pyprov/officehelper.py
 +++ b/scripting/source/pyprov/officehelper.py
-@@ -53,7 +53,7 @@ def bootstrap():
+@@ -44,7 +44,7 @@ def bootstrap():
          if "UNO_PATH" in os.environ:
              sOffice = os.environ["UNO_PATH"]
          else:
 -            sOffice = "" # lets hope for the best
 +            sOffice = "/usr/lib/libreoffice/program"
          sOffice = os.path.join(sOffice, "soffice")
-         if platform.startswith("win"): 
+         if platform.startswith("win"):
              sOffice += ".exe"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 6b59f6a50..105be2a57 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 181249 2013-04-02 15:45:47Z giovanni $
+# $Id: PKGBUILD 182095 2013-04-06 19:27:44Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2013.04.01
+pkgver=2013.04.06
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('9a19e8301c3c0b93de03282c6a6144aa')
+md5sums=('1cd8e5181a1ddd29537cb16ad3cb0138')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD
deleted file mode 100644
index 0fb057092..000000000
--- a/extra/mediastreamer/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 178928 2013-02-28 19:31:23Z eric $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Adrià Arrufat <swiftscythe@gmail.com>
-
-pkgname=mediastreamer
-pkgver=2.8.2
-pkgrel=4
-pkgdesc="A library written in C that allows you to create and run audio and video streams"
-arch=('i686' 'x86_64')
-url="http://www.linphone.org/"
-license=('GPL')
-depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse')
-makedepends=('intltool')
-options=('!libtool')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        mediastreamer-ffmpeg.patch)
-md5sums=('e51ea9d5fce1396b374d10473dfbadec'
-         '805da7def98f367e621363fa0c951fe8'
-         '553d5d47ea4a8c8dfeabdc0281849d5f')
-
-build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/mediastreamer/mediastreamer-ffmpeg.patch b/extra/mediastreamer/mediastreamer-ffmpeg.patch
deleted file mode 100644
index 3304e9f56..000000000
--- a/extra/mediastreamer/mediastreamer-ffmpeg.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-commit f586917ea4d66f9ba8910f0967a8830e54d50784
-Author: Yann Diorcet <yann.diorcet@belledonne-communications.com>
-Date:   Tue Jun 5 11:07:48 2012 +0200
-
-    Fixes for new versions of ffmpeg
-
-diff --git a/src/h264dec.c b/src/h264dec.c
-index c4a84ee..5229b5e 100644
---- a/src/h264dec.c
-+++ b/src/h264dec.c
-@@ -45,7 +45,9 @@ typedef struct _DecData{
- static void ffmpeg_init(){
- 	static bool_t done=FALSE;
- 	if (!done){
-+#ifdef FF_API_AVCODEC_INIT
- 		avcodec_init();
-+#endif
- 		avcodec_register_all();
- 		done=TRUE;
- 	}
-diff --git a/src/videoenc.c b/src/videoenc.c
-index 21d016f..fb35760 100644
---- a/src/videoenc.c
-+++ b/src/videoenc.c
-@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
- static bool_t avcodec_initialized=FALSE;
- 
-+#ifndef FF_I_TYPE
-+#define FF_I_TYPE AV_PICTURE_TYPE_I
-+#endif
-+
- #ifdef ENABLE_LOG_FFMPEG
- 
- void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
-@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
- 
- void ms_ffmpeg_check_init(){
- 	if(!avcodec_initialized){
-+#ifdef FF_API_AVCODEC_INIT
- 		avcodec_init();
-+#endif
- 		avcodec_register_all();
- 		avcodec_initialized=TRUE;
- #ifdef ENABLE_LOG_FFMPEG
-@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){
- 	if (s->profile==0){
- 		s->codec=CODEC_ID_H263;
- 	}else{
-+		/*
- 		c->flags|=CODEC_FLAG_H263P_UMV;
- 		c->flags|=CODEC_FLAG_AC_PRED;
- 		c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
--		/*
- 		c->flags|=CODEC_FLAG_OBMC;
- 		c->flags|=CODEC_FLAG_AC_PRED;
- 		*/
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 71258a605..d6edcf95e 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173791 2012-12-23 03:50:49Z stephane $
+# $Id: PKGBUILD 182098 2013-04-06 21:41:54Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
-pkgver=1.7.8
+pkgver=1.7.9
 pkgrel=1
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64')
@@ -25,16 +25,14 @@ source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
         svnserve.conf
         svnserve.tmpfiles
         svnserve.service
-        subversion-kwallet.patch
         subversion.rpath.fix.patch)
-sha1sums=('12c7d8d5414bba74c9777c4d1dae74f152df63c2'
-          '24f8e82fa131c1a1b924d71046f8d38cb00645a7'
+sha1sums=('453757bae78a800997559f2232483ab99238ec1e'
+          '5ce5adc5f5cae5a2d569a89b5e4498623feae84a'
           '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
           '73b36c046c09cec2093354911c89e3ba8056af6c'
           'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
           '00cc36e69077a8c45674ead6dd62a7647b3a3b6d'
           '9f6790d842cf3e0228b007483a43e39a42724068'
-          'f2aed28a2e34b8631ee9b69175bac1bac59327ce'
           '3d1e28408a9abb42af2e531adc0d01ce21acfad6')
 
 build() {
@@ -44,9 +42,6 @@ build() {
    patch -Np0 -i ../subversion.rpath.fix.patch
    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
 
-   # FS#33081
-   patch -Np0 -i ../subversion-kwallet.patch
-
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
                --with-zlib=/usr --with-neon=/usr --with-serf=/usr --with-apxs \
                --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \
diff --git a/extra/subversion/subversion-kwallet.patch b/extra/subversion/subversion-kwallet.patch
deleted file mode 100644
index d2bf17101..000000000
--- a/extra/subversion/subversion-kwallet.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: subversion/libsvn_auth_kwallet/kwallet.cpp
-===================================================================
---- subversion/libsvn_auth_kwallet/kwallet.cpp	(revision 1421011)
-+++ subversion/libsvn_auth_kwallet/kwallet.cpp	(working copy)
-@@ -253,7 +253,7 @@ kwallet_password_get(svn_boolean_t *done,
-         }
-     }
- 
--  apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL);
-+  apr_pool_cleanup_register(pool, parameters, kwallet_terminate, apr_pool_cleanup_null);
- 
-   return SVN_NO_ERROR;
- }
-@@ -327,7 +327,7 @@ kwallet_password_set(svn_boolean_t *done,
-         }
-     }
- 
--  apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL);
-+  apr_pool_cleanup_register(pool, parameters, kwallet_terminate, apr_pool_cleanup_null);
- 
-   return SVN_NO_ERROR;
- }
\ No newline at end of file