diff options
69 files changed, 817 insertions, 2010 deletions
diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD index 11c3384b2..9c2807e88 100644 --- a/community/fcitx-mozc/PKGBUILD +++ b/community/fcitx-mozc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87458 2013-04-01 05:08:23Z fyan $ +# $Id: PKGBUILD 88116 2013-04-12 03:06:47Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> @@ -12,8 +12,8 @@ _pkgbase=mozc pkgname=fcitx-mozc pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)" pkgver=1.10.1390.102 -_patchver=${pkgver}.1 -pkgrel=1 +_patchver=${pkgver}.2 +pkgrel=2 arch=('i686' 'x86_64') url="http://code.google.com/p/mozc/" license=('custom') @@ -26,15 +26,14 @@ source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2 http://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcoderel}.zip http://protobuf.googlecode.com/files/protobuf-${_protobuf_ver}.tar.bz2 http://fcitx.googlecode.com/files/fcitx-mozc-${_patchver}.patch + mozc_1.10.1390.102_remove_warn_as_error.patch ) build() { cd "$srcdir" - ln -sf `which python2` ./python - PATH="${srcdir}:${PATH}" #source /etc/profile.d/qt4.sh - + # Update: Fix qt4 include path too # Fix compatibility with google-glog 0.3.3 (symbol conflict) #CFLAGS="${CFLAGS} -DFLAGS_log_dir=FLAGS_mozc_log_dir" @@ -52,6 +51,13 @@ build() { sed -i 's|(qt_dir)/bin|(qt_dir)/lib/qt4/bin|' gui/*.gyp{,i} sed -i 's|(qt_dir_env)/bin|(qt_dir_env)/lib/qt4/bin|' gui/*.gyp{,i} + # Patch for gcc>=4.8 + patch -p0 -i "${srcdir}/mozc_1.10.1390.102_remove_warn_as_error.patch" + + # Adjust to use python2 + find . -name \*.py -type f -exec sed -i -e "1s|python.*$|python2|" {} + + find . -regex '.*\.gypi?$' -type f -exec sed -i -e "s|'python'|'python2'|g" {} + + # Generate zip code seed msg "Generating zip code seed..." python2 dictionary/gen_zip_code_seed.py --zip_code="${srcdir}/KEN_ALL.CSV" --jigyosyo="${srcdir}/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt @@ -104,9 +110,9 @@ package() { install -m 644 data/images/unix/ui-properties.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-properties.png" install -m 644 data/images/unix/ui-tool.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png" } - md5sums=('ff1611354703cbaa76cd562007ba57e9' '63310f8bad30f528ba10a6574b807952' 'bb9fa83c00dece4de5f92ca1773e2bc5' 'a72001a9067a4c2c4e0e836d0f92ece4' - 'b3e15acd43b41cb5383508250707292b') + '1d94b16b5379f0ccd9f4e372c59b8190' + '36689e236c97e570c1a8c98f947755bb') diff --git a/community/fcitx-mozc/mozc_1.10.1390.102_remove_warn_as_error.patch b/community/fcitx-mozc/mozc_1.10.1390.102_remove_warn_as_error.patch new file mode 100644 index 000000000..ff6e9f09b --- /dev/null +++ b/community/fcitx-mozc/mozc_1.10.1390.102_remove_warn_as_error.patch @@ -0,0 +1,12 @@ +Index: gyp/common.gypi
+===================================================================
+--- gyp/common.gypi (revision 151)
++++ gyp/common.gypi (working copy)
+@@ -58,7 +58,6 @@
+ # warning_cflags will be shared with Mac and Linux. + 'warning_cflags': [ + '-Wall', +- '-Werror', + '-Wno-char-subscripts', + '-Wno-sign-compare', + '-Wno-deprecated-declarations', diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD index 738cebc2a..001b3ccf2 100644 --- a/community/instead/PKGBUILD +++ b/community/instead/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 83203 2013-01-28 10:07:31Z spupykin $ +# $Id: PKGBUILD 88145 2013-04-12 13:33:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Peter Kosyh <p.kosyhgmail.com> pkgname=instead -pkgver=1.8.3 +pkgver=1.9.0 pkgrel=1 pkgdesc="a quest interpreter" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'lua') optdepends=('instead-launcher: install and update INSTEAD games from net') source=(http://instead.googlecode.com/files/instead_${pkgver}.tar.gz) -md5sums=('4ec9f3e9f3300ce5a01b0d2b98974868') +md5sums=('c7082772f7cb972d825e8e183e9af90f') build() { cd "${srcdir}/instead-${pkgver}" diff --git a/community/kradio/PKGBUILD b/community/kradio/PKGBUILD deleted file mode 100644 index 66a5f20dc..000000000 --- a/community/kradio/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 83293 2013-01-28 23:02:36Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=kradio -pkgver=4.0.7 -pkgrel=1 -arch=('x86_64' 'i686') -license=('GPL2') -pkgdesc='Comfortable KDE internet and AM/FM radio application' -url='http://kradio.sourceforge.net/' -depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg') -makedepends=('automoc4' 'cmake' 'boost') -install=$pkgname.install -source=("http://downloads.sourceforge.net/$pkgname/kradio4-$pkgver.tar.bz2"{,.asc}) -sha256sums=('53d1a706f08cfd5a405142cf34cf9c0b03397b03961936651dfae7206003959c' - 'cc6e801e10dbb7971cd09f2083d9fad0dc20ffc59ce3301486a985b8718d0c97') - -build() { - cd "$srcdir" - - mkdir build - cd build - cmake "../${pkgname}4-$pkgver" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "$srcdir/build" - - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/kradio/kradio.install b/community/kradio/kradio.install deleted file mode 100644 index 364567b9d..000000000 --- a/community/kradio/kradio.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/kshutdown/PKGBUILD b/community/kshutdown/PKGBUILD index d46b40b1b..e54f7026d 100644 --- a/community/kshutdown/PKGBUILD +++ b/community/kshutdown/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84190 2013-02-13 13:42:33Z arodseth $ +# $Id: PKGBUILD 88132 2013-04-12 11:15:41Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=kshutdown -pkgver=3.0beta6 +pkgver=3.0beta7 pkgrel=1 pkgdesc='Shutdown Utility for KDE' arch=('x86_64' 'i686') @@ -11,9 +11,9 @@ url='http://kshutdown.sourceforge.net/' license=('GPL') depends=('kdebase-workspace') makedepends=('cmake' 'automoc4') -install='kshutdown.install' +install="$pkgname.install" source=("http://downloads.sourceforge.net/$pkgname/$pkgname-source-$pkgver.zip") -sha256sums=('dfe89f124e68ae3f5b859fc02ad4d37726b3e001ee6b02f1bb1f6281fbef45cf') +sha256sums=('5de50c532a9fd2e65706376232b7e641b05bbc5f54677f06d27bce0e0f9825ac') build() { mkdir "$srcdir/build" diff --git a/community/quagga/0001-doc-fix-makeinfo-errors-and-one-warning.patch b/community/quagga/0001-doc-fix-makeinfo-errors-and-one-warning.patch deleted file mode 100644 index 3119e34ac..000000000 --- a/community/quagga/0001-doc-fix-makeinfo-errors-and-one-warning.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 9e26f1c5a00c93b7a5dadb634d4452c769e48048 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Fri, 22 Mar 2013 11:54:44 +0200 -Subject: [PATCH] doc: fix makeinfo errors and one warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -commit 4afa50b added few lines that are syntactically incorrect -with leading plus sign. - -Cc: Denis Ovsienko <infrastation@yandex.ru> -Signed-off-by: Timo Teräs <timo.teras@iki.fi> ---- - doc/ipv6.texi | 4 ++-- - doc/quagga.texi | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/doc/ipv6.texi b/doc/ipv6.texi -index b6cc437..2482c1c 100644 ---- a/doc/ipv6.texi -+++ b/doc/ipv6.texi -@@ -136,8 +136,8 @@ for the lowest preference possible. - Default: 0 - @end deffn - --+@deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {} --+@deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {} -+@deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {} -+@deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {} - The value to be placed in Home Agent Option, when Home Agent config flag is set, - which indicates to hosts Home Agent Lifetime. The default value of 0 means to - place the current Router Lifetime value. -diff --git a/doc/quagga.texi b/doc/quagga.texi -index ff913aa..b4105ac 100644 ---- a/doc/quagga.texi -+++ b/doc/quagga.texi -@@ -1,13 +1,13 @@ - \input texinfo @c -*- texinfo -*- -+@c Set variables - sourced from defines.texi -+@include defines.texi -+ - @c %**start of header - @setchapternewpage odd - @settitle @uref{http://www.quagga.net,,@value{PACKAGE_NAME}} - @setfilename quagga.info - @c %**end of header - --@c Set variables - sourced from defines.texi --@include defines.texi -- - @c automake will automatically generate version.texi - @c and set EDITION, VERSION, UPDATED and UPDATED-MONTH - @include version.texi --- -1.8.2 - diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD index 5167a45b6..3a350e3ed 100644 --- a/community/quagga/PKGBUILD +++ b/community/quagga/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87783 2013-04-06 13:02:55Z seblu $ +# $Id: PKGBUILD 88141 2013-04-12 12:11:57Z seblu $ # Maintainer: Sébastien Luttringer pkgname=quagga -pkgver=0.99.22 -pkgrel=3 +pkgver=0.99.22.1 +pkgrel=1 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64') url='http://www.quagga.net' @@ -19,9 +19,8 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar 'ospfd.service' 'ripd.service' 'ripngd.service' - 'zebra.service' - '0001-doc-fix-makeinfo-errors-and-one-warning.patch') -md5sums=('3057bf3a91116a1017dd0df7e5e8ef93' + 'zebra.service') +md5sums=('d9ab848661720d6da2551c7a4a19c731' '87bf4ae8aca3b3cf70e3986bc669aa78' '9b14110bed4982baa801808db6ac9135' 'b685b5c12637cb963e1fb78ecd926e14' @@ -29,8 +28,7 @@ md5sums=('3057bf3a91116a1017dd0df7e5e8ef93' '4d95a4af1ddb4ae21b867bebbedc77d5' '7e33c2a2e1c12309ba28d75a34294ed0' '6c682c0cd06c109bc10d29c1d9af3e38' - '18964536b7ed012aa5b22f2fa9fb3e87' - '214ed8ae0d58d080dcba9a176a94eb51') + '18964536b7ed012aa5b22f2fa9fb3e87') prepare() { cd $pkgname-$pkgver diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index 2ca7ffe45..f4e3a4b08 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85517 2013-03-02 12:31:53Z arodseth $ +# $Id: PKGBUILD 88149 2013-04-12 13:59:38Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scite -pkgver=3.2.5 +pkgver=3.3.1 pkgrel=1 pkgdesc='Editor with facilities for building and running programs' arch=('x86_64' 'i686') @@ -15,13 +15,11 @@ license=('custom:scite') depends=('desktop-file-utils' 'gtk2') makedepends=('setconf') backup=('usr/share/scite/SciTEGlobal.properties') -install=$pkgname.install +install="$pkgname.install" source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz") -sha256sums=('ac3ca9588bb23ef21da2e22f6ef21416bbd7bf6957130a8e4057b3e5f3c58bef') - -build() { - cd "$srcdir" +sha256sums=('96f1b74f728375e405a39f210b34dfabbbd2654b9c30ba886d8c3b4acbafc717') +prepare() { if [ $?CXXBASEFLAGS == 1 ]; then sed '0,/CXXTFLAGS=/s//nop=/' -i scite/gtk/makefile setconf scite/gtk/makefile CXXTFLAGS "-DNDEBUG ${CXXFLAGS} $(CXXBASEFLAGS)" @@ -31,10 +29,11 @@ build() { "-DNDEBUG ${CXXFLAGS} \$(CXXBASEFLAGS) \$(THREADFLAGS)" setconf scintilla/gtk/makefile CXXBASEFLAGS \ "-Wno-missing-braces -Wno-char-subscripts ${CXXFLAGS} -DGTK -DSCI_LEXER \$(INCLUDEDIRS)" - cd "$srcdir/scintilla/gtk" - make - cd "$srcdir/$pkgname/gtk" - make +} + +build() { + make -C "$srcdir/scintilla/gtk" + make -C "$srcdir/$pkgname/gtk" } package() { diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD index 8856014b4..2cd8af622 100644 --- a/community/sfml/PKGBUILD +++ b/community/sfml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78941 2012-10-27 23:45:33Z ebelanger $ +# $Id: PKGBUILD 88118 2013-04-12 07:50:02Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Ondrej Martinak <omartinak@gmail.com> pkgname=sfml -pkgver=2.0rc1 -pkgrel=3 +pkgver=2.0 +pkgrel=1 pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API' arch=('i686' 'x86_64') url='http://www.sfml-dev.org/' @@ -12,22 +12,23 @@ license=('zlib') depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2') makedepends=('mesa' 'cmake' 'doxygen') install=sfml.install -source=("2.0-rc.tar.gz::https://github.com/LaurentGomila/SFML/tarball/2.0-rc") -md5sums=('03c8e6817f4525092b94a3d44e8eada8') +source=("https://github.com/LaurentGomila/SFML/archive/2.0.tar.gz") +md5sums=('294fd8563a319e06f68bbca0eedc905e') build() { - cd "$srcdir"/Laurent* + cd "$srcdir"/SFML-${pkgver} mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ - -DBUILD_DOC=true \ - -DBUILD_EXAMPLES=true + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSFML_BUILD_EXAMPLES=true \ + -DSFML_BUILD_DOC=true make make doc } package() { - cd "$srcdir"/Laurent*/build + cd "$srcdir"/SFML-${pkgver}/build make DESTDIR="$pkgdir/" install diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD index 2f9772d2d..dd6ecae95 100644 --- a/community/virtualbox-modules-lts/PKGBUILD +++ b/community/virtualbox-modules-lts/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 87866 2013-04-08 09:34:56Z tpowa $ +# $Id: PKGBUILD 88157 2013-04-12 15:58:47Z seblu $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Sébastien Luttringer pkgbase=virtualbox-modules-lts pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') -pkgver=4.2.10 -pkgrel=3 +pkgver=4.2.12 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index e36fd36e4..3941dbe84 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 87865 2013-04-08 09:34:55Z tpowa $ +# $Id: PKGBUILD 88161 2013-04-12 16:17:46Z seblu $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') -pkgver=4.2.10 -_extramodules=extramodules-3.8-ARCH -pkgrel=4 +pkgver=4.2.12 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -17,7 +16,7 @@ makedepends=('linux-headers' 'bc') build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + _kernver=$(expac -Q '%v' linux-headers)-ARCH # dkms need modification to be run as user cp -r /var/lib/dkms . @@ -31,7 +30,8 @@ build() { } package_virtualbox-host-modules(){ - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + _kernver=$(expac -Q '%v' linux-headers)-ARCH + _extraver=extramodules-${_kernver%.*}-ARCH pkgdesc='Host kernel modules for VirtualBox' depends=("linux>=${_kernver%.*}" "linux<$(echo "${_kernver%.*}+0.1"|bc)") @@ -39,15 +39,16 @@ package_virtualbox-host-modules(){ conflicts=('virtualbox-modules') install=virtualbox-host-modules.install - install -dm755 "$pkgdir/usr/lib/modules/$_extramodules" + install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" - install -m644 * "$pkgdir/usr/lib/modules/$_extramodules" + install -m644 * "$pkgdir/usr/lib/modules/$_extraver" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-host-modules.install" + sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules.install" } package_virtualbox-guest-modules(){ - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + _kernver=$(expac -Q '%v' linux-headers)-ARCH + _extraver=extramodules-${_kernver%.*}-ARCH pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') @@ -56,11 +57,11 @@ package_virtualbox-guest-modules(){ conflicts=('virtualbox-archlinux-modules') install=virtualbox-guest-modules.install - install -dm755 "$pkgdir/usr/lib/modules/$_extramodules" + install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" - install -m644 * "$pkgdir/usr/lib/modules/$_extramodules" + install -m644 * "$pkgdir/usr/lib/modules/$_extraver" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-guest-modules.install" + sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules.install" } # vim:set ts=2 sw=2 et: diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index 2b2b97e1c..a33ac2048 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 181165 2013-04-02 06:48:55Z allan $ +# $Id: PKGBUILD 182643 2013-04-12 00:05:23Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils pkgver=2.23.2 -pkgrel=1 +pkgrel=2 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/binutils/" @@ -21,15 +21,21 @@ md5sums=('4f8fa651e35ef262edc01d60fb45702e' 'dfde4428f08d91f309cdcfe92bf28d08' '34e439ce23213a91e2af872dfbb5094c') -build() { +prepare() { cd ${srcdir}/binutils-${pkgver} # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935 # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542 patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch - cd ${srcdir} - mkdir binutils-build && cd binutils-build + # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure + + mkdir ${srcdir}/binutils-build +} + +build() { + cd ${srcdir}/binutils-build ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \ --with-lib-path=/usr/lib:/usr/local/lib \ diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD index 99d938bfe..70c3a306e 100644 --- a/core/libcap/PKGBUILD +++ b/core/libcap/PKGBUILD @@ -1,15 +1,16 @@ -#$Id: PKGBUILD 158556 2012-05-04 23:56:45Z allan $ +#$Id: PKGBUILD 182644 2013-04-12 00:05:24Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libcap pkgver=2.22 -pkgrel=3 +pkgrel=4 pkgdesc="POSIX 1003.1e capabilities" arch=('i686' 'x86_64') url="http://sites.google.com/site/fullycapable/" license=('GPL2') depends=('glibc' 'attr') +options=('!staticlibs') source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) md5sums=('b4896816b626bea445f0b3849bdd4077' '9d0983e25e5a251d098507f9561d2b27') @@ -21,10 +22,7 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} - make prefix=/usr DESTDIR=${pkgdir} RAISE_SETFCAP=no install - - chmod 755 ${pkgdir}/usr/lib/libcap.so.${pkgver} - rm ${pkgdir}/usr/lib/libcap.a + make prefix=/usr lib=/lib DESTDIR=${pkgdir} RAISE_SETFCAP=no install install -Dm644 pam_cap/capability.conf \ $pkgdir/usr/share/doc/$pkgname/capability.conf.example diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD index b7bcee9a0..85c803c89 100644 --- a/extra/alsa-plugins/PKGBUILD +++ b/extra/alsa-plugins/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166381 2012-09-07 09:14:25Z tpowa $ +# $Id: PKGBUILD 182673 2013-04-12 14:23:59Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel Ehlers <danielehlers@mindeye.net> pkgname=alsa-plugins -pkgver=1.0.26 +pkgver=1.0.27 pkgrel=1 pkgdesc="Extra alsa plugins" arch=(i686 x86_64) @@ -18,14 +18,11 @@ optdepends=('libpulse: PulseAudio plugin' 'libsamplerate: libsamplerate resampling plugin' 'speex: libspeexdsp resampling plugin') options=('!libtool') -source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2" - alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch - alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch) +source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2") +md5sums=('ada0163e0e84c787bfc929ad0f3f5cb8') build() { cd $pkgname-$pkgver - patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch - patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch ./configure --prefix=/usr make } @@ -37,6 +34,3 @@ package() { install -d "$pkgdir/usr/share/doc/$pkgname" install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/" } -md5sums=('4facd408326ef5567a7d4ceb6589e6b0' - '50d9adcda20756d063e676a563c201d9' - '697c6275f678d86ded2e5092d8a154c9') diff --git a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch b/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch deleted file mode 100644 index cce4f7e7e..000000000 --- a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -u -r alsa-plugins-1.0.25/a52/pcm_a52.c alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c ---- alsa-plugins-1.0.25/a52/pcm_a52.c 2012-01-25 08:57:07.000000000 +0100 -+++ alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c 2012-06-09 00:42:52.177219012 +0200 -@@ -702,7 +702,6 @@ - rec->channels = channels; - rec->format = format; - -- avcodec_init(); - avcodec_register_all(); - - rec->codec = avcodec_find_encoder_by_name("ac3_fixed"); diff --git a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch b/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch deleted file mode 100644 index f4ebbf466..000000000 --- a/extra/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch +++ /dev/null @@ -1,29 +0,0 @@ -Ffmpeg 0.11 (LIBAVCODEC_VERSION_MAJOR = 54) removed the CH_LAYOUT_* aliases for -the AV_CH_LAYOUT_* defines. - -diff -pru alsa-plugins-1.0.25-original/a52/pcm_a52.c alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c ---- alsa-plugins-1.0.25-original/a52/pcm_a52.c 2012-01-25 08:57:07.000000000 +0100 -+++ alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c 2012-06-01 14:59:47.096671464 +0200 -@@ -441,7 +441,21 @@ static int a52_prepare(snd_pcm_ioplug_t - #else - rec->avctx->sample_fmt = SAMPLE_FMT_S16; - #endif --#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) -+#if (LIBAVCODEC_VERSION_MAJOR >= 54) -+ switch (io->channels) { -+ case 2: -+ rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO; -+ break; -+ case 4: -+ rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD; -+ break; -+ case 6: -+ rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1; -+ break; -+ default: -+ break; -+ } -+#elif (LIBAVCODEC_VERSION_MAJOR > 52 && LIBAVCODEC_VERSION_MAJOR < 54) || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) - switch (io->channels) { - case 2: - rec->avctx->channel_layout = CH_LAYOUT_STEREO; diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD index ce3b9eec2..90456699b 100644 --- a/extra/cifs-utils/PKGBUILD +++ b/extra/cifs-utils/PKGBUILD @@ -1,20 +1,17 @@ -# $Id: PKGBUILD 176097 2013-01-27 12:26:02Z tpowa $ +# $Id: PKGBUILD 182654 2013-04-12 07:11:03Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=cifs-utils -pkgver=5.9 +pkgver=6.0 pkgrel=1 pkgdesc="CIFS filesystem user-space tools" arch=(i686 x86_64) url="http://wiki.samba.org/index.php/LinuxCIFS_utils" license=('GPL') depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient') -source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2 - fix-5.9-credentials.patch) +source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2) build() { cd "$srcdir/$pkgname-$pkgver" - # fix credentials - patch -Np1 -i ../fix-5.9-credentials.patch # systemd support is broken in mount.cifs # https://bugs.archlinux.org/task/30958 ./configure --prefix=/usr --disable-systemd @@ -27,6 +24,4 @@ package() { # set mount.cifs uid, to enable none root mounting form fstab chmod +s $pkgdir/usr/bin/mount.cifs } -md5sums=('6aa9c4347780872fefe5823ac06a8ff3') -md5sums=('7164ad6f7963a31fcbffbe4f14a7cfc6' - '2550d43af5bb734307cae22a09cd7710') +md5sums=('371e007a201be90c16497cd9bd5e2553') diff --git a/extra/ldb/PKGBUILD b/extra/ldb/PKGBUILD new file mode 100644 index 000000000..3a665cd0d --- /dev/null +++ b/extra/ldb/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 182651 2013-04-12 07:10:22Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Christian Hesse <mail@eworm.de> +# Contributor: Marco A Rojas <marquicus at gmail dot com> + +pkgname=ldb +pkgver=1.1.15 +pkgrel=1 +pkgdesc="A schema-less, ldap like, API and database" +arch=('i686' 'x86_64') +url="http://ldb.samba.org/" +source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz) +license=('GPL3') +depends=('talloc' 'tevent' 'tdb' 'popt') +makedepends=('python2') +optdepends=('python2: for python bindings') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # change to use python2 + sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" buildtools/bin/waf + export PYTHON=/usr/bin/python2 + + ./configure --prefix=/usr \ + --disable-rpath \ + --disable-rpath-install \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --with-modulesdir=/usr/lib/ldb/modules \ + --with-privatelibdir=/usr/lib/ldb + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir}/ install +} +md5sums=('97ee9b455f6a547fb2b3b5a7836c41d7') diff --git a/extra/libkolab/PKGBUILD b/extra/libkolab/PKGBUILD index 4be397cd9..94c4d9378 100644 --- a/extra/libkolab/PKGBUILD +++ b/extra/libkolab/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 174981 2013-01-09 20:16:01Z andrea $ +# $Id: PKGBUILD 182679 2013-04-12 14:31:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkolab -pkgver=0.4.1 +pkgver=0.4.2 pkgrel=1 pkgdesc="Advanced Kolab Object Handling Library" url='http://git.kolab.org/libkolab/' @@ -11,8 +11,8 @@ license=('GPL') depends=('libkolabxml' 'kdepimlibs') makedepends=('cmake' 'automoc4' 'boost') source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg}) -md5sums=('16c4d513fd41f498348ab401a79cdaf6' - '18e76021f9b91df75c798ef24962de06') +md5sums=('76c112b18c1c0928af5e6e9733a424d3' + '2b289570a6ca6d8105b2865a953fa36d') build() { mkdir build diff --git a/extra/libkolabxml/PKGBUILD b/extra/libkolabxml/PKGBUILD index 4d528d475..d6d4920b5 100644 --- a/extra/libkolabxml/PKGBUILD +++ b/extra/libkolabxml/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181122 2013-03-31 19:16:46Z stephane $ +# $Id: PKGBUILD 182677 2013-04-12 14:30:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkolabxml -pkgver=0.8.3 -pkgrel=2 +pkgver=0.8.4 +pkgrel=1 pkgdesc="Kolab XML Format Schema Definitions Library" url='http://git.kolab.org/libkolabxml/' arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ license=('GPL') depends=('xerces-c' 'boost-libs') makedepends=('cmake' 'boost' 'xsd' 'qt4') source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg}) -md5sums=('38ded7003255decf9cd46c6a3f442e6b' - '493a9fcca56a244fc7403e4131cf7d5f') +md5sums=('64887f52c6629bbd8e2390d591ef5892' + '55fcdaff82818c4a0eac50570db31e53') build() { mkdir build diff --git a/extra/ncmpc/PKGBUILD b/extra/ncmpc/PKGBUILD index d6397c819..6759227fa 100644 --- a/extra/ncmpc/PKGBUILD +++ b/extra/ncmpc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180582 2013-03-23 23:09:37Z td123 $ +# $Id: PKGBUILD 182640 2013-04-11 22:29:15Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,21 +6,25 @@ # Contributor: Daniel Bainton <dpb [at] backarrow.org> pkgname=ncmpc -pkgver=0.20 -pkgrel=2 +pkgver=0.21 +pkgrel=1 pkgdesc='Fully featured MPD client using ncurses' -url='http://mpd.wikia.com/wiki/Client:Ncmpc' +url='http://www.musicpd.org/clients/ncmpc/' arch=('i686' 'x86_64') license=('GPL') depends=('ncurses' 'glib2' 'libmpdclient') optdepends=('python2: to enable lyrics plugin' 'ruby: to enable lyrics plugin') -source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('da106de4b11a48eb2d63619da1316713f95cc9cb') +source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('ec828bf17be6ab4c60c39bc91a3bd5cd93fac4a5') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -e 's#python#python2#' -i lyrics/30-leoslyrics.py +} build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's#python#python2#' lyrics/30-leoslyrics.py ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index 6d21059ca..acf0031f1 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176029 2013-01-26 16:18:55Z giovanni $ +# $Id: PKGBUILD 182685 2013-04-12 16:53:38Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay -pkgver=1.52 +pkgver=1.54 pkgrel=1 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ options=(!emptydirs) replaces=('net-ssleay') provides=('net-ssleay') source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz") -md5sums=('b885d173d5733b103355658aa4b3c60d') +md5sums=('26e758fff1c90cb00e9358fea7e1e22f') build() { cd ${srcdir}/${_cpanname}-${pkgver} diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 1a18b2162..218cdd805 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180807 2013-03-26 11:49:38Z foutrelis $ +# $Id: PKGBUILD 182657 2013-04-12 07:45:16Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,8 +21,8 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.13 -pkgrel=3 +pkgver=5.4.14 +pkgrel=1 arch=('i686' 'x86_64') 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=('cacd308e978b7cf9ba4993196612ccf7' +md5sums=('cfdc044be2c582991a1fe0967898fa38' '44c1bb1df346b3b9d3e092c7df9a37d0' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '5c1f4c967b66ce3eaf819b46951dcbf5' @@ -41,8 +41,19 @@ md5sums=('cacd308e978b7cf9ba4993196612ccf7' 'f8b206cb8fecb05cb1ded8bee45633ff' 'c60343df74f8e1afb13b084d5c0e47ed') +prepare() { + cd ${srcdir}/${pkgbase}-${pkgver} + + # adjust paths + 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 +} + build() { - phpconfig="--srcdir=../${pkgbase}-${pkgver} \ + local _phpconfig="--srcdir=../${pkgbase}-${pkgver} \ --config-cache \ --prefix=/usr \ --sysconfdir=/etc/php \ @@ -55,7 +66,7 @@ build() { --without-pear \ " - phpextensions="--enable-bcmath=shared \ + local _phpextensions="--enable-bcmath=shared \ --enable-calendar=shared \ --enable-dba=shared \ --enable-exif=shared \ @@ -120,72 +131,65 @@ build() { cd ${srcdir}/${pkgbase}-${pkgver} - # adjust paths - 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 ln -s ../${pkgbase}-${pkgver}/configure - ./configure ${phpconfig} \ + ./configure ${_phpconfig} \ --disable-cgi \ --with-readline \ --enable-pcntl \ - ${phpextensions} + ${_phpextensions} make # cgi and fcgi # reuse the previous run; this will save us a lot of time cp -a ${srcdir}/build-php ${srcdir}/build-cgi cd ${srcdir}/build-cgi - ./configure ${phpconfig} \ + ./configure ${_phpconfig} \ --disable-cli \ --enable-cgi \ - ${phpextensions} + ${_phpextensions} make # apache cp -a ${srcdir}/build-php ${srcdir}/build-apache cd ${srcdir}/build-apache - ./configure ${phpconfig} \ + ./configure ${_phpconfig} \ --disable-cli \ --with-apxs2 \ - ${phpextensions} + ${_phpextensions} make # fpm cp -a ${srcdir}/build-php ${srcdir}/build-fpm cd ${srcdir}/build-fpm - ./configure ${phpconfig} \ + ./configure ${_phpconfig} \ --disable-cli \ --enable-fpm \ --with-fpm-user=http \ --with-fpm-group=http \ - ${phpextensions} + ${_phpextensions} make # embed cp -a ${srcdir}/build-php ${srcdir}/build-embed cd ${srcdir}/build-embed - ./configure ${phpconfig} \ + ./configure ${_phpconfig} \ --disable-cli \ --enable-embed=shared \ - ${phpextensions} + ${_phpextensions} make # pear cp -a ${srcdir}/build-php ${srcdir}/build-pear cd ${srcdir}/build-pear - ./configure ${phpconfig} \ + ./configure ${_phpconfig} \ --disable-cgi \ --with-readline \ --enable-pcntl \ --with-pear \ - ${phpextensions} + ${_phpextensions} make } diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 20d337625..c1089a201 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,26 +1,35 @@ -# $Id: PKGBUILD 180160 2013-03-18 13:15:20Z tpowa $ + # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> +# Contributor: Michael Hansen <zrax0111 gmail com> +# Contributor: Marco A Rojas <marquicus at gmail.com> +# Contributor: Netanel Shine <netanel at archlinux.org.il > +# Contributor: ngoonee <ngoonee.talk@gmail.com> +# Contributor: Adam Russell <adamlr6+arch@gmail.com> +# Contributor: Dhananjay Sathe <dhananjaysathe@gmail.com> + pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=3.6.13 +pkgver=4.0.5 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=3.6.13 +_realver=4.0.5 pkgrel=1 arch=(i686 x86_64) url="http://www.samba.org" license=('GPL3') -makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb') +makedepends=('python2' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups' + 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb>=1.1.15' 'krb5' 'pam' + 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb') source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz samba.logrotate swat.xinetd samba.pam smbd.service smbd.socket - smbd@.service nmbd.service + smbd@.service swat.socket swat@.service winbindd.service @@ -28,134 +37,175 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz ### UNINSTALL dmapi package before building!!! build() { - cd ${srcdir}/${pkgbase}-${_realver}/source3 - ./configure --prefix=/usr \ - --libdir=/usr/lib/ \ + # Use samba-pkg as a staging directory for the split packages + # (This is so RPATHS and symlinks are generated correctly via + # make install, but the otherwise unsplit pieces can be split) + _pkgsrc=${srcdir}/samba-pkg + rm -rf ${_pkgsrc} + cd ${srcdir}/samba-${_realver} + # change to use python2 + SAVEIFS=${IFS} + IFS=$(echo -en "\n\b") + PYTHON_CALLERS="$(find ${srcdir}/samba-${_realver} -name '*.py') +$(find ${srcdir}/samba-${_realver} -name 'wscript*') +$(find ${srcdir}/samba-${_realver} -name 'configure.ac') +$(find ${srcdir}/samba-${_realver} -name 'upgrade_from_s3') +$(find ${srcdir}/samba-${_realver}/buildtools -type f) +$(find ${srcdir}/samba-${_realver}/source4/scripting -type f)" + sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" \ + -e "s|python-config|python2-config|" \ + -e "s|bin/python|bin/python2|" \ + ${PYTHON_CALLERS} + IFS=${SAVEIFS} + + export PYTHON=/usr/bin/python2 +_samba4_idmap_modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 +_samba4_pdb_modules=pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4 +_samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4 + cd ${srcdir}/samba-${_realver} + ./configure --enable-fhs \ + --prefix=/usr \ + --libdir=/usr/lib \ --localstatedir=/var \ --with-configdir=/etc/samba \ --with-lockdir=/var/cache/samba \ - --with-piddir=/var/run/samba \ - --with-fhs \ - --with-pam \ - --with-pam_smbpass \ - --with-pammodulesdir=/usr/lib/security \ - --with-dnsupdate \ - --with-automount \ - --with-quotas \ + --with-sockets-dir=/var/run/samba \ + --with-piddir=/var/run \ --with-ads \ + --with-ldap \ + --with-swat \ + --with-winbind \ --with-acl-support \ - --with-libsmbclient \ - --with-syslog \ - --enable-external-libtalloc \ - --disable-dnssd \ - --disable-avahi \ - --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \ - --enable-external-libtdb + --enable-gnutls \ + --with-pam \ + --with-pammodulesdir=/usr/lib/security \ + --with-shared-modules=${_samba4_idmap_modules},${_samba4_pdb_modules},${_samba4_auth_modules} \ + --disable-rpath-install + + # Add this to the options once it's working... + #--with-system-mitkrb5 /opt/heimdal make + make DESTDIR="${_pkgsrc}/" install + + # This gets skipped somehow + if [ ! -e ${_pkgsrc}/usr/bin/smbtar ]; then + install -m755 ${srcdir}/samba-${_realver}/source3/script/smbtar ${_pkgsrc}/usr/bin/ + fi } -package_libwbclient () { +package_libwbclient() { pkgdesc="Samba winbind client library" -depends=('glibc') - cd ${srcdir}/${pkgbase}-${_realver}/source3 - mkdir -p ${pkgdir}/usr/lib - for i in libwbclient*; do - cp -a bin/${i}*.so* ${pkgdir}/usr/lib/ - done - install -D -m644 pkgconfig/wbclient.pc ${pkgdir}/usr/lib/pkgconfig/wbclient.pc - install -D -m644 ../nsswitch/libwbclient/wbclient.h ${pkgdir}/usr/include/wbclient.h +depends=('glibc' 'libbsd') + # Use samba-pkg as a staging directory for the split packages + # (This is so RPATHS and symlinks are generated correctly via + # make install, but the otherwise unsplit pieces can be split) + _pkgsrc=${srcdir}/samba-pkg + install -d -m755 ${pkgdir}/usr/lib + mv ${_pkgsrc}/usr/lib/libwbclient*.so* ${pkgdir}/usr/lib/ + + install -d -m755 ${pkgdir}/usr/lib/samba + mv ${_pkgsrc}/usr/lib/samba/libwinbind-client*.so* ${pkgdir}/usr/lib/samba/ + mv ${_pkgsrc}/usr/lib/samba/libreplace.so* ${pkgdir}/usr/lib/samba/ + + install -d -m755 ${pkgdir}/usr/lib/pkgconfig + mv ${_pkgsrc}/usr/lib/pkgconfig/wbclient.pc ${pkgdir}/usr/lib/pkgconfig/ + + install -d -m755 ${pkgdir}/usr/include/samba-4.0 + mv ${_pkgsrc}/usr/include/samba-4.0/wbclient.h ${pkgdir}/usr/include/samba-4.0/ } -package_smbclient () { +package_smbclient() { pkgdesc="Tools to access a server's filespace and printers via SMB" -depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc' 'libwbclient') - cd ${srcdir}/${pkgbase}-${_realver}/source3 - mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib - install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/ - for i in libnetapi* libsmbclient*;do - cp -a bin/${i}*.so* ${pkgdir}/usr/lib/ - done - install -m755 script/smbtar ${pkgdir}/usr/bin/ - mkdir -p ${pkgdir}/usr/lib/cups/backend - ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb - mkdir -p ${pkgdir}/usr/include - install -m644 include/libsmbclient.h ${pkgdir}/usr/include/ - install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/ - mkdir -p ${pkgdir}/usr/lib/pkgconfig - install -m644 pkgconfig/smbclient.pc ${pkgdir}/usr/lib/pkgconfig/ - install -m644 pkgconfig/netapi.pc ${pkgdir}/usr/lib/pkgconfig/ - mkdir -p ${pkgdir}/usr/share/man/man{1,7} - for man in rpcclient smbcacls smbclient smbcquotas smbget \ - smbtree smbtar nmblookup; do - install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/ - done - install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/ +depends=('popt' 'cifs-utils' 'tdb' "libwbclient>=$pkgver" 'ldb' + 'tevent' 'libgcrypt' 'python2' 'talloc' 'readline' 'gnutls' + 'libbsd' 'libldap' 'libcups') + + _smbclient_bins=('smbclient' 'smbclient4' 'rpcclient' 'smbspool' + 'smbtree' 'smbcacls' 'smbcquotas' 'smbget' 'net' + 'nmblookup' 'nmblookup4' 'smbtar') + # Use samba-pkg as a staging directory for the split packages + # (This is so RPATHS and symlinks are generated correctly via + # make install, but the otherwise unsplit pieces can be split) + _pkgsrc=${srcdir}/samba-pkg + install -d -m755 ${pkgdir}/usr/bin + for bin in ${_smbclient_bins[@]}; do + mv ${_pkgsrc}/usr/bin/${bin} ${pkgdir}/usr/bin/ + done + + # smbclient binaries link to the majority of the samba + # libs, so this is a shortcut instead of resolving the + # whole dependency tree by hand + install -d -m755 ${pkgdir}/usr/lib + for lib in ${_pkgsrc}/usr/lib/lib*.so*; do + mv ${lib} ${pkgdir}/usr/lib/ + done + + install -d -m755 ${pkgdir}/usr/lib/samba + for lib in ${_pkgsrc}/usr/lib/samba/lib*.so*; do + mv ${lib} ${pkgdir}/usr/lib/samba/ + done + + install -d -m755 ${pkgdir}/usr/lib/pkgconfig + mv ${_pkgsrc}/usr/lib/pkgconfig/smbclient.pc ${pkgdir}/usr/lib/pkgconfig/ + mv ${_pkgsrc}/usr/lib/pkgconfig/smbclient-raw.pc ${pkgdir}/usr/lib/pkgconfig/ + mv ${_pkgsrc}/usr/lib/pkgconfig/netapi.pc ${pkgdir}/usr/lib/pkgconfig/ + + install -d -m755 ${pkgdir}/usr/share/man/man1 + install -d -m755 ${pkgdir}/usr/share/man/man7 + install -d -m755 ${pkgdir}/usr/share/man/man8 + for bin in ${_smbclient_bins[@]}; do + if [ -e ${_pkgsrc}/usr/share/man/man1/${bin}.1 ]; then + mv ${_pkgsrc}/usr/share/man/man1/${bin}.1 ${pkgdir}/usr/share/man/man1/ + fi + if [ -e ${_pkgsrc}/usr/share/man/man8/${bin}.8 ]; then + mv ${_pkgsrc}/usr/share/man/man8/${bin}.8 ${pkgdir}/usr/share/man/man8/ + fi + done + mv ${_pkgsrc}/usr/share/man/man7/libsmbclient.7 ${pkgdir}/usr/share/man/man7/ + + install -d -m755 ${pkgdir}/usr/include/samba-4.0 + mv ${_pkgsrc}/usr/include/samba-4.0/libsmbclient.h ${pkgdir}/usr/include/samba-4.0/ + mv ${_pkgsrc}/usr/include/samba-4.0/netapi.h ${pkgdir}/usr/include/samba-4.0/ + + mkdir -p ${pkgdir}/usr/lib/cups/backend + ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb } -package_samba () { -pkgdesc="Tools to access a server's filespace and printers via SMB" +package_samba() { +pkgdesc="SMB Fileserver and AD Domain server" +depends=('db>=4.7' 'popt' 'libcups' 'libcap>=2.16' 'gamin' 'gnutls>=2.4.1' + 'talloc' 'ldb' 'libbsd' 'python2' 'tdb' "smbclient>=$pkgver") backup=(etc/logrotate.d/samba etc/pam.d/samba etc/samba/smb.conf etc/xinetd.d/swat etc/conf.d/samba) -depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc') -install='samba.install' - cd ${srcdir}/samba-${_realver}/source3 - mkdir -p ${pkgdir}/etc/samba/private - chmod 700 ${pkgdir}/etc/samba/private - make DESTDIR=${pkgdir} install - chmod 644 ${pkgdir}/usr/include/*.h - rm -rf ${pkgdir}/usr/var - rm -rf ${pkgdir}/var/run/samba - (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh) - mkdir -p ${pkgdir}/etc/samba - cat ../examples/smb.conf.default | \ - sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default - install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba - install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat - install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba - # spool directory - install -d -m1777 ${pkgdir}/var/spool/samba - sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default - # fix logrotate - sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default - # nsswitch libraries - install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/usr/lib/libnss_wins.so - ln -s libnss_wins.so ${pkgdir}/usr/lib/libnss_wins.so.2 - install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/usr/lib/libnss_winbind.so - ln -s libnss_winbind.so ${pkgdir}/usr/lib/libnss_winbind.so.2 - # winbind krb5 locator - mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5 - install -d -m 0755 ${pkgdir}/usr/lib/krb5/plugins/libkrb5 - install -m 755 bin/winbind_krb5_locator.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/winbind_krb5_locator.so - # remove conflict files of smbclient - for man in libsmbclient smbspool \ - mount.cifs net cifs.upcall; do - rm -f ${pkgdir}/usr/share/man/man8/${man}.8 - done - for i in libnetapi* libwbclient* libsmbclient* winbind_krb5*;do - rm -f ${pkgdir}/usr/lib/$i - done - for bin in net \ - nmblookup rpcclient smbcacls smbclient \ - smbcquotas smbget smbspool smbtar smbtree; do - rm -f ${pkgdir}/usr/bin/$bin - done - rm -f ${pkgdir}/usr/sbin/cifs.upcall - rm -f ${pkgdir}/usr/include/netapi.h - rm -f ${pkgdir}/usr/include/wbclient.h - for man in rpcclient smbcacls smbclient smbcquotas \ - smbtree smbtar nmblookup smbget; do - rm -f ${pkgdir}/usr/share/man/man1/${man}.1 - done - for man in tdbbackup tdbdump tdbtool; do - rm -f ${pkgdir}/usr/share/man/man8/${man}.8 - done - rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7 - rm -f ${pkgdir}/usr/include/libsmbclient.h - # copy ldap example - install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema +install=samba.install + # Use samba-pkg as a staging directory for the split packages + # (This is so RPATHS and symlinks are generated correctly via + # make install, but the otherwise unsplit pieces can be split) + _pkgsrc=${srcdir}/samba-pkg + # Everything that libwbclient and smbclient didn't install goes + # into the samba package... + mv ${_pkgsrc}/* ${pkgdir}/ + rmdir ${_pkgsrc} + + _pyver=`python2 -c 'import sys; print(sys.version[:3])'` + + find ${pkgdir}/usr/lib/python${_pyver}/site-packages/ -name '*.py' | \ + xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" + find ${pkgdir}/usr/bin ${pkgdir}/usr/sbin -type f -executable | \ + xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" + + # Make admin scripts look in the right place for the samba python module + for script in sbin/samba_dnsupdate sbin/samba_kcc sbin/samba_spnupdate \ + sbin/samba_upgradedns bin/samba-tool + do + sed -i "/^sys\.path\.insert/ a\ +sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ + ${pkgdir}/usr/${script} + done + # install systemd files install -d -m755 ${pkgdir}/usr/lib/systemd/system for i in smbd nmbd swat winbindd; do @@ -164,20 +214,41 @@ install='samba.install' done # create ephemeral dirs via tmpfiles rather than shipping them in package install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf - rm -rf ${pkgdir}/var/run + # install sample smb.conf + install -d -m755 ${pkgdir}/etc/samba + install -m644 ${srcdir}/samba-${_realver}/packaging/LSB/smb.conf ${pkgdir}/etc/samba/smb.conf.default + + mkdir -p ${pkgdir}/etc/samba/private + chmod 700 ${pkgdir}/etc/samba/private + + install -D -m644 ${srcdir}/samba.logrotate ${pkgdir}/etc/logrotate.d/samba + install -D -m644 ${srcdir}/swat.xinetd ${pkgdir}/etc/xinetd.d/swat + install -D -m644 ${srcdir}/samba.pam ${pkgdir}/etc/pam.d/samba + + # winbind krb5 locator + mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5 + mv ${pkgdir}/usr/lib/*.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/ - mkdir -p ${pkgdir}/usr/lib/pkgconfig - install -m644 pkgconfig/smbsharemodes.pc ${pkgdir}/usr/lib/pkgconfig/ + # fix logrotate + sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default + + # spool directory + install -d -m1777 ${pkgdir}/var/spool/samba + + rm -rf ${pkgdir}/var/run + + # copy ldap example + install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('b9fe8413cbb6fa4b970a159968db2fb4' +md5sums=('58ec2fec08872b72f8fd526f2da20a9e' '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' '96f82c38f3f540b53f3e5144900acf17' - '4d86a4e3b2ac4b35e12ac667d1d261a7' + 'd0b18dd7f5fafc8d25cb3a7c37c6d920' 'a78b9aa93eb14b0ac445897395693225' - '4f2a5266f88d016a78014bb02e118c7f' - '46bac3375dcf25baea4699226410987a' + '90845b89f2321cb19c0b13f385f1782a' + '70186fa43510bf99e3afd5951e814fbf' '6db11f3dd2112a4b7a73007b189bef3f' 'b0de262f9c62acd162e873658f33d063' - '03257dd11fc041d59e612c02a54ef4c0' + '64a52bc798033aeabfae3410bd559aa4' '49abd7b719e3713a3f75a8a50958e381') diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service index 44b4ffba1..4f86c4db9 100644 --- a/extra/samba/nmbd.service +++ b/extra/samba/nmbd.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -PIDFile=/var/run/samba/nmbd.pid +PIDFile=/var/run/nmbd.pid ExecStart=/usr/sbin/nmbd -D ExecReload=/bin/kill -HUP $MAINPID diff --git a/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch b/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch new file mode 100644 index 000000000..cb2378a78 --- /dev/null +++ b/extra/samba/samba-4.0.3-fix_pidl_with_gcc48.patch @@ -0,0 +1,60 @@ +From 1ac743a7d0d20e16fc325749d593edaaed89d706 Mon Sep 17 00:00:00 2001 +From: Alexander Bokovoy <ab@samba.org> +Date: Wed, 6 Feb 2013 10:17:57 +0200 +Subject: [PATCH] PIDL: fix parsing linemarkers in preprocessor output + +When PIDL calls out to C preprocessor to expand IDL files +and parse the output, it filters out linemarkers and line control +information as described in http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html +and http://gcc.gnu.org/onlinedocs/cpp/Line-Control.html#Line-Control + +With gcc 4.8 stdc-predef.h is included automatically and linemarker for the +file has extended flags that PIDL couldn't parse ('system header that needs to +be extern "C" protected for C++') + +Thanks to Jakub Jelinek <jakub@redhat.com> for explanation of the linemarker format. + +Fixes https://bugzilla.redhat.com/show_bug.cgi?id=906517 + +Reviewed-by: Andreas Schneider <asn@samba.org> +(cherry picked from commit 6ba7ab5c14801aecae96373d5a9db7ab82957526) + +Signed-off-by: Andreas Schneider <asn@samba.org> +--- + pidl/idl.yp | 4 +++- + pidl/lib/Parse/Pidl/IDL.pm | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/pidl/idl.yp b/pidl/idl.yp +index b5c5185..c8a65f6 100644 +--- a/pidl/idl.yp ++++ b/pidl/idl.yp +@@ -610,7 +610,9 @@ again: + + for ($parser->YYData->{INPUT}) { + if (/^\#/) { +- if (s/^\# (\d+) \"(.*?)\"( \d+|)//) { ++ # Linemarker format is described at ++ # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html ++ if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) { + $parser->YYData->{LINE} = $1-1; + $parser->YYData->{FILE} = $2; + goto again; +diff --git a/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm +index d4820ff..6927c89 100644 +--- a/pidl/lib/Parse/Pidl/IDL.pm ++++ b/pidl/lib/Parse/Pidl/IDL.pm +@@ -2576,7 +2576,9 @@ again: + + for ($parser->YYData->{INPUT}) { + if (/^\#/) { +- if (s/^\# (\d+) \"(.*?)\"( \d+|)//) { ++ # Linemarker format is described at ++ # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html ++ if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) { + $parser->YYData->{LINE} = $1-1; + $parser->YYData->{FILE} = $2; + goto again; +-- +1.8.1.1 + diff --git a/extra/samba/samba.install b/extra/samba/samba.install index d8c6c49ef..420643f0e 100644 --- a/extra/samba/samba.install +++ b/extra/samba/samba.install @@ -4,4 +4,11 @@ post_install() { systemd-tmpfiles --create samba.conf } +post_upgrade() { + if [ "$(vercmp $2 4.0.4)" -lt 0 ]; then + echo "Major upgrade from samba 3.x to 4.x," + echo "please read the Samba4 migration guide:" + echo "http://wiki.samba.org/index.php/Samba4/samba3upgrade/HOWTO" + fi +} # vim:set ts=2 sw=2 et: diff --git a/extra/samba/smbd.service b/extra/samba/smbd.service index 5c006a44e..12c08474a 100644 --- a/extra/samba/smbd.service +++ b/extra/samba/smbd.service @@ -4,7 +4,7 @@ After=network.target nmbd.service winbindd.service [Service] Type=forking -PIDFile=/var/run/samba/smbd.pid +PIDFile=/var/run/smbd.pid ExecStart=/usr/sbin/smbd -D ExecReload=/bin/kill -HUP $MAINPID diff --git a/extra/samba/smbd@.service b/extra/samba/smbd@.service index 58ccd6a9f..e1f71be3f 100644 --- a/extra/samba/smbd@.service +++ b/extra/samba/smbd@.service @@ -2,8 +2,6 @@ Description=Samba SMB/CIFS server instance [Service] -Type=forking -PIDFile=/var/run/samba/smbd.pid -ExecStart=/usr/sbin/smbd -D +ExecStart=/usr/sbin/smbd -F ExecReload=/bin/kill -HUP $MAINPID StandardInput=socket diff --git a/extra/samba/winbindd.service b/extra/samba/winbindd.service index 67a778fc7..02e3014b1 100644 --- a/extra/samba/winbindd.service +++ b/extra/samba/winbindd.service @@ -4,7 +4,7 @@ After=network.target nmbd.service [Service] Type=forking -PIDFile=/var/run/samba/winbindd.pid +PIDFile=/var/run/winbindd.pid ExecStart=/usr/sbin/winbindd -D ExecReload=/bin/kill -HUP $MAINPID diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index fa292f3f6..3b0bca75c 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 181034 2013-03-30 09:25:06Z andyrtr $ +# $Id: PKGBUILD 182667 2013-04-12 14:07:12Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc') -_amalgamationver=3071601 +_amalgamationver=3071602 _docver=${_amalgamationver} #_docver=3071601 -pkgver=3.7.16.1 +pkgver=3.7.16.2 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64') @@ -19,8 +19,8 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with http://www.sqlite.org/2013/sqlite-doc-${_docver}.zip license.txt) options=('!libtool' '!emptydirs') -sha1sums=('b0d9b3e2ca3c50f72e5921e9532130787871b7ae' - '254dbed306ceb4e9017497dbafaa47280a2fc4ff' +sha1sums=('85bf857cf86f34831d55d7ba97606dba581b8d62' + '998df3d9ada4a4a8a048bcf20613d1d02be77731' 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { diff --git a/extra/tevent/PKGBUILD b/extra/tevent/PKGBUILD new file mode 100644 index 000000000..fac6d2aea --- /dev/null +++ b/extra/tevent/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 182652 2013-04-12 07:10:43Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Christian Hesse <mail@eworm.de> +# Contributor: Marco A Rojas <marquicus at gmail dot com> +# Contributor: Ng Oon-Ee <ngoonee.talk@gmail.com> +# Contributor: Thomas Burdick <thomas.burdick@gmail.com> + +pkgname=tevent +pkgver=0.9.18 +pkgrel=1 +pkgdesc="An event system based on the talloc memory management library" +arch=('i686' 'x86_64') +url="https://tevent.samba.org/" +source=("http://samba.org/ftp/tevent/${pkgname}-${pkgver}.tar.gz") +license=('GPL3') +depends=('talloc') +makedepends=('python2') +optdepends=('python2: for python bindings') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # change to use python2 + sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" buildtools/bin/waf + export PYTHON=/usr/bin/python2 + + ./configure --prefix=/usr +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make + make DESTDIR=${pkgdir}/ install +} +md5sums=('952535f0bcf002eee5a8db68deb6374b') diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD index 910632835..ade9eedff 100644 --- a/extra/xf86-video-vmware/PKGBUILD +++ b/extra/xf86-video-vmware/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180220 2013-03-18 16:09:26Z andyrtr $ +# $Id: PKGBUILD 182671 2013-04-12 14:13:36Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-vmware pkgver=13.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="X.org vmware video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -15,7 +15,7 @@ groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch) sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6' - '0a0fce7ddcb9c53da1b2aa1aa11317c10f0161026f40c82523c4dc0fd496016f') + '9322d467d2111be4049e8649b1d2729a2a2ab35cc9769cfee5be63f18e176938') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-vmware/git-fixes.patch b/extra/xf86-video-vmware/git-fixes.patch index 70597def7..f1cde34aa 100644 --- a/extra/xf86-video-vmware/git-fixes.patch +++ b/extra/xf86-video-vmware/git-fixes.patch @@ -53,3 +53,37 @@ index 9959ffb..7863ba2 100644 miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); -- cgit v0.9.0.2-2-gbebe +From d13a6334fe76f4e869b2cb8c0a6a13c185b1bedd Mon Sep 17 00:00:00 2001 +From: Loïc Yhuel <loic.yhuel@gmail.com> +Date: Thu, 11 Apr 2013 09:29:10 +0000 +Subject: vmwgfx: Use myGlyphs to fix crashes + +Tested-by: Christian Hesse <mail@eworm.de> +Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> +Signed-off-by: Loïc Yhuel <loic.yhuel@gmail.com> +Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> +--- +diff --git a/saa/saa_render.c b/saa/saa_render.c +index c69f2c9..c6ce68c 100644 +--- a/saa/saa_render.c ++++ b/saa/saa_render.c +@@ -406,6 +406,8 @@ saa_render_setup(ScreenPtr pScreen) + saa_wrap(sscreen, ps, Trapezoids, saa_trapezoids); + saa_wrap(sscreen, ps, Triangles, saa_triangles); + saa_wrap(sscreen, ps, Composite, saa_composite); ++ saa_wrap(sscreen, ps, Glyphs, miGlyphs); ++ saa_wrap(sscreen, ps, UnrealizeGlyph, miUnrealizeGlyph); + } + } + +@@ -419,6 +421,8 @@ saa_render_takedown(ScreenPtr pScreen) + saa_unwrap(sscreen, ps, Trapezoids); + saa_unwrap(sscreen, ps, Triangles); + saa_unwrap(sscreen, ps, Composite); ++ saa_unwrap(sscreen, ps, Glyphs); ++ saa_unwrap(sscreen, ps, UnrealizeGlyph); + } + } + #endif +-- +cgit v0.9.0.2-2-gbebe diff --git a/libre-testing/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre-testing/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch deleted file mode 100644 index 4ca4fc704..000000000 --- a/libre-testing/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ /dev/null @@ -1,281 +0,0 @@ -From: Mike Hommey <mh@glandium.org>
-Date: Tue, 5 Jun 2012 08:57:06 +0200
-Subject: Bug 756390 - Make the "Reset Firefox" feature more generic
-
-diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
-index 0e8ccf5..fa46c08 100644
---- a/browser/components/migration/content/migration.js
-+++ b/browser/components/migration/content/migration.js
-@@ -249,7 +249,7 @@ var MigrationWizard = {
- }
-
- var brandBundle = document.getElementById("brandBundle");
-- // These strings don't exist when not using official branding. If that's
-+ // These strings may not exist when not using official branding. If that's
- // the case, just skip this page.
- try {
- var pageTitle = brandBundle.getString("homePageMigrationPageTitle");
-@@ -281,8 +281,8 @@ var MigrationWizard = {
- case "chrome":
- source = "sourceNameChrome";
- break;
-- case "firefox":
-- source = "sourceNameFirefox";
-+ case "self":
-+ source = "brand";
- break;
- }
-
-@@ -292,7 +292,12 @@ var MigrationWizard = {
- var oldHomePageURL = this._migrator.sourceHomePageURL;
-
- if (oldHomePageURL && source) {
-- var appName = MigrationUtils.getLocalizedString(source);
-+ var appName;
-+ if (source == "brand") {
-+ appName = brandBundle.GetStringFromName("brandFullName");
-+ } else {
-+ appName = MigrationUtils.getLocalizedString(source);
-+ }
- var oldHomePageLabel =
- brandBundle.getFormattedString("homePageImport", [appName]);
- var oldHomePage = document.getElementById("oldHomePage");
-diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul
-index f030756..23e37ff 100644
---- a/browser/components/migration/content/migration.xul
-+++ b/browser/components/migration/content/migration.xul
-@@ -42,7 +42,7 @@
- #elifdef XP_UNIX
- <radio id="chrome" label="&importFromChrome.label;" accesskey="&importFromChrome.accesskey;"/>
- #endif
-- <radio id="firefox" label="&importFromFirefox.label;" accesskey="&importFromFirefox.accesskey;"/>
-+ <radio id="self" hidden="true"/>
- <radio id="nothing" label="&importFromNothing.label;" accesskey="&importFromNothing.accesskey;" hidden="true"/>
- </radiogroup>
- <label id="noSources" hidden="true">&noMigrationSources.label;</label>
-diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest
-index d7fec75..d531b83 100644
---- a/browser/components/migration/src/BrowserProfileMigrators.manifest
-+++ b/browser/components/migration/src/BrowserProfileMigrators.manifest
-@@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737
- component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js
- contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}
- component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
--contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
-+contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}
- #ifdef HAS_IE_MIGRATOR
- component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
- contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
-diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
-index 52722e9..0448444 100644
---- a/browser/components/migration/src/FirefoxProfileMigrator.js
-+++ b/browser/components/migration/src/FirefoxProfileMigrator.js
-@@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {
-
-
- FirefoxProfileMigrator.prototype.classDescription = "Firefox Profile Migrator";
--FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox";
-+FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";
- FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");
-
- this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
-diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
-index 401623a..4ce7a3e 100644
---- a/browser/components/migration/src/MigrationUtils.jsm
-+++ b/browser/components/migration/src/MigrationUtils.jsm
-@@ -404,11 +404,6 @@ this.MigrationUtils = Object.freeze({
- * @see nsIStringBundle
- */
- getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
-- const OVERRIDES = {
-- "4_firefox": "4_firefox_history_and_bookmarks"
-- };
-- aKey = OVERRIDES[aKey] || aKey;
--
- if (aReplacements === undefined)
- return getMigrationBundle().GetStringFromName(aKey);
- return getMigrationBundle().formatStringFromName(
-@@ -623,6 +618,17 @@ this.MigrationUtils = Object.freeze({
- },
-
- /**
-+ * Returns whether a given migration type is supported.
-+ *
-+ * @param aKey Migrator key
-+ * @returns whether the migrator key is supported.
-+ */
-+ canMigrate:
-+ function MU_canMigrate(aMigratorKey) {
-+ return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;
-+ },
-+
-+ /**
- * Cleans up references to migrators and nsIProfileInstance instances.
- */
- finishMigration: function MU_finishMigration() {
-diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
-index f67823b..36016b8 100644
---- a/browser/components/migration/src/ProfileMigrator.js
-+++ b/browser/components/migration/src/ProfileMigrator.js
-@@ -12,6 +12,7 @@ function ProfileMigrator() {
-
- ProfileMigrator.prototype = {
- migrate: MigrationUtils.startupMigration.bind(MigrationUtils),
-+ canMigrate: MigrationUtils.canMigrate.bind(MigrationUtils),
- QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIProfileMigrator]),
- classDescription: "Profile Migrator",
- contractID: "@mozilla.org/toolkit/profile-migrator;1",
-diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd
-index 21cf405..f3c1a6b 100644
---- a/browser/locales/en-US/chrome/browser/migration/migration.dtd
-+++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd
-@@ -17,8 +17,6 @@
- <!ENTITY importFromSafari.accesskey "S">
- <!ENTITY importFromChrome.label "Chrome">
- <!ENTITY importFromChrome.accesskey "C">
--<!ENTITY importFromFirefox.label "Firefox">
--<!ENTITY importFromFirefox.accesskey "X">
-
- <!ENTITY noMigrationSources.label "No programs that contain bookmarks, history or password data could be found.">
-
-diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
-index 260bc29..52b32cc 100644
---- a/browser/locales/en-US/chrome/browser/migration/migration.properties
-+++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
-@@ -8,7 +8,6 @@ profileName_format=%S %S
- sourceNameIE=Internet Explorer
- sourceNameSafari=Safari
- sourceNameChrome=Google Chrome
--sourceNameFirefox=Mozilla Firefox
-
- importedBookmarksFolder=From %S
-
-@@ -24,22 +23,22 @@ importedSafariReadingList=Reading List (From Safari)
- 2_ie=Cookies
- 2_safari=Cookies
- 2_chrome=Cookies
--2_firefox=Cookies
-+2_self=Cookies
-
- 4_ie=Browsing History
- 4_safari=Browsing History
- 4_chrome=Browsing History
--4_firefox_history_and_bookmarks=Browsing History and Bookmarks
-+4_self=Browsing History and Bookmarks
-
- 8_ie=Saved Form History
- 8_safari=Saved Form History
- 8_chrome=Saved Form History
--8_firefox=Saved Form History
-+8_self=Saved Form History
-
- 16_ie=Saved Passwords
- 16_safari=Saved Passwords
- 16_chrome=Saved Passwords
--16_firefox=Saved Passwords
-+16_self=Saved Passwords
-
- 32_ie=Favorites
- 32_safari=Bookmarks
-@@ -48,4 +47,4 @@ importedSafariReadingList=Reading List (From Safari)
- 64_ie=Other Data
- 64_safari=Other Data
- 64_chrome=Other Data
--64_firefox=Bookmarks Backups
-+64_self=Bookmarks Backups
-diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index fa45115..1fcf3cd 100644
---- a/toolkit/content/jar.mn
-+++ b/toolkit/content/jar.mn
-@@ -42,7 +42,7 @@ toolkit.jar:
- + content/global/mozilla.xhtml (mozilla.xhtml)
- content/global/nsDragAndDrop.js (nsDragAndDrop.js)
- content/global/resetProfile.css (resetProfile.css)
--* content/global/resetProfile.js (resetProfile.js)
-+ content/global/resetProfile.js (resetProfile.js)
- content/global/resetProfile.xul (resetProfile.xul)
- content/global/resetProfileProgress.xul (resetProfileProgress.xul)
- content/global/treeUtils.js (treeUtils.js)
-diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
-index dcb4065..09c1146 100644
---- a/toolkit/content/resetProfile.js
-+++ b/toolkit/content/resetProfile.js
-@@ -36,13 +36,13 @@ function resetSupported() {
- getService(Ci.nsIToolkitProfileService);
- let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
-
--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
--
- // Reset is only supported for the default profile if the self-migrator used for reset exists.
- try {
-- return currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
-- ("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc);
-+ if (currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
-+ "@mozilla.org/toolkit/profile-migrator;1" in Cc) {
-+ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
-+ return ("canMigrate" in pm) && pm.canMigrate("self");
-+ }
- } catch (e) {
- // Catch exception when there is no selected profile.
- Cu.reportError(e);
-@@ -53,9 +53,6 @@ function resetSupported() {
- function getMigratedData() {
- Components.utils.import("resource:///modules/MigrationUtils.jsm");
-
--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
--
- // From migration.properties
- const MIGRATED_TYPES = [
- 4, // History and Bookmarks
-@@ -68,7 +65,7 @@ function getMigratedData() {
- let dataTypes = [];
- for (let itemID of MIGRATED_TYPES) {
- try {
-- let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME);
-+ let typeName = MigrationUtils.getLocalizedString(itemID + "_self");
- dataTypes.push(typeName);
- } catch (x) {
- // Catch exceptions when the string for a data type doesn't exist.
-diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl
-index f35c227..7062886 100644
---- a/toolkit/profile/nsIProfileMigrator.idl
-+++ b/toolkit/profile/nsIProfileMigrator.idl
-@@ -37,7 +37,7 @@ interface nsIProfileStartup : nsISupports
- * @client Toolkit (Startup code)
- * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")
- */
--[scriptable, uuid(3df284a5-2258-4d46-a664-761ecdc04c22)]
-+[scriptable, uuid(96d9ab66-082c-4a9e-82ad-f8c21b391342)]
- interface nsIProfileMigrator : nsISupports
- {
- /**
-@@ -60,6 +60,14 @@ interface nsIProfileMigrator : nsISupports
- * @note The startup code ignores COM exceptions thrown from this method.
- */
- void migrate(in nsIProfileStartup aStartup, in ACString aKey);
-+
-+ /**
-+ * Returns whether a given migration type is supported.
-+ *
-+ * @param aKey Migrator key
-+ * @returns whether the migrator key is supported.
-+ */
-+ bool canMigrate(in ACString aKey);
- };
-
- %{C++
-diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 7665de2..4588f4a 100644
---- a/toolkit/xre/nsAppRunner.cpp
-+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3699,7 +3699,7 @@ XREMain::XRE_mainRun()
- if (gDoProfileReset) {
- // Automatically migrate from the current application if we just
- // reset the profile.
-- aKey = MOZ_APP_NAME;
-+ aKey = "self";
- }
- pm->Migrate(&mDirProvider, aKey);
- }
diff --git a/libre-testing/iceweasel-libre/PKGBUILD b/libre-testing/iceweasel-libre/PKGBUILD deleted file mode 100644 index 920a70c83..000000000 --- a/libre-testing/iceweasel-libre/PKGBUILD +++ /dev/null @@ -1,211 +0,0 @@ -# Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org> -# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Figue <ffigue at gmail> -# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> -# Contributor (Parabola): vando <facundo@esdebian.org> -# Contributor (Parabola): André Silva <emulatorman@lavabit.com> -# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> -# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com> -# Thank you very much to the older contributors: -# Contributor: evr <evanroman at gmail> -# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> - -_pgo=true - -# We're getting this from Debian Experimental -_debname=iceweasel -_debver=20.0.1 -_debrel=1 -_debrepo=http://ftp.debian.org/debian/pool/main/ -debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } - -_pkgname=iceweasel -pkgname=iceweasel-libre -pkgver=$_debver.$_debrel -pkgrel=1 - -pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." -arch=(i686 x86_64 mips64el) -license=(MPL GPL LGPL) -depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) -makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 quilt unzip zip) -[ "$CARCH" != "mips64el" ] && makedepends+=('yasm') -if $_pgo; then - makedepends+=(xorg-server-xvfb) - options=(!ccache) -fi - -optdepends=('networkmanager: Location detection via available WiFi networks') -url="http://packages.debian.org/experimental/${_pkgname}" -install=iceweasel.install -replaces=('firefox') -conflicts=('firefox') -provides=('firefox') -source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" - "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz" - mozconfig - mozconfig.pgo - libre.patch - iceweasel.desktop - iceweasel-install-dir.patch - vendor.js - shared-libs.patch - replace-urls.txt - Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('22daa24b6490c654f131550cbf20fad3' - '0c70ab52f35701558081df3d360361a2' - 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' - '383e8e2a97a8b13fe56d153adb6878b6' - '5addd418bf32b673fdfe80c8fefbea1a' - '7b9e5996dd9fe0b186a43a297db1c6b5' - 'abf5ecb74caa857abb42bcfbb3442d9c' - '6dd547c72bb875a3101135a1c32d4783' - '52e52f840a49eb1d14be1c0065b03a93' - 'a8fc4658d45b6bf9350023e5c3f34e56' - 'd0e1f2625cd9f7234abdeb55aee00529') - -prepare() { - export DEBIAN_BUILD="mozilla-release" - - export QUILT_PATCHES=debian/patches - export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' - export QUILT_DIFF_ARGS='--no-timestamps' - - mv debian "$srcdir/$DEBIAN_BUILD" - cd "$srcdir/$DEBIAN_BUILD" - - # Doesn't apply and seems unimportant - rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true - - # This patch doesn't works in some parts due that has patches for others locales languages, source code hasn't it - rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true - - quilt push -a - - patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch - patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname - patch -Np1 -i "$srcdir/shared-libs.patch" - - # Replace common URLs - sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do - if [[ -n $moz_url ]]; then - printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url" - grep -Erl "${moz_url}" \ - --exclude='*.'{patch,orig,rej} \ - --exclude-dir={.pc,test,tests,testing} \ - | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g" - fi - done - - # Patch anything that's left - patch -Np1 -i "$srcdir/libre.patch" - - cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch - - if $_pgo; then - cat "$srcdir/mozconfig.pgo" >> .mozconfig - fi - - # From js on abslibre-mips64el.git - if [ "$CARCH" = "mips64el" ]; then - msg "Force disabling JIT." - sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ - js/src/assembler/wtf/Platform.h - sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.{in,ref} - - echo "ac_add_options --disable-methodjit" >> .mozconfig - echo "ac_add_options --disable-tracejit" >> .mozconfig - fi - - # 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))/' \ - js/src/assembler/wtf/Platform.h - # Disable JIT. - sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ - js/src/assembler/wtf/Platform.h - sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in - echo 'ac_add_options --disable-methodjit' >> .mozconfig - echo 'ac_add_options --disable-tracejit' >> .mozconfig - echo 'ac_add_options --disable-jemalloc' >> .mozconfig - fi - - # Fix PRE_RELEASE_SUFFIX - sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ - browser/base/Makefile.in - - mkdir "$srcdir/path" - - # WebRTC build tries to execute "python" and expects Python 2 - ln -s /usr/bin/python2 "$srcdir/path/python" - - # Use gold, as Mozilla can use some of its features, such as safe ICF - ln -s /usr/bin/ld.gold "$srcdir/path/ld" - - # configure script misdetects the preprocessor without an optimization level - # https://bugs.archlinux.org/task/34644 - sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure -} - -build() { - cd "$srcdir/$DEBIAN_BUILD" - - export PATH="$srcdir/path:$PATH" - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" - export PYTHON="/usr/bin/python2" - export MOZ_MAKE_FLAGS="$MAKEFLAGS" - unset MAKEFLAGS - - if $_pgo; then - # Enable PGO for x86_64 and mips64el only. i686 currently has problems: - # Either segfaults since gcc 4.8, or the linker runs out of memory - # If you discover that PGO again works on i686, please file a bug - if [[ $CARCH != i686 ]]; then - export DISPLAY=:99 - Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & - _fail=0 - - make -f client.mk build MOZ_PGO=1 || _fail=1 - - kill $! || true - return $_fail - else - make -f client.mk build - fi - else - make -f client.mk build - fi -} - -package() { - cd "$srcdir/$DEBIAN_BUILD" - make -j1 -f client.mk DESTDIR="$pkgdir" install - - install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js" - - # I don't even know why we're hitting the objdir, and ConnOS didn't - _brandingdir=debian/branding - brandingdir=moz-objdir/$_brandingdir - icondir="$pkgdir/usr/share/icons/hicolor" - for i in 16x16 32x32 48x48 64x64; do - install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png" - done - install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$_pkgname.png" - install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg" - - install -d "$pkgdir/usr/share/applications" - install -m644 "$srcdir/iceweasel.desktop" "$pkgdir/usr/share/applications" - - rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins} - ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" - ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation" - ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$_pkgname/plugins" - ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins" - - # We don't want the development stuff - rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} - - # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850 - ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin" -} diff --git a/libre-testing/iceweasel-libre/bug677092.patch b/libre-testing/iceweasel-libre/bug677092.patch deleted file mode 100644 index aee09b451..000000000 --- a/libre-testing/iceweasel-libre/bug677092.patch +++ /dev/null @@ -1,330 +0,0 @@ -exporting patch: -# HG changeset patch -# User Axel Hecht <axel@pike.org> -# Date 1348128099 -7200 -# Node ID 812d0ba8317507c4026958a740960384eac1507a -# Parent 97e49e7a33266a0680e5af59289264a07e4321f8 -bug 677092, make language packs restartless, r=Unfocused -Make language packs just trigger the chrome registration hooks, and -disable picking up bootstrap.js, and declare them restartless. - -diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/XPIProvider.jsm ---- a/toolkit/mozapps/extensions/XPIProvider.jsm Wed Sep 26 13:08:50 2012 +0200 -+++ b/toolkit/mozapps/extensions/XPIProvider.jsm Thu Sep 20 10:01:39 2012 +0200 -@@ -740,8 +740,8 @@ - } - } - else { -- // spell check dictionaries never require a restart -- if (addon.type == "dictionary") -+ // spell check dictionaries and language packs never require a restart -+ if (addon.type == "dictionary" || addon.type == "locale") - addon.bootstrap = true; - - // Only extensions are allowed to provide an optionsURL, optionsType or aboutURL. For -@@ -3695,6 +3695,11 @@ - Components.manager.addBootstrappedManifestLocation(aFile); - - try { -+ // Don't call bootstrap.js methods for language packs, -+ // they only contain chrome. -+ if (aType == "locale") -+ return; -+ - // Load the scope if it hasn't already been loaded - if (!(aId in this.bootstrapScopes)) - this.loadBootstrapScope(aId, aFile, aVersion, aType); -diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/toolkit/mozapps/extensions/test/addons/test_langpack/chrome.manifest Thu Sep 20 10:01:39 2012 +0200 -@@ -0,0 +1,1 @@ -+locale test-langpack x-testing locale/x-testing -diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/toolkit/mozapps/extensions/test/addons/test_langpack/install.rdf Thu Sep 20 10:01:39 2012 +0200 -@@ -0,0 +1,23 @@ -+<?xml version="1.0"?> -+ -+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" -+ xmlns:em="http://www.mozilla.org/2004/em-rdf#"> -+ -+ <Description about="urn:mozilla:install-manifest"> -+ <em:id>langpack-x-testing@tests.mozilla.org</em:id> -+ <em:type>8</em:type> -+ <em:version>1.0</em:version> -+ -+ <!-- Front End MetaData --> -+ <em:name>Language Pack x-testing</em:name> -+ -+ <em:targetApplication> -+ <Description> -+ <em:id>xpcshell@tests.mozilla.org</em:id> -+ <em:minVersion>1</em:minVersion> -+ <em:maxVersion>2</em:maxVersion> -+ </Description> -+ </em:targetApplication> -+ -+ </Description> -+</RDF> -diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/xpcshell/test_langpack.js ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/toolkit/mozapps/extensions/test/xpcshell/test_langpack.js Thu Sep 20 10:01:39 2012 +0200 -@@ -0,0 +1,247 @@ -+/* Any copyright is dedicated to the Public Domain. -+ * http://creativecommons.org/publicdomain/zero/1.0/ -+ */ -+ -+// This verifies that language packs can be used without restarts. -+Components.utils.import("resource://gre/modules/Services.jsm"); -+ -+// Enable loading extensions from the user scopes -+Services.prefs.setIntPref("extensions.enabledScopes", -+ AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_USER); -+ -+createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2"); -+ -+const profileDir = gProfD.clone(); -+profileDir.append("extensions"); -+const userExtDir = gProfD.clone(); -+userExtDir.append("extensions2"); -+userExtDir.append(gAppInfo.ID); -+registerDirectory("XREUSysExt", userExtDir.parent); -+ -+var chrome = Components.classes["@mozilla.org/chrome/chrome-registry;1"] -+ .getService(Components.interfaces.nsIXULChromeRegistry); -+ -+function do_check_locale_not_registered(provider) { -+ let didThrow = false; -+ try { -+ chrome.getSelectedLocale(provider); -+ } catch (e) { -+ didThrow = true; -+ } -+ do_check_true(didThrow); -+} -+ -+function run_test() { -+ do_test_pending(); -+ -+ startupManager(); -+ -+ run_test_1(); -+} -+ -+// Tests that installing doesn't require a restart -+function run_test_1() { -+ prepare_test({ }, [ -+ "onNewInstall" -+ ]); -+ -+ AddonManager.getInstallForFile(do_get_addon("test_langpack"), function(install) { -+ ensure_test_completed(); -+ -+ do_check_neq(install, null); -+ do_check_eq(install.type, "locale"); -+ do_check_eq(install.version, "1.0"); -+ do_check_eq(install.name, "Language Pack x-testing"); -+ do_check_eq(install.state, AddonManager.STATE_DOWNLOADED); -+ do_check_true(install.addon.hasResource("install.rdf")); -+ do_check_false(install.addon.hasResource("bootstrap.js")); -+ do_check_eq(install.addon.operationsRequiringRestart & -+ AddonManager.OP_NEEDS_RESTART_INSTALL, 0); -+ -+ let addon = install.addon; -+ prepare_test({ -+ "langpack-x-testing@tests.mozilla.org": [ -+ ["onInstalling", false], -+ "onInstalled" -+ ] -+ }, [ -+ "onInstallStarted", -+ "onInstallEnded", -+ ], function() { -+ do_check_true(addon.hasResource("install.rdf")); -+ check_test_1(); -+ }); -+ install.install(); -+ }); -+} -+ -+function check_test_1() { -+ AddonManager.getAllInstalls(function(installs) { -+ // There should be no active installs now since the install completed and -+ // doesn't require a restart. -+ do_check_eq(installs.length, 0); -+ -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { -+ do_check_neq(b1, null); -+ do_check_eq(b1.version, "1.0"); -+ do_check_false(b1.appDisabled); -+ do_check_false(b1.userDisabled); -+ do_check_true(b1.isActive); -+ // check chrome reg that language pack is registered -+ do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing"); -+ do_check_true(b1.hasResource("install.rdf")); -+ do_check_false(b1.hasResource("bootstrap.js")); -+ -+ let dir = do_get_addon_root_uri(profileDir, "langpack-x-testing@tests.mozilla.org"); -+ -+ AddonManager.getAddonsWithOperationsByTypes(null, function(list) { -+ do_check_eq(list.length, 0); -+ -+ run_test_2(); -+ }); -+ }); -+ }); -+} -+ -+// Tests that disabling doesn't require a restart -+function run_test_2() { -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { -+ prepare_test({ -+ "langpack-x-testing@tests.mozilla.org": [ -+ ["onDisabling", false], -+ "onDisabled" -+ ] -+ }); -+ -+ do_check_eq(b1.operationsRequiringRestart & -+ AddonManager.OP_NEEDS_RESTART_DISABLE, 0); -+ b1.userDisabled = true; -+ ensure_test_completed(); -+ -+ do_check_neq(b1, null); -+ do_check_eq(b1.version, "1.0"); -+ do_check_false(b1.appDisabled); -+ do_check_true(b1.userDisabled); -+ do_check_false(b1.isActive); -+ // check chrome reg that language pack is not registered -+ do_check_locale_not_registered("test-langpack"); -+ -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) { -+ do_check_neq(newb1, null); -+ do_check_eq(newb1.version, "1.0"); -+ do_check_false(newb1.appDisabled); -+ do_check_true(newb1.userDisabled); -+ do_check_false(newb1.isActive); -+ -+ run_test_3(); -+ }); -+ }); -+} -+ -+// Test that restarting doesn't accidentally re-enable -+function run_test_3() { -+ shutdownManager(); -+ startupManager(false); -+ // check chrome reg that language pack is not registered -+ do_check_locale_not_registered("test-langpack"); -+ -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { -+ do_check_neq(b1, null); -+ do_check_eq(b1.version, "1.0"); -+ do_check_false(b1.appDisabled); -+ do_check_true(b1.userDisabled); -+ do_check_false(b1.isActive); -+ -+ run_test_4(); -+ }); -+} -+ -+// Tests that enabling doesn't require a restart -+function run_test_4() { -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { -+ prepare_test({ -+ "langpack-x-testing@tests.mozilla.org": [ -+ ["onEnabling", false], -+ "onEnabled" -+ ] -+ }); -+ -+ do_check_eq(b1.operationsRequiringRestart & -+ AddonManager.OP_NEEDS_RESTART_ENABLE, 0); -+ b1.userDisabled = false; -+ ensure_test_completed(); -+ -+ do_check_neq(b1, null); -+ do_check_eq(b1.version, "1.0"); -+ do_check_false(b1.appDisabled); -+ do_check_false(b1.userDisabled); -+ do_check_true(b1.isActive); -+ // check chrome reg that language pack is registered -+ do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing"); -+ -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) { -+ do_check_neq(newb1, null); -+ do_check_eq(newb1.version, "1.0"); -+ do_check_false(newb1.appDisabled); -+ do_check_false(newb1.userDisabled); -+ do_check_true(newb1.isActive); -+ -+ run_test_5(); -+ }); -+ }); -+} -+ -+// Tests that a restart shuts down and restarts the add-on -+function run_test_5() { -+ shutdownManager(); -+ startupManager(false); -+ // check chrome reg that language pack is registered -+ do_check_eq(chrome.getSelectedLocale("test-langpack"), "x-testing"); -+ -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { -+ do_check_neq(b1, null); -+ do_check_eq(b1.version, "1.0"); -+ do_check_false(b1.appDisabled); -+ do_check_false(b1.userDisabled); -+ do_check_true(b1.isActive); -+ do_check_false(isExtensionInAddonsList(profileDir, b1.id)); -+ -+ run_test_7(); -+ }); -+} -+ -+// Tests that uninstalling doesn't require a restart -+function run_test_7() { -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { -+ prepare_test({ -+ "langpack-x-testing@tests.mozilla.org": [ -+ ["onUninstalling", false], -+ "onUninstalled" -+ ] -+ }); -+ -+ do_check_eq(b1.operationsRequiringRestart & -+ AddonManager.OP_NEEDS_RESTART_UNINSTALL, 0); -+ b1.uninstall(); -+ -+ check_test_7(); -+ }); -+} -+ -+function check_test_7() { -+ ensure_test_completed(); -+ // check chrome reg that language pack is not registered -+ do_check_locale_not_registered("test-langpack"); -+ -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(b1) { -+ do_check_eq(b1, null); -+ -+ restartManager(); -+ -+ AddonManager.getAddonByID("langpack-x-testing@tests.mozilla.org", function(newb1) { -+ do_check_eq(newb1, null); -+ -+ do_test_finished(); -+ }); -+ }); -+} -diff -r 97e49e7a3326 -r 812d0ba83175 toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini ---- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini Wed Sep 26 13:08:50 2012 +0200 -+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini Thu Sep 20 10:01:39 2012 +0200 -@@ -139,6 +139,7 @@ - [test_corrupt_strictcompat.js] - [test_db_sanity.js] - [test_dictionary.js] -+[test_langpack.js] - [test_disable.js] - [test_distribution.js] - [test_dss.js] diff --git a/libre-testing/iceweasel-libre/firefox.install b/libre-testing/iceweasel-libre/firefox.install deleted file mode 100644 index 1a1f4b16b..000000000 --- a/libre-testing/iceweasel-libre/firefox.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - diff --git a/libre-testing/iceweasel-libre/iceweasel-install-dir.patch b/libre-testing/iceweasel-libre/iceweasel-install-dir.patch deleted file mode 100644 index a44aef496..000000000 --- a/libre-testing/iceweasel-libre/iceweasel-install-dir.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/baseconfig.mk ---- iceweasel-16.0.1.orig/config/baseconfig.mk 2012-10-10 19:42:45.000000000 -0200 -+++ iceweasel-16.0.1/config/baseconfig.mk 2012-10-12 05:40:32.346949927 -0200 -@@ -1,10 +1,10 @@ - INCLUDED_AUTOCONF_MK = 1 - - MOZ_APP_BASE_VERSION = $(firstword $(subst ., ,$(MOZ_APP_VERSION))).$(word 2,$(subst ., ,$(MOZ_APP_VERSION))) --includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION) -+includedir := $(includedir)/$(MOZ_APP_NAME) -+idldir = $(datadir)/idl/$(MOZ_APP_NAME) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - DIST = $(DEPTH)/dist - - # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't -diff -Nur iceweasel-16.0.1.orig/js/src/config/baseconfig.mk iceweasel-16.0.1/js/src/config/baseconfig.mk ---- iceweasel-16.0.1.orig/js/src/config/baseconfig.mk 2012-10-10 19:43:05.000000000 -0200 -+++ iceweasel-16.0.1/js/src/config/baseconfig.mk 2012-10-12 05:08:23.064066227 -0200 -@@ -1,7 +1,7 @@ - INCLUDED_AUTOCONF_MK = 1 - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - - ifneq (,$(filter /%,$(TOP_DIST))) - DIST = $(TOP_DIST) diff --git a/libre-testing/iceweasel-libre/iceweasel.desktop b/libre-testing/iceweasel-libre/iceweasel.desktop deleted file mode 100644 index c4a338cc6..000000000 --- a/libre-testing/iceweasel-libre/iceweasel.desktop +++ /dev/null @@ -1,105 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Iceweasel -Name[bg]=Iceweasel -Name[ca]=Iceweasel -Name[cs]=Iceweasel -Name[el]=Iceweasel -Name[es]=Iceweasel -Name[fa]=Iceweasel -Name[fi]=Iceweasel -Name[fr]=Iceweasel -Name[hu]=Iceweasel -Name[it]=Iceweasel -Name[ja]=Iceweasel -Name[ko]=Iceweasel -Name[nb]=Iceweasel -Name[nl]=Iceweasel -Name[nn]=Iceweasel -Name[no]=Iceweasel -Name[pl]=Iceweasel -Name[pt]=Iceweasel -Name[pt_BR]=Iceweasel -Name[ru]=Iceweasel -Name[sk]=Iceweasel -Name[sv]=Iceweasel -Comment=Browse the World Wide Web -Comment[bg]=Сърфиране в Мрежата -Comment[ca]=Navegueu per el web -Comment[cs]=Prohlížení stránek World Wide Webu -Comment[de]=Im Internet surfen -Comment[el]=Περιηγηθείτε στον παγκόσμιο ιστό -Comment[es]=Navegue por la web -Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید -Comment[fi]=Selaa Internetin WWW-sivuja -Comment[fr]=Navigue sur Internet -Comment[hu]=A világháló böngészése -Comment[it]=Esplora il web -Comment[ja]=ウェブを閲覧します -Comment[ko]=웹을 돌아 다닙니다 -Comment[nb]=Surf på nettet -Comment[nl]=Verken het internet -Comment[nn]=Surf på nettet -Comment[no]=Surf på nettet -Comment[pl]=Przeglądanie stron WWW -Comment[pt]=Navegue na Internet -Comment[pt_BR]=Navegue na Internet -Comment[ru]=Обозреватель Всемирной Паутины -Comment[sk]=Prehliadanie internetu -Comment[sv]=Surfa på webben -GenericName=Web Browser -GenericName[bg]=Интернет браузър -GenericName[ca]=Navegador web -GenericName[cs]=Webový prohlížeč -GenericName[de]=Webbrowser -GenericName[el]=Περιηγητής ιστού -GenericName[es]=Navegador web -GenericName[fa]=مرورگر اینترنتی -GenericName[fi]=WWW-selain -GenericName[fr]=Navigateur Web -GenericName[hu]=Webböngésző -GenericName[it]=Browser Web -GenericName[ja]=ウェブ・ブラウザ -GenericName[ko]=웹 브라우저 -GenericName[nb]=Nettleser -GenericName[nl]=Webbrowser -GenericName[nn]=Nettlesar -GenericName[no]=Nettleser -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador Web -GenericName[ru]=Интернет-браузер -GenericName[sk]=Internetový prehliadač -GenericName[sv]=Webbläsare -X-GNOME-FullName=Iceweasel Web Browser -X-GNOME-FullName[bg]=Интернет браузър (Iceweasel) -X-GNOME-FullName[ca]=Navegador web Iceweasel -X-GNOME-FullName[cs]=Iceweasel Webový prohlížeč -X-GNOME-FullName[el]=Περιηγήτης Ιστού Iceweasel -X-GNOME-FullName[es]=Navegador web Iceweasel -X-GNOME-FullName[fa]=مرورگر اینترنتی Iceweasel -X-GNOME-FullName[fi]=Iceweasel-selain -X-GNOME-FullName[fr]=Navigateur Web Iceweasel -X-GNOME-FullName[hu]=Iceweasel webböngésző -X-GNOME-FullName[it]=Iceweasel Browser Web -X-GNOME-FullName[ja]=Iceweasel ウェブ・ブラウザ -X-GNOME-FullName[ko]=Iceweasel 웹 브라우저 -X-GNOME-FullName[nb]=Iceweasel Nettleser -X-GNOME-FullName[nl]=Iceweasel webbrowser -X-GNOME-FullName[nn]=Iceweasel Nettlesar -X-GNOME-FullName[no]=Iceweasel Nettleser -X-GNOME-FullName[pl]=Przeglądarka WWW Iceweasel -X-GNOME-FullName[pt]=Iceweasel Navegador Web -X-GNOME-FullName[pt_BR]=Navegador Web Iceweasel -X-GNOME-FullName[ru]=Интернет-браузер Iceweasel -X-GNOME-FullName[sk]=Internetový prehliadač Iceweasel -X-GNOME-FullName[sv]=Webbläsaren Iceweasel -Exec=/usr/lib/iceweasel/iceweasel %u -Terminal=false -X-MultipleArgs=false -Type=Application -Icon=iceweasel -Categories=Network;WebBrowser; -MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https; -StartupWMClass=Iceweasel -StartupNotify=true diff --git a/libre-testing/iceweasel-libre/iceweasel.install b/libre-testing/iceweasel-libre/iceweasel.install deleted file mode 100644 index c1fe8284a..000000000 --- a/libre-testing/iceweasel-libre/iceweasel.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} - diff --git a/libre-testing/iceweasel-libre/libre.patch b/libre-testing/iceweasel-libre/libre.patch deleted file mode 100644 index 9d2aa7c05..000000000 --- a/libre-testing/iceweasel-libre/libre.patch +++ /dev/null @@ -1,262 +0,0 @@ -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-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); - --// 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); -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 -@@ -5,70 +5,41 @@ - // If a definition requires additional params, check that the final search url - // is handled correctly by the engine. - const SEARCH_ENGINES = { -- "Google": { -+ "DuckDuckGo HTML": { - image: "data:image/png;base64," + -- "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" --#ifdef XP_MACOSX -- , imageHD: "data:image/png;base64,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" --#endif -- , params: "source=hp&channel=np" -+ "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" - } - }; - -@@ -78,7 +49,7 @@ - // * add an entry here in the proper ordering (based on spans) - // The <a/> part of the snippet will be linked to the corresponding url. - const DEFAULT_SNIPPETS_URLS = [ -- "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1" -+ "http://packages.debian.org/experimental/iceweasel" - , "https://www.gnu.org/software/gnuzilla/addons.html" - ]; - -@@ -141,10 +112,6 @@ - if (searchEngineInfo.image) { - let logoElt = document.getElementById("searchEngineLogo"); - logoElt.src = searchEngineInfo.image; --#ifdef XP_MACOSX -- if (searchEngineInfo.imageHD && window.matchMedia("(min-resolution: 2dppx)")) -- logoElt.src = searchEngineInfo.imageHD; --#endif - logoElt.alt = searchEngineName; - } - -diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css 2013-01-04 21:44:27.000000000 -0200 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2013-01-10 01:35:44.497079456 -0200 -@@ -66,8 +66,7 @@ - #searchEngineLogo { - display: inline-block; - height: 28px; -- width: 70px; -- min-width: 70px; -+ width: 47px; - } - - #searchText { -diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties ---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-02-15 19:14:45.000000000 -0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-02-20 19:55:41.962705914 -0200 -@@ -3,19 +3,12 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - # Default search engine --browser.search.defaultenginename=Google -+browser.search.defaultenginename=DuckDuckGo HTML - - # Search engine order (order displayed in the search bar dropdown)s --browser.search.order.1=Google --browser.search.order.2=Yahoo --browser.search.order.3=Bing -- --# This is the default set of web based feed handlers shown in the reader --# selection UI --browser.contentHandlers.types.0.title=Google --browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s --browser.contentHandlers.types.1.title=My Yahoo! --browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s -+browser.search.order.1=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=Seeks Search - - # increment this number when anything gets changed in the list below. This will - # cause Firefox to re-read these prefs and inject any new handlers into the -@@ -24,20 +17,10 @@ - # don't make any spelling errors here. - gecko.handlerService.defaultHandlersVersion=3 - --# The default set of protocol handlers for webcal: --gecko.handlerService.schemes.webcal.0.name=30 Boxes --gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s -- --# The default set of protocol handlers for mailto: --gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail --gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s --gecko.handlerService.schemes.mailto.1.name=Gmail --gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s -- - # The default set of protocol handlers for irc: --gecko.handlerService.schemes.irc.0.name=Mibbit --gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.irc.0.name=Freenode Web IRC -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net - - # The default set of protocol handlers for ircs: --gecko.handlerService.schemes.ircs.0.name=Mibbit --gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net -diff -ruN mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul ---- mozilla-release.orig/dom/ipc/test.xul 2013-01-04 18:44:31.000000000 -0500 -+++ mozilla-release/dom/ipc/test.xul 2013-01-10 18:19:26.000000000 -0500 -@@ -299,6 +299,6 @@ - oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> - </toolbar> - -- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/> -+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/> - <label id="messageLog" value="" crop="center"/> - </window> -diff -ruN mozilla-release.orig/layout/ipc/test-ipcbrowser.xul mozilla-release/layout/ipc/test-ipcbrowser.xul ---- mozilla-release.orig/layout/ipc/test-ipcbrowser.xul 2013-01-04 18:44:37.000000000 -0500 -+++ mozilla-release/layout/ipc/test-ipcbrowser.xul 2013-01-10 18:20:03.000000000 -0500 -@@ -73,6 +73,6 @@ - label="setViewportScale"/> - </toolbar> - -- <browser type="content" src="http://www.google.com/" flex="1" id="content" -+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content" - remote="true"/> - </window> -diff -urN mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in ---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300 -+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2012-06-15 22:54:08.446274144 -0300 -@@ -11,13 +11,20 @@ - <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> - <DD>@bookmarks_toolbarfolder_description@ - <DL><p> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A> -+ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D" ID="rdf:#$GvPhC3">Parabola GNU/Linux-libre</A> - </DL><p> -- <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3> -+ <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3> - <DL><p> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A> -+ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre</A> -+ <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Packages</A> -+ <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Wiki</A> -+ <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Labs</A> -+ </DL><p> -+ <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3> -+ <DL><p> -+ <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A> -+ <DT><A HREF="http://libreplanet.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC/v78AAAAAAPLy9ABsbakA/f3+APn5+QC6ur0A6urqAEpLbQACBLQApKW3AAULuQDMzMwAGBiDAL29vQCgocsAgnzJALu82QA+PpsAAQOvAOjo6ADZ2dkAysrKALS0zwD5+foAAgKRAAYGdQD19fUADhOjAAQJyACrnqIAxMTLAOnp7gDm5uYAzczNACgobwDg2dEAQkaeAA0RkAAUFnEA0MvQAIBzgAANDYsAk5OyAOTk5ADy8vYA1dXVAD8/cADGxsYA+fn7AAMHvgBzZnQApqauAAEGuQDExMQAAAGmAAoLmgADCMQAxMTdAAwPlwD+/v4ABg7MAF5ehADg4OAA0dHRAAAAoQAYEXAAwsLCALCxwQBnadkAAQGWAPz8/ACgoLgAbm6RANvb5wDr6+sA0dHSALe3uQADB8AAzc3NAGFhbAABAZcAOTtlALi4xwAAAJoA/Pz9AAQHnwADBJcACQl4AFVa3AChl6EAAgW2ABscdAABAq4A2NjYAAAAmwDAwMoAAQKmAAcMswDR0eQAAQSxANvX2wB4aXcAAQGpAAAAkwDW1tYAAgSpACIZZAAAAaEA+vr8AKuirAACBbcA8vLyALOztgADBZYAAACcAAACpwAEA6QAAQKnAPT09QD///8AvL3UADIpigDw8PAABwWOAK6dogBub4kAiozDANLS0gAFC8gAAgW4AP39/QAAAJ0A0NDQAMHBwQDp6ewACg2RAAIFqAAKCokA+/v7AAkOnwAAAaMA7OzsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4eHh4eHh4eHh4eHh4AXh4eHhlbikzZlooeHh4eAF4eHh4hX1JVFweInh4eHgBeHh4XmlAGXNGSB8VeHh4AXg8LhaGcV9zKg0wQF54eAF4K0NNOGthjXNCUwAMS3gBPC82iW+CCRN2Iz4wTwx4AW0GgCc5OU41VnSKTBoOiwEFTz8hHIF5RANdQVRfNIMBeBUhe0o9jB0Pcjdzc1E8AXgsB3AbUlkQRVtnhHNoeAF4i45wJCAlYjJbdYRfY3gBeDwmEn4XMToKZDd6WDx4AXh4VTsIfwt3FGpsfAR4eAF4eHgEEYhQAodXYDx4eHgBeHh4eHg8GC1HPHh4eHh4AQABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAA%3D">LibrePlanet</A> -+ <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</A> -+ <DT><A HREF="http://www.h-node.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC7zrYAWYhNANjj1QA9fEcAEEwBAHTQkwAeVRkAPXMvALvOtwASVQEAHFcUAH/bpgB60p8AKnQmAGO1fgAjaRwALmA1AA5EAQDM2sgAN3ApAG7EjgC5zbQAVJxrAChwIgC0ya8ALmczAHXJmQBNf0EAgd6oADhwKgC8z7cA7vPtANTg0QANPwAARIhSADtyLQBzzpQAus21AEeKVQDC070AieyzALzPuAB93qEALGYvAO/z7gBEiVAAasWFAFuJTwBKil4AXotSAEuKXgAORQEAD0gBABlDFwBWpmoALGYwAGCNVQAbYBAAHGAQABBOAQCI6rIAjPG3AB1bDgAaXg4A////AGaRWwB/2qYAUYJEAEx+PwAZXAwAm7eUAD51MADN28oAJmwhACRiFAAzeTYAasaFAB9eDwBkt34Aus62AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPT09PT09PT09PT09PT09PT09PT0OIjALPRQmMkI9PT09PT09OkcHNQU+Q0oQPT09PT09PToVGDQtI0ABKz09PT09PT06JRg0Nh1ALxk9PT09PT09OiUYIS4TQC83PT09PT09PTpPSDsGG0BEAz09PT09PT06T0BGMRIsTRY9PT09PT09OgACJx8gQwooPT09PT09PToICAkJCUkkPT09PT09PT05HggETio9PT09PT09PT09Px4IERw9PT09PT09PT09PUUpCDMMPT09PT09PT09PT0NOEEEGj09PT09PT09PT09TBcPSzw9PT09PT09PT09PT09PT09PT09PT09PQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%3D">h-node</A> - </DL><p> - </DL><p> diff --git a/libre-testing/iceweasel-libre/mozconfig b/libre-testing/iceweasel-libre/mozconfig deleted file mode 100644 index c929b8972..000000000 --- a/libre-testing/iceweasel-libre/mozconfig +++ /dev/null @@ -1,39 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib - -# Iceweasel -ac_add_options --disable-official-branding -ac_add_options --with-branding=debian/branding - -# System libraries -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-bz2 -ac_add_options --with-system-png -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx -ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite -ac_add_options --enable-system-ffi -#ac_add_options --enable-system-cairo -ac_add_options --enable-system-pixman -ac_add_options --with-pthreads - -# Features -ac_add_options --enable-startup-notification -#ac_add_options --enable-gstreamer - -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-tests -ac_add_options --disable-installer - -# Parabola features -ac_add_options --disable-safe-browsing - -# Other -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir diff --git a/libre-testing/iceweasel-libre/mozconfig.pgo b/libre-testing/iceweasel-libre/mozconfig.pgo deleted file mode 100644 index 2f4ebe32b..000000000 --- a/libre-testing/iceweasel-libre/mozconfig.pgo +++ /dev/null @@ -1,3 +0,0 @@ - -# PGO -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10' diff --git a/libre-testing/iceweasel-libre/replace-urls.txt b/libre-testing/iceweasel-libre/replace-urls.txt deleted file mode 100644 index fc13e32fb..000000000 --- a/libre-testing/iceweasel-libre/replace-urls.txt +++ /dev/null @@ -1,25 +0,0 @@ -# These are replaced in order, so if one is a subset of another, the smaller one should be last -# These are whitespace-separated EREs, comments are lines starting with '#' - -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)? https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell- -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://gnuzilla.gnu.org/plugins/ -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#themes -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://www.gnu.org/software/gnuzilla/addons.html" -https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://www.gnu.org/software/gnuzilla/addons.html - -https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html - -https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/ - -https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php https://gnuzilla.gnu.org/plugins/PluginFinderService.php -#https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php -#https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php - -"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html" - -# hack: these aren't URLs, per se -(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html diff --git a/libre-testing/iceweasel-libre/shared-libs.patch b/libre-testing/iceweasel-libre/shared-libs.patch deleted file mode 100644 index 1f22b2b0d..000000000 --- a/libre-testing/iceweasel-libre/shared-libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in ---- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000 -+++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000 -@@ -50,7 +50,7 @@ - MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in - # Some files have been already bundled with xulrunner - ifndef SYSTEM_LIBXUL --MOZ_PKG_FATAL_WARNINGS = 1 -+MOZ_PKG_FATAL_WARNINGS = 0 - endif - - MOZ_NONLOCALIZED_PKG_LIST = \ diff --git a/libre-testing/iceweasel-libre/vendor.js b/libre-testing/iceweasel-libre/vendor.js deleted file mode 100644 index 865bfaec7..000000000 --- a/libre-testing/iceweasel-libre/vendor.js +++ /dev/null @@ -1,18 +0,0 @@ -// Use LANG environment variable to choose locale -pref("intl.locale.matchOS", true); - -// Disable default browser checking. -pref("browser.shell.checkDefaultBrowser", false); - -// Don't disable our bundled extensions in the application directory -pref("extensions.autoDisableScopes", 11); -pref("extensions.shownSelectionUI", true); - -// Make sure that safebrowsing is disabled -pref("browser.safebrowsing.enabled", false); -pref("browser.safebrowsing.malware.enabled", false); - -pref("keyword.URL", ""); -pref("app.update.enabled", false); -pref("app.update.auto", false); -pref("dom.storage.enabled", false); diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 70118c9e2..789a3fdd9 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 182034 2013-04-05 19:01:42Z andyrtr $ +# $Id: PKGBUILD 182682 2013-04-12 14:56:52Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.33 -pkgrel=1 +pkgver=1.0.34 +pkgrel=2 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') -depends=('lcms2' 'poppler>=0.22.2' 'qpdf>=4.0.0') +depends=('lcms2' 'poppler>=0.22.3' 'qpdf>=4.0.0') makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' @@ -19,7 +19,7 @@ backup=(etc/fonts/conf.d/99pdftoopvp.conf options=(!libtool) source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz cups-browsed.service) -md5sums=('e35e497cbdb61ee29d9e7ffa58317c23' +md5sums=('fea9cad6bbb14ab0635243ed5d1d5c77' '4c9f97eae201798000483c4e7109e690') replaces=("${_pkgname}") conflicts=("${_pkgname}") diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 30a1b6f05..21ab61b28 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180013 2013-03-14 18:45:58Z andyrtr $ +# $Id: PKGBUILD 182674 2013-04-12 14:26:14Z andyrtr $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> @@ -6,9 +6,9 @@ _pkgname=hplip pkgname=hplip-libre -pkgver=3.13.3 -pkgrel=2 -pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)" +pkgver=3.13.4 +pkgrel=1 +pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation" arch=('i686' 'x86_64') url="http://hplipopensource.com" license=('GPL') @@ -30,10 +30,12 @@ provides=$_pkgname=$pkgver options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} - cups-1.6-buildfix.diff) -md5sums=('4a378cc08f7a4f131968c0966c1ceb8c' - 'f37ad6d95a36d7547a2c60374fc4d1ec' - 'ef64578c6cb3ce252dbdcb0f1c2f4a47') + cups-1.6-buildfix.diff + hp-mkuri.patch) +md5sums=('e5c247161e2fd7685e0520e968393d19' + 'SKIP' + 'ef64578c6cb3ce252dbdcb0f1c2f4a47' + '0bd7779fdbc4d7a9386df04dce2cb8d4') build() { cd "$srcdir/$_pkgname-$pkgver" @@ -41,6 +43,9 @@ build() { # fix build with cups 1.6 - FC hplip-ipp-accessors.patch patch -p1 -i "${srcdir}/cups-1.6-buildfix.diff" + # fix linking libnotify, FS#34283 + patch -Np0 -i ${srcdir}/hp-mkuri.patch + export PYTHON=python2 find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + diff --git a/libre/hplip-libre/hp-mkuri.patch b/libre/hplip-libre/hp-mkuri.patch new file mode 100644 index 000000000..518e7608f --- /dev/null +++ b/libre/hplip-libre/hp-mkuri.patch @@ -0,0 +1,11 @@ +--- io/hpmud/hp-mkuri.c.orig 2013-03-17 09:15:15.360624061 -0400 ++++ io/hpmud/hp-mkuri.c 2013-03-17 09:15:30.924316847 -0400 +@@ -266,7 +266,7 @@ + + /* Bypass glib build dependencies by loading libnotify manually. */ + +- if ((handle = load_library("libnotify.so.1")) == NULL) ++ if ((handle = load_library("libnotify.so.4")) == NULL) + { + BUG("failed to open libnotify: %m\n"); + goto bugout; diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index b86107e16..aeb4d528f 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=5 +pkgrel=6 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -31,23 +31,21 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" libre.patch) md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908' '1fb9c4affad5f030c4e3544aadeaeea2' - '60ba9e8f2fafd20e41268af534a55ea7' + '70575e76b339fa7e17274a8ed84429fc' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' 'c395d443a8c4c16880c7322bcf174743' 'e6e4a2b5b5976404d7d54c21f9d1c2c3') -build() { - export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}" - export MOZ_MAKE_FLAGS="$MAKEFLAGS" - unset MAKEFLAGS +prepare() { + export DEBIAN_BUILD="comm-release" + export DEBIAN_BRANDING_DIR="debian/branding" + + export ICEAPE_ICONS_BRANDING="suite/branding/nightly" export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' - 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}" @@ -97,8 +95,21 @@ build() { # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure +} + +build() { + cd "${srcdir}/${DEBIAN_BUILD}" + + export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}" + export MOZ_MAKE_FLAGS="$MAKEFLAGS" + unset MAKEFLAGS + + # Don't exit with error when some libs are missing which we have in + # system. + sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \ + -i suite/installer/Makefile.in - make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" + make -j1 -f client.mk build } package() { diff --git a/libre/iceape-libre/mozconfig b/libre/iceape-libre/mozconfig index 5227d77a5..3093d20ee 100644 --- a/libre/iceape-libre/mozconfig +++ b/libre/iceape-libre/mozconfig @@ -1,9 +1,12 @@ -mk_add_options MOZ_CO_PROJECT=suite ac_add_options --enable-application=suite ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib +# Iceape +ac_add_options --disable-official-branding +ac_add_options --with-branding=debian/branding + # System libraries ac_add_options --with-system-nspr ac_add_options --with-system-nss @@ -16,46 +19,20 @@ ac_add_options --with-system-libvpx ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi -ac_add_options --enable-system-cairo +#ac_add_options --enable-system-cairo ac_add_options --with-pthreads # Features ac_add_options --enable-startup-notification -ac_add_options --disable-safe-browsing ac_add_options --enable-gio ac_add_options --disable-gnomevfs ac_add_options --disable-crashreporter ac_add_options --disable-updater ac_add_options --disable-tests -ac_add_options --disable-mochitest ac_add_options --disable-installer -# Optimization -ac_add_options --enable-optimize - export MOZILLA_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 -# Parabola -export BUILD_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 - -# Debian -ac_add_options --with-default-mozilla-five-home=/usr/lib/iceape -ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --disable-official-branding -ac_add_options --with-branding=debian/branding -ac_add_options --enable-pango -ac_add_options --enable-svg -ac_add_options --enable-mathml -ac_add_options --disable-pedantic -ac_add_options --disable-long-long-warning -ac_add_options --disable-debug -ac_add_options --enable-canvas -ac_add_options --enable-extensions="default,-venkman,-inspector" -ac_add_options --disable-elf-dynstr-gc -ac_add_options --disable-strip -ac_add_options --disable-install-strip -ac_add_options --enable-crypto -ac_add_options --disable-javaxpcom +# Parabola features +ac_add_options --disable-safe-browsing diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index bf16eca0b..d32a96d52 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -10,56 +10,22 @@ # Contributor: evr <evanroman at gmail> # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> -# If you are updating this package, don't forget to update the version number in -# the value for 'browser.dictionaries.download.url' in 'libre.patch' +_pgo=true -_pgo=false pkgname=icecat pkgver=17.0.1 pkgrel=7 pkgdesc='GNU IceCat, the standalone web browser based on Mozilla Firefox.' arch=(i686 x86_64 mips64el) license=(MPL GPL LGPL) -depends=( - alsa-lib - dbus-glib - desktop-file-utils - gtk2 - hicolor-icon-theme - hunspell - libevent - libnotify - libvpx - libxt - mime-types - mozilla-common - mozilla-searchplugins - 'nss>=3.13.3' - sqlite3 - startup-notification -) -makedepends=( - autoconf2.13 - diffutils - imagemagick - libidl2 - librsvg - libxslt - mesa - pkg-config - python2 - unzip - wireless_tools - zip -) -optdepends=( - 'wireless_tools: Location detection via available WiFi networks' -) +depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) +makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 unzip zip) +options=(!emptydirs) if $_pgo; then makedepends+=(xorg-server-xvfb) - options=(!ccache) + options+=(!ccache) fi -options=(!emptydirs) +optdepends=('networkmanager: Location detection via available WiFi networks') url=http://www.gnu.org/software/gnuzilla/ install=$pkgname.install source=( @@ -76,8 +42,8 @@ source=( ) md5sums=( c88a29aa92fc41a07e777a0e63ac5f7e - 2a35cf0054d0459993e3c3bae3d9841d - dfeb4ab2c96aae3356a4c347eee0b97b + 855f11c20d38133d107cc3c6f48162a8 + 383e8e2a97a8b13fe56d153adb6878b6 3009b176cc5f9b1e416b1bf7c45b064b 1dec37a964098fb3bc46bc767a5c0587 b41f82994fa056ffa5f8e6d99570e27a @@ -87,18 +53,7 @@ md5sums=( #c8552d030494443218d88792f4dbbd0f ) -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 - +prepare() { mv $pkgname-$pkgver $srcdir/gnuzilla-build cd $srcdir/gnuzilla-build @@ -107,6 +62,7 @@ build() { if $_pgo; then cat $srcdir/mozconfig.pgo >> .mozconfig fi + patch -Np1 -i $srcdir/$pkgname-install-dir.patch # install to /usr/lib/$pkgname patch -Np1 -i $srcdir/xulrunner-copy-stub.patch # small fix patch -Np1 -i $srcdir/libre.patch # Remove Google+Mozilla stuff @@ -116,10 +72,6 @@ build() { sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \ browser/installer/Makefile.in - # Fix PRE_RELEASE_SUFFIX - sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ - browser/base/Makefile.in - # This is a bug, we should fix it if [ $CARCH = mips64el ]; then # Fix MIPS N32 support. @@ -136,16 +88,42 @@ build() { chmod +x build/unix/run-icecat.sh # fix bug for bad file permition + # Fix PRE_RELEASE_SUFFIX + sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ + browser/base/Makefile.in + + mkdir "$srcdir/path" + + # WebRTC build tries to execute "python" and expects Python 2 + ln -s /usr/bin/python2 "$srcdir/path/python" + # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 - sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + # TODO: re-enable when we're building with GCC >= 4.8 again + #sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure +} + +build() { + cd $srcdir/gnuzilla-build + + export PATH="$srcdir/path:$PATH" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" + export PYTHON="/usr/bin/python2" + export MOZ_MAKE_FLAGS="$MAKEFLAGS" + unset MAKEFLAGS 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 + # Enable PGO + export DISPLAY=:99 + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + _fail=0 + + make -f client.mk build MOZ_PGO=1 || _fail=1 + kill $! || true + return $_fail else - LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS + make -f client.mk build fi } diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index 7b27e3c6a..75b61828a 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -4,9 +4,6 @@ ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib # IceCat -export MOZ_PHOENIX=1 -mk_add_options MOZ_PHOENIX=1 - ac_add_options --disable-official-branding ac_add_options --with-branding=browser/branding/unofficial ac_add_options --with-distribution-id=org.gnu.gnuzilla diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo index 30464c38c..2f4ebe32b 100644 --- a/libre/icecat/mozconfig.pgo +++ b/libre/icecat/mozconfig.pgo @@ -1,5 +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 90aa96d1a..a6825ea97 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-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 Icedove, the standalone mail/news reader based on Mozilla Thunderbird." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -35,7 +35,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" options=(!emptydirs) md5sums=('26ce85189f3b55cc2c97c57e18c1e2de' 'fafa558c1940a48c3f29de61dc27d737' - 'd6d58d3104a44624e0a3d227cdf1c211' + '5cf95ea94f69cdd36604890cfbf7b954' '476ec205162340fb0679f522c9d31c3b' '4eecc4fc5aafaf0da651a09eadc90bee' 'c4ed43e85945e180a89cce03e45ec62c' @@ -43,14 +43,12 @@ md5sums=('26ce85189f3b55cc2c97c57e18c1e2de' 'e785e0c267f4435ae1a9aa0b03bcacfb' 'ea5f7a06967f561d47d7e5c35b23de6f') -build() { - export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}" - export PYTHON="/usr/bin/python2" +prepare() { + export DEBIAN_BUILD="comm-esr17" export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' - export DEBIAN_BUILD="comm-esr17" mv debian "${srcdir}/${DEBIAN_BUILD}" cd "${srcdir}/${DEBIAN_BUILD}" @@ -65,7 +63,7 @@ build() { install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png" done - # This patch fixes a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh + # This patch has a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh. rm -v debian/patches/debian-hacks/Icedove-branding.patch || true quilt push -av @@ -79,6 +77,13 @@ build() { # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure +} + +build() { + cd "${srcdir}/${DEBIAN_BUILD}" + + export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}" + export PYTHON="/usr/bin/python2" make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" } diff --git a/libre/icedove-libre/mozconfig b/libre/icedove-libre/mozconfig index 58f8ce24f..4f90cb58a 100644 --- a/libre/icedove-libre/mozconfig +++ b/libre/icedove-libre/mozconfig @@ -4,6 +4,10 @@ ac_add_options --enable-application=mail ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib +# Icedove +ac_add_options --disable-official-branding +ac_add_options --with-branding=mail/branding/icedove + # System libraries ac_add_options --with-system-nspr ac_add_options --with-system-nss @@ -16,7 +20,7 @@ ac_add_options --with-system-libvpx ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi -ac_add_options --enable-system-cairo +#ac_add_options --enable-system-cairo ac_add_options --enable-system-pixman ac_add_options --with-pthreads @@ -37,28 +41,5 @@ ac_add_options --enable-optimize export MOZILLA_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1 -# Parabola -export BUILD_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 - -# Debian -export MAIL_PKG_SHARED=1 -mk_add_options MAIL_PKG_SHARED=1 -ac_add_options --disable-official-branding -ac_add_options --with-branding=mail/branding/icedove -ac_add_options --enable-extensions=default -ac_add_options --with-default-mozilla-five-home=/usr/lib/icedove -ac_add_options --disable-javaxpcom -ac_add_options --disable-elf-dynstr-gc -ac_add_options --disable-strip -ac_add_options --disable-strip-libs -ac_add_options --disable-install-strip -ac_add_options --enable-pango -ac_add_options --enable-xft -ac_add_options --enable-xinerama -ac_add_options --enable-svg -ac_add_options --enable-svg-renderer=cairo -ac_add_options --enable-canvas -ac_add_options --enable-crypto -ac_add_options --enable-shared-js -ac_add_options --enable-readline +# Parabola features +ac_add_options --disable-safe-browsing diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 0c9520b17..03dd71fba 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=20.0 +_debver=20.0.1 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -22,19 +22,19 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." -arch=('i686' 'x86_64' 'mips64el') -license=('MPL' 'GPL' 'LGPL') -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.14.1' 'sqlite3' 'startup-notification') -makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'zip') +arch=(i686 x86_64 mips64el) +license=(MPL GPL LGPL) +depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) +makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 quilt unzip zip) [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') +options=(!emptydirs) if $_pgo; then - makedepends+=('xorg-server-xvfb') - options=(!ccache) + makedepends+=(xorg-server-xvfb) + options+=(!ccache) fi - optdepends=('networkmanager: Location detection via available WiFi networks') url="http://packages.debian.org/experimental/${_pkgname}" install=iceweasel.install @@ -55,7 +55,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" md5sums=('22daa24b6490c654f131550cbf20fad3' '0c70ab52f35701558081df3d360361a2' 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' - 'dfeb4ab2c96aae3356a4c347eee0b97b' + '383e8e2a97a8b13fe56d153adb6878b6' '5addd418bf32b673fdfe80c8fefbea1a' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' @@ -64,20 +64,12 @@ md5sums=('22daa24b6490c654f131550cbf20fad3' 'a8fc4658d45b6bf9350023e5c3f34e56' 'd0e1f2625cd9f7234abdeb55aee00529') -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" +prepare() { + export DEBIAN_BUILD="mozilla-release" export QUILT_PATCHES=debian/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' - export DEBIAN_BUILD="mozilla-release" mv debian "$srcdir/$DEBIAN_BUILD" cd "$srcdir/$DEBIAN_BUILD" @@ -125,10 +117,6 @@ build() { echo "ac_add_options --disable-tracejit" >> .mozconfig fi - # Fix PRE_RELEASE_SUFFIX - sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ - browser/base/Makefile.in - # This is a bug, we should fix it if [ "$CARCH" = "mips64el" ]; then # Fix MIPS N32 support. @@ -143,16 +131,42 @@ build() { echo 'ac_add_options --disable-jemalloc' >> .mozconfig fi + # Fix PRE_RELEASE_SUFFIX + sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ + browser/base/Makefile.in + + mkdir "$srcdir/path" + + # WebRTC build tries to execute "python" and expects Python 2 + ln -s /usr/bin/python2 "$srcdir/path/python" + # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 - sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + # TODO: re-enable when we're building with GCC >= 4.8 again + #sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure +} + +build() { + cd "$srcdir/$DEBIAN_BUILD" + + export PATH="$srcdir/path:$PATH" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" + export PYTHON="/usr/bin/python2" + export MOZ_MAKE_FLAGS="$MAKEFLAGS" + unset MAKEFLAGS 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" + # Enable PGO + export DISPLAY=:99 + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + _fail=0 + + make -f client.mk build MOZ_PGO=1 || _fail=1 + kill $! || true + return $_fail else - LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" + make -f client.mk build fi } diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo index 30464c38c..2f4ebe32b 100644 --- a/libre/iceweasel-libre/mozconfig.pgo +++ b/libre/iceweasel-libre/mozconfig.pgo @@ -1,5 +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/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 038191729..a9464f1fd 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -7,8 +7,8 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') -pkgver=4.2.10 -pkgrel=3 +pkgver=4.2.12 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index c7c0c7707..d6d50f425 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -6,9 +6,9 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') -pkgver=4.2.10 +pkgver=4.2.12 _extramodules=extramodules-3.8-LIBRE -pkgrel=4 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre/003-gcc-48.patch b/libre/virtualbox-libre/003-gcc-48.patch new file mode 100644 index 000000000..3039ea2c6 --- /dev/null +++ b/libre/virtualbox-libre/003-gcc-48.patch @@ -0,0 +1,39 @@ +Index: configure +=================================================================== +--- a/configure (revision 45449) ++++ a/configure (revision 45450) +@@ -416,7 +416,7 @@ + elif [ $cc_maj -lt 3 \ + -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \ + -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \ +- -o \( $cc_maj -eq 4 -a $cc_min -gt 7 \) \ ++ -o \( $cc_maj -eq 4 -a $cc_min -gt 8 \) \ + -o $cc_maj -gt 4 ]; then + log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<8" + fail really +Index: Config.kmk +=================================================================== +--- a/Config.kmk (revision 45449) ++++ a/Config.kmk (revision 45450) +@@ -1503,7 +1503,7 @@ + # + # Compiler optimization flags. + # +-VBOX_GCC_WARN ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs $(VBOX_GCC_fdiagnostics-show-option) ++VBOX_GCC_WARN ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs $(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_no-unused-parameter) + VBOX_GCC_WARN_PEDANTIC = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long + ifdef VBOX_WITH_MASOCHISTIC_WARNINGS + VBOX_GCC_WARN_PEDANTIC += -Wunused-variable -Wunused-function -Wunused-label -Wunused-parameter +@@ -2285,6 +2285,12 @@ + $(QUIET)$(APPEND) '$@' ' endif' + $(QUIET)$(APPEND) '$@' 'endif' + endif ++# Prevent warnings about unused parameters as of gcc-4.8 as this warning is now very verbose ++ $(QUIET)$(APPEND) '$@' 'ifneq ($$(VBOX_GCC_VERSION_CXX),)' ++ $(QUIET)$(APPEND) '$@' ' ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CXX),40800),)' ++ $(QUIET)$(APPEND) '$@' ' VBOX_GCC_no-unused-parameter ?= -Wno-unused-parameter' ++ $(QUIET)$(APPEND) '$@' ' endif' ++ $(QUIET)$(APPEND) '$@' 'endif' + ifeq ($(KBUILD_TARGET),solaris) + $(QUIET)$(APPEND) '$@' 'VBOX_GCC_msave-args ?= $(call VBOX_GCC_CHECK_CXX,-msave-args,)' + # Detect the solaris assembler. It is used by the the 4.x gcc compilers, diff --git a/libre/virtualbox-libre/18-system-xorg.patch b/libre/virtualbox-libre/004-system-xorg.patch index c527f7f20..c527f7f20 100644 --- a/libre/virtualbox-libre/18-system-xorg.patch +++ b/libre/virtualbox-libre/004-system-xorg.patch diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 3619c0c1b..709edc49e 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -12,8 +12,8 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-guest-dkms' 'virtualbox-libre-sdk' 'virtualbox-libre-guest-utils') -pkgver=4.2.10 -pkgrel=2 +pkgver=4.2.12 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -22,12 +22,15 @@ makedepends=('alsa-lib' 'cdrkit' 'curl' 'dev86' - 'gsoap=2.8.11-1' + 'device-mapper' + 'glu' + 'gsoap' 'iasl' 'jdk7-openjdk' 'libidl2' 'libpulse' 'libstdc++5' + 'libxcomposite' 'libxcursor' 'libxinerama' 'libxml2' @@ -37,13 +40,14 @@ makedepends=('alsa-lib' 'libxtst' 'linux-libre-headers' 'mesa' - 'glu' 'python2' 'qt4' 'sdl' 'sdl_ttf' 'vde2' - 'xalan-c' 'xorg-server-devel' 'xf86driproto' 'libxcomposite') + 'xalan-c' + 'xf86driproto' + 'xorg-server-devel') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2" '10-vboxdrv.rules' @@ -53,7 +57,8 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta 'vboxweb.service' '001-vboxdrv-reference.patch' '002-change_default_driver_dir.patch' - '18-system-xorg.patch' + '003-gcc-48.patch' + '004-system-xorg.patch' 'os_blag_64.png' 'os_blag.png' 'os_dragora_64.png' @@ -74,7 +79,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta 'os_venenux.png' 'libre.patch' 'free-distros.patch') -md5sums=('99349df34caacdecbb7cf3908631c3f3' +md5sums=('654e45054ae6589452508d37403dc800' '5f85710e0b8606de967716ded7b2d351' 'ed1341881437455d9735875ddf455fbe' '58d6e5bb4b4c1c6f3f0b3daa6aaeed03' @@ -82,6 +87,7 @@ md5sums=('99349df34caacdecbb7cf3908631c3f3' 'bc9efed88e0469cd7fc460d5a5cd7b4b' 'f4e4c7895ede9c524109589bf16ae660' '97e193f050574dd272a38e5ee5ebe62b' + '7cf8611ae5850b86323b690e430eeed7' '4da461f8c90caa123b47c62479f426b4' '8538dba8686d7449cb481c9bae9d722a' '545c925b46f2ac95e5f8ae407fad101a' @@ -101,12 +107,11 @@ md5sums=('99349df34caacdecbb7cf3908631c3f3' 'c7951fe6888d939f3a7d0dafe477e82b' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' - '05d166104a66ee479896c941ac27a3d0' - '78168f8699aa01a632603f0d5b1b8281') + '919277147baae235810f1858200038c0' + '50387fba578646a9d29de3f917a199d2') -build() { +prepare() { cd "VirtualBox-$pkgver" - # Apply patches for _p in "$srcdir"/*.patch; do [[ -e $_p ]] || continue @@ -133,9 +138,11 @@ build() { for i in {dynebolic,venenux,{gnu,parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do cp -v "$srcdir/os_${i}.png" "./src/VBox/Frontends/VirtualBox/images" done +} +build() { + cd "VirtualBox-$pkgver" cp "$srcdir/LocalConfig.kmk" . - # fake makeself binary to compile without nofatal ln -s /bin/echo makeself export PATH="$CWD:$PATH" diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index 91d15e380..913fe7039 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -1,8 +1,8 @@ diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp -index 6ae0372..df65e60 100644 +index 8c6ab79..1e048d9 100644 --- a/src/VBox/Main/src-all/Global.cpp +++ b/src/VBox/Main/src-all/Global.cpp -@@ -33,289 +33,365 @@ const Global::OSType Global::sOSTypes[] = +@@ -33,285 +33,361 @@ const Global::OSType Global::sOSTypes[] = VBOXOSTYPE_Unknown, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, @@ -188,10 +188,6 @@ index 6ae0372..df65e60 100644 + VBOXOSTYPE_Dynebolic, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Free Distros", "Free GNU/Linux Distros", "Venenux", "Venenux", -+ VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, + { "Non-free Distros", "Non-free GNU/Linux Distros", "ArchLinux", "Arch Linux", VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, @@ -304,6 +300,10 @@ index 6ae0372..df65e60 100644 - { "Linux", "Linux", "Linux", "Other Linux", - VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, - 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Venenux", "Venenux", ++ VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, + { "Non-free OSs", "Non-free Operating Systems", "Windows31", "Windows 3.1", + VBOXOSTYPE_Win31, VBOXOSHINT_FLOPPY, + 32, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, @@ -410,102 +410,106 @@ index 6ae0372..df65e60 100644 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "FreeBSD", "FreeBSD", -+ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD", "FreeBSD", ++ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD", "FreeBSD", VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE, 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "FreeBSD_64", "FreeBSD (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD_64", "FreeBSD (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD_64", "FreeBSD (64 bit)", VBOXOSTYPE_FreeBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "OpenBSD", "OpenBSD", -+ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD", "OpenBSD", ++ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD", "OpenBSD", VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "OpenBSD_64", "OpenBSD (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD_64", "OpenBSD (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD_64", "OpenBSD (64 bit)", VBOXOSTYPE_OpenBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "NetBSD", "NetBSD", -+ { "Non-free OSs", "Non-free Operating Systems", "NetBSD", "NetBSD", ++ { "Non-free OSs", "Non-free Operating Systems", "NetBSD", "NetBSD", VBOXOSTYPE_NetBSD, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "NetBSD_64", "NetBSD (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems", "NetBSD_64", "NetBSD (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "NetBSD_64", "NetBSD (64 bit)", VBOXOSTYPE_NetBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "OS2", "IBM OS/2", "OS2Warp3", "OS/2 Warp 3", -+ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp3", "OS/2 Warp 3", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp3", "OS/2 Warp 3", VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 48, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2Warp4", "OS/2 Warp 4", -+ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp4", "OS/2 Warp 4", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp4", "OS/2 Warp 4", VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2Warp45", "OS/2 Warp 4.5", -+ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp45", "OS/2 Warp 4.5", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp45", "OS/2 Warp 4.5", VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 128, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2eCS", "eComStation", -+ { "Non-free OSs", "Non-free Operating Systems", "OS2eCS", "eComStation", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2eCS", "eComStation", VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX, 256, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "OS2", "IBM OS/2", "OS2", "Other OS/2", -+ { "Non-free OSs", "Non-free Operating Systems", "OS2", "Other OS/2", ++ { "Non-free OSs", "Non-free Operating Systems", "OS2", "Other OS/2", VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "MacOS", "Mac OS X", "MacOS", "Mac OS X", -+ { "Non-free OSs", "Non-free Operating Systems", "MacOS", "Mac OS X", ++ { "Non-free OSs", "Non-free Operating Systems", "MacOS", "Mac OS X", VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, AudioControllerType_HDA }, - { "MacOS", "Mac OS X", "MacOS_64", "Mac OS X (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems", "MacOS_64", "Mac OS X (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems", "MacOS_64", "Mac OS X (64 bit)", VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, AudioControllerType_HDA }, - { "Other", "Other", "DOS", "DOS", -+ { "Non-free OSs", "Non-free Operating Systems", "DOS", "DOS", ++ { "Non-free OSs", "Non-free Operating Systems", "DOS", "DOS", VBOXOSTYPE_DOS, VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, 32, 4, 500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "Other", "Other", "Netware", "Netware", -+ { "Non-free OSs", "Non-free Operating Systems", "Netware", "Netware", ++ { "Non-free OSs", "Non-free Operating Systems", "Netware", "Netware", VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX, 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "L4", "L4", -+ { "Non-free OSs", "Non-free Operating Systems", "L4", "L4", ++ { "Non-free OSs", "Non-free Operating Systems", "L4", "L4", VBOXOSTYPE_L4, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "QNX", "QNX", -+ { "Non-free OSs", "Non-free Operating Systems", "QNX", "QNX", - VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX, ++ { "Non-free OSs", "Non-free Operating Systems", "QNX", "QNX", + #ifdef VBOX_WITH_RAW_RING1 + VBOXOSTYPE_QNX, VBOXOSHINT_NONE, + #else +@@ -319,7 +395,7 @@ const Global::OSType Global::sOSTypes[] = + #endif 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "JRockitVE", "JRockitVE", -+ { "Non-free OSs", "Non-free Operating Systems", "JRockitVE", "JRockitVE", ++ { "Non-free OSs", "Non-free Operating Systems", "JRockitVE", "JRockitVE", VBOXOSTYPE_JRockitVE, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE, 1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 }, diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp -index c5a4cfe..7d2b363 100644 +index b335043..59ee885 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp -@@ -44,46 +44,33 @@ struct osTypePattern +@@ -44,46 +44,32 @@ struct osTypePattern static const osTypePattern gs_OSTypePattern[] = { @@ -573,22 +577,21 @@ index c5a4cfe..7d2b363 100644 + { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" }, + { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" }, + { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" }, -+ { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" }, + + /* Code names for non-free GNU/Linux distributions: */ - { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" }, - { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" }, - { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -91,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] = - { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" }, - { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" }, + { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)).*64", Qt::CaseInsensitive), "Ubuntu_64" }, + { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)", Qt::CaseInsensitive), "Ubuntu" }, + { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" }, +@@ -91,7 +77,7 @@ static const osTypePattern gs_OSTypePattern[] = + { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" }, + { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)", Qt::CaseInsensitive), "Fedora" }, - /* Regular names of Linux distributions: */ + /* Regular names of non-free GNU/Linux distributions: */ { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -116,15 +103,51 @@ static const osTypePattern gs_OSTypePattern[] = +@@ -116,15 +102,52 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, @@ -599,8 +602,10 @@ index c5a4cfe..7d2b363 100644 - { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" }, - { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" }, - { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" }, - +- - /* Other: */ ++ { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" }, ++ + /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */ + { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" }, + { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" }, @@ -836,10 +841,10 @@ index cbc0b73..31516cd 100644 #define VBOXOSTYPE_x64_BIT 8 /** The mask which indicates 64-bit. */ diff --git a/src/VBox/Main/src-server/ApplianceImpl.cpp b/src/VBox/Main/src-server/ApplianceImpl.cpp -index 05fc3b6..ce24d92 100644 +index 05fc3b6..dc06073 100644 --- a/src/VBox/Main/src-server/ApplianceImpl.cpp +++ b/src/VBox/Main/src-server/ApplianceImpl.cpp -@@ -84,7 +84,32 @@ g_osTypes[] = +@@ -84,7 +84,31 @@ g_osTypes[] = { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS }, { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS_x64 }, // there is no CIM 64-bit type for this @@ -859,7 +864,6 @@ index 05fc3b6..ce24d92 100644 + { ovf::CIMOSType_CIMOS_Trisquel, VBOXOSTYPE_Trisquel }, + { ovf::CIMOSType_CIMOS_Trisquel_64, VBOXOSTYPE_Trisquel_x64 }, + { ovf::CIMOSType_CIMOS_Dynebolic, VBOXOSTYPE_Dynebolic }, -+ { ovf::CIMOSType_CIMOS_Venenux, VBOXOSTYPE_Venenux }, + + // Free GNU/Linux distros that we have support for but CIM doesn't + { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Parabola }, @@ -873,7 +877,14 @@ index 05fc3b6..ce24d92 100644 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat }, { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat_x64 }, { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_Solaris_x64 }, -@@ -110,7 +135,7 @@ g_osTypes[] = +@@ -104,13 +128,14 @@ g_osTypes[] = + { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu_x64 }, + { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian }, + { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian_x64 }, ++ { ovf::CIMOSType_CIMOS_Venenux, VBOXOSTYPE_Venenux }, + { ovf::CIMOSType_CIMOS_Linux_2_4_x, VBOXOSTYPE_Linux24 }, + { ovf::CIMOSType_CIMOS_Linux_2_4_x_64, VBOXOSTYPE_Linux24_x64 }, + { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Linux26 }, { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Linux26_x64 }, { ovf::CIMOSType_CIMOS_Linux_64, VBOXOSTYPE_Linux26_x64 }, diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index e93fe80e8..a696f9a0d 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -681,8 +681,8 @@ ifdef VBOX_WITH_INSTALLER include $(PATH_SUB_CURRENT)/Installer/Makefile.kmk # Keep this last. endif ---- VirtualBox-4.1.18.orig/src/libs/Makefile.kmk 2012-07-24 21:23:26.938013023 -0300 -+++ VirtualBox-4.1.18/src/libs/Makefile.kmk 2012-07-24 21:43:42.557911752 -0300 +--- VirtualBox-4.2.12.orig/src/libs/Makefile.kmk 2013-04-12 07:39:14.000000000 -0300 ++++ VirtualBox-4.2.12/src/libs/Makefile.kmk 2013-04-13 02:00:29.294392443 -0300 @@ -48,13 +48,6 @@ include $(PATH_SUB_CURRENT)/kStuff/Makefile.kmk endif @@ -691,7 +691,7 @@ -if !defined(VBOX_ONLY_SDK) \ - && ( "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" \ - || defined(VBOX_WITH_EXTPACK_PUEL_BUILD)) -- include $(PATH_SUB_CURRENT)/openssl-0.9.8t/Makefile.kmk +- include $(PATH_SUB_CURRENT)/openssl-0.9.8y/Makefile.kmk -endif - # libjpeg for VRDP video redirection diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD index 74b1c77d9..5698ac14f 100644 --- a/pcr/pandoc/PKGBUILD +++ b/pcr/pandoc/PKGBUILD @@ -4,7 +4,7 @@ # Run `makepkg -sp SRCBUILD` if you want to update the source tarball pkgname=pandoc -pkgver=1.10.1 +pkgver=1.11.1 pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' @@ -17,9 +17,6 @@ source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any # citeproc-hs-pre-0.3.7.patch) conflicts=('haskell-pandoc') optdepends=('texlive-most: for pdf creation') -md5sums=('bca5fa27ac593f24d18cd434289d4673' - '87a6a5fd1abfbe3199c5ff42742ff5f1' - '0d5b6d7adf6fdcea52dcbb7b62368b19') # PKGBUILD functions build() { @@ -90,3 +87,6 @@ package() { install -d ${pkgdir}/usr/share cp -rv ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/ } +md5sums=('74acd042fcd85bee9edb093cc3fe5c2e' + 'SKIP' + '0d5b6d7adf6fdcea52dcbb7b62368b19') diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD index 4c7f5de8d..ec499f814 100644 --- a/pcr/pandoc/SRCBUILD +++ b/pcr/pandoc/SRCBUILD @@ -2,10 +2,10 @@ # Based on haskell-pandoc pkgname=pandoc -pkgver=1.10.1 +pkgver=1.11.1 # 0.4 doesn't work with ghc 7.6 # Use blaze_html_0_5 flag in the future -_blaze_html=0.5.1.3 +_blaze_html=0.6.1.1 pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' @@ -29,7 +29,7 @@ build() { msg2 "Getting the dependency build order" # Ignore the cabal messages HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --flags="blaze_html_0_5" --dry-run file-embed ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER + cabal install --dry-run file-embed blaze-html-${_blaze_html} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER } package() { |