Merge branch 'master' of ssh://gparabola/abslibre

7 files changed, 240 insertions, 26 deletions

diff --git a/libre/kdenetwork-libre/PKGBUILD b/libre/kdenetwork-libre/PKGBUILD
new file mode 100644
index 000000000..14c6448e5
--- /dev/null
+++ b/libre/kdenetwork-libre/PKGBUILD
@@ -0,0 +1,126 @@
+# $Id: PKGBUILD 144733 2011-12-08 09:21:25Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgbase=kdenetwork
+pkgname=('kdenetwork-filesharing'
+         'kdenetwork-kdnssd'
+         'kdenetwork-kget'
+         'kdenetwork-kopete-libre'
+         'kdenetwork-kppp'
+         'kdenetwork-krdc'
+         'kdenetwork-krfb')
+pkgver=4.7.4
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdenetwork')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
+	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'ppp'
+    'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
+    'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer')
+source=("http://repo.parabolagnulinux.org/other/${pkgbase}-libre-${pkgver}.tar.xz")
+sha1sums=('2537c5286a1464008e05974a3fd55ae00740c843')
+
+# Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
+mksource() {
+    [ -f "${pkgbase}-${pkgver}.tar.bz2" ] || wget "http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+    tar xf "${pkgbase}-${pkgver}.tar.bz2"
+    cd "${pkgbase}-${pkgver}"
+    sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' kopete/protocols/CMakeLists.txt
+    rm -rf kopete/protocols/skype
+    sed 's/, Skype//' -i ./doc/kopete/index.docbook
+    cd ..
+    tar cJf "${pkgbase}-libre-${pkgver}.tar.xz" "${pkgbase}-${pkgver}"
+}
+
+build() {
+    cd "${srcdir}"
+	mkdir build
+	cd build
+	cmake ../${pkgbase}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
+        -DWITH_Xmms=OFF \
+		-DWITH_LibMeanwhile=OFF
+	make
+}
+
+package_kdenetwork-filesharing() {
+	pkgdesc='Konqueror properties dialog plugin to share a directory with the local network'
+	depends=('kdelibs' 'smbclient')
+	install='kdenetwork.install'
+	cd $srcdir/build/filesharing
+	make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kdnssd() {
+	pkgdesc='Monitors the network for DNS-SD services'
+	depends=('kdelibs')
+	cd $srcdir/build/kdnssd
+	make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kget() {
+	pkgdesc='Download Manager'
+	depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
+	optdepends=('python2: YouTube plugin')
+	url="http://kde.org/applications/internet/kget/"
+	install='kdenetwork.install'
+	cd $srcdir/build/kget
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kget
+	make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kopete-libre() {
+	pkgdesc='Instant Messenger'
+	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn'
+	         'libidn' 'qimageblitz' 'v4l-utils' 'libgadu' 'mediastreamer')
+        conflicts=('kdenetwork-kopete')
+        provides=("kdenetwork-kopete=${pkgver}")
+        replaces=('kdenetwork-kopete')
+	url="http://kde.org/applications/internet/kopete/"
+	install='kdenetwork.install'
+	cd $srcdir/build/kopete
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kopete
+	make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kppp() {
+	pkgdesc='Internet Dial-Up Tool'
+	depends=('kdebase-runtime' 'ppp')
+	url="http://kde.org/applications/internet/kppp/"
+	install='kdenetwork.install'
+	cd $srcdir/build/kppp
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kppp
+	make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-krdc() {
+	pkgdesc='Remote Desktop Client'
+	depends=('kdebase-runtime' 'libvncserver' 'rdesktop' 'telepathy-qt4')
+    optdepends=('kdebase-keditbookmarks: to edit bookmarks')
+	url="http://kde.org/applications/internet/krdc/"
+	cd $srcdir/build/krdc
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/krdc
+	make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-krfb() {
+	pkgdesc='Desktop Sharing'
+	# note on libxdamage:
+	#       not detected by namcap because libgl depends on it
+	#       but nvidia providing libgl does not depend on libxdamage
+	depends=('kdebase-runtime' 'libvncserver' 'libxdamage')
+	cd $srcdir/build/krfb
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/krfb
+	make DESTDIR=$pkgdir install
+}
diff --git a/libre/kdenetwork-libre/kdenetwork.install b/libre/kdenetwork-libre/kdenetwork.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/libre/kdenetwork-libre/kdenetwork.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/libre/kdeutils-libre/PKGBUILD b/libre/kdeutils-libre/PKGBUILD
index 4337580e3..16fff37d3 100644
--- a/libre/kdeutils-libre/PKGBUILD
+++ b/libre/kdeutils-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 139746 2011-10-04 21:03:39Z andrea $
+# $Id: PKGBUILD 146715 2012-01-16 19:50:44Z dreisner $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -16,8 +16,8 @@ pkgname=('kdeutils-ark-libre'
          'kdeutils-printer-applet'
          'kdeutils-superkaramba'
          'kdeutils-sweeper')
-pkgver=4.7.2
-pkgrel=1
+pkgver=4.7.4
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -26,27 +26,37 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
 	'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
 	'qjson')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('52ce9b6b5f2c20475f46b6f7378ca4c530df37b4')
+sha1sums=('4630f01f36558eb5494fc562086fbd4e488e411e')
 
 build() {
-	cd ${srcdir}
+    cd "${srcdir}"/${pkgbase}-${pkgver}
+    
+    # Use Python2
+    sed -i 's|/usr/bin/python|/usr/bin/python2|' \
+      kcharselect/kcharselect-generate-datafile.py \
+      superkaramba/examples/richtext/rtext.py
+    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+      printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py
+
+	cd "${srcdir}"
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_PREFIX=/usr \
+        -DPYTHON_EXECUTABLE=/usr/bin/python2
 	make
 }
 
 package_kdeutils-ark-libre() {
 	pkgdesc='Archiving Tool'
 	depends=('kdebase-runtime' 'kdebase-lib' 'libarchive')
-	optdepends=('p7zip' 'zip')
+	optdepends=('p7zip' 'zip' 'unzip' 'ununrar')
+	provides=("kdeutils-ark=$pkgver")
+	replaces=('kdeutils-ark')
+	conflicts=('kdeutils-ark')
 	url="http://kde.org/applications/utilities/ark/"
-    provides=("kdeutils-ark=$pkgver")
-    replaces=('kdeutils-ark')
-    conflicts=('kdeutils-ark')
 	cd $srcdir/build/ark
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/ark/doc
@@ -162,9 +172,6 @@ package_kdeutils-printer-applet() {
 	make DESTDIR=$pkgdir install
 	cd $srcdir/build/printer-applet/doc
 	make DESTDIR=$pkgdir install
-
-        # Use the python2 executable
-        find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
 }
 
 package_kdeutils-superkaramba() {
diff --git a/libre/kdeutils-libre/rePKGBUILD b/libre/kdeutils-libre/rePKGBUILD
index a8d78bede..9dad18cf0 100644
--- a/libre/kdeutils-libre/rePKGBUILD
+++ b/libre/kdeutils-libre/rePKGBUILD
@@ -2,8 +2,9 @@
 source PKGBUILD
 #CARCH=x86_64
 unset build package md5sums source
+pkgname=("kdeutils-ark-libre")
 _repo=extra       # Put the repo here
-_mirror=ftp://ftp.archlinux.org # Put mirror here
+_mirror=ftp://mirrors.kernel.org/archlinux # Put mirror here
 source=(PKGBUILD
         "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT"
         # files for pkg modifications below this line
@@ -18,15 +19,15 @@ build() {
 }
 
 package_kdeutils-ark-libre() {
-  pkgdesc='Archiving Tool'
-  depends=('kdebase-runtime' 'kdebase-lib' 'libarchive')
-  optdepends=('p7zip' 'zip')
-  url="http://kde.org/applications/utilities/ark/"
-  provides=("kdeutils-ark=$pkgver")
-  replaces=('kdeutils-ark')
-  conflicts=('kdeutils-ark')
-  find ${srcdir} -maxdepth 1 -type l -delete
-  cp -a ${srcdir}/* ${pkgdir}
+	pkgdesc='Archiving Tool'
+	depends=('kdebase-runtime' 'kdebase-lib' 'libarchive')
+	optdepends=('p7zip' 'zip' 'unzip' 'ununrar')
+	provides=("kdeutils-ark=$pkgver")
+	replaces=('kdeutils-ark')
+	conflicts=('kdeutils-ark')
+	url="http://kde.org/applications/utilities/ark/"
+	find ${srcdir} -maxdepth 1 -type l -delete
+	cp -a ${srcdir}/* ${pkgdir}
 }
 
 
diff --git a/libre/mozilla-devscripts/PKGBUILD b/libre/mozilla-devscripts/PKGBUILD
new file mode 100644
index 000000000..faa4b3a2a
--- /dev/null
+++ b/libre/mozilla-devscripts/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Michał Masłowski  <mtjm@mtjm.eu>
+
+pkgname=mozilla-devscripts
+pkgver=0.30
+pkgrel=1.1
+pkgdesc="Development scripts used by Debian Mozilla's addons packages"
+arch=("any")
+url="http://packages.debian.org/source/unstable/mozilla-devscripts"
+license=('GPL' 'custom')
+depends=("python2" "zip" "unzip")
+_debrepo=http://ftp.debian.org/debian/pool/main/
+source=("${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.dsc"
+        "${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.tar.gz")
+md5sums=("6e517cef69c115356eb808866fd29268"
+         "4e95fb93d0d93b56543d2a789d457309")
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  # Adapt it to Arch's Python naming.
+  find . -type f | xargs -L1 sed -i "s:#!/usr/bin/python:#!/usr/bin/python2:"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  # The Makefile expects the system to have standard Python name, so
+  # do this directly here.
+  python2 setup.py install --root="$pkgdir/"
+  install -Dm644 debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/copyright"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/xmlstarlet/PKGBUILD b/libre/xmlstarlet/PKGBUILD
new file mode 100644
index 000000000..a06daf063
--- /dev/null
+++ b/libre/xmlstarlet/PKGBUILD
@@ -0,0 +1,29 @@
+# From https://aur.archlinux.org/packages.php?ID=20101.
+# Maintainer: PyroPeter <abi1789@googlemail.com>
+# Contributor: BlackEagle <ike.devolder@scarlet.be>
+# Contributor: chochem <chochem@gmail.com>
+
+pkgname=xmlstarlet
+pkgver=1.3.1
+pkgrel=1
+pkgdesc="A set of tools to transform, query, validate, and edit XML documents"
+arch=('i686' 'x86_64')
+url="http://xmlstar.sourceforge.net/"
+license=('custom:MIT')
+depends=('libxslt>=1.1.9')
+source=("xmlstarlet-$pkgver.tar.gz::http://sourceforge.net/projects/xmlstar/files/xmlstarlet/$pkgver/xmlstarlet-$pkgver.tar.gz/download")
+md5sums=('5173ad3f01ec0ba0d54bd1fbfc057abf')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  local xsltlibs=$(pkg-config --libs libxslt libexslt)
+  local xmllibs=$(pkg-config --libs libxml-2.0)
+
+  LIBXSLT_PREFIX=/usr LIBXML_PREFIX=/usr LIBXSLT_LIBS="${xsltlibs}" LIBXML_LIBS="${xmllibs}" ./configure --prefix=/usr
+  
+  make
+  make DESTDIR="${pkgdir}" install
+  mkdir -p $pkgdir/usr/share/licenses/$pkgname
+  cp Copyright $pkgdir/usr/share/licenses/$pkgname/COPYING
+  ln -s /usr/bin/xml ${pkgdir}/usr/bin/xmlstarlet
+}
diff --git a/mozilla-testing/iceweasel-i18n/PKGBUILD b/mozilla-testing/iceweasel-i18n/PKGBUILD
index 0973cbb07..fd56f38bb 100644
--- a/mozilla-testing/iceweasel-i18n/PKGBUILD
+++ b/mozilla-testing/iceweasel-i18n/PKGBUILD
@@ -14,6 +14,7 @@ _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
+# echo $(ls src/iceweasel-l10n-*+debian/upstream/ | sed 's/\.xpi/ /')
 _langpacks=(af ak ar ast as be bg bn-BD bn-IN br bs ca cs cy da de dz-BT el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa-IR fa fi fr fur-IT fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja ka kk kn ko ku lg lt lv mai mk ml mn mr nb-NO ne-NP nl nn-NO nso oc or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu)
 
 pkgbase=iceweasel-i18n
@@ -28,7 +29,8 @@ pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
 url="http://www.geticeweasel.org/"
 license=('MPL')
-depends=("iceweasel=$_pkgver")
+depends=("iceweasel-libre>=$_pkgver")
+makedepends=("mozilla-devscripts" "xmlstarlet")
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc")
@@ -46,16 +48,23 @@ dpkg-source() {
 build() {
   cd "${srcdir}"
   dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+  patch -Np0 -i ${_debname}_${_debver}-${_debrel}.diff
+  cd ${_debname}-${_debver}
+  # Fix broken files or avoid unnecessary dependencies.
+  sed -i 's/$TARGET/$TARGET ; exit/' debian/build-script.sh
+  # Langpacks initially state to support exactly one browser version,
+  # Debian fixes this.
+  sh debian/build-script.sh override_dh_auto_build 9 21
 }
 
-_path="/usr/lib/iceweasel-${_pkgver}/extensions"
+_path="/usr/lib/iceweasel/extensions"
 
 
 for lang in ${_langpacks[@]}
 do
     eval "
 package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () {
-  install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi'
+  install -Dm644 '$srcdir/'*'/build/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi'
 }
 "
 done