Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/celt-0.7/PKGBUILD
	core/binutils/PKGBUILD
	core/gcc/PKGBUILD
	extra/gnome-media/PKGBUILD
	extra/libgnome-media-profiles/PKGBUILD
	extra/libwebp/PKGBUILD
	extra/telepathy-kde-desktop-applets/PKGBUILD
	extra/telepathy-kde-presence-applet/PKGBUILD

11 files changed, 133 insertions, 83 deletions

diff --git a/pcr/hexchat-libre/PKGBUILD b/pcr/hexchat-libre/PKGBUILD
deleted file mode 100644
index 489fb0c91..000000000
--- a/pcr/hexchat-libre/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-#Maintainer: TingPing tingping@tingping.se
-#Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-
-_pkgname=hexchat
-pkgname=hexchat-libre
-pkgver=2.9.4
-pkgrel=2.1
-pkgdesc='A GTK+ based IRC client without non-free browser reference (Parabola rebranded)'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.hexchat.org/'
-license=('GPL')
-options=('!libtool')
-replaces=('hexchat')
-conflicts=('hexchat')
-provides=("hexchat=$pkgver")
-depends=('gtk2' 'openssl' 'dbus-glib' 'hicolor-icon-theme' 'libnotify' 'libproxy')
-makedepends=('perl' 'python2' 'tcl')
-optdepends=('enchant: for spell check'
-            'perl: for perl plugin'
-            'tcl: for tcl plugin'
-            'python2: for python plugin')
-install="$_pkgname.install"
-source=("https://github.com/downloads/hexchat/hexchat/hexchat-$pkgver.tar.xz"
-        'remove-non-free-suggestion.patch'
-        'no-firefox.patch')
-md5sums=('5609cac7200fc91be57196501aaf07fa'
-         '978da875b73d9570134a1e87af54f94b'
-         '8934416304ed77161da0883d5b06e7b8')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  sed -i -e 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c
-  patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch"
-  patch -p1 -i "${srcdir}/no-firefox.patch"
-  mkdir m4
-  chmod +x autogen.sh
-  ./autogen.sh
-  ./configure --prefix=/usr \
-    --enable-openssl --enable-dbus --enable-nls --enable-ipv6 --enable-shm --enable-spell=static
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -D -m644 "share/icons/hexchat.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/hexchat.svg"
-}
diff --git a/pcr/hexchat-libre/hexchat.install b/pcr/hexchat-libre/hexchat.install
deleted file mode 100644
index 4b3df7505..000000000
--- a/pcr/hexchat-libre/hexchat.install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  echo 'Read the FAQ if migrating from XChat - https://github.com/hexchat/hexchat/blob/master/share/doc/faq.md'
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/pcr/hexchat-libre/no-firefox.patch b/pcr/hexchat-libre/no-firefox.patch
deleted file mode 100644
index 998ff4dca..000000000
--- a/pcr/hexchat-libre/no-firefox.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur hexchat-2.9.4.orig/src/fe-gtk/fe-gtk.c hexchat-2.9.4/src/fe-gtk/fe-gtk.c
---- hexchat-2.9.4.orig/src/fe-gtk/fe-gtk.c	2012-11-11 07:08:30.000000000 -0200
-+++ hexchat-2.9.4/src/fe-gtk/fe-gtk.c	2013-01-30 23:06:38.670239405 -0200
-@@ -1039,8 +1039,10 @@
- 			return;
- 	}
- 
--	/* everything failed, what now? just try firefox */
--	if (try_browser ("firefox", NULL, url))
-+	/* everything failed, what now? just try iceweasel or icecat */
-+	if (try_browser ("iceweasel", NULL, url))
-+		return;
-+	if (try_browser ("icecat", NULL, url))
- 		return;
- 
- 	/* fresh out of ideas... */
diff --git a/pcr/hexchat-libre/remove-non-free-suggestion.patch b/pcr/hexchat-libre/remove-non-free-suggestion.patch
deleted file mode 100644
index a83a71f17..000000000
--- a/pcr/hexchat-libre/remove-non-free-suggestion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur hexchat-2.9.4.orig/src/common/hexchat.c hexchat-2.9.4/src/common/hexchat.c
---- hexchat-2.9.4.orig/src/common/hexchat.c	2012-11-11 07:08:30.000000000 -0200
-+++ hexchat-2.9.4/src/common/hexchat.c	2013-01-30 23:02:12.884864062 -0200
-@@ -618,7 +618,7 @@
- 	"NAME WII\n"			"CMD quote WHOIS %2 %2\n\n";
- 
- static char defaultconf_urlhandlers[] =
--		"NAME Open Link in Opera\n"		"CMD !opera -remote 'openURL(%s)'\n\n";
-+		""		"";
- 
- #ifdef USE_SIGACTION
- /* Close and open log files on SIGUSR1. Usefull for log rotating */
diff --git a/pcr/musescore/PKGBUILD b/pcr/musescore/PKGBUILD
new file mode 100644
index 000000000..8acfecfeb
--- /dev/null
+++ b/pcr/musescore/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Stefan Husmann <stefan-husmann@t-online.de
+# Contributor: Cristian Maureira <saint [at] archlinux.cl>
+# Contributor: Dr.Egg <rwhite @ archlinux . us>
+
+pkgname=musescore
+pkgver=1.3
+pkgrel=3
+pkgdesc="A music score editor written in Qt"
+arch=('i686' 'x86_64')
+url="http://www.musescore.org/en/"
+license=('GPL')
+depends=('shared-mime-info' 'qtscriptgenerator' 'portaudio')
+makedepends=('cmake' 'doxygen')
+optdepends=('jack')
+install=musescore.install
+source=("http://downloads.sourceforge.net/mscore/mscore-${pkgver}.tar.bz2"
+paths.patch system_qscriptgenerator.patch mime.xml qmake-qt4.patch desktop.patch)
+md5sums=('e5fde2bef0d40ee7542e1f515a3919d1'
+         '28f61c298f53214adacbc8d43f9c43e9'
+         '51e590842a92cdea7efa01fd60fe715c'
+         '969696178e56de36f9af37d7da61baaa'
+         'a9e1d9c1a891810172245c6021682258'
+         'c8f37720422ae1e1a0fa02b284bd00ed')
+
+build() {
+  cd $srcdir/mscore-${pkgver}
+  export QT_PLUGINS_DIR=/usr/lib/qt4/plugins 
+  [ -d build ] && make clean
+  patch -p1 < $srcdir/system_qscriptgenerator.patch 
+  patch -p1 < $srcdir/paths.patch
+  patch -p1 < $srcdir/desktop.patch
+  patch -p1 < $srcdir/qmake-qt4.patch 
+  make PREFIX=/usr release 
+}
+
+package() {
+  cd $srcdir/mscore-${pkgver}
+  make PREFIX=/usr DESTDIR="$pkgdir" install
+  cd $pkgdir/usr/share/mscore-$pkgver/man
+  install -d $pkgdir/usr/share/doc/$pkgname
+  cp * $pkgdir/usr/share/doc/$pkgname/
+  cd ../..
+  rm -r $pkgdir/usr/share/mscore-$pkgver/man
+  install -Dm644 $srcdir/mime.xml \
+    $pkgdir/usr/share/mime/packages/x-musescore.xml
+}
diff --git a/pcr/musescore/desktop.patch b/pcr/musescore/desktop.patch
new file mode 100644
index 000000000..46beefc93
--- /dev/null
+++ b/pcr/musescore/desktop.patch
@@ -0,0 +1,12 @@
+diff -Naur mscore-1.2.old/mscore/packaging/mscore.desktop mscore-1.2.new/mscore/packaging/mscore.desktop
+--- mscore-1.2.old/mscore/packaging/mscore.desktop	2013-01-20 14:54:27.000000000 +0100
++++ mscore-1.2.new/mscore/packaging/mscore.desktop	2013-01-20 14:55:11.000000000 +0100
+@@ -3,7 +3,7 @@
+ Comment=WYSIWYG Music score typesetter
+ Comment[ru]=Визуальный редактор нотных партитур
+ Exec=mscore
+-GenericName=mscore
++GenericName=MuseScore
+ GenericName[ru]=MuseScore
+ Icon=mscore
+ Name=MuseScore
diff --git a/pcr/musescore/mime.xml b/pcr/musescore/mime.xml
new file mode 100644
index 000000000..a46de9f41
--- /dev/null
+++ b/pcr/musescore/mime.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+<mime-type type="application/x-musescore">
+</mime-type>
+</mime-info>
diff --git a/pcr/musescore/musescore.install b/pcr/musescore/musescore.install
new file mode 100644
index 000000000..6da0990dc
--- /dev/null
+++ b/pcr/musescore/musescore.install
@@ -0,0 +1,12 @@
+post_install() {
+	      update-desktop-database -q
+	      update-mime-database /usr/share/mime/
+}
+
+post_upgrade() {
+	       post_install
+}
+
+post_remove() {
+	      post_install
+}
diff --git a/pcr/musescore/paths.patch b/pcr/musescore/paths.patch
new file mode 100644
index 000000000..a1e43a93d
--- /dev/null
+++ b/pcr/musescore/paths.patch
@@ -0,0 +1,22 @@
+diff -Naur musescore-svn.orig//mscore/mscore/mscore.cpp musescore-svn.new//mscore/mscore/mscore.cpp
+--- musescore-svn.orig//mscore/mscore/mscore.cpp	2010-06-16 23:10:27.000000000 +0200
++++ musescore-svn.new//mscore/mscore/mscore.cpp	2010-06-16 23:13:59.000000000 +0200
+@@ -919,15 +919,15 @@
+       if (debugMode)
+             printf("open handbook for language <%s>\n", qPrintable(lang));
+ 
+-      QFileInfo mscoreHelp(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
++      QFileInfo mscoreHelp(("/usr/share/doc/musescore/MuseScore-") + lang + QString(".pdf"));
+       if (!mscoreHelp.isReadable()) {
+             if (debugMode) {
+                   printf("cannot open doc <%s>\n", qPrintable(mscoreHelp.filePath()));
+                   }
+             lang = lang.left(2);
+-            mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
++            mscoreHelp.setFile(("/usr/share/doc/musescore/MuseScore-") + lang + QString(".pdf"));
+             if(!mscoreHelp.isReadable()){
+-                mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-en.pdf"));
++                mscoreHelp.setFile(("/usr/share/doc/musescore/MuseScore-en.pdf"));
+                 if (!mscoreHelp.isReadable()) {
+                       QString info(tr("MuseScore handbook not found at: \n"));
+                       info += mscoreHelp.filePath();
diff --git a/pcr/musescore/qmake-qt4.patch b/pcr/musescore/qmake-qt4.patch
new file mode 100644
index 000000000..27c50d8b3
--- /dev/null
+++ b/pcr/musescore/qmake-qt4.patch
@@ -0,0 +1,25 @@
+diff -Naur mscore-1.3.orig/Makefile mscore-1.3.new/Makefile
+--- mscore-1.3.orig/Makefile	2013-03-05 18:41:00.000000000 +0100
++++ mscore-1.3.new/Makefile	2013-03-05 18:55:46.000000000 +0100
+@@ -34,6 +34,7 @@
+             cd build;                                  \
+             cmake -DCMAKE_BUILD_TYPE=RELEASE	       \
+             	  -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
++	          -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
+             	   ../mscore; 			       \
+             make lrelease;                             \
+             make -j ${CPUS};                           \
+diff -Naur mscore-1.3.orig/mscore/CMakeLists.txt mscore-1.3.new/mscore/CMakeLists.txt
+--- mscore-1.3.orig/mscore/CMakeLists.txt	2013-03-05 18:41:27.000000000 +0100
++++ mscore-1.3.new/mscore/CMakeLists.txt	2013-03-05 18:54:35.000000000 +0100
+@@ -427,8 +427,8 @@
+ 
+ add_custom_target(lrelease
+    COMMAND ${PROJECT_SOURCE_DIR}/gen-qt-projectfile ${PROJECT_SOURCE_DIR} > mscore.pro
+-   COMMAND lrelease ${PROJECT_SOURCE_DIR}/share/locale/*.ts
+-   COMMAND lrelease ${PROJECT_SOURCE_DIR}/share/plugins/musescore.com/translations/*.ts
++   COMMAND lrelease-qt4 ${PROJECT_SOURCE_DIR}/share/locale/*.ts
++   COMMAND lrelease-qt4 ${PROJECT_SOURCE_DIR}/share/plugins/musescore.com/translations/*.ts
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+    )
+ 
diff --git a/pcr/musescore/system_qscriptgenerator.patch b/pcr/musescore/system_qscriptgenerator.patch
new file mode 100644
index 000000000..6deef6ec9
--- /dev/null
+++ b/pcr/musescore/system_qscriptgenerator.patch
@@ -0,0 +1,11 @@
+diff -Naur mscore-1.3.orig/mscore/CMakeLists.txt mscore-1.3.new/mscore/CMakeLists.txt
+--- mscore-1.3.orig/mscore/CMakeLists.txt	2011-12-23 20:22:29.000000000 +0100
++++ mscore-1.3.new/mscore/CMakeLists.txt	2011-12-23 20:36:37.000000000 +0100
+@@ -31,6 +31,6 @@
+ set(GCC_VISIBILITY TRUE)                  # requires gcc 4.x?
+ set(HAS_AUDIOFILE TRUE)                   # requires libsndfile
+ 
+-set(BUILD_SCRIPTGEN TRUE)                 #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib)
++set(BUILD_SCRIPTGEN FALSE)                 #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib)
+ set(STATIC_SCRIPT_BINDINGS FALSE)
+ set(USE_SSE FALSE)