diff options
Diffstat (limited to 'libre')
88 files changed, 1279 insertions, 1449 deletions
diff --git a/libre/abiword/PKGBUILD b/libre/abiword/PKGBUILD index 12881cd8a..00e0b7ef0 100644 --- a/libre/abiword/PKGBUILD +++ b/libre/abiword/PKGBUILD @@ -6,9 +6,9 @@ pkgname=abiword pkgver=3.0.1 -pkgrel=2.parabola1 -arch=('i686' 'x86_64' 'mips64el') -pkgdesc='Fully-featured word processor, without nonfree fonts support' +pkgrel=2.parabola2 +arch=('i686' 'x86_64') +pkgdesc='Fully-featured word processor, without Google search engine and nonfree fonts support' license=('GPL') url='http://www.abisource.com' depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils' @@ -70,7 +70,12 @@ build() { --disable-static \ --enable-clipart \ --enable-templates \ - --enable-plugins \ + --enable-plugins="aiksaurus applix babelfish bmp clarisworks collab docbook \ + eml epub freetranslation garble gdict gimp goffice grammar \ + hancom hrtext iscii kword latex loadbindings mathview mht \ + mif mswrite opendocument openwriter openxml opml ots paint \ + passepartout pdb pdf presentation psion s5 sdw t602 urldict \ + wikipedia wmf wml wordperfect wpg xslfo" \ --enable-introspection make } diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD index d3d2f41dc..38f9050f1 100644 --- a/libre/acpi_call/PKGBUILD +++ b/libre/acpi_call/PKGBUILD @@ -9,7 +9,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=4.1 - _archrel=33 + _archrel=34 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/ark/PKGBUILD b/libre/ark/PKGBUILD new file mode 100644 index 000000000..652081ec5 --- /dev/null +++ b/libre/ark/PKGBUILD @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer (Arch): Antonio Rojas <arojas@archlinux.org> +# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> +# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> +# Maintainer: André Silva <emulatorman@parabola.nu> + +pkgname=ark +pkgver=15.08.0 +pkgrel=1.parabola1 +#pkgdesc='Archiving Tool, with unar support' +pkgdesc='Archiving Tool, without unrar recommendation' +arch=(i686 x86_64) +url='http://kde.org/applications/utilities/ark/' +license=(GPL) +depends=(kpty khtml libarchive hicolor-icon-theme) +makedepends=(extra-cmake-modules kdoctools python) +#optdepends=(p7zip zip unzip unar) +optdepends=(p7zip zip unzip) +conflicts=(kdeutils-ark) +replaces=(kdeutils-ark) +groups=(kde-applications kdeutils) +install=$pkgname.install +source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz") +# 'ark-unar-06.patch') +md5sums=('6ab73a072f05b4ccccbfe64521094f7f') +# 'f38dc71e385e9242899cbe032a983d81') + +prepare() { + mkdir -p build +# cd $pkgname-$pkgver +# # This patch will allow Ark to use The Unarchiver command line utilities (unar/lsar) to operate on RAR files, particularly RARv3. +# patch -Np1 -i ../ark-unar-07.patch +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DLIB_INSTALL_DIR=lib \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -DBUILD_TESTING=OFF + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} + diff --git a/libre/kdeutils-ark/ark-unar-06.patch b/libre/ark/ark-unar-06.patch index ab2ef274f..ab2ef274f 100644 --- a/libre/kdeutils-ark/ark-unar-06.patch +++ b/libre/ark/ark-unar-06.patch diff --git a/libre/kdeutils-ark/kdeutils-ark.install b/libre/ark/ark.install index 8a26818d8..74ff488bc 100644 --- a/libre/kdeutils-ark/kdeutils-ark.install +++ b/libre/ark/ark.install @@ -1,12 +1,13 @@ post_install() { - update-desktop-database -q xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q } -post_update() { +post_upgrade() { post_install } post_remove() { post_install } + diff --git a/libre/arora/PKGBUILD b/libre/arora/PKGBUILD index 9144b6e7d..d75963567 100644 --- a/libre/arora/PKGBUILD +++ b/libre/arora/PKGBUILD @@ -6,11 +6,11 @@ pkgname=arora pkgver=0.11.0 -pkgrel=4.parabola1 -pkgdesc='Lightweight cross-platform Web browser, without nonfree flash recommendation and non-privacy search providers' +pkgrel=4.parabola2 +pkgdesc='Lightweight cross-platform Web browser, without nonfree flash recommendation and non-privacy search engines' url="http://code.google.com/p/$pkgname/" license=('GPL') -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') replaces=($pkgname-libre) conflicts=($pkgname-libre) depends=('qtwebkit' 'desktop-file-utils') @@ -33,7 +33,7 @@ install=install prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - # remove non-privacy search providers + # remove non-privacy search engines rm -r src/data/searchengines/* install -m644 $srcdir/searchengines.qrc src/data/searchengines install -m644 "$srcdir/"{duckduckgo-html,seeks-search,wikipedia-en,yacy}.xml src/data/searchengines diff --git a/libre/atril-gtk3/PKGBUILD b/libre/atril-gtk3/PKGBUILD index 4f26f5e17..3b6c8ce8e 100644 --- a/libre/atril-gtk3/PKGBUILD +++ b/libre/atril-gtk3/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136849 2015-07-14 12:49:40Z flexiondotorg $ +# $Id: PKGBUILD 139031 2015-08-31 19:47:25Z flexiondotorg $ # Maintainer (Arch): Martin Wimpress <code@flexion.org> # Maintainer: André Silva <emulatorman@parabola.nu> _ver=1.10 _pkgbase=atril pkgname=(${_pkgbase}-gtk3) -pkgver=${_ver}.1 +pkgver=${_ver}.2 pkgrel=1.parabola1 pkgdesc="MATE document viewer (GTK3 version [EXPERIMENTAL]), with libarchive support for compressed comic books" url="http://mate-desktop.org" @@ -23,7 +23,7 @@ optdepends=('caja-gtk3: Document Properties extension' groups=('mate-extra-gtk3') conflicts=("${_pkgbase}") source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz") -sha1sums=('5560b9d4f7c5ba07390cc0217453b0e9986542e4') +sha1sums=('ffbc018f534729d68fb1a5dbdc92de6c9ddbe0b1') install=${_pkgbase}.install build() { diff --git a/libre/atril/PKGBUILD b/libre/atril/PKGBUILD index d2719d723..3ca560990 100644 --- a/libre/atril/PKGBUILD +++ b/libre/atril/PKGBUILD @@ -4,7 +4,7 @@ _ver=1.10 _pkgbase=atril pkgname=(${_pkgbase}) -pkgver=${_ver}.1 +pkgver=${_ver}.2 pkgrel=1.parabola1 pkgdesc="MATE document viewer (GTK2 version), with libarchive support for compressed comic books" url="http://mate-desktop.org" @@ -23,7 +23,7 @@ groups=('mate-extra') conflicts=("${_pkgbase}-gtk3" "${_pkgbase}-libre") replaces=("${_pkgbase}-libre") source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz") -sha1sums=('5560b9d4f7c5ba07390cc0217453b0e9986542e4') +sha1sums=('ffbc018f534729d68fb1a5dbdc92de6c9ddbe0b1') install=${_pkgbase}.install build() { diff --git a/libre/bbswitch/PKGBUILD b/libre/bbswitch/PKGBUILD index f9cd1d900..071fe4f22 100644 --- a/libre/bbswitch/PKGBUILD +++ b/libre/bbswitch/PKGBUILD @@ -9,7 +9,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=4.1 - _archrel=35 + _archrel=36 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD index b8f493862..17a3142db 100644 --- a/libre/calibre/PKGBUILD +++ b/libre/calibre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 138067 2015-08-07 18:32:28Z jelle $ +# $Id: PKGBUILD 139022 2015-08-31 18:19:44Z jelle $ # Maintainer (Arch): Jelle van der Waa <jelle@vdwaa.nl> # Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org> @@ -8,12 +8,12 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=calibre -_pkgname=$pkgname-libre -pkgver=2.34.0 -pkgrel=1.parabola1 +_pkgname=calibre-libre +pkgver=2.36.0 +pkgrel=2.parabola1 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives" arch=('i686' 'x86_64') -url="http://$pkgname-ebook.com/" +url="http://calibre-ebook.com/" license=('GPL3') depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python2-mechanize' 'podofo' 'libwmf' @@ -21,33 +21,35 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python2-pillow' 'shared-mime-info' 'python2-dnspython' 'python2-pyqt5' 'python2-psutil' 'icu=55.1' 'libmtp' 'python2-dbus' 'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit' - 'qt5-svg' 'python2-chardet' 'python2-html5lib' 'python2-pygments' 'mtdev') -makedepends=('python2-pycountry' 'qt5-x11extras') -optdepends=("ipython2: to use $pkgname-debug" + 'qt5-svg' 'python2-chardet' 'python2-html5lib' 'python2-pygments' 'mtdev' + 'desktop-file-utils' 'gtk-update-icon-cache') +makedepends=('qt5-x11extras' 'xdg-utils') +optdepends=('ipython2: to use calibre-debug' 'udisks: required for mounting certain devices' + 'poppler: required for converting pdf to html' ) replaces=($_pkgname) conflicts=($_pkgname) -install=$pkgname.install +install=calibre.install mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz") source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.xz" 'libre.patch') -mkmd5sums=('588f060543f8c3142f94ebbc09416f0d') -md5sums=('644bebc5fd167e238ceda31800f97e01' +mkmd5sums=('f22f3666d6ab70faa52b01552b6f5965') +md5sums=('76f7a0b10a6f8c6f5d62ccd4db168638' '7e07f0c7cf71fdfd5950e5d648b07fd0') mksource(){ - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" # Remove nonfree unRAR utility files from the source rm -rv src/unrar } prepare(){ - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" # Remove nonfree rar/cbr support and references - rm -v src/$pkgname/{ebooks/metadata/rar.py,utils/unrar.{cpp,py}} + rm -v src/calibre/{ebooks/metadata/rar.py,utils/unrar.{cpp,py}} rm -v resources/images/mimetypes/{cbr,rar}.png rm -v imgsrc/mimetypes/rar.svg patch -Np1 -i "${srcdir}/libre.patch" @@ -58,52 +60,35 @@ prepare(){ src/html5lib \ src/chardet - sed -i "s/shlex.split(ldflags)/& + ['-fPIC']/" setup/extensions.py - - # Use python2 - sed -i 's:\(env[ ]\+python$\|/usr/bin/python$\):\12:g' $(find . -regex ".*\.py\|.*\.recipe") - # Desktop integration (e.g. enforce arch defaults) sed -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ - -e "/\(cc('xdg-icon-resource\|self.icon_resources.append\|'128'))\)/d" \ - -e "/render_img/ s/\('calibre-.*\.png'\)/os.path.join(dir, \1)/g" \ - -e "/dir, 'calibre-lrf.png'/i \ -\ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')\n\ -\ os.mkdir(dir)" \ - -e "/f = open/ s/\('calibre-.*\.desktop'\)/os.path.join(dir, \1)/g" \ - -e "/dir, 'calibre-lrfviewer.desktop'/i \ -\ dir = os.path.join(self.opts.staging_sharedir,'../applications')\n\ -\ os.mkdir(dir)" \ + -e "/cc(\['xdg-desktop-menu', 'forceupdate'\])/d" \ + -e "/cc(\['xdg-mime', 'install', MIME\])/d" \ -e "s/'ctc-posml'/'text' not in mt and 'pdf' not in mt and 'xhtml'/" \ -e "s/^Name=calibre/Name=Calibre/g" \ - -i src/$pkgname/linux.py + -i src/calibre/linux.py } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" LANG='en_US.UTF-8' python2 setup.py build - # LANG='en_US.UTF-8' python2 setup.py resources - - # Don't build translations since building them is broken badly - #LANG='en_US.UTF-8' python2 setup.py translations + LANG='en_US.UTF-8' python2 setup.py gui } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Fix the environment module location - sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py + cd "${pkgname}-${pkgver}" + + install -d "${pkgdir}/usr/share/zsh/site-functions" \ + "${pkgdir}"/usr/share/{applications,desktop-directories,icons/hicolor} - install -d "${pkgdir}/usr/lib/python2.7/site-packages" \ - "${pkgdir}/usr/share/zsh/site-functions" + install -Dm644 resources/calibre-mimetypes.xml \ + "${pkgdir}/usr/share/mime/packages/calibre-mimetypes.xml" - LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \ - --staging-bindir="${pkgdir}/usr/bin" \ - --staging-libdir="${pkgdir}/usr/lib" \ - --staging-sharedir="${pkgdir}/usr/share" + XDG_DATA_DIRS="${pkgdir}/usr/share" LANG='en_US.UTF-8' \ + python2 setup.py install --staging-root="${pkgdir}/usr" --prefix=/usr # Compiling bytecode FS#33392 - python2 -m compileall "${pkgdir}/usr/lib/$pkgname/" - python2 -O -m compileall "${pkgdir}/usr/lib/$pkgname/" + python2 -m compileall "${pkgdir}/usr/lib/calibre/" + python2 -O -m compileall "${pkgdir}/usr/lib/calibre/" } diff --git a/libre/calibre/calibre.install b/libre/calibre/calibre.install index 6210bd0ab..34ab919aa 100644 --- a/libre/calibre/calibre.install +++ b/libre/calibre/calibre.install @@ -1,6 +1,7 @@ post_install() { update-desktop-database -q update-mime-database usr/share/mime &> /dev/null + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { diff --git a/libre/cups-filters/PKGBUILD b/libre/cups-filters/PKGBUILD index dd2169f94..1496d52b3 100644 --- a/libre/cups-filters/PKGBUILD +++ b/libre/cups-filters/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 241756 2015-07-03 17:22:16Z andyrtr $ +# $Id: PKGBUILD 244873 2015-08-26 16:21:44Z andyrtr $ # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters -pkgver=1.0.71 +pkgver=1.0.74 pkgrel=1.parabola1 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') depends=('lcms2' 'poppler=0.33.0' 'qpdf') -makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check +makedepends=('ghostscript' 'ttf-dejavu' 'python2') # 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' 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly') @@ -19,7 +19,7 @@ source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.x provides=('foomatic-filters') replaces=('foomatic-filters' "${pkgname}-libre" "${pkgname}-parabola") conflicts=('foomatic-filters' "${pkgname}-libre" "${pkgname}-parabola") -md5sums=('f1e11dfe5fa52eb65aa0bdd3a7ee0117') +md5sums=('14862048b4a9a87abfeeae07531dd020') build() { cd $pkgname-$pkgver diff --git a/libre/django17/PKGBUILD b/libre/django17/PKGBUILD index 8311f84bb..2639a7640 100644 --- a/libre/django17/PKGBUILD +++ b/libre/django17/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=django17 pkgname=('python-django17' 'python2-django17') -pkgver=1.7.7 +pkgver=1.7.9 pkgrel=1 pkgdesc="A high-level Python Web framework that encourages rapid development and clean design" arch=('any') @@ -12,8 +12,9 @@ license=('BSD') url="http://www.djangoproject.com/" makedepends=('python2' 'python2-setuptools' 'python' 'python-setuptools') source=("https://www.djangoproject.com/m/releases/${pkgver:0:3}/Django-$pkgver.tar.gz") -md5sums=('a62d6598966947d150525ad2ab20fb0c') -sha256sums=('4816f892063569ca9a77584fa23cb4995c1b3b954ef875102a8219229cbd2e33') +md5sums=('6ea69f3ebb73755bd2a4c9e3743f17c8') +sha1sums=('473599c2e2810a30bb86fd9c730ef52f23e5f709') +sha256sums=('4f3f9fe4e5d20ff8ed6a90b5d2f2df2d8fc054e478cdcc3db81c6b29bd217860') prepare() { cp -a "$srcdir/Django-$pkgver" "$srcdir/Django-$pkgver-python2" diff --git a/libre/icecat-l10n/Makefile b/libre/icecat-l10n/Makefile deleted file mode 100644 index d1aaf7bff..000000000 --- a/libre/icecat-l10n/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/make -f -# Use this script to update the PKGBUILD's list of langpacks. -# This script depends on: -# - coreutils -# - grep -# - pacman -# - sed -# - wget - -# Variables: -_pkgver=10.0 -pkgver=10.0 -pkgrel=1 - -# Guts: ############################################################## - -default: PHONY all -all: PHONY PKGBUILD - -index.html: Makefile - rm -f $@ - wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/ -langpacks.txt: index.html Makefile - egrep -o '[^>".]+\.xpi' $< | sort -u | sed 's/\.xpi//' > $@ -PKGBUILD: PKGBUILD.in langpacks.txt Makefile - sed \ - -e 's/@_PKGVER@/$(_pkgver)/' \ - -e 's/@PKGVER@/$(pkgver)/' \ - -e 's/@PKGREL@/$(pkgrel)/' \ - -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \ - -e '/md5sums/,$$d' \ - PKGBUILD.in > $@ - makepkg -dg >> $@ - -clean: PHONY - rm -f index.html langpacks.txt *.xpi - -.PHONY: PHONY FORCE diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD index 8f9c3d2ef..bc15d0f2e 100644 --- a/libre/icecat-l10n/PKGBUILD +++ b/libre/icecat-l10n/PKGBUILD @@ -6,8 +6,8 @@ _pkgbase=icecat pkgbase=$_pkgbase-l10n -_pkgver=31.8.0 -pkgver=31.8.0_gnu1 +_pkgver=38.2.0 +pkgver=38.2.0_gnu1 pkgrel=1 pkgdesc="Language pack for GNU IceCat." arch=('any') @@ -22,17 +22,22 @@ _languages=( 'an "Aragonese"' 'ar "Arabic"' 'as "Assamese"' + 'ast "Asturian"' + 'az "Azerbaijani"' 'be "Belarusian"' 'bg "Bulgarian"' 'bn-BD "Bengali (Bangladesh)"' + 'bn-IN "Bengali (India)"' 'br "Breton"' 'bs "Bosnian"' + 'ca "Catalan"' 'cs "Czech"' - 'csb "Kashubian"' 'cy "Welsh"' 'da "Danish"' 'de "German"' + 'dsb "Lower Sorbian"' 'el "Greek"' + 'en-GB "English (British)"' # 'en-US "English (US)"' 'en-ZA "English (South African)"' 'eo "Esperanto"' @@ -43,57 +48,79 @@ _languages=( 'et "Estonian"' 'eu "Basque"' 'fa "Persian"' + 'ff "Fulah"' 'fi "Finnish"' 'fr "French"' 'fy-NL "Frisian"' + 'ga-IE "Irish"' 'gd "Gaelic (Scotland)"' 'gl "Galician"' 'gu-IN "Gujarati (India)"' 'he "Hebrew"' + 'hi-IN "Hindi (India)"' 'hr "Croatian"' + 'hsb "Upper Sorbian"' + 'hu "Hungarian"' 'hy-AM "Armenian"' 'id "Indonesian"' + 'is "Icelandic"' 'it "Italian"' + 'ja "Japanese"' 'kk "Kazakh"' 'km "Khmer"' 'kn "Kannada"' - 'ku "Kurdish"' + 'ko "Korean"' 'lij "Ligurian"' 'lt "Lithuanian"' 'lv "Latvian"' 'mai "Maithili"' + 'mk "Macedonian"' 'ml "Malayalam"' 'mr "Marathi"' 'ms "Malay"' 'nb-NO "Norwegian (Bokmål)"' 'nl "Dutch"' + 'nn-NO "Norwegian (Nynorsk)"' + 'or "Oriya"' 'pa-IN "Punjabi (India)"' 'pl "Polish"' 'pt-BR "Portuguese (Brazilian)"' + 'pt-PT "Portuguese (Portugal)"' 'rm "Romansh"' 'ro "Romanian"' 'ru "Russian"' 'si "Sinhala"' + 'sk "Slovak"' 'sl "Slovenian"' 'son "Songhai"' 'sq "Albanian"' + 'sr "Serbian"' + 'sv-SE "Swedish"' 'ta "Tamil"' 'te "Telugu"' + 'th "Thai"' + 'tr "Turkish"' 'uk "Ukrainian"' + 'uz "Uzbek"' + 'vi "Vietnamese"' + 'xh "Xhosa"' + 'zh-CN "Chinese (Simplified)"' 'zh-TW "Chinese (Traditional)"' - 'zu "Zulu"' ) pkgname=() -source=('region.properties') -_url=http://ftp.gnu.org/gnu/gnuzilla/$_pkgver/langpacks +#source=('region.properties') +#_url=http://ftp.gnu.org/gnu/gnuzilla/$_pkgver/langpacks +source=('brand.dtd' 'brand.properties' 'browserconfig.properties' 'region.properties') +_url=http://download.cdn.mozilla.net/pub/firefox/releases/${_pkgver}esr/linux-i686/xpi for _lang in "${_languages[@]}"; do _locale=${_lang%% *} _pkgname=$pkgbase-${_locale,,} pkgname+=($_pkgname) - source+=("$_url/$_pkgbase-$_pkgver.$_locale.langpack.xpi") +# source+=("$_url/$_pkgbase-$_pkgver.$_locale.langpack.xpi") + source+=("$_pkgbase-$_pkgver.$_locale.langpack.xpi::$_url/$_locale.xpi") eval "package_$_pkgname() { _package $_lang }" @@ -109,8 +136,19 @@ _package() { unzip icecat-$_pkgver.$1.langpack.xpi -d $1 rm -v icecat-$_pkgver.$1.langpack.xpi + install -vDm644 $srcdir/brand.dtd $1/browser/chrome/$1/locale/branding/ + install -vDm644 $srcdir/brand.properties $1/browser/chrome/$1/locale/branding/ + install -vDm644 $srcdir/browserconfig.properties $1/browser/chrome/$1/locale/branding/ + mv $1/browser/defaults/preferences/{firefox,icecat}-l10n.js + sed -i '\|firefox-l10n|d' $1/browser/defaults/preferences/icecat-l10n.js install -vDm644 $srcdir/region.properties $1/browser/chrome/$1/locale/browser-region + sed -i 's|Firefox|IceCat| + ' $1/browser/chrome/$1/locale/browser/devtools/sourceeditor.properties \ + $1/browser/chrome/$1/locale/browser/devtools/toolbox.dtd \ + $1/browser/chrome/$1/locale/browser/devtools/webide.dtd \ + $1/browser/chrome/$1/locale/browser/devtools/webide.properties rm -rv $1/{browser/{chrome/.mkdir.done,searchplugins},chrome/{.mkdir.done,$1/locale/$1/global-platform/{mac,win}}} + sed -i -e 's/firefox/icecat/' $1/install.rdf cd $1 zip -r langpack-$1@icecat.mozilla.org.xpi . mv -v langpack-$1@icecat.mozilla.org.xpi $srcdir @@ -119,81 +157,97 @@ _package() { install -vDm644 langpack-$1@icecat.mozilla.org.xpi \ "$pkgdir/usr/lib/icecat/browser/extensions/langpack-$1@icecat.mozilla.org.xpi" - - # Fix a few broken langpacks - # https://bugzilla.mozilla.org/show_bug.cgi?id=832060 - if in_array $1 bg csb; then - pushd "$pkgdir/usr/lib/icecat/browser/extensions" >/dev/null - unzip langpack-$1@icecat.mozilla.org.xpi install.rdf >/dev/null - sed -i '/./,$!d' install.rdf - zip -u langpack-$1@icecat.mozilla.org.xpi install.rdf >/dev/null - rm -v install.rdf - popd >/dev/null - fi } -sha256sums=('816fbc139595c924ed8ab719955d13364beda0eaf631ab679d7aa32462b4278b' - '75ad3b6f73afc0186046b042fdbea35962e0da5d621f308783b7cc4b6bab4797' - '3a142028e90b4d10ce2458753a3a1d22aaf540edc4dc3fec1fa8eb3daf8214c7' - '954346d995584eaed081f758ff310480662ea6baaa3a913867f2a2c3dcb82271' - 'fae24a79b1a76379e651f14825ebf40a91c19712a8d267f5bd474650162877de' - 'aeb33ce69aeeeb8b2d0058899bd074177bedbf765156c4d751185edad306b5a5' - '2b0401a81f61f1fd900536a38c30d9d7f2ee0a6709f58e9281e12e48b8bb20b3' - '6e926d054be858e15c313eb812dbe74c5a75aa3257ca693f255a0ee624bf6a01' - 'e29fe7286beeeadced4bb644b748c638ad32f3f791d223aebaf83d0ac2a4abe2' - '2e7d5ce6e316eaa82506e221e27ba2b785772233011ba1dcc25ff5b693bde9dd' - 'f44e2efa9e8314affd24e29f7f639368fe43e91458be0433dd1121b1dfbc27b1' - '72aea1b22dd86d09db2647a334c0619efb77774a17bed51f862b60a753ac2e65' - '125f09b878ae949ac1db0f6686fc534fc2e52f410aee8538b3497c751ba24ac3' - '52092eee647f47e2ccd7bdaf17fb0fdedce141e4419a45a09601e57a3bc1f4cf' - '027bfa25fbda15af04e5c2965b229ec42d4cb30e203108113aff3895cfcd2d60' - '214d9fbd76ce5e4bf247938761e52219ba6370ef23504467d35ee72ab27118d7' - '554386360ed78f128b8f9e5d781decdc22c43f0b2da2eca51a12017a9575e8c3' - '60f5d85b1b6036654b5e141c019e23073e49d95e117cd3e48a83c35a45e0bea5' - '6ec862fd24b66d0e1adb3afac2304f6fa3bb2d2ccf7ce98ed96908f7125cabd1' - '087d7c85e46825e459569d161646cce867e58accbbfe097cc3296084c29d7a69' - '60b86ff5c57c57aa941347278c7a52307241d50bac72f862f68a7b118b47d524' - '70d67287ac89a539af34e7e88e9fcae80b678e4a919d9dbc772d7711712de313' - 'c405258d7fe875ebf8c9486cc7144863d2bc42f382b91a900e9be0a500f7092d' - '0358cabd6c25674981e0f1f564bbe7491bd8b47834703b1afdc9e52be8bf7c44' - '6f6d83d62c7e9b5135b0dd85e33fb0657a638009281e9932c88f1780dc67a24b' - 'e9e781536b446ac6c801dfb00139d682be3f05f9c14280107fbbdffb4ccd942e' - '1d2fb1b81338ac6fc7a552ff809f587a8c5268c74b1c495e06e65be86045393d' - '8a564feec6669fe79d6cec92bb2f07b3e92ea0d718e58b5e40237e20c117057d' - '2aee274220f409b3210d42d955a9c00811a93513f2e1d9707d82f7a04472024c' - 'bb5d3e3381e0339141f0c0bf57cd18d7b59da905412cc44d730a546ff6388928' - 'bc8d1837532c4b5ca62d251113bffbb166cb3a6a8b9218bf168a9efe2234a760' - '31eb7b0305c50788a2a744d936d5644277d9dcb2c4bd7c4a25bbacf4165f73c3' - 'b0274ad9951e13908b811c09048b48e96f1a0486044b8b6bc7f344d41a9d1112' - 'a6307333f1918be9c1985a25a768d533c2d9417088729d967842141afb83d08b' - 'f4b5a3099f7d507ef70f0537450ba4f0d1f383c9c7a99675606b914387e22c93' - 'e310c7a68283a3160b705bac8c64f59257e3cf552d0755e1ebb2694d551912f8' - '404626f0cf706db523426ea65e7cc2e101d25c859ba31b4faf23a5d191817156' - '0b343af40d361ea6209a4399e6ead0b250126aec42bd3befad0e5dadf4d55ea9' - 'e88473d92936c4b4c86988af32ea8ac2f6132ab1e9335920a6cc11b03bf728c1' - '460fe08777455232e020b699f0da51511e9b62575082cd2ddcf5b934fcd99c2e' - 'bc5ddabeeaaa960f4e9a8a2ce0a33e656bf7a6e158c830e38e2c72260297c6b8' - 'ddd71a5a90525242eaec80ed426a4d2c7c1577cd7db2eb3edac07acb85b0a89c' - '7e9039fa356260ab2e2fbb5ae73f6503cb102f46ccd70c1922cca1ce495b0b94' - '45443c64b216b476d7fb9bd0a03aa4069718e93b093dd6cf0e3090b600704249' - '3da5559ec7f5ffaf7b9e8e1e62f234fc63916a6be35ca8d5efa7857332c2ab8f' - '97c1e100777099c38daae913d87c567554bac1494c588d478ec1fd03d37adde5' - 'd7fbd96680a31480a70fc1fcfb7f84836dad45fa57ede24d2ad93df2e26e9bad' - 'a9fc5ed350a417c38ecda39623502f2901a095377c3f8995a28dfe55ce21ab52' - 'fdf75ce2838af444dc737508e5262fd8575579d5d73b0467408d1e0dfebdbf41' - 'e2f03f67cde25c89d25ca5fa5c565a91f5ebbbe912642adc4edb955b1acc7849' - '1d5797102d9610ec4faf05d6cfb7f05106286f172a44436cdbfcc4c4c7d90759' - '3a7caa3a58af708135c996603fa35a46b3f7d12a397bdda971963b8ee37f14af' - '1319e8db747e517af71c63f7e80b4ee55137c362f38477c30fb9bb3734a1e2c1' - 'aa990edb911c633f09a73e797cff60d2a5bd3b227292cd6acb6b36f80e67721d' - '868a8497cfe0e4a1bee49a9cc02a2854b4f79c956d2aebf08265bd929a479045' - 'e34ea94c89892b41493d3806cf9e689aa302dde4d0a8041041a14fd8137c0904' - 'a152e417463079522db77332b3e54cede90cb737955e1ce3d507e2e6e36f0e6e' - '6b13d79a8b3e1b6b875359aa968bded50c2f6fb68eb6dbfb895900f8071ea732' - '0b8f105e853159e035dfd5eadceb822bdc33db403b57ea1bdc20f9705bf904ca' - 'b417b141277402d55f32bc48b27911d08a381b7c68381dcd9de3ab3e80a10369' - 'a5b0fd320a65b7c58080d92e184c8ce33e3e706001f68045d09ff6051fd51f7f' - '695700e5485182d1dc56287245bf9815dafab8e8024b1c3147319ee8c42530a9' - 'dedc2d4bd1ac97bbd4070024c1a4a061e914fae755fac8069881669cc46095e9' - 'ac7ed07c661e21ddc39095da7b74bab6254031020bc42c30cd1dbca24242139d' - '767fc108f5d963e80bdc551773d54384c6ea02ecda6956fca97f23b65cc2af46') +sha256sums=('c57f9d372f056d79b074976a70d3f8b99ec9379eedd9b7a4ec33608b002b9af9' + 'ce4530dc72a4c01db088b46e7018a29a87fb8b719e6a640c4c97ee0793d8190a' + '9f9a8b54932b3138d15fb050a6b04e574fc018d6acb2b7f23b1a9425513d416f' + 'fc301f3ce1f7d7cd995c7920af18f638e7dd40ade90318567c2bdb922d9cd11a' + '80f2d65db6ba7c1079e36d4540c5364dadf50ee5cc00cdd1f4fe505915b12ef9' + '4d822352bd0dbaa73dd547602e20ccdccb62b3ef9bdeccc03f172511e18b41ed' + 'c58525c2b8bca44c5242e15a3597d3c5af89cbd227a2f37dec0cc64b777eaa2c' + '5e5e573f9cf9bb050ac9e94311887b83684c9933c8ba36021010b093b69c667b' + '690987405cf31ba44a2bc52a040f79e07bdca5e1a68bccb65a94f608dd32a168' + '81ad42dce9d9525aa2d4339e928d5675d4f069b46deffed0c1afa7c29f7b4586' + 'bb1b9b3e7ee14cf447780807ecda9789d696e83a6ceaa83a3f455025462976b0' + 'f025e13585be2126f1f805f431a2aab6f92064970a5d3ecf8e458fb35fcf1b04' + 'd566656889a8922a88bab1a06fcf6e49f1131cc7ebc53aa19ea9b177314a7003' + '1d8a734901cfc8f4a3372ae7586e6615a044757faaa43d0102d687465a7d8646' + '7a6e05c0eab890318718b014402168f30e2593a63cbd639b1dec9bbf88e74b30' + 'e5bc879e345784c9b4d9228a3e8900b4ffa4e643f01546db80cb4d9e11049a34' + '0bf5d0e162a33a5ef6ac3059a5b713d88fff367f7384ad56a594ec07aafce358' + 'd2aaebad9dd838e9cb6aa4d5fcc45cfb2105cd655671455fd5a360ca43302842' + 'd3f1fe4b368d1f30cf93f6dba98af57491f2f23df1754edfc896aa7aef7bab8d' + '7ab25f18ca0e267fcbc30503f47162319a5c1c08e1bc03518bab04c2c8fe59c2' + '23147921fc13063f39818bc2d563d4b07b0a5ab466000d9405fd9b9249e67663' + '6d4cdaa88f41cc5feaae869db51684d85b1b1d6026ba9309c0572261828f8c1b' + 'ff71942cac9c2548caa8f12df7005b5b9f91264f5b7da7360a99a088c4528440' + '24226e706875c0f1c1b18c4f2f55fb83e5963c3e22061a2af436d92e8b66ae29' + '2824d85c15ff1a0ee6bd69228dec418481c9a7c4565beb5b45d0428e0b6f127b' + '7b103f2e7472388b6fea50c602a5950404e9d297a8ede752e04e93fecce4cc1a' + '7c41dc63256b9ae615206cecd5bf008879443791b03269e1d4dfcbb0b6e73fb9' + 'fede8e15d08da232349fd180b17d208d556de12fcb37a98a59362773e67ceca1' + '5957a2f6db01d593b6d82149f1ecd6b129e5322f74a254ac46d07503719e61c9' + '2da47c5401a9e60c84859bd28635cac8bd03d07cfc0d25ffd2fed66819d060bb' + '0d396f5f5ea77920d7273fe4dd3662b08997657c321fb7ae62c9406abd9135e1' + 'fac02f932ee8c93c660daf2b36ca6a8246724dfa5ac040809e6d88eb219b7a03' + '492ac55eceaff28188516c154e738d4189615135e4434cde7d4108c6c92200a2' + '125f97265b11efa49886c6ca9611b6cdedfbaf40ac59fa7ba2f5d86308dbe4e9' + '36e58433af2939b69d461a4d21f8576c2773ab926f95e9742fcfa28c4b8155a9' + 'e56a3252d800bdc5ad2c18badf8a1a6743e7aa4fd29f459a339ef05a26614272' + '959138dcce85fd35da81fc9a1ddc28bfb06435f9a71fa1f2a2cf0b44978cdf70' + '3f86674161098d9446ea0736969c0d030eca100688880921daa8e615a9410e38' + 'bfb2eeb0c787ff5ca2afec939f4da875eb854bc5baafcd61021b2d0a4db4456b' + '8acb2f0a4416f8ef182abcf6450e9169852524c0fbf37dbf15cb5156273eec8c' + '53ecc5c4d83346d327cfea3ed8554b468f9ecb17daba0ee655268a3d1a23d276' + '33799f5f28c4b6fd80f5ecb5b4ac1ff9ebe34461e50c59151d029053f1f73d53' + '98f05fde9c1341b7d32e196660884fa24c266575374aa8fb26859f5fa75b7b46' + '3a9480cd2345f00507ae719c33185acf5e9f66a9c996607dfac0ec95d0d32d89' + '125abeb8f4a881fd68bb8f8bd31d7b89c98d35f3d04e18ade625a74e45723466' + 'a88449a67fdb85b21e031b894fc060e328c42a3ac1a39d13fff8446cc4df00d1' + 'd37fc8e422a2421829665a13c7b39bc18af76afc22639395fe346a3540a360e1' + 'ebdf5d14d7b97eddafe6fedc3b7b58b4823e2ba7e9f019facc65c469a1c0538b' + '861b0ee5cd7130606f8db16d16855a932f62d18ea279aeb425d13043b88afecf' + '17f205a9d775e3a97ea3d7b63ee931f4cf5bb24089978fc979dc4d1b5d057311' + '1da955c3cb53ee2fdbf03454840f2588ec3731b88d5ea31e450c4473eb7c0c8b' + '1b51688caa1e55b2117fe510d31485a3219c3f4446e3475c87699abd460e84b0' + '9a445773926e5abf3df7ed1e4ace90e52c17ffcfc65e76bc81b14ce3f9a47910' + 'fbff5ab8dae477e73725de8f1ee346287aede8c00b6891dbb11d4500b7e6620e' + 'd8756e4efe30cf21178d51ea7186d0bac4980a10fbfb29534d0e3988859d2997' + '19f3413cf7c9e0deaa025d254c8e787f2e2d3dbe0c800841d69f87dd02249b30' + '769ad5652416a94c038f1df689532c35cf00804e7971f7d0bfa7157ebc24e95d' + '692e7fb76eba7b2926300e2ae12dd1215c4010722cd95ece2893556ce1729ff5' + '0e7a1903ee292b3bacf00a876bce9618a869a708820bb04cc4487536b7a09590' + 'c51b1627c24c48721cf799e9438d097d2b815e576042813a15d7631285385499' + 'e4be6327448665795bc83a5de98826bfbc78118d188e7687546b5b5d170a1e3a' + '6aa7b005affd7cdc10d9c42454e841d94ecc94bec273755ef9754e033a3e62be' + '73bb6c2101dfa7876814c68b3b02467608c72e0e8bc3517aa0fec61673069bba' + 'f4f68fd8871ab409f9d3d0540873167e693314278a16508450a359d9cafdfdc3' + '8056a9169fd52a12f8f806f1e2870a2578591df8a2c711786bee7ce84436dbfa' + '5dd497dbddcc664facae77de25b8b3f4e3c87a1747bc44595dd91b716ba82748' + 'a7371d8b484cb686965b3769f0bedf6c8803bbbc05021c8b3e24d99dfe66348d' + '79db2dab58df83d308c614469a7050d3228898fcb2edfbdb9eaf66d37d541719' + 'cbfc04c1b6dd2de9f87bca693b4de8275ab4860cc538c0d7a60fecb58b88c6dd' + 'f7f312ed6907c15004e75cfb95a0e254087932cf8203b1d0419dc1eea055a9c7' + 'd13fcef16af096732c430b699a53b1d0d76eb3829bff5166d876ffcc94e123e7' + '9cd4c26a521f2e0550ea62ddc27ca751a2b3f2fdc6d55af861936abcdd6c1efd' + 'cf88953513fc4b20a5318b3d4e8f771edc7dc3ef3b3b09a8858ad1b9261c0866' + 'd5151574b477c6964461ae75563397ebc8f11dfb9331e2ffeb046a4bd046ea97' + '0289531702f0e2ad68984a9dd939e67dafed98eed7c1a6552d136d759ed74684' + '314d1635548bbfd7f41927cf327c781d03d99b8ed1a2c8775a34ba6cd3b12a85' + 'd40e11bda881fa9703e51065bab7204bc5dad8d4affedd4638cfe96f907ddf07' + '8ba7277af23a615970cc1384d3b54e8d88a3305da9fe03790819e7b1aeb41a15' + '3709b10419d813e3255ef9022e276344ca90788c33858aec111c541b455bb79a' + 'fdc0e581d870726728aad45980c6f10d4141a0b9fa39424e51335c8751063e30' + '6007a48742b675c34bd8a331c201f79a19cb52fe7dd7907cd73e76ff9d0c090c' + '21158bf5a1286bc55dda4e34ef00fecf5490c55da61dfbb8de8a8f15f6c3fb95' + 'ec13ec46f071219815b200ab46f103ebdca82308187562d57ae9ae01a9c234e8' + 'b1ffd8fa3534f51d3ec9294288223898d8c41285c4fa400e096fc7ec1aff8b0b' + '0e15637fcefb0e16c4722c242466d2f67b18eb0fbe79097cc29e5358cf7aa19d' + 'fae94efd727ddd145146d2df759e02e060e8302c666ea6cb2d09558bdff76abe' + 'd9871bbdffe5f9cf5275894c05a7934a21af421c3343844fb5efa78efa06aaa8' + '3c5ff9e17debf3c7d865474262aad09c5e7d98106ecb6395d656caee27c39b61' + '9e7dc043c3aa7890255241bdd0292a01d957fcb77434ed236df07401e3f7a9b2' + 'd41ee639470dce1ff3a103987c16ad5dc32c3b1f468760855d9c840dfbc0a39d' + '6b58c8a6fd5e62933d8ec42758a6fc7dd4794b7f659855331debc876e8b80bec' + 'bb22672b52104fd11c28d5609d2c039dd0b3636445b091523dfb90538cf84e94') diff --git a/libre/icecat-l10n/brand.dtd b/libre/icecat-l10n/brand.dtd new file mode 100644 index 000000000..ff4f95957 --- /dev/null +++ b/libre/icecat-l10n/brand.dtd @@ -0,0 +1,9 @@ +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + +<!ENTITY brandShorterName "IceCat"> +<!ENTITY brandShortName "IceCat"> +<!ENTITY brandFullName "GNU IceCat"> +<!ENTITY vendorShortName "GNU"> +<!ENTITY trademarkInfo.part1 ""> diff --git a/libre/icecat-l10n/brand.properties b/libre/icecat-l10n/brand.properties new file mode 100644 index 000000000..73ef20839 --- /dev/null +++ b/libre/icecat-l10n/brand.properties @@ -0,0 +1,16 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +brandShorterName=IceCat +brandShortName=IceCat +brandFullName=Mozilla IceCat +vendorShortName=Mozilla + +homePageSingleStartMain=IceCat Start, a fast home page with built-in search +homePageImport=Import your home page from %S + +homePageMigrationPageTitle=Home Page Selection +homePageMigrationDescription=Please select the home page you wish to use: + +syncBrandShortName=Sync diff --git a/libre/icecat-l10n/browserconfig.properties b/libre/icecat-l10n/browserconfig.properties new file mode 100644 index 000000000..72ab4bed3 --- /dev/null +++ b/libre/icecat-l10n/browserconfig.properties @@ -0,0 +1,6 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# Do NOT localize or otherwise change these values +browser.startup.homepage=about:icecat diff --git a/libre/icecat-l10n/region.properties b/libre/icecat-l10n/region.properties index 64a540fac..3333c1b71 100644 --- a/libre/icecat-l10n/region.properties +++ b/libre/icecat-l10n/region.properties @@ -3,12 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine -browser.search.defaultenginename=DuckDuckGo HTML +browser.search.defaultenginename=searx # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=DuckDuckGo HTML -browser.search.order.2=DuckDuckGo Lite -browser.search.order.3=searx +browser.search.order.1=searx +browser.search.order.2=DuckDuckGo HTML +browser.search.order.3=DuckDuckGo Lite # increment this number when anything gets changed in the list below. This will # cause IceCat to re-read these prefs and inject any new handlers into the diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 28740b81d..da8b17ff9 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137608 2015-07-30 10:33:50Z spupykin $ +# $Id: PKGBUILD 138725 2015-08-24 13:10:01Z spupykin $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=icecat-noscript -pkgver=2.6.9.33 +pkgver=2.6.9.36 pkgrel=1 pkgdesc="Extension for icecat which disables script" arch=('any') @@ -12,7 +12,7 @@ license=('GPL2') depends=() makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('1ff903dddb39aafe62dc3b7194a2a39d') +md5sums=('fc131963fd1339ee173d74a95939de5a') package() { depends=("icecat") diff --git a/libre/icecat-theme-adwaita/PKGBUILD b/libre/icecat-theme-adwaita/PKGBUILD index d349ac4d6..c8b749cc4 100644 --- a/libre/icecat-theme-adwaita/PKGBUILD +++ b/libre/icecat-theme-adwaita/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: André Silva <emulatorman@parabola.nu> pkgname=icecat-theme-adwaita -pkgver=31.1 +pkgver=38.1 pkgrel=1 pkgdesc="Adwaita theme for IceCat (Matches the default Gnome Shell theme)" url="https://addons.mozilla.org/en-US/firefox/addon/adwaita/" @@ -13,12 +13,16 @@ arch=('any') license=('MPL') depends=("icecat") makedepends=('unzip') -source=("gnome-firefox-theme-${pkgver}.xpi"::"https://github.com/gnome-integration-team/firefox-gnome/releases/download/${pkgver}/gnome-firefox-theme-${pkgver}.xpi") -sha256sums=('6fb71b316db500574a837a511b05219273363c5b8ed05b20fc9e031eff3299db') +source=("gnome-firefox-theme-${pkgver}.xpi"::"https://github.com/gnome-integration-team/firefox-gnome/releases/download/${pkgver}/gnome-firefox-theme.xpi") +sha256sums=('af050237a8cddee0f9123f81a9df58b0b97e94f84059cc67225183cb3243a70e') noextract=("gnome-firefox-theme-${pkgver}.xpi") prepare() { unzip -qo "gnome-firefox-theme-${pkgver}.xpi" -d "${pkgname}-${pkgver}" + # Fix for wrong version number + # https://github.com/gnome-integration-team/firefox-gnome/issues/337 + cd "${pkgname}-${pkgver}" + sed -i "s_\(<em:version>\)35.1\(</em:version>\)_\1${pkgver}\2_" "install.rdf" } package() { diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 05e6cc5c3..462ccb6b7 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -13,12 +13,12 @@ _pgo=true pkgname=icecat -_pkgver=31.8.0-gnu1 +_pkgver=38.2.0-gnu1 pkgver=${_pkgver//-/_} -pkgrel=4 +pkgrel=1 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox." -arch=(i686 x86_64 mips64el) +arch=(i686 x86_64) license=(MPL GPL LGPL) depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell icu=55.1 libevent libvpx=1.4.0 libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) makedepends=(diffutils gst-plugins-base-libs imake inetutils libpulse mesa python2 unzip yasm zip) @@ -32,32 +32,28 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'gst-libav: h.264 video') url="http://www.gnu.org/software/gnuzilla/" install=$pkgname.install -source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{,.sig} +#source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{,.sig} +source=(http://jenkins.trisquel.info/$pkgname/$pkgname-$_pkgver.tar.bz2 mozconfig - mozconfig.pgo libre.patch gnu_headshadow.png $pkgname.desktop $pkgname-install-dir.patch freetype26.patch vendor.js - rhbz-966424.patch $pkgname-fixed-loading-icon.png - fixing_nullptr_31.7.0.patch) -sha256sums=('370087d0adadf8b1c1e6a9920e26488a8902b9dc461d305f258fddb26a129d87' - 'SKIP' - 'c36d18a8ffc99ea4dab8e8564d92bc5c9b1bb2c7680323f48483695522cefd1d' - '92d7ea9feb8d2814d1abaf5cf4012983a2fb9cc56b26a5d7c7c3898aedf06fb4' - '8082a8a5adf21c50fa77650c74adcd6fedbf7bedcdb6b8ae29529ca96adeb05d' + remove-google-play-services-support.patch) +sha256sums=('eef4addf37f6fc885f28eea936cee7258d42f0cb11d79703ec7ec1fe2b80ef8d' + '33a8cf07373c63a0bea70ec2c3983d2cca990752c0f946cb5dbd91f1e2b6410f' + 'e333901df4fc8a881d08c9434e3c302885ed4a989316114e13af828417510410' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '52df9ffeb52166ed4abd9a132ee4a9017b9c4980f0725ba383610ccfb06d4745' '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47' 'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85' '977aa49b940f1da049cefa2878a63ac6669a78e63e9d55bb11db7b8f8fb64c33' - 'd25c6e95d20ec622a51346897d986fdd97074023d6a02bee0533773a195f8233' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213' - 'd57d0e4d5bc66323388e8f3c9999ed443abfd304a28a1696cc6f4518ed0d0f2a') -validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez + '9e651b0f7e7d9d663e8b24077d52bad15f011871747743aff60d6e2d7a45ae5b') +#validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez prepare() { export GNU_BUILD="gnuzilla-release" @@ -75,22 +71,9 @@ prepare() { # https://bugzilla.mozilla.org/show_bug.cgi?id=1143411 patch -Np1 -i "$srcdir/freetype26.patch" - # https://bugs.archlinux.org/task/41689 - patch -Np1 -i "$srcdir/rhbz-966424.patch" - - # Patch for GCC 5.1 - patch -Np1 -i "$srcdir/fixing_nullptr_31.7.0.patch" - # Patch and remove anything that's left patch -Np1 -i "$srcdir/libre.patch" - sed -i '\|return| s|Flash|SWF Player|g; - ' browser/base/content/pageinfo/permissions.js \ - browser/base/content/browser-plugins.js - sed -i '\|["]displayName["][:] ["]Flash["]| s|Flash|SWF Player| - \|["]displayName["][:] ["]Shockwave["]| s|Shockwave|DCR Player| - \|["]displayName["][:] ["]QuickTime["]| s|QuickTime|MOV Player| - \|installLinux| s|true|false| - ' browser/base/content/browser-plugins.js + patch -Np1 -i "$srcdir/remove-google-play-services-support.patch" rm -v browser/base/content/abouthome/snippet*.png || true sed -i '\|abouthome/snippet|d ' browser/base/jar.mn @@ -111,44 +94,6 @@ prepare() { # Load our build config, disable SafeSearch cp "$srcdir/mozconfig" .mozconfig - 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 - - # Fixing for libvpx >= 1.4.0 - sed -i 's|IMG_FMT_I420|VPX_IMG_FMT_I420|; - s|PLANE_U|VPX_PLANE_U|; - s|PLANE_V|VPX_PLANE_V|; - s|PLANE_Y|VPX_PLANE_Y|; - s|VPX_VPX_PLANE_|VPX_PLANE_|; - ' content/media/encoder/VP8TrackEncoder.cpp \ - media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc - mkdir "$srcdir/path" # WebRTC build tries to execute "python" and expects Python 2 @@ -158,15 +103,10 @@ prepare() { # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure - # Fix tab loading icon (flickers with libpng 1.6) + # Fix tab loading icon (doesn't work with libpng 1.6) # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 - # TODO: Remove this; IceCat 36 might use CSS animations for the loading icon - # https://bugzilla.mozilla.org/show_bug.cgi?id=759252 cp "$srcdir/$pkgname-fixed-loading-icon.png" \ browser/themes/linux/tabbrowser/loading.png - - # Remove non-existent file on Makefile.in - sed -i '\|build/pgo/blueprint/valid.png|d' build/Makefile.in } build() { @@ -175,7 +115,6 @@ build() { cd "$srcdir/$GNU_BUILD" export PATH="$srcdir/path:$PATH" - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" export PYTHON="/usr/bin/python2" if $_pgo; then diff --git a/libre/icecat/fixing_nullptr_31.7.0.patch b/libre/icecat/fixing_nullptr_31.7.0.patch deleted file mode 100644 index ecfca4138..000000000 --- a/libre/icecat/fixing_nullptr_31.7.0.patch +++ /dev/null @@ -1,174 +0,0 @@ ---- a/js/src/builtin/TypedObject.cpp 2015-06-03 22:48:47.000000000 +0200 -+++ b/js/src/builtin/TypedObject.cpp 2015-06-08 16:45:30.918154529 +0200 -@@ -710,12 +710,12 @@ - contents.append(")"); - RootedAtom stringRepr(cx, contents.finishAtom()); - if (!stringRepr) -- return nullptr; -+ return false; - - // Extract ArrayType.prototype - RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal)); - if (!arrayTypePrototype) -- return nullptr; -+ return false; - - // Create the instance of ArrayType - Rooted<UnsizedArrayTypeDescr*> obj(cx); -@@ -728,7 +728,7 @@ - if (!JSObject::defineProperty(cx, obj, cx->names().length, - UndefinedHandleValue, nullptr, nullptr, - JSPROP_READONLY | JSPROP_PERMANENT)) -- return nullptr; -+ return false; - - args.rval().setObject(*obj); - return true; -@@ -762,7 +762,7 @@ - if (!size.isValid()) { - JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, - JSMSG_TYPEDOBJECT_TOO_BIG); -- return nullptr; -+ return false; - } - - // Construct a canonical string `new ArrayType(<elementType>).dimension(N)`: -@@ -775,7 +775,7 @@ - contents.append(")"); - RootedAtom stringRepr(cx, contents.finishAtom()); - if (!stringRepr) -- return nullptr; -+ return false; - - // Create the sized type object. - Rooted<SizedArrayTypeDescr*> obj(cx); -@@ -793,7 +793,7 @@ - if (!JSObject::defineProperty(cx, obj, cx->names().length, - lengthVal, nullptr, nullptr, - JSPROP_READONLY | JSPROP_PERMANENT)) -- return nullptr; -+ return false; - - // Add `unsized` property, which is a link from the sized - // array to the unsized array. -@@ -801,7 +801,7 @@ - if (!JSObject::defineProperty(cx, obj, cx->names().unsized, - unsizedTypeDescrValue, nullptr, nullptr, - JSPROP_READONLY | JSPROP_PERMANENT)) -- return nullptr; -+ return false; - - args.rval().setObject(*obj); - return true; -@@ -1253,7 +1253,7 @@ - Rooted<TypedProto*> proto(cx); - proto = NewObjectWithProto<TypedProto>(cx, objProto, nullptr, TenuredObject); - if (!proto) -- return nullptr; -+ return false; - proto->initTypeDescrSlot(*descr); - descr->initReservedSlot(JS_DESCR_SLOT_TYPROTO, ObjectValue(*proto)); - -@@ -1358,14 +1358,14 @@ - #define BINARYDATA_SCALAR_DEFINE(constant_, type_, name_) \ - if (!DefineSimpleTypeDescr<ScalarTypeDescr>(cx, global, module, constant_, \ - cx->names().name_)) \ -- return nullptr; -+ return false; - JS_FOR_EACH_SCALAR_TYPE_REPR(BINARYDATA_SCALAR_DEFINE) - #undef BINARYDATA_SCALAR_DEFINE - - #define BINARYDATA_REFERENCE_DEFINE(constant_, type_, name_) \ - if (!DefineSimpleTypeDescr<ReferenceTypeDescr>(cx, global, module, constant_, \ - cx->names().name_)) \ -- return nullptr; -+ return false; - JS_FOR_EACH_REFERENCE_TYPE_REPR(BINARYDATA_REFERENCE_DEFINE) - #undef BINARYDATA_REFERENCE_DEFINE - -@@ -1375,14 +1375,14 @@ - arrayType = DefineMetaTypeDescr<ArrayMetaTypeDescr>( - cx, global, module, TypedObjectModuleObject::ArrayTypePrototype); - if (!arrayType) -- return nullptr; -+ return false; - - RootedValue arrayTypeValue(cx, ObjectValue(*arrayType)); - if (!JSObject::defineProperty(cx, module, cx->names().ArrayType, - arrayTypeValue, - nullptr, nullptr, - JSPROP_READONLY | JSPROP_PERMANENT)) -- return nullptr; -+ return false; - - // StructType. - -@@ -1390,14 +1390,14 @@ - structType = DefineMetaTypeDescr<StructMetaTypeDescr>( - cx, global, module, TypedObjectModuleObject::StructTypePrototype); - if (!structType) -- return nullptr; -+ return false; - - RootedValue structTypeValue(cx, ObjectValue(*structType)); - if (!JSObject::defineProperty(cx, module, cx->names().StructType, - structTypeValue, - nullptr, nullptr, - JSPROP_READONLY | JSPROP_PERMANENT)) -- return nullptr; -+ return false; - - // Everything is setup, install module on the global object: - RootedValue moduleValue(cx, ObjectValue(*module)); -@@ -1407,7 +1407,7 @@ - nullptr, nullptr, - 0)) - { -- return nullptr; -+ return false; - } - - return module; -@@ -2466,7 +2466,7 @@ - if (length < 0) { - JS_ReportErrorNumber(cx, js_GetErrorMessage, - nullptr, JSMSG_TYPEDOBJECT_BAD_ARGS); -- return nullptr; -+ return false; - } - Rooted<TypedObject*> obj(cx, createZeroed(cx, callee, length)); - if (!obj) - ---- a/js/src/frontend/BytecodeCompiler.cpp 2015-06-03 22:48:48.000000000 +0200 -+++ b/js/src/frontend/BytecodeCompiler.cpp 2015-06-08 01:15:08.080302638 +0200 -@@ -544,7 +544,7 @@ - - RootedScriptSource sourceObject(cx, CreateScriptSourceObject(cx, options)); - if (!sourceObject) -- return nullptr; -+ return false; - ScriptSource* ss = sourceObject->source(); - - SourceCompressionTask sct(cx); ---- a/js/xpconnect/wrappers/XrayWrapper.cpp 2015-06-03 22:48:45.000000000 +0200 -+++ b/js/xpconnect/wrappers/XrayWrapper.cpp 2015-06-08 01:15:35.672193557 +0200 -@@ -351,7 +351,7 @@ - { - JSAutoCompartment ac(cx, target); - if (!JS_GetClassPrototype(cx, key, protop)) -- return nullptr; -+ return false; - } - return JS_WrapObject(cx, protop); - } ---- a/netwerk/ipc/NeckoParent.cpp 2015-06-03 22:46:41.000000000 +0200 -+++ b/netwerk/ipc/NeckoParent.cpp 2015-06-08 01:16:10.200055747 +0200 -@@ -359,7 +359,7 @@ - RtspChannelParent* p = static_cast<RtspChannelParent*>(aActor); - return p->Init(aConnectArgs); - #else -- return nullptr; -+ return false; - #endif - } - diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index 16f77f72e..ee88c6d56 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -1,21 +1,34 @@ diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js ---- a/browser/app/profile/icecat.js 2014-10-09 12:56:31.000000000 -0200 -+++ b/browser/app/profile/icecat.js 2014-10-21 14:05:40.131766712 -0200 -@@ -281,11 +281,6 @@ - pref("browser.slowStartup.timeThreshold", 50000); +--- a/browser/app/profile/icecat.js 2015-08-23 17:05:03.000000000 -0300 ++++ b/browser/app/profile/icecat.js 2015-08-25 04:49:18.450526750 -0300 +@@ -279,11 +279,6 @@ + pref("browser.slowStartup.timeThreshold", 40000); pref("browser.slowStartup.maxSamples", 5); -// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into -// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream -// repackager of this code using an alternate snippet url, please keep your users safe --pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.mozilla.com/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/"); +-pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.cdn.mozilla.net/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/"); - pref("browser.enable_automatic_image_resizing", true); + pref("browser.casting.enabled", false); pref("browser.chrome.site_icons", true); - pref("browser.chrome.favicons", true); +@@ -2080,12 +2075,6 @@ + pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%"); + pref("pfs.filehint.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%"); + +-// I'm feeling Ducky. +-pref("keyword.URL", "https://duckduckgo.com/html?t=gnu&q=!+"); +-pref("browser.search.defaultenginename", "DuckDuckGo"); +-pref("browser.search.order.extra.duckduckgo", "DuckDuckGo"); +-pref("browser.search.showOneOffButtons", false); +- + // https://directory.fsf.org/wiki/Disable_DHE + pref("security.ssl3.dhe_rsa_aes_128_sha", false); + pref("security.ssl3.dhe_rsa_aes_256_sha", false); diff -Nur a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css ---- a/browser/base/content/abouthome/aboutHome.css 2014-10-09 12:53:31.000000000 -0200 -+++ b/browser/base/content/abouthome/aboutHome.css 2014-10-21 14:11:09.936570764 -0200 +--- a/browser/base/content/abouthome/aboutHome.css 2015-07-13 19:10:24.000000000 -0300 ++++ b/browser/base/content/abouthome/aboutHome.css 2015-08-18 02:37:30.095295232 -0300 @@ -49,11 +49,6 @@ background-repeat: no-repeat; } @@ -34,7 +47,7 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/ height: 28px; - width: 70px; - min-width: 70px; -+ width: 47px; ++ width: 28px; } #searchText { @@ -158,9 +171,9 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/ } diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js ---- a/browser/base/content/abouthome/aboutHome.js 2014-10-09 12:53:31.000000000 -0200 -+++ b/browser/base/content/abouthome/aboutHome.js 2014-10-21 14:21:10.012011384 -0200 -@@ -3,149 +3,44 @@ +--- a/browser/base/content/abouthome/aboutHome.js 2015-07-13 19:10:24.000000000 -0300 ++++ b/browser/base/content/abouthome/aboutHome.js 2015-08-18 02:40:01.024730697 -0300 +@@ -3,149 +3,54 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ const SEARCH_ENGINES = { @@ -290,41 +303,51 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a - "k4w0jAcTAyllnBoh9Kxw/tEdS8cuT0WyH4vX1PYD5qMBzQDE2eFDxz09zsscWuwVHX6a8YwaFAiM" + - "NAkHr4vdUdf82rQN6JwnSl4N4vAxeKdxP2A+mjXuKTvcXcY9TdOnyxPk4zKZ/vbRAqe75C3QfZZY" + - "0P/y6/7299z+H4QrdGsoib8JAAAAAElFTkSuQmCC" -+ "DuckDuckGo HTML": { -+ image: "data:image/png;base64," + -+ "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" ++ "searx": { ++ image: "data:image/png;base64,\ ++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" } }; @@ -345,7 +368,7 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a // This global tracks if the page has been set up before, to prevent double inits let gInitialized = false; let gObserver = new MutationObserver(function (mutations) { -@@ -153,7 +48,6 @@ +@@ -153,7 +58,6 @@ if (mutation.attributeName == "searchEngineName") { setupSearchEngine(); if (!gInitialized) { @@ -353,7 +376,7 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a gInitialized = true; } return; -@@ -178,118 +72,6 @@ +@@ -178,118 +82,6 @@ window.removeEventListener("resize", fitToWidth); }); @@ -472,7 +495,7 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a function onSearchSubmit(aEvent) { let searchTerms = document.getElementById("searchText").value; -@@ -339,159 +121,6 @@ +@@ -339,159 +131,6 @@ } @@ -633,8 +656,21 @@ diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/a if (window.scrollMaxX) { document.body.setAttribute("narrow", "true"); diff -Nur a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml ---- a/browser/base/content/abouthome/aboutHome.xhtml 2014-10-09 12:53:31.000000000 -0200 -+++ b/browser/base/content/abouthome/aboutHome.xhtml 2014-10-21 14:23:10.525956357 -0200 +--- a/browser/base/content/abouthome/aboutHome.xhtml 2015-07-13 19:10:24.000000000 -0300 ++++ b/browser/base/content/abouthome/aboutHome.xhtml 2015-08-18 02:41:35.756857459 -0300 +@@ -90,10 +90,10 @@ + <img src="chrome://branding/content/about-logo.png"/> + + <div id="searchContainer"> +- <form name="searchForm" id="searchForm" action="https://duckduckgo.com/html/"> ++ <form name="searchForm" id="searchForm" action="https://searx.laquadrature.net/"> + <input type="text" name="q" value="" id="searchText" maxlength="256" + autofocus="autofocus"/> +- <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label; DuckDuckGO"/> ++ <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label; searx"/> + </form> + </div> + @@ -101,6 +101,7 @@ <div class="spacer"/> @@ -655,8 +691,8 @@ diff -Nur a/browser/base/jar.mn b/browser/base/jar.mn content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png) content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png) diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd ---- a/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-27 16:19:19.000000000 -0200 -+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-29 12:19:21.741429014 -0200 +--- a/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-08-23 17:05:01.000000000 -0300 ++++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-08-25 04:47:50.321608830 -0300 @@ -13,17 +13,6 @@ <!ENTITY abouthome.searchEngineButton.label "Search"> @@ -674,16 +710,16 @@ diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales - <!ENTITY abouthome.bookmarksButton.label "Bookmarks"> <!ENTITY abouthome.historyButton.label "History"> - <!ENTITY abouthome.settingsButton.label "Settings"> + <!-- LOCALIZATION NOTE (abouthome.preferencesButtonWin.label): The label for the diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties ---- a/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-27 16:20:32.000000000 -0200 -+++ b/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-29 12:21:13.202346944 -0200 +--- a/browser/locales/en-US/chrome/browser-region/region.properties 2015-07-13 19:14:26.000000000 -0300 ++++ b/browser/locales/en-US/chrome/browser-region/region.properties 2015-08-18 02:43:13.382178053 -0300 @@ -3,17 +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 ++browser.search.defaultenginename=searx # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google @@ -694,9 +730,9 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow -# selection UI -browser.contentHandlers.types.0.title=My Yahoo! -browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s -+browser.search.order.1=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=searx ++browser.search.order.1=searx ++browser.search.order.2=DuckDuckGo HTML ++browser.search.order.3=DuckDuckGo Lite # increment this number when anything gets changed in the list below. This will # cause IceCat to re-read these prefs and inject any new handlers into the @@ -753,8 +789,8 @@ diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/ </DL><p> </DL><p> diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm ---- a/browser/modules/AboutHome.jsm 2014-10-09 12:53:30.000000000 -0200 -+++ b/browser/modules/AboutHome.jsm 2014-10-21 14:54:12.086062616 -0200 +--- a/browser/modules/AboutHome.jsm 2015-08-23 17:04:41.000000000 -0300 ++++ b/browser/modules/AboutHome.jsm 2015-08-25 04:52:43.993422621 -0300 @@ -8,7 +8,7 @@ let Ci = Components.interfaces; let Cu = Components.utils; @@ -764,9 +800,9 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/Services.jsm"); -@@ -18,66 +18,6 @@ - XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts", - "resource://gre/modules/FxAccounts.jsm"); +@@ -20,68 +20,6 @@ + XPCOMUtils.defineLazyModuleGetter(this, "Promise", + "resource://gre/modules/Promise.jsm"); -// Url to fetch snippets, in the urlFormatter service format. -const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl"; @@ -775,7 +811,9 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm -const STARTPAGE_VERSION = 4; - -this.AboutHomeUtils = { -- get snippetsVersion() STARTPAGE_VERSION, +- get snippetsVersion() { +- return STARTPAGE_VERSION; +- }, - - /* - * showKnowYourRights - Determines if the user should be shown the @@ -831,14 +869,14 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm /** * This code provides services to the about:home page. Whenever * about:home needs to do something chrome-privileged, it sends a -@@ -202,18 +142,9 @@ - ss.promiseInitialized.then(function() { +@@ -246,18 +184,9 @@ + }).then(function(engineName) { let data = { showRestoreLastSession: ss.canRestoreLastSession, - snippetsURL: AboutHomeUtils.snippetsURL, - showKnowYourRights: AboutHomeUtils.showKnowYourRights, - snippetsVersion: AboutHomeUtils.snippetsVersion, - defaultEngineName: Services.search.defaultEngine.name + defaultEngineName: engineName }; - if (AboutHomeUtils.showKnowYourRights) { @@ -847,6 +885,6 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm - Services.prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true); - } - - if (target) { + if (target && target.messageManager) { target.messageManager.sendAsyncMessage("AboutHome:Update", data); } else { diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index 4f8fc3aea..d85989194 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -14,7 +14,7 @@ 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 --with-system-libvpx ac_add_options --with-system-icu ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite @@ -34,3 +34,5 @@ ac_add_options --disable-debug-symbols # Parabola features ac_add_options --disable-safe-browsing +ac_add_options --disable-url-classifier +ac_add_options --disable-eme diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo deleted file mode 100644 index 71ba205a4..000000000 --- a/libre/icecat/mozconfig.pgo +++ /dev/null @@ -1,3 +0,0 @@ - -# PGO -mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run' diff --git a/libre/icecat/remove-google-play-services-support.patch b/libre/icecat/remove-google-play-services-support.patch new file mode 100644 index 000000000..f184b15ad --- /dev/null +++ b/libre/icecat/remove-google-play-services-support.patch @@ -0,0 +1,64 @@ +diff -Nur a/configure b/configure +--- a/configure 2015-08-23 17:05:16.000000000 -0300 ++++ b/configure 2015-08-25 17:13:48.155780403 -0300 +@@ -18883,46 +18883,6 @@ + + + +-if test -n "$MOZ_NATIVE_DEVICES" ; then +- +- +- echo $ac_n "checking for google play services""... $ac_c" 1>&6 +-echo "configure:18891: checking for google play services" >&5 +- GOOGLE_PLAY_SERVICES_LIB="${ANDROID_SDK_ROOT}/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar" +- GOOGLE_PLAY_SERVICES_RES="${ANDROID_SDK_ROOT}/extras/google/google_play_services/libproject/google-play-services_lib/res" +- +- +- if ! test -e $GOOGLE_PLAY_SERVICES_LIB ; then +- { echo "configure: error: You must download Google Play Services to build with native video casting support enabled. Run the Android SDK tool and install Google Play Services under Extras. See http://developer.android.com/google/play-services/setup.html for more info. (looked for $GOOGLE_PLAY_SERVICES_LIB) " 1>&2; echo "configure: error: You must download Google Play Services to build with native video casting support enabled. Run the Android SDK tool and install Google Play Services under Extras. See http://developer.android.com/google/play-services/setup.html for more info. (looked for $GOOGLE_PLAY_SERVICES_LIB) " 1>&5; exit 1; } +- fi +- echo "$ac_t""$GOOGLE_PLAY_SERVICES_LIB" 1>&6 +- +- ANDROID_APPCOMPAT_LIB="$ANDROID_COMPAT_DIR_BASE/v7/appcompat/libs/android-support-v7-appcompat.jar" +- ANDROID_APPCOMPAT_RES="$ANDROID_COMPAT_DIR_BASE/v7/appcompat/res" +- echo $ac_n "checking for v7 appcompat library""... $ac_c" 1>&6 +-echo "configure:18904: checking for v7 appcompat library" >&5 +- if ! test -e $ANDROID_APPCOMPAT_LIB ; then +- { echo "configure: error: You must download the v7 app compat Android support library when targeting Android with native video casting support enabled. Run the Android SDK tool and install Android Support Library under Extras. See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_APPCOMPAT_LIB)" 1>&2; echo "configure: error: You must download the v7 app compat Android support library when targeting Android with native video casting support enabled. Run the Android SDK tool and install Android Support Library under Extras. See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_APPCOMPAT_LIB)" 1>&5; exit 1; } +- fi +- echo "$ac_t""$ANDROID_APPCOMPAT_LIB" 1>&6 +- +- +- +- ANDROID_MEDIAROUTER_LIB="$ANDROID_COMPAT_DIR_BASE/v7/mediarouter/libs/android-support-v7-mediarouter.jar" +- ANDROID_MEDIAROUTER_RES="$ANDROID_COMPAT_DIR_BASE/v7/mediarouter/res" +- echo $ac_n "checking for v7 mediarouter library""... $ac_c" 1>&6 +-echo "configure:18915: checking for v7 mediarouter library" >&5 +- if ! test -e $ANDROID_MEDIAROUTER_LIB ; then +- { echo "configure: error: You must download the v7 media router Android support library when targeting Android with native video casting support enabled. Run the Android SDK tool and install Android Support Library under Extras. See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_MEDIAROUTER_LIB)" 1>&2; echo "configure: error: You must download the v7 media router Android support library when targeting Android with native video casting support enabled. Run the Android SDK tool and install Android Support Library under Extras. See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_MEDIAROUTER_LIB)" 1>&5; exit 1; } +- fi +- echo "$ac_t""$ANDROID_MEDIAROUTER_LIB" 1>&6 +- +- +-fi +- +- +- +- + if test "$MOZ_ENABLE_GTK" -o "$MOZ_ENABLE_QT" + then + succeeded=no +@@ -29180,13 +29140,6 @@ + (''' MOZ_OFFICIAL_BRANDING ''', r''' $MOZ_OFFICIAL_BRANDING ''') + (''' MOZ_BRANDING_DIRECTORY ''', r''' $MOZ_BRANDING_DIRECTORY ''') + (''' MOZ_DISTRIBUTION_ID ''', r''' $MOZ_DISTRIBUTION_ID ''') +- (''' MOZ_NATIVE_DEVICES ''', r''' $MOZ_NATIVE_DEVICES ''') +- (''' GOOGLE_PLAY_SERVICES_LIB ''', r''' $GOOGLE_PLAY_SERVICES_LIB ''') +- (''' GOOGLE_PLAY_SERVICES_RES ''', r''' $GOOGLE_PLAY_SERVICES_RES ''') +- (''' ANDROID_APPCOMPAT_LIB ''', r''' $ANDROID_APPCOMPAT_LIB ''') +- (''' ANDROID_APPCOMPAT_RES ''', r''' $ANDROID_APPCOMPAT_RES ''') +- (''' ANDROID_MEDIAROUTER_LIB ''', r''' $ANDROID_MEDIAROUTER_LIB ''') +- (''' ANDROID_MEDIAROUTER_RES ''', r''' $ANDROID_MEDIAROUTER_RES ''') + (''' _PANGOCHK_CFLAGS ''', list(r''' $_PANGOCHK_CFLAGS '''.split())) + (''' _PANGOCHK_LIBS ''', list(r''' $_PANGOCHK_LIBS '''.split())) + (''' MOZ_PANGO_CFLAGS ''', list(r''' $MOZ_PANGO_CFLAGS '''.split())) diff --git a/libre/icecat/rhbz-966424.patch b/libre/icecat/rhbz-966424.patch deleted file mode 100644 index 9a1c9e2b4..000000000 --- a/libre/icecat/rhbz-966424.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur mozilla-release.orig/toolkit/modules/CertUtils.jsm mozilla-release/toolkit/modules/CertUtils.jsm ---- mozilla-release.orig/toolkit/modules/CertUtils.jsm 2014-10-11 07:06:48.000000000 -0200 -+++ mozilla-release/toolkit/modules/CertUtils.jsm 2014-10-16 03:44:30.226448002 -0200 -@@ -174,7 +174,9 @@ - } - - function isBuiltinToken(tokenName) { -- return tokenName == "Builtin Object Token"; -+ return tokenName == "Builtin Object Token" || -+ tokenName == "Default Trust" || -+ tokenName == "System Trust"; - } - - /** diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index 476ea454e..3d57c4e32 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -4,9 +4,9 @@ epoch=1 _pkgbase=icedove pkgbase=$_pkgbase-l10n -_pkgver=31.7.0 -pkgver=31.7.0.deb1 -pkgrel=1 +_pkgver=38.1.0 +pkgver=38.1.0.deb1 +pkgrel=3 pkgdesc="Language pack for Debian ${_pkgbase^}." arch=('any') url="http://packages.debian.org/sid/icedove" @@ -23,8 +23,10 @@ _languages=( 'br "Breton"' 'ca "Catalan"' 'cs "Czech"' + 'cy "Welsh"' 'da "Danish"' 'de "German"' + 'dsb "Lower Sorbian"' 'el "Greek"' 'en-GB "English (British)"' 'en-US "English (US)"' @@ -40,6 +42,7 @@ _languages=( 'gl "Galician"' 'he "Hebrew"' 'hr "Croatian"' + 'hsb "Upper Sorbian"' 'hu "Hungarian"' 'hy-AM "Armenian"' 'id "Indonesian"' @@ -73,7 +76,7 @@ _languages=( ) pkgname=() -source=('brand.dtd' 'brand.properties') +source=('brand.dtd' 'brand.properties' 'region.properties') _url=https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$_pkgver/linux-i686/xpi for _lang in "${_languages[@]}"; do @@ -100,6 +103,7 @@ _package() { rm -v icedove-l10n-$_pkgver-$1.xpi install -vDm644 $srcdir/brand.dtd $1/chrome/$1/locale/$1/branding install -vDm644 $srcdir/brand.properties $1/chrome/$1/locale/$1/branding + install -vDm644 $srcdir/region.properties $1/chrome/$1/locale/$1/messenger-region rm -rv $1/chrome/{.mkdir.done,$1/locale/$1/global-platform/{mac,win}} sed -i -e 's/thunderbird/icedove/' $1/install.rdf cd $1 @@ -114,58 +118,62 @@ _package() { sha256sums=('49b419449431d8d64e20427a2e7105e3ac1ffc41e677a5f9a8eb276f5b82df4a' 'acc2cf95661be7cb8928fca89e08d0681685409ff2428e4e3d25baf1af427b38' - 'fac353e1067852ccac7bc23a958c54fdebd2aad30ad9551a07deb23811046d79' - '4e39fb7792c7fe787bb9d9f3a03ac57da15e9b353a51f1602afcffc3e0e0ffa8' - '8be5b81c0a747d89ff9f586d726706718711a01ffd70ecbed9fe00352fb795dd' - '7ab3641502204c37108430f5be2f78a161b1aa5a63561c8edcf0186a7f509df6' - '51cf109e8416775e656a1431630f3f4a6b0bde3e44744449283d0666284698bf' - '97bbaea547340a56f528d8675b04a596369fb9b63245e20acd76d74211f7a668' - '49d3df068e9edcf17ed99754bd45c7d00c50f4bacd7a5484ab86018197258523' - 'd491ebf429f56ad21632bc476f9364857ee838a330ff1b966cae2e8ec5a944e8' - 'c95a6ce7d22eca56f365f05805393a1b52a5427af02a447f9dba1cd1559dd7c7' - '0debd56af6d8872d525e62ae8fd609620c3a66a425817dec83d701346fd766ba' - '9b3ca0a7df6b8bc91274b2b757dfb909beb04815cf51b377b22755114776b536' - 'd8d4dc74889792dc9b434f11a8934d5363dafb07aada75068809f1d3ceba7d66' - 'c4e5def480042a55d8532129f3bd5226004b98f5dd3991eeb429a35152f4391e' - 'e0bf50d99447934d0f9865329469559308ab54c32d2d64321a9742b3aa4be063' - '162a5c3879bb4d826b8cfea0dd68cf13f29d417bac79cc2482dd78d76cc0a8f7' - '9f5846d2147eeb8a834a282abc80ef1cd58389faaf4a0dfedfc4e91cd28faaf5' - 'bba78265515862435a7aa19345460c0bdd192be207550f6a9ac0cdb7de535ac8' - 'bdf3d4bf05bc66951c9d861af635c791fd3513f578fe32a9ccc150aa81ba6304' - '5700997d79942d74db684fddb255ee1e5a1b10b0c7c0df875b917dbba91f9607' - 'ed3f3e4bbba12218a0025747257cdaefceb4f37ce65fbf8e3ec1746cacf62d62' - '788127820d6404540b698794a9008990f77005056ec1f15da05785087729c178' - 'f688f29b6e4032d6f6fd9b3e7ae20d2f94f7ae34e977bcb1ea1e9b4393ac9f4d' - '52ba67336de4d8d19ac1d29d22df362af9e8b43a2cb800a0303b51e0b6d4c4fb' - '39519209cf6c19208e8c677439b3cad194d9d14f7ff3814c189890d6285b7af7' - '7abab0668491b42dff80e8b656407b9489f8a133a58f0ca42f8c83a1973efd77' - 'ec4d3c63698bc825fee4a2dedde66a7796fef0efee8df307d8f233f382ba784a' - 'f22b7f8a56d6b92448d4b1cf471fdad56cef13e8668a472e833a8efc8400b53f' - '40c62742c10f08f1b93e68b026b48b849dcf323f99987720be19c0bc0f4fbb7f' - '1007cd1f3f72deecdbfbb3ec54837955f53235de4b39405158eec9dd74750246' - '6de47224c4342a1fc1c81d8ec0bab90cdacb4b4e54709e9590c2bd341fbfbae7' - '4e3f6637cccafab04d665bb66b2d808797384c3b322a4375efcb9a3be480fe7f' - '6c962ee2ce9051223897ace9fa6d7c60ffb7e95b103a52bad0f17803efcfeaf2' - '9dbde5ddc20a9512320490318f5f6278d5626357f3b17401482a439a4f6be654' - '51a38f39dfc18d945a0985a23d0b7770f8fe3cebf8a28f22fd92bb288345a9b0' - '784ba5505afef70f492a85651c632da974c01bf1c5a945ff132df40b077304d7' - 'cfd312de7632a96facd36acdc00a04bc571101d655c5c8f70300d3f982b58366' - 'e444889660a60b44a3e5e6fc94972e2b8a2b97e0fa8959b41bcacacfc8be931d' - '3ef71ff4f72e28f15ea76764be9179cefdbf92a2270e87dad557cbf6d6c44f36' - '298f9a4a205a77e471f96e38d12dbba00b6fb9ddf89b496e8b5eb106d1f33c97' - 'e01d684612fd224536e9cb21f44ace5cab81bf8fd15e8e5265847df1b2407a59' - '0d2606836428595232daf0aedbafea4935e641658712fd99e34668e686c0d2e7' - '7de4b8e3ffcf3ac7ced5aeae0ca84d1e9c8603646e54473665505e1f1ac66925' - '38b372432b02c42703e3f425946cee6a42918d574f7bff7df5f9997ddb076f64' - '3441d57aeedf15c5a29800e8f544b8571d41e5ed5a381d8bb2087cda97074970' - 'dcd56d713daa7b6fb03d64219797e159eab8bef2e7eb9bd7999c0b285a24d153' - '7e7fb8287b9255aa8988bf63677e0bed8ae30c0da5ac7d83ba1300ba2bca41d3' - 'b9270889a4905233e450be25d61e4a1359a057bc6c021d5aba23a941cde56123' - '0ef471cf54c052214d5169189a72efc0e8d65801e482aeff413ffc7c822c1651' - '803529203aded6bf1194a6d5d575f5e16f8a4a249a68878650c5469e92512923' - '3529d8a55ea5458edf24059d55178b6c4935aa82b604bc1c46e4b4bffb88234b' - 'e83e64f528b12b1550efb28ba4dea51e7912ab2af470c1382d78e01d9dc3a3ff' - '12c2001834af439d1a0f95ed3f416788672d41c5b02481d26e54f66e721c83a6' - '7a20d9842117105f4ac641d602977cf20d4149564593adba0f3415976fd7b52d' - 'f582fac503f385ceb59761134ed24170ded9f65861106ff77219040b169e6a37' - '3b60993a3c85f61ef57b02334d3a71d864e9e6609ec29f398c1f60094cad43a3') + 'e6edcc7c478d73ca5a17e4889acd302d55201ec5c29de545d3f44165201923db' + '8bc4384ede05efcb02e67a8888651a81f22cbaea3bbf6072e156d707e2a9ad49' + '2a8b35fb65014cc2789e38a396a9c153b8726f5cc5c50ec042e29d9c7972b4fb' + '0bd3e4dcc65e44d62127fb1832803f75a0bad4cd179135375460327363e81864' + '806a7f2d151db0f5334b2791dbd708b3f631b2ec214b2f6edfa7aa95abe0b59a' + '5f16873ea47e84fb01a263f7ab59a90188ad6c5b57ab13b90c925b4a8d0bf06a' + 'c976d2fdb520e178df568a5824f4416b043f9ebbe436ddbfb81ef5b5f972d6e9' + '82a2eef48fefe335f1f8d53d21861a45f7b73b4ad8b65c912f9820bf69273309' + 'a1e0b882b599705e1150a66139fee97dc009be2a8e64e6a7c2b1158373bfd3ca' + '877cbe5d9dba3f90c2754788baaa137fb45bf9e2d071a50df69e970f341a6365' + 'fad0fc825311a1b546eb117c8cc838f542485ff87cb71c5a656c449366a71526' + 'bc900b8f0f2db4c0e5527780db826789d61bf5b265ccf62033909fbb4f21e12e' + '06ebda860118ac5833c6d8884a4e94bab7265622a48978c0e1b472055f784314' + 'd6df1e34d17723f2b52aecea1fab9af964bd936816f51e5dc0f335bbf59a9a6c' + '07e443159860c85c82f01dbc57e0c83904fa7788dd69fb234970ef0484afdc81' + 'ef68841d061f743ab199e087ab45c12a2f1c4b481d2017f535bcadab2e8902ad' + 'c5b0d927e51ef06414cc14a64ab84d0d4e3b86f2833dd0bc1211a056507d425d' + '79bb32e02108f6f8971c6504adc39ff45a202cb91b6e7daca286a3b0aaa6e1b0' + '9fe401fa441232dd29fee49d26fcb65af34ccffc2666bf2fb09546a947d91e9d' + '0d54de9beec9e2f232a016d93d0b626bf8be86a1966ad6fb02c8d1cfe531a3f0' + 'cc7bf6325bf7d4c914cb7958687c776db8e2444cd969ac16e91d6a67be0ab729' + '56dbffbc5e1286f71eeb33961e209a6c6a9dd3916c4b3432733baf8f10c10e77' + '00ec21c0bab139981ab81902051d7c59a5fa3a6ae7865e9613ebd95c0fe1bf87' + '76384620c71115c8ebb3afcc4b30de9de45d1230e44983b4bd3d1473bb9c144e' + '1da8565cafbb009abb0b0424fc15e0dc2bcf2c3048e14f7e1cf5e62bb5618835' + 'ff3d29d1a050b74e64e0a4450b65edb247a5eb36a1b8df6b57dc3851b1658fd3' + 'aab3240dca233f9e6ec9077be40a3d0033d75ccbd196a9ccce2726261c9d4c41' + 'f368ccd53d7d405c07149b351f56d391142b40e8774d9d7fa623ff3318428b6a' + 'f47a8a2ff662acef03541ead6caf3e900706ce348b7577cd656222e9dcc2c47a' + 'c8393cb2f5c8aab62fec71e53f19791e7ce4d3acc37814a4796e7b390a4e1fcf' + '56454db77528fd2bc02abd4f4ecde69adbe278cbe807842e3e92d709d5df526c' + '913db42b7530f55a8f3836d4dd493cf45df86509c77cfc64aca28c4bf60c6321' + '0a0194046282ea36e3c48238f08bfa9ffff07531d473b9a800628b6fb22b4970' + '2b7659c9a0c57e608d05f64bff90b3f6e631ce089ed1135465e89a133482fca7' + 'c790816d9a735d0ff3e3d82516b6c10076a94c6e278fdea05f04d52615984257' + '42a147ac06a0cd7995a78f014259464db2e51391aec4ea16a548e0d5f156d951' + 'bbdb182ae21c8b8da1175b5a936e8563250838e538004a45b7847d27a0b192ad' + 'e4b10c9cfd80c6f9b683880e454cc3dcd2e9eb01acdc0090e73b6c6b6b71a7d3' + '032f473e1fce313d8d9cdcc49cdaf390711c266069c45df4dbee2e9c81e19b0d' + '361710679e3229b98aa5785b1cf36afa493e5ded84353a69574e4cbe7f5bbe29' + '53afb6a6ff09df13b97ffc88f95a527d860e751fd79e873a78be2e7bd977a15e' + 'd9c770408d6b8cc52df4113ccfeb339fc7e34ca45a62df49ee5f24e70a5e3503' + '8160379e9ff6319939e7a9e2d37c0a7f66f436796f16c0c3ef8a70f1a2e17ea0' + 'd6354d745df58c48d15792c35aa8f4874d11bff0980df6b567de58f659357efe' + 'fbc4bb3603cd5927c98e82ca83e830bd0c0807cc63ee0215f60e1cea66cc4400' + '2e768e1a2e9ae04bafea1948c19b2b6e83f436f3a2841a94550f95bde7b30b42' + '85ab5454186b1a35c1268a8854b2407f1a260857a092de2cdc1c0fb84e278104' + '8df4c4ca6dbb901f419b69b37da8b0762483e080513b6cebe0d4424444f6ce25' + '8b34d932a49e56cc47b9dae57f7a515b40bcc1ae4efa50f1dd275855abb30659' + '7d2bbe2b04052165bde61b4e24f2c928460f914a57c8bec36d3496de67d5dd66' + '0e41b9ab3ec7853e3c8d19ad6380598ccc4d04884426f64be577a045f876cdd6' + 'c2d6d4a751580f2107aaeec7f23584ca7a8803cd15289fbf863d124a1801ffee' + '59cfe9b9ee411b92e288d0050ba3baddd5bc7bb779ed4fbff7681ae252053133' + '891b12e9f7722c570189c0c47a814e96ac3ef9e16b2d50625a4766085649d16f' + '5b42a203b0a6938a9967ce982fb800bd4db8ef0d2def1b9966e1352e843729fc' + 'e32214709147900c4336af83dce5445614b72d4059dad67b6f703a0853ec2ad1' + '6d9b056f1d13e7dd95b79780c65e202c5c428f87e206370a5264644579a41626' + '9d00bbc2f01c6974877923f9d770e16112b5e859788a728a7244052361f1ea7b' + '65dd33db3a18a4f8eeb54b953650a3a592a8821765e44888849f15531bcf88ca') diff --git a/libre/icedove-l10n/region.properties b/libre/icedove-l10n/region.properties new file mode 100644 index 000000000..9bc71fa63 --- /dev/null +++ b/libre/icedove-l10n/region.properties @@ -0,0 +1,27 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# Default search engine +browser.search.defaultenginename=searx + +# Search engine order (order displayed in the search bar dropdown)s +browser.search.order.1=searx +browser.search.order.2=DuckDuckGo HTML +browser.search.order.3=DuckDuckGo Lite + +# To make mapit buttons to disappear in the addressbook, specify empty string. For example: +# mail.addr_book.mapit_url.format= +# The format for "mail.addr_book.mapit_url.format" is: +# @A1 == address, part 1 +# @A2 == address, part 2 +# @CI == city +# @ST == state +# @ZI == zip code +# @CO == country +mail.addr_book.mapit_url.format= +mailnews.messageid_browser.url= + +# Recognize non-standard versions of "Re:" in subjects from localized versions of MS Outlook et al. +# Specify a comma-separated list without spaces. For example: mailnews.localizedRe=AW,SV +mailnews.localizedRe= diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD index d86927420..792fcdd4a 100644 --- a/libre/icedove/PKGBUILD +++ b/libre/icedove/PKGBUILD @@ -3,7 +3,7 @@ # We're getting this from Debian Sid _debname=icedove -_debver=31.7.0 +_debver=38.1.0 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -11,13 +11,16 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } pkgname=${_debname} epoch=1 pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') url="http://packages.debian.org/sid/${pkgname}" -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx=1.4.0' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') -makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse' 'autoconf2.13' 'quilt' 'jquery-ui') +depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' + 'dbus-glib' 'alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme' + 'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite' 'mozilla-searchplugins') +makedepends=('unzip' 'zip' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse' + 'pkg-config' 'autoconf2.13' 'quilt' 'jquery-ui') optdepends=('libcanberra: for sound support') replaces=('thunderbird' "${pkgname}-libre") conflicts=('thunderbird' "${pkgname}-libre") @@ -27,55 +30,49 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.xz" mozconfig ${pkgname}.desktop - ${pkgname}-install-dir.patch + changing-the-default-search-engine.patch vendor.js) -options=(!emptydirs) -sha256sums=('00ce17575690400e22e7ce21dc5b3b4f71092b7708ee9aad74448d1401da8794' - '04c30b4e72819b764bc463d36c39f55741d3e47ae994ba89fd14e63fe32c6561' - '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a' +options=(!emptydirs !makeflags) +sha256sums=('b59c74f67d2f9684d9cf0db62b5c60d3ef155807e17a91ebf0899dd55670f6a0' + '29de44253624814ae3ce3e0a6a786ba229c62e78d8c97e36257f730d38d542f7' + 'e3d0f5f78fede687dfc38a2787c2c8f33c8213be286abeb9176e3dcebabb0b74' '0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a' - '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d' - 'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec') + '9765d9bbcae82d0006766741c813840db46c56ee16f79d39b8d7d96d716ee2d7' + '798d5bff1e6025e9a803b67f629afac740f16e537b714ee7c7e829b2345fb6a2') prepare() { - export DEBIAN_BUILD="comm-esr31" + export DEBIAN_BUILD=comm-esr${pkgver%%.*} 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}" + mv debian ${srcdir}/${DEBIAN_BUILD} + cd ${srcdir}/${DEBIAN_BUILD} - mv debian/${pkgname}-branding "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}" + # Prepare branding for the Icedove packages + mkdir -v mail/branding/${pkgname} - cp -a debian/app-icons/${pkgname}big.svg debian/app-icons/${pkgname}_icon.svg - for i in 16x16 22x22 24x24 32x32 48x48 256x256; do - install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/mailicon${i/x*/}.png" + # Copy needed icons + cp -va debian/${pkgname}-branding/* mail/branding/${pkgname} + for i in 16 22 24 32 48 256; do + install -vDm 644 debian/app-icons/${pkgname}${i}.png mail/branding/${pkgname}/mailicon${i}.png done - for i in 48x48 64x64; do - install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/content/icon${i/x*/}.png" + for i in 48 64; do + install -vDm 644 debian/app-icons/${pkgname}${i}.png mail/branding/${pkgname}/content/icon${i}.png done + cp -va debian/preview.png mail/themes/linux/mail/preview.png - # We are doing it from sed commands - rm -v debian/patches/fixes/vp8_impl.cc-backporting-naming-for-constants.patch || true + # Useless since we are doing it ourselves + rm -v debian/patches/debian-hacks/changing-the-default-search-engine.patch || true quilt push -av - # Fix paths on makefile - sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/|topsrcdir = @top_srcdir@|; - s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|; - s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; - ' mail/branding/icedove/Makefile.in - - sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/[.][.]|topsrcdir = @top_srcdir@|; - s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|; - s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; - ' mail/branding/icedove/locales/Makefile.in - - # Fix package-manifest.in - sed -i '\|; Phishing Protection| s|$|\n#ifdef MOZ_SAFE_BROWSING|; - \|@BINPATH@/components/url-classifier[.]xpt| s|$|\n#endif| + # Remove url-classifier from package-manifest.in to build and disable Phishing Protection + sed -i '\|Phishing Protection|d + \|UrlClassifier|d + \|URLClassifier|d + \|url-classifier|d ' mail/installer/package-manifest.in # Fix branding @@ -88,62 +85,59 @@ prepare() { \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g; ' mail/app/profile/all-thunderbird.js - cp "${srcdir}/mozconfig" .mozconfig + cp -v ${srcdir}/mozconfig .mozconfig - # configure script misdetects the preprocessor without an optimization level + # Configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure - # Install to /usr/lib/$pkgname - patch -Np1 -i "$srcdir/${pkgname}-install-dir.patch" - - # Add symlinks to use jquery files built for us - ln -s /usr/share/javascript/jquery/jquery.min.js mail/jquery - ln -s /usr/share/javascript/jquery-ui/jquery-ui.min.js mail/jquery - - # Fixing for libvpx >= 1.4.0 - sed -i 's|IMG_FMT_I420|VPX_IMG_FMT_I420|; - s|PLANE_U|VPX_PLANE_U|; - s|PLANE_V|VPX_PLANE_V|; - s|PLANE_Y|VPX_PLANE_Y|; - s|VPX_VPX_PLANE_|VPX_PLANE_|; - ' mozilla/content/media/encoder/VP8TrackEncoder.cpp \ - mozilla/media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc + # Change the default search engine using our system-provided searchplugins + patch -Np1 -i ${srcdir}/changing-the-default-search-engine.patch + + # Add symlinks to use jquery files built by us + ln -vs /usr/share/javascript/jquery/jquery.min.js mail/jquery + ln -vs /usr/share/javascript/jquery-ui/jquery-ui.min.js mail/jquery } build() { - export DEBIAN_BUILD="comm-esr31" + export DEBIAN_BUILD=comm-esr${pkgver%%.*} - cd "${srcdir}/${DEBIAN_BUILD}" + cd ${srcdir}/${DEBIAN_BUILD} - export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${pkgname}" - export PYTHON="/usr/bin/python2" + export PYTHON=/usr/bin/python2 - make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" + make -f client.mk build } package() { - export DEBIAN_BUILD="comm-esr31" + export DEBIAN_BUILD=comm-esr${pkgver%%.*} + + cd ${srcdir}/${DEBIAN_BUILD} - cd "${srcdir}/${DEBIAN_BUILD}" + make -f client.mk DESTDIR=${pkgdir} install - make -j1 -f client.mk DESTDIR="${pkgdir}" install + install -vDm 644 ${srcdir}/vendor.js ${pkgdir}/usr/lib/${pkgname}/defaults/preferences/vendor.js - install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${pkgname}/defaults/preferences/vendor.js" + # Install Icedove menu icon + install -vDm 644 debian/${pkgname}.xpm ${pkgdir}/usr/share/pixmaps/${pkgname}.xpm - for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do - install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${pkgname}.png" + # Install Icedove icons + for i in 16 22 24 32 48 64 128 256; do + install -vDm 644 debian/app-icons/${pkgname}${i}.png ${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname}.png done - install -Dm644 "debian/app-icons/${pkgname}_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg" - - install -Dm644 "${srcdir}/${pkgname}.desktop" \ - "${pkgdir}/usr/share/applications/${pkgname}.desktop" - - rm -rf "${pkgdir}"/usr/lib/${pkgname}/{dictionaries,hyphenation,searchplugins} - 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/searchplugins "${pkgdir}/usr/lib/${pkgname}/searchplugins" - - # We don't want the development stuff - rm -r "${pkgdir}"/usr/{include,lib/${pkgname}-devel,share/idl} + install -vDm 644 debian/app-icons/${pkgname}big.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg + + # Install Icedove desktop + install -vDm 644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop + + # Use system-provided dictionaries + rm -vrf ${pkgdir}/usr/lib/${pkgname}/{dictionaries,hyphenation,searchplugins} + ln -vsf /usr/share/hunspell ${pkgdir}/usr/lib/${pkgname}/dictionaries + ln -vsf /usr/share/hyphen ${pkgdir}/usr/lib/${pkgname}/hyphenation + + # Use system-provided searchplugins + ln -vsf /usr/lib/mozilla/searchplugins ${pkgdir}/usr/lib/${pkgname}/searchplugins + + # Remove development stuff + rm -vr ${pkgdir}/usr/{include,lib/${pkgname}-devel,share/idl} } diff --git a/libre/icedove/changing-the-default-search-engine.patch b/libre/icedove/changing-the-default-search-engine.patch new file mode 100644 index 000000000..845e4f2fa --- /dev/null +++ b/libre/icedove/changing-the-default-search-engine.patch @@ -0,0 +1,31 @@ +diff -Nur comm-esr38.orig/mail/locales/en-US/chrome/messenger-region/region.properties comm-esr38/mail/locales/en-US/chrome/messenger-region/region.properties +--- comm-esr38.orig/mail/locales/en-US/chrome/messenger-region/region.properties 2015-07-07 14:34:06.000000000 -0300 ++++ comm-esr38/mail/locales/en-US/chrome/messenger-region/region.properties 2015-08-16 13:30:55.466053010 -0300 +@@ -3,12 +3,12 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + # Default search engine +-browser.search.defaultenginename=Bing ++browser.search.defaultenginename=searx + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Bing +-browser.search.order.2=Yahoo +-browser.search.order.3= ++browser.search.order.1=searx ++browser.search.order.2=DuckDuckGo HTML ++browser.search.order.3=DuckDuckGo Lite + + # To make mapit buttons to disappear in the addressbook, specify empty string. For example: + # mail.addr_book.mapit_url.format= +@@ -19,8 +19,8 @@ + # @ST == state + # @ZI == zip code + # @CO == country +-mail.addr_book.mapit_url.format=http://maps.google.com/maps?q=@A1%20@A2%20@CI%20@ST%20@ZI%20@CO +-mailnews.messageid_browser.url=http://groups.google.com/search?as_umsgid=%mid ++mail.addr_book.mapit_url.format= ++mailnews.messageid_browser.url= + + # Recognize non-standard versions of "Re:" in subjects from localized versions of MS Outlook et al. + # Specify a comma-separated list without spaces. For example: mailnews.localizedRe=AW,SV diff --git a/libre/icedove/icedove-install-dir.patch b/libre/icedove/icedove-install-dir.patch deleted file mode 100644 index 0c7ffaa4a..000000000 --- a/libre/icedove/icedove-install-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr comm-esr31.orig/mozilla/config/baseconfig.mk comm-esr31/mozilla/config/baseconfig.mk ---- comm-esr31.orig/mozilla/config/baseconfig.mk 2014-07-22 09:44:22.000000000 +0300 -+++ comm-esr31/mozilla/config/baseconfig.mk 2014-07-22 09:46:45.000000000 +0300 -@@ -4,7 +4,7 @@ - # whether a normal build is happening or whether the check is running. - includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - ifndef TOP_DIST - TOP_DIST = dist diff --git a/libre/icedove/mozconfig b/libre/icedove/mozconfig index 3987c2c5a..20cb08590 100644 --- a/libre/icedove/mozconfig +++ b/libre/icedove/mozconfig @@ -3,10 +3,11 @@ ac_add_options --enable-application=mail ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib +ac_add_options --enable-pie # Icedove -ac_add_options --disable-official-branding ac_add_options --with-branding=mail/branding/icedove +#ac_add_options --enable-calendar # System libraries ac_add_options --with-system-nspr @@ -17,12 +18,12 @@ 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 --with-system-icu 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 @@ -44,4 +45,6 @@ export MOZILLA_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1 # Parabola features +ac_add_options --disable-official-branding ac_add_options --disable-safe-browsing +ac_add_options --disable-url-classifier diff --git a/libre/icedove/vendor.js b/libre/icedove/vendor.js index 05cce3d61..4d58bfc4a 100644 --- a/libre/icedove/vendor.js +++ b/libre/icedove/vendor.js @@ -18,3 +18,6 @@ pref("social.directories", ""); // Disable the GeoLocation API for content pref("geo.enabled", false); + +// Pointing the "Help -> What's new" menu entry to mozilla.debian.net +pref("mailnews.start_page.override_url", "http://wiki.debian.org/Icedove/WhatsNew38"); diff --git a/libre/iceweasel-l10n/Makefile b/libre/iceweasel-l10n/Makefile deleted file mode 100644 index d596111f3..000000000 --- a/libre/iceweasel-l10n/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/make -f -# Use this script to update the PKGBUILD's list of langpacks. -# This script depends on: -# - coreutils -# - pacman -# - sed - -# Variables: -# This is to get it from Debian Sid -debname=iceweasel-l10n -debver=9.0+debian -debrel=1 -debrepo=http://ftp.debian.org/debian/pool/main/ - -pkgver=9.0 -pkgrel=2.1 - -# Guts: ############################################################## - -default: PHONY all -all: PHONY - $(MAKE) clean - $(MAKE) PKGBUILD -.PRECIOUS: PKGBUILD - -PKGBUILD.list: Makefile - sed \ - -e 's/@DEBNAME@/$(debname)/' \ - -e 's/@DEBVER@/$(debver)/' \ - -e 's/@DEBREL@/$(debrel)/' \ - -e 's%@DEBREPO@%$(debrepo)%' \ - -e 's/@PKGVER@/$(pkgver)/' \ - -e 's/@PKGREL@/$(pkgrel)/' \ - -e "s/@LANGPACKS@/(phony)/" \ - -e '/CUT HERE/,$$d' \ - PKGBUILD.in > $@ - echo 'package() { exit 0; }' >> $@ - makepkg -gp $@ >> $@ -langpacks.txt: PKGBUILD.list Makefile - makepkg -dp $< - ls src/*/upstream | sed 's/\.xpi//' > $@ -PKGBUILD: PKGBUILD.in langpacks.txt Makefile - sed \ - -e 's/@DEBNAME@/$(debname)/' \ - -e 's/@DEBVER@/$(debver)/' \ - -e 's/@DEBREL@/$(debrel)/' \ - -e 's%@DEBREPO@%$(debrepo)%' \ - -e 's/@PKGVER@/$(pkgver)/' \ - -e 's/@PKGREL@/$(pkgrel)/' \ - -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \ - -e '/CUT HERE/d' \ - -e '/md5sums/,$$d' \ - PKGBUILD.in > $@ - makepkg -dg >> $@ - -clean: PHONY - rm -f PKGBUILD.list langpacks.txt - -.PHONY: PHONY FORCE diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index b75a01710..97ddcad1b 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: fauno <fauno@kiwwwi.com.ar> # Contributor: Figue <ffigue@gmail.com> -_debver=39.0.3 +_debver=40.0.3 _debrel=deb1 epoch=1 _pkgbase=iceweasel @@ -16,7 +16,7 @@ arch=('any') url="http://packages.debian.org/experimental/$_pkgbase" license=('MPL' 'GPL') depends=("$_pkgbase=$epoch:$pkgver") -makedepends=('unzip' 'zip') +makedepends=('unzip' 'zip' 'mozilla-searchplugins') _languages=( 'ach "Acholi"' @@ -137,7 +137,7 @@ _package() { bsdtar xf data.tar.xz mv -v usr/lib/iceweasel/browser/extensions/langpack-$1@iceweasel.mozilla.org.xpi . - rm -rv {control.tar.gz,data.tar.xz,debian-binary,etc,usr} + rm -rv {control.tar.gz,data.tar.xz,debian-binary,usr} rm -v $pkgbase-${1,,}_$_debver-${_debrel#deb}_all.deb unzip langpack-$1@iceweasel.mozilla.org.xpi -d $1 @@ -149,6 +149,9 @@ _package() { $1/browser/chrome/$1/locale/browser/devtools/webide.dtd \ $1/browser/chrome/$1/locale/browser/devtools/webide.properties rm -rv $1/chrome/$1/locale/$1/global-platform/{mac,win} + rm -rv $1/browser/chrome/$1/locale/browser/searchplugins + cp -av /usr/lib/mozilla/searchplugins $1/browser/chrome/$1/locale/browser + cd $1 zip -r langpack-$1@iceweasel.mozilla.org.xpi . mv -v langpack-$1@iceweasel.mozilla.org.xpi $srcdir @@ -159,92 +162,92 @@ _package() { "$pkgdir/usr/lib/iceweasel/browser/extensions/langpack-$1@iceweasel.mozilla.org.xpi" } -sha256sums=('6ab481740fdd48790329217a1bbe1fc7d2438bbdc1f767e21ba3d66084f4afcf' - '917ae11fc1f976e2ad1bd52ec55a724ea3bbfc3a0096890e458ecc51b9a1ebf6' - 'f6269f3bae576c01dec62f53b58ae736852137bd445471440fc85e26334824dc' - '4e5137ea0186cd714ab46115d1ce7294757d2176aa1b5ac8d66331b60bf381e4' - '22625c772d18e0fa3893c2aaf122a51704354458164eb3fd9d71dff9336f9a03' - '984934d480506f53f88af1c72f03eade75845d212bb5a582e354f83fe1ab4df5' - '77cf7eae203bcafd808a412df24374f9f8117cb7352b1d3ee13fea7ad417b149' - '1c2fd8f725102bf2276a2a66d11fc9ac2b49862fdabda7cbb4f68ffe15cd011b' - 'c653aae7dd0dd0d3a5be1825a6c3b66e88e6ab241820b1b5e3f6ef52b2c1d9fd' - '6a7dba4a352e18609ac72facce28ccfc15e435929c74892e0ca2130308af5a53' - '39de03cf67a7dbc0d43055e01e4032b3595fbb141ddcad9f7c29538f5eb8bf78' - 'd46478ca119f7e69276af994ab3c3db6a4bf8799fd2cba49b30b25cf53daa47f' - '6704afb48f3cfa00dd8010694c4cb095bb3f1352ec2aeba70b02f813ecdbaccb' - '770c5f7ee71b886c7f8974c400ebbae855446f983e3de3168aafc9143b4fb946' - '0eccda364422005ce40945086a598b47ed6196571eec34f5d8765259e3cbe3bf' - '6afc1b029f2721e9465faf64a062ccf2b61765e2edb1a922f4e883f8a7904ff0' - '42d311bf8f7a600e2def5647bc2ab1b7fdf4135e51818d416e0c359592687c17' - '6b77f1556f4c258eebd99a8f4486147aba37dd7673264758e9bed1f530d6b514' - 'bf29673686d3b6d2fe98681fa6d1a04175e0d68dd8f4837a71a5c93c6ea4d306' - '534e57b1d996a0630c05fa09d283945d1eafdca290cc8adfcc8730d9459e2ce1' - '1ed3d9dbc1aebf1aa3489efc34d570aa90bb218a8b25c896a157f7986d7e52bb' - '63a7a1ad83e5e4b47dcb6b757de746454bcca2b8385e856615f6f3f762cb0307' - '28310a77f3b4c691a7a580b39381db53ad09dc8be27e23a55171533745847058' - '7b3caea5f37e48744bd8b58565253907c1d45a2c90d7f5c9e240f65645291059' - 'e39c4e0512dfbf7f1a1b637dc7b3704dd3e6ed9b697ea114d638a12e4d2932cc' - '9472bda0060414476818fd6daab4fc57520f4414551f0183a736799ee0d31f92' - '46570e4fa2f5bbdc7ec6f97abf8f33ea7cb62f1ddc10e07840eed990d263e15e' - '268f884a507d03e94dd64be106d9521305f505c955ef69327eb6b18bc8acedf6' - '55d2cfb2ddbbd234cc2dcd0cad7c2c76bb38fe3ed42c6a23978a0564b74a49d0' - '1a835e853ce5e554ad88c5d3f05c98f58a87a2d3fcbbaa45465a2bcd9b16c1e9' - 'f372d78d160b24e12acdf4fd9cbd9cc1945cda9eeac51c58b94bb06b1c3fc8b1' - 'cc539a9a58b631ea3398aa212258504b1af3f57d43e3d251f1300a1f09d03a17' - '330762cf58ebb05a461ad640efe46a001b3abf1e371292719e405b16c970bf2b' - 'dbf3f28dfcc171a3bcf3f9fb563fbc898a3c226e7640f7ed5e00250d28373175' - '081a9e81f129de4e0d7ee93a1f1b5d5963cd3c327b41854771981627213acf25' - '7389700490bd83583347a0b4b96f8e983ba52ed604e34a307ce4171c0057c863' - '104b0d05ba00867490de48a52d28469cfd8ce9553404f4d1020d2e1befdaf49b' - '15e1985d9749a51e2a049e07b97674cc24694d27cfea8d26892fa9da81e1859e' - '6754a3bb1fa63c26221f32e01642768bc7bac3839f403cd4d717217182e3cc02' - 'adb38b26438da9d5d44c711d7210f6c442961d638fb84aa7c0c322f17d12139d' - '256d3ddefd879bfcedf9ff9b9d1ad2c852b99668366e6c9b0ce2520b48f261f3' - '5ebdd8b1bf5d4395dbcf53140d222f75e72845fce03a93e721247774cbc81a35' - '3543de4231ec0c2cc01923a0d94a41a1d987c1369a8e643ff3cdfe6251f66112' - '010b26b08aec37450d6a23043d2c352f81c9c45752742e28bfff420019ceb1a4' - '8b81953e58d2e076837d2913a61ba2bb718e1e4f6316d5fc879ba00ff5f46826' - '88ec31106d057b52580f3704893522bdd853df1a32e5dbe0d5340eee0491bf7d' - '7015fcd4568055905d74da5f3395f2b39a3388baef56341788eca4ec326110d5' - '8abb60d6ff6843f3ab609f26be2ad0b367f42a74ef116e73938c9a81421a4296' - '357d68d77d8535b3405d72236266c5c43ea4b798570fb390ff524949a67bda6d' - 'e83b7eb93cc897f3217e8815b34720130673bdadf4ed69215886aeb2e5696798' - '867f9559b697fb2447ca37e71e42f3ec9d9e861f1498b8f5bf8faec4812df2f7' - '48f1ac145483531881fdd95f3a4d39e6ae207d301fe3f4031a7be9a73a6dd1de' - '995532c4b7d81b21d3aee7deaf0024159aa8b417dd270b41e4f4a049449a61a2' - 'e99ab26f8435a77f4d30b8fb7736e865edebdec62a5ac910d5f049f6d3a2dcc6' - 'b0bf847bc8f9209b45c5896eabcc035bdb31b850d63be7f123df2c8f05444944' - '35b47ee3d72dfb337345cf1e84a3e1c9f16e492382c7c6cd41888304cb62b860' - '1cb14db19ce8a658df81f27ca3bcc427278cee9f8f04d9253122834153d58308' - 'fe7ba654111f853dc91651f9f8115e6afb35ca295bf1f8b6a38e3a84f9212cc8' - '90a312470c813e53a1a524a9687154ab62f1bb86e7a6fe0779dc6dda354011b7' - 'aecb8c247337e89a612b6f907ee79cda1cdc44710cf6f92e09b70d62b13304ec' - 'c1757f9c682d172810972674c9e00eae62d593d5202ee27feb42b6919283b473' - '005a5d870dfbdc922249bd2bb2d14934d417da254eac6118f3bffbd377098320' - '4ad01009ab22875174beec63de336081ec444a8c3ce0a5f2a7aba30701bf6641' - '98184bc2b03eee568e0c7eb82fbace5ac4198521f3006eb2675755fb67466fbc' - '9e835042eecf2ca3ce03b8f793882ae77f0838a986a3fc765f6311592365da96' - '3e1ad243dcbd1b2befdecb86fd062f75f11f62e813871d99310ab8d7e2dbaa12' - 'e4bba44c28733a487d47c3357b36dcec99ee4e3422cb933803f15cef6baaac51' - '796df43da460f20efc1654b28ec973de9a4d49c2f7c6c15d6118ca5135dd5e09' - 'b2d84e5273bdfac3e6bcddf2a80f0fbba76ab8f49c37d38104299e9890810f54' - '64d707020c56229a952fb3f51a676b65823de50564d519fb2c22f4562209153e' - 'bb3e8f5170286a6e0d4aa0c5d17e9773722791cfbea36ab6ed27daf217529bf6' - '2c1d19b6d0614250ab6b26197ec5f79df6cc01799cdd4c7316147598743e13a4' - 'a499c718cb9b0bd50895d1d5f84ae0e15edb901ad43409dfce52659eb309394c' - '5e886797c436e4e67e8d115b8e81cb7ef10bb672ab116b2b064c62f152eea9e8' - 'e7ded41881560e5ad466994ebc34e3c8f305849b2bde30fd2e6847649c696365' - 'b2c718a0ca865b482be0f1735f1cd5530ec3b448cb1869cbb45e3c14fccc45d9' - '9549570d5947a483dbfba24a043ea631a8ecdc1c1a84b7d0532b98718f7bdbb3' - 'c2e5ee57215c78b9214d7c13e47da72f8d9f82bd550ad2d714f127b96f36228c' - '6d178e5c5caccfbddfece737a53576a7bfd122da7ccb4183117c5395510aca73' - 'f5342875f4eeecc66b50cc05d8c689b879124984be9e03560ef45c7493b4722f' - 'd1f8732e1bece6597b3c2e988989d3faa8f0510c1ab3f9d97d64e8ae4d3f351b' - 'ff0500c343ab6617dd3d88e5a42ca1c332c432fac6b84776587f45f1e4cef1ae' - 'e37e0ec815638d63b6c0797969221db15ca52ab29e91a17e6fd363e5f92d1f20' - '680e3f90421abb1397101038585d0fc5cd82e5aec76b405d3021ec13d173d9a3' - '9af87f17a3b16a43d512d23656689e2c6ff8ee5518ed7a1196819a79ad716c1c' - '9b2ab341b3b9a5f31bdcdf6b2e8a661477b1dcf15cd830f8b7cf2288c23f4295' - '41aac09b324b3cf8239d60832cde22930e0271de7129f49d13702467dc6bf285' - 'af30f99754851f689b232472e28c3c620f81dc4522f2c0c0eee67e56f10d2dda' - '21c9063da957f43fb1570ab8a47818a732fa82fa924f7150a7362c5b641adab4') +sha256sums=('81d1f98843f29a81c10a9a96655505c72ee34acee45225dcd307ae9a123e63d9' + '86b47b16b829c20b98c55c86920f840e24ed7285fd12721e215d32284e0a37a0' + 'd6b588e9d0052aaa301c13d0f36424c7ed451078327432a6ca6f7ab1fe722c47' + '443e6895401b421d2198ed56eb6d1da656ca0f23fb4b37146944b34963bc5ff8' + '6ddcac571a55ced9275b58acae1a32e6575b64127c1221099c59fb83a2f2dcc6' + '350edd0664f8d169851c6f44962f5b48f779015098ec0473cbdc9e0012fcd88b' + '8e03ea10fae11112e51d9d7f05ba96305330a52b15857157c3344ccf9aab9626' + '8fc266421931939a03dc502a5ddc833240efee7077855e099c853a301d9f44d2' + '2d112a487986eba88c9702c4a760d630dec268d8f743ab728dbbdbaa97504983' + '68b9525ef3f69ee08c16b5c508d9badbfc22e6a42d025e037ba0472d1524a10e' + '466ae762ad899598f29368cd47efb01f461036dcf163a0598cab758530c70605' + 'fa813184f2953a5262be1bfcb4b507556de2a3c3ad27264a012397c41105a3ca' + '82f916f52fa37bbfef4d72c78a4b22e2a6f0fc0e534281250352b7b2d2f1964d' + '47e93986d1c1ba0e7ce84489f89ee1f3238faba9c3f5d3bd751372d021140197' + 'e1a9ae8114ea3eea4f5fd88fe311334cacd7041352f819e734d3b1bba41070b9' + 'e30f0180b578884c52288b97d85de8bbc9b167c14520dc010a0aba90b354955b' + '3da406f9a61f07182ce333b5f4e918c37c96e9631ea9eed0a358488c56bb8fce' + 'd633709e95775a051e9e400e04b97d1e95b5fe43ba4376c06ff6c40eb4149709' + '9954fab2a0ff5fbedfb4e9d0c01a9cd5551cf5b442310be67fd1617bf28fc60c' + '08dd910b3ca98baaf1bd2a8a5aae266244662477ca62725552c2d2e34a3b8b3c' + 'a24255006962e4119804191d45324d2bd92c3dc76c4b9a3b8c1bdaba2d869403' + '9d25c813f63ad35ec37341a4296d40759f04f42e4713327b081a2c74687c62ed' + 'c9c8de0212840831d616482c4cb10ca0c8bb7e9bdb22ca6e4bfc503c7f54c4c0' + 'c374ddf82403ccbe7255c450b74cd3beb4f27389e41c49df71df45d3451bd683' + 'c6287bb90609a5dd8ada1276c588e9c167812bdc35b2a33c41993a1fca26a63f' + '0a653d6b8ccea3d300084a1e9e381d012dd5bfab23e3dc18b0f58c31b8106e8b' + 'b325cea20c0de649029dbae5b86881bf94eff31107cb1a8d03b755e5712e91a8' + 'aea869be9d259982b666c0f8eac229b210429ee416f83de018a61c46300b0ecb' + '92ef61880643f35368ace2858b506ed4ccce9a353259ddf67cae9eef1a96586b' + '978ff6e3073c733d824e189bf6b0d607fe2b6c90acaf0439625f3af03bff103d' + '78d0d43ef9c50a1abf64e76406163611abcf81b76e625b0db2dfbfe1ecae6f7c' + '693205a11f6e889692b29e2f2e2daca934910289e4a3bac5478cf329c223834d' + '074d3d2e2650e5a1530502b4347c6a1559f8c8fd1b4ec81091b4464dff1115ed' + '98410ccd6e117704e12ca662c3f726379e618f8f891f7de6f32b33c0f33c233c' + 'a641c447c80175a312fa6a97f20603119232837e09e5e30cfab408ef05371587' + '71508ecafe9fd1c2a5e293eda2735e366f80c6f117cfc76ce84caa51e864729b' + 'b6ffc5e8f06f7d732b47463dd23f6a82fce73baefbd61ef268c2003a42dde26d' + '7f78d1f9abb554cac2b849c322279cde29ff317869ee1d64e7c53b2dcf35f20a' + '856484815c1919037fcba7281d122c5064f6c723629b108e7b271cce95452b8e' + 'bebbf39945828681158c920a3a67205919c93d39947761cab97a3cd8f95806f4' + '95948df90a11d45492f78127a12f7c85441ee6be99331f8697acf44f90c8eddb' + '54c5fe05d8f0222f3849fbd9349a0287475f7f5cfadde53bda268a8be4e2e73c' + '47b8023434a6386dc9553991ea3c47ee30aeef96d1510c30fa4b636518fb45f9' + 'd049504e419bfc5ad9d5a3a157f6c930a0a15c346c666a60412111b9623eb290' + '4857976f2a17fc1b785e99aa0f4c6b599a8495db2d5d8c3fe2e8bf8e1c695f12' + 'ec9619e8757495ce77500d9cfa0888d527b2ed9d7417a2302ee7487da7c8a484' + 'fd3d223fda20f22ebea5426caf29fc2358b170bb50b5f2e32eb88d9619eafd53' + '98e7e6741a7d791156f7eb9edd4e25acd54142d658928f4434ff0447a0b1fe08' + '7e11cd3b6c14c59f9a475a93a28d65cb5cae10b26fe936f81ed9069f7b903153' + '9e26dd8d34146ced2ed73e1abe629468de213c410a8efe5feb160056451feb05' + 'a8f0d23577569b5550aacdce1120a13bd7365e932343cc13a0409bc7d5fac2f0' + 'ad9d32ac29ece7c874316eb7712ef50e2e455e3d63ddacf439762a2aa0aef29d' + '7b493a0f8cbc9da57caef1363f5e518dad3966b157dfc0e1d6d457df0107d08f' + '095e9a301738d29e82ec14774f6197db9653a264ca17d00109eaac0a2bfaf7d0' + '236a1ae41013db11e58235d639860c44a2c274d61ce135390cf844e2dac285e2' + '3a0c47498128a84af7fa03f07a219e2f1986ed49afa9b0e9cc92805e97cb1ba1' + 'b6d578b014c9a283790007af286627c3ae414079c5d75cf015f5b973299904b3' + '431690723f492677e265d0663f49d60db789763189600a803b7921bec2ee9740' + '122ca76121d03f55d0be579261d29d4f53728b0bf5f50d30d50f96e6ad9038b2' + 'f60431ac3d478cfa5bd950d6dc0151598f6ef00d645eb7db3a2c90996629dc1b' + '122209392c40c9850bb1be008ad5788be26a654e26bea319f62a8bf78fccd7e0' + '907e3c213b40b0f1e4c734a2cad82d6866b89dc57f5bc5a5141baa937bffa084' + 'e66071671084c16ff7d3cd6bf5ca126b64ab9e1488db27bfed32de35d7dc88d9' + '79e0f363c9f26a59a6a56777ae8e04baa413ca37a61de6f56ce5683e4e1d37dd' + 'a27aa417ff7054c61bb83c84f5208bc510b13caea5507f38b4915a763defa88a' + '060612b92d791e246a37d86c240daf36f4cf8e46506eb71701339c127e193cfc' + '7a6da2d0b7db4c18e30037c395c3d0086ab81ae70bf228a1f439b86d87e6f77d' + '988efbd35f6e31f1870dc7630bd993ff24092074f85119e54f375cc79407c251' + '49fd82563ebbbaed7b57031ca16558660e32ca9eb452cf1f51374dc49cc945cf' + '8c1496efbdf6a65a45e999a617e404dca1553e8c22251b1ea7c0ef2e88cb0790' + '2cfed7210f1f8a20781d78b79d6574eb3fa07c2987dd60a60179881c7f3bda3b' + '8749a70412102617394d38f052531f5ad6b6f6f3955955d54c772bb18eedc13c' + 'f86b302b861f23a545be94c5419828942e9704813961f8920363de9e49082de8' + 'ad451ab2d1b8e70f3c36f507bd17737527c55e89300d1b0fb5bc1f8383277dce' + '0f63e7f77a1d9fe18c127bde579f118acd1ee6d181ecaa5cfac9068589ec6c86' + 'b5cae9e12ff2927f141f2e9fcff999b48d174df0487883300c7f7e739cf744da' + '9c1373adcd05c518147009ba7c39c0fc89f150aa1824b66e995d134aa79f971a' + '24bd221634e1e5b97e08557c6c77423792741db655d4bf9b3fc251a96801e598' + 'c330fa0c305d1f07f9a5887628c71e5dd5b8e603253eafc3a2f19f9b3ca41073' + '084dfa2356cdaf50bbbdec3132d7bea43003439cfe5b3a1afaadc7cc4604609f' + '3134e9f9d3d9d38457da0dcf8ad2fb25a4ad23867d3ed432ecc54193b8f47f2f' + '24b2e2f9c5ed64df69bdc4b397f286bd3213146d5d8e4fd534305439be414264' + '1bfdfb22a278001da030037b1da0820cdfa4c60f22b73d426f3ddf06ed8b5d2f' + 'f3439c09edd6c9528913a51dfe5bad6e8c2d1bdb7ac8c94f4959a788f030e34b' + '39feea871a31cee240b500c4a129d6a465cc60992cbb696a2107a093166cf520' + 'aeb5fa756166cd699cff21571a37214b63004e18845ff21df506f5c6799195c8' + '1fe91255bdb93fede031a70c981ef25898082eb15f98adcbbf04e8898ea91473' + '60c017d50b421ffc2901e667afda08d8e2fabb2792782696a9dbf7fc1ecf8fc6' + '618957dc579c831f5fac0c0bce5252d9494f9e42405819208cbcd57e159c515e') diff --git a/libre/iceweasel-l10n/region.properties b/libre/iceweasel-l10n/region.properties index ab27e9a0f..ce2c5ed4d 100644 --- a/libre/iceweasel-l10n/region.properties +++ b/libre/iceweasel-l10n/region.properties @@ -3,12 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine -browser.search.defaultenginename=DuckDuckGo HTML +browser.search.defaultenginename=searx # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=DuckDuckGo HTML -browser.search.order.2=DuckDuckGo Lite -browser.search.order.3=searx +browser.search.order.1=searx +browser.search.order.2=DuckDuckGo HTML +browser.search.order.3=DuckDuckGo Lite # 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 diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 607ffed76..09bd25f19 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137608 2015-07-30 10:33:50Z spupykin $ +# $Id: PKGBUILD 138725 2015-08-24 13:10:01Z spupykin $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=iceweasel-noscript -pkgver=2.6.9.33 +pkgver=2.6.9.36 pkgrel=1 pkgdesc="Extension for iceweasel which disables script" arch=('any') @@ -13,7 +13,7 @@ depends=() makedepends=('unzip') replaces=('firefox-noscript') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('1ff903dddb39aafe62dc3b7194a2a39d') +md5sums=('fc131963fd1339ee173d74a95939de5a') package() { depends=("iceweasel") diff --git a/libre/iceweasel-theme-adwaita/PKGBUILD b/libre/iceweasel-theme-adwaita/PKGBUILD index a6c8de182..2e5940568 100644 --- a/libre/iceweasel-theme-adwaita/PKGBUILD +++ b/libre/iceweasel-theme-adwaita/PKGBUILD @@ -1,12 +1,13 @@ +# $Id: PKGBUILD 138643 2015-08-22 19:27:15Z muflone $ # Maintainer (Arch): Muflone http://www.muflone.com/contacts/english/ # Contributor (Arch): Diego Principe <cdprincipe@at@gmail@dot@com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: Daniel Milewski <niitotantei@riseup.net> -# Contributor: André Silva <emulatorman@parabola.nu> pkgname=iceweasel-theme-adwaita -pkgver=38.1 -pkgrel=1.2 +pkgver=40.1 +pkgrel=1 pkgdesc="Adwaita theme for Iceweasel (Matches the default Gnome Shell theme)" url="https://addons.mozilla.org/en-US/firefox/addon/adwaita/" arch=('any') @@ -15,15 +16,11 @@ depends=("iceweasel") makedepends=('unzip') replaces=('firefox-theme-adwaita') source=("gnome-firefox-theme-${pkgver}.xpi"::"https://github.com/gnome-integration-team/firefox-gnome/releases/download/${pkgver}/gnome-firefox-theme.xpi") -sha256sums=('af050237a8cddee0f9123f81a9df58b0b97e94f84059cc67225183cb3243a70e') +sha256sums=('a87f3eb2687e912e47080caee34a4eb72970eb64e6b9583d504c73e9e6d56137') noextract=("gnome-firefox-theme-${pkgver}.xpi") prepare() { unzip -qo "gnome-firefox-theme-${pkgver}.xpi" -d "${pkgname}-${pkgver}" - # Fix for wrong version number - # https://github.com/gnome-integration-team/firefox-gnome/issues/337 - cd "${pkgname}-${pkgver}" - sed -i "s_\(<em:version>\)35.1\(</em:version>\)_\1${pkgver}\2_" "install.rdf" } package() { diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 13995fd95..8d19d4ae6 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -16,7 +16,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=39.0.3 +_debver=40.0.3 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -27,10 +27,10 @@ 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) +arch=(i686 x86_64) license=(MPL GPL LGPL) -depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell icu=55.1 libevent libvpx=1.4.0 libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) -makedepends=(autoconf2.13 diffutils gst-plugins-base-libs imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip yasm zip) +depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell icu=55.1 libevent libvpx=1.4.0 libxt mime-types mozilla-common nss sqlite startup-notification) +makedepends=(autoconf2.13 diffutils gst-plugins-base-libs imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip) options=(!emptydirs !makeflags debug) if $_pgo; then makedepends+=(xorg-server-xvfb) @@ -53,15 +53,15 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" $pkgname-install-dir.patch vendor.js $pkgname-fixed-loading-icon.png) -sha256sums=('9675d5ba68ac2b27bca5dbd360439369496a50f0c4d85392762b84e4aa06ee58' - '77f7558e7d71c43b501e57e28cd2a5662d0ce295a2d5aef28c13305c0c722f47' - '521ad8ac7b84a9e00721087073ccb312a066bf92d4a6ef385c9d7597977e1ca4' - '4d5eb8d65a599ed9a46eda02ee96f62b8bde698d6fb29ab2a62dda9f1f30358f' +sha256sums=('2a2ded339bf491c4072fdcdc79cdc906733deffb8bcfa1d4fd9243e7f4ff9ee9' + 'ffab34628fdf8cdf5bf9167d2be2e244aaf3fa2802b7cf5165e18ced498cffab' + '8e0b2aa899f9c71dfabf61e8e3427bda9a6ef76330bda4428d1badddcfc331a5' + '1811eec7a02411295affc6ee66e3e4b9fd636b0bfbd313ce2a132beb124612d8' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6' '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3' '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' - '153057101644dc764f9cc502ce1c47c66bd89e3eff09db7e9c86d591d0d6f39d' + '0171656480113c6fabfdf5b14effe4ac67fda667682eb692badac81562afa696' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') prepare() { @@ -112,31 +112,6 @@ prepare() { # Load our build config, disable SafeSearch cp "$srcdir/mozconfig" .mozconfig - # 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 - mkdir "$srcdir/path" # WebRTC build tries to execute "python" and expects Python 2 @@ -150,6 +125,10 @@ prepare() { # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 cp "$srcdir/$pkgname-fixed-loading-icon.png" \ browser/themes/linux/tabbrowser/loading.png + + # Load our searchplugins + rm -rv browser/locales/en-US/searchplugins + cp -av /usr/lib/mozilla/searchplugins browser/locales/en-US } build() { @@ -197,10 +176,6 @@ package() { ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries" ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation" - rm -rf "$pkgdir/usr/lib/$pkgname/browser/"{searchplugins,plugins} - ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$pkgname/browser/plugins" - ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgname/browser/searchplugins" - # 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/iceweasel/libre.patch b/libre/iceweasel/libre.patch index 89b5d9421..e465b3e41 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -1,7 +1,7 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js ---- mozilla-release.orig/browser/app/profile/firefox.js 2015-07-05 23:02:37.831899460 -0300 -+++ mozilla-release/browser/app/profile/firefox.js 2015-07-05 23:08:31.637567304 -0300 -@@ -284,11 +284,6 @@ +--- mozilla-release.orig/browser/app/profile/firefox.js 2015-08-14 02:22:36.676626042 -0300 ++++ mozilla-release/browser/app/profile/firefox.js 2015-08-14 02:23:52.119613185 -0300 +@@ -283,11 +283,6 @@ pref("browser.slowStartup.timeThreshold", 40000); pref("browser.slowStartup.maxSamples", 5); @@ -14,8 +14,8 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br pref("browser.casting.enabled", false); pref("browser.chrome.site_icons", true); diff -Nur 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 2015-01-09 02:38:12.000000000 -0200 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2015-06-26 18:10:33.415681146 -0300 +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css 2015-08-07 12:54:06.000000000 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2015-08-14 02:46:44.222645356 -0300 @@ -49,11 +49,6 @@ background-repeat: no-repeat; } @@ -34,7 +34,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi height: 28px; - width: 70px; - min-width: 70px; -+ width: 47px; ++ width: 28px; } #searchIcon { @@ -179,9 +179,9 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi } diff -Nur 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 2015-05-08 13:55:12.000000000 -0300 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2015-05-15 06:52:57.450189850 -0300 -@@ -5,155 +5,44 @@ +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2015-08-07 12:54:06.000000000 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2015-08-14 02:30:21.304032046 -0300 +@@ -5,155 +5,54 @@ "use strict"; const SEARCH_ENGINES = { @@ -190,7 +190,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil - // it will be scaled down as necessary on lower-dpi displays. - // This needs to be defined in a single line to keep the JS parser from creating many - // intermediate strings in memory. See bug 986672. -- image: "data:image/png;base64,\ ++ "searx": { + image: "data:image/png;base64,\ -iVBORw0KGgoAAAANSUhEUgAAAIwAAAA4CAYAAAAvmxBdAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ\ -bWFnZVJlYWR5ccllPAAAGrFJREFUeNrtfHt4VdW172+utZOASLJ5+BaIFrUeXkFsa0Fl++gDnznV\ -VlvFxt7aqvUUarXtse3Bau35ak/rZ9XT26NtfOvV6wFET+FYCQEKWqsQIT5RCAgSXnlnrzXneNw/\ @@ -313,41 +314,49 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil -k4w0jAcTAyllnBoh9Kxw/tEdS8cuT0WyH4vX1PYD5qMBzQDE2eFDxz09zsscWuwVHX6a8YwaFAiM\ -NAkHr4vdUdf82rQN6JwnSl4N4vAxeKdxP2A+mjXuKTvcXcY9TdOnyxPk4zKZ/vbRAqe75C3QfZZY\ -0P/y6/7299z+H4QrdGsoib8JAAAAAElFTkSuQmCC" -+ "DuckDuckGo HTML": { -+ image: "data:image/png;base64," + -+ "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" } }; @@ -372,7 +381,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil // This global tracks if the page has been set up before, to prevent double inits let gInitialized = false; let gObserver = new MutationObserver(function (mutations) { -@@ -161,7 +50,6 @@ +@@ -161,7 +60,6 @@ if (mutation.attributeName == "searchEngineName") { setupSearchEngine(); if (!gInitialized) { @@ -380,7 +389,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil gInitialized = true; } return; -@@ -186,118 +74,6 @@ +@@ -186,118 +84,6 @@ window.removeEventListener("resize", fitToWidth); }); @@ -499,7 +508,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil function onSearchSubmit(aEvent) { let searchText = document.getElementById("searchText"); -@@ -381,144 +157,6 @@ +@@ -381,144 +167,6 @@ document.dispatchEvent(event); } @@ -739,9 +748,9 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/sou # LOCALIZATION NOTE The correct localization of this file might be to keep it diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd ---- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd 2015-06-30 19:57:55.000000000 -0300 -+++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd 2015-07-05 23:08:31.667565805 -0300 -@@ -83,7 +83,7 @@ +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd 2015-08-07 12:54:09.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd 2015-08-14 02:23:52.122946356 -0300 +@@ -86,7 +86,7 @@ - checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled - boolean preference in about:config, in the options panel. --> <!ENTITY options.enableRemote.label3 "Enable remote debugging"> @@ -750,7 +759,7 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/too <!-- LOCALIZATION NOTE (options.disableJavaScript.label, - options.disableJavaScript.tooltip): This is the options panel label and -@@ -106,7 +106,7 @@ +@@ -109,7 +109,7 @@ <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for - the heading of group of checkboxes corresponding to the default developer - tools. --> @@ -781,8 +790,8 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/web <!ENTITY key_quit "W"> <!-- open menu --> diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties ---- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties 2015-02-23 05:39:34.000000000 -0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties 2015-02-25 21:33:17.993024651 -0200 +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties 2015-08-07 12:54:09.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties 2015-08-14 02:23:52.122946356 -0300 @@ -2,8 +2,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -794,7 +803,7 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/web runtimeButton_label=Select Runtime projectButton_label=Open App -@@ -47,10 +47,10 @@ +@@ -50,10 +50,10 @@ addons_stable=stable addons_unstable=unstable # LOCALIZATION NOTE (addons_simulator_label): This label is shown as the name of @@ -808,14 +817,14 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/web addons_uninstall_button=uninstall addons_adb_label=ADB Helper Add-on diff -Nur 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 2015-01-09 02:38:16.000000000 -0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2015-01-16 15:03:01.408257268 -0200 +--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2015-08-07 12:54:09.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2015-08-14 02:25:49.750538381 -0300 @@ -3,17 +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 ++browser.search.defaultenginename=searx # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google @@ -826,9 +835,9 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio -# selection UI -browser.contentHandlers.types.0.title=My Yahoo! -browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s -+browser.search.order.1=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=searx ++browser.search.order.1=searx ++browser.search.order.2=DuckDuckGo HTML ++browser.search.order.3=DuckDuckGo Lite # 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 diff --git a/libre/iceweasel/mozconfig b/libre/iceweasel/mozconfig index bee4b2c90..0997645d4 100644 --- a/libre/iceweasel/mozconfig +++ b/libre/iceweasel/mozconfig @@ -36,6 +36,7 @@ ac_add_options --disable-debug-symbols # Parabola features ac_add_options --disable-safe-browsing +ac_add_options --disable-url-classifier ac_add_options --disable-eme # Other diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js index 4f45d6ebb..3b04e96b4 100644 --- a/libre/iceweasel/vendor.js +++ b/libre/iceweasel/vendor.js @@ -97,9 +97,9 @@ pref("app.update.url", "http://127.0.0.1/");" // Spoof the useragent to a generic one pref("general.useragent.compatMode.firefox", true); // Spoof the useragent to a generic one -pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:38.0) Gecko/20100101 Firefox/38.0"); +pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:40.0) Gecko/20100101 Firefox/40.0"); pref("general.appname.override", "Netscape"); -pref("general.appversion.override", "38.0"); +pref("general.appversion.override", "40.0"); pref("general.buildID.override", "Gecko/20100101"); pref("general.oscpu.override", "Windows NT 6.1"); pref("general.platform.override", "Win32"); diff --git a/libre/java8-openjdk/JDK-8074312-hotspot.patch b/libre/java8-openjdk/JDK-8074312-hotspot.patch deleted file mode 100644 index a4e3f607f..000000000 --- a/libre/java8-openjdk/JDK-8074312-hotspot.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r 61edd5c7412e make/linux/Makefile ---- a/make/linux/Makefile Mon Mar 02 18:12:06 2015 +0000 -+++ b/make/linux/Makefile Tue Mar 03 15:58:13 2015 +0100 -@@ -233,7 +233,7 @@ - # Solaris 2.5.1, 2.6). - # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. - --SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% -+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4% - OS_VERSION := $(shell uname -r) - EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) - diff --git a/libre/java8-openjdk/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch b/libre/java8-openjdk/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch deleted file mode 100644 index f6bd4ae98..000000000 --- a/libre/java8-openjdk/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch +++ /dev/null @@ -1,46 +0,0 @@ - -# HG changeset patch -# User sgehwolf -# Date 1430335428 25200 -# Node ID 2a55e4998f0d28c7003a8a0f43d2c7602d89f54b -# Parent cd8fe1a9205aedb6b5a1fc16e664412e48aee565 -8078666: JVM fastdebug build compiled with GCC 5 asserts with "widen increases" -Summary: do the math on the unsigned type where overflows are well defined -Reviewed-by: kvn, aph - -diff -r cd8fe1a9205a -r 2a55e4998f0d src/share/vm/opto/type.cpp ---- a/src/share/vm/opto/type.cpp Wed Jun 10 20:15:29 2015 -0400 -+++ b/src/share/vm/opto/type.cpp Wed Apr 29 12:23:48 2015 -0700 -@@ -1180,11 +1180,11 @@ - // Certain normalizations keep us sane when comparing types. - // The 'SMALLINT' covers constants and also CC and its relatives. - if (lo <= hi) { -- if ((juint)(hi - lo) <= SMALLINT) w = Type::WidenMin; -- if ((juint)(hi - lo) >= max_juint) w = Type::WidenMax; // TypeInt::INT -+ if (((juint)hi - lo) <= SMALLINT) w = Type::WidenMin; -+ if (((juint)hi - lo) >= max_juint) w = Type::WidenMax; // TypeInt::INT - } else { -- if ((juint)(lo - hi) <= SMALLINT) w = Type::WidenMin; -- if ((juint)(lo - hi) >= max_juint) w = Type::WidenMin; // dual TypeInt::INT -+ if (((juint)lo - hi) <= SMALLINT) w = Type::WidenMin; -+ if (((juint)lo - hi) >= max_juint) w = Type::WidenMin; // dual TypeInt::INT - } - return w; - } -@@ -1438,11 +1438,11 @@ - // Certain normalizations keep us sane when comparing types. - // The 'SMALLINT' covers constants. - if (lo <= hi) { -- if ((julong)(hi - lo) <= SMALLINT) w = Type::WidenMin; -- if ((julong)(hi - lo) >= max_julong) w = Type::WidenMax; // TypeLong::LONG -+ if (((julong)hi - lo) <= SMALLINT) w = Type::WidenMin; -+ if (((julong)hi - lo) >= max_julong) w = Type::WidenMax; // TypeLong::LONG - } else { -- if ((julong)(lo - hi) <= SMALLINT) w = Type::WidenMin; -- if ((julong)(lo - hi) >= max_julong) w = Type::WidenMin; // dual TypeLong::LONG -+ if (((julong)lo - hi) <= SMALLINT) w = Type::WidenMin; -+ if (((julong)lo - hi) >= max_julong) w = Type::WidenMin; // dual TypeLong::LONG - } - return w; - } - diff --git a/libre/java8-openjdk/PKGBUILD b/libre/java8-openjdk/PKGBUILD index 4e5834fb4..528a1190a 100644 --- a/libre/java8-openjdk/PKGBUILD +++ b/libre/java8-openjdk/PKGBUILD @@ -11,9 +11,10 @@ pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk') pkgbase=java8-openjdk _java_ver=8 -# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html -_jdk_update=51 -_jdk_build=16 +# Found @ http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html +_jdk_update=60 +# Found @ http://hg.openjdk.java.net/jdk8u/jdk8u +_jdk_build=24 pkgver=${_java_ver}.u${_jdk_update} _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build} pkgrel=1.parabola1 @@ -30,20 +31,16 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz - nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz - JDK-8074312-hotspot.patch - JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch) - -sha256sums=('02eab2b937ed83c4505e93f58ad0b84a4e1a69e6d0baa4d041ec09ed98f18c2d' - '00d783dda3a7d87eb55a72febe7666c4b3297616ef3f11bbd679a05f19a81825' - 'a7236d5e5824cea20b48ca4efb8e5109007024af9b85214e9153c4d633665d0a' - 'f7554dc2fba5dfd36af0ed618ebe4c7b1527b5a067052299a1679a4142bbbeee' - 'aa202ddf3bcc1dc54723bb26c0ae5ccaefc1693647e6b463955065d2b1720382' - '5d6faf6c726392212659cebd93fdbf89a11b86bab60f5b220493d9d8e7ff0686' - '3171ec4dbd96747eeb876a8fd3caf1e1e52da3dc91b63308193c914a5501d6e4' - 'ffdd0446fce7b624f2cdc80297b99eecfdf30adfee39d3b8832a78c1dc202636' - '95fbd155806cac22de9e6df6f4f92ae79530f86d63cea1deaf98e607953e0b50' - '8df4d5d78753ebc5bc425fd1c8fe788106ac8b9d3155feb162a748a96c81cc05') + nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz) + +sha256sums=('97e368187b08067d57eb10bce08fb9057e63242c263f63ab7b7dd036cbf7aebf' + '76736786a1205367167b1abd10b6f173885f8ca8b2c3f56d5ff94b9e65a98865' + '9e7830631897679c97127387a1e962bfac46bafbe2b5a4be88e8bbf238e6c84c' + '999f0242213a4d048cee4e990d62024d277bcc8d49ab6fd807e32271fe078985' + '9643d8c22c4d6a680609168d84ac5a92421aa9973aea15cac687e4ccf167ff96' + 'cb854984714541af5cba6e920958d0c68f2de52bff5acf723387fa03d63d8c3d' + '93a553f2e9dfc820e50bfd70f989c96cd330857849ddba23dc50246e99ab1329' + '518dd422df787547bbeedb57a524501548a6efd8f96443ebc59276cc7922e801') case "${CARCH}" in 'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;; @@ -66,13 +63,6 @@ prepare() { do ln -s ../${subrepo}-${_repo_ver} ${subrepo} done - - cd "${srcdir}/hotspot-${_repo_ver}" - # https://bugs.openjdk.java.net/browse/JDK-8074312 - patch -p1 < "${srcdir}"/JDK-8074312-hotspot.patch - # https://bugs.archlinux.org/task/45386 - # https://bugs.openjdk.java.net/browse/JDK-8078666 - patch -p1 < "${srcdir}"/JVM_fastdebug_build_compiled_with_GCC_5_asserts_with_widen_increases.patch } build() { diff --git a/libre/kdebase-konqueror/PKGBUILD b/libre/kdebase-konqueror/PKGBUILD index 662034484..4aa023576 100644 --- a/libre/kdebase-konqueror/PKGBUILD +++ b/libre/kdebase-konqueror/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 241398 2015-06-29 17:50:28Z arojas $ +# $Id: PKGBUILD 244976 2015-08-28 19:28:40Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> @@ -6,26 +6,26 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname='kdebase-konqueror' -pkgver=15.04.3 -pkgrel=1.parabola1 +pkgver=15.08.0 +pkgrel=3.parabola1 arch=('i686' 'x86_64') url="http://kde.org/applications/internet/konqueror/" license=('GPL' 'LGPL' 'FDL') groups=('kde-applications' 'kdebase') conflicts=('kdebase-nsplugins' 'kdebase-konqueror-libre') replaces=('kdebase-nsplugins' 'kdebase-konqueror-libre') -makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'baloo4-widgets') +makedepends=('libkactivities4' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" 'konq-about-fsdg.diff') -sha1sums=('5f5168f3ad9d60b4dc9ba88b1d649364a0534fc6' +sha1sums=('637d91462557487fe2e1a1fc7cf38729658ded81' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' -depends=('kdebase-dolphin' 'kdebase-keditbookmarks') +depends=('dolphinpart4' 'kdebase-keditbookmarks') optdepends=('kwebkitpart: to enable webkit engine') install='kdebase-konqueror.install' prepare() { - mkdir build + mkdir -p build cd kde-baseapps-${pkgver} # Don't recommend nonfree software or Google. diff --git a/libre/kdebase-runtime/PKGBUILD b/libre/kdebase-runtime/PKGBUILD index 09ca57226..504066520 100644 --- a/libre/kdebase-runtime/PKGBUILD +++ b/libre/kdebase-runtime/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 242137 2015-07-11 22:33:39Z arojas $ +# $Id: PKGBUILD 243783 2015-08-16 08:40:47Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> @@ -6,18 +6,18 @@ pkgbase=kdebase-runtime pkgname=kdebase-runtime -pkgver=15.04.3 -pkgrel=4.parabola1 -pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" +pkgver=15.08.0 +pkgrel=1.parabola2 +pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search engines" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kde-runtime' license=('GPL' 'LGPL') makedepends=('kdelibs' 'libkactivities4' 'smbclient' 'libssh' 'libcanberra' 'libwebp' - 'pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen' 'networkmanager' 'boost') + 'pkg-config' 'cmake' 'automoc4' 'kdepimlibs4' 'openslp' 'doxygen' 'networkmanager' 'boost') source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('9984b22d2706e7d3efefeefca94a9de5b53f07c3' +sha1sums=('cf356762677d80adfec16d5756839cdfa36b84d7' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') @@ -52,7 +52,7 @@ build() { package_kdebase-runtime() { depends=('kdelibs' 'kactivities' 'libkactivities4' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth' 'libwebp') - optdepends=('kdepimlibs: for kwalletd, and is needed by DrKonqi to send crash reports to KDE.org' 'kdebase-runtime-doc: KDE4 documentation' + optdepends=('kdepimlibs4: for kwalletd, and is needed by DrKonqi to send crash reports to KDE.org' 'kdebase-runtime-doc: KDE4 documentation' 'gdb: needed by DrKonqi to generate backtrace' 'khelpcenter: to display applications documentation') replaces=("${pkgname}-libre") conflicts=("${pkgname}-libre") diff --git a/libre/kdelibs/PKGBUILD b/libre/kdelibs/PKGBUILD index 861ea3b64..e670df6a9 100644 --- a/libre/kdelibs/PKGBUILD +++ b/libre/kdelibs/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 241398 2015-06-29 17:50:28Z arojas $ +# $Id: PKGBUILD 243962 2015-08-18 22:43:39Z arojas $ # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdelibs -pkgver=4.14.10 -_kdeappver=15.04.3 +pkgver=4.14.11 +_kdeappver=15.08.0 pkgrel=1.parabola1 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ url='https://projects.kde.org/projects/kde/kdelibs' license=('GPL' 'LGPL' 'FDL') replaces=('kdelibs-libre') conflicts=('kdelibs-libre') -depends=('attica-qt4' 'libxss' 'krb5' 'qca' 'libdbusmenu-qt' 'polkit-qt4' +depends=('attica-qt4' 'libxss' 'krb5' 'qca' 'libdbusmenu-qt4' 'polkit-qt4' 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi' 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4' 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'icu') @@ -22,7 +22,7 @@ makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa' 'grantlee-qt4') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch') -sha1sums=('0f05d3d85d29dae45f3d7c246ae2e88ea91ab94f' +sha1sums=('b25177d6247db8b83faed710f5e713a81c8f8e81' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'a1502a964081ad583a00cf90c56e74bf60121830' 'ed1f57ee661e5c7440efcaba7e51d2554709701c') diff --git a/libre/kdenetwork-kopete/PKGBUILD b/libre/kdenetwork-kopete/PKGBUILD index b010f0f3a..ee59492ad 100644 --- a/libre/kdenetwork-kopete/PKGBUILD +++ b/libre/kdenetwork-kopete/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 241398 2015-06-29 17:50:28Z arojas $ +# $Id: PKGBUILD 243760 2015-08-15 17:04:46Z arojas $ # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=kdenetwork-kopete -pkgver=15.04.3 +pkgver=15.08.0 pkgrel=1.parabola1 pkgdesc='Instant Messenger, without nonfree Skype support' url='http://kde.org/applications/internet/kopete/' @@ -12,12 +12,12 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde-applications' 'kdenetwork') replaces=(${pkgname}-libre) conflicts=(${pkgname}-libre) -depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'qimageblitz' 'jsoncpp') -makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim' 'mediastreamer' 'libgadu' 'kdepim-kleopatra') +depends=('kdebase-runtime' 'kdepimlibs4' 'qca-ossl' 'libotr' 'qimageblitz' 'jsoncpp') +makedepends=('cmake' 'automoc4' 'boost' 'mediastreamer' 'libgadu') optdepends=('mediastreamer: jingle support' 'libgadu: Gadu-Gadu protocol') install=${pkgname}.install source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz") -sha1sums=('1dddde0459361c47bcc7a27b88f8a53499cf73c5') +sha1sums=('b7ee954b96d10be94fa59b99ecdf302ba73c88f8') prepare() { cd kopete-${pkgver} diff --git a/libre/kdeutils-ark/PKGBUILD b/libre/kdeutils-ark/PKGBUILD deleted file mode 100644 index 99d261862..000000000 --- a/libre/kdeutils-ark/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 241398 2015-06-29 17:50:28Z arojas $ -# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> -# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> -# Maintainer: André Silva <emulatorman@parabola.nu> - -pkgname=kdeutils-ark -pkgver=15.04.3 -pkgrel=1.parabola1 -pkgdesc='Archiving Tool, with unar support' -url='http://kde.org/applications/utilities/ark/' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde-applications' 'kdeutils') -replaces=('kdeutils-ark-libre') -conflicts=('kdeutils-ark-libre') -depends=('kdebase-runtime' 'kdebase-lib' 'libarchive' 'qjson') -makedepends=('cmake' 'automoc4') -optdepends=('p7zip' 'zip' 'unzip' 'unar') -install=${pkgname}.install -source=("http://download.kde.org/stable/applications/${pkgver}/src/ark-${pkgver}.tar.xz" - 'ark-unar-06.patch') -sha1sums=('891187b1c49258ab461f1dcbfae82f0640a96f54' - 'a0a836950f185d9b2245204579f969203036fdec') - -prepare() { - cd "${srcdir}/ark-${pkgver}" - # This patch will allow Ark to use The Unarchiver command line utilities (unar/lsar) to operate on RAR files, particularly RARv3. - patch -Np1 -i "${srcdir}/ark-unar-06.patch" -} - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../ark-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install -} diff --git a/libre/kodi/PKGBUILD b/libre/kodi/PKGBUILD index e75f194b2..7fc416586 100644 --- a/libre/kodi/PKGBUILD +++ b/libre/kodi/PKGBUILD @@ -1,5 +1,5 @@ # vim:set ts=2 sw=2 et: -# $Id: PKGBUILD 137372 2015-07-24 12:44:05Z idevolder $ +# $Id: PKGBUILD 138449 2015-08-17 10:49:09Z idevolder $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > # Contributor (Arch): Brad Fanella <bradfanella@archlinux.us> @@ -15,7 +15,7 @@ _prefix=/usr _pkgbase=kodi-libre pkgbase=kodi pkgname=kodi -pkgver=15.0 +pkgver=15.1 _codename=Isengard pkgrel=1.parabola1 arch=('i686' 'x86_64') @@ -38,10 +38,10 @@ source=( "https://repo.parabola.nu/other/$_pkgbase/$_pkgbase-$pkgver-$_codename.tar.gz" ) mksha256sums=( - '27dba173cfe74b323f4dbaa72ae2bfe5961f76c27bddcd5210253be91cae0dff' + '72b2610d8fbff807128d74429f25bf6716ba880c27c2c5d9fad012ec7fc70705' ) sha256sums=( - 'feff6278b4b6570f053c954bbe0ab0df34dbd5db5cadfdd37fea43b03306a437' + 'df1cf288ae5aba3ac6530b31b17eff98a2f2a853415eb0360707266e9688142d' ) mksource() { diff --git a/libre/lesspipe/PKGBUILD b/libre/lesspipe/PKGBUILD index 942b526de..cd1d317a9 100644 --- a/libre/lesspipe/PKGBUILD +++ b/libre/lesspipe/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 130024 2015-03-27 10:04:07Z spupykin $ +# $Id: PKGBUILD 138775 2015-08-26 07:05:31Z spupykin $ # Maintainer (Arch): Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor (Arch): solsTiCe d'Hiver <solstice.dhiver@gmail.com> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=lesspipe -pkgver=1.82 -pkgrel=3.parabola1 -pkgdesc='an input filter for the pager less, with libarchive support' +pkgver=1.83 +pkgrel=1.parabola1 +pkgdesc='an input filter for the pager less, with libarchive recommendation' depends=('less') arch=('any') license=('GPL') @@ -26,19 +26,9 @@ optdepends=('perl' 'imagemagick: support for some image file') url="http://www-zeuthen.desy.de/~friebel/unix/lesspipe.html" source=("http://downloads.sourceforge.net/project/lesspipe/lesspipe/$pkgver/lesspipe-$pkgver.tar.gz" - "html2text.patch::https://bugs.archlinux.org/task/44365?getfile=12856" - lesspipe.sh - libarchive.patch) -md5sums=('dd6f7bc9b9f9afaf04c9aa0cdbe9fe56' - '4bb768cae4723b3719a70848d36cf5fe' - '675b56f560c600f43108adfd98222251' - 'ec452ea980d5c1e254e9775fd424c18c') - -prepare() { - cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/html2text.patch - patch -Np1 -i ../libarchive.patch -} + lesspipe.sh) +md5sums=('fff7da88b9af45497c493a1682c67652' + '675b56f560c600f43108adfd98222251') build() { cd $srcdir/$pkgname-$pkgver diff --git a/libre/lesspipe/libarchive.patch b/libre/lesspipe/libarchive.patch deleted file mode 100644 index b4fb48788..000000000 --- a/libre/lesspipe/libarchive.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/configure b/configure -index cbd34af..5df4a31 100755 ---- a/configure -+++ b/configure -@@ -405,8 +405,7 @@ LESS_ADVANCED_PREPROCESSOR N # always interpret textlike files (html, ...) - # compression programs - bzip2 Y # include bzip2 and unzip code, it is fairly essential - unzip Y --rar Y --unrar Y -+bsdtar Y # bsdtar is the best free as in freedom alternative for rar - lzip N # default for lzma, lzip, xz, 7za should probably be N - lzma Y - xz Y -diff --git a/lesspipe.sh b/lesspipe.sh -index c80c75b..262a47b 100755 ---- a/lesspipe.sh -+++ b/lesspipe.sh -@@ -276,12 +276,8 @@ get_cmd () { - cmd=(isrpm "$2" "$file2") - elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then - cmd=(istemp "unzip -avp" "$2" "$file2") -- elif [[ "$1" = *RAR\ archive* ]]; then -- if cmd_exist unrar; then -- cmd=(istemp "unrar p -inul" "$2" "$file2") -- elif cmd_exist rar; then -- cmd=(istemp "rar p -inul" "$2" "$file2") -- fi -+ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then -+ cmd=(bsdtar xOf "$2" "$file2") - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then - cmd=(istemp "7za e -so" "$2" "$file2") - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7zr; then -@@ -534,14 +530,9 @@ isfinal() { - elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then - msg "use zip_file${sep}contained_file to view a file in the archive" - istemp "unzip -lv" "$2" -- elif [[ "$1" = *RAR\ archive* ]]; then -- if cmd_exist unrar; then -- msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "unrar v" "$2" -- elif cmd_exist rar; then -- msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "rar v" "$2" -- fi -+ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then -+ msg "use rar_file${sep}contained_file to view a file in the archive" -+ bsdtar tf "$2" - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then - typeset res - res=$(istemp "7za l" "$2") -diff --git a/lesspipe.sh.in b/lesspipe.sh.in -index 407bc7d..753f3c5 100755 ---- a/lesspipe.sh.in -+++ b/lesspipe.sh.in -@@ -323,17 +323,10 @@ get_cmd () { - elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then - set -A cmd istemp "unzip -avp" "$2" "$file2" - #endif --#ifdef unrar -- elif [[ "$1" = *RAR\ archive* ]]; then -- if cmd_exist unrar; then -- set -A cmd istemp "unrar p -inul" "$2" "$file2" -- elif cmd_exist rar; then -- set -A cmd istemp "rar p -inul" "$2" "$file2" -- fi --#elif rar -- elif [[ "$1" = *RAR\ archive* ]] && cmd_exist rar; then -- set -A cmd istemp "rar p -inul" "$2" "$file2" --#endif -+#ifdef bsdtar -+ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then -+ set -A cmd bsdtar xOf "$2" "$file2" -+#endif - #ifdef 7za - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then - set -A cmd istemp "7za e -so" "$2" "$file2" -@@ -705,19 +698,10 @@ isfinal() { - msg "use zip_file${sep}contained_file to view a file in the archive" - istemp "unzip -lv" "$2" - #endif --#ifdef unrar -- elif [[ "$1" = *RAR\ archive* ]]; then -- if cmd_exist unrar; then -- msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "unrar v" "$2" -- elif cmd_exist rar; then -- msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "rar v" "$2" -- fi --#elif rar -- elif [[ "$1" = *RAR\ archive* ]] && cmd_exist rar; then -+#ifdef bsdtar -+ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then - msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "rar v" "$2" -+ bsdtar tf "$2" - #endif - #ifdef 7za - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 6b3bdf850..29384cde6 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -9,9 +9,9 @@ pkgbase=linux-libre-grsec _pkgbasever=4.1-gnu -_pkgver=4.1.5-gnu +_pkgver=4.1.6-gnu _grsecver=3.1 -_timestamp=201508102129 +_timestamp=201508181953 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -46,9 +46,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch') sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' 'SKIP' - '2f8b5d3176112f3b1679a77acbdd303e9e45bffde76a1972f7e90d457614afb3' + '335d3e07319ddf393c69e047c27bc5d28ee9e6126282619e3364db56a4331d34' 'SKIP' - 'edf25146df39686581c63b91c80e83dc4568bd50ce4d91ca73cfd00cf9e1528d' + 'a7898f8f6852998f76cdf0dd2a7cb6941c64be868f41745722eec363b6a1b35e' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' diff --git a/libre/linux-libre-lts-grsec/PKGBUILD b/libre/linux-libre-lts-grsec/PKGBUILD index 247d9152b..2da1845b8 100644 --- a/libre/linux-libre-lts-grsec/PKGBUILD +++ b/libre/linux-libre-lts-grsec/PKGBUILD @@ -9,9 +9,9 @@ pkgbase=linux-libre-lts-grsec _pkgbasever=3.14-gnu -_pkgver=3.14.50-gnu +_pkgver=3.14.51-gnu _grsecver=3.1 -_timestamp=201508102128 +_timestamp=201508181951 _replacesarchkernel=('linux-grsec-lts') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26-grsec-lts' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -51,9 +51,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '811f8820610d9c8622229151c638f08d62b693242cac6b0c04428b6f5df863a2' + 'b12b75dfeac07e8bfe7c76bc7b4d9012dfbfc25201b7cdf9edf31466ee5a0fac' 'SKIP' - '64ca1482a0eb070df19c279dae3a34f9352e1cf6d7adce043497452891fde1f5' + '8b28ae2f46283274dbd6fd77bba36e6a18be633887125e2077ea269587b0b0b7' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 56ebfd485..ce763409a 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-lts _pkgbasever=3.14-gnu -_pkgver=3.14.50-gnu +_pkgver=3.14.51-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -47,7 +47,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'SKIP' - '811f8820610d9c8622229151c638f08d62b693242cac6b0c04428b6f5df863a2' + 'b12b75dfeac07e8bfe7c76bc7b4d9012dfbfc25201b7cdf9edf31466ee5a0fac' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' diff --git a/libre/linux-libre-pck/PKGBUILD b/libre/linux-libre-pck/PKGBUILD index 10480c3a8..be7b01f52 100644 --- a/libre/linux-libre-pck/PKGBUILD +++ b/libre/linux-libre-pck/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=linux-libre-pck _pkgbasever=4.1-gnu -_pkgver=4.1.5-gnu +_pkgver=4.1.6-gnu _pckpatchver=pck1 _replacesarchkernel=('linux-zen') @@ -44,9 +44,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'change-default-console-loglevel.patch') sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' 'SKIP' - '2f8b5d3176112f3b1679a77acbdd303e9e45bffde76a1972f7e90d457614afb3' + '335d3e07319ddf393c69e047c27bc5d28ee9e6126282619e3364db56a4331d34' 'SKIP' - '183faa34a7ef069ebb0f5f7c8f9a54cda01b81769092758e80bc29ac8006a338' + '985ce51fbed0630802badaa1848671395b897557969a1109bb0a9da28426d695' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 21de41ece..6611a4b2d 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,7 +10,7 @@ pkgbase=linux-libre # Build stock kernel #pkgbase=linux-libre-custom # Build kernel with a different name _pkgbasever=4.1-gnu -_pkgver=4.1.5-gnu +_pkgver=4.1.6-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -43,7 +43,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch') sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' 'SKIP' - '2f8b5d3176112f3b1679a77acbdd303e9e45bffde76a1972f7e90d457614afb3' + '335d3e07319ddf393c69e047c27bc5d28ee9e6126282619e3364db56a4331d34' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' diff --git a/libre/linux-libre/linux-libre_kernels_aur_version.sh b/libre/linux-libre/linux-libre_kernels_aur_version.sh index d80096905..a4db1583e 100755 --- a/libre/linux-libre/linux-libre_kernels_aur_version.sh +++ b/libre/linux-libre/linux-libre_kernels_aur_version.sh @@ -20,7 +20,7 @@ # You should have received a copy of the GNU General Public License # along with Parabola. If not, see <http://www.gnu.org/licenses/>. -for kernel in libre/linux-libre{,-lts,-grsec,-pck} kernels/linux-libre-{knock,grsec-knock,rt,pae,xen,lts-{grsec,knock,grsec-knock}}; do +for kernel in libre/linux-libre{,-lts{,-grsec},-grsec,-pck} kernels/linux-libre-{knock,grsec-knock,rt,pae,xen,lts-{knock,grsec-knock}}; do cd ~/packages/abslibre/$kernel sed -i '\|conflicts=| s|"${_replacesarchkernel\[@][/%a-z-]*}" ||' $(grep -rlI 'conflicts') cd ~/packages/abslibre diff --git a/libre/luxrays/PKGBUILD b/libre/luxrays/PKGBUILD index 36a84af49..596bedbe0 100644 --- a/libre/luxrays/PKGBUILD +++ b/libre/luxrays/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 132036 2015-04-23 06:25:24Z fyan $ +# $Id: PKGBUILD 138970 2015-08-30 09:36:35Z stativ $ # Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> # Maintainer: Márcio Silva <coadde@parabola.nu> pkgname='luxrays' -pkgver=1.4 -_pkgver=7c7127ee1fa4 -pkgrel=4.parabola1 +pkgver=1.5 +_pkgver=53c0b9a41ea2 +pkgrel=1.parabola1 pkgdesc="Accelerate the ray intersection process by using GPUs, with opencl-mesa recommendation" -arch=('i686' 'x86_64' 'mips64el') +arch=('x86_64') url="http://www.luxrender.net/" license=('GPL') -depends=('freetype2' 'libcl' 'libgl' 'libpng' 'openimageio') -makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut') +depends=('embree' 'libcl' 'libgl' 'openimageio') +makedepends=('boost' 'cmake' 'freetype2' 'libpng' 'mesa' 'opencl-headers' 'glew' 'freeglut') optdepends=('opencl-mesa: OpenCL support for AMD/ATI GPUs' \ - 'glew: demos (SmallLuxGPU etc.)' 'freeglut: demos (SmallLuxGPU etc.)' \ + 'glew: demos (SmallLuxGPU etc.)' \ + 'freeglut: demos (SmallLuxGPU etc.)' \ 'boost-libs: demos (SmallLuxGPU etc.)') options=('staticlibs') source=($pkgname-$pkgver.tar.bz2::https://bitbucket.org/luxrender/luxrays/get/${_pkgver}.tar.bz2 \ force_python3.diff) -md5sums=('2dda3316fb2ae9be6e58b5fa3a35de62' +md5sums=('b432c48332a765791d27aaa25fee4783' '3bfb5594a709d1ea772866d66904b8fd') prepare() { @@ -29,10 +30,10 @@ prepare() { build() { cd "$srcdir/luxrender-luxrays-$_pkgver" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=ON \ - -DLUXRAYS_DISABLE_OPENCL=OFF \ - . + -DLUXRAYS_DISABLE_OPENCL=OFF make } diff --git a/libre/luxrender/PKGBUILD b/libre/luxrender/PKGBUILD index 9a883bb48..4be470e69 100644 --- a/libre/luxrender/PKGBUILD +++ b/libre/luxrender/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 133054 2015-05-09 12:38:26Z stativ $ +# $Id: PKGBUILD 138968 2015-08-30 09:36:10Z stativ $ # Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor (Arch): flixie <69one@gmx.net> # Contributor (Arch): Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer: Márcio Silva <coadde@parabola.nu> pkgname=luxrender -pkgver=1.4 -_pkgver=dfd211d6faa0 -pkgrel=6.parabola1 +pkgver=1.5 +_pkgver=216e294b59e3 +pkgrel=1.parabola1 pkgdesc="Rendering system for physically correct, unbiased image synthesis, with opencl-mesa recommendation" -arch=('i686' 'x86_64' 'mips64el') +arch=('x86_64') url="http://www.luxrender.net/" license=('GPL') -depends=('boost-libs' 'freeimage' 'openexr' 'openimageio' 'libpng' 'libcl' 'libgl' 'fftw') -optdepends=('blender-addon-luxrender: Blender exporter' 'qt4: Qt GUI' +depends=('boost-libs' 'embree' 'freeimage' 'openexr' 'openimageio' 'libpng' 'libcl' 'libgl' 'fftw') +optdepends=('blender-addon-luxrender: Blender exporter' 'qt4: Qt GUI' \ 'python: pylux Python interface' 'opencl-mesa: OpenCL support for AMD/ATI GPUs') makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers') @@ -20,7 +20,7 @@ conflicts=("$pkgname-libre" "$pkgname-parabola") replaces=("$pkgname-libre" "$pkgname-parabola") source=(https://bitbucket.org/luxrender/lux/get/${_pkgver}.tar.bz2 \ force_python3.diff) -md5sums=('7591ac4e86d0232245af38f6cf932c02' +md5sums=('531234aaa2969c3aacf2a69ed7835335' '42692e65eabc5828693e2682e94b7c64') prepare() { @@ -33,13 +33,13 @@ build() { cd "$srcdir"/luxrender-lux-$_pkgver - cmake -DCMAKE_INSTALL_PREFIX=/usr \ + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DLUXRAYS_DISABLE_OPENCL=OFF \ -DPYTHON_CUSTOM=ON \ -DPYTHON_LIBRARIES=/usr/lib/libpython3.4m.so \ -DPYTHON_INCLUDE_PATH=/usr/include/python3.4m/ \ - -DCMAKE_EXE_LINKER_FLAGS=-lpthread \ - . + -DCMAKE_EXE_LINKER_FLAGS=-lpthread make } @@ -50,7 +50,7 @@ package() { # fix library path on x86_64 [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib - #install pylux + # install pylux install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.4/pylux.so } diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD index 433ab70e3..2b62e0a44 100644 --- a/libre/mesa-libcl/PKGBUILD +++ b/libre/mesa-libcl/PKGBUILD @@ -4,10 +4,10 @@ pkgbase=mesa _pkgname=libcl pkgname=$pkgbase-$_pkgname -pkgver=10.6.4 +pkgver=10.6.5 pkgrel=1 pkgdesc='Mesa 3-D OpenCL library and ICD loader' -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://${pkgbase}3d.sourceforge.net" license=('custom') depends=("$pkgbase" 'libclc' 'clang') @@ -19,7 +19,7 @@ conflicts=("$_pkgname" "$_pkgname-libre" 'opencl-nvidia' 'opencl-nvidia-304xx' ' replaces=("$_pkgname" "$_pkgname-libre" 'opencl-nvidia' 'opencl-nvidia-304xx') source=(ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig} 0001-i965-Remove-early-release-of-DRI2-miptree.patch) -sha512sums=('913800ebb73bde04ceed1dfe0c622f36622a89be2a795b63e6b05fbb59a982f4b0d83531b2b1697aeb20bab0aac4b82adf8e7d1985713e525d722b3b7b58f683' +sha512sums=('46be6bd683d286bdf9ab8b4c1b1b32f89c95701b8c48cee49b060f5beaacea4540a69b99b4fde0f80acdd8e725552bef17dbd4251b9e977caeb5fd9d0ba56595' 'SKIP' '86bfab88131440d1e5aefd157f12d8927c1a71af4f29b43c607bd2c37ee87f8164c92dc4309fade3c667f7d5907f99d0aa79b5fee1b8ff0eafe5f6d869bbed99') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com> diff --git a/libre/midori-gtk3/PKGBUILD b/libre/midori-gtk3/PKGBUILD index 9bb49c055..36ed4f4ee 100644 --- a/libre/midori-gtk3/PKGBUILD +++ b/libre/midori-gtk3/PKGBUILD @@ -9,9 +9,9 @@ pkgname=midori-gtk3 pkgver=0.5.10 -pkgrel=1.parabola1 -pkgdesc='Lightweight web browser (GTK3), without non-privacy search providers' -arch=('x86_64' 'i686' 'mips64el') +pkgrel=1.parabola2 +pkgdesc='Lightweight web browser (GTK3), without non-privacy search engines' +arch=('x86_64' 'i686') url='http://www.midori-browser.org/' license=('LGPL2.1') install='midori.install' @@ -31,7 +31,7 @@ sha256sums=('702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f') prepare() { #cd "${pkgname/-gtk3}-$pkgver" - # remove non-privacy search providers + # remove non-privacy search engines sed -i 's|Duck Duck Go|DuckDuckGo HTML| s|duckduckgo[.]com|duckduckgo.com/html| \|Yahoo|d diff --git a/libre/midori/PKGBUILD b/libre/midori/PKGBUILD index ab72b2c62..a400cbcb0 100644 --- a/libre/midori/PKGBUILD +++ b/libre/midori/PKGBUILD @@ -9,8 +9,8 @@ pkgname=midori pkgver=0.5.10 -pkgrel=1.parabola1 -pkgdesc='Lightweight web browser (GTK2), without non-privacy search providers' +pkgrel=1.parabola2 +pkgdesc='Lightweight web browser (GTK2), without non-privacy search engines' arch=('x86_64' 'i686') url='http://www.midori-browser.org/' license=('LGPL2.1') @@ -26,7 +26,7 @@ sha256sums=('702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f') prepare() { #cd "$pkgname-$pkgver" - # remove non-privacy search providers + # remove non-privacy search engines sed -i 's|Duck Duck Go|DuckDuckGo HTML| s|duckduckgo[.]com|duckduckgo.com/html| \|Yahoo|d diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index e99b42fb4..832756cbf 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -9,35 +9,38 @@ # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> pkgname=mozilla-searchplugins -pkgver=1.7 +pkgver=1.9 pkgrel=1 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers." arch=('any') license=('MPL' 'GPL' 'LGPL') url="https://www.parabola.nu/" source=( + list.txt + searx.xml duckduckgo-html.xml duckduckgo-lite.xml seeks.xml::https://seeks.ru/opensearch.xml - searx.xml::https://searx.laquadrature.net/opensearch.xml internet-archive.xml parabola-packages.xml::https://www.parabola.nu/opensearch/packages/ - parabola-wiki-en.xml:: - yacy.xml::http://search.yacy.net/opensearchdescription.xml + parabola-wiki-en.xml + yacy.xml wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php ) package() { - install -m755 -d "${pkgdir}/usr/lib/mozilla/searchplugins" - install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins" + install -m755 -d "${pkgdir}/usr/lib/mozilla/searchplugins" + install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins" + install -m644 "${srcdir}"/list.txt "${pkgdir}/usr/lib/mozilla/searchplugins" } -sha256sums=('cd8e9eb45567cb362acf607e65fcabfaf682f0051a251aa6a616ca25cd77106e' +sha256sums=('f05c7f1505a2511ccb5a58174ed52605238431ae880e526176393fe72b73ffb9' + '3e95dff7d062889c86531aa80962b80e3c0d6c87244ec838963b313193c3f367' + 'cd8e9eb45567cb362acf607e65fcabfaf682f0051a251aa6a616ca25cd77106e' '1cd8dc8d1275a4e1fa10187997a0558f578c21a91e97c48222448e485de35d6a' '7ee18525957e05326db0bb2d6264bdceaf754b4df0a2fbe27d36707b7afae821' - '6811be771ea12bea5ac52e04a3d57a753b3e38553020e4acae3b62b04e07f76d' 'ec4a1054f4b9cca9cf410b3302fa86e2322a8dfdfe560b5dbbabba7d0bdd3197' '2480ca917a10d0955b818498171ecff6b86faf2eeae25684dd617ec4da40d585' '5e249e946193da91c95ade7f60fe227c28b99ecf40aba717b77d004ac9080905' - '3913ad1b9951a7550c73a6ff6690120b9a3663f55ddce62fb74e9b4018b580cc' - '6887bd0cdf2cf116c35b689b78cdd97657376b57cd6b4d51c940af0f22c5c232') + '8ed0e09a96020c5ba0df60b74c37a23d1bb1f2c80b04608abed3d1d450001722' + '44d8d849806e21a8e32489ade3e8191c4b4b23b416632beb258dea2484ed4ea3') diff --git a/libre/mozilla-searchplugins/list.txt b/libre/mozilla-searchplugins/list.txt new file mode 100644 index 000000000..030fb86a9 --- /dev/null +++ b/libre/mozilla-searchplugins/list.txt @@ -0,0 +1,9 @@ +duckduckgo-html +duckduckgo-lite +internet-archive +parabola-packages +parabola-wiki-en +searx +seeks +wikipedia-en +yacy diff --git a/libre/mozilla-searchplugins/searx.xml b/libre/mozilla-searchplugins/searx.xml new file mode 100644 index 000000000..e5eaed548 --- /dev/null +++ b/libre/mozilla-searchplugins/searx.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> + <ShortName>searx</ShortName> + <Description>Search searx</Description> + <Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAQAAAAAYLlVAAAACXBIWXMAAB8/AAAfPwHBe4GKAAAAB3RJTUUH3gELEhkV5/5DowAAAAJiS0dEAP+Hj8y/AAAHnUlEQVRo3u2Za4xdVRXHf2ef173z6kxnOjPMzE2pbVOJlKYipYE0Ko0EKfiKBpuABY1CTCDYRL9ASGiCfiDEUKOBGAFRgeCLQE1aP2jTCCnFgoq1pUNaCy0thdoW+ph7z9nn74ez77l3ppS5MzWDH1g7557csx/rv9de67/XPgc+lA/lQ6nLTS216vT6vSFvkB6CFloval39eRx7/wbel8xTwf7grfBYdDw8Fh4JDvnPe2tpf99OjzO7VQCfRiw/i+oV5qEwi1VWuzrV5UqH2lRSqGCLuY7oLKPu5v5WAXwf8ch7PJ9lXo5smzrVrdnq0xwNaEAD6lefetWjLrUplj/Gte/Rdx7i8GSKjbtfBlxH94TKO8Nj8YUlUyIvZcqU3FUunpUoxdHT/u/pnzD2BqDMnEmW1t0PMQC8zEVFTWS2hktDQkICfHx8DAYPg7CAJcOSYklJSEjesYt0qOj/FZ4EqizhlVYAJM6r7+QeAALzYrQ4ogGgygJWciG9RKS8wyv8hW2EUFdPjVrVrtSzAMxmHx1AyjJeasUHasiVLwAlM1pSl+ZoSOdrgS7Sau3QmfK21mqpFmieRtSvHrUrkDcXmMVbbrSEi1tzwkMFALHGPJGrH9Y8zdcV2qmzy2F9R/M1XxUNqEdtCt705vJqMVaNxa0B2NwA4ClSp/o0rHlaqNs1uazXRzVfFfWrWyUZNU3mFHNbi4KtjUc+Efnqw/X8sAX0t3J/0ScibK5KeKs1AJsaXhkSEBARsoq7WqSRK7mVjMg5bBNL7+LU+/f03b3Kt4gBAiIiYmJiflNUTy6X8Cr/dnbPsPXHt7GzNQsc5IXm+QeIB4lJsU0lG1eaa1ISbkOub1AHfpTftcqEsCb/6zsjLmYJVUc0deX2DDh19RbLQlaB6+8ArJ/ccg0A+3kAjIMgVsKE+VssEVW28U8ivAk1KSdZ6/jSx+QM96OpAIC7OZnTrcFyFSnpuPmLd1nLEJ9jJcP8etxCpFgS2ljk+hs8uJ4jkwNo9rITZiS4JCIiYIhvU3UOhbuf4BqepewCdCOHuZqqg5a5+9/YiyUlw/4ru6UV5zXj/i3wMHh4fIxqYYEUSwY8wMEmvD6/YnOTFfKWFfJlBK/TeFMG4FWM258GqTZ5QIbF5+kJXSM2uZCrA03pQXh4GOhqLXzHZ3blXL1H5OadW0R4wGuUJnR+nYwUuUUQahrOC7xpADglBIgTWFK39+cAUjpIJ3Ruw2KdBwiLOAnOZ5SIKS+B9uZMBq9hScbFQZVLG+14jF34LCVpWgBLypt4zm05ztQBsD2fDewo1jYlJSHlNDcU2YvlOEfp5JpxLVIS9ruIEU250RQs8IfMDfAuuwoL1G2whHsxJAjDDXyNR6GpRQ5iXxGW2ptpyj6g57PMGosl5k+sdpTi42EwZCxjI7/k77RxBZ/nFMm4vUEcZH8RltramgUmuGqwOf5kiTIxQ/wAHx/PXcaFV06yGdbZqlEi7mCUGmOMcZrkfPZN3QfINlgsCZY32AIu3UyoFVeVMcaoFjWN8iJ7yOoO+Y/W1J9hAdqDE2ViYkpE3MUAfsHtuQ0akaCCATIyDHfzGlXGqHKa9OPZS60BmJhxJNS8lXWFe1leUEwjC6j/po6C8/IwL5ORYKmR7rTryKZnASgFu+NKnhFFVLidoLCBV9hA0AQMNrKRmgvF05hr39nQaiZlzngyZm+vFev+Ous5TEr1jDLm7jXG+DnPUCPFInxCXb5bQWrkTc8CgLkvXBsTuRKwmkWETfOv+wBY3uAR3iWlRkKGhw+kp5ZetmkHmZdNEwC++XO4Ii4SbY9BFnMps5zreYAh4a9s5wCJO5zVyBARJTxqta6bR39xnG47PQCA2RKtCF2iHRDgkTHEXGZTIuEoB9iLh+cYMAdgETElYgxVZn1z96NjtmynCQDf/DS4KT+c+oTF2dhrCsI8FtLieGox+C6EfRLMg2/cciToTafmhHWx2deTm2v/qUf2aU4z5kio6tguv/J/tT9aICNljFNUsYRkNw8+9UyHfGumY4EcXxs/878aNL0d8PBcztBIzNM92Wc1yo08lA/pE1EiJsCSjB5ejMV6YtpygX9fsCdSWW3qUKc61akOtausWOEJ/wlvVdFyFSfz422gsno0qIqG1b//MxdAZs71Nd6wd4f/nH8yqIW1sBbU/FHzE+/SM1otzHcpT75K6taAKhpWr5YtV3juEOobeFt+ijyLDLK7DiFWlwY0ohH11+Z9A9L/EYTJZVsOwShWp+ZoRBX1q/I9xfJb48dzFZ+H8kg1itShPg2rogH1P6ng4AxBgHV1CKHa1athVTSowd/e0y0zUxCurr/yCdSuXg2povPUN7qu9+1wpiBc1QjLNvVoSBUNqe/A8iXyj84QhH6O1GOirG4NakTD6jt55QUKNEMxMcQL+VL4KmmWY4Y+LfmUIjtDEEK21yFEDWY4/nifIvkzxQzrG2GZM8OIhl6pdimeuS8y9zbCMmeGEV1+ozpnjBz5Ll/Gbdj59m45egkzpx+ACzmQx0SoNnUfX7M0nTXTn8YifuzCMv3ER1RS6YP4PncxD/Oc+aK81Jfv8cGIh0AflPb/K/kvIVmE2W8jhuAAAAAASUVORK5CYII=</Image> + <InputEncoding>UTF-8</InputEncoding> + <LongName>searx metasearch</LongName> + + <Url type="text/html" method="post" template="https://searx.laquadrature.net/"> + <Param name="q" value="{searchTerms}" /> + </Url> + + +</OpenSearchDescription> diff --git a/libre/mozilla-searchplugins/yacy.xml b/libre/mozilla-searchplugins/yacy.xml new file mode 100644 index 000000000..ec7bf2970 --- /dev/null +++ b/libre/mozilla-searchplugins/yacy.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<OpenSearchDescription + xmlns="http://a9.com/-/spec/opensearch/1.1/" + xmlns:suggestions="http://www.opensearch.org/specifications/opensearch/extensions/suggestions/1.1"> + <ShortName>YaCy</ShortName> + <LongName>YaCy.net - Web Search by the People, for the People</LongName> + <Image type="image/gif">http://search.yacy.net:7001/env/grafics/yacy.png</Image> + <Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAAAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////Chiu+fBm+fRq+fRq+fRq+fRq+fRq8ehXMmk////////////////////////////++exjUqGfZsnjYsXbYsXbYsXbZsnjTp2W+fBr///////////////////////////+9exfs2r/69/L58+z58+z58+z59e/z59bChSn///////////////////////////+9fBnnz638+fX69O369e748un38Ob59O3Ll0fVrGz////////////////////////Jk0HJlUjXuYrWt4jVtYPr28T58+r59OzPn1fPnlX////////////////////////Rolu8eRXCiTPEjTvCijbNnlj169359e7Zs3vLlkf////////////////////////UqmrAgSLt3MP27eH1693169327+T59Ozo0rG/gB////////////////////////////+/gCDv4Mn48+v38Of59Oz58+v48+vr2b2+fRv///////////////////////////+9ehXr17n58+z48ejo0bDp07T48+zx49DBhCj///////////////////////////+/fhzjyJ/59Oz59OzQoVvNmU759Oz58+vKlUbXrnH////////////////////////LlkfUqmn59Oz48+vZtHzNm1D48+v59OzPoFjOnlX////////////////////////OnVPOnFL59e348+vq1rnEiC7u38j69vDXsHTIkT3////////////////////////UqWjIkD327+T58+3s2bzAgSLp07T79/Pmzqq+fBn///////////////////////////+/fx7v4Mr7+PTx5NDHkD3kyqP8+vjs2r+9exf///////////////////////////++fBjQoFnVq2zTp2bGjTjJk0LWrW7SpWC+exf////////////////////////////Nm1C6dQy7eBG8eBK9exe8ehS7dxC6dQzLlkj////////////AH///wB8x+sAf///AD/+PwA///8AP///AD///4A9PU+APoz/gB///4AdxvOAHoz/gB3368AfjU/AHT1PwB/+P +</Image> + <Language>en-us</Language> + <OutputEncoding>UTF-8</OutputEncoding> + <InputEncoding>UTF-8</InputEncoding> + <AdultContent>true</AdultContent> + <Description>YaCy is a free GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer.</Description> + + <Url type="text/html" method="GET" template="http://search.yacy.net:7001/yacysearch.html?query={searchTerms}&startRecord={startIndex?}&maximumRecords={count?}&nav=all&resource=global" /> + <Url type="application/rss+xml" method="GET" template="http://search.yacy.net:7001/yacysearch.rss?nav=&query={searchTerms}&startRecord={startIndex?}&maximumRecords={count?}&nav=all&resource=global" /> + <Url type="application/atom+xml" method="GET" template="http://search.yacy.net:7001/yacysearch.atom?query={searchTerms}&startRecord={startIndex?}&maximumRecords={count?}&resource=global" /> + + <Url type="application/x-suggestions+json" template="http://search.yacy.net:7001/suggest.json?query={searchTerms}"/> + <Url type="application/x-suggestions+xml" template="http://search.yacy.net:7001/suggest.xml?query={searchTerms}"/> + <!-- syntax according to http://www.loc.gov/standards/sru/. Set verify=true to get snippets in the search results --> + <Developer>See http://github.com/orgs/yacy/teams/yacy_developers</Developer> + <Query role="example" searchTerms="yacy+free+software" /> + <Tags>YaCy Free Software P2P Peer-to-Peer Uncensored Distributed Web Search Engine</Tags> + <Contact>See http://search.yacy.net:7001/ViewProfile.html?hash=localhash</Contact> + <Attribution>http://yacy.net YaCy Software &copy; 2004-2014 by Michael Christen et al., YaCy.net; Content: ask peer owner</Attribution> + <SyndicationRight>open</SyndicationRight> +</OpenSearchDescription> diff --git a/libre/netsurf/PKGBUILD b/libre/netsurf/PKGBUILD index e4fdaed84..50a3270e8 100644 --- a/libre/netsurf/PKGBUILD +++ b/libre/netsurf/PKGBUILD @@ -7,9 +7,9 @@ pkgname=netsurf pkgver=3.3 -pkgrel=1.parabola1 -pkgdesc='Lightweight and fast web browser, without non-privacy search providers' -arch=('x86_64' 'i686' 'mips64el') +pkgrel=1.parabola2 +pkgdesc='Lightweight and fast web browser, without non-privacy search engines' +arch=('x86_64' 'i686') url='http://www.netsurf-browser.org/' license=('MIT' 'GPL2') replaces=(${pkgname}-libre) @@ -25,7 +25,7 @@ sha256sums=('23f92a0940f577b9605f2e54786fea3521680d32d6c00f2a3db1eae3f29e3686' prepare() { cd "$pkgname-$pkgver" - # remove non-privacy search providers + # remove non-privacy search engines sed -i '\|Google|d \|Yahoo|d \|Bing|d diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD index 7698faa60..9bbeaa040 100644 --- a/libre/parabolaweb-utils/PKGBUILD +++ b/libre/parabolaweb-utils/PKGBUILD @@ -1,14 +1,14 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> pkgname=(parabolaweb-utils parabolaweb-dev) -pkgver=20150417 +pkgver=20150814 pkgdesc="Utilities for managing the ParabolaWeb website application" url="https://projects.parabola.nu/packages/parabolaweb-utils.git/" license=('GPL2') # The commit to get dependency info for # Bump pkgrel instead of pkgver if updating this is the only change -_parabolaweb_commit=d2eb47c0dfc068c7727232d89daeee377969288d +_parabolaweb_commit=97d80ca25b9d0b76c88774b8d566d15d4e1eb21f pkgrel=1 epoch=1 @@ -16,8 +16,8 @@ arch=('i686' 'x86_64') source=("https://projects.parabolagnulinux.org/packages/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2" "requirements_prod-${_parabolaweb_commit}.txt::https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt?id=${_parabolaweb_commit}") -md5sums=('12419393e81d9a890a98a676eec4103e' - '28653bf82e9c73b6f1d736bf107d2a40') +md5sums=('4f4cbe0de96b1b5c526506017b600c13' + '2a282dc52fb6cf3c4907715a2e85dc7b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/libre/qupzilla/PKGBUILD b/libre/qupzilla/PKGBUILD index 9565202e7..a328f4f89 100644 --- a/libre/qupzilla/PKGBUILD +++ b/libre/qupzilla/PKGBUILD @@ -5,8 +5,8 @@ pkgbase=qupzilla pkgname=(qupzilla qupzilla-qt4) pkgver=1.8.6 -pkgrel=1.parabola1 -arch=(i686 x86_64 mips64el) +pkgrel=1.parabola2 +arch=(i686 x86_64) url="http://www.qupzilla.com/" license=('GPL3') makedepends=('qtwebkit' 'qt5-webkit' 'qt5-script' 'qt5-tools' 'hunspell' 'kdelibs' 'kwallet' 'libgnome-keyring') @@ -57,7 +57,7 @@ build() { } package_qupzilla() { - pkgdesc="Cross-platform QtWebKit browser (Qt5), without non-privacy search providers" + pkgdesc="Cross-platform QtWebKit browser (Qt5), without non-privacy search engines" depends=('qt5-webkit' 'qt5-script' 'hunspell' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('kwallet: kf5 kwallet integration' 'libgnome-keyring: gnome keyring integration') @@ -74,7 +74,7 @@ package_qupzilla() { } package_qupzilla-qt4() { - pkgdesc="Cross-platform QtWebKit browser (Qt4), without non-privacy search providers" + pkgdesc="Cross-platform QtWebKit browser (Qt4), without non-privacy search engines" depends=('qtwebkit' 'hunspell') optdepends=('kdelibs: kwallet integration' 'libgnome-keyring: gnome keyring integration') diff --git a/libre/ruby/PKGBUILD b/libre/ruby/PKGBUILD index d9a5b6890..41230a1a0 100644 --- a/libre/ruby/PKGBUILD +++ b/libre/ruby/PKGBUILD @@ -6,7 +6,7 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=(ruby ruby-docs) -pkgver=2.2.2 +pkgver=2.2.3 _jsonver=1.8.1 pkgrel=1.parabola1 arch=(i686 x86_64) @@ -15,27 +15,36 @@ license=(BSD custom) makedepends=(gdbm openssl libffi doxygen graphviz libyaml ttf-dejavu tk) options=(!emptydirs) mksource=(http://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz - https://github.com/flori/json/archive/v${_jsonver}.tar.gz - json-${_jsonver}.gem - libre.patch) + https://github.com/flori/json/archive/v${_jsonver}.tar.gz) source=(https://repo.parabola.nu/other/ruby-libre/ruby-libre-${pkgver}.tar.xz + json-${_jsonver}.gem + remove-nonfree-json-references.patch + remove-nonfree-ruby-references.patch gemrc) -mksha1sums=('58cfec8db9b51ad1ff3bd2b9065da087913a6268' - '043ed2df4b0ce2174c9c020ffcb4ec31f9fde560' - '2cd288d00c5211e4c9d9338080b30af65cbb143a' - '5595b4eeb67ac5f63d13630932b44bf2a8ed9197') -sha1sums=('194cabc318c0ed63042059c5f60376f254c5b626' +mksha1sums=('cff5421e3a7f6dbe72009ef44164d4b9e6d1801f' + '043ed2df4b0ce2174c9c020ffcb4ec31f9fde560') +sha1sums=('36c5a0b8179179b91ee185796519a841dfa4b9be' + '2cd288d00c5211e4c9d9338080b30af65cbb143a' + '0ba1010a271e6fcc1734f7382b99963f46133ea5' + '57b7f137daf2e925739e8c1d1471b13b9bfa8bbd' 'dc536754c8fac2c3d82965c5a708cd8f79562d98') mksource() { rm -rv ruby-${pkgver}/ext/json rm -rv ruby-${pkgver}/test/json - rm -rv json-${_jsonver}/ext +} + +prepare() { + cd ruby-${pkgver} + + install -D -m644 ${srcdir}/json-${_jsonver}.gem gems + + patch -Np1 -i ${srcdir}/remove-nonfree-ruby-references.patch - cp -v json-${_jsonver}.gem ruby-${pkgver}/gems + cd ${srcdir}/json-${_jsonver} - patch -Np0 -i libre.patch + patch -Np1 -i ${srcdir}/remove-nonfree-json-references.patch } build() { diff --git a/libre/ruby/libre.patch b/libre/ruby/remove-nonfree-json-references.patch index ea530d38d..4fb5dd1e2 100644 --- a/libre/ruby/libre.patch +++ b/libre/ruby/remove-nonfree-json-references.patch @@ -236,84 +236,3 @@ diff -Nur json-1.8.1.orig/lib/json.rb json-1.8.1/lib/json.rb - end + require 'json/pure' end -diff -Nur ruby-2.2.2.orig/common.mk ruby-2.2.2/common.mk ---- ruby-2.2.2.orig/common.mk 2015-03-22 00:39:38.000000000 -0300 -+++ ruby-2.2.2/common.mk 2015-04-14 15:33:02.058396283 -0300 -@@ -15,7 +15,7 @@ - - RUBYLIB = $(PATH_SEPARATOR) - RUBYOPT = - --RUN_OPTS = --disable-gems -+RUN_OPTS = --disable-gems -I$(srcdir)/../json-1.8.1/lib - - SPEC_GIT_BASE = git://github.com/ruby - MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git -@@ -728,8 +728,6 @@ - - srcs-ext: $(EXT_SRCS) - --srcs-extra: $(srcdir)/ext/json/parser/parser.c -- - LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb - - srcs-lib: $(LIB_SRCS) -@@ -816,11 +814,6 @@ - top_srcdir=../.. srcdir=. \ - RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" - --$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl -- $(ECHO) generating $@ -- $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \ -- Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)" -- - $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \ - $(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in - $(ECHO) generating $@ -diff -Nur ruby-2.2.2.orig/defs/default_gems ruby-2.2.2/defs/default_gems ---- ruby-2.2.2.orig/defs/default_gems 2014-07-15 00:43:04.000000000 -0300 -+++ ruby-2.2.2/defs/default_gems 2015-04-14 15:33:02.058396283 -0300 -@@ -1,4 +1,3 @@ - # gem base directory versioning file [executable files under bin] - rake lib/rake lib/rake.rb [rake] - rdoc lib/rdoc lib/rdoc.rb [rdoc ri] --json ext/json ext/json/lib/json/version.rb -diff -Nur ruby-2.2.2.orig/ext/.document ruby-2.2.2/ext/.document ---- ruby-2.2.2.orig/ext/.document 2014-08-02 11:55:36.000000000 -0300 -+++ ruby-2.2.2/ext/.document 2015-04-14 15:33:02.058396283 -0300 -@@ -35,9 +35,6 @@ - io/nonblock/nonblock.c - io/wait/lib - io/wait/wait.c --json/ext/generator/generator.c --json/ext/parser/parser.c --json/lib - mathn/complex/complex.c - mathn/rational/rational.c - nkf/lib -diff -Nur ruby-2.2.2.orig/gems/bundled_gems ruby-2.2.2/gems/bundled_gems ---- ruby-2.2.2.orig/gems/bundled_gems 2014-12-12 11:00:15.000000000 -0200 -+++ ruby-2.2.2/gems/bundled_gems 2015-04-14 15:33:02.058396283 -0300 -@@ -1,3 +1,4 @@ - power_assert 0.2.2 - test-unit 3.0.8 - minitest 5.4.3 -+json 1.8.1 -diff -Nur ruby-2.2.2.orig/test/ruby/test_module.rb ruby-2.2.2/test/ruby/test_module.rb ---- ruby-2.2.2.orig/test/ruby/test_module.rb 2015-04-12 12:41:32.000000000 -0300 -+++ ruby-2.2.2/test/ruby/test_module.rb 2015-04-14 15:33:02.058396283 -0300 -@@ -202,7 +202,6 @@ - - ancestors = Object.ancestors - mixins = ancestors - [Object, Kernel, BasicObject] -- mixins << JSON::Ext::Generator::GeneratorMethods::String if defined?(JSON::Ext::Generator::GeneratorMethods::String) - assert_equal([Object, Kernel, BasicObject], ancestors - mixins) - assert_equal([String, Comparable, Object, Kernel, BasicObject], String.ancestors - mixins) - end -@@ -436,7 +435,6 @@ - assert_equal([Mixin], User.included_modules) - - mixins = Object.included_modules - [Kernel] -- mixins << JSON::Ext::Generator::GeneratorMethods::String if defined?(JSON::Ext::Generator::GeneratorMethods::String) - assert_equal([Kernel], Object.included_modules - mixins) - assert_equal([Comparable, Kernel], String.included_modules - mixins) - end diff --git a/libre/ruby/remove-nonfree-ruby-references.patch b/libre/ruby/remove-nonfree-ruby-references.patch new file mode 100644 index 000000000..77966827c --- /dev/null +++ b/libre/ruby/remove-nonfree-ruby-references.patch @@ -0,0 +1,81 @@ +diff -Nur ruby-2.2.3.orig/common.mk ruby-2.2.3/common.mk +--- ruby-2.2.3.orig/common.mk 2015-08-15 15:10:16.000000000 -0300 ++++ ruby-2.2.3/common.mk 2015-08-20 01:58:55.065621626 -0300 +@@ -15,7 +15,7 @@ + + RUBYLIB = $(PATH_SEPARATOR) + RUBYOPT = - +-RUN_OPTS = --disable-gems ++RUN_OPTS = --disable-gems -I$(srcdir)/../json-1.8.1/lib + + SPEC_GIT_BASE = git://github.com/ruby + MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git +@@ -729,8 +729,6 @@ + + srcs-ext: $(EXT_SRCS) + +-srcs-extra: $(srcdir)/ext/json/parser/parser.c +- + LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb + + srcs-lib: $(LIB_SRCS) +@@ -817,11 +815,6 @@ + top_srcdir=../.. srcdir=. \ + RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" + +-$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl +- $(ECHO) generating $@ +- $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \ +- Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)" +- + $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \ + $(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in + $(ECHO) generating $@ +diff -Nur ruby-2.2.3.orig/defs/default_gems ruby-2.2.3/defs/default_gems +--- ruby-2.2.3.orig/defs/default_gems 2014-07-15 00:43:04.000000000 -0300 ++++ ruby-2.2.3/defs/default_gems 2015-08-20 01:58:55.065621626 -0300 +@@ -1,4 +1,3 @@ + # gem base directory versioning file [executable files under bin] + rake lib/rake lib/rake.rb [rake] + rdoc lib/rdoc lib/rdoc.rb [rdoc ri] +-json ext/json ext/json/lib/json/version.rb +diff -Nur ruby-2.2.3.orig/ext/.document ruby-2.2.3/ext/.document +--- ruby-2.2.3.orig/ext/.document 2014-08-02 11:55:36.000000000 -0300 ++++ ruby-2.2.3/ext/.document 2015-08-20 01:58:55.065621626 -0300 +@@ -35,9 +35,6 @@ + io/nonblock/nonblock.c + io/wait/lib + io/wait/wait.c +-json/ext/generator/generator.c +-json/ext/parser/parser.c +-json/lib + mathn/complex/complex.c + mathn/rational/rational.c + nkf/lib +diff -Nur ruby-2.2.3.orig/gems/bundled_gems ruby-2.2.3/gems/bundled_gems +--- ruby-2.2.3.orig/gems/bundled_gems 2014-12-12 11:00:15.000000000 -0200 ++++ ruby-2.2.3/gems/bundled_gems 2015-08-20 01:58:55.065621626 -0300 +@@ -1,3 +1,4 @@ + power_assert 0.2.2 + test-unit 3.0.8 + minitest 5.4.3 ++json 1.8.1 +diff -Nur ruby-2.2.3.orig/test/ruby/test_module.rb ruby-2.2.3/test/ruby/test_module.rb +--- ruby-2.2.3.orig/test/ruby/test_module.rb 2015-04-12 12:41:32.000000000 -0300 ++++ ruby-2.2.3/test/ruby/test_module.rb 2015-08-20 01:58:55.065621626 -0300 +@@ -202,7 +202,6 @@ + + ancestors = Object.ancestors + mixins = ancestors - [Object, Kernel, BasicObject] +- mixins << JSON::Ext::Generator::GeneratorMethods::String if defined?(JSON::Ext::Generator::GeneratorMethods::String) + assert_equal([Object, Kernel, BasicObject], ancestors - mixins) + assert_equal([String, Comparable, Object, Kernel, BasicObject], String.ancestors - mixins) + end +@@ -436,7 +435,6 @@ + assert_equal([Mixin], User.included_modules) + + mixins = Object.included_modules - [Kernel] +- mixins << JSON::Ext::Generator::GeneratorMethods::String if defined?(JSON::Ext::Generator::GeneratorMethods::String) + assert_equal([Kernel], Object.included_modules - mixins) + assert_equal([Comparable, Kernel], String.included_modules - mixins) + end diff --git a/libre/sagemath/PKGBUILD b/libre/sagemath/PKGBUILD index e121efc5f..872ceceb7 100644 --- a/libre/sagemath/PKGBUILD +++ b/libre/sagemath/PKGBUILD @@ -11,34 +11,35 @@ pkgname=sagemath pkgver=6.8 -pkgrel=1.parabola1 +pkgrel=3.parabola1 pkgdesc="Free Mathematics Software, free software replacement of Magma, Maple, Mathematica, and Matlab, without nonfree nauty recommendation" arch=(i686 x86_64) url="http://www.sagemath.org" license=(GPL) -depends=(ipython2 ppl glpk mpfi palp polybori singular libcliquer maxima-ecl gfan sympow tachyon python2-rpy2 +depends=(ipython2 ppl mpfi palp polybori singular libcliquer maxima-ecl gfan sympow tachyon python2-rpy2 python2-matplotlib python2-scipy python2-sympy python2-networkx libgap gap flintqs lcalc lrcalc eclib gmp-ecm zn_poly gd python2-cvxopt pynac linbox gsl rubiks pari-galdata pari-seadata-small planarity rankwidth sage-data-combinatorial_designs sage-data-elliptic_curves sage-data-graphs sage-data-polytopes_db sage-data-conway_polynomials) optdepends=('cython2: to compile cython code' 'jmol: 3D plots' 'sage-notebook: Browser-based (flask) notebook interface' - 'sagemath-doc: Documentation and inline help' 'ipython2-notebook: IPython notebook interface' 'mathjax: IPython notebook interface' + 'sagemath-doc: Documentation and inline help' 'ipython2-notebook: Jupyter notebook interface' 'mathjax: Jupyter notebook interface' 'coin-or-cbc: COIN backend for numerical computations' 'buckygen: for generating fullerene graphs' 'plantri: for generating some classes of graphs' 'benzene: for generating fusenes and benzenoids' 'modular_decomposition: modular decomposition of graphs' 'lrs: Algorithms for linear reverse search used in game theory and for computing volume of polytopes' 'imagemagick: to show animations' 'coxeter3: Coxeter groups implementation' 'cryptominisat: SAT solver' 'arb: floating-point ball arithmetic') -makedepends=(cython2-devel boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc +makedepends=(cython2 boost ratpoints symmetrica fflas-ffpack python2-jinja coin-or-cbc mcqd coxeter3 cryptominisat arb modular_decomposition bliss-graphs) # libfes conflicts=(sage-mathematics) replaces=(sage-mathematics) provides=(sage-mathematics) source=("$pkgname-$pkgver.tar.gz::https://github.com/sagemath/sage/archive/$pkgver.tar.gz" # "http://www.sagemath.org/packages/upstream/pexpect/pexpect-2.0.tar.bz2" -"http://mirrors.mit.edu/sage/spkg/upstream/pexpect/pexpect-2.0.tar.bz2" +"http://mirrors.mit.edu/sage/spkg/upstream/pexpect/pexpect-2.0.tar.bz2" 'kernel.json' 'anal.h' 'package.patch' 'env.patch' 'paths.patch' 'clean.patch' 'skip-check.patch' -'pexpect-env.patch' 'pexpect-del.patch' 'disable-fes.patch') +'pexpect-env.patch' 'pexpect-del.patch' 'disable-fes.patch' 'cython-0.23.patch' 'ipython-4.patch') md5sums=('943780ef4460e38f28fefe95e3138981' 'd9a3e113ed147dcee8f89962a8dccd43' + '4cee4f96bcd877587e7efc40c20adba7' 'a906a180d198186a39820b0a2f9a9c63' 'f72e544032b1a3f952b7ddafc3a49d63' '843a6cc3b17a1850604593813321418e' @@ -47,7 +48,9 @@ md5sums=('943780ef4460e38f28fefe95e3138981' '5947a420a0b1483f0cbc74c76895789b' 'a83a3b1bc7fcb7cbf752a83a8311fc42' 'f333939ea6c41377b66407c81016cee4' - '4eb23a3c7363258bc9ba764d6e5512ba') + '4eb23a3c7363258bc9ba764d6e5512ba' + '1b8dfa047115180aa0afbeaf19d97762' + '41aa997ad9f00afdc3357b37fc70f0e6') prepare(){ cd sage-$pkgver @@ -78,12 +81,16 @@ prepare(){ sed -e "s|os.path.join(SAGE_ROOT, 'sage')|'/usr/bin/sage'|" -i src/sage/repl/ipython_kernel/install.py # find bliss headers sed -e 's|graph.hh|bliss/graph.hh|' -i src/sage/graphs/bliss.pyx +# fix IPython 4 compatibility + patch -p0 -i ../ipython-4.patch # Upstream patches # fix build against libfes 0.2 http://trac.sagemath.org/ticket/15209 # patch -p0 -i "$srcdir"/fes02.patch # disable fes module, fails to compile patch -p0 -i ../disable-fes.patch +# fix build with cython 0.23 + patch -p1 -i "$srcdir"/cython-0.23.patch # use python2 sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -e 's|exec python|exec python2|' -i src/bin/* @@ -155,4 +162,14 @@ package() { python2 setup.py install --root="$pkgdir" --optimize=1 mkdir -p "$pkgdir"/usr/lib/sage/site-packages/ mv "$pkgdir"/usr/lib/python2.7/site-packages/pexpect* "$pkgdir"/usr/lib/sage/site-packages/ + +# Install Jupyter kernel + install -Dm644 "$srcdir"/kernel.json "$pkgdir"/usr/share/jupyter/kernels/sagemath/kernel.json + cd "$pkgdir"/usr/share/jupyter/kernels/sagemath + ln -s /usr/share/doc/sage/output/html/en doc + ln -s /usr/share/sage/ext/notebook-ipython/logo.svg . + ln -s /usr/share/sage/ext/notebook-ipython/logo-64x64.png . + + mkdir "$pkgdir"/usr/share/jupyter/nbextensions + ln -s /usr/share/{jsmol,mathjax} "$pkgdir"/usr/share/jupyter/nbextensions } diff --git a/libre/sagemath/c_lib.patch b/libre/sagemath/c_lib.patch deleted file mode 100644 index 6df7b8efa..000000000 --- a/libre/sagemath/c_lib.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- src/setup.py.orig 2014-11-01 23:49:10.000000000 +0100 -+++ src/setup.py 2014-11-07 00:40:58.414838636 +0100 -@@ -171,10 +171,12 @@ - m.libraries = ['csage'] + m.libraries - if m.language == 'c++': - m.libraries.append('stdc++') -+ m.libraries.append('ntl') -+ m.libraries = m.libraries + ['gmp', 'm', 'dl'] - - m.extra_compile_args = m.extra_compile_args + extra_compile_args - m.extra_link_args = m.extra_link_args + extra_link_args -- m.library_dirs = m.library_dirs + [os.path.join(SAGE_LOCAL, "lib")] -+ m.library_dirs += ['c_lib', '%s/lib' % SAGE_LOCAL] - m.include_dirs = m.include_dirs + include_dirs - - - diff --git a/libre/sagemath/cython-0.23.patch b/libre/sagemath/cython-0.23.patch new file mode 100644 index 000000000..2ae14ad57 --- /dev/null +++ b/libre/sagemath/cython-0.23.patch @@ -0,0 +1,16 @@ +diff --git a/src/sage/libs/polybori/decl.pxd b/src/sage/libs/polybori/decl.pxd +index b8fcc6e..6ec4bce 100644 +--- a/src/sage/libs/polybori/decl.pxd ++++ b/src/sage/libs/polybori/decl.pxd +@@ -10,8 +10,8 @@ cdef extern from "sage/libs/polybori/pb_wrap.h": + pbdp_asc "CTypes::dp_asc" + pbblock_dlex "CTypes::block_dlex" + pbblock_dp_asc "CTypes::block_dp_asc" +- pbdp "17" +- pbblock_dp "19" ++ pbdp "static_cast<COrderEnums::ordercodes>(17)" ++ pbblock_dp "static_cast<COrderEnums::ordercodes>(19)" + + cdef enum comparecodes "CCompareEnums::comparecodes": + less_than "CTypes::less_than" + diff --git a/libre/sagemath/ipython-4.patch b/libre/sagemath/ipython-4.patch new file mode 100644 index 000000000..a3b17563d --- /dev/null +++ b/libre/sagemath/ipython-4.patch @@ -0,0 +1,35 @@ +--- src/sage/repl/interpreter.py.orig 2015-08-16 14:57:55.571128473 +0200 ++++ src/sage/repl/interpreter.py 2015-08-16 14:58:06.647849803 +0200 +@@ -104,8 +104,8 @@ + import sys + from sage.repl.preparse import preparse + +-from IPython import Config +-from IPython.utils.traitlets import Bool, Type ++from traitlets.config.loader import Config ++from traitlets import Bool, Type + + from sage.env import SAGE_LOCAL + +--- src/sage/repl/ipython_kernel/__main__.py.orig 2015-08-22 12:32:58.595605714 +0200 ++++ src/sage/repl/ipython_kernel/__main__.py 2015-08-22 12:33:36.065900491 +0200 +@@ -1,3 +1,3 @@ +-from IPython.kernel.zmq.kernelapp import IPKernelApp ++from ipykernel.kernelapp import IPKernelApp + from sage.repl.ipython_kernel.kernel import SageKernel + IPKernelApp.launch_instance(kernel_class=SageKernel) +--- src/sage/repl/ipython_kernel/kernel.py.orig 2015-08-22 12:35:08.709928354 +0200 ++++ src/sage/repl/ipython_kernel/kernel.py 2015-08-22 12:35:31.983429208 +0200 +@@ -15,9 +15,9 @@ + #***************************************************************************** + + import sys +-from IPython.kernel.zmq.ipkernel import IPythonKernel +-from IPython.kernel.zmq.zmqshell import ZMQInteractiveShell +-from IPython.utils.traitlets import Type ++from ipykernel.ipkernel import IPythonKernel ++from ipykernel.zmqshell import ZMQInteractiveShell ++from traitlets import Type + + from sage.env import SAGE_VERSION, SAGE_EXTCODE, SAGE_DOC + from sage.repl.interpreter import SageNotebookInteractiveShell diff --git a/libre/sagemath/kernel.json b/libre/sagemath/kernel.json new file mode 100644 index 000000000..19b0f197b --- /dev/null +++ b/libre/sagemath/kernel.json @@ -0,0 +1 @@ +{"display_name": "SageMath", "argv": ["/usr/bin/sage", "-python", "-m", "sage.repl.ipython_kernel", "-f", "{connection_file}"]} diff --git a/libre/sh-roundup/PKGBUILD b/libre/sh-roundup/PKGBUILD index 10fdff645..cc614c0d9 100644 --- a/libre/sh-roundup/PKGBUILD +++ b/libre/sh-roundup/PKGBUILD @@ -1,39 +1,35 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=sh-roundup -pkgver=0.0.5.git17 -_gitver='commit=695ae7609353a360556e1f465ac81ce447235179' - +_pkgname="roundup" +pkgver=0.0.6 +pkgrel=1 pkgdesc='A unit testing framework for POSIX shell' -license=("custom:MIT") -url="http://bmizerany.github.io/roundup/" - -pkgrel=2 arch=('any') +url="http://bmizerany.github.io/roundup/" +license=("custom:MIT") depends=(sh) -makedepends=(ronn) +makedepends=(ruby-ronn) -source=("https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz" 'makefile-fix.patch') -md5sums=('053754e0a450288710bde0b9e5deb67e' +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/bmizerany/$_pkgname/archive/v$pkgver.tar.gz" + 'makefile-fix.patch') +md5sums=('607023b4fe4e42fdc2f0cb14b4138b2e' '9efcd83d666c1e84302fe611610c60fa') -mksource=("$pkgname-$pkgver::git://github.com/bmizerany/roundup.git#${_gitver}") -mkmd5sums=('SKIP') - prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$_pkgname-$pkgver" patch -i ../makefile-fix.patch Makefile } build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$_pkgname-$pkgver" ./configure --prefix="$pkgdir"/usr make -j1 build man } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$_pkgname-$pkgver" make -j1 install install-man install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } - diff --git a/libre/smplayer/PKGBUILD b/libre/smplayer/PKGBUILD index 430eb40a3..0191b5bbd 100644 --- a/libre/smplayer/PKGBUILD +++ b/libre/smplayer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 244955 2015-08-28 08:42:55Z foutrelis $ # Maintainer (Arch): Ionut Biru <ibiru@archlinux.org> # Contributor (Arch): Allan McRae <allan@archlinux.org> # Contributor (Arch): Alessio 'mOLOk' Bolognino <themolok@gmail.com> @@ -7,8 +7,8 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=smplayer -pkgver=14.9.0.6690 -pkgrel=1.parabola2 +pkgver=14.9.0.6994 +pkgrel=1.parabola1 pkgdesc="A complete front-end for MPlayer, without nonfree smtube recommendation" arch=('i686' 'x86_64') url="http://smplayer.sourceforge.net/" @@ -19,11 +19,14 @@ optdepends=('smplayer-themes: icon themes collection' 'smplayer-skins: skin themes collection' 'mpv: for using mpv instead of mplayer') install=smplayer.install -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('75d8947682de96f7bf29c6f1a2f21391') +source=(https://downloads.sourceforge.net/project/$pkgname/Unstable/releases/$pkgname-$pkgver.tar.bz2 + add-missing-QDataStream-include.patch) +md5sums=('666a589b1fc3480a29e87f0ee7efd511' + '418ab45eb94448fc8a2f44500c9742c2') prepare() { cd "$pkgname-$pkgver" + patch -Np1 -i ../add-missing-QDataStream-include.patch sed -i 's|DEFINES [+][=] YOUTUBE_SUPPORT|#DEFINES += YOUTUBE_SUPPORT| s|DEFINES [+][=] YT_USE_SCRIPT|#DEFINES += YT_USE_SCRIPT| ' src/smplayer.pro diff --git a/libre/smplayer/add-missing-QDataStream-include.patch b/libre/smplayer/add-missing-QDataStream-include.patch new file mode 100644 index 000000000..5f37b0957 --- /dev/null +++ b/libre/smplayer/add-missing-QDataStream-include.patch @@ -0,0 +1,11 @@ +diff -upr smplayer-14.9.0.6994.orig/src/qtsingleapplication/qtlocalpeer.cpp smplayer-14.9.0.6994/src/qtsingleapplication/qtlocalpeer.cpp +--- smplayer-14.9.0.6994.orig/src/qtsingleapplication/qtlocalpeer.cpp 2013-08-30 03:53:57.000000000 +0300 ++++ smplayer-14.9.0.6994/src/qtsingleapplication/qtlocalpeer.cpp 2015-08-28 11:37:18.435899495 +0300 +@@ -41,6 +41,7 @@ + + #include "qtlocalpeer.h" + #include <QCoreApplication> ++#include <QDataStream> + #include <QTime> + + #if defined(Q_OS_WIN) diff --git a/libre/spacefm/PKGBUILD b/libre/spacefm/PKGBUILD index 00d0b0e08..9f4ac3867 100644 --- a/libre/spacefm/PKGBUILD +++ b/libre/spacefm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 134719 2015-06-03 22:17:41Z arojas $ +# $Id: PKGBUILD 138873 2015-08-28 13:04:56Z arojas $ # Maintainer (Arch): Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor (Arch): IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor (Arch): ridikulus_rat <the.ridikulus.rat@gmail.com> @@ -6,10 +6,10 @@ # Contributor: Edison Ibañez <arkhan.xxx@gmail.com> pkgname=spacefm -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1.parabola1 pkgdesc='Multi-panel tabbed file manager, with unar support' -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url='http://ignorantguru.github.com/spacefm/' license=('GPL3') install=$pkgname.install @@ -24,7 +24,7 @@ replaces=(${pkgname}-libre) conflicts=(${pkgname}-libre) source=($pkgname-$pkgver.tar.gz::https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz libre.patch) -md5sums=('cef34680fc5b76d8aefc1efa5e4b8824' +md5sums=('000e26dc414443f934e3838610cb6174' '66cc35023050ff6664bf14b1073700e2') prepare() { diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD index 2cde342b2..8e44e9be4 100644 --- a/libre/tp_smapi/PKGBUILD +++ b/libre/tp_smapi/PKGBUILD @@ -14,7 +14,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=4.1 - _archrel=72 + _archrel=73 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/vhba-module/PKGBUILD b/libre/vhba-module/PKGBUILD index 43ec48eb1..dfc2e1145 100644 --- a/libre/vhba-module/PKGBUILD +++ b/libre/vhba-module/PKGBUILD @@ -9,7 +9,7 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then _basekernel=4.1 - _archrel=16 + _archrel=17 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=3.14 diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index ac615d742..831fa315e 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -5,8 +5,8 @@ pkgdesc="This package conflicts with every nonfree package known to date to ensu license=('GPL3') url="https://projects.parabola.nu/blacklist.git" #url="https://lukeshu.com/git/mirror/parabola/blacklist.git" -pkgver=20150730 -_gitver=ccec75e41f57f1ebb883d2789b48bf37211ed035 +pkgver=20150829 +_gitver=42873ae6fb9fa2b22d9c46e8b3b6ff0525f3850f pkgrel=1 arch=('any') @@ -16,7 +16,7 @@ install=${pkgname}.install makedepends=(librelib) source=(blacklist-${_gitver}.txt::https://projects.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver}) #source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/blacklist.txt?id=${_gitver}) -md5sums=('cae24bfe8b2c73a8e3c620f01d8fe7b9') +md5sums=('454551c4d6374c405b520ef86b1a98c4') package() { cd "$srcdir" |