From 1b6860ed7a33a22c4202348a4f42afbb5d26be09 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 4 Apr 2013 00:06:36 -0700 Subject: Thu Apr 4 00:06:36 PDT 2013 --- community/couchdb/PKGBUILD | 10 +- community/klavaro/PKGBUILD | 6 +- community/leptonica/PKGBUILD | 6 +- community/libshairport/PKGBUILD | 10 +- community/murmur/PKGBUILD | 31 +--- community/murmur/murmur.conf | 1 - community/murmur/murmur.conf.d | 2 - community/murmur/murmur.install | 19 +-- community/murmur/murmur.logrotate.d | 6 - community/murmur/murmur.rc.d | 44 ----- community/murmur/murmur.service | 5 +- community/poedit/PKGBUILD | 9 +- community/rust/PKGBUILD | 57 +++++++ community/rust/rust.install | 11 ++ community/xbmc/PKGBUILD | 4 +- extra/gnome-media/PKGBUILD | 38 ----- extra/gnome-media/gnome-media.install | 22 --- extra/libgnome-media-profiles/PKGBUILD | 39 ----- .../libgnome-media-profiles.install | 17 -- libre/hexchat-libre/PKGBUILD | 8 +- libre/iceweasel-l10n/PKGBUILD | 180 ++++++++++----------- ...Make-the-Reset-Firefox-feature-more-gener.patch | 12 +- libre/iceweasel-libre/PKGBUILD | 16 +- libre/iceweasel-libre/libre.patch | 11 +- pcr/musescore/PKGBUILD | 46 ++++++ pcr/musescore/desktop.patch | 12 ++ pcr/musescore/mime.xml | 5 + pcr/musescore/musescore.install | 12 ++ pcr/musescore/paths.patch | 22 +++ pcr/musescore/qmake-qt4.patch | 25 +++ pcr/musescore/system_qscriptgenerator.patch | 11 ++ 31 files changed, 353 insertions(+), 344 deletions(-) delete mode 100644 community/murmur/murmur.conf delete mode 100644 community/murmur/murmur.conf.d delete mode 100644 community/murmur/murmur.logrotate.d delete mode 100644 community/murmur/murmur.rc.d create mode 100644 community/rust/PKGBUILD create mode 100644 community/rust/rust.install delete mode 100644 extra/gnome-media/PKGBUILD delete mode 100644 extra/gnome-media/gnome-media.install delete mode 100644 extra/libgnome-media-profiles/PKGBUILD delete mode 100644 extra/libgnome-media-profiles/libgnome-media-profiles.install create mode 100644 pcr/musescore/PKGBUILD create mode 100644 pcr/musescore/desktop.patch create mode 100644 pcr/musescore/mime.xml create mode 100644 pcr/musescore/musescore.install create mode 100644 pcr/musescore/paths.patch create mode 100644 pcr/musescore/qmake-qt4.patch create mode 100644 pcr/musescore/system_qscriptgenerator.patch diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index a0fc51f78..06696807c 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87043 2013-03-26 11:49:36Z foutrelis $ +# $Id: PKGBUILD 87592 2013-04-03 15:19:45Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Contributor: Michael Fellinger pkgname=couchdb -pkgver=1.2.1 -pkgrel=3 +pkgver=1.2.2 +pkgrel=1 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64') url="http://couchdb.apache.org" @@ -21,8 +21,8 @@ source=("http://apache-mirror.rbc.ru/pub/apache/couchdb/$pkgver/apache-couchdb-$ "couchdb.tmpfiles" "couchdb.rc" "build-fix.patch") -md5sums=('df75b03e56c2431ede7625200f0d44a7' - 'e6e943c1da93cfcb41a4286daa80195d' +md5sums=('6cc49c22fadcf7d8cf8aa34dae71b203' + '1346a657d7552188f6cc9e0cdc231b05' '8914a7ffc6745f94106d96206709acb4' '1e254ebe32eeb061be64193bafa35dbf' 'a75ee9b310a950eea13b07274b7a0669' diff --git a/community/klavaro/PKGBUILD b/community/klavaro/PKGBUILD index 50adc778a..19dae4b17 100644 --- a/community/klavaro/PKGBUILD +++ b/community/klavaro/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 83424 2013-01-31 21:14:34Z stativ $ +# $Id: PKGBUILD 87583 2013-04-03 13:18:34Z stativ $ # Maintainer: Lukas Jirkovsky pkgname=klavaro -pkgver=1.9.6 +pkgver=1.9.7 pkgrel=1 pkgdesc="Free touch typing tutor program" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('intltool') optdepends=('espeakup: voice output') install=$pkgname.install source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('1b44cd541303af6167f5f971b57a745c') +md5sums=('e28114568ac20f64b372f5af53abc5a3') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD index 779130797..bd18b03dc 100644 --- a/community/leptonica/PKGBUILD +++ b/community/leptonica/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 81033 2012-12-10 15:15:51Z spupykin $ +# $Id: PKGBUILD 87567 2013-04-03 09:46:00Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Christoph Drexler pkgname=leptonica pkgver=1.69 -pkgrel=5 +pkgrel=6 pkgdesc="Software that is broadly useful for image processing and image analysis applications" arch=('i686' 'x86_64') url="http://www.leptonica.com/" license=('custom') options=(!libtool) -depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp=0.2.1') +depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp') source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz) md5sums=('d4085c302cbcab7f9af9d3d6f004ab22') diff --git a/community/libshairport/PKGBUILD b/community/libshairport/PKGBUILD index d6e406c41..7e69f1b6e 100644 --- a/community/libshairport/PKGBUILD +++ b/community/libshairport/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 68571 2012-03-28 10:35:14Z idevolder $ +# $Id: PKGBUILD 87587 2013-04-03 13:29:16Z idevolder $ # Maintainer: BlackIkeEagle pkgname=libshairport _developer='amejia1' -_version=1.2.1 -_commithash='aeb4987' +_version=1.2.1.20121215 +_commithash='16395d8' pkgver=${_version} -pkgrel=2 +pkgrel=1 pkgdesc="emulates an AirPort Express" arch=('i686' 'x86_64') url='https://github.com/amejia1/libshairport' license=('GPL') depends=('openssl' 'libao') source=("$pkgname-$pkgver.tar.gz::https://github.com/amejia1/libshairport/tarball/$_commithash") -sha256sums=('003c65f56123a7cb090b2d7249f0facbef668f7db6048f4b458713892a6911ca') +sha256sums=('98b73313d0a8f2abcb32e11f4fd4b422777a495cd62dbe881d5061b91959d1d5') options=(!libtool) _srcfolder=$_developer-$pkgname-$_commithash diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD index 699837545..c80917dbd 100644 --- a/community/murmur/PKGBUILD +++ b/community/murmur/PKGBUILD @@ -1,40 +1,30 @@ -# $Id: PKGBUILD 86935 2013-03-25 04:07:12Z foutrelis $ +# $Id: PKGBUILD 87551 2013-04-02 23:01:31Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Otto Allmendinger # Contributor: Malte Rabenseifner pkgname=murmur pkgver=1.2.3 -pkgrel=12 +pkgrel=13 pkgdesc="The voice chat application server for Mumble" arch=('i686' 'x86_64') url="http://mumble.sourceforge.net" license=('BSD') depends=('avahi' 'lsb-release' 'protobuf' 'qt4' 'icu') makedepends=('boost') -backup=("etc/murmur.ini" - "etc/logrotate.d/murmur" - "etc/conf.d/murmur" ) +backup=("etc/murmur.ini") install="murmur.install" source=("http://downloads.sourceforge.net/mumble/mumble-$pkgver.tar.gz" - "murmur.rc.d" - "murmur.conf.d" "murmur.dbus.conf" - "murmur.logrotate.d" - "murmur.service" - "murmur.conf") + "murmur.service") md5sums=('55804e3dfe98b16eeb40abca6c254625' - 'a4f6fc515f258eb4db437a226e16de5d' - '11c1cc875e8021739ec2087252cf0533' 'eddea4cdbd0bde4b960a67e16b5d5478' - 'c56726cb267ead68f37f35c28e36e6fa' - '5ad8798aea4f8b70f47f16df64f755b3' - 'e00d0d2610b77efebce5b3556609251f') + '4ce52d399ba2d95705e997146e0e2544') build() { cd ${srcdir}/mumble-$pkgver - qmake main.pro CONFIG+="no-client no-ice" + qmake-qt4 main.pro CONFIG+="no-client no-ice" make release } @@ -43,23 +33,16 @@ package() { sed -e "1i# vi:ft=cfg" \ -e "s|database=|database=/var/lib/murmur/murmur.sqlite|" \ - -e "s|dbus=session|#dbus=system|" \ - -e "s|#logfile=murmur.log|logfile=/var/log/murmur/murmur.log|" \ - -e "s|#pidfile=|pidfile=/var/run/murmur/murmur.pid|" \ + -e "s|#logfile=murmur.log|logfile=|" \ -e "s|#uname=|uname=murmur|" \ -i scripts/murmur.ini install -dm755 ${pkgdir}/var/lib/murmur - install -dm755 ${pkgdir}/var/log/murmur install -Dm755 release/murmurd ${pkgdir}/usr/sbin/murmurd install -Dm644 scripts/murmur.ini ${pkgdir}/etc/murmur.ini - install -Dm755 ${srcdir}/murmur.rc.d ${pkgdir}/etc/rc.d/murmur - install -Dm644 ${srcdir}/murmur.conf.d ${pkgdir}/etc/conf.d/murmur install -Dm644 ${srcdir}/murmur.dbus.conf ${pkgdir}/etc/dbus-1/system.d/murmur.conf - install -Dm644 ${srcdir}/murmur.logrotate.d ${pkgdir}/etc/logrotate.d/murmur install -Dm644 README ${pkgdir}/usr/share/doc/murmur/README install -Dm644 man/murmurd.1 ${pkgdir}/usr/share/man/man1/murmurd.1 - install -Dm644 ${srcdir}/murmur.conf ${pkgdir}/usr/lib/tmpfiles.d/murmur.conf install -Dm644 ${srcdir}/murmur.service ${pkgdir}/usr/lib/systemd/system/murmur.service } diff --git a/community/murmur/murmur.conf b/community/murmur/murmur.conf deleted file mode 100644 index 0cc583c40..000000000 --- a/community/murmur/murmur.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/murmur 0775 murmur murmur - diff --git a/community/murmur/murmur.conf.d b/community/murmur/murmur.conf.d deleted file mode 100644 index 592194be9..000000000 --- a/community/murmur/murmur.conf.d +++ /dev/null @@ -1,2 +0,0 @@ -# Use /etc/murmur.ini as configuration file -PARAMS="-ini /etc/murmur.ini" diff --git a/community/murmur/murmur.install b/community/murmur/murmur.install index 8d2f96b7c..fecd2c2ca 100644 --- a/community/murmur/murmur.install +++ b/community/murmur/murmur.install @@ -1,19 +1,16 @@ post_install() { - systemd-tmpfiles --create murmur.conf + getent group murmur > /dev/null || groupadd -r -g 86 murmur 1>/dev/null + getent passwd murmur > /dev/null || useradd -r -u 86 -d /var/lib/murmur -g murmur -s /bin/false murmur 1>/dev/null - getent group murmur > /dev/null || groupadd -r -g 86 murmur 1>/dev/null - getent passwd murmur > /dev/null || useradd -r -u 86 -d /var/lib/murmur -g murmur -s /bin/false murmur 1>/dev/null + chown -R murmur:murmur /var/lib/murmur - chown -R murmur:murmur /var/lib/murmur - chown -R murmur:murmur /var/log/murmur - - echo "You might have to reload dbus before launching murmur:" + echo "You might have to reload dbus before launching murmur:" echo " systemctl reload bus" - echo "Don't forget to set the superuser password:" - echo " murmurd -ini /etc/murmur.ini -supw " + echo "Don't forget to set the superuser password:" + echo " murmurd -ini /etc/murmur.ini -supw " } post_remove() { - getent passwd murmur > /dev/null && userdel murmur 1>/dev/null - getent group murmur > /dev/null && groupdel murmur 1>/dev/null + getent passwd murmur > /dev/null && userdel murmur 1>/dev/null + getent group murmur > /dev/null && groupdel murmur 1>/dev/null } diff --git a/community/murmur/murmur.logrotate.d b/community/murmur/murmur.logrotate.d deleted file mode 100644 index e113175ab..000000000 --- a/community/murmur/murmur.logrotate.d +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/murmur/murmur.log { - missingok - postrotate - /bin/kill -HUP `cat /var/run/murmur/murmur.pid 2>/dev/null` 2> /dev/null || true - endscript -} diff --git a/community/murmur/murmur.rc.d b/community/murmur/murmur.rc.d deleted file mode 100644 index e26a2a3db..000000000 --- a/community/murmur/murmur.rc.d +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -CONF=/etc/conf.d/murmur - -. /etc/rc.conf -. /etc/rc.d/functions - -[ -f $CONF ] && . $CONF - -PID=$(pidof -o %PPID /usr/sbin/murmurd) -case "$1" in - start) - stat_busy "Starting murmur" - - [ -d /var/run/murmur ] || mkdir -p /var/run/murmur - chown murmur:murmur /var/run/murmur - - [ -z "$PID" ] && /usr/sbin/murmurd $PARAMS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon murmur - stat_done - fi - ;; - stop) - stat_busy "Stopping murmur" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon murmur - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/murmur/murmur.service b/community/murmur/murmur.service index b0097796e..9d58077ab 100644 --- a/community/murmur/murmur.service +++ b/community/murmur/murmur.service @@ -3,9 +3,8 @@ Description=Mumble Daemon After=network.target [Service] -Type=forking -PIDFile=/run/murmur/murmur.pid -ExecStart=/usr/sbin/murmurd -ini /etc/murmur.ini +Type=simple +ExecStart=/usr/sbin/murmurd -ini /etc/murmur.ini -fg Restart=always [Install] diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD index bcd7486b9..ea6fa780e 100644 --- a/community/poedit/PKGBUILD +++ b/community/poedit/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 82111 2013-01-08 18:49:13Z spupykin $ +# $Id: PKGBUILD 87572 2013-04-03 10:14:55Z spupykin $ # Contributor: Andrea Scarpino # Contributor: Giovanni Scafora # Contributor: Alexander Fehr # Contributor: Daniel J Griffiths pkgname=poedit -pkgver=1.5.4 +pkgver=1.5.5 pkgrel=1 pkgdesc="Cross-platform gettext catalogs (.po files) editor" arch=('i686' 'x86_64') url="http://www.poedit.net/" license=('custom') -depends=('wxgtk>=2.8.11' 'gtkspell' 'db>=5.1' 'hicolor-icon-theme' 'gettext') +depends=('wxgtk2.9' 'gtkspell' 'db>=5.1' 'hicolor-icon-theme' 'gettext') makedepends=('pkgconfig' 'boost') install=poedit.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('708991f73368f2ea7a24134058d2caf2') +md5sums=('da86cb73cee9d006a42f9574811d13ab') build() { cd ${srcdir}/${pkgname}-${pkgver} + export WX_CONFIG_PATH=/usr/bin/wx-config-2.9 ./configure --prefix=/usr make } diff --git a/community/rust/PKGBUILD b/community/rust/PKGBUILD new file mode 100644 index 000000000..294b128c0 --- /dev/null +++ b/community/rust/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 87570 2013-04-03 09:53:17Z thestinger $ +# Maintainer: Daniel Micay +pkgname=rust +pkgver=0.6 +pkgrel=2 +arch=('i686' 'x86_64') +pkgdesc='A safe, concurrent, practical language' +url='http://www.rust-lang.org/' +license=('MIT' 'Apache') +depends=(gcc-libs shared-mime-info) +makedepends=(libffi perl python2 curl chrpath emacs) +source=("http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz") +sha256sums=('e11cb529a1e20f27d99033181a9e0e131817136b46d2742f0fa1afa1210053e5') +install=rust.install + +build() { + cd rust-$pkgver + + ./configure --prefix=/usr --disable-docs + + # avoid python makedepend (force fallback to python2) + sed -i 's/^PYTHONVERSION.*/PYTHONVERSION := 3/' src/llvm/Makefile.rules + + make +} + +package() { + cd rust-$pkgver + make DESTDIR="$pkgdir" install + + mkdir -p "$pkgdir/usr/share/vim" "$pkgdir/usr/share/licenses/rust" + + cp -a src/etc/vim "$pkgdir/usr/share/vim/vimfiles" + find "$pkgdir/usr/share/vim" -type f -exec chmod 644 {} + + find "$pkgdir/usr/share/vim" -type d -exec chmod 755 {} + + + install -Dm644 src/etc/kate/rust.xml "$pkgdir/usr/share/apps/katepart/syntax/rust.xml" + install -Dm644 src/etc/gedit/share/mime/packages/rust.xml \ + "$pkgdir/usr/share/mime/packages/rust.xml" + install -Dm644 src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang \ + "$pkgdir/usr/share/gtksourceview-3.0/language-specs/rust.lang" + + install -m644 LICENSE-APACHE "$pkgdir/usr/share/licenses/rust" + install -m644 LICENSE-MIT "$pkgdir/usr/share/licenses/rust" + + cd src/etc/emacs + make + mkdir -p "$pkgdir/usr/share/emacs/site-lisp/" + install -Dm644 cm-mode.el{,c} rust-mode.el{,c} "$pkgdir/usr/share/emacs/site-lisp/" + + cd "$pkgdir/usr" + + # https://github.com/mozilla/rust/issues/5219 + chrpath -d bin/* lib/*.so lib/rustc/*/lib/*.so + + cp lib/rustc/*/lib/{librustdoc-*-0.6.so,librustpkg-*-0.6.so} lib/ +} diff --git a/community/rust/rust.install b/community/rust/rust.install new file mode 100644 index 000000000..80b6673ec --- /dev/null +++ b/community/rust/rust.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime >/dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD index 72df48bdf..72adcc8cb 100644 --- a/community/xbmc/PKGBUILD +++ b/community/xbmc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87024 2013-03-25 19:17:07Z bpiotrowski $ +# $Id: PKGBUILD 87589 2013-04-03 13:31:16Z idevolder $ # Maintainer: Sergej Pupykin # Contributor: Brad Fanella # Contributor: [vEX] @@ -9,7 +9,7 @@ _prefix=/usr pkgname=xbmc pkgver=12.1 -pkgrel=4 +pkgrel=5 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" diff --git a/extra/gnome-media/PKGBUILD b/extra/gnome-media/PKGBUILD deleted file mode 100644 index d3c017b1c..000000000 --- a/extra/gnome-media/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 156827 2012-04-23 09:07:01Z ibiru $ -# Maintainer: Jan de Groot - -pkgname=gnome-media -pkgver=3.4.0 -pkgrel=1 -pkgdesc="GNOME Media Tools" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libgnome-media-profiles' 'libcanberra' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils') -url="http://www.gnome.org" -groups=('gnome-extra') -options=('!libtool' '!emptydirs') -install=gnome-media.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('a76fac286f24d3836137ddbaab66f05e19eb5fb83cca6e375dbef040765a1d1f') - -build() { - cd $pkgname-$pkgver - - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gnome-media \ - --localstatedir=/var --disable-static \ - --disable-scrollkeeper - make -} - -package() { - cd $pkgname-$pkgver - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgbase}.schemas" --domain gnome-media-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas - - rm -rf "${pkgdir}/usr/share/sounds/" -} diff --git a/extra/gnome-media/gnome-media.install b/extra/gnome-media/gnome-media.install deleted file mode 100644 index 97488b6d0..000000000 --- a/extra/gnome-media/gnome-media.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=gnome-media - -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/libgnome-media-profiles/PKGBUILD b/extra/libgnome-media-profiles/PKGBUILD deleted file mode 100644 index 9cb1b849c..000000000 --- a/extra/libgnome-media-profiles/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 148822 2012-02-05 11:51:50Z ibiru $ -# Maintainer: Ionut Biru -pkgname=libgnome-media-profiles -pkgver=3.0.0 -pkgrel=3 -pkgdesc="Library for management of audio recording profiles" -arch=(i686 x86_64) -url="http://www.gnome.org" -license=('GPL2') -depends=('gconf' 'gtk3' 'gstreamer0.10-base-plugins') -makedepends=('intltool' 'gnome-doc-utils') -options=('!emptydirs' '!libtool') -install=libgnome-media-profiles.install -source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('ab1288e53a8fccca3e8fa59757ef586901e236e09a737a1178eeb8d74428c061') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --sysconfdir=/etc \ - --disable-static -disable-scrollkeeper \ - --disable-schemas-install - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-audio-profiles "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas -} - -# vim:set ts=2 sw=2 et: diff --git a/extra/libgnome-media-profiles/libgnome-media-profiles.install b/extra/libgnome-media-profiles/libgnome-media-profiles.install deleted file mode 100644 index 22b4c8f12..000000000 --- a/extra/libgnome-media-profiles/libgnome-media-profiles.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=libgnome-media-profiles - -post_install(){ - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD index 81a4e370b..bab6e70c5 100644 --- a/libre/hexchat-libre/PKGBUILD +++ b/libre/hexchat-libre/PKGBUILD @@ -6,17 +6,17 @@ _pkgname=hexchat pkgname=hexchat-libre pkgver=2.9.5 -pkgrel=3 +pkgrel=4 pkgdesc="A popular and easy to use graphical IRC (chat) client, without non-free browser reference (Parabola rebranded)" arch=('i686' 'x86_64' 'mips64el') url="http://www.hexchat.org/" license=('GPL') -options=('!libtool') -depends=('desktop-file-utils' 'gtkspell' 'hicolor-icon-theme' 'libnotify' 'libproxy' 'pciutils') +depends=('dbus-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'libnotify' 'libproxy' 'libsexy' 'pciutils') makedepends=('perl' 'python2') optdepends=('enchant: Spell check' 'perl: Perl plugin' 'python2: Python plugin') +options=('!libtool') install=${_pkgname}.install replaces=$_pkgname conflicts=$_pkgname @@ -40,7 +40,7 @@ build() { # Build ./autogen.sh - ./configure --prefix=/usr --enable-{shm,spell=gtkspell,textfe} + ./configure --prefix=/usr --enable-{shm,spell=libsexy,textfe} make } diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index d59f6dad3..af600985c 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -11,7 +11,7 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceweasel -_debver=19.0.2 +_debver=20.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -68,98 +68,98 @@ do package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() { replaces=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z)) conflicts=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z)) - provides=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z)) + provides=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z) firefox-i18n-$(echo $lang | tr A-Z a-z)) install -Dm644 \"\$srcdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" } " done md5sums=('e88728730ecf9f0f145de5f70e362b15' - '577f0913ac160c2336854ed842044b6f' - 'e96d6bbc8345b5ffb47637342b480193' - 'ed612ec7d50fcd977859f3e6f6875534' - 'd35212122110d449772202f65f8954d1' - 'fc764ee08f7aa67f69083aceab66bb81' - '06de1d263a8a4776b7e448a0ad8362a0' - '02d8e24ef36077bff080eeebc252adeb' - 'ebf1e4045843f52956a98bfc70ec3efc' - '9d8cd02d602731db2d1a02e913cc7dbc' - '287b82c04569177250b55d674269462a' - '382837da7d688057a0b69359963f93ff' - '1ccd265903b1963f6a9de8539698cbb0' - '0219f58a916c0cf0df799c2e269105c9' - '5527ac476ce1b10bb2420047edb21f24' - 'a40237df431981bfca233ef38a8df474' - '32b3599f81fb9a250d335e4a4a313def' - '0903b962eca658cf88a64095f139a809' - '3a80ded2c90fa410432d44bcd9808b9e' - 'af744ffcb375785811fbc22b814cfa82' - '0fd6576b735ac437e25ecfab730e3db3' - '694019675d5966cb7aafa662c207467e' - '05b712fc956fac57600eb6205a2341d2' - '67e11e01d236f0787d382c462fbaa0d0' - 'e07ca2aa3d1b68307b10e46b267e7bb5' - 'cf6b53eae07f1c1129a2ce3d89c78589' - 'adb43ace5104c3ff9a96a5c9cd5342b6' - '08d27decba62fef21bc0f094b7c6fb39' - '33d1886baa6cf67385f1d662b31b6bdd' - '01724da61afc4558e80e93662a96d5dd' - '7b11d548e148cb779e164aa21d781e77' - '06ec8e9346a2d8bed31e59d2ae5f06c2' - 'cee7e005f487018602b0fa6336b1e808' - 'a0550ba75b0030ed610c24a2508e0f31' - '1fc0945594cde4e165828e610fc3e0a1' - '65fb01cbaa9ec423430084d014078344' - '4d4edc8cc1d512e903e6857232ec6c04' - '60461b2b0fd0d50b7a799702880595f8' - 'b6b571eb0e2e5e7f2f68787e4aabf2bf' - '49ce5b75e49466afdf455628927d2d30' - '014b582e1d7b96ff4632cdd0ee12fd2f' - '3d28b51cf16763c5cf246e956c154ebb' - 'b8f60afa1dfe264418a7a1d74374629a' - '3743cce61567698ea95a622a58e6024f' - '3fd118453485902eeabad9083d77da0a' - '8f16503b338fa959d234af03eddcecf6' - '1cbb856b565d60933f550b589b81ed90' - '10150da51e917a5f1f084d41d9b70d75' - 'cee582980678829954cb7adfbd8bba81' - 'c0f0fe587753be359701673c8bf28c0b' - '48be85369d8a5bebf19b99143693e656' - '188dcf198b42edd3c58fe7d89881ae27' - '6d0f4cbfcab26af14b8c6d088bb99e75' - 'b0522c391e49d68bfe523de9eaff78e2' - 'e79d309ab539a3735fdbd344ee4d087c' - '3222399aa9eaa432e13391d1178fe748' - 'b412fedbf05a9faa37c3119ce8745b38' - 'fa42254a7d3304f89386ae5da13395fb' - '4507fa683d06e3a9f2bf867c7b9e1c80' - 'f18d4b25957c27a338b9440243578341' - 'ab21b048fc397f6e87929fea4ed8f49f' - 'd564a6d04df098010d706001ce07ab45' - 'e552c50840d4d6587a748f78b7180c16' - '4ebff11fd20c9d2e32a5917d13275c17' - 'e27d4af2134fe45ee332738ec333ab24' - '690a3a5187e9f9275b6ca368528856c6' - '42921abda94e6f1c960ff17197a7a203' - 'f23feb82e9e498d7b95c075d72d58f25' - '79e5fafcd4c9053d71f6b88d4ba13c19' - '5a5faae4a8339b9543f365b9bec9aaf9' - 'f6e21175aa922111e1270f845df63c6a' - '24ba1a50d34e7bd77b443184e80a4154' - 'b644aa9d757383848504104fefa8c02e' - '24e395878a542ae3e148c86ff6d7f834' - '98e1f1d4a59f8b29eba9c0d9180fff8a' - '96bfa3b03d1ff2cd6a5934c4e04b3fbd' - 'cfd277d4d8a12cea253fa163e4df4670' - '5649ab30c7856895199524359e8ee6e1' - '04acd4ea38086e95976bb98762283fb2' - 'c62bb42d6b5718b6cede126466d40d9c' - 'ce3d87441cb6a23ff2c2343e112fb265' - 'c5ac0408351585156b04a1c519851de5' - '5eb03c3ba770c3d03fbc61a01c31f89b' - 'db6fde87a056b5ba9705d3127028cfab' - 'e77956cf4cf4bbf16949bfa6fa5f815d' - '2c694332daddb6de2773f2fd4253521b' - 'dd12eaa38c8a47e05b7b87de8914dc78' - 'f37c87a13da078e6a575c36dac084fe6' - 'beaf7c4a95689735db4899780bdc1aaf') + 'd1651c29cc6f62fab7aa8d399018fdfd' + '326c4e887c068f9ecc9c52041a8de0f4' + 'c34b9f5b54fe0ee01d4dec85e0be3582' + '2b47d281bbe9a46f7a5c1c7a916082a7' + '0c8060587becaf417c6184c6259f0269' + '9bbbff12bfd00c5b458f844f5e457e82' + 'd52c93c34062735809dfcd0047092f54' + 'f92175163b97d52c59f77613a1e7068a' + '6e4590b2f46ab6d673ea66f1ebe49d0e' + '57c52240c1097a4d4e8d688a243612da' + 'd159050304d9eee50c90fb24a6767a81' + '10cc3fc8a12811eb6c250eacda07331d' + '8ee75c270325ac2aaefcf21f05cabee3' + 'cf8a6e7c49642ce1e25a0b5f1148d7b0' + '8df2b6c9ff9fc809a6b760e7d1c547bd' + 'a3bd9cf2ead7ea2fadc05de54f5471d9' + 'b5deda5efa7bfee9d40ca24ad3b32fc5' + '07c17a2b2ee81e5e92fa40599a11c77c' + 'e07a84d04a90835ca3ca382841e3d1ac' + '9e8c323c92a448e1e0fea0acf16b139c' + '7ca09907a2c13997ce81e0898525c0ab' + 'ea968fd0b22338398433e155199a69cf' + '5907528876f8bf63caa9a1ba30618e27' + 'df46e9156d67d63f8c461d85082c143d' + '354dea9cca6f0c52eeaf6fccb0a722a2' + '0f66a3864af8dd5416d604444a7caccd' + 'a628720aad8c316a67e9dbc6925c0117' + '838d83ee766ccc23b413cc78feaaf66e' + '5338d8017e52d6a2c2bfa9f0456d06a5' + '35e1af40baf6be70d2ab1aee7e685d87' + 'a59464ff5e836aeaed88c14868969ddf' + '87697f71946a0b1e60fe6364a03511d0' + '5f2831e8b4bc47c96a96b3d54e7567ea' + '32a9e0a3b117323d72fbcadb61fffc46' + '06b942c5ed0827353a66058e20aa1566' + '9077b7c5c7f00a9987c094beb18a8477' + 'cb5e678ea288eb77cdc72cd775b139fc' + 'd81b1b70ad5257c9db2c3bc600060564' + '70fe86d4dd3f18398f27a79914a5d5a7' + '9b4d5ba6ba647a7612fd2599c2123efa' + '405bc14439cd1cc6b2272179697870fa' + '4ec5178099d4d573b43379e751824b2a' + '8462e327c292c8777859dd9def1bf99a' + 'a5310b15b7c4563d6d14a1d992a366e4' + '82dbf25ae893b17fd80f622334b40be9' + '639ebfb70a105e5ab8abc27cbc0fc6f4' + '931c9cec0b02245faf84178a0ee6bba6' + 'abf3a17fe5a518a229d98b3165c7ea54' + 'f7ce85e60cefbafb9d0a5509163ab2fa' + '7ce7984f91bde4a100d1cb235ff9d934' + 'bf2a48221ae4bc2b8dce548801936ce6' + '403ce2a839e42fdb0d59c94d44d7d761' + 'fc70c7291c83014f14a73c63f6c7a96f' + 'a055ac9a1d9f4d6c851d5bfc469bcf69' + 'ebcf54da830e668474212f18783eb917' + 'bbceb1e048430dc4681db49ef3b9fed6' + '379590483064e6cea3af18025a418aa9' + 'ed754da9e0fd5e8425121f48ae62d37c' + 'd89ef20360750693b95678f301fb2664' + '5535b58bf3002c06c6b118d5eaed10fa' + '4aa12ddad5b1b998d2b4c5ae08fdcea6' + '8efc40ce477c9bd375e371e92571de8b' + '144cab65088ad01e5821b62c059deeb5' + '0aaf40e7427b958ac5808406cd7d2310' + '233e98ecfd0a0e73fd4ecdb2dc5eb434' + '68dc8ea77bfcf20aad06d63770a88108' + '10a92a0b94522f42aab595a2fa299df0' + '120c822b8e91bc77e66df5675f68b218' + '7eb3b611964f801695f55375c303bac2' + '200f29098852065284c153dc7f405016' + 'f65badaccceee09063f83342b17b62c8' + 'cde4af8ad6fe0368c972a7b4cbbcbf2b' + '6ab7c6e0ce48680fead7295604067ccd' + 'b207abe2bc1fb8ccd0c55185b943e341' + '338860a47735330619099b35c0a6660b' + '5a4de6eb0bca5b337c62feb1fd9bb35e' + 'a01d5c370b2263cc07e1706e423959c8' + 'a1e0594303fb257f6cb94c20bf990fdd' + '934033c448d6f4b2b78503d2b7864c16' + '71ca1bca582ed7199d9e27022ce0b740' + '4c081b33ab71b2e8153628f0a0832ad7' + '713a2606488f49cf31dc1ea01a45ad00' + 'b1a1f959f8c639c5435e2ed707f275c0' + 'fc2f8e28db037c5b2ed0549233199751' + '30dee9ddc86d54cff05ab97771f3f2e9' + '57a1db9470741338eb452045e1b15221' + 'd43034023b5289d5a1dcc4e6fe83c7cd' + 'ea15b25281abc80308b4253253c30936') diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index b7bd659a0..4ca4fc704 100644 --- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -80,10 +80,10 @@ index 52722e9..0448444 100644 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]); diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm -index 1f60879..fc83a99 100644 +index 401623a..4ce7a3e 100644 --- a/browser/components/migration/src/MigrationUtils.jsm +++ b/browser/components/migration/src/MigrationUtils.jsm -@@ -403,11 +403,6 @@ this.MigrationUtils = Object.freeze({ +@@ -404,11 +404,6 @@ this.MigrationUtils = Object.freeze({ * @see nsIStringBundle */ getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) { @@ -95,7 +95,7 @@ index 1f60879..fc83a99 100644 if (aReplacements === undefined) return getMigrationBundle().GetStringFromName(aKey); return getMigrationBundle().formatStringFromName( -@@ -622,6 +617,17 @@ this.MigrationUtils = Object.freeze({ +@@ -623,6 +618,17 @@ this.MigrationUtils = Object.freeze({ }, /** @@ -184,7 +184,7 @@ index 260bc29..52b32cc 100644 -64_firefox=Bookmarks Backups +64_self=Bookmarks Backups diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn -index 96cedd3..a0f8a75 100644 +index fa45115..1fcf3cd 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -42,7 +42,7 @@ toolkit.jar: @@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index 1045665..04bd1aa 100644 +index 7665de2..4588f4a 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3698,7 +3698,7 @@ XREMain::XRE_mainRun() +@@ -3699,7 +3699,7 @@ XREMain::XRE_mainRun() if (gDoProfileReset) { // Automatically migrate from the current application if we just // reset the profile. diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 1702a17b7..6dc52a213 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,7 +14,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=19.0.2 +_debver=20.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -38,6 +38,7 @@ fi optdepends=('networkmanager: Location detection via available WiFi networks') url="http://www.geticeweasel.org/" install=iceweasel.install +provides=('firefox') source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz" mozconfig @@ -49,22 +50,17 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" shared-libs.patch replace-urls.txt Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('ceda63e01012f9940542d862fd755a65' - '7fa6e0fb544d01516d3232f26023c570' +md5sums=('22daa24b6490c654f131550cbf20fad3' + '0c70ab52f35701558081df3d360361a2' 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' 'dfeb4ab2c96aae3356a4c347eee0b97b' - '7ef2c05dbd5631741404f2589c4ea07e' + '5addd418bf32b673fdfe80c8fefbea1a' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '6dd547c72bb875a3101135a1c32d4783' '52e52f840a49eb1d14be1c0065b03a93' 'a8fc4658d45b6bf9350023e5c3f34e56' - '2fde2f4bc158b217f3d71b33ef0bc626') - -if [ "$_pkgname" != "$pkgname" ]; then - provides+=("$_pkgname=$pkgver") - conflicts+=("$_pkgname") -fi + 'd0e1f2625cd9f7234abdeb55aee00529') build() { # WebRTC build tries to execute "python" and expects Python 2 diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 154fc3b94..9d2aa7c05 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,19 +1,20 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js ---- mozilla-release.orig/browser/app/profile/firefox.js 2013-01-10 20:20:02.000000000 -0500 -+++ mozilla-release/browser/app/profile/firefox.js 2013-01-10 17:47:34.000000000 -0500 -@@ -1168,11 +1168,9 @@ +--- mozilla-release.orig/browser/app/profile/firefox.js 2013-03-26 19:17:35.000000000 -0300 ++++ mozilla-release/browser/app/profile/firefox.js 2013-04-03 16:10:57.681396937 -0300 +@@ -1176,12 +1176,9 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); --// Example social provider +-// Default social providers -pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}"); +- // Comma-separated list of nsIURI::prePaths that are allowed to activate // built-in social functionality. -pref("social.activation.whitelist", "https://www.facebook.com"); +pref("social.activation.whitelist", ""); + pref("social.sidebar.open", true); pref("social.sidebar.unload_timeout_ms", 10000); - pref("social.active", false); diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js --- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-01-04 18:44:27.000000000 -0500 +++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-01-10 18:26:10.000000000 -0500 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 +# Contributor: Dr.Egg + +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 @@ + + + + + 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) -- cgit v1.2.3-54-g00ecf