From d304fad026899d2db5af26740eeb952698bd6fb2 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 3 Apr 2013 00:04:48 -0700 Subject: Wed Apr 3 00:04:48 PDT 2013 --- community/0ad/PKGBUILD | 10 +- community/celt-0.7/PKGBUILD | 36 --- community/kbibtex/PKGBUILD | 6 +- community/nginx/PKGBUILD | 8 +- community/pcsc-perl/PKGBUILD | 8 +- community/protobuf/PKGBUILD | 4 +- community/sxiv/PKGBUILD | 6 +- community/sxiv/sxiv.install | 2 +- community/teamspeak3/PERMISSION.eml | 70 ------ community/teamspeak3/PKGBUILD | 67 ----- community/teamspeak3/icon.xpm | 305 ----------------------- community/teamspeak3/teamspeak3.desktop | 11 - community/teamspeak3/teamspeak3.launcher | 6 - community/ubuntuone-client-gnome/PKGBUILD | 8 +- community/ubuntuone-client/1339_1338.diff | 57 ----- community/ubuntuone-client/PKGBUILD | 39 ++- community/ubuntuone-client/fix-notify-hint.patch | 27 +- community/ubuntuone-client/lp1093111.patch | 10 - community/vtk/PKGBUILD | 6 +- 19 files changed, 61 insertions(+), 625 deletions(-) delete mode 100644 community/celt-0.7/PKGBUILD delete mode 100644 community/teamspeak3/PERMISSION.eml delete mode 100644 community/teamspeak3/PKGBUILD delete mode 100644 community/teamspeak3/icon.xpm delete mode 100644 community/teamspeak3/teamspeak3.desktop delete mode 100644 community/teamspeak3/teamspeak3.launcher delete mode 100644 community/ubuntuone-client/1339_1338.diff delete mode 100644 community/ubuntuone-client/lp1093111.patch (limited to 'community') diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD index 765c524df..c1a642e5f 100644 --- a/community/0ad/PKGBUILD +++ b/community/0ad/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87402 2013-03-31 19:18:04Z stephane $ +# $Id: PKGBUILD 87547 2013-04-02 21:52:23Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: t3ddy # Contributor: Adrián Chaves Fernández (Gallaecio) pkgname=0ad -pkgver=a12 -_pkgver=0.0.12-alpha -pkgrel=3 +pkgver=a13 +_pkgver=0.0.13-alpha +pkgrel=1 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game" arch=('i686' 'x86_64') url="http://play0ad.com/" @@ -13,7 +13,7 @@ license=('GPL2' 'CCPL') depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu') makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2') source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz") -md5sums=('0ff92fb2b22b5384067cdd88b89e5450') +md5sums=('3075c982c4af41a3586b6b6ef637d2c4') build() { cd "$srcdir/$pkgname-$_pkgver/build/workspaces" diff --git a/community/celt-0.7/PKGBUILD b/community/celt-0.7/PKGBUILD deleted file mode 100644 index 0c572e9e8..000000000 --- a/community/celt-0.7/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 84881 2013-02-25 19:42:06Z arodseth $ -# Maintainer: Ray Rashif -# Contributor: Sven-Hendrik Haase -# Contributor: Lauri Niskanen - -pkgname=celt-0.7 -_realname=celt -pkgver=0.7.1 -pkgrel=4 -pkgdesc='Low-latency audio communication codec' -arch=('i686' 'x86_64') -url='http://www.celt-codec.org' -license=('BSD') -depends=('libogg') -#provides=('celt=$pkgver') -conflicts=('celt') -options=('!libtool') -source=("http://downloads.xiph.org/releases/celt/$_realname-$pkgver.tar.gz") -md5sums=('c7f6b8346e132b1a48dae0eff77ea9f0') - -build() { - cd "$srcdir/$_realname-$pkgver" - - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$_realname-$pkgver" - - make DESTDIR="$pkgdir/" install - install -Dm644 COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/BSD" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/kbibtex/PKGBUILD b/community/kbibtex/PKGBUILD index 87024dda3..abcd8d8b8 100644 --- a/community/kbibtex/PKGBUILD +++ b/community/kbibtex/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 87529 2013-04-02 15:44:34Z schiv $ # Maintainer: Ray Rashif # Contributor: Antonio Rojas # Contributor: cmorlok @@ -6,12 +6,12 @@ pkgname=kbibtex pkgver=0.4.1 _branch=0.4 -pkgrel=1 +pkgrel=2 pkgdesc="A BibTeX editor for KDE" arch=('i686' 'x86_64') url='http://home.gna.org/kbibtex/' license=('GPL') -depends=('kdebase-runtime') +depends=('kdebase-runtime' 'kdegraphics-okular') makedepends=('cmake' 'automoc4') install=$pkgname.install source=("http://download.gna.org/$pkgname/$_branch/$pkgname-$pkgver.tar.bz2") diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index e889eb458..48c00e91c 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86846 2013-03-22 20:04:56Z foutrelis $ +# $Id: PKGBUILD 87542 2013-04-02 19:17:59Z bpiotrowski $ # Maintainer: Sergej Pupykin # Maintainer: Bartłomiej Piotrowski # Contributor: Miroslaw Szot @@ -7,8 +7,8 @@ _cfgdir=/etc/nginx _tmpdir=/var/lib/nginx pkgname=nginx -pkgver=1.2.7 -pkgrel=5 +pkgver=1.2.8 +pkgrel=1 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64') depends=('pcre' 'zlib' 'openssl' 'geoip') @@ -29,7 +29,7 @@ backup=(${_cfgdir:1}/fastcgi.conf source=(http://nginx.org/download/nginx-$pkgver.tar.gz service logrotate) -sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3' +sha256sums=('d2947c98c5bed311b1e6c04e35a730af92e40e2e6bfe9201fa7f404987457137' '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a' '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16') diff --git a/community/pcsc-perl/PKGBUILD b/community/pcsc-perl/PKGBUILD index 0d6aec8c6..acacbf515 100644 --- a/community/pcsc-perl/PKGBUILD +++ b/community/pcsc-perl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71749 2012-06-02 10:29:26Z bluewind $ +# $Id: PKGBUILD 87531 2013-04-02 15:53:32Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: neuromante # Contributor: marc0s pkgname=pcsc-perl -pkgver=1.4.12 -pkgrel=3 +pkgver=1.4.13 +pkgrel=1 pkgdesc="A Perl Module for PC/SC SmartCard access" arch=('i686' 'x86_64') url="http://ludovic.rousseau.free.fr/softwares/pcsc-perl/" @@ -14,7 +14,7 @@ depends=('pcsclite' 'perl') makedepends=('pkgconfig') options=('!emptydirs') source=("http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('f34c5ab748815bf0b2e571362b4f8121') +md5sums=('758ca469b79667fa8c41422df86a088b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/protobuf/PKGBUILD b/community/protobuf/PKGBUILD index d86e9c13f..2e50d63eb 100644 --- a/community/protobuf/PKGBUILD +++ b/community/protobuf/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=protobuf pkgname=('protobuf' 'python2-protobuf') pkgver=2.5.0 -pkgrel=2 +pkgrel=3 pkgdesc="A way of encoding structured data in an efficient yet extensible format" arch=('i686' 'x86_64') url="http://code.google.com/p/protobuf/" @@ -31,6 +31,8 @@ package_protobuf() { package_python2-protobuf() { pkgdesc="protobuf python API" depends=("python2" "protobuf=${pkgver}") + provides=("protobuf-python") + conflicts=("protobuf-python") replaces=("protobuf-python") cd $srcdir/protobuf-$pkgver/python diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD index de8f86865..1275da245 100644 --- a/community/sxiv/PKGBUILD +++ b/community/sxiv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87472 2013-04-01 10:33:39Z bpiotrowski $ +# $Id: PKGBUILD 87533 2013-04-02 17:43:50Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Bert Muennich @@ -6,13 +6,13 @@ pkgname=sxiv pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc='Simple X Image Viewer' arch=('i686' 'x86_64') license=('GPL2') install=sxiv.install url='https://github.com/muennich/sxiv' -depends=('libx11' 'xproto' 'imlib2' 'giflib' 'libexif' 'desktop-file-utils') +depends=('libx11' 'xproto' 'imlib2' 'giflib' 'desktop-file-utils') source=(https://github.com/muennich/sxiv/archive/$pkgver.tar.gz sxiv.desktop config.h) diff --git a/community/sxiv/sxiv.install b/community/sxiv/sxiv.install index 6302d1f8f..1e3ec7774 100644 --- a/community/sxiv/sxiv.install +++ b/community/sxiv/sxiv.install @@ -3,7 +3,7 @@ post_install () { echo "* Edit config.h in sxiv's PKGBUILD directory (generally /var/abs/community/sxiv/)" echo " and rebuild package if you want to change settings." - echo "* Create the directory ~/.sxiv/ to enable thumbnail caching." + echo "* Create the directory ~/.sxiv/cache to enable thumbnail caching." echo " See sxiv(1) for more information." } diff --git a/community/teamspeak3/PERMISSION.eml b/community/teamspeak3/PERMISSION.eml deleted file mode 100644 index 34ab6fedb..000000000 --- a/community/teamspeak3/PERMISSION.eml +++ /dev/null @@ -1,70 +0,0 @@ -Return-Path: -X-Original-To: sh@lutzhaase.com -Delivered-To: sh@lutzhaase.com -Received: from tritoncia.com (mail.tritoncia.com [50.22.6.155]) - by lutzhaase.com (Postfix) with ESMTP id 4066410001D - for ; Wed, 27 Feb 2013 22:41:21 +0100 (CET) -Received: from support.teamspeakusa.com ([50.22.6.158]) - by tritoncia.com (tritoncia.com [127.0.0.1]) - (MDaemon PRO v12.5.2) - with ESMTP id md50001207881.msg - for ; Wed, 27 Feb 2013 15:41:14 -0600 -X-Spam-Processed: tritoncia.com, Wed, 27 Feb 2013 15:41:14 -0600 - (not processed: spam filter heuristic analysis disabled) -X-MDRemoteIP: 50.22.6.158 -X-Return-Path: bizdev@teamspeakusa.com -X-Envelope-From: bizdev@teamspeakusa.com -X-MDaemon-Deliver-To: sh@lutzhaase.com -Message-ID: <1362001813.512e7f9544c05@support.teamspeakusa.com> -Date: Wed, 27 Feb 2013 22:50:13 +0100 -Subject: [#DYK-534-32625]: Redistribution for Arch Linux -From: TeamSpeak Business Development -Reply-To: bizdev@teamspeakusa.com -To: sh@lutzhaase.com -MIME-Version: 1.0 -Content-Type: text/html; charset=utf-8 -Content-Transfer-Encoding: quoted-printable -X-Priority: 3 (Normal) - -Hi Sven, -
-as long as our licenses remain included and the binari= -es remain unchanged we are approving a packaging of the TeamSpeak 3 soft= -ware in your Arch Linux project.
-
-Best regards
= - -
-Andreas Brillen
-
_____________________= -___________
-TeamSpeak Business Development
-e-Mail: b= -izdev@teamspeakusa.com
-Visit: http://www.TeamSpeak.com
-Customers: https://sales.TeamSpeakUSA.com
-Knowledgebase= -: http://support.TeamSpeakUSA.com
-
-Hours of operation= - for this department are Monday - Friday, 9AM to 5PM Pacific Time (UTC-8= -) and 9AM to 4PM CET (UTC+1). We are committed to responding to your inq= -uiry within 48 hours, and typically will reply within 24 hours, excludin= -g weekends and holidays.
-

- - -Ticket De= -tails
-
-Ticket ID: DYK-53= -4-32625
-Department: Business Development
-Type: Issue= -
-Status: Open
- - diff --git a/community/teamspeak3/PKGBUILD b/community/teamspeak3/PKGBUILD deleted file mode 100644 index 2caaef515..000000000 --- a/community/teamspeak3/PKGBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# Maintainer: Sven-Hendrik Haase -# Contributor: Slash -# Contributor: J.W. Birdsong - -pkgname=teamspeak3 -pkgver=3.0.10 -pkgrel=2 -pkgdesc="TeamSpeak is software for quality voice communication via the Internet" -url="http://www.teamspeak.com/" -license=('custom') -depends=('qt4' 'libpulse') -arch=('i686' 'x86_64') -source=("http://teamspeak.gameserver.gamed.de/ts3/releases/${pkgver}/TeamSpeak3-Client-linux_x86-${pkgver}.run" - "http://teamspeak.gameserver.gamed.de/ts3/releases/${pkgver}/TeamSpeak3-Client-linux_amd64-${pkgver}.run" - 'teamspeak3.desktop' - 'icon.xpm' - 'teamspeak3.launcher') -md5sums=('1a0f4fa7effca1419d74f7bac2c9a8e4' - '73f0328f4d64150b6465932e624725df' - '98e987a42511f159fa2228f5e0bffed1' - '19f103384e4c1a0aafc8fed44de0c87b' - '170fcbb1b468ce4f3dba7ee3fb2a1c6d') - -[[ "$CARCH" == "i686" ]] && _TSARCH='x86' -[[ "$CARCH" == "x86_64" ]] && _TSARCH='amd64' - -package() { - cd ${srcdir} - - # Create Destination Directories - install -d ${pkgdir}/{usr/bin/,opt/} - - # Make Installer Executable - chmod +x TeamSpeak3-Client-linux_${_TSARCH}-${pkgver}.run - - # Run Installer - ./TeamSpeak3-Client-linux_${_TSARCH}-${pkgver}.run --noexec --target teamspeak3 - - # Move Program Data to Package Directory - mv ${srcdir}/teamspeak3/ ${pkgdir}/opt/ - - # Remove Bundled Qt Libraries and Symlink system libraries to TS3 Directory - rm ${pkgdir}/opt/teamspeak3/libQt* - ln -s /usr/lib/libQtCore.so.4 ${pkgdir}/opt/teamspeak3/libQtCore.so.4 - ln -s /usr/lib/libQtGui.so.4 ${pkgdir}/opt/teamspeak3/libQtGui.so.4 - ln -s /usr/lib/libQtNetwork.so.4 ${pkgdir}/opt/teamspeak3/libQtNetwork.so.4 - - # Fix FS#34190 - sed -i "/export QTDIR.*/d" ${pkgdir}/opt/teamspeak3/ts3client_runscript.sh - sed -i "/export QT_PLUGIN_PATH*/d" ${pkgdir}/opt/teamspeak3/ts3client_runscript.sh - - # Fix FS#34189 - rm ${pkgdir}/opt/teamspeak3/qt.conf - - # Install Desktop File - install -D -m644 $srcdir/teamspeak3.desktop ${pkgdir}/usr/share/applications/teamspeak3.desktop - - # Install Icon File - install -D -m644 $srcdir/icon.xpm ${pkgdir}/usr/share/pixmaps/teamspeak3.xpm - - # Install Custom License - install -D -m644 ${pkgdir}/opt/teamspeak3/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - - # Install Client Launcher - install -D -m755 $srcdir/teamspeak3.launcher ${pkgdir}/usr/bin/teamspeak3 -} -# vim:set ts=2 sw=2 et: diff --git a/community/teamspeak3/icon.xpm b/community/teamspeak3/icon.xpm deleted file mode 100644 index fe47b3bb9..000000000 --- a/community/teamspeak3/icon.xpm +++ /dev/null @@ -1,305 +0,0 @@ -/* XPM */ -static char *dummy[]={ -"48 48 254 2", -"Qt c None", -"ar c #026d04", -"aq c #069309", -"aF c #0c9928", -"ae c #0f6f16", -"ad c #107a03", -"aW c #138d08", -"a7 c #148d1e", -"bg c #165f30", -"bh c #17602f", -"a6 c #1b633e", -"a3 c #1b6a32", -"#0 c #1b8418", -"bi c #1e4c3b", -"aK c #1fb404", -"aE c #1fd04d", -"aJ c #228739", -"aD c #25d939", -"aG c #276253", -"ax c #27a737", -"aO c #27f965", -"bf c #28534e", -"ay c #28da23", -"as c #296255", -"aN c #29fa5d", -"ap c #2bb41e", -"bW c #2c3546", -"aR c #2d9d45", -"br c #303b50", -"aS c #305a5c", -"bk c #323e54", -"aX c #32d03c", -"b5 c #333d50", -"aj c #33bb49", -"aC c #33e131", -"bR c #343d50", -"bb c #344056", -"#1 c #35845e", -"#4 c #36435b", -"ba c #365360", -"aB c #36ee37", -"aM c #36f958", -"aT c #38455d", -"aA c #39f83c", -"bL c #3a4355", -"be c #3a4760", -"af c #3a5e69", -"aL c #3ae333", -"bn c #3b4250", -".R c #3b485e", -".z c #3b4862", -"#n c #3b4b64", -"bj c #3b5166", -"bs c #3c4452", -"#a c #3c4a64", -"ac c #3ca72c", -".E c #3d4962", -"aH c #3d4c66", -"#t c #3e4d68", -"#C c #404e6a", -".t c #414e65", -"b4 c #434e62", -".1 c #43516c", -"#Z c #43a735", -"bC c #444d5e", -".v c #455166", -".y c #455573", -"#i c #475a75", -"#P c #47ae4e", -"am c #47fc4a", -"bt c #485162", -"#z c #485772", -"#Q c #489571", -"az c #49f243", -"aP c #49fa88", -"#b c #4a5975", -".0 c #4c5669", -".2 c #4d5c79", -"bm c #4e5868", -"#8 c #4eae72", -"ao c #4ed03d", -"bS c #505762", -".x c #505e79", -".o c #515b6e", -"#2 c #515d74", -".V c #53627b", -"#I c #537680", -"an c #53ec4b", -".n c #565e6e", -".F c #566580", -"bK c #576276", -"#T c #577983", -".S c #586681", -"ak c #58ee66", -".u c #596171", -".U c #5a6882", -"bX c #5b616b", -"#E c #5b657a", -"aw c #5d687c", -"by c #5d6b85", -"a8 c #5dcf79", -"bV c #5e6a80", -"#K c #5e8b89", -"#o c #5f6d86", -"bT c #60697c", -"#H c #609c89", -"bD c #616e88", -"b# c #61c07a", -".f c #636b7b", -"bY c #636d7f", -".e c #646d7c", -"#G c #64ac8e", -".w c #657187", -".s c #65728b", -"#U c #66e377", -"aZ c #66feaa", -"b6 c #696e77", -".H c #69758e", -"a0 c #69feac", -"bJ c #6a717c", -".d c #6a7282", -"b3 c #6a7488", -"#F c #6a9992", -"#O c #6ad465", -"aY c #6cfda3", -".p c #6d778b", -".I c #6d7a91", -"bZ c #6f788b", -"aQ c #6fed9c", -"aa c #6ffa7a", -".D c #707783", -"aU c #727b8c", -"ab c #72db67", -"#7 c #737d92", -"al c #73fd80", -"b7 c #747a84", -"ag c #767c85", -"#L c #76ea8d", -".g c #77808f", -"b2 c #778194", -".3 c #778298", -"bH c #787d85", -".m c #7a808b", -".c c #7a828f", -"bQ c #7b7f88", -"#3 c #7b8392", -"b0 c #7b8396", -"aV c #7b8494", -"#A c #7b869a", -"bF c #7c7e86", -"bp c #7c818a", -"#9 c #7cec81", -"## c #7d8390", -".4 c #7d889c", -"#d c #7d8aa4", -"bz c #7e8491", -"a# c #7efe93", -"#c c #7f899b", -"bP c #80858e", -"bO c #808b9f", -"a2 c #80d598", -"#S c #818895", -"b1 c #828c9e", -"#p c #828da1", -"ai c #838b9a", -"b. c #83e6a5", -"bB c #848991", -"at c #858e9e", -"#r c #858ea1", -"#w c #8592ac", -"bN c #86898d", -".G c #8690a3", -"#Y c #86e982", -"a9 c #86eaa9", -"#k c #8795b0", -"bq c #888c93", -"a1 c #88fdbb", -"bE c #898b90", -".b c #898f9a", -".h c #8991a0", -"#x c #8a99b5", -"#N c #8af397", -"#M c #8af99b", -"bG c #8b8f96", -"#h c #8c96a8", -"#e c #8e9dba", -"bU c #8f96a6", -".T c #8f98a9", -"bo c #90949d", -".5 c #909fbc", -"#s c #9197a2", -"#u c #939bac", -".q c #939db1", -"#f c #93a2bd", -"#J c #959aa4", -"bd c #97a5c0", -"bw c #99a6c1", -".l c #9a9fa8", -".6 c #9ba9c3", -"bx c #9ca2ac", -".i c #9ca4b3", -".W c #a0a6b3", -"#l c #a0adc5", -"#R c #a3abb8", -".a c #a4a9b3", -"#X c #a4feb9", -"#g c #a5b1c8", -"#j c #a8aeba", -".k c #a8afbd", -"bI c #aaacaf", -"bM c #aaaeb7", -".7 c #aab5cb", -".K c #abb1bc", -"av c #aeb4c0", -"#q c #aeb9cb", -"bv c #afb1b5", -"bc c #b0b5bd", -"aI c #b0b6c2", -"bA c #b1b3b6", -".J c #b1b8c4", -"a. c #b2fec6", -".j c #b3b8c3", -"bl c #b3bdd0", -"bu c #b4bac6", -"#v c #b5bcc7", -"ah c #b6bac3", -"#y c #b7c1d3", -"a5 c #b9bfcb", -"#V c #b9fcc4", -".8 c #bbc4d5", -"#B c #bcc1cc", -".r c #c2c7d1", -".X c #c3c9d5", -".L c #c3cbd9", -".# c #c4c7cd", -"#W c #c4ffd7", -"a4 c #c6c8cd", -"au c #c8cdd5", -".9 c #c8cfdd", -"#6 c #cacdd3", -".Y c #cad1de", -".Z c #ccd3e0", -".A c #d0d3d9", -".M c #d0d6e2", -".N c #d3d9e4", -"#D c #d6d8de", -".O c #d9dde5", -"#. c #dadfe8", -".P c #dde1ea", -"#5 c #dfe2e7", -".B c #e2e6ec", -"#m c #e5e8ef", -".Q c #e6eaf0", -".C c #ebeef2", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQt.#.a.b.c.d.e.f.d.g.h.i.jQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQt.k.lQtQtQtQtQtQtQtQtQtQtQtQt.m.n.o.p.q.rQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQtQt.q.s.tQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.u.v.w.qQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQt.q.x.y.zQtQtQtQtQt.A.B.C.CQtQtQtQtQtQtQtQtQtQt.D.E.F.GQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQt.H.y.y.zQtQt.I.JQtQt.K.L.M.M.N.O.P.QQtQtQtQtQtQtQt.D.R.S.TQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQt.U.y.y.zQtQt.x.V.GQtQt.W.X.Y.Z.Z.Z.Z.M.O.BQtQtQtQtQtQt.0.1.sQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQt.V.y.y.zQtQt.x.y.2.3QtQt.4.5.6.7.8.9.Y.Z.Z.M#.QtQtQtQtQt###a.F.WQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQt.W.2.y.y.zQtQt.V.y.y#b#cQtQt#d#e.5#e#f#g.8.Y.Y.Z.M#.QtQtQtQtQt.E.x#hQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQt.4#i.y.y.zQtQt.V.y.y.y#b#jQt.a#k#e#e#e#e#e#l.L.Y.Y.Z.N#mQtQtQtQt#n.2.4QtQtQtQtQtQtQt", -"QtQtQtQtQtQt#o.y.y.y.zQtQt.V.y.y.y.y.xQtQt#p#e#e#e#e#e#e.5#q.Y.Y.Z.M.PQtQtQtQt#a.2#rQtQtQtQtQtQt", -"QtQtQtQtQtQt.F.y.y.y.zQtQt.V.y.y.y.y.y#rQtQt#k#e#e#e#e#e#e.5#g.Y.Y.Z.Z.OQtQtQt#s#t.2#uQtQtQtQtQt", -"QtQtQtQtQt#v.x.y.y.y.zQtQt.V.y.y.y.y.y.yQtQt#w#e#e#e#e#e#e#e#e.7.Y.Y.Y.Z.OQtQtQt.d.1.2QtQtQtQtQt", -"QtQtQtQtQt.q#b.y.y.y.zQtQt.V.y.y.y.y.y.y.TQt.J#x#e#e#e#e#e#e#e.5#y.Y.Y.Y.9QtQtQtQt.v.y.VQtQtQtQt", -"QtQtQtQtQt.4#z.y.y.y#aQtQt#z.y.y.y.y.y.y#bQtQt#w#e#e#e#e#e#e#e#e#f.9.Y.Y.Y.XQtQtQtQt#t.y#AQtQtQt", -"QtQtQt#B#A.x.y.y.y.y.y.TQtQt.v.1.y.y.y.y#CQtQt.q#e#e#e#e#e#e#e#e#e.7.Y.Y.Y.L#DQtQtQt#E.y.yQtQtQt", -"QtQt.J#o.F#F#G#H#I.y.y.x#pQtQt.t.y.y.y.y.1#JQt#q#e#e#e#e#e#e#e#e#e#f.Y.Y.Y.Y#BQtQtQtQt.1.y#AQtQt", -"QtQt.s#K#L#M#N#O#P#Q#i.y#b#RQtQt#a.y.y.y.1#SQt.O.7.5#e#e#e#e#e#e#e#e#y.Y.Y.Y.rQtQtQtQt.y.y.1QtQt", -"Qt#h#T#U#V#W#X#Y#Z#0#1.y.y#2QtQt#3.1.y.y#4QtQt#5.Z.8#f#e#e#e#e#e#e#e.7.Y.Y.Y.L#6QtQtQt#7.y.1QtQt", -"Qt#o#8#9a.a#aaabacadaeaf.y#CQtQtQt.1.y.1agQtQt.N.Z.Y.L#f#e#e#e#e#e#e#l.Y.Y.Y.9ahQtQtQt.W.y.1aiQt", -"Qt.Vajakalamanaoapaqaras.y#CQtQtQtat.1.1.gQt#5au.Y.Y.Y.8.5#e#e#e#e#e#l.Y.Y.Y.YavQtQtQtQt#z.yawQt", -"Qt#iaxayazaAaBaCaDaEaFaG.yaHQtQtQtQt#C.y#zQtQt.K.L.Y.Y.Y#g#e#e#e#e#e#g.Y.Y.Y.YaIQtQtQtQt#b.y.1Qt", -"Qt#zaJaKaLaMaNaOaPaQaRaS.yaTQtQtQtQt.V.y.yaUQtQtav.Y.Y.Y.8.5#e#e#e#e#q.Y.Y.Y.YaIQtQtQtQt.2.y.EQt", -"QtaVasaWaXaYaZa0a1a2a3.y.1.uQtQtQtQtat.y.y#bQtQta4a5.Y.Y.Y#f#e#e#e.5.L.Y.Y.Y.Y#jQtQtQtQt.x.y.EQt", -"QtQt.ta6a7a8a9b.b#a3ba.ybbQtQtQtQtQtQt.y.y.y.VQtQtbc.X.Y.Ybd#e#e#e.6.Y.Y.Y.Y.Y.aQtQtQtQt.V.ybeQt", -"QtQtQt.Rbfbga3bhbibj.1bkQtQtQtQtQtQtQt#b.y.y#z#AQtQtav.Y.Y#f#e#e#ebl.Y.Y.Y.Y.L.aQtQtQtQt.V.y.EQt", -"QtQtQtQtbm#4#n#t#abkbnQtQtQtQtQtQtQtQt#b.y.y.y#zQtQt.#.X.9.5#e#e.6.Y.Y.Y.Y.Y#vQtQtQtQtQt.V.y.0Qt", -"QtQtQtQtQtQtbobpbqQtQtQtQtQtQtQtQtQtQt.x.y#CbrbsQtQtQt.9bl#e#e#f.L.Y.Y.Y.Y.9#JQtQtQtQt#v.2.1.dQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.V.1btQtQtQtQt#m.Ybd#e#f.X.Y.Y.Y.Y.YbubvQtQtQtQt#u#b#C#JQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.x.1#SQtQt.B#..M#g#ebw.L.Y.Y.Y.Y.Y.XboQtQtQtQtQt.I.ybeQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtav.2.y#2QtQta5.Y.7.5#g.9.Y.Y.Y.Y.Y.9#JQtQtQtQtQtQt.U.ybtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt#h#b#CbmQtQt.X#lbw.8.Y.Y.Y.Y.Y.Y.9.WQtQtQtQtQtQt.G#baHboQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.H.y#aQtQtQtbl#y.Y.Y.Y.Y.Y.Y.Y.9bxbvQtQtQtQtQtQtby.y#4QtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.S.y#CbzQtQt.Z.Y.Y.Y.Y.Y.Y.Y.L#sbAQtQtQtQtQtQt#p#b#a.bQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt#h#b.yaTQtQt.Q.M.Y.Y.Y.Y.Y.Ya5bBQtQtQtQtQtQtQt#v.S.1bCQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtbD.y.yaHQtQt.M.Z.Y.Y.Y.Y.L.lbEQtQtQtQtQtQtQtQt.H.ybbQtQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.G#b.y.y#CQtQt.Y.Y.Y.Y.L.abFQtQtQtQtQtQtQtQtQt#A#baTbGQtQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.K.F.y.y.yaHQtQt.M.9#B.lbHbIQtQtQtQtQtQtQtQtQt.G.2bebJQtQtQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQt.jbK#C#C#t#4bLQtQtbMbHbNQtQtQtQtQtQtQtQtQtQtQtbO.2bebJQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtbPagbQQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.r#7#zbbagQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt#RbD#CbRQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt#B.3#bbbbSQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt#BbO.V#4bsQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.Oav#A#2bbbsQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQtQt.ebTbU#vQtQtQtQtQtQtQtQtQtQtQtQtau.k#rbV.EbWbXQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtag.n.nbYbZb0at#rb1#cb2b3bKb4b5bsb6QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtbBbHb7b7bpbGQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", -"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"}; diff --git a/community/teamspeak3/teamspeak3.desktop b/community/teamspeak3/teamspeak3.desktop deleted file mode 100644 index da6ef5472..000000000 --- a/community/teamspeak3/teamspeak3.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=TeamSpeak 3 -GenericName=TeamSpeak -Comment=TeamSpeak is software for quality voice communication via the Internet -Exec=teamspeak3 -Icon=teamspeak3.xpm -StartupNotify=true -Terminal=false -Type=Application -Categories=Network;Application diff --git a/community/teamspeak3/teamspeak3.launcher b/community/teamspeak3/teamspeak3.launcher deleted file mode 100644 index 6fcd46bb7..000000000 --- a/community/teamspeak3/teamspeak3.launcher +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -cd "/opt/teamspeak3" -./ts3client_runscript.sh $@ -exit $? - diff --git a/community/ubuntuone-client-gnome/PKGBUILD b/community/ubuntuone-client-gnome/PKGBUILD index 51e54fff1..d3cbd7d1a 100644 --- a/community/ubuntuone-client-gnome/PKGBUILD +++ b/community/ubuntuone-client-gnome/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 77831 2012-10-15 01:46:26Z bgyorgy $ +# $Id: PKGBUILD 87514 2013-04-02 00:47:12Z bgyorgy $ # Maintainer: Balló György pkgname=ubuntuone-client-gnome -pkgver=4.0.0 +pkgver=4.2.0 pkgrel=1 pkgdesc="Some plug-ins, extensions, and data for integrating Ubuntu One features in some core parts of GNOME" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ makedepends=('intltool' 'gnome-settings-daemon') optdepends=('gnome-settings-daemon: shows a warning when Ubuntu One runs out of space') options=('!libtool') install=$pkgname.install -source=(http://launchpad.net/ubuntuone-client-gnome/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('26e9e391cabe1047eeb203d99ee2d9c6') +source=(https://launchpad.net/ubuntuone-client-gnome/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz) +md5sums=('e2f5e4ef6f4eca6ffcf838b3aa46c3ef') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/ubuntuone-client/1339_1338.diff b/community/ubuntuone-client/1339_1338.diff deleted file mode 100644 index cbd966a70..000000000 --- a/community/ubuntuone-client/1339_1338.diff +++ /dev/null @@ -1,57 +0,0 @@ -=== modified file 'tests/platform/sync_menu/test_linux.py' ---- tests/platform/sync_menu/test_linux.py 2012-10-10 14:54:49 +0000 -+++ tests/platform/sync_menu/test_linux.py 2012-10-11 12:01:27 +0000 -@@ -124,6 +124,7 @@ - """Check that the dummy has the proper methods required by the API.""" - dummy = linux.DummySyncMenu('random', 'args') - self.assertIsInstance(dummy.update_transfers, Callable) -+ self.assertIsInstance(dummy.sync_status_changed, Callable) - - - class SyncMenuTestCase(TestCase): - -=== modified file 'ubuntuone/platform/sync_menu/linux.py' ---- ubuntuone/platform/sync_menu/linux.py 2012-10-10 17:06:14 +0000 -+++ ubuntuone/platform/sync_menu/linux.py 2012-10-11 13:00:10 +0000 -@@ -183,7 +183,7 @@ - self.timer.addCallback(self._timeout) - - --class TransfersMenu(Dbusmenu.Menuitem): -+class TransfersMenu(Dbusmenu.Menuitem if use_syncmenu else object): - """Menu that handles the recent and current transfers.""" - - def __init__(self, status_frontend): -@@ -227,7 +227,7 @@ - items_added = 0 - remove = [] - for item in self._uploading_items: -- if item in uploading_data: -+ if item in uploading_data.keys(): - size, written = uploading_data[item] - percentage = written * 100 / size - upload_item = self._uploading_items[item] -@@ -243,7 +243,7 @@ - for item in remove: - self._uploading_items.pop(item) - if items_added < 5: -- for item in uploading_data: -+ for item in uploading_data.keys(): - if item not in self._uploading_items and items_added < 5: - size, written = uploading_data[item] - percentage = written * 100 / size -@@ -270,4 +270,12 @@ - def update_transfers(self): - """Do nothing.""" - --UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux if use_syncmenu else DummySyncMenu -+ def sync_status_changed(self): -+ """Do nothing.""" -+ -+ -+if use_syncmenu: -+ UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux -+else: -+ UbuntuOneSyncMenu = DummySyncMenu -+ TransfersMenu = None - diff --git a/community/ubuntuone-client/PKGBUILD b/community/ubuntuone-client/PKGBUILD index 798331ad9..15bcde899 100644 --- a/community/ubuntuone-client/PKGBUILD +++ b/community/ubuntuone-client/PKGBUILD @@ -1,41 +1,34 @@ -# $Id: PKGBUILD 82715 2013-01-23 12:42:21Z bgyorgy $ +# $Id: PKGBUILD 87512 2013-04-02 00:39:00Z bgyorgy $ # Maintainer: Balló György pkgname=ubuntuone-client -pkgver=4.0.0 -pkgrel=4 +pkgver=4.2.0 +pkgrel=1 pkgdesc="Ubuntu One helps you store, sync and share files between your computers" arch=('i686' 'x86_64') url="https://launchpad.net/ubuntuone-client" -license=('GPL') -depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'python2-gobject' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python2-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('intltool' 'imake') +license=('GPL' 'CCPL:cc-by-sa') +depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'python2-gobject' 'libnotify' 'python2-pyinotify' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('intltool' 'imake' 'python2-distutils-extra') options=('!libtool') install=$pkgname.install -source=(http://launchpad.net/ubuntuone-client/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz - 1339_1338.diff - fix-notify-hint.patch - lp1093111.patch) -md5sums=('738039703d4dcf54518a725f8ffbc4de' - 'e82e80c229de06692988c1f938a34fb9' - '54dfeb2be011f0a12ea7cfa0f0c19bec' - 'ca79cb558231639e28be7276017ae91c') +source=(https://launchpad.net/ubuntuone-client/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz + https://launchpad.net/ubuntuone-client-data/stable-4-2/$pkgver/+download/$pkgname-data-$pkgver.tar.gz + fix-notify-hint.patch) +md5sums=('37d2de5c6e795e75f447682ee1c3bacc' + 'd3c445a9957a80471a84f323f24e8f84' + 'c38cb043e3241f12610ed6eb9ae0f087') build() { cd "$srcdir/$pkgname-$pkgver" - sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/* - # Improve TransfersMenu declaration to avoid problems - patch -Np0 -i "$srcdir/1339_1338.diff" + # Python2 fix + sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/* # Workaround for crash in notification-daemon # https://bugzilla.gnome.org/show_bug.cgi?id=665166 patch -Np1 -i "$srcdir/fix-notify-hint.patch" - # Fix compatibility with glibc 2.17 - # https://bugs.launchpad.net/ubuntuone-client/+bug/1093111 - patch -Np1 -i "$srcdir/lp1093111.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ --disable-static \ PYTHON=python2 @@ -47,6 +40,10 @@ package() { make DESTDIR="$pkgdir/" install + # Install data + cd "$srcdir/$pkgname-data-$pkgver" + python2 setup.py install --root=$pkgdir/ --optimize=1 + # We don't have Apport in Arch Linux rm -r "$pkgdir"/{etc/apport,usr/share/apport} } diff --git a/community/ubuntuone-client/fix-notify-hint.patch b/community/ubuntuone-client/fix-notify-hint.patch index f32280de9..58a0888ef 100644 --- a/community/ubuntuone-client/fix-notify-hint.patch +++ b/community/ubuntuone-client/fix-notify-hint.patch @@ -1,20 +1,19 @@ -diff -Naur ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py ---- ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py 2012-06-19 15:51:01.000000000 +0200 -+++ ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py 2012-10-15 01:14:01.019476818 +0200 -@@ -40,7 +40,7 @@ +diff -Naur ubuntuone-client-4.2.0.orig/ubuntuone/platform/notification/linux.py ubuntuone-client-4.2.0/ubuntuone/platform/notification/linux.py +--- ubuntuone-client-4.2.0.orig/ubuntuone/platform/notification/linux.py 2013-04-01 16:37:48.530956424 +0000 ++++ ubuntuone-client-4.2.0/ubuntuone/platform/notification/linux.py 2013-04-01 16:38:32.333945773 +0000 +@@ -32,7 +32,7 @@ + USE_NOTIFY = False - if 'gi' in sys.modules and sys.modules['gi'] is not None: - try: -- from gi.repository import Notify -+ from gi.repository import GLib, Notify - Notify # pyflakes - NOTIFY_MODULE = 'gi' - except ImportError: -@@ -85,5 +85,6 @@ + try: +- from gi.repository import Notify ++ from gi.repository import GLib, Notify + USE_NOTIFY = True + except ImportError: + pass +@@ -67,5 +67,5 @@ if append: self.notification.set_hint_string('x-canonical-append', '') - self.notification.set_hint_int32('transient', int(True)) -+ if NOTIFY_MODULE == 'gi': -+ self.notification.set_hint('transient', GLib.Variant.new_boolean(1)) ++ self.notification.set_hint('transient', GLib.Variant.new_boolean(1)) self.notification.show() diff --git a/community/ubuntuone-client/lp1093111.patch b/community/ubuntuone-client/lp1093111.patch deleted file mode 100644 index 8663915d3..000000000 --- a/community/ubuntuone-client/lp1093111.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/ubuntuone/syncdaemon/tritcask.py 2013-01-18 18:27:41.809017000 +0200 -+++ b/ubuntuone/syncdaemon/tritcask.py 2013-01-22 15:08:15.015987671 +0200 -@@ -300,6 +300,7 @@ - self.fd.seek(0, os.SEEK_END) - self.fd.write(crc32 + header) - self.fd.write(key) -+ self.fd.flush() - value_pos = self.fd.tell() - self.fd.write(value) - self.fd.flush() diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 607b987e6..592a5ecee 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87023 2013-03-25 19:17:06Z bpiotrowski $ +# $Id: PKGBUILD 87540 2013-04-02 19:06:45Z aginiewicz $ # Maintainer: Andrzej Giniewicz # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha @@ -12,7 +12,7 @@ pkgname=vtk pkgver=5.10.1 -pkgrel=6 +pkgrel=7 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.' arch=('i686' 'x86_64') url='http://www.vtk.org/' @@ -67,6 +67,7 @@ build() { -DDOCUMENTATION_HTML_HELP:BOOL=ON \ -DDOCUMENTATION_HTML_TARZ:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=ON \ + -DVTK_USE_CHEMISTRY:BOOL=ON \ -DVTK_USE_HYBRID:BOOL=ON \ -DVTK_USE_PARALLEL:BOOL=ON \ -DVTK_USE_PATENTED:BOOL=ON \ @@ -113,4 +114,3 @@ package() { sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find "${pkgdir}" -name '*.py') } - -- cgit v1.2.3-54-g00ecf 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 (limited to 'community') 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