diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-23 10:32:13 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-23 10:32:13 +0100 |
commit | cc98017bbad1f9abb4fd76c68a158f356926a164 (patch) | |
tree | 1c3bb2e1c6bf899d35d5b7f58e798a4d9d63e1d1 | |
parent | 40ee6ff3cb6c8b9b90e75463ce9dc37bdcd0d79b (diff) | |
parent | c8c918cb8c810e3300e5165f9af7ca8ab9650a59 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/freeimage/PKGBUILD
extra/php/PKGBUILD
-rw-r--r-- | community/freeimage/PKGBUILD | 10 | ||||
-rw-r--r-- | community/meteorjs/PKGBUILD | 14 | ||||
-rw-r--r-- | community/nginx/PKGBUILD | 19 | ||||
-rw-r--r-- | community/nginx/logrotate (renamed from community/nginx/nginx.logrotate) | 3 | ||||
-rw-r--r-- | community/nginx/nginx.install | 8 | ||||
-rw-r--r-- | community/nginx/rc.d | 68 | ||||
-rw-r--r-- | community/opencollada/PKGBUILD | 12 | ||||
-rw-r--r-- | community/opencollada/opencollada.conf | 1 | ||||
-rw-r--r-- | community/spring/PKGBUILD | 12 | ||||
-rw-r--r-- | extra/dosfstools/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/graphviz/PKGBUILD | 13 | ||||
-rw-r--r-- | extra/php/PKGBUILD | 11 | ||||
-rw-r--r-- | libre/calibre-libre/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/iceape-libre/PKGBUILD | 9 | ||||
-rw-r--r-- | libre/icecat/PKGBUILD | 36 | ||||
-rw-r--r-- | libre/icecat/mozconfig | 2 | ||||
-rw-r--r-- | libre/icecat/mozconfig.pgo | 5 | ||||
-rw-r--r-- | libre/icedove-libre/PKGBUILD | 8 | ||||
-rw-r--r-- | libre/iceweasel-libre/PKGBUILD | 8 | ||||
-rw-r--r-- | libre/iceweasel-libre/mozconfig.pgo | 1 | ||||
-rw-r--r-- | pcr/nexuiz/PKGBUILD | 6 |
21 files changed, 118 insertions, 146 deletions
diff --git a/community/freeimage/PKGBUILD b/community/freeimage/PKGBUILD index 864c89613..1a3a5837e 100644 --- a/community/freeimage/PKGBUILD +++ b/community/freeimage/PKGBUILD @@ -5,8 +5,8 @@ # Contributor: scippio <scippio@berounet.cz> pkgname=freeimage -pkgver=3.15.3 -pkgrel=2.1 +pkgver=3.15.4 +pkgrel=1 pkgdesc="Library project for developers who would like to support popular graphics image formats" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'custom:FIPL') @@ -14,7 +14,7 @@ url="http://freeimage.sourceforge.net/" depends=('gcc-libs') makedepends=('dos2unix') source=("http://downloads.sourceforge.net/project/freeimage/Source%20Distribution/${pkgver}/FreeImage${pkgver//./}.zip") -md5sums=('6c305b4086500ff8541c596ea6fc7cd7') +md5sums=('9f9a3b2c3c1b4fd24fe479e8aaee86b1') build() { if [ "$CARCH" != "i686" ] ; then @@ -30,15 +30,17 @@ build() { export CXXFLAGS="$CXXFLAGS -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS" cd FreeImage + sed -i "1 i #include <cstring>" Source/OpenEXR/IlmImf/ImfAutoArray.h make cd ${srcdir}/FreeImagefip + sed -i "1 i #include <cstring>" Source/OpenEXR/IlmImf/ImfAutoArray.h make -f Makefile.fip } package() { cd FreeImage - make DESTDIR=${pkgdir} install || true + make DESTDIR=${pkgdir} install cd ${srcdir}/FreeImagefip make -f Makefile.fip DESTDIR=${pkgdir} install diff --git a/community/meteorjs/PKGBUILD b/community/meteorjs/PKGBUILD index b514b39f3..b64b79f01 100644 --- a/community/meteorjs/PKGBUILD +++ b/community/meteorjs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83547 2013-02-02 18:38:31Z mtorromeo $ +# $Id: PKGBUILD 84695 2013-02-22 11:25:02Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Parth Buch <parthbuch115 at gmail dot com> # Contributor: Tom Vincent <http://tlvince.com/contact/> pkgname=meteorjs -pkgver=0.5.4 +pkgver=0.5.7 pkgrel=1 pkgdesc="Open-source platform for building top-quality web apps in a fraction of the time." arch=('i686' 'x86_64') @@ -13,14 +13,14 @@ license=('MIT') depends=('nodejs' 'mongodb') options=('!strip') -sha256sums=('64dbdfd1788e3859f54bbe36e99ca60574e625c68d41b9bfc9384b253b345798' +sha256sums=('dea74135489b89d7a7fdebb3966a05b2df41440bbdc31adce85e6b140aff8e23' 'a3ac659c52b652676da0530f2148025e0f8bfa84bccf63431c20eb72d3bc5cb7') -if [ "$CARCH" == x86_64 ]; then +if [ "$CARCH" = "x86_64" ]; then _arch="amd64" else _arch="i386" - sha256sums[0]='7a3c1eaa8588876ed8bec6bab20b0be99f7e36fce839b3d70b776018ca606f89' + sha256sums[0]='2a126beb5224e4063c8efc849e099d7bf302f062e76356f8f7662737bccd41b6' fi source=("http://d3sqy0vbqsdhku.cloudfront.net/meteor_$pkgver-1_$_arch.deb" meteor) @@ -33,7 +33,9 @@ package() { cd "$pkgdir/usr/lib/meteor" rm -rf LICENSE.txt lib/node lib/dtrace lib/node_modules/npm share include \ - lib/node_modules/mongodb/node_modules/bson/build/Release/obj.target/bson.node + lib/node_modules/mongodb/node_modules/bson/build/Release/obj.target/bson.node \ + lib/node_modules/websocket/build/Release/obj.target/xor.node \ + lib/node_modules/websocket/build/Release/obj.target/validation.node # mongodb links rm -rf mongodb diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 448fab964..15f2a549b 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84198 2013-02-13 14:43:00Z bpiotrowski $ +# $Id: PKGBUILD 84707 2013-02-22 20:47:11Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -8,7 +8,7 @@ _tmpdir=/var/lib/nginx pkgname=nginx pkgver=1.2.7 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'zlib' 'openssl' 'geoip') @@ -27,13 +27,11 @@ backup=(${_cfgdir:1}/fastcgi.conf ${_cfgdir:1}/win-utf etc/logrotate.d/nginx) source=(http://nginx.org/download/nginx-$pkgver.tar.gz - rc.d service - nginx.logrotate) + logrotate) sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3' - '4f6bd31d684956ca143f7dc68dbd3caa67e835fb84dc44d1a94217b9214c6cfd' '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a' - '613b0ed3fe4b5ee505ddb5122ee41604f464a5049be81c97601ee93970763a23') + 'b0ef6c00e0e94926588242ed910b387922e513d5152fcdb651dc06e2b84e7d85') build() { cd "$srcdir"/$pkgname-$pkgver @@ -80,9 +78,6 @@ package() { cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install - install -d "$pkgdir"/etc/logrotate.d - install -m644 "$srcdir"/nginx.logrotate "$pkgdir"/etc/logrotate.d/nginx - sed -e 's|\<user\s\+\w\+;|user html;|g' \ -e '44s|html|/usr/share/nginx/html|' \ -e '54s|html|/usr/share/nginx/html|' \ @@ -94,9 +89,9 @@ package() { install -d "$pkgdir"/usr/share/nginx mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx - - install -D -m755 "$srcdir"/rc.d "$pkgdir"/etc/rc.d/nginx + + install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/nginx install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service - install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE rm -rf "$pkgdir"/var/run } diff --git a/community/nginx/nginx.logrotate b/community/nginx/logrotate index d490d5d9b..8773578b5 100644 --- a/community/nginx/nginx.logrotate +++ b/community/nginx/logrotate @@ -1,5 +1,6 @@ -/var/log/nginx/*.log { +/var/log/nginx/*log { missingok + create 750 root log sharedscripts compress postrotate diff --git a/community/nginx/nginx.install b/community/nginx/nginx.install index b31ee41d7..00a7b9cac 100644 --- a/community/nginx/nginx.install +++ b/community/nginx/nginx.install @@ -1,4 +1,12 @@ +post_install() { + if [[ -e var/log/nginx ]]; then + chmod 750 var/log/nginx + chown root:log var/log/nginx + fi +} + post_upgrade() { + [[ $(vercmp $2 1.2.7-1) -le 0 ]] && post_install if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then echo " >>> Since 1.2.1-2 several changes has been made in package:" echo " - *.conf files have been moved to /etc/nginx" diff --git a/community/nginx/rc.d b/community/nginx/rc.d deleted file mode 100644 index eb9031e81..000000000 --- a/community/nginx/rc.d +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -function check_config { - stat_busy "Checking nginx configuration" - /usr/sbin/nginx -t -q -c /etc/nginx/nginx.conf - if [ $? -ne 0 ]; then - stat_die - else - stat_done - fi -} - -case "$1" in - start) - check_config - $0 careless_start - ;; - careless_start) - stat_busy "Starting nginx" - if [ -s /var/run/nginx.pid ]; then - stat_fail - # probably ;) - stat_busy "Nginx is already running" - stat_die - fi - /usr/sbin/nginx -c /etc/nginx/nginx.conf &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - add_daemon nginx - stat_done - fi - ;; - stop) - stat_busy "Stopping nginx" - PID=$(cat /var/run/nginx.pid) - kill -QUIT $PID &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - for i in {1..10}; do - [ -d /proc/$PID ] || { stat_done; rm_daemon nginx; exit 0; } - sleep 1 - done - stat_fail - fi - ;; - restart) - check_config - $0 stop - sleep 1 - $0 careless_start - ;; - reload) - check_config - if [ -s /var/run/nginx.pid ]; then - status "Reloading nginx configuration" kill -HUP $(cat /var/run/nginx.pid) - fi - ;; - check) - check_config - ;; - *) - echo "usage: $0 {start|stop|restart|reload|check|careless_start}" -esac diff --git a/community/opencollada/PKGBUILD b/community/opencollada/PKGBUILD index cf2af3acb..3804e7621 100644 --- a/community/opencollada/PKGBUILD +++ b/community/opencollada/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 83397 2013-01-31 10:18:08Z svenstaro $ +# $Id: PKGBUILD 84701 2013-02-22 15:29:30Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=opencollada -pkgver=20130130 +pkgver=20130222 pkgrel=1 pkgdesc="Stream based reader and writer library for COLLADA files" arch=(i686 x86_64) @@ -9,6 +9,8 @@ url="https://github.com/KhronosGroup/OpenCOLLADA" license=('GPL') depends=('libxml2' 'pcre') makedepends=('git' 'cmake') +source=('opencollada.conf') +md5sums=('5f7e9d79ab86756648b648ee5ed6ce1d') _gitroot=git://github.com/KhronosGroup/OpenCOLLADA.git _gitname=opencollada @@ -33,9 +35,9 @@ build() { [[ -d build ]] && rm -r build mkdir build && cd build + cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DUSE_SHARED=ON + -DCMAKE_INSTALL_PREFIX=/usr make } @@ -43,6 +45,8 @@ package() { cd "$srcdir/$_gitname-build/build" make DESTDIR=$pkgdir install + + install -Dm644 $srcdir/opencollada.conf $pkgdir/etc/ld.so.conf.d/opencollada.conf } # vim:set ts=2 sw=2 et: diff --git a/community/opencollada/opencollada.conf b/community/opencollada/opencollada.conf new file mode 100644 index 000000000..cd7c2a5c5 --- /dev/null +++ b/community/opencollada/opencollada.conf @@ -0,0 +1 @@ +/usr/lib/opencollada diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 85a5c786e..29387d510 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 83277 2013-01-28 16:50:13Z stephane $ +# $Id: PKGBUILD 84689 2013-02-22 09:36:08Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring -pkgver=0.91.0 -_pkgver=91.0 -pkgrel=4 +pkgver=0.92.0 +_pkgver=92.0 +pkgrel=1 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64' 'mips64el') url="http://springrts.com/" @@ -18,15 +18,13 @@ optdepends=('python2: python-based bots' 'java-runtime: java-based bots') install=spring.install source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma) -md5sums=('8849ace38f2ae20dc100b9d0a8d743e9') +md5sums=('6dcf665cfe7d6eaf0e287086685c6709') build() { bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma cd spring_${_pkgver} - sed "s/TIME_UTC/TIME_UTC_/g" -i AI/Skirmish/E323AI/CScopedTimer.h - cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDATADIR=share/spring -DCMAKE_SKIP_RPATH:BOOL=YES diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD index af3708914..af963ec00 100644 --- a/extra/dosfstools/PKGBUILD +++ b/extra/dosfstools/PKGBUILD @@ -1,23 +1,20 @@ -# $Id: PKGBUILD 174137 2013-01-02 14:44:16Z tpowa $ +# $Id: PKGBUILD 178443 2013-02-22 11:41:58Z tpowa $ # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=dosfstools -pkgver=3.0.13 -pkgrel=2 +pkgver=3.0.15 +pkgrel=1 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64 'mips64el') depends=('glibc') #source=(http://www.daniel-baumann.ch/software/dosfstools/$pkgname-$pkgver.tar.xz) # using debian source, main page is down since quite some time -source=(http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.13.orig.tar.xz - dosfstools-3.0.12-fix-alloc-rootdir-entry.patch) +source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz) url="http://www.daniel-baumann.ch/software/dosfstools/" license=('GPL2') build() { cd $srcdir/$pkgname-$pkgver - # fix https://bugs.archlinux.org/task/33248 - patch -Np1 -i ${srcdir}/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch make } @@ -25,5 +22,4 @@ package () { cd $srcdir/$pkgname-$pkgver make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install } -md5sums=('c1d851e3fc065a935c7cf919545d239f' - 'c2be6f2cd1d47297b2d6a8ba237e04eb') +md5sums=('64d2020bd8e92105dfad30feee72a3ec') diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 3513965db..1fa7bf596 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178365 2013-02-20 22:51:19Z bisson $ +# $Id: PKGBUILD 178429 2013-02-22 00:30:19Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz pkgver=2.30.0 -pkgrel=3 +pkgrel=5 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') @@ -59,10 +59,10 @@ build() { export PYTHON=python2 export LUA=lua5.1 - ./configure \ - --prefix=/usr \ - --with-cgraph=false # apps need porting to that new api first + # install the graph and cgraph api alongside + sed 's/@WITH_CGRAPH_FALSE@//g' -i lib/graph/Makefile.in + ./configure --prefix=/usr make || sed '/caml_array_length/d' -i tclpkg/gv/gv_ocaml.cpp # swig goes wonky make } @@ -73,4 +73,7 @@ package() { # http://www.graphviz.org/License.php install -Dm644 ../LICENSE "${pkgdir}"/usr/share/licenses/graphviz/LICENSE + + # everything has been built against cgraph, but use graph as default api + sed '/#define WITH_CGRAPH 1/d' -i "${pkgdir}"/usr/include/graphviz/types.h } diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index f77fec4a5..a5ff7ec7c 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175873 2013-01-23 00:13:10Z eric $ +# $Id: PKGBUILD 178435 2013-02-22 07:43:22Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,8 +21,8 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.11 -pkgrel=2.1 +pkgver=5.4.12 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') url='http://www.php.net' @@ -33,7 +33,7 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('9975e68c22b86b013b934743ad2d2276' +md5sums=('5c7b614242ae12e9cacca21c8ab84818' '0b0bc7a917fc592bdf11dcd3c5c255e9' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '5c1f4c967b66ce3eaf819b46951dcbf5' @@ -124,6 +124,9 @@ build() { patch -p0 -i ${srcdir}/php.ini.patch patch -p0 -i ${srcdir}/php-fpm.conf.in.patch + # workaround for pkg-config 0.28 + sed 's/ && test -n "$OPENSSL_INCS"//g' -i configure + # php mkdir ${srcdir}/build-php cd ${srcdir}/build-php diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 39c40f9ea..125a8b3d6 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.19 +pkgver=0.9.20 pkgrel=1 pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)" arch=('i686' 'x86_64') @@ -27,7 +27,7 @@ install=calibre.install source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('1977c75613209b8fcade35e9185a8ee0' +md5sums=('860b4b28029ae40e5ea59ec4f50b1144' '42c07b43d575b5e7e7524bd7b9528f0e' '675cd87d41342119827ef706055491e7') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index 01bc6558e..b84a30e72 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=2 +pkgrel=3 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -38,14 +38,17 @@ md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908' '3e0a275b57e5ccfeb7573e716693441a') build() { + export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}" + export MOZ_MAKE_FLAGS="$MAKEFLAGS" + unset MAKEFLAGS + export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' - export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}" - export PYTHON="/usr/bin/python2" export DEBIAN_BUILD="comm-release" export DEBIAN_BRANDING_DIR="debian/branding" export ICEAPE_ICONS_BRANDING="suite/branding/nightly" + mv comm-esr10 "${DEBIAN_BUILD}" mv debian "${srcdir}/${DEBIAN_BUILD}" cd "${srcdir}/${DEBIAN_BUILD}" diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 1a55d6999..7d1492804 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -76,8 +76,8 @@ source=( ) md5sums=( c88a29aa92fc41a07e777a0e63ac5f7e - f6ade03013a0bcb7f1585c51cb488e81 - ac29b01c189f20abae2f3eef1618ffc0 + 2a35cf0054d0459993e3c3bae3d9841d + 383e8e2a97a8b13fe56d153adb6878b6 3009b176cc5f9b1e416b1bf7c45b064b fcd2d895a0335c1b5fb652401e9da0d5 b41f82994fa056ffa5f8e6d99570e27a @@ -88,10 +88,22 @@ md5sums=( ) build() { + # WebRTC build tries to execute "python" and expects Python 2 + # Workaround taken from chromium PKGBUILD on Archlinux + mkdir "$srcdir/python2-path" + ln -s /usr/bin/python2 "$srcdir/python2-path/python" + export PATH="$srcdir/python2-path:$PATH" + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" + export PYTHON="/usr/bin/python2" + export MOZ_MAKE_FLAGS="$MAKEFLAGS" + unset MAKEFLAGS + mv $pkgname-$pkgver $srcdir/gnuzilla-build cd $srcdir/gnuzilla-build cp $srcdir/mozconfig .mozconfig # Load our build config, disable SafeSearch + if $_pgo; then cat $srcdir/mozconfig.pgo >> .mozconfig fi @@ -110,7 +122,7 @@ build() { sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in - # This is a bug, we should fix it. + # This is a bug, we should fix it if [ $CARCH = mips64el ]; then # Fix MIPS N32 support. sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ @@ -125,16 +137,22 @@ build() { fi chmod +x build/unix/run-icecat.sh # fix bug for bad file permition - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" - export PYTHON=/usr/bin/python2 if $_pgo; then - LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & - LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS=$MAKEFLAGS - kill $! || true + export MOZ_PGO=1 + export DISPLAY=:99 + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + _fail=0 + + make -f client.mk build || _fail=1 else - LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS + _fail=0 + + make -f client.mk build || _fail=1 fi + + kill $! || true + return $_fail } package() { diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index e54cdb54c..7b27e3c6a 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -3,7 +3,7 @@ ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib -# Icecat +# IceCat export MOZ_PHOENIX=1 mk_add_options MOZ_PHOENIX=1 diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo index b0c249ebf..2f4ebe32b 100644 --- a/libre/icecat/mozconfig.pgo +++ b/libre/icecat/mozconfig.pgo @@ -1,4 +1,3 @@ + # PGO -ac_add_options --enable-profile-guided-optimization -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' -mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10' diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 1bf14850d..406853a9b 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -44,15 +44,19 @@ md5sums=('3f7679bb98ae99be5adf73fd0025b00e' 'ea5f7a06967f561d47d7e5c35b23de6f') build() { + export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}" + export PYTHON="/usr/bin/python2" + export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' - export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}" - export PYTHON="/usr/bin/python2" export DEBIAN_BUILD="comm-release" + mv debian "${srcdir}/${DEBIAN_BUILD}" cd "${srcdir}/${DEBIAN_BUILD}" + mv debian/${_pkgname}-branding "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}" + cp -a debian/app-icons/${_pkgname}big.svg debian/app-icons/${_pkgname}_icon.svg for i in 16x16 22x22 24x24 32x32 48x48 256x256; do install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/mailicon${i/x*/}.png" diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 0a3225605..065835d99 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -52,7 +52,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" md5sums=('b4c109e987f869f94220188a901d4425' 'e1d6920cb49c9de88b8e00eb14b1b0e7' 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' - 'ac29b01c189f20abae2f3eef1618ffc0' + 'dfeb4ab2c96aae3356a4c347eee0b97b' 'acb402fa414bed916fb0e09dfc1485c4' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' @@ -73,12 +73,14 @@ build() { ln -s /usr/bin/python2 "$srcdir/python2-path/python" export PATH="$srcdir/python2-path:$PATH" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" + export PYTHON="/usr/bin/python2" + export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" - export PYTHON="/usr/bin/python2" export DEBIAN_BUILD="mozilla-release" + mv debian "$srcdir/$DEBIAN_BUILD" cd "$srcdir/$DEBIAN_BUILD" diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo index b0c249ebf..30464c38c 100644 --- a/libre/iceweasel-libre/mozconfig.pgo +++ b/libre/iceweasel-libre/mozconfig.pgo @@ -1,3 +1,4 @@ + # PGO ac_add_options --enable-profile-guided-optimization mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' diff --git a/pcr/nexuiz/PKGBUILD b/pcr/nexuiz/PKGBUILD index 3b59cd617..5c3b50899 100644 --- a/pcr/nexuiz/PKGBUILD +++ b/pcr/nexuiz/PKGBUILD @@ -8,10 +8,10 @@ pkgname=nexuiz pkgver=2.5.2 _zipver=252 -pkgrel=2 +pkgrel=2.2 arch=('i686' 'x86_64') -pkgdesc="a free software first person shooter" -url="http://www.nexuiz.com/" +pkgdesc="A free software first person shooter" +url="http://www.alientrap.org/games/nexuiz/" license=("GPL") depends=('alsa-lib' 'curl' 'libjpeg>=8' 'libmodplug' 'libvorbis' 'libxpm' 'libxxf86dga' 'libxxf86vm' 'sdl' 'nexuiz-data' 'libpng>=1.4.0') makedepends=('mesa') |